diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..f444942
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+.idea*
+.docker*
+.docker_init*
+docker-compose.yml
+Dockerfile*
+data/cache/*
+data/cache/sessions/*
+data/logs/*
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index de7b51d..2dcd893 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,81 +1,190 @@
 # ignore local files and directories
 local/*
 *.local*
 .htpasswd*
 .htaccess*
 .docker_init
 Dockerfile.stage
 
-# Created by https://www.gitignore.io/api/phpstorm
+.idea*
+.vagrant*
+
+# Created by https://www.gitignore.io/api/linux,macos,windows,netbeans,phpstorm
+# Edit at https://www.gitignore.io/?templates=linux,macos,windows,netbeans,phpstorm
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### NetBeans ###
+**/nbproject/private/
+**/nbproject/Makefile-*.mk
+**/nbproject/Package-*.bash
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
 
 ### PhpStorm ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
+# User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
-.idea/dictionaries
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
 
-# Sensitive or high-churn files:
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
 .idea/**/dataSources/
 .idea/**/dataSources.ids
 .idea/**/dataSources.xml
 .idea/**/dataSources.local.xml
 .idea/**/sqlDataSources.xml
 .idea/**/dynamic.xml
 .idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
 
-# Gradle:
+# Gradle
 .idea/**/gradle.xml
 .idea/**/libraries
 
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
 # CMake
-cmake-build-debug/
+cmake-build-*/
 
-# Mongo Explorer plugin:
+# Mongo Explorer plugin
 .idea/**/mongoSettings.xml
 
-## File-based project format:
+# File-based project format
 *.iws
 
-## Plugin-specific files:
-
 # IntelliJ
-/out/
+out/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
 
 # JIRA plugin
 atlassian-ide-plugin.xml
 
 # Cursive Clojure plugin
 .idea/replstate.xml
 
 # Ruby plugin and RubyMine
 /.rakeTasks
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
 ### PhpStorm Patch ###
 # Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
 
 # *.iml
 # modules.xml
 # .idea/misc.xml
 # *.ipr
 
 # Sonarlint plugin
-.idea/sonarlint
+.idea/**/sonarlint/
+
+# SonarQube Plugin
+.idea/**/sonarIssues.xml
+
+# Markdown Navigator plugin
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator/
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
 
+# Windows shortcuts
+*.lnk
 
 # End of https://www.gitignore.io/api/phpstorm
 .idea*
 .vagrant*
 /nbproject/private/
 
diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 1745454..958aa49 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,237 +1,252 @@
 <?php
 
 /**
  *
  *   ocs-apiserver
  *
  *   Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-apiserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
     /**
      * @var Zend_Controller_Router_Rewrite
      */
     protected $_router = false;
 
+    /**
+     * @throws Zend_Exception
+     * @throws Zend_Session_Exception
+     */
+    protected function _initSessionManagement()
+    {
+        $session = $this->bootstrap('session');
+        $domain = Local_Tools_ParseDomain::get_domain();
+        Zend_Session::setOptions(array('cookie_domain'   => $domain));
+        Zend_Session::start();
+        Zend_Auth::getInstance()->setStorage(new Zend_Auth_Storage_NonPersistent());
+    }
+
     /**
      * @return mixed
      */
     protected function _initConfig()
     {
         /** $config Zend_Config */
         $config = $this->getApplication()->getApplicationConfig();
         Zend_Registry::set('config', $config);
 
         return $config;
     }
 
     /**
      * @throws Zend_Application_Bootstrap_Exception
      */
     protected function _initLogger()
     {
         /** @var Zend_Log $logger */
         $logger = $this->getPluginResource('log')->getLog();
         $logger->registerErrorHandler();
         Zend_Registry::set('logger', $logger);
     }
 
     /**
      * @return mixed|null|Zend_Cache_Core|Zend_Cache_Frontend
      * @throws Zend_Cache_Exception
      * @throws Zend_Exception
      */
     protected function _initCache()
     {
         if (Zend_Registry::isRegistered('cache')) {
             return Zend_Registry::get('cache');
         }
 
         $cache = null;
         $options = $this->getOption('settings');
 
         if (true == $options['cache']['enabled']) {
             $cache = Zend_Cache::factory(
                 $options['cache']['frontend']['type'],
                 $options['cache']['backend']['type'],
                 $options['cache']['frontend']['options'],
                 $options['cache']['backend']['options']
             );
         } else {
             // Fallback settings for some (maybe development) environments which have no cache management installed.
 
             if (false === is_writeable(APPLICATION_CACHE)) {
                 error_log('directory for cache files does not exists or not writable: ' . APPLICATION_CACHE);
                 exit('directory for cache files does not exists or not writable: ' . APPLICATION_CACHE);
             }
 
             $frontendOptions = array(
                 'lifetime'                => 600,
                 'automatic_serialization' => true,
                 'cache_id_prefix'         => 'front_cache',
                 'cache'                   => true
             );
 
             $backendOptions = array(
                 'cache_dir'              => APPLICATION_CACHE,
                 'file_locking'           => true,
                 'read_control'           => true,
                 'read_control_type'      => 'crc32',
                 'hashed_directory_level' => 1,
                 'hashed_directory_perm'  => 0700,
                 'file_name_prefix'       => 'ocs',
                 'cache_file_perm'        => 0700
             );
 
             $cache = Zend_Cache::factory(
                 'Core',
                 'File',
                 $frontendOptions,
                 $backendOptions
             );
         }
 
         Zend_Registry::set('cache', $cache);
 
         Zend_Locale::setCache($cache);
         Zend_Locale_Data::setCache($cache);
         Zend_Currency::setCache($cache);
         Zend_Translate::setCache($cache);
         Zend_Translate_Adapter::setCache($cache);
         Zend_Db_Table_Abstract::setDefaultMetadataCache($cache);
         Zend_Paginator::setCache($cache);
 
         return $cache;
     }
 
     /**
      * @throws Zend_Application_Bootstrap_Exception
+     * @throws Zend_Exception
      */
     protected function _initDbAdapter()
     {
         $db = $this->bootstrap('db')->getResource('db');
 
         if ((APPLICATION_ENV == 'development')) {
             $profiler = new Zend_Db_Profiler_Firebug('All DB Queries');
             $profiler->setEnabled(true);
 
             // Attach the profiler to your db adapter
             $db->setProfiler($profiler);
         }
 
         Zend_Registry::set('db', $db);
         Zend_Db_Table::setDefaultAdapter($db);
         Zend_Db_Table_Abstract::setDefaultAdapter($db);
         
         
         $config = Zend_Registry::get('config');
         //$db2 = $this->bootstrap('db')->getResource('db2');
         try {
             $db2 = Zend_Db::factory($config->settings->db2->adapter, array(
                 'host'     => $config->settings->db2->params->host,
                 'username' => $config->settings->db2->params->username,
                 'password' => $config->settings->db2->params->password,
                 'dbname'   => $config->settings->db2->params->dbname,
                 'charset'  => $config->settings->db2->params->charset,
                 'type'  => $config->settings->db2->params->type,
                 'persistent'  => $config->settings->db2->params->persistent,
                 'isDefaultTableAdapter' => FALSE
             ));
 
             Zend_Registry::set('db2', $db2);
             
             $db2->getConnection();
             
         } catch (Zend_Db_Adapter_Exception $e) {
             Zend_Registry::get('logger')->err('Error Init DB2: '. $e->getTraceAsString());
             //$e->getMessage();
         } catch (Zend_Exception $e) {
             Zend_Registry::get('logger')->err('Error Init DB2: '. $e->getTraceAsString());
            //$e->getMessage();
         }
         
     }
 
     protected function _initRouter()
     {
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
 
         $this->_router = $cache->load('ocs_api_router');
 
         $bootstrap = $this;
         $bootstrap->bootstrap('FrontController');
         if (false === $this->_router) {
             $this->_router = $bootstrap->getContainer()->frontcontroller->getRouter();
 
             $options = $this->getOptions()['resources']['router'];
             if (!isset($options['routes'])) {
                 $options['routes'] = array();
             }
 
             if (isset($options['chainNameSeparator'])) {
                 $this->_router->setChainNameSeparator($options['chainNameSeparator']);
             }
 
             if (isset($options['useRequestParametersAsGlobal'])) {
                 $this->_router->useRequestParametersAsGlobal($options['useRequestParametersAsGlobal']);
             }
 
             $this->_router->addConfig(new Zend_Config($options['routes']));
             $cache->save($this->_router, 'ocs_api_router', array(), 7200);
         }
 
         $this->getContainer()->frontcontroller->setRouter($this->_router);
 
         return $this->_router;
     }
 
     protected function _initGlobalAppConst()
     {
         $appConfig = $this->getResource('config');
 
         $imageConfig = $appConfig->images;
         defined('IMAGES_UPLOAD_PATH') || define('IMAGES_UPLOAD_PATH', $imageConfig->upload->path);
         defined('IMAGES_MEDIA_SERVER') || define('IMAGES_MEDIA_SERVER', $imageConfig->media->server);
 
         // ppload
-        $pploadConfig = $appConfig->third_party->ppload;
-        defined('PPLOAD_API_URI') || define('PPLOAD_API_URI', $pploadConfig->api_uri);
-        defined('PPLOAD_CLIENT_ID') || define('PPLOAD_CLIENT_ID', $pploadConfig->client_id);
-        defined('PPLOAD_SECRET') || define('PPLOAD_SECRET', $pploadConfig->secret);
-        defined('PPLOAD_DOWNLOAD_SECRET') || define('PPLOAD_DOWNLOAD_SECRET', $pploadConfig->download_secret);
+        $configFileserver = $appConfig->settings->server->files;
+        defined('PPLOAD_API_URI') || define('PPLOAD_API_URI', $configFileserver->api->uri);
+        defined('PPLOAD_CLIENT_ID') || define('PPLOAD_CLIENT_ID', $configFileserver->api->client_id);
+        defined('PPLOAD_SECRET') || define('PPLOAD_SECRET', $configFileserver->api->client_secret);
+        defined('PPLOAD_HOST') || define('PPLOAD_HOST', $configFileserver->host);
+        defined('PPLOAD_DOWNLOAD_SECRET') || define('PPLOAD_DOWNLOAD_SECRET', $configFileserver->download_secret);
     }
 
     protected function _initGlobalApplicationVars()
     {
         $modelDomainConfig = new Application_Model_DbTable_ConfigStore();
         Zend_Registry::set('application_store_category_list', $modelDomainConfig->fetchAllStoresAndCategories());
         Zend_Registry::set('application_store_config_list', $modelDomainConfig->fetchAllStoresConfigArray());
         Zend_Registry::set('application_store_config_id_list', $modelDomainConfig->fetchAllStoresConfigByIdArray());
     }
 
     protected function _initStoreDependentVars()
     {
         /** @var $front Zend_Controller_Front */
         $front = $this->bootstrap('frontController')->getResource('frontController');
         $front->registerPlugin(new Application_Plugin_InitGlobalStoreVars());
     }
 
 }
 
diff --git a/application/configs/application.ini b/application/configs/application.ini
index 282d24c..b0cd545 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -1,252 +1,262 @@
 [production]
+;phpSettings.date.timezone = "UTC"
+
 phpSettings.display_startup_errors = 0
 phpSettings.display_errors = 0
 
 includePaths.library = APPLICATION_PATH "/../library"
+autoloaderNamespaces[] = "Local_"
+autoloaderNamespaces[] = "Ppload_"
 bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
 bootstrap.class = "Bootstrap"
 appnamespace = "Application"
 
 
-autoloaderNamespaces[] = "Local_"
-autoloaderNamespaces[] = "Ppload_"
-
 ; FRONTCONTROLLER:
 resources.frontController.params.displayExceptions = 0
 resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
 ; resources.frontController.modulecontrollerdirectoryname = <NAME>
 ; resources.frontController.moduledirectory = <NAME>
 resources.frontController.defaultcontrollername = 'ocsv1'
 resources.frontController.defaultaction = 'index'
 ; resources.frontController.defaultmodule = 'default'
 ; resources.frontController.baseurl = <BASE_URL>
 ; resources.frontController.returnresponse = false
 ; resources.frontController.throwexceptions = false
 ; resources.frontController.actionhelperpaths.<HELPER_PREFIX> = <HELPER_PATH>
 resources.frontController.noErrorHandler = true
 resources.frontController.noViewRenderer = true
 resources.frontController.useDefaultControllerAlways = true
 ; resources.frontController.disableOutputBuffering = false
 ; resources.frontController.prefixDefaultModule  = false
 
 
 ; DB options:
 resources.db.adapter = "pdo_mysql"
 resources.db.isDefaultTableAdapter = true
 resources.db.params.host = <HOST>
 resources.db.params.username = <USERNAME>
 resources.db.params.password = <PASSWORD>
 resources.db.params.dbname = <DBNAME>
 ; resources.db.params.port = <PORT>
 resources.db.params.charset = "utf8"
 resources.db.params.type = "pdo_mysql"
 resources.db.params.driver_options.1002 = "SET NAMES utf8"
 ; resources.db.params.options.<OPTION> = <VALUE>
 ; resources.db.params.driver_options.<OPTION> = <VALUE>
 ; resources.db.params.adapterNamespace = <NAMESPACE>
 resources.db.params.persistent = false
 ; resources.db.params.protocol = 'TCPIP'
 ; resources.db.params.caseFolding = 0
 ; resources.db.params.autoQuoteIdentifiers = true
 
 ; DB profiler options:
 resources.db.params.profiler.class = "Zend_Db_Profiler_Firebug"
 resources.db.params.profiler.enabled = false
 
 
 ; DB2: for writing
 settings.db2.adapter = "pdo_mysql"
 settings.db2.isDefaultTableAdapter = false
 settings.db2.params.host = <HOST>
 settings.db2.params.username = <USERNAME>
 settings.db2.params.password = <PASSWORD>
 settings.db2.params.dbname = <DBNAME>
 ; settings.db2.params.port = <PORT>
 settings.db2.params.charset = "utf8"
 settings.db2.params.type = "pdo_mysql"
 settings.db2.params.driver_options.1002 = "SET NAMES utf8"
 ; settings.db2.params.options.<OPTION> = <VALUE>
 ; settings.db2.params.driver_options.<OPTION> = <VALUE>
 ; settings.db2.params.adapterNamespace = <NAMESPACE>
 settings.db2.params.persistent = true
 ; settings.db2.params.protocol = 'TCPIP'
 ; settings.db2.params.caseFolding = 0
 ; settings.db2.params.autoQuoteIdentifiers = true
 
 ; DB profiler options:
 settings.db2.params.profiler.class = "Zend_Db_Profiler_Firebug"
 settings.db2.params.profiler.enabled = false
 
 
 
 
 ; LOG options:
 resources.log.stream.writerName = "Stream"
 resources.log.stream.writerParams.stream = APPLICATION_PATH "/../data/logs/application.log"
 resources.log.stream.writerParams.mode = "a"
 ;resources.log.stream.filterName = "Priority"
 ;resources.log.stream.filterParams.priority = 8
 
 
 ; SESSION:
 resources.session.save_path = APPLICATION_DATA "/sessions"
-resources.session.name = <SESSIONID>
-; resources.session.save_handler
-; resources.session.gc_probability
-; resources.session.gc_divisor
-resources.session.gc_maxlifetime = 3600
-; resources.session.serialize_handler
-; resources.session.cookie_lifetime
-; resources.session.cookie_path
-; resources.session.cookie_domain
-resources.session.cookie_secure = true
+resources.session.name = 'ocs-session'
 resources.session.cookie_httponly = true
-; resources.session.use_cookies
+resources.session.cookie_secure = true
+resources.session.cookie_lifetime = 2592000
+resources.session.remember_me_seconds = 31536000
 resources.session.use_only_cookies = on
-; resources.session.referer_check
-; resources.session.entropy_file
-; resources.session.entropy_length
-; resources.session.cache_limiter
-; resources.session.cache_expire
-; resources.session.use_trans_sid
-; resources.session.bug_compat_42
-; resources.session.bug_compat_warn
-; resources.session.hash_function
-; resources.session.hash_bits_per_character
-;
-; Options to configure Zend_Session behavior
-; resources.session.remember_me_seconds = 1209600
-; resources.session.strict = off
-; resources.session.throw_startup_exceptions = true
+; comment out all following lines with savehandler to use alternative php session management
+; or copy to application.local.ini
+;resources.session.saveHandler.class = "Local_Session_Handler_Memcache"
+;resources.session.saveHandler.options.cache.type = "Libmemcached"
+;; #ZF-3490 : For the memcached backend, there is a lifetime limit of 30 days (2592000 seconds)
+;resources.session.saveHandler.options.cache.maxlifetime = 2592000
+;resources.session.saveHandler.options.servers.0.host = "memcachehost"
+;resources.session.saveHandler.options.servers.0.port = 11211
+;resources.session.saveHandler.options.servers.0.persistent = true
+;resources.session.saveHandler.options.servers.0.status = true
+;resources.session.saveHandler.options.compression = true
 
 ; ROUTER
+resources.router.routes.contentdata_store.route = "/s/:domain_store_id/ocs/v1/content/data/*"
+resources.router.routes.contentdata_store.defaults.controller = "ocsv1"
+resources.router.routes.contentdata_store.defaults.action = "contentdata"
+
+resources.router.routes.categories_store.route = "/s/:domain_store_id/ocs/v1/content/categories/*"
+resources.router.routes.categories_store.defaults.controller = "ocsv1"
+resources.router.routes.categories_store.defaults.action = "contentcategories"
+
 resources.router.routes.providers.route = "/ocs/providers.xml"
 resources.router.routes.providers.defaults.controller = "ocsv1"
 resources.router.routes.providers.defaults.action = "providers"
 
 resources.router.routes.config.route = "/ocs/v1/config"
 resources.router.routes.config.defaults.controller = "ocsv1"
 resources.router.routes.config.defaults.action = "config"
 
 resources.router.routes.personcheck.route = "/ocs/v1/person/check"
 resources.router.routes.personcheck.defaults.controller = "ocsv1"
 resources.router.routes.personcheck.defaults.action = "personcheck"
 
 resources.router.routes.persondata.route = "/ocs/v1/person/data/:personid"
 resources.router.routes.persondata.defaults.controller = "ocsv1"
 resources.router.routes.persondata.defaults.action = "persondata"
 
 resources.router.routes.personself.route = "/ocs/v1/person/self"
 resources.router.routes.personself.defaults.controller = "ocsv1"
 resources.router.routes.personself.defaults.action = "personself"
 
 resources.router.routes.categories.route = "/ocs/v1/content/categories"
 resources.router.routes.categories.defaults.controller = "ocsv1"
 resources.router.routes.categories.defaults.action = "contentcategories"
 
 resources.router.routes.contentdata.route = "/ocs/v1/content/data/*"
 resources.router.routes.contentdata.defaults.controller = "ocsv1"
 resources.router.routes.contentdata.defaults.action = "contentdata"
 
 resources.router.routes.contentdata_2.route = "/ocs/v1/content/data/:content_id/*"
 resources.router.routes.contentdata_2.defaults.controller = "ocsv1"
 resources.router.routes.contentdata_2.defaults.action = "contentdata"
 ;resources.router.routes.contentdata_2.defaults.content_id = null
 
 resources.router.routes.contentdownload.route = "/ocs/v1/content/download/:contentid/:itemid"
 resources.router.routes.contentdownload.defaults.controller = "ocsv1"
 resources.router.routes.contentdownload.defaults.action = "contentdownload"
 
 resources.router.routes.contentpreviewpic.route = "/ocs/v1/content/previewpic/:contentid"
 resources.router.routes.contentpreviewpic.defaults.controller = "ocsv1"
 resources.router.routes.contentpreviewpic.defaults.action = "contentpreviewpic"
 
 resources.router.routes.comments.route = "/ocs/v1/comments/data/:comment_type/:content_id/:second_id"
 resources.router.routes.comments.defaults.controller = "ocsv1"
 resources.router.routes.comments.defaults.action = "comments"
 resources.router.routes.comments.defaults.comment_type = -1
 resources.router.routes.comments.defaults.content_id = null
 resources.router.routes.comments.defaults.second_id = null
 
 resources.router.routes.voting.route = "/ocs/v1/content/vote/:contentid"
 resources.router.routes.voting.defaults.controller = "ocsv1"
 resources.router.routes.voting.defaults.action = "vote"
 
 ;resources.router.routes.contentdata_3.route = "/s/:domain_store_id/ocs/v1/content/data/*"
 ;resources.router.routes.contentdata_3.defaults.controller = "ocsv1"
 ;resources.router.routes.contentdata_3.defaults.action = "contentdata"
 
 ;resources.router.routes.config.route = "/ocs/v1/config"
 ;resources.router.routes.config.defaults.controller = "ocsv1"
 ;resources.router.routes.config.defaults.action = "config"
 
 
 ; third party:
 ; PPLOAD:
+; @deprecated
 third_party.ppload.server = "https://any-server.org"
 third_party.ppload.api_uri = "https://any-server.org"
 third_party.ppload.client_id = "clientid"
 third_party.ppload.secret = "sec"
 third_party.ppload.download_secret = "sec"
 
+; new fileserver config
+settings.server.files.host = ""
+settings.server.files.download_secret = ""
+settings.server.files.api.uri = ""
+settings.server.files.api.client_id = ""
+settings.server.files.api.client_secret = ""
+
 images.upload.path = APPLICATION_PATH "/../httpdocs/img/data/"
 images.media.server = "https://any-server.org"
 images.media.upload = "https://any-server.org/any-file.php"
 images.media.privateKey = ""
 
 ; APPLICATION:
 settings.cache.path = APPLICATION_CACHE
 settings.log.path = APPLICATION_DATA "/logs/"
 settings.search.path = APPLICATION_DATA "/indexes/"
 
 settings.client.default.name = 'default'
 settings.client.config.path = APPLICATION_PATH "/configs/"
 settings.client.default.website = 'anyhost'
 settings.client.default.baselogo = 'images/system/storeLogo.png'
 settings.client.special.mapping_active = false;
 ;settings.client.special.mapping['host_name'] = 'anyOtherHost'
 
-; cache
+; Application cache
 settings.cache.enabled = true
 settings.cache.frontend.type = Core
 settings.cache.frontend.options.lifetime = 600
 settings.cache.frontend.options.automatic_serialization = true
-settings.cache.frontend.options.cache_id_prefix = "[some string]"
+settings.cache.frontend.options.cache_id_prefix = "api_"
 settings.cache.frontend.options.cache = true
 
-settings.cache.backend.type = "Libmemcached"
-settings.cache.backend.options.servers.0.host = "127.0.0.1"
-settings.cache.backend.options.servers.0.port = 11211
-settings.cache.backend.options.servers.0.persistent = true
-settings.cache.backend.options.servers.0.weight = 1
-settings.cache.backend.options.servers.0.timeout = 5
-settings.cache.backend.options.servers.0.retry_interval = 15
-
-; alternative backend file cache, if no memcache installed (only for development environments)
-;settings.cache.backend.type = File
-;settings.cache.backend.options.cache_dir = APPLICATION_CACHE
-;settings.cache.backend.options.file_locking = true
-;settings.cache.backend.options.read_control = true
-;settings.cache.backend.options.read_control_type = 'crc32'
-;settings.cache.backend.options.hashed_directory_level = 1
-;settings.cache.backend.options.hashed_directory_perm = 0700
-;settings.cache.backend.options.file_name_prefix = 'ocs'
-;settings.cache.backend.options.cache_file_perm = 0700
+; default backend file cache, if no memcache installed (only for development environments)
+settings.cache.backend.type = "File"
+settings.cache.backend.options.cache_dir = APPLICATION_CACHE
+settings.cache.backend.options.file_locking = true
+settings.cache.backend.options.read_control = true
+settings.cache.backend.options.read_control_type = 'crc32'
+settings.cache.backend.options.hashed_directory_level = 1
+settings.cache.backend.options.hashed_directory_perm = 0700
+settings.cache.backend.options.file_name_prefix = 'api_'
+settings.cache.backend.options.cache_file_perm = 0700
+
+; comment out all following lines with savehandler to use alternative cache management
+; or copy to application.local.ini
+;settings.cache.backend.type = "Libmemcached"
+;settings.cache.backend.options.servers.0.host = "memcachehost"
+;settings.cache.backend.options.servers.0.port = 11211
+;settings.cache.backend.options.servers.0.persistent = true
+;settings.cache.backend.options.servers.0.weight = 1
+;settings.cache.backend.options.servers.0.timeout = 5
+;settings.cache.backend.options.servers.0.retry_interval = 15
 
 settings.search.host = 'localhost'
 settings.search.port = '8983'
 settings.search.http_path = '/path/'
 
 settings.client.default.tag_group_plasmaversion_id = ''
 
+settings.jwt.secret = ""
+
 [staging : production]
 
 [testing : production]
 phpSettings.display_startup_errors = 1
 phpSettings.display_errors = 1
 
 [development : production]
 phpSettings.display_startup_errors = 1
 phpSettings.display_errors = 1
 
 resources.frontController.params.displayExceptions = 1
diff --git a/application/controllers/Ocsv1Controller.php b/application/controllers/Ocsv1Controller.php
index f8dded8..4dfebc8 100644
--- a/application/controllers/Ocsv1Controller.php
+++ b/application/controllers/Ocsv1Controller.php
@@ -1,2353 +1,2439 @@
 <?php
 /**
  *  ocs-apiserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-apiserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Created: 01.12.2017
  */
 
 /**
  * What changes from official OCS v1 spec
  *
  * OCS specification:
  * http://www.freedesktop.org/wiki/Specifications/open-collaboration-services/
  *
  * ----
  *
  * Allow delimiter ',' of value of parameter 'categories'
  *
  * Example:
  * /content/data?categories=1,2,3
  * /content/data?categories=1x2x3
  *
  * ----
  *
  * Additional URL queries to '/content/data'
  *
  * xdg_types
  * package_types
  *
  * Example:
  * /content/data?xdg_types=icons,themes,wallpapers
  * /content/data?package_types=1,2,3
  *
  * package_types:
  * 1 = AppImage
  * 2 = Android (apk)c
  * 3 = OS X compatible
  * 4 = Windows executable
  * 5 = Debian
  * 6 = Snappy
  * 7 = Flatpak
  * 8 = Electron-Webapp
  * 9 = Arch
  * 10 = open/Suse
  * 11 = Redhat
  * 12 = Source Code
  *
  * ----
  *
  * Additional data field of '/content/categories'
  *
  * display_name
  * parent_id
  * xdg_type
  *
  * ----
  *
  * Additional data field of '/content/data'
  *
  * xdg_type
  * download_package_type{n}
  * download_package_arch{n}
  *
  * ----
  *
  * Additional data field of '/content/download'
  *
  * download_package_type
  * download_package_arch
  *
  * ----
  *
  * Additional API method for preview picture
  *
  * /content/previewpic/{contentid}
  *
  * Example:
  * /content/previewpic/123456789
  * /content/previewpic/123456789?size=medium
  */
 class Ocsv1Controller extends Zend_Controller_Action
 {
 
     const COMMENT_TYPE_CONTENT = 1;
     const COMMENT_TYPE_FORUM = 4;
     const COMMENT_TYPE_KNOWLEDGE = 7;
     const COMMENT_TYPE_EVENT = 8;
 
     const DOWNLOAD_PERIOD_VALIDITY = 12; // hours
 
     const CACHE_PERIOD_VALIDITY = 1; // hour
 
     protected $_authData = null;
 
     protected $_uriScheme = 'https';
 
     protected $_format = 'xml';
 
     protected $_config = array(
         'id'         => 'opendesktop.org',
         'location'   => 'https://www.opendesktop.org/ocs/v1/',
         'name'       => 'opendesktop.org',
         'icon'       => '',
         'termsofuse' => 'https://www.opendesktop.org/terms',
         'register'   => 'https://www.opendesktop.org/register',
         'version'    => '1.7',
         'website'    => 'www.opendesktop.org',
         'host'       => 'www.opendesktop.org',
         'contact'    => 'contact@opendesktop.org',
         'ssl'        => true,
         'user_host'  => 'www.pling.com'
     );
 
     protected $_params = array();
 
+    protected $_allowed_format = array('json', 'xml');
+
     /**
      * @throws Zend_Exception
      */
     public function init()
     {
         parent::init();
         $this->_initUriScheme();
         $this->_initRequestParamsAndFormat();
         $this->_initConfig();
         $this->_initResponseHeader();
+        $this->_initAuthorization();
     }
 
+    /**
+     *
+     */
     protected function _initUriScheme()
     {
         $this->_uriScheme = 'http';
 
         if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] === '1')) {
             $this->_uriScheme = 'https';
 
             return;
         }
 
         if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) AND $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
             $this->_uriScheme = 'https';
 
             return;
         }
     }
 
     /**
      * @throws Zend_Exception
      */
     protected function _initRequestParamsAndFormat()
     {
         // Set request parameters
         switch (strtoupper($_SERVER['REQUEST_METHOD'])) {
             case 'GET':
-                $this->_params = $_GET;
+                $this->_params = $_GET + $this->getAllParams();
                 break;
             case 'PUT':
                 parse_str(file_get_contents('php://input'), $_PUT);
                 $this->_params = $_PUT;
                 break;
             case 'POST':
                 $this->_params = $_POST;
                 break;
+            case 'OPTIONS':
+                header('Allow: GET,POST');
+                $this->_sendResponse(null, 'json');
             default:
                 Zend_Registry::get('logger')->err(__METHOD__ . ' - request method not supported - ' . $_SERVER['REQUEST_METHOD']);
                 exit('request method not supported');
         }
 
+        // try to find accept header
+        /** @var Zend_Controller_Request_Http $request */
+        $request = $this->getRequest();
+        $accept_header = $request->getHeader('accept');
+        Zend_Registry::get('logger')->debug(__METHOD__ . ' :: ' . print_r($accept_header, true));
+        list($format) = sscanf($accept_header, "application/%s");
+        Zend_Registry::get('logger')->debug(__METHOD__ . ' :: ' . print_r($this->_format, true));
+        if (in_array(strtolower($format), $this->_allowed_format)) {
+            $this->_format = $format;
+        }
+
         // Set format option
         if (isset($this->_params['format']) && strtolower($this->_params['format']) == 'json') {
             $this->_format = 'json';
         }
     }
 
     /**
      * @throws Zend_Exception
      */
     protected function _initConfig()
     {
         $clientConfig = $this->_loadClientConfig();
 
         $credentials = '';
         if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
             $credentials = $_SERVER['PHP_AUTH_USER'] . ':' . $_SERVER['PHP_AUTH_PW'] . '@';
         }
 
         $baseUri = $this->_uriScheme . '://' . $credentials . $_SERVER['SERVER_NAME'];
 
         $webSite = Zend_Registry::get('config')->settings->client->default->website;
 
         //Mask api.kde-look.org to store.kde.org
 //        if (strpos($_SERVER['SERVER_NAME'], 'api.kde-look.org') !== false) {
 //            $webSite = 'store.kde.org';
 //        }
 //        if (strpos($_SERVER['SERVER_NAME'], 'api2.kde-look.org') !== false) {
 //            $webSite = 'store.kde.org';
 //        }
 //        if (strpos($_SERVER['SERVER_NAME'], '165.227.165.131') !== false) {
 //            $webSite = 'store.kde.org';
 //        }
         if (Zend_Registry::get('config')->settings->client->special->mapping_active == true) {
             $mapping = Zend_Registry::get('config')->settings->client->special->mapping->toArray();
 
             $webSite = $mapping[$this->_getNameForStoreClient()] ? $mapping[$this->_getNameForStoreClient()] : $webSite;
         }
 
         $this->_config = array(
                              'id'         => $_SERVER['SERVER_NAME'],
                              'location'   => $baseUri . '/ocs/v1/',
                              'name'       => $clientConfig['head']['browser_title'],
                              'icon'       => $baseUri . $clientConfig['logo'],
                              'termsofuse' => $webSite . '/content/terms',
                              'register'   => $webSite . '/register',
                              'website'    => $webSite,
                              'host'       => $_SERVER['SERVER_NAME']
                          ) + $this->_config;
     }
 
     /**
      * @return array|null
      * @throws Zend_Exception
      */
     protected function _loadClientConfig()
     {
         $clientConfigReader = new Application_Model_ClientConfig($this->_getNameForStoreClient());
         $clientConfigReader->loadClientConfig();
 
         return $clientConfigReader->getConfig();
     }
 
     /**
      * Returns the name for the store client.
      * If no name were found, the name for the standard store client will be returned.
      *
      * @return string
      * @throws Zend_Exception
      */
     protected function _getNameForStoreClient()
     {
         $clientName = Zend_Registry::get('config')->settings->client->default->name; // default client
         if (Zend_Registry::isRegistered('store_config_name')) {
             $clientName = Zend_Registry::get('store_config_name');
         }
 
         return $clientName;
     }
 
+    /**
+     *
+     */
     protected function _initResponseHeader()
     {
         $duration = 1800; // in seconds
         $expires = gmdate("D, d M Y H:i:s", time() + $duration) . " GMT";
 
         $this->getResponse()
-             ->setHeader('X-FRAME-OPTIONS', 'SAMEORIGIN',true)
+             ->setHeader('X-FRAME-OPTIONS', 'SAMEORIGIN', true)
 //           ->setHeader('Last-Modified', $modifiedTime, true)
-             ->setHeader('Expires', $expires, true)->setHeader('Pragma', 'cache', true)
+             ->setHeader('Expires', $expires, true)
+             ->setHeader('Pragma', 'cache', true)
              ->setHeader('Cache-Control', 'max-age=1800, public', true);
+//             ->setHeader("Cache-Control","no-store, no-cache, must-revalidate, max-age=0", true)
+//             ->setHeader("Cache-Control","post-check=0, pre-check=0", true)
+//             ->setHeader("Pragma","no-cache", true);
+    }
+
+    protected function _initAuthorization()
+    {
+        $authToken = $this->getAuthToken();
+        if ($authToken) {
+            $this->getAuthDataFromToken($authToken);
+            return;
+        }
+        $this->_authenticateUser();
+    }
+
+    protected function getAuthToken()
+    {
+        $authHeader = $this->getAuthorizationHeader();
+        list($authToken) = sscanf( $authHeader, "Bearer %s");
+//        return sscanf( $authHeader, "Authorization: Bearer %s");
+
+        return $authToken;
+    }
+
+    /**
+     * Get header Authorization
+     * */
+    protected function getAuthorizationHeader()
+    {
+        if (isset($_SERVER['Authorization'])) {
+            return trim($_SERVER["Authorization"]);
+        }
+        if (isset($_SERVER['HTTP_AUTHORIZATION'])) { //Nginx or fast CGI but depends on Webserver Config
+            return trim($_SERVER["HTTP_AUTHORIZATION"]);
+        }
+        if (function_exists('apache_request_headers')) {
+            $requestHeaders = apache_request_headers();
+            // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
+            $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
+            //print_r($requestHeaders);
+            if (isset($requestHeaders['Authorization'])) {
+                return trim($requestHeaders['Authorization']);
+            }
+        }
+
+        return '';
+    }
+
+    protected function getAuthDataFromToken($authToken)
+    {
+        try {
+            $data = Application_Model_Jwt::decode($authToken);
+            if ($data->exp < microtime()) {
+                return;
+            }
+
+            $external_id = $data->sub;
+            if (empty($external_id)) {
+                return;
+            }
+
+            $modelMember = new Application_Model_Member();
+            $member_data = $modelMember->fetchMemberDataByExternalId($external_id);
+            $this->_authData = (object)$member_data->toArray();
+            $auth = Zend_Auth::getInstance();
+            $auth->clearIdentity();
+            $auth->getStorage()->write((object)$member_data->toArray());
+        } catch (Exception $e) {
+            error_log(__METHOD__ . ' :: ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * @param null $identity
+     * @param null $credential
+     * @param bool $force
+     *
+     * @return bool
+     * @throws Zend_Auth_Adapter_Exception
+     * @throws Zend_Exception
+     *
+     */
+    protected function _authenticateUser($identity = null, $credential = null, $force = false)
+    {
+        if (!$identity && !empty($_SERVER['PHP_AUTH_USER'])) {
+            // Will set user identity or API-Key
+            $identity = $_SERVER['PHP_AUTH_USER'];
+        }
+        if (!$credential && !empty($_SERVER['PHP_AUTH_PW'])) {
+            $credential = $_SERVER['PHP_AUTH_PW'];
+        }
+
+        if (isset($identity) && isset($credential)) {
+            $authModel = new Application_Model_Authorization();
+            $authData = $authModel->getAuthDataFromApi($identity, $credential);
+            if ($authData) {
+                $this->_authData = $authData;
+                Zend_Auth::getInstance()->clearIdentity();
+                Zend_Auth::getInstance()->getStorage()->write($authData);
+
+                return true;
+            }
+        }
+
+        if ($force) {
+            //header('WWW-Authenticate: Basic realm="Your valid user account or api key"');
+            header('WWW-Authenticate: Basic realm="Your valid user account"');
+            header('HTTP/1.0 401 Unauthorized');
+            exit;
+        }
+
+        return false;
     }
 
     public function indexAction()
     {
         $this->_sendErrorResponse(999, 'unknown request');
     }
 
     /**
      * @param        $statuscode
      * @param string $message
      * @throws Zend_Exception
      */
     protected function _sendErrorResponse($statuscode, $message = '')
     {
         if ($this->_format == 'json') {
             $response = array(
                 'status'     => 'failed',
                 'statuscode' => $statuscode,
                 'message'    => $message
             );
         } else {
             $response = array(
                 'meta' => array(
                     'status'     => array('@text' => 'failed'),
                     'statuscode' => array('@text' => $statuscode),
                     'message'    => array('@text' => $message)
                 )
             );
         }
 
         Zend_Registry::get('logger')->err(json_encode($response));
         $this->_sendResponse($response, $this->_format);
     }
 
     /**
      * @param        $response
      * @param string $format
      * @param string $xmlRootTag
      */
     protected function _sendResponse($response, $format = 'xml', $xmlRootTag = 'ocs')
     {
         header('Pragma: public');
         header('Cache-Control: cache, must-revalidate');
+
+        header("Access-Control-Allow-Origin: *");
+        header("Access-Control-Allow-Headers: Accept,Authorization,X-Requested-With");
+        header("Access-Control-Request-Method: GET,POST,OPTIONS");
+
         $duration = 1800; // in seconds
         $expires = gmdate("D, d M Y H:i:s", time() + $duration) . " GMT";
         header('Expires: ' . $expires);
         if ($format == 'json') {
             header('Content-Type: application/json; charset=UTF-8');
             echo json_encode($response);
         } else {
             header('Content-Type: application/xml; charset=UTF-8');
             echo $this->_convertXmlDom($response, $xmlRootTag)->saveXML();
         }
 
         exit;
     }
 
     /**
      * @param                 $values
      * @param string          $tagName
      * @param DOMNode|null    $dom
      * @param DOMElement|null $element
      *
      * @return DomDocument|DOMNode
      */
     protected function _convertXmlDom($values, $tagName = 'data', DOMNode &$dom = null, DOMElement &$element = null)
     {
         if (!$dom) {
             $dom = new DomDocument('1.0', 'UTF-8');
         }
         if (!$element) {
             $element = $dom->appendChild($dom->createElement($tagName));
         }
         if (is_array($values) || is_object($values)) {
             foreach ($values as $key => $value) {
                 if (is_array($value) || is_object($value)) {
                     $isHash = false;
                     foreach ($value as $_key => $_value) {
                         if (ctype_digit((string)$_key)) {
                             $isHash = true;
                         }
                         break;
                     }
                     if ($isHash) {
                         $this->_convertXmlDom($value, $key, $dom, $element);
                         continue;
                     }
                     if (ctype_digit((string)$key)) {
                         $key = $tagName;
                     }
                     $childElement = $element->appendChild($dom->createElement($key));
                     $this->_convertXmlDom($value, $key, $dom, $childElement);
                 } else {
                     if ($key == '@text') {
                         if (is_bool($value)) {
                             $value = var_export($value, true);
                         }
                         $element->appendChild($dom->createTextNode($value));
                     } else {
                         if ($key == '@cdata') {
                             if (is_bool($value)) {
                                 $value = var_export($value, true);
                             }
                             $element->appendChild($dom->createCDATASection($value));
                         } else {
                             if (is_bool($value)) {
                                 $value = var_export($value, true);
                             }
                             $element->setAttribute($key, $value);
                         }
                     }
                 }
             }
         }
 
         return $dom;
     }
 
     public function providersAction()
     {
         // As providers.xml
         $response = array(
             'provider' => array(
                 'id'         => array('@text' => $this->_config['id']),
                 'location'   => array('@text' => $this->_config['location']),
                 'name'       => array('@text' => $this->_config['name']),
                 'icon'       => array('@text' => $this->_config['icon']),
                 'termsofuse' => array('@text' => $this->_config['termsofuse']),
                 'register'   => array('@text' => $this->_config['register']),
                 'services'   => array(
                     'person'  => array('ocsversion' => $this->_config['version']),
                     'content' => array('ocsversion' => $this->_config['version'])
                 )
             )
         );
 
         $this->_sendResponse($response, 'xml', 'providers');
     }
 
     public function configAction()
     {
         if ($this->_format == 'json') {
             $response = array(
                 'status'     => 'ok',
                 'statuscode' => 100,
                 'message'    => '',
                 'data'       => array(
                     'version' => $this->_config['version'],
                     'website' => $this->_config['website'],
                     'host'    => $this->_config['host'],
                     'contact' => $this->_config['contact'],
                     'ssl'     => $this->_config['ssl']
                 )
             );
         } else {
             $response = array(
                 'meta' => array(
                     'status'     => array('@text' => 'ok'),
                     'statuscode' => array('@text' => 100),
                     'message'    => array('@text' => '')
                 ),
                 'data' => array(
                     'version' => array('@text' => $this->_config['version']),
                     'website' => array('@text' => $this->_config['website']),
                     'host'    => array('@text' => $this->_config['host']),
                     'contact' => array('@text' => $this->_config['contact']),
                     'ssl'     => array('@text' => $this->_config['ssl'])
                 )
             );
         }
 
         $this->_sendResponse($response, $this->_format);
     }
 
     public function personcheckAction()
     {
-        $identity = null;
-        $credential = null;
-        if (!empty($this->_params['login'])) {
-            $identity = $this->_params['login'];
-        }
-        if (!empty($this->_params['password'])) {
-            $credential = $this->_params['password'];
+        /** @var Zend_Controller_Request_Http $request */
+        $request = $this->getRequest();
+        if (false === $request->isPost()) {
+            $this->_sendErrorResponse(405, "method not allowed");
         }
+        $identity = $this->getParam('login');
+        $credential = $this->getParam('password');
 
         if (!$identity) {
             $this->_sendErrorResponse(101, 'please specify all mandatory fields');
-        } else {
-            if (!$this->_authenticateUser($identity, $credential)) {
-                $this->_sendErrorResponse(102, 'login not valid');
-            }
+        }
+
+        $modelAuth = new Application_Model_Authorization();
+        $authResult = $modelAuth->authenticateCredentials($identity, $credential);
+
+        if (!$authResult->isValid()) {
+            $this->_sendErrorResponse(102, 'login not valid');
         }
 
         if ($this->_format == 'json') {
             $response = array(
                 'status'     => 'ok',
                 'statuscode' => 100,
                 'message'    => '',
                 'data'       => array(
                     array(
                         'details'  => 'check',
-                        'personid' => $this->_authData->username
+                        'personid' => $authResult->getIdentity()
                     )
                 )
             );
         } else {
             $response = array(
                 'meta' => array(
                     'status'     => array('@text' => 'ok'),
                     'statuscode' => array('@text' => 100),
                     'message'    => array('@text' => '')
                 ),
                 'data' => array(
                     'person' => array(
                         'details'  => 'check',
-                        'personid' => array('@text' => $this->_authData->username)
+                        'personid' => array('@text' => $authResult->getIdentity())
                     )
                 )
             );
         }
 
         $this->_sendResponse($response, $this->_format);
     }
 
     /**
-     * @param null $identity
-     * @param null $credential
-     * @param bool $force
+     * Gets a parameter from the {@link $_request Request object}.  If the
+     * parameter does not exist, NULL will be returned.
      *
-     * @return bool
+     * If the parameter does not exist and $default is set, then
+     * $default will be returned instead of NULL.
+     *
+     * @param string $paramName
+     * @param mixed $default
+     * @return mixed
      */
-    protected function _authenticateUser($identity = null, $credential = null, $force = false)
+    public function getParam($paramName, $default = null)
     {
-        ////////////////////////////////////////////////////////
-        // BasicAuth enabled testing site workaround
-        if (strrpos($_SERVER['SERVER_NAME'], 'pling.ws') !== false
-            || strrpos($_SERVER['SERVER_NAME'], 'pling.cc') !== false
-            || strrpos($_SERVER['SERVER_NAME'], 'pling.to') !== false
-            || strrpos($_SERVER['SERVER_NAME'], 'ocs-store.com') !== false) {
-            $authData = new stdClass;
-            $authData->username = 'dummy';
-            $this->_authData = $authData;
-
-            return true;
-        }
-        ////////////////////////////////////////////////////////
-
-        if (!$identity && !empty($_SERVER['PHP_AUTH_USER'])) {
-            // Will set user identity or API-Key
-            $identity = $_SERVER['PHP_AUTH_USER'];
-        }
-        if (!$credential && !empty($_SERVER['PHP_AUTH_PW'])) {
-            $credential = $_SERVER['PHP_AUTH_PW'];
+        $value = $this->_params[$paramName];
+        if ((null === $value || '' === $value) && (null !== $default)) {
+            $value = $default;
         }
 
-        $loginMethod = null;
-        //if ($identity && !$credential) {
-        //    $loginMethod = 'api-key';
-        //}
-
-        if ($identity && ($credential || $loginMethod == 'api-key')) {
-            $authModel = new Application_Model_Authorization();
-            $authData = $authModel->getAuthDataFromApi($identity, $credential, $loginMethod);
-            if ($authData) {
-                $this->_authData = $authData;
-
-                return true;
-            }
-        }
-
-        if ($force) {
-            //header('WWW-Authenticate: Basic realm="Your valid user account or api key"');
-            header('WWW-Authenticate: Basic realm="Your valid user account"');
-            header('HTTP/1.0 401 Unauthorized');
-            exit;
-        }
-
-        return false;
+        return $value;
     }
 
     public function personselfAction()
     {
         $this->persondataAction(true);
     }
 
     public function persondataAction($self = false)
     {
+        //See Ticket: https://phabricator.kde.org/T11173: we should show some data instead of an error
         $showAll = false;
-        if (!$this->_authenticateUser()) {
-            //See Ticket: https://phabricator.kde.org/T11173: we should show some data insead of an error
-            //$this->_sendErrorResponse(101, 'person not found');
-            $showAll = false;
-        } else {
+        if (Zend_Auth::getInstance()->hasIdentity()) {
             $showAll = true;
         }
 
         $tableMember = new Application_Model_Member();
 
         // Self data or specific person data
         if ($self || $this->getParam('personid')) {
             if ($self) {
                 $username = $this->_authData->username;
             } else {
                 if ($this->getParam('personid')) {
                     $username = $this->getParam('personid');
                 }
             }
 
             $member = $tableMember->findActiveMemberByIdentity($username);
 
-            if (!$member) {
+            if (empty($member->member_id)) {
                 $this->_sendErrorResponse(101, 'person not found');
             }
 
             $profilePage = $this->_uriScheme . '://' . $this->_config['user_host'] . '/u/' . $member->username;
-            $avatarUrl = $this->_uriScheme . '://' . $this->_config['user_host'] . '/member/avatar/'. md5($member->mail).'/800';
-            
+            $avatarUrl = $this->_uriScheme . '://' . $this->_config['user_host'] . '/member/avatar/' . md5($member->mail) . '/800';
+
             $userData = array(
-                            'details'              => $showAll?'full':'summary',
-                            'personid'             => $member->username,
-                            'privacy'              => 0,
-                            'privacytext'          => 'public',
-                            'firstname'            => $member->firstname,
-                            'lastname'             => $showAll?$member->lastname:'',
-                            'gender'               => '',
-                            'communityrole'        => '',
-                            'homepage'             => $member->link_website,
-                            'company'              => '',
-                            'avatarpic'            => $avatarUrl,
-                            'avatarpicfound'       => 1,
-                            'bigavatarpic'         => $avatarUrl,
-                            'bigavatarpicfound'    => 1,
-                            'birthday'             => '',
-                            'jobstatus'            => '',
-                            'city'                 => $showAll?$member->city:'',
-                            'country'              => $showAll?$member->country:'',
-                            'latitude'             => '',
-                            'longitude'            => '',
-                            'ircnick'              => '',
-                            'ircchannels'          => '',
-                            'irclink'              => '',
-                            'likes'                => '',
-                            'dontlikes'            => '',
-                            'interests'            => '',
-                            'languages'            => '',
-                            'programminglanguages' => '',
-                            'favouritequote'       => '',
-                            'favouritemusic'       => '',
-                            'favouritetvshows'     => '',
-                            'favouritemovies'      => '',
-                            'favouritebooks'       => '',
-                            'favouritegames'       => '',
-                            'description'          => $showAll?$member->biography:'',
-                            'profilepage'          => $profilePage
-                        );
+                'details'              => $showAll ? 'full' : 'summary',
+                'personid'             => $member->username,
+                'privacy'              => 0,
+                'privacytext'          => 'public',
+                'firstname'            => $member->firstname,
+                'lastname'             => $showAll ? $member->lastname : '',
+                'gender'               => '',
+                'communityrole'        => '',
+                'homepage'             => $member->link_website,
+                'company'              => '',
+                'avatarpic'            => $avatarUrl,
+                'avatarpicfound'       => 1,
+                'bigavatarpic'         => $avatarUrl,
+                'bigavatarpicfound'    => 1,
+                'birthday'             => '',
+                'jobstatus'            => '',
+                'city'                 => $showAll ? $member->city : '',
+                'country'              => $showAll ? $member->country : '',
+                'latitude'             => '',
+                'longitude'            => '',
+                'ircnick'              => '',
+                'ircchannels'          => '',
+                'irclink'              => '',
+                'likes'                => '',
+                'dontlikes'            => '',
+                'interests'            => '',
+                'languages'            => '',
+                'programminglanguages' => '',
+                'favouritequote'       => '',
+                'favouritemusic'       => '',
+                'favouritetvshows'     => '',
+                'favouritemovies'      => '',
+                'favouritebooks'       => '',
+                'favouritegames'       => '',
+                'description'          => $showAll ? $member->biography : '',
+                'profilepage'          => $profilePage
+            );
 
             if ($this->_format == 'json') {
                 $response = array(
                     'status'     => 'ok',
                     'statuscode' => 100,
                     'message'    => '',
                     'data'       => array(
                         $userData
                     )
                 );
             } else {
                 $userData = array(
-                            'details'              => $showAll?'full':'summary',
-                            'personid'             => array('@text' => $member->username),
-                            'privacy'              => array('@text' => 0),
-                            'privacytext'          => array('@text' => 'public'),
-                            'firstname'            => array('@text' => $member->firstname),
-                            'lastname'             => array('@text' => $showAll?$member->lastname:''),
-                            'gender'               => array('@text' => ''),
-                            'communityrole'        => array('@text' => ''),
-                            'homepage'             => array('@text' => $member->link_website),
-                            'company'              => array('@text' => ''),
-                            'avatarpic'            => array('@text' => $avatarUrl),
-                            'avatarpicfound'       => array('@text' => 1),
-                            'bigavatarpic'         => array('@text' => $avatarUrl),
-                            'bigavatarpicfound'    => array('@text' => 1),
-                            'birthday'             => array('@text' => ''),
-                            'jobstatus'            => array('@text' => ''),
-                            'city'                 => array('@text' => $showAll?$member->city:''),
-                            'country'              => array('@text' => $showAll?$member->country:''),
-                            'latitude'             => array('@text' => ''),
-                            'longitude'            => array('@text' => ''),
-                            'ircnick'              => array('@text' => ''),
-                            'ircchannels'          => array('@text' => ''),
-                            'irclink'              => array('@text' => ''),
-                            'likes'                => array('@text' => ''),
-                            'dontlikes'            => array('@text' => ''),
-                            'interests'            => array('@text' => ''),
-                            'languages'            => array('@text' => ''),
-                            'programminglanguages' => array('@text' => ''),
-                            'favouritequote'       => array('@text' => ''),
-                            'favouritemusic'       => array('@text' => ''),
-                            'favouritetvshows'     => array('@text' => ''),
-                            'favouritemovies'      => array('@text' => ''),
-                            'favouritebooks'       => array('@text' => ''),
-                            'favouritegames'       => array('@text' => ''),
-                            'description'          => array('@text' => $showAll?$member->biography:''),
-                            'profilepage'          => array('@text' => $profilePage)
-                        );
-                
-                
+                    'details'              => $showAll ? 'full' : 'summary',
+                    'personid'             => array('@text' => $member->username),
+                    'privacy'              => array('@text' => 0),
+                    'privacytext'          => array('@text' => 'public'),
+                    'firstname'            => array('@text' => $member->firstname),
+                    'lastname'             => array('@text' => $showAll ? $member->lastname : ''),
+                    'gender'               => array('@text' => ''),
+                    'communityrole'        => array('@text' => ''),
+                    'homepage'             => array('@text' => $member->link_website),
+                    'company'              => array('@text' => ''),
+                    'avatarpic'            => array('@text' => $avatarUrl),
+                    'avatarpicfound'       => array('@text' => 1),
+                    'bigavatarpic'         => array('@text' => $avatarUrl),
+                    'bigavatarpicfound'    => array('@text' => 1),
+                    'birthday'             => array('@text' => ''),
+                    'jobstatus'            => array('@text' => ''),
+                    'city'                 => array('@text' => $showAll ? $member->city : ''),
+                    'country'              => array('@text' => $showAll ? $member->country : ''),
+                    'latitude'             => array('@text' => ''),
+                    'longitude'            => array('@text' => ''),
+                    'ircnick'              => array('@text' => ''),
+                    'ircchannels'          => array('@text' => ''),
+                    'irclink'              => array('@text' => ''),
+                    'likes'                => array('@text' => ''),
+                    'dontlikes'            => array('@text' => ''),
+                    'interests'            => array('@text' => ''),
+                    'languages'            => array('@text' => ''),
+                    'programminglanguages' => array('@text' => ''),
+                    'favouritequote'       => array('@text' => ''),
+                    'favouritemusic'       => array('@text' => ''),
+                    'favouritetvshows'     => array('@text' => ''),
+                    'favouritemovies'      => array('@text' => ''),
+                    'favouritebooks'       => array('@text' => ''),
+                    'favouritegames'       => array('@text' => ''),
+                    'description'          => array('@text' => $showAll ? $member->biography : ''),
+                    'profilepage'          => array('@text' => $profilePage)
+                );
+
+
                 $response = array(
                     'meta' => array(
                         'status'     => array('@text' => 'ok'),
                         'statuscode' => array('@text' => 100),
                         'message'    => array('@text' => '')
                     ),
                     'data' => array(
                         'person' => $userData
                     )
                 );
             }
 
             $this->_sendResponse($response, $this->_format);
         } // Find a specific list of persons
         else {
             //Only auth users can search here
-            if(!$showAll) {
+            if (!$showAll) {
                 $this->_sendErrorResponse(101, 'data is private');
             }
-            
-            
+
             $limit = 10; // 1 - 100
             $offset = 0;
 
             $tableMemberSelect = $tableMember->select()->where('is_active = ?', 1)->where('is_deleted = ?', 0);
 
             if (!empty($this->_params['name'])) {
                 $isSearchable = false;
                 foreach (explode(' ', $this->_params['name']) as $keyword) {
                     if ($keyword && strlen($keyword) > 2) {
                         $tableMemberSelect->where('username LIKE ?' . ' OR firstname LIKE ?' . ' OR lastname LIKE ?',
                             "%$keyword%");
                         $isSearchable = true;
                     }
                 }
                 if (!$isSearchable) {
                     $tableMemberSelect->where('username LIKE ?' . ' OR firstname LIKE ?' . ' OR lastname LIKE ?',
                         "%{$this->_params['name']}%");
                 }
             }
             if (!empty($this->_params['country'])) {
                 $tableMemberSelect->where('country = ?', $this->_params['country']);
             }
             if (!empty($this->_params['city'])) {
                 $tableMemberSelect->where('city = ?', $this->_params['city']);
             }
             if (!empty($this->_params['description'])) {
                 $isSearchable = false;
                 foreach (explode(' ', $this->_params['name']) as $keyword) {
                     if ($keyword && strlen($keyword) > 2) {
                         $tableMemberSelect->where('biography LIKE ?', "%$keyword%");
                         $isSearchable = true;
                     }
                 }
                 if (!$isSearchable) {
                     $tableMemberSelect->where('biography LIKE ?', "%$this->_params['description']}%");
                 }
             }
             if (!empty($this->_params['pc'])) {
             }
             if (!empty($this->_params['software'])) {
             }
             if (!empty($this->_params['longitude'])) {
             }
             if (!empty($this->_params['latitude'])) {
             }
             if (!empty($this->_params['distance'])) {
             }
             if (!empty($this->_params['attributeapp'])) {
             }
             if (!empty($this->_params['attributekey'])) {
             }
             if (!empty($this->_params['attributevalue'])) {
             }
             if (isset($this->_params['pagesize'])
                 && ctype_digit((string)$this->_params['pagesize'])
                 && $this->_params['pagesize'] > 0
                 && $this->_params['pagesize'] < 101) {
                 $limit = $this->_params['pagesize'];
             }
             if (isset($this->_params['page'])
                 && ctype_digit((string)$this->_params['page'])) {
                 // page parameter: the first page is 0
                 $offset = $limit * $this->_params['page'];
             }
 
             $members = $tableMember->fetchAll($tableMemberSelect->limit($limit, $offset));
 
             $tableMemberSelect->reset('columns');
             $tableMemberSelect->reset('limitcount');
             $tableMemberSelect->reset('limitoffset');
 
             $count = $tableMember->fetchRow($tableMemberSelect->columns(array('count' => 'COUNT(*)')));
 
             if ($count['count'] > 1000) {
                 $this->_sendErrorResponse(102,
                     'more than 1000 people found.' . ' it is not allowed to fetch such a big resultset.'
                     . ' please specify more search conditions');
             }
 
             if ($this->_format == 'json') {
                 $response = array(
                     'status'       => 'ok',
                     'statuscode'   => 100,
                     'message'      => '',
                     'totalitems'   => $count['count'],
                     'itemsperpage' => $limit,
                     'data'         => array()
                 );
             } else {
                 $response = array(
                     'meta' => array(
                         'status'       => array('@text' => 'ok'),
                         'statuscode'   => array('@text' => 100),
                         'message'      => array('@text' => ''),
                         'totalitems'   => array('@text' => $count['count']),
                         'itemsperpage' => array('@text' => $limit)
                     ),
                     'data' => array()
                 );
             }
 
             if (!count($members)) {
                 $this->_sendResponse($response, $this->_format);
             }
 
             $personsList = array();
             foreach ($members as $member) {
                 if ($this->_format == 'json') {
                     $personsList[] = array(
                         'details'       => 'summary',
                         'personid'      => $member->username,
                         'privacy'       => 0,
                         'privacytext'   => 'public',
                         'firstname'     => $member->firstname,
                         'lastname'      => $member->lastname,
                         'gender'        => '',
                         'communityrole' => '',
                         'company'       => '',
                         'city'          => $member->city,
                         'country'       => $member->country
                     );
                 } else {
                     $personsList[] = array(
                         'details'       => 'summary',
                         'personid'      => array('@text' => $member->username),
                         'privacy'       => array('@text' => 0),
                         'privacytext'   => array('@text' => 'public'),
                         'firstname'     => array('@text' => $member->firstname),
                         'lastname'      => array('@text' => $member->lastname),
                         'gender'        => array('@text' => ''),
                         'communityrole' => array('@text' => ''),
                         'company'       => array('@text' => ''),
                         'city'          => array('@text' => $member->city),
                         'country'       => array('@text' => $member->country)
                     );
                 }
             }
 
             if ($this->_format == 'json') {
                 $response['data'] = $personsList;
             } else {
                 $response['data'] = array('person' => $personsList);
             }
 
             $this->_sendResponse($response, $this->_format);
         }
     }
 
     public function contentcategoriesAction()
     {
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
-        $cacheName = 'content_categories_' . md5($this->_getNameForStoreClient());
+        $cacheName = 'content_categories_' . md5($this->_getNameForStoreClient() . $this->_format);
 
         $debugMode = (int)$this->getParam('debug') ? (int)$this->getParam('debug') : false;
 
         if (false == ($categoriesList = $cache->load($cacheName))) {
             $categoriesList = $this->_buildCategories();
             $cache->save($categoriesList, $cacheName, array(), 900);
         }
 
         if ($this->_format == 'json') {
             $response = array(
                 'status'     => 'ok',
                 'statuscode' => 100,
                 'message'    => '',
                 'totalitems' => count($categoriesList),
                 'data'       => array()
             );
             if (!empty($categoriesList)) {
                 $response['data'] = $categoriesList;
             }
         } else {
             $response = array(
                 'meta' => array(
                     'status'     => array('@text' => 'ok'),
                     'statuscode' => array('@text' => 100),
                     'message'    => array('@text' => ''),
                     'totalitems' => array('@text' => count($categoriesList))
                 ),
                 'data' => array()
             );
             if (!empty($categoriesList)) {
                 $response['data'] = array('category' => $categoriesList);
             }
         }
 
         if ($debugMode) {
             $response['meta']['debug']['store_client_name'] = $this->_getNameForStoreClient();
             $response['meta']['debug']['param_store_client_name'] = $this->getParam('domain_store_id');
         }
 
         $this->_sendResponse($response, $this->_format);
     }
 
     /**
      * @return array
      */
     protected function _buildCategories()
     {
         $modelCategoryTree = new Application_Model_ProjectCategory();
         $tree = $modelCategoryTree->fetchCategoryTreeCurrentStore();
 
         return $this->buildResponseTree($tree);
     }
 
     /**
      * @param array $tree
      *
      * @return array
      */
     protected function buildResponseTree($tree)
     {
         $result = array();
         foreach ($tree as $element) {
             if ($this->_format == 'json') {
                 $result[] = array(
                     'id'           => $element['id'],
                     'name'         => (false === empty($element['name_legacy'])) ? $element['name_legacy'] : $element['title'],
                     'display_name' => $element['title'],
                     'parent_id'    => (false === empty($element['parent_id'])) ? $element['parent_id'] : '',
                     'xdg_type'     => (false === empty($element['xdg_type'])) ? $element['xdg_type'] : ''
                 );
             } else {
                 $result[] = array(
                     'id'           => array('@text' => $element['id']),
                     'name'         => array(
                         '@text' => (false === empty($element['name_legacy'])) ? $element['name_legacy'] : $element['title']
                     ),
                     'display_name' => array('@text' => $element['title']),
                     'parent_id'    => array('@text' => (false === empty($element['parent_id'])) ? $element['parent_id'] : ''),
                     'xdg_type'     => array('@text' => (false === empty($element['xdg_type'])) ? $element['xdg_type'] : '')
                 );
             }
             if ($element['has_children']) {
                 $sub_tree = $this->buildResponseTree($element['children']);
                 $result = array_merge($result, $sub_tree);
             }
         }
 
         return $result;
     }
 
     public function contentdataAction()
     {
-        $this->_authenticateUser();
+        /* @deprecated use Zend_Auth::getInstance() instead */
+        //$this->_authenticateUser();
 
         $pploadApi = new Ppload_Api(array(
             'apiUri'   => PPLOAD_API_URI,
             'clientId' => PPLOAD_CLIENT_ID,
             'secret'   => PPLOAD_SECRET
         ));
         $previewPicSize = array(
             'width'  => 770,
             'height' => 540,
             'crop'   => 0
         );
         $smallPreviewPicSize = array(
             'width'  => 100,
             'height' => 100,
             'crop'   => 0
         );
 
         $debugMode = (int)$this->getParam('debug') ? (int)$this->getParam('debug') : false;
         $nocache = (int)$this->getParam('nocache') ? (int)$this->getParam('nocache') : false;
 
         // Specific content data
         $requestedId = (int)$this->getParam('content_id') ? (int)$this->getParam('content_id') : null;
         if ($requestedId) {
             $response = $this->fetchContent($requestedId, $previewPicSize, $smallPreviewPicSize, $pploadApi);
 
             $this->_sendResponse($response, $this->_format);
         } // Gets a list of a specific set of contents
         else {
             $response = $this->fetchCategoryContent($previewPicSize, $smallPreviewPicSize, $pploadApi, $debugMode, $nocache);
 
             $this->_sendResponse($response, $this->_format);
         }
     }
 
     /**
      * @param int        $contentId
      * @param array      $previewPicSize
      * @param array      $smallPreviewPicSize
      * @param Ppload_Api $pploadApi
      *
      * @return array
      * @throws Zend_Cache_Exception
      * @throws Zend_Exception
      */
     protected function fetchContent(
         $contentId,
         $previewPicSize,
         $smallPreviewPicSize,
         $pploadApi
     ) {
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
-        $cacheName = 'api_fetch_content_by_id_' . $contentId;
+        $cacheName = 'api_fetch_content_by_id_' . $contentId . $this->_format;
 
         if (($response = $cache->load($cacheName))) {
             return $response;
         }
 
         $tableProject = new Application_Model_Project();
         $tableProjectSelect = $this->_buildProjectSelect($tableProject);
 
         $project = $tableProject->fetchRow($tableProjectSelect->where('project.project_id = ?', $contentId));
 
         if (!$project) {
             $this->_sendErrorResponse(101, 'content not found');
         }
 
         $project->title = Application_Model_HtmlPurify::purify($project->title);
         $project->description = Application_Model_BBCode::renderHtml(Application_Model_HtmlPurify::purify($project->description));
         $project->version = Application_Model_HtmlPurify::purify($project->version);
 
         $categoryXdgType = '';
         if (!empty($project->cat_xdg_type)) {
             $categoryXdgType = $project->cat_xdg_type;
         }
 
         $created = date('c', strtotime($project->created_at));
         $changed = date('c', strtotime($project->changed_at));
 
         $previewPage = $this->_uriScheme . '://' . $this->_config['website'] . '/p/' . $project->project_id;
 
         $donationPage = $previewPage;
         if (empty($project->paypal_mail) && empty($project->dwolla_id)) {
             $donationPage = '';
         }
 
         list($previewPics, $smallPreviewPics) = $this->getGalleryPictures($project, $previewPicSize,
             $smallPreviewPicSize);
 
         $downloads = $project->count_downloads_hive;
         list($downloadItems, $downloads) = $this->getPPLoadInfo($project, $pploadApi, $downloads);
 
         $score = $project->laplace_score;
         $score = round($score / 10, 0);
 
         $projTags = "";
         //special for plasma-version-tags
         if (!empty($project->tags)) {
             //get File-Tags from Product
             $fileTagArray = explode(',', $project->tags);
             //collect tags
             $projTags = "";
 
             $tagTable = new Application_Model_Tags();
             $plasmaversionTags = $tagTable->getAllFilePlasmaVersionTags();
             foreach ($fileTagArray as $tag) {
                 if (in_array($tag, $plasmaversionTags)) {
                     $version = null;
                     $pos = strrpos($tag, '-');
                     if ($pos) {
                         $version = substr($tag, $pos + 1);
                     }
                     $projTags .= "plasma##majorversion=" . $version . ",";
                 } else {
                     $projTags .= $tag . ",";
                 }
             }
 
             $projTags = rtrim($projTags, ",");
         }
-        
+
         if ($this->_format == 'json') {
             $response = array(
                 'status'     => 'ok',
                 'statuscode' => 100,
                 'message'    => '',
                 'data'       => array(
                     array(
                         'details'              => 'full',
                         'id'                   => $project->project_id,
                         'name'                 => $project->title,
                         'version'              => $project->version,
                         'typeid'               => $project->project_category_id,
                         'typename'             => $project->cat_title,
                         'xdg_type'             => $categoryXdgType,
                         'language'             => '',
                         'personid'             => $project->username,
                         'created'              => $created,
                         'changed'              => $changed,
                         'downloads'            => $downloads,
                         'score'                => $score,
                         'summary'              => '',
                         'description'          => $project->description,
                         'changelog'            => '',
                         'feedbackurl'          => $previewPage,
                         'homepage'             => $previewPage,
                         'homepagetype'         => '',
                         'donationpage'         => $donationPage,
                         'comments'             => $project->count_comments,
                         'commentspage'         => $previewPage,
                         'fans'                 => null,
                         'fanspage'             => '',
                         'knowledgebaseentries' => null,
                         'knowledgebasepage'    => '',
                         'depend'               => '',
                         'preview1'             => $previewPage,
                         'icon'                 => '',
                         'video'                => '',
                         'detailpage'           => $previewPage,
                         'ghns_excluded'        => $project->ghns_excluded,
                         'tags'                 => $projTags
                     ) + $previewPics + $smallPreviewPics + $downloadItems
                 )
             );
         } else {
             foreach ($previewPics as $key => $value) {
                 $previewPics[$key] = array('@text' => $value);
             }
             foreach ($smallPreviewPics as $key => $value) {
                 $smallPreviewPics[$key] = array('@text' => $value);
             }
             if ($downloadItems) {
                 foreach ($downloadItems as $key => $value) {
                     $downloadItems[$key] = array('@text' => $value);
                 }
             }
             $response = array(
                 'meta' => array(
                     'status'     => array('@text' => 'ok'),
                     'statuscode' => array('@text' => 100),
                     'message'    => array('@text' => '')
                 ),
                 'data' => array(
                     'content' => array(
                                      'details'              => 'full',
                                      'id'                   => array('@text' => $project->project_id),
                                      'name'                 => array('@text' => $project->title),
                                      'version'              => array('@text' => $project->version),
                                      'typeid'               => array('@text' => $project->project_category_id),
                                      'typename'             => array('@text' => $project->cat_title),
                                      'xdg_type'             => array('@text' => $categoryXdgType),
                                      'language'             => array('@text' => ''),
                                      'personid'             => array('@text' => $project->username),
                                      'created'              => array('@text' => $created),
                                      'changed'              => array('@text' => $changed),
                                      'downloads'            => array('@text' => $downloads),
                                      'score'                => array('@text' => $score),
                                      'summary'              => array('@text' => ''),
                                      'description'          => array('@cdata' => $project->description),
                                      'changelog'            => array('@text' => ''),
                                      'feedbackurl'          => array('@text' => $previewPage),
                                      'homepage'             => array('@text' => $previewPage),
                                      'homepagetype'         => array('@text' => ''),
                                      'donationpage'         => array('@text' => $donationPage),
                                      'comments'             => array('@text' => $project->count_comments),
                                      'commentspage'         => array('@text' => $previewPage),
                                      'fans'                 => array('@text' => null),
                                      'fanspage'             => array('@text' => ''),
                                      'knowledgebaseentries' => array('@text' => null),
                                      'knowledgebasepage'    => array('@text' => ''),
                                      'depend'               => array('@text' => ''),
                                      'preview1'             => array('@text' => $previewPage),
                                      'icon'                 => array('@text' => ''),
                                      'video'                => array('@text' => ''),
                                      'detailpage'           => array('@text' => $previewPage),
                                      'ghns_excluded'        => array('@text' => $project->ghns_excluded),
                                      'tags'                 => array('@text' => $projTags)
                                  ) + $previewPics + $smallPreviewPics + $downloadItems
                 )
             );
         }
 
         $cache->save($response, $cacheName);
 
         return $response;
     }
 
     /**
      * @param Zend_Db_Table $tableProject
      *
      * @param bool          $withSqlCalcFoundRows
      *
      * @return Zend_Db_Table_Select
      * @throws Zend_Db_Select_Exception
      */
     protected function _buildProjectSelect($tableProject, $withSqlCalcFoundRows = false)
     {
         $tableProjectSelect = $tableProject->select();
         if ($withSqlCalcFoundRows) {
             $tableProjectSelect->from(array('project' => 'stat_projects'),
                 array(new Zend_Db_Expr('SQL_CALC_FOUND_ROWS *')));
         } else {
             $tableProjectSelect->from(array('project' => 'stat_projects'));
         }
         $tableProjectSelect->setIntegrityCheck(false)->columns(array(
             '*',
             'member_username' => 'username',
             'category_title'  => 'cat_title',
             'xdg_type'        => 'cat_xdg_type',
             'name_legacy'     => 'cat_name_legacy',
             new Zend_Db_Expr("(select count(1) as num_files from ppload.ppload_files f where f.active = 1 and f.collection_id = project.ppload_collection_id group by f.collection_id) as num_files"),
             new Zend_Db_Expr("(select count(1) AS `amount` from `stat_downloads_24h` `s` WHERE s.collection_id = project.ppload_collection_id group by `s`.`collection_id`) as num_dls")
         ))->where('project.status = ?',
             Application_Model_Project::PROJECT_ACTIVE)->where('project.ppload_collection_id IS NOT NULL');
         $tableProjectSelect->having('num_files > 0');
 
         return $tableProjectSelect;
     }
 
     /**
      * @param Zend_Db_Table_Row_Abstract $project
      * @param array                      $previewPicSize
      * @param array                      $smallPreviewPicSize
      *
      * @return array
      * @throws Zend_Cache_Exception
      * @throws Zend_Exception
      */
     protected function getGalleryPictures($project, $previewPicSize, $smallPreviewPicSize)
     {
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         $cacheName = 'api_fetch_gallery_pics_' . $project->project_id;
 
         if (($previews = $cache->load($cacheName))) {
             return $previews;
         }
 
         $viewHelperImage = new Application_View_Helper_Image();
         $previewPics = array(
             'previewpic1' => $viewHelperImage->Image($project->image_small, $previewPicSize)
         );
         $smallPreviewPics = array(
             'smallpreviewpic1' => $viewHelperImage->Image($project->image_small, $smallPreviewPicSize)
         );
 
         $tableProject = new Application_Model_Project();
         $galleryPics = $tableProject->getGalleryPictureSources($project->project_id);
         if ($galleryPics) {
             $i = 2;
             foreach ($galleryPics as $galleryPic) {
                 $previewPics['previewpic' . $i] = $viewHelperImage->Image($galleryPic, $previewPicSize);
                 $smallPreviewPics['smallpreviewpic' . $i] = $viewHelperImage->Image($galleryPic, $smallPreviewPicSize);
                 $i++;
             }
         }
 
         $cache->save(array($previewPics, $smallPreviewPics), $cacheName);
 
         return array($previewPics, $smallPreviewPics);
     }
 
     /**
      * @param Zend_Db_Table_Row_Abstract $project
      * @param Ppload_Api                 $pploadApi
      * @param int                        $downloads
      * @param string                     $fileIds
      *
      * @return array
      * @throws Zend_Cache_Exception
      * @throws Zend_Exception
      */
     protected function getPPLoadInfo($project, $pploadApi, $downloads, $fileIds = null)
     {
         $downloadItems = array();
 
         if (empty($project->ppload_collection_id)) {
             return array($downloadItems, $downloads);
         }
 
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         $cacheName = 'api_ppload_collection_by_id_' . $project->ppload_collection_id;
 
         if ($fileIds && count($fileIds) > 0) {
             $cacheName .= '_' . md5($fileIds);
         }
 
-        if (false !== ($pploadInfo = $cache->load($cacheName))) {
-            return $pploadInfo;
-        }
+//        if (false !== ($pploadInfo = $cache->load($cacheName))) {
+//            return $pploadInfo;
+//        }
 
         $tagTable = new Application_Model_Tags();
 
         //if filter for fileIds
         //if($fileIds && count($fileIds) > 0) {
         //    $filesRequest['ids'] = $fileIds;
         //}
 
         //Load Files from DB
         $pploadFileTable = new Application_Model_DbTable_PploadFiles();
         $files = $pploadFileTable->fetchAllActiveFilesForFileInfo($project->ppload_collection_id, $fileIds);
 
         $sql = "    SELECT  *
                      FROM `ppload`.`ppload_files` `f` 
                      WHERE `f`.`collection_id` = :collection_id 
                      AND `f`.`ocs_compatible` = 1 
                      AND `f`.`active` = 1
                    ";
         if (null != $fileIds && count($fileIds) > 0) {
             $sql .= " and f.id in (" . $fileIds . ")";
         }
 
         $packageTypeTags = $tagTable->getAllFilePackageTypeTags();
         $architectureTags = $tagTable->getAllFileArchitectureTags();
         $plasmaversionTags = $tagTable->getAllFilePlasmaVersionTags();
 
         $i = 1;
         foreach ($files as $file) {
             //get File-Tags from DB
             $fileTagArray = $tagTable->getTagsAsArray($file['id'], $tagTable::TAG_TYPE_FILE);
 
             //create ppload download hash: secret + collection_id + expire-timestamp
             list($timestamp, $hash) = $this->createDownloadHash($project);
 
             //$tags = $this->_parseFileTags($file->tags);
 
             //collect tags
             $fileTags = "";
 
             //mimetype
             $fileTags .= "data##mimetype=" . $file['type'] . ",";
 
             //$fileTags .= "tags=".$fileTagArray->__toString().",";
 
 
             $tagTable = new Application_Model_Tags();
 
             foreach ($fileTagArray as $tag) {
                 if (in_array($tag, $packageTypeTags)) {
                     $fileTags .= "application##packagetype=" . $tag . ",";
                 } else {
                     if (in_array($tag, $architectureTags)) {
                         $fileTags .= "application##architecture=" . $tag . ",";
                     } else {
                         if (in_array($tag, $plasmaversionTags)) {
                             $version = null;
                             $pos = strrpos($tag, '-');
                             if ($pos) {
                                 $version = substr($tag, $pos + 1);
                             }
                             $fileTags .= "plasma##majorversion=" . $version . ",";
                         }
                     }
                 }
             }
 
             $fileTags = rtrim($fileTags, ",");
 
 
             $downloads += (int)$file['downloaded_count'];
 
-            $downloadLink =
-                PPLOAD_API_URI . 'files/download/id/' . $file['id'] . '/s/' . $hash . '/t/' . $timestamp . '/o/1/' . $file['name'];
+            $downloadLink = PPLOAD_API_URI . 'files/download/id/' . $file['id'] . '/s/' . $hash . '/t/' . $timestamp . '/o/1/' . $file['name'];
+
+            $payload = array('id' => $file['id'], 'o' => '1');
+            $downloadLink = Application_Model_PpLoad::createDownloadUrlJwt($project->ppload_collection_id, $file['name'], $payload);
+
             $downloadItems['downloadway' . $i] = 1;
             $downloadItems['downloadtype' . $i] = '';
             $downloadItems['downloadprice' . $i] = '0';
             $downloadItems['downloadlink' . $i] = $downloadLink;
             $downloadItems['downloadname' . $i] = $file['name'];
             $downloadItems['downloadsize' . $i] = round($file['size'] / 1024);
             $downloadItems['downloadgpgfingerprint' . $i] = '';
             $downloadItems['downloadgpgsignature' . $i] = '';
             $downloadItems['downloadpackagename' . $i] = '';
             $downloadItems['downloadrepository' . $i] = '';
             $downloadItems['download_package_type' . $i] = null;
             $downloadItems['download_package_arch' . $i] = null;
             //$downloadItems['downloadtags' . $i] = empty($tags['filetags']) ? '' : implode(',', $tags['filetags']);
             $downloadItems['downloadtags' . $i] = empty($fileTags) ? '' : $fileTags;
             $i++;
 
         }
 
         $cache->save(array($downloadItems, $downloads), $cacheName, array(), (self::CACHE_PERIOD_VALIDITY * 3600));
 
         return array($downloadItems, $downloads);
     }
 
     /**
      * @param $project
      *
      * @return array
      */
     protected function createDownloadHash($project)
     {
         //create ppload download hash: secret + collection_id + expire-timestamp
         $salt = PPLOAD_DOWNLOAD_SECRET;
         $collectionID = $project->ppload_collection_id;
         $timestamp = time() + (3600 * self::DOWNLOAD_PERIOD_VALIDITY);
         $hash = md5($salt . $collectionID . $timestamp);
 
         return array($timestamp, $hash);
     }
 
     /**
      * @param array      $previewPicSize
      * @param array      $smallPreviewPicSize
      * @param Ppload_Api $pploadApi
      * @param boolean    $debugMode Is debug mode
      *
+     * @param bool       $nocache
      * @return array
+     * @throws Zend_Auth_Adapter_Exception
+     * @throws Zend_Auth_Storage_Exception
      * @throws Zend_Cache_Exception
      * @throws Zend_Db_Select_Exception
+     * @throws Zend_Db_Statement_Exception
      * @throws Zend_Exception
      */
     protected function fetchCategoryContent(
         $previewPicSize,
         $smallPreviewPicSize,
         $pploadApi,
         $debugMode,
         $nocache = false
     ) {
         $limit = 10; // 1 - 100
         $offset = 0;
 
         $tableProject = new Application_Model_Project();
         $tableProjectSelect = $this->_buildProjectSelect($tableProject, true);
 
         $storeTags = Zend_Registry::isRegistered('config_store_tags') ? Zend_Registry::get('config_store_tags') : null;
 
-        /*
-        if ($storeTags) {
-            $tableProjectSelect->join(array(
-                'tags' => new Zend_Db_Expr('(SELECT DISTINCT project_id FROM stat_project_tagids WHERE tag_id in ('
-                    . implode(',', $storeTags) . '))')
-            ), 'project.project_id = tags.project_id', array());
-        }
-         *
-         */
-
         if ($storeTags) {
             $tagList = $storeTags;
             //build where statement für projects
             $selectAnd = $tableProject->select();
             $selectAndFiles = $tableProject->select();
 
             $tableTags = new Application_Model_Tags();
             $possibleFileTags = $tableTags->fetchAllFileTagNamesAsArray();
 
             if (!is_array($tagList)) {
                 $tagList = array($tagList);
             }
 
             foreach ($tagList as $item) {
                 #and
                 $selectAnd->where('find_in_set(?, tag_ids)', $item);
                 if (in_array($item, $possibleFileTags)) {
                     $selectAndFiles->where('find_in_set(?, tag_ids)', $item);
                 } else {
                     $selectAndFiles->where("1=1");
                 }
             }
             $tableProjectSelect->where(implode(' ', $selectAnd->getPart('where')));
         }
 
         if (false === empty($this->_params['categories'])) {
             // categories parameter: values separated by ","
             // legacy OCS API compatible: values separated by "x"
             if (strpos($this->_params['categories'], ',') !== false) {
                 $catList = explode(',', $this->_params['categories']);
             } else {
                 $catList = explode('x', $this->_params['categories']);
             }
 
             $modelProjectCategories = new Application_Model_DbTable_ProjectCategory();
             $allCategories = array_merge($catList, $modelProjectCategories->fetchChildIds($catList));
             $tableProjectSelect->where('project.project_category_id IN (?)', $allCategories);
         }
 
         if (!empty($this->_params['xdg_types'])) {
             // xdg_types parameter: values separated by ","
             $xdgTypeList = explode(',', $this->_params['xdg_types']);
             $tableProjectSelect->where('category.xdg_type IN (?)', $xdgTypeList);
         }
 
         $hasSearchPart = false;
         if (false === empty($this->_params['search'])) {
             foreach (explode(' ', $this->_params['search']) as $keyword) {
                 if ($keyword && strlen($keyword) > 2) {
                     $tableProjectSelect->where('project.title LIKE ? OR project.description LIKE ?', "%$keyword%");
                     $hasSearchPart = true;
                 }
             }
         }
 
         if (false === empty($this->_params['tags'])) {
             // tags parameter: values separated by "," and | for or filter
             if (strpos($this->_params['tags'], ',') !== false) {
                 $tagList = explode(',', $this->_params['tags']);
             } else {
                 $tagList = array($this->_params['tags']);
             }
 
-            //build where statement für projects
+            //build where statement for projects
             $selectAnd = $tableProject->select();
             $selectAndFiles = $tableProject->select();
 
             $tableTags = new Application_Model_Tags();
             $possibleFileTags = $tableTags->fetchAllFileTagNamesAsArray();
 
             foreach ($tagList as $item) {
                 if (strpos($item, '|') !== false) {
                     #or
                     $selectOr = $tableProject->select();
                     $selectOrFiles = $tableProject->select();
                     $tagListOr = explode('|', $item);
                     foreach ($tagListOr as $itemOr) {
                         $selectOr->orWhere('find_in_set(?, tags)', $itemOr);
                         if (in_array($itemOr, $possibleFileTags)) {
                             $selectOrFiles->orWhere('find_in_set(?, tags)', $itemOr);
                         }
                     }
                     $selectAnd->where(implode(' ', $selectOr->getPart('where')));
 
                     $selectAndFiles->where(implode(' ', $selectOrFiles->getPart('where')));
                 } else {
                     #and
                     $selectAnd->where('find_in_set(?, tags)', $item);
                     if (in_array($item, $possibleFileTags)) {
                         $selectAndFiles->where('find_in_set(?, tags)', $item);
                     } else {
                         $selectAndFiles->where("1=1");
                     }
                 }
 
             }
             $tableProjectSelect->where(implode(' ', $selectAnd->getPart('where')));
         } else {
             $selectAndFiles = $tableProject->select();
             $selectAndFiles->where("1=1");
         }
 
         if (!empty($this->_params['ghns_excluded'])) {
             $tableProjectSelect->where('project.ghns_excluded = ?', $this->_params['ghns_excluded']);
         }
 
         if (!empty($this->_params['user'])) {
             $tableProjectSelect->where('member.username = ?', $this->_params['user']);
         }
 
         if (!empty($this->_params['external'])) {
         }
 
         if (!empty($this->_params['distribution'])) {
             // distribution parameter: comma separated list of ids
         }
-        
+
         if (!empty($this->_params['showfavorites'])) {
-            $identity = null;
-            $credential = null;
-            if (!empty($this->_params['login'])) {
-                $identity = $this->_params['login'];
-            }
-            if (!empty($this->_params['password'])) {
-                $credential = $this->_params['password'];
-            }
-            $this->_authenticateUser($identity, $credential, true);
-            
-            $auth = Zend_Auth::getInstance();
-            $authData = $auth->getStorage()->read();
-            
-            if(!isset($this->_authData) && isset($authData)) {
-                $this->_authData = $authData;
-            }
-            
             // if = 1 then show auth users favorites
-            if($this->_params['showfavorites'] == 1 && null != $this->_authData) {
+            if ($this->_params['showfavorites'] == 1 && null != $this->_authData) {
                 $member_id = $this->_authData->member_id;
                 $tableProjectSelect->where('project_follower.member_id = ?', $member_id);
-                $tableProjectSelect->setIntegrityCheck(false)->join('project_follower', 'project.project_id = project_follower.project_id', array('project_follower_id'));
+                $tableProjectSelect->setIntegrityCheck(false)->join('project_follower',
+                    'project.project_id = project_follower.project_id', array('project_follower_id'));
             }
         }
 
         if (!empty($this->_params['license'])) {
             // license parameter: comma separated list of ids
         }
 
         if (!empty($this->_params['sortmode'])) {
             // sortmode parameter: new|alpha|high|down
             switch (strtolower($this->_params['sortmode'])) {
                 case 'new':
                     $tableProjectSelect->order('project.created_at DESC');
 
                     break;
                 case 'alpha':
                     $tableProjectSelect->order('project.title ASC');
 
                     break;
                 case 'high':
                     $tableProjectSelect->order('laplace_score DESC');
                     $tableProjectSelect->order('project.created_at DESC');
 
                     break;
                 case 'down':
                     $tableProjectSelect->order('num_dls DESC');
                     $tableProjectSelect->order('project.created_at DESC');
 
                     break;
                 default:
                     break;
             }
         }
 
         if (isset($this->_params['pagesize'])
             && ctype_digit((string)$this->_params['pagesize'])
             && $this->_params['pagesize'] > 0
             && $this->_params['pagesize'] < 101) {
             $limit = $this->_params['pagesize'];
         }
 
         if (isset($this->_params['page'])
             && ctype_digit((string)$this->_params['page'])) {
             // page parameter: the first page is 0
             $offset = $limit * $this->_params['page'];
         }
 
         $tableProjectSelect->limit($limit, $offset);
 
-        
+
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         $storeName = Zend_Registry::get('store_config')->name;
-        $cacheName = 'api_fetch_category_' . md5($tableProjectSelect->__toString() . '_' . $selectAndFiles->__toString() . '_' . $storeName);
-        $cacheNameCount = 'api_fetch_category_' . md5($tableProjectSelect->__toString() . '_' . $selectAndFiles->__toString() . '_' . $storeName) . '_count';
+        $cacheName = 'api_fetch_category_' . md5($tableProjectSelect->__toString() . '_' . $selectAndFiles->__toString() . '_' . $storeName . '_' . $this->_format);
+        $cacheNameCount = 'api_fetch_category_' . md5($tableProjectSelect->__toString() . '_' . $selectAndFiles->__toString() . '_' . $storeName . '_' . $this->_format) . '_count';
         $contentsList = false;
         $count = 0;
         $isFromCache = false;
-        
+
         //ignore cache, if param nocache is set
-        if($nocache == true) {
+        if ($nocache == true) {
             $projects = $tableProject->fetchAll($tableProjectSelect);
             $counter = $tableProject->getAdapter()->fetchRow('select FOUND_ROWS() AS counter');
             $count = $counter['counter'];
 
             if (count($projects) > 0) {
                 $contentsList = $this->_buildContentList($previewPicSize, $smallPreviewPicSize, $pploadApi, $projects,
                     implode(' ', $selectAndFiles->getPart('where')));
             } else {
                 $contentsList = array();
             }
         } else {
             if (false === $hasSearchPart) {
                 $contentsList = $cache->load($cacheName);
                 $count = $cache->load($cacheNameCount);
             }
 
             if (false == $contentsList) {
                 $projects = $tableProject->fetchAll($tableProjectSelect);
                 $counter = $tableProject->getAdapter()->fetchRow('select FOUND_ROWS() AS counter');
                 $count = $counter['counter'];
 
                 if (count($projects) > 0) {
-                    $contentsList = $this->_buildContentList($previewPicSize, $smallPreviewPicSize, $pploadApi, $projects,
+                    $contentsList = $this->_buildContentList($previewPicSize, $smallPreviewPicSize, $pploadApi,
+                        $projects,
                         implode(' ', $selectAndFiles->getPart('where')));
                     if (false === $hasSearchPart) {
                         $cache->save($contentsList, $cacheName, array(), 900);
                         $cache->save($count, $cacheNameCount, array(), 900);
                     }
                 } else {
                     $contentsList = array();
                 }
             } else {
                 $isFromCache = true;
             }
         }
 
         if ($this->_format == 'json') {
             $response = array(
                 'status'       => 'ok',
                 'statuscode'   => 100,
                 'message'      => '',
                 'totalitems'   => $count,
                 'itemsperpage' => $limit,
                 'data'         => $contentsList
             );
         } else {
             $response = array(
                 'meta' => array(
                     'status'       => array('@text' => 'ok'),
                     'statuscode'   => array('@text' => 100),
                     'message'      => array('@text' => ''),
                     'totalitems'   => array('@text' => $count),
                     'itemsperpage' => array('@text' => $limit)
                 ),
                 'data' => array()
             );
             if (count($contentsList) > 0) {
                 $response['data']['content'] = $contentsList;
             }
         }
 
 
         if ($debugMode) {
             $response['meta']['debug']['is_from_cache_now'] = $isFromCache;
             $response['meta']['debug']['select_project'] = $tableProjectSelect->__toString();
             $response['meta']['debug']['select_files'] = $selectAndFiles->__toString();
             $response['meta']['debug']['store_client_name'] = $this->_getNameForStoreClient();
             $response['meta']['debug']['param_store_client_name'] = $this->getParam('domain_store_id');
             $response['meta']['debug']['hello'] = 'World';
         }
 
         return $response;
     }
 
     /**
-     * @param $previewPicSize
-     * @param $smallPreviewPicSize
-     * @param $pploadApi
-     * @param $projects
+     * @param        $previewPicSize
+     * @param        $smallPreviewPicSize
+     * @param        $pploadApi
+     * @param        $projects
      * @param String $selectWhereString
-
      * @return array
      * @throws Zend_Cache_Exception
      * @throws Zend_Exception
      */
     protected function _buildContentList(
         $previewPicSize,
         $smallPreviewPicSize,
         $pploadApi,
         $projects,
         $selectWhereString
     ) {
         $contentsList = array();
         $helperTruncate = new Application_View_Helper_Truncate();
         $selectWhereString = ' AND ' . $selectWhereString;
         foreach ($projects as $project) {
             $project->description =
                 $helperTruncate->truncate(Application_Model_BBCode::renderHtml(Application_Model_HtmlPurify::purify($project->description)),
                     300);
 
             $categoryXdgType = '';
             if (!empty($project->xdg_type)) {
                 $categoryXdgType = $project->xdg_type;
             }
 
             $created = date('c', strtotime($project->created_at));
             $changed = date('c', strtotime($project->changed_at));
 
             $previewPage = $this->_uriScheme . '://' . $this->_config['website'] . '/p/' . $project->project_id;
 
             list($previewPics, $smallPreviewPics) = $this->getGalleryPictures($project, $previewPicSize,
                 $smallPreviewPicSize);
 
             $downloads = $project->count_downloads_hive;
 
             //Get Files from OCS-API
             //get the list of file-ids from tags-filter
             $fileIds = "";
             $filesList = array();
             $tableTags = new Application_Model_Tags();
             $filesList = $tableTags->getFilesForTags($project->project_id, $selectWhereString);
 
             //if there is a tag filter and we have found any files, skip this project
             if ($selectWhereString <> ' AND (1=1)' && (empty($filesList) || count($filesList) == 0)) {
                 //echo "No files found for project ".$project->project_id;
                 continue;
             }
 
             foreach ($filesList as $file) {
                 $fileIds .= $file['file_id'] . ',';
             }
             $fileIds = rtrim($fileIds, ",");
 
             //var_dump($fileIds);
 
             list($downloadItems, $downloads) = $this->getPPLoadInfo($project, $pploadApi, $downloads, $fileIds);
 
             //If no files available, do not show this project
             if (empty($downloadItems)) {
                 continue; // jump to next product
             }
 
             $score = $project->laplace_score;
             $score = round($score / 10, 0);
 
             $projTags = "";
             //special for plasma-version-tags
             if (!empty($project->tags)) {
                 //get File-Tags from Product
                 $fileTagArray = explode(',', $project->tags);
                 //collect tags
                 $projTags = "";
 
                 $tagTable = new Application_Model_Tags();
                 $plasmaversionTags = $tagTable->getAllFilePlasmaVersionTags();
                 foreach ($fileTagArray as $tag) {
                     if (in_array($tag, $plasmaversionTags)) {
                         $version = null;
                         $pos = strrpos($tag, '-');
                         if ($pos) {
                             $version = substr($tag, $pos + 1);
                         }
                         $projTags .= "plasma##majorversion=" . $version . ",";
                     } else {
                         $projTags .= $tag . ",";
                     }
                 }
 
                 $projTags = rtrim($projTags, ",");
             }
 
             if ($this->_format == 'json') {
                 $contentsList[] = array(
                                       'details'       => 'summary',
                                       'id'            => $project->project_id,
                                       'name'          => $project->title,
                                       'version'       => $project->version,
                                       'typeid'        => $project->project_category_id,
                                       'typename'      => $project->cat_title,
                                       'xdg_type'      => $categoryXdgType,
                                       'language'      => '',
                                       'personid'      => $project->member_username,
                                       'created'       => $created,
                                       'changed'       => $changed,
                                       'downloads'     => $downloads,
                                       'score'         => $score,
                                       'summary'       => '',
                                       'description'   => $project->description,
                                       'comments'      => $project->count_comments,
                                       'ghns_excluded' => $project->ghns_excluded,
                                       'preview1'      => $previewPage,
                                       'detailpage'    => $previewPage,
                                       'tags'          => $projTags
                                   ) + $previewPics + $smallPreviewPics + $downloadItems;
             } else {
                 foreach ($previewPics as $key => $value) {
                     $previewPics[$key] = array('@text' => $value);
                 }
                 foreach ($smallPreviewPics as $key => $value) {
                     $smallPreviewPics[$key] = array('@text' => $value);
                 }
                 if ($downloadItems) {
                     foreach ($downloadItems as $key => $value) {
                         $downloadItems[$key] = array('@text' => $value);
                     }
                 }
                 $contentsList[] = array(
                                       'details'       => 'summary',
                                       'id'            => array('@text' => $project->project_id),
                                       'name'          => array('@text' => $project->title),
                                       'version'       => array('@text' => $project->version),
                                       'typeid'        => array('@text' => $project->project_category_id),
                                       'typename'      => array('@text' => $project->cat_title),
                                       'xdg_type'      => array('@text' => $categoryXdgType),
                                       'language'      => array('@text' => ''),
                                       'personid'      => array('@text' => $project->member_username),
                                       'created'       => array('@text' => $created),
                                       'changed'       => array('@text' => $changed),
                                       'downloads'     => array('@text' => $downloads),
                                       'score'         => array('@text' => $score),
                                       'summary'       => array('@text' => ''),
                                       'description'   => array('@cdata' => $project->description),
                                       'comments'      => array('@text' => $project->count_comments),
                                       'ghns_excluded' => array('@text' => $project->ghns_excluded),
                                       'preview1'      => array('@text' => $previewPage),
                                       'detailpage'    => array('@text' => $previewPage),
                                       'tags'          => array('@text' => $projTags)
                                   ) + $previewPics + $smallPreviewPics + $downloadItems;
             }
         }
 
         return $contentsList;
     }
 
     public function contentdownloadAction()
     {
-        $this->_authenticateUser();
-
         $project = null;
         $file = null;
 
         if ($this->getParam('contentid')) {
             $tableProject = new Application_Model_Project();
             $project = $tableProject->fetchRow($tableProject->select()
                                                             ->where('project_id = ?', $this->getParam('contentid'))
-                                                            ->where('status = ?',Application_Model_Project::PROJECT_ACTIVE));
+                                                            ->where('status = ?',
+                                                                Application_Model_Project::PROJECT_ACTIVE));
         }
 
         if (!$project) {
             $this->_sendErrorResponse(101, 'content not found');
         }
 
         if (((int)$this->getParam('itemid')) === 0) {
             $this->_sendErrorResponse(103, 'content item not found');
         }
 
         if ($project->ppload_collection_id
             && $this->getParam('itemid')
             && ctype_digit((string)$this->getParam('itemid'))) {
             $tagTable = new Application_Model_Tags();
 
             //Load Files from DB
             $pploadFileTable = new Application_Model_DbTable_PploadFiles();
             $files = $pploadFileTable->fetchActiveFileWithIndex($project->ppload_collection_id,
                 $this->getParam('itemid'));
 
             if (empty($files)) {
                 $this->_sendErrorResponse(103, 'content item not found');
             }
 
             $packageTypeTags = $tagTable->getAllFilePackageTypeTags();
             $architectureTags = $tagTable->getAllFileArchitectureTags();
             $plasmaversionTags = $tagTable->getAllFilePlasmaVersionTags();
 
             $fileTags = "";
             foreach ($files as $file) {
                 //get File-Tags from DB
                 $fileTagArray = $tagTable->getTagsAsArray($file['id'], $tagTable::TAG_TYPE_FILE);
 
                 //create ppload download hash: secret + collection_id + expire-timestamp
                 list($timestamp, $hash) = $this->createDownloadHash($project);
 
                 //$tags = $this->_parseFileTags($file->tags);
 
                 //collect tags
                 $fileTags = "";
 
                 //mimetype
                 $fileTags .= "data##mimetype=" . $file['type'] . ",";
 
                 //$fileTags .= "tags=".$fileTagArray->__toString().",";
 
 
                 $tagTable = new Application_Model_Tags();
 
                 foreach ($fileTagArray as $tag) {
                     if (in_array($tag, $packageTypeTags)) {
                         $fileTags .= "application##packagetype=" . $tag . ",";
                     } else {
                         if (in_array($tag, $architectureTags)) {
                             $fileTags .= "application##architecture=" . $tag . ",";
                         } else {
                             if (in_array($tag, $plasmaversionTags)) {
                                 $version = null;
                                 $pos = strrpos($tag, '-');
                                 if ($pos) {
                                     $version = substr($tag, $pos + 1);
                                 }
                                 $fileTags .= "plasma##majorversion=" . $version . ",";
                             }
                         }
                     }
                 }
 
                 $fileTags = rtrim($fileTags, ",");
 
-                $downloadLink =
-                    PPLOAD_API_URI . 'files/download/id/' . $file['id'] . '/s/' . $hash . '/t/' . $timestamp . '/o/1/' . $file['name'];
+                $downloadLink = PPLOAD_API_URI . 'files/download/id/' . $file['id'] . '/s/' . $hash . '/t/' . $timestamp . '/o/1/' . $file['name'];
+
+                $payload = array('id' => $file['id'], 'o' => '1');
+                $downloadLink = Application_Model_PpLoad::createDownloadUrlJwt($project->ppload_collection_id, $file['name'], $payload);
 
                 if ($this->_format == 'json') {
                     $response = array(
                         'status'     => 'ok',
                         'statuscode' => 100,
                         'message'    => '',
                         'data'       => array(
                             array(
                                 'details'               => 'download',
                                 'downloadway'           => 1,
                                 'downloadlink'          => $downloadLink,
                                 'mimetype'              => $file['type'],
                                 'gpgfingerprint'        => '',
                                 'gpgsignature'          => '',
                                 'packagename'           => '',
                                 'repository'            => '',
                                 'download_package_type' => null,
                                 'download_package_arch' => null,
                                 'downloadtags'          => empty($fileTags) ? '' : $fileTags
                             )
                         )
                     );
                 } else {
                     $response = array(
                         'meta' => array(
                             'status'     => array('@text' => 'ok'),
                             'statuscode' => array('@text' => 100),
                             'message'    => array('@text' => '')
                         ),
                         'data' => array(
                             'content' => array(
                                 'details'               => 'download',
                                 'downloadway'           => array('@text' => 1),
                                 'downloadlink'          => array('@text' => $downloadLink),
                                 'mimetype'              => array('@text' => $file['type']),
                                 'gpgfingerprint'        => array('@text' => ''),
                                 'gpgsignature'          => array('@text' => ''),
                                 'packagename'           => array('@text' => ''),
                                 'repository'            => array('@text' => ''),
                                 'download_package_type' => array('@text' => ''),
                                 'download_package_arch' => array('@text' => ''),
                                 'downloadtags'          => array('@text' => empty($fileTags) ? '' : $fileTags)
                             )
                         )
                     );
                 }
 
             }
 
         }
 
         $this->_sendResponse($response, $this->_format);
     }
 
     public function contentpreviewpicAction()
     {
-        $this->_authenticateUser();
-
         $project = null;
 
         if ($this->getParam('contentid')) {
             $tableProject = new Application_Model_Project();
             $project = $tableProject->fetchRow($tableProject->select()
                                                             ->where('project_id = ?', $this->getParam('contentid'))
-                                                            ->where('status = ?',Application_Model_Project::PROJECT_ACTIVE));
+                                                            ->where('status = ?',
+                                                                Application_Model_Project::PROJECT_ACTIVE));
         }
 
         if (!$project) {
             //$this->_sendErrorResponse(101, 'content not found');
             header('Location: ' . $this->_config['icon']);
             exit;
         }
 
         $previewPicSize = array(
             'width'  => 100,
             'height' => 100
         );
 
         if (!empty($this->_params['size'])
             && strtolower($this->_params['size']) == 'medium') {
             $previewPicSize = array(
                 'width'  => 770,
                 'height' => 540
             );
         }
 
         $viewHelperImage = new Application_View_Helper_Image();
         $previewPicUri = $viewHelperImage->Image($project->image_small, $previewPicSize);
 
         header('Location: ' . $previewPicUri);
         exit;
     }
 
     public function commentsAction()
     {
         if ($this->_format == 'json') {
             $response = array(
                 'status'     => 'ok',
                 'statuscode' => 100,
                 'message'    => '',
                 'data'       => array()
             );
         } else {
             $response = array(
                 'meta' => array(
                     'status'     => array('@text' => 'ok'),
                     'statuscode' => array('@text' => 100),
                     'message'    => array('@text' => ''),
                 ),
                 'data' => array()
             );
         }
 
         $commentType = (int)$this->getParam('comment_type', -1);
         if ($commentType != self::COMMENT_TYPE_CONTENT) {
             $this->_sendResponse($response, $this->_format);
         }
 
         $contentId = (int)$this->getParam('content_id', null);
         if (empty($contentId)) {
             $this->_sendResponse($response, $this->_format);
         }
 
         $page = (int)$this->getParam('page', 0) + 1;
         $pagesize = (int)$this->getParam('pagesize', 10);
 
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         $cacheName = 'api_fetch_comments_' . md5("{$commentType}, {$contentId}");
 
         if (false === ($comments = $cache->load($cacheName))) {
             $modelComments = new Application_Model_ProjectComments();
             $comments = $modelComments->getCommentsHierarchic($contentId);
             $cache->save($comments, $cacheName, array(), 900);
         }
 
         if ($comments->count() == 0) {
             $this->_sendResponse($response, $this->_format);
         }
 
         $comments->setCurrentPageNumber($page);
         $comments->setItemCountPerPage($pagesize);
 
         if ($page > $comments->getPages()->pageCount) {
             $this->_sendResponse($response, $this->_format);
         }
 
         $response['data'] = $this->_buildCommentList($comments->getCurrentItems());
 
         $this->_sendResponse($response, $this->_format);
     }
 
     /**
      * @param Traversable $currentItems
      *
      * @return array
      */
     protected function _buildCommentList($currentItems)
     {
         $commentList = array();
         foreach ($currentItems as $current_item) {
             if ($this->_format == 'json') {
                 $comment = array(
                     'id'         => $current_item['comment_id'],
                     'subject'    => $current_item['comment_subject'],
                     'text'       => Application_Model_HtmlPurify::purify($current_item['comment_text_trim']),
                     'childcount' => $current_item['childcount'],
                     'user'       => $current_item['username'],
                     'date'       => date('c', strtotime($current_item['comment_created_at'])),
                     'score'      => $current_item['comment_score']
                 );
                 if ($current_item['childcount'] > 0) {
                     $comment['children'] = $this->_buildCommentList($current_item['children']);
                 }
             } else {
                 $comment = array(
                     'id'         => array('@text' => $current_item['comment_id']),
                     'subject'    => array('@text' => $current_item['comment_subject']),
                     'text'       => array('@text' => Application_Model_HtmlPurify::purify($current_item['comment_text_trim'])),
                     'childcount' => array('@text' => $current_item['childcount']),
                     'user'       => array('@text' => $current_item['username']),
                     'date'       => array('@text' => date('c', strtotime($current_item['comment_created_at']))),
                     'score'      => array('@text' => $current_item['comment_score'])
                 );
                 if ($current_item['childcount'] > 0) {
                     $comment['children'] = $this->_buildCommentList($current_item['children']);
                 }
             }
             $commentList[] = array('comment' => $comment);
         }
 
         return $commentList;
     }
 
     /**
      * @return void
      * @throws Zend_Exception
      */
     public function voteAction()
     {
         //20191215 enable rating
         //$this->_sendErrorResponse(405, "method not allowed");
-        
-        
-        
-        
-                
+
+
         if ($this->_authenticateUser(null, null, true)) {
-            
+
             Zend_Registry::get('logger')->info('Start Voting');
-            
-            if($this->hasParam('contentid') && $this->hasParam('vote')) { 
+
+            if ($this->hasParam('contentid') && $this->hasParam('vote')) {
                 $score = (int)$this->getParam('vote');
-                
-                if($score >= 0 && $score <= 100) { 
+
+                if ($score >= 0 && $score <= 100) {
                     $msg = '';
-                    
-                    if($this->hasParam('msg')) {
+
+                    if ($this->hasParam('msg')) {
                         $msg = trim($this->getParam('msg'));
                     }
-                    
+
                     $project_id = (int)$this->getParam('contentid');
                     $status = 'ok';
                     $message = '';
-                    
-                    Zend_Registry::get('logger')->info('ProjectId: '. $project_id . ', Vote: ' . $score);
+
+                    Zend_Registry::get('logger')->info('ProjectId: ' . $project_id . ', Vote: ' . $score);
 
                     if ($score > 0) {
                         $score = $this->roundFunction($score) / 10;
                     }
-                    
-                    if($score == 0) {
+
+                    if ($score == 0) {
                         $score = 1;
                     }
 
-                    if ($msg != '' && strlen($msg)>0) { 
+                    if ($msg != '' && strlen($msg) > 0) {
                         $message = $msg;
                     } else {
                         //Get message via score
                         switch ($score) {
                             case 1:
                                 $message = '1 ugh';
                                 break;
                             case 2:
                                 $message = '2 really bad';
                                 break;
                             case 3:
                                 $message = '3 bad';
                                 break;
                             case 4:
                                 $message = '4 soso';
                                 break;
                             case 5:
                                 $message = '5 average';
                                 break;
                             case 6:
                                 $message = '6 okay';
                                 break;
                             case 7:
                                 $message = '7 good';
                                 break;
                             case 8:
                                 $message = '8 great';
                                 break;
                             case 9:
                                 $message = '9 excellent';
                                 break;
                             case 10:
                                 $message = '10 the best';
                                 break;
 
                             default:
                                 break;
                         }
                     }
 
-                    Zend_Registry::get('logger')->info('Comment: '. $message);
+                    Zend_Registry::get('logger')->info('Comment: ' . $message);
 
                     //$product = $this->loadProductInfo((int)$this->getParam('p'));
                     $member_id = $this->_authData->member_id;
 
-                    Zend_Registry::get('logger')->info('MemberId: '. $member_id);
+                    Zend_Registry::get('logger')->info('MemberId: ' . $member_id);
 
                     /*
                     if($this->view->product->member_id==$this->view->member_id)
                     {
                         $this->_helper->json(array('status' => 'error', 'message' => ' Not allowed. ', 'data' => ''));
-                        return;   
+                        return;
                     }
-                     * 
+                     *
                      */
-                    
+
                     try {
-                        $modelRating = new Application_Model_DbTable_ProjectRating(array('db' => 'db2'));                
+                        $modelRating = new Application_Model_DbTable_ProjectRating(array('db' => 'db2'));
                         $modelRating->scoreForProject($project_id, $member_id, $score, $message);
                     } catch (Exception $exc) {
-                        Zend_Registry::get('logger')->err('Error Saving Vote: '. $exc->getMessage() . PHP_EOL . $exc->getTraceAsString());
+                        Zend_Registry::get('logger')->err('Error Saving Vote: ' . $exc->getMessage() . PHP_EOL . $exc->getTraceAsString());
                         $this->_sendErrorResponse(500, $exc->getMessage() . PHP_EOL . $exc->getTraceAsString());
                     }
 
 
                     /*
-                    if($this->view->product){                    
+                    if($this->view->product){
                         //Send a notification to the owner
-                        $this->sendNotificationToOwner($this->view->product, Default_Model_HtmlPurify::purify($this->getParam('msg')));                   
+                        $this->sendNotificationToOwner($this->view->product, Default_Model_HtmlPurify::purify($this->getParam('msg')));
                     }
-                     * 
+                     *
                      */
 
                     if ($this->_format == 'json') {
                         $response = array(
                             'status'     => $status,
                             'statuscode' => 100,
                             'message'    => $message,
                             'data'       => '',
-                            'score' =>$score
+                            'score'      => $score
                         );
                     } else {
                         $response = array(
                             'meta' => array(
                                 'status'     => array('@text' => $status),
                                 'statuscode' => array('@text' => 100),
                                 'message'    => array('@text' => $message),
-                                'score' => array('@text' => $score)
+                                'score'      => array('@text' => $score)
                             ),
                             'data' => array('@text' => '')
                         );
                     }
 
-                    Zend_Registry::get('logger')->info('Done: '. json_encode($response));
+                    Zend_Registry::get('logger')->info('Done: ' . json_encode($response));
 
                     //$this->_helper->json(array('status' => $status, 'message' => $message, 'data' => '','laplace_score' =>$this->view->product->laplace_score));
 
                     $this->_sendResponse($response, $this->_format);
                 } else {
-            
+
                     $this->_sendErrorResponse(101, 'please specify all mandatory fields');
-            
+
                 }
-                
+
             } else {
-            
+
                 $this->_sendErrorResponse(101, 'please specify all mandatory fields');
-            
+
             }
         } else {
             $this->_sendErrorResponse(102, 'login not valid');
         }
-        
+
+    }
+
+    /**
+     * @param $n
+     * @return float|int
+     */
+    function roundFunction($n)
+    {
+        // Smaller multiple
+        $a = (int)($n / 10) * 10;
+
+        // Larger multiple
+        $b = ($a + 10);
+
+        // Return of closest of two
+        return ($n - $a > $b - $n) ? $b : $a;
     }
 
     /**
      * @param string $fileTags
      *
      * @return array
      */
     protected function _parseFileTags($fileTags)
     {
         $tags = explode(',', $fileTags);
         $parsedTags = array(
             'link'           => '',
             'licensetype'    => '',
             'packagetypeid'  => '',
             'architectureid' => '',
             'packagearch'    => '',
             'filetags'       => ''
         );
         foreach ($tags as $tag) {
             $tag = trim($tag);
             if (strpos($tag, 'link##') === 0) {
                 $parsedTags['link'] = urldecode(str_replace('link##', '', $tag));
             } else {
                 if (strpos($tag, 'licensetype-') === 0) {
                     $parsedTags['licensetype'] = str_replace('licensetype-', '', $tag);
                 } else {
                     if (strpos($tag, 'packagetypeid-') === 0) {
                         $parsedTags['packagetypeid'] = str_replace('packagetypeid-', '', $tag);
                     } else {
                         if (strpos($tag, 'architectureid-') === 0) {
                             $parsedTags['architectureid'] = str_replace('architectureid-', '', $tag);
                         } else {
                             if (strpos($tag, 'packagearch-') === 0) {
                                 $parsedTags['packagearch'] = str_replace('packagearch-', '', $tag);
                             } else {
                                 if (strpos($tag, '@@@') === 0) {
                                     $strTags = substr($tag, 3, strlen($tag) - 2);
                                     $parsedTags['filetags'] = explode('@@', $strTags);
                                 }
                             }
                         }
                     }
                 }
             }
         }
 
         return $parsedTags;
     }
-    
-    
-    function roundFunction($n)  
-    {  
-        // Smaller multiple  
-        $a = (int)($n / 10) * 10;  
-
-        // Larger multiple  
-        $b = ($a + 10);  
-
-        // Return of closest of two  
-        return ($n - $a > $b - $n) ? $b : $a;  
-    }  
 
 }
diff --git a/application/models/Authorization.php b/application/models/Authorization.php
index cb67aa9..bc1b739 100644
--- a/application/models/Authorization.php
+++ b/application/models/Authorization.php
@@ -1,368 +1,368 @@
 <?php
 
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 class Application_Model_Authorization
 {
 
     const LOGIN_REMEMBER_ME = 'infinity';
 
     /** @var string */
     protected $_dataModelName;
     /** @var  Zend_Db_Table_Abstract */
     protected $_dataTable;
 
     /** @var  string */
     protected $_loginMethod;
     /** @var  object */
     protected $_authUserData;
 
     /**
      * @param string $_dataModelName
      */
     function __construct($_dataModelName = 'Application_Model_DbTable_Member')
     {
         $this->_dataModelName = $_dataModelName;
         $this->_dataTable = new $this->_dataModelName;
     }
 
     /**
      * @throws Zend_Session_Exception
      * @throws Zend_Exception
      */
     public function logout()
     {
         $auth = Zend_Auth::getInstance();
         $auth->clearIdentity();
 
         $session = new Zend_Session_Namespace();
         $session->unsetAll();
         Zend_Session::forgetMe();
         //        Zend_Session::destroy();
 
         $modelRememberMe = new Application_Model_RememberMe();
         $modelRememberMe->deleteSession();
     }
 
     /**
      * @param string $userId
      * @param string $userSecret
      * @param bool   $setRememberMe
      * @param string $loginMethod
      *
      * @return Zend_Auth_Result
      * @throws Zend_Auth_Storage_Exception
      * @throws Zend_Session_Exception
      * @throws exception
      */
     public function authenticateUser($userId, $userSecret, $setRememberMe = false, $loginMethod = null)
     {
         if (false === empty($loginMethod)) {
             $this->_loginMethod = $loginMethod;
         }
 
         $authResult = $this->authenticateCredentials($userId, $userSecret, $loginMethod);
         if ($authResult->isValid()) {
             $this->updateRememberMe($setRememberMe);
             Zend_Session::regenerateId();
             $this->_storeAuthSessionData();
             $this->updateUserLastOnline('member_id', $this->_authUserData->member_id);
         }
 
         return $authResult;
     }
 
     /**
      * @param      $identity
      * @param      $credential
      * @param null $loginMethod
      *
      * @return Zend_Auth_Result
      * @throws Zend_Auth_Adapter_Exception
      * @throws Zend_Exception
      */
-    protected function authenticateCredentials($identity, $credential, $loginMethod = null)
+    public function authenticateCredentials($identity, $credential, $loginMethod = null)
     {
         /** @var Local_Auth_Adapter_Ocs $authAdapter */
         $authAdapter = Local_Auth_AdapterFactory::getAuthAdapter($identity, $credential, $loginMethod);
         $authAdapter->setIdentity($identity);
         $authAdapter->setCredential($credential);
         $authResult = $authAdapter->authenticate();
 
         if ($authResult->isValid()) {
             $this->_authUserData = $authAdapter->getResultRowObject(null, 'password');
         }
 
         return $authResult;
     }
 
     /**
      * @param bool $setRememberMe
      *
      * @throws Zend_Db_Statement_Exception
      * @throws Zend_Exception
      */
     public function updateRememberMe($setRememberMe = false)
     {
         $modelRememberMe = new Application_Model_RememberMe();
         if (false == $setRememberMe) {
             $modelRememberMe->deleteSession();
 
             return;
         }
         if ($modelRememberMe->hasValidCookie()) {
             $modelRememberMe->updateSession($this->_authUserData->member_id);
         } else {
             $modelRememberMe->createSession($this->_authUserData->member_id);
         }
     }
 
     /**
      * @throws Zend_Auth_Storage_Exception
      * @throws exception
      */
     protected function _storeAuthSessionData()
     {
         $extendedAuthData = $this->getExtendedAuthUserData($this->_authUserData);
 
         $auth = Zend_Auth::getInstance();
         $auth->getStorage()->write($extendedAuthData);
     }
 
     /**
      * @param object $authUserData
      *
      * @return object
      * @throws exception
      */
     protected function getExtendedAuthUserData($authUserData)
     {
         $extendedAuthUserData = new stdClass();
         if (isset($this->_loginMethod) AND $this->_loginMethod == self::LOGIN_REMEMBER_ME) {
             $modelMember = new Application_Model_Member();
             $memberData = $modelMember->fetchMemberData($authUserData->member_id);
             $extendedAuthUserData->external_id = $memberData->external_id;
             $extendedAuthUserData->username = $memberData->username;
             $extendedAuthUserData->roleId = $memberData->roleId;
             $extendedAuthUserData->avatar = $memberData->avatar;
             $extendedAuthUserData->profile_image_url = $memberData->profile_image_url;
             $extendedAuthUserData->is_active = $memberData->is_active;
             $extendedAuthUserData->is_deleted = $memberData->is_deleted;
             $extendedAuthUserData->roleName = $this->getRoleNameForUserRole($memberData->roleId);
         } else {
             $extendedAuthUserData->roleName = $this->getRoleNameForUserRole($authUserData->roleId);
         }
         $extendedAuthUserData->projects = $this->getProjectIdsForUser($authUserData->member_id);
 
         return (object)array_merge((array)$authUserData, (array)$extendedAuthUserData);
     }
 
     /**
      * @param int $roleId
      *
      * @return string
      * @throws exception
      */
     protected function getRoleNameForUserRole($roleId)
     {
         $database = Zend_Db_Table::getDefaultAdapter();
 
         $sql = "
                 SELECT `shortname`
                 FROM `member_role`
                 WHERE  `member_role_id` = ?;
         ";
         $sql = $database->quoteInto($sql, $roleId, 'INTEGER', 1);
         $resultSet = $database->query($sql)->fetchAll();
         if (count($resultSet) > 0) {
             return $resultSet[0]['shortname'];
         } else {
             throw new Exception('undefined member role');
         }
     }
 
     /**
      * @param int $identifier
      *
      * @return array
      * @throws Zend_Db_Statement_Exception
      */
     protected function getProjectIdsForUser($identifier)
     {
         $database = Zend_Db_Table::getDefaultAdapter();
         $sql = "
                 SELECT `p`.`project_id`
                 FROM `project` AS `p`
                 WHERE `p`.`member_id` = ?;
         ";
         $sql = $database->quoteInto($sql, $identifier, 'INTEGER', 1);
         $resultSet = $database->query($sql)->fetchAll();
 
         return $this->generateArrayWithKeyProjectId($resultSet);
     }
 
     /**
      * @param array $inputArray
      *
      * @return array
      */
     protected function generateArrayWithKeyProjectId($inputArray)
     {
         $arrayWithKeyProjectId = array();
         foreach ($inputArray as $element) {
             $arrayWithKeyProjectId[$element['project_id']] = $element;
         }
 
         return $arrayWithKeyProjectId;
     }
 
     /**
      * @param string     $identifier
      * @param string|int $identity
      *
      * @return int
      */
     public function updateUserLastOnline($identifier, $identity)
     {
         /** @var Zend_Db_Table_Abstract $dataTable */
         $dataTable = $this->_dataTable;
 
         return $dataTable->update(array('last_online' => new Zend_Db_Expr('NOW()')),
             $dataTable->getAdapter()->quoteIdentifier($identifier, true) . ' = ' . $identity);
     }
 
     /**
      * @return object
      */
     public function getAuthData()
     {
         return $this->_authUserData;
     }
 
     /**
      * @param int $identity
      *
      * @throws Zend_Auth_Storage_Exception
      * @throws exception
      */
     public function storeAuthSessionDataByIdentity($identity)
     {
         $authDataAll = $this->getAllAuthUserData('member_id', $identity);
 
         $auth = Zend_Auth::getInstance();
         $auth->getStorage()->write($authDataAll);
     }
 
     /**
      * @param string     $identifier
      * @param string|int $identity
      *
      * @return object
      * @throws exception
      */
     protected function getAllAuthUserData($identifier, $identity)
     {
         $this->_authUserData = $this->getAuthUserData($identifier, $identity);
 
         return $this->getExtendedAuthUserData($this->_authUserData);
     }
 
     /**
      * @param string     $identifier
      * @param string|int $identity
      *
      * @return object
-     * @throws Zend_Exception
      */
     protected function getAuthUserData($identifier, $identity)
     {
         $dataTable = $this->_dataTable;
-        $where = $dataTable->select()->where($dataTable->getAdapter()->quoteIdentifier($identifier, true) . ' = ?', $identity);
+        $where = $dataTable->select()->where($dataTable->getAdapter()->quoteIdentifier($identifier, true) . ' = ?',
+            $identity);
         $resultRow = $dataTable->fetchRow($where)->toArray();
         unset($resultRow['password']);
 
         return (object)$resultRow;
     }
 
     /**
      * @param string $identity
      *
      * @return null|object
-     * @throws Zend_Exception
      */
     public function getAuthUserDataFromUnverified($identity)
     {
         $sql = "
             SELECT `m`.*, `member_email`.`email_verification_value`, `member_email`.`email_checked`, `mei`.`external_id` 
             FROM `member_email`
             JOIN `member` AS `m` ON `m`.`member_id` = `member_email`.`email_member_id`
             LEFT JOIN `member_external_id` AS `mei` ON `mei`.`member_id` = `m`.`member_id`
             WHERE `member_email`.`email_deleted` = 0 AND `member_email`.`email_verification_value` = :verification AND `m`.`is_deleted` = 0
         ";
         $resultRow = $this->_dataTable->getAdapter()->fetchRow($sql, array('verification' => $identity));
         if ($resultRow) {
             unset($resultRow['password']);
 
             return (object)$resultRow;
         }
 
         return null;
     }
 
     /**
      * ppload and OCS
      *
      * @param string $identity
      * @param string $credential
      * @param string $loginMethod
      *
      * @return mixed
      * @throws Zend_Auth_Adapter_Exception
      * @throws Zend_Exception
      */
     public function getAuthDataFromApi($identity, $credential, $loginMethod = null)
     {
         $authResult = $this->authenticateCredentials($identity, $credential, $loginMethod);
 
         if ($authResult->isValid()) {
             Zend_Session::regenerateId();
             $this->_storeAuthSessionData();
+
             return $this->_authUserData;
         }
 
         return false;
     }
 
     /**
      * @param string     $identifier
      * @param string|int $identity
      *
      * @return int
      */
     public function removeAllCookieInformation($identifier, $identity)
     {
         $dataTable = new Application_Model_DbTable_Session();
         $where = $dataTable->getAdapter()->quoteInto($dataTable->getAdapter()->quoteIdentifier($identifier, true) . ' = ?', $identity);
 
         return $dataTable->delete($where);
     }
 
 }
\ No newline at end of file
diff --git a/application/models/DbTable/ProjectRating.php b/application/models/DbTable/ProjectRating.php
index 5a7f258..cebcab3 100644
--- a/application/models/DbTable/ProjectRating.php
+++ b/application/models/DbTable/ProjectRating.php
@@ -1,551 +1,550 @@
 <?php
 
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 class Application_Model_DbTable_ProjectRating extends Local_Model_Table
 {
 
     protected $_name = "project_rating";
 
     protected $_keyColumnsForRow = array('rating_id');
 
     protected $_key = 'rating_id';
 
 
     public static $options = array(1 => 'ugh', 2=>'really bad',3=>'bad',4=>'soso',5=>'average', 6=>'okay',7=>'good', 8=>'great', 9=>'excellent',10=>'the best');
 
     /**
      * @param int $project_id
      *
      * @return array
      */
     public function fetchRating($project_id)
     {
         $sql = "
                 SELECT
                    p.* ,
                    (SELECT `profile_image_url` FROM member m WHERE m.member_id = p.member_id)  AS profile_image_url,
                    (SELECT `username` FROM member m WHERE m.member_id = p.member_id)  AS username,
                    (SELECT `comment_text` FROM comments c WHERE c.comment_id = p.comment_id)  AS comment_text
                 FROM
                     project_rating p
                 WHERE
                     project_id = :project_id and rating_active = 1
                     ORDER BY created_at DESC
                 ;
                ";
         $result = $this->_db->query($sql, array('project_id' => $project_id))->fetchAll();
 
         return $result;
     }
 
     /**
      * @param int $project_id
      * @param int $member_id
      *
      * @return null
      */
     public function getProjectRateForUser($project_id, $member_id)
     {
         $sql = "
                 SELECT
                    p.* ,
                    (SELECT `comment_text` FROM comments c WHERE c.comment_id = p.comment_id)  AS comment_text
                 FROM
                     project_rating p
                 WHERE
                     project_id = :project_id
                     AND member_id = :member_id
                     AND rating_active = 1
                 ;
                ";
         $result = $this->_db->query($sql, array('project_id' => $project_id, 'member_id' => $member_id))->fetchAll();
         if (count($result) > 0) {
             return $result[0];
         } else {
             return null;
         }
     }
 
     /**
      * @param int $project_id
      *
      * @return mixed
      */
     public function fetchRatingCntActive($project_id)
     {
         $sql = "
                 SELECT
                    count(*)
                 FROM
                     project_rating p
                 WHERE
                     project_id = :project_id
                     AND rating_active = 1
                 ;
                ";
         $result = $this->_db->query($sql, array('project_id' => $project_id))->fetch();
 
         return $result;
     }
 
     public function getScore($project_id)
     {
           $sql = "select (sum(t.totalscore)+4*5)/(sum(t.count)+4)*100 as score
                     from
                     (
                         select project_id
                         ,user_like as likes
                         ,user_dislike as dislikes
                         ,1 as count
                         ,score as totalscore
                         from project_rating pr where pr.project_id=:project_id and pr.rating_active = 1
                     ) t
                 ";
 
         $result = $this->_db->query($sql, array('project_id' => $project_id))->fetchAll();
         if($result[0]['score'])
         {
             return $result[0]['score'];
          }else
          {
             return 500;
          }
     }
 
     // public function getScore($project_id)
     // {
     //       $sql = "select (sum(t.totalscore)+4*5)/(sum(t.count)+4)*100 as score
     //                 from
     //                 (
     //                     select project_id
     //                     ,user_like as likes
     //                     ,user_dislike as dislikes
     //                     ,1 as count
     //                     ,score as totalscore
     //                     from project_rating pr where pr.project_id=:project_id and pr.rating_active = 1
     //
     //                     union all
     //
     //                     select
     //                     project_id
     //                     ,user_like-6 as likes
     //                     ,user_dislike-6 as dislikes
     //                     ,user_like+user_dislike-12 as count
     //                     ,(user_like-6)*9+(user_dislike-6)*3 as totalscore
     //                     from project_rating pr
     //                     where pr.project_id=:project_id and pr.rating_active = 0 and user_dislike >=6 and user_like>=6
     //                 ) t
     //             ";
     //
     //     $result = $this->_db->query($sql, array('project_id' => $project_id))->fetchAll();
     //     if($result[0]['score'])
     //     {
     //         return $result[0]['score'];
     //      }else
     //      {
     //         return 500;
     //      }
     // }
 
     public function getScoreOld($project_id)
     {
         $sql = "
             SELECT laplace_score(sum(pr.user_like), sum(pr.user_dislike)) AS score
                 FROM project_rating AS pr
               WHERE pr.project_id = :project_id and (pr.rating_active = 1 or (rating_active=0 and user_like>1))
               ";
 
         $result = $this->_db->query($sql, array('project_id' => $project_id))->fetchAll();
         if($result[0]['score'])
         {
             return $result[0]['score'];
          }else
          {
             return 50;
          }
     }
 
     /**
      * @param int      $projectId
      * @param int      $member_id
      * @param int      $userRating
      * @param int|null $msg comment
      */
     public function rateForProject($projectId, $member_id, $userRating, $msg )
     {
         $msg = trim($msg);
         if(strlen($msg)<1) return;
         $userLikeIt = $userRating == 1 ? 1 : 0;
         $userDislikeIt = $userRating == 2 ? 1 : 0;
         $sql = 'select rating_id,comment_id from project_rating where project_id='.$projectId.'  and rating_active=1 and user_like='.$userLikeIt.' and user_dislike='.$userDislikeIt.' and member_id='.$member_id;
         $result = $this->getAdapter()->fetchRow($sql);
         $is_upvote=$userRating == 1 ? true : false;
         $is_exist = (($result!=null) && ($result['rating_id']!=null))?true:false;
         $modelComments = new Application_Model_ProjectComments(array('db' => 'db2'));
 
         // Zend_Registry::get('logger')->info($msg);
         if($is_exist){
             // this do cancel old rating .  remove rating & deactive
             $rating_id = $result['rating_id'];
             $comment_id = $result['comment_id'];
             $this->update(array('rating_active' => 0), 'rating_id=' . $rating_id);
             $modelComments->deactiveComment($comment_id);
             /*if($is_upvote){
                $this->rateUpdateProject($projectId,1);
             }else{
                 $this->rateUpdateProject($projectId,2);
             }*/
         }else{
             // this do first rating or change from - to + or + to -
             // first comment
             $data = array();
             $data['comment_target_id'] =$projectId;
             $data['comment_member_id'] =$member_id;
             $data['comment_parent_id'] = 0;
             $data['comment_text'] = $msg;
             $tableReplies = new Application_Model_ProjectComments(array('db' => 'db2'));
             $result = $tableReplies->save($data);
             $comment_id =  $result->comment_id;
 
             // get old rating
             $sql = 'select rating_id,comment_id,user_like from project_rating where project_id='.$projectId.'  and rating_active=1 and member_id='.$member_id;
             $result = $this->getAdapter()->fetchRow($sql);
             if($result!=null && $result['rating_id']!=null){
                  $this->update(array('rating_active' => 0), 'rating_id=' . $result['rating_id']);
                 $modelComments->deactiveComment($result['comment_id']);
             }
 
             if($userLikeIt==1)
             {
                 $score = 8;
             }else
             {
                 $score = 3;
             }
             $this->save(array(
                 'project_id'    => $projectId,
                 'member_id'     => $member_id,
                 'user_like'     => $userLikeIt,
                 'user_dislike'  => $userDislikeIt,
                 'score'         => $score,
                 'rating_active' => 1,
                 'comment_id'    => $comment_id
             ));
 
             // deal with project table ratings
             /*if(($result!=null) && ($result['rating_id']!=null)){
                 if($is_upvote){
                       $this->rateUpdateProject($projectId,5);
                 }else{
                      $this->rateUpdateProject($projectId,6);
                 }
             }else{
                 // first time rating
                 if($is_upvote){
                    $this->rateUpdateProject($projectId,3);
                 }else{
                     $this->rateUpdateProject($projectId,4);
                 }
             }*/
 
         }
 
 
     }
 
    
 
     /**
      * @param int      $projectId
      * @param int      $member_id
      * @param int      $userRating
      * @param int|null $msg comment
      */
     public function scoreForProject($projectId, $member_id, $score, $msg )
     {
         $msg = trim($msg);
         $score =(int)$score;
         if(strlen($msg)<1) return;
         if($score<6){
             $userLikeIt = 0;
             $userDislikeIt = 1;
         }else
         {
             $userLikeIt = 1;
             $userDislikeIt = 0;
         }
 
         $sql = 'select rating_id,comment_id from project_rating where project_id='.$projectId.'  and rating_active=1 and member_id='.$member_id;
         $result = $this->getAdapter()->fetchRow($sql);
 
         $is_upvote=$score<6 ? false : true;
 
         //$is_exist = (($result!=null) && ($result['rating_id']!=null))?true:false;
         $modelComments = new Application_Model_ProjectComments(array('db' => 'db2'));
 
         if($score<=0){
             // this do cancel old rating .  remove rating & deactive
             $rating_id = $result['rating_id'];
             $comment_id = $result['comment_id'];
             $this->update(array('rating_active' => 0), 'rating_id=' . $rating_id);
             $modelComments->deactiveComment($comment_id);
             /*if($is_upvote){
                $this->rateUpdateProject($projectId,1);
             }else{
                 $this->rateUpdateProject($projectId,2);
             }*/
         }else{
             // this do first rating or change from - to + or + to -
             // first comment
             $data = array();
             $data['comment_target_id'] =$projectId;
             $data['comment_member_id'] =$member_id;
             $data['comment_parent_id'] = 0;
             $data['comment_text'] = $msg;
-            $tableReplies = new Application_Model_ProjectComments(array('db' => 'db2'));
-            $result = $tableReplies->save($data);
+            $result = $modelComments->save($data);
             $comment_id =  $result->comment_id;
 
             // get old rating
             $sql = 'select rating_id,comment_id from project_rating where project_id='.$projectId.'  and rating_active=1 and member_id='.$member_id;
             $result = $this->getAdapter()->fetchRow($sql);
             if($result!=null && $result['rating_id']!=null){
                  $this->update(array('rating_active' => 0), 'rating_id=' . $result['rating_id']);
                 $modelComments->deactiveComment($result['comment_id']);
             }
 
 
             $this->save(array(
                 'project_id'    => $projectId,
                 'member_id'     => $member_id,
                 'user_like'     => $userLikeIt,
                 'user_dislike'  => $userDislikeIt,
                 'score'         => $score,
                 'rating_active' => 1,
                 'comment_id'    => $comment_id
             ));
 
             // deal with project table ratings
             /*if(($result!=null) && ($result['rating_id']!=null)){
                 if($is_upvote){
                       $this->rateUpdateProject($projectId,5);
                 }else{
                      $this->rateUpdateProject($projectId,6);
                 }
             }else{
                 // first time rating
                 if($is_upvote){
                    $this->rateUpdateProject($projectId,3);
                 }else{
                     $this->rateUpdateProject($projectId,4);
                 }
             }*/
 
         }
 
 
     }
 
       /**
      * @param int      $projectId
      * @param int      $member_id
      * @param int      $userRating
      * @param int|null $msg comment
      */
       /*
     public function rateForProject($projectId, $member_id, $userRating, $msg )
     {
         $msg = trim($msg);
         if(strlen($msg)<1) return;
         $userLikeIt = $userRating == 1 ? 1 : 0;
         $userDislikeIt = $userRating == 2 ? 1 : 0;
         $sql = 'select rating_id,comment_id from project_rating where project_id='.$projectId.'  and rating_active=1 and user_like='.$userLikeIt.' and user_dislike='.$userDislikeIt.' and member_id='.$member_id;
         $result = $this->getAdapter()->fetchRow($sql);
         $is_upvote=$userRating == 1 ? true : false;
         $is_exist = (($result!=null) && ($result['rating_id']!=null))?true:false;
         $modelComments = new Default_Model_ProjectComments();
 
         // Zend_Registry::get('logger')->info($msg);
         if($is_exist){
             // this do cancel old rating .  remove rating & deactive
             $rating_id = $result['rating_id'];
             $comment_id = $result['comment_id'];
             $this->update(array('rating_active' => 0), 'rating_id=' . $rating_id);
             $modelComments->deactiveComment($comment_id);
             if($is_upvote){
                $this->rateUpdateProject($projectId,1);
             }else{
                 $this->rateUpdateProject($projectId,2);
             }
         }else{
             // this do first rating or change from - to + or + to -
             // first comment
             $data = array();
             $data['comment_target_id'] =$projectId;
             $data['comment_member_id'] =$member_id;
             $data['comment_parent_id'] = 0;
             $data['comment_text'] = $msg;
             $tableReplies = new Default_Model_ProjectComments();
             $result = $tableReplies->save($data);
             $comment_id =  $result->comment_id;
 
             // get old rating
             $sql = 'select rating_id,comment_id,user_like from project_rating where project_id='.$projectId.'  and rating_active=1 and member_id='.$member_id;
             $result = $this->getAdapter()->fetchRow($sql);
             if($result!=null && $result['rating_id']!=null){
                  $this->update(array('rating_active' => 0), 'rating_id=' . $result['rating_id']);
                 $modelComments->deactiveComment($result['comment_id']);
             }
 
             $this->save(array(
                 'project_id'    => $projectId,
                 'member_id'     => $member_id,
                 'user_like'     => $userLikeIt,
                 'user_dislike'  => $userDislikeIt,
                 'rating_active' => 1,
                 'comment_id'    => $comment_id
             ));
 
             // deal with project table ratings
             if(($result!=null) && ($result['rating_id']!=null)){
                 if($is_upvote){
                       $this->rateUpdateProject($projectId,5);
                 }else{
                      $this->rateUpdateProject($projectId,6);
                 }
             }else{
                 // first time rating
                 if($is_upvote){
                    $this->rateUpdateProject($projectId,3);
                 }else{
                     $this->rateUpdateProject($projectId,4);
                 }
             }
 
         }
 
 
     }*/
 
     /*private function rateUpdateProject($projectId,$action)
     {
         // $action ==1 => $project->count_likes - 1
         // $action ==2 => $project->count_dislikes - 1
         // $action ==3 => $project->count_likes + 1
         // $action ==4 => $project->count_dislikes + 1
         // $action ==5 => $project->count_likes+1 and $project->count_dislikes - 1
         // $action ==6 => $project->count_likes-1 and $project->count_dislikes +1
          $projectTable = new Default_Model_Project();
          $project = $projectTable->fetchProductInfo($projectId);
          if($action==1)
          {
             $numLikes = (int)$project->count_likes - 1;
             $updatearray = array('count_likes' => $numLikes);
          }else if($action==2)
          {
             $numLikes = (int)$project->count_dislikes - 1;
             $updatearray = array('count_dislikes' => $numLikes);
          }else if($action==3)
          {
             $numLikes = (int)$project->count_likes +1;
             $updatearray = array('count_likes' => $numLikes);
          }else if($action==4)
          {
             $numLikes = (int)$project->count_dislikes +1;
             $updatearray = array('count_dislikes' => $numLikes);
          }else if($action==5)
          {
             $numdisLikes = (int)$project->count_dislikes -1;
             $numLikes = (int)$project->count_likes +1;
             $updatearray = array('count_dislikes' => $numdisLikes,'count_likes' => $numLikes);
          }else if($action==6)
          {
             $numdisLikes = (int)$project->count_dislikes +1;
             $numLikes = (int)$project->count_likes -1;
             $updatearray = array('count_dislikes' => $numdisLikes,'count_likes' => $numLikes);
          }
          $projectTable->update($updatearray, 'project_id = ' . $projectId);
     }
 */
 
     /**
      * @param int $memberId
      *
      * @return array returns array of affected rows. can be empty.
      */
     public function setDeletedByMemberId($memberId)
     {
         $sql = "
             UPDATE {$this->_name}
             SET rating_active = 0
             WHERE member_id = :member_id AND rating_active = 1
         ";
 
         $sqlAffectedRows =
             "SELECT rating_id, project_id, user_like, user_dislike FROM {$this->_name} WHERE member_id = :member_id AND rating_active = 1";
         $affectedRows = $this->_db->fetchAll($sqlAffectedRows, array('member_id' => $memberId));
 
         $result = $this->_db->query($sql, array('member_id' => $memberId))->execute();
         if ($result) {
             return $affectedRows;
         }
 
         return array();
     }
 
     public function getRatedForMember($member_id)
     {
         $sql = "
                      SELECT
                        r.user_like
                        ,r.user_dislike
                        ,r.rating_active
                        ,r.created_at rating_created_at
                        ,(select `comment_text` from comments c where c.comment_id = r.comment_id)  as comment_text
                        ,r.project_id
                        ,r.score
                         ,p.member_id as project_member_id
                         ,p.username as project_username
                         ,p.project_category_id
                         ,p.status
                         ,p.title
                         ,p.description
                         ,p.image_small
                         ,p.project_created_at
                         ,p.project_changed_at
                         ,p.laplace_score
                         ,p.cat_title
                         ,p.count_likes
                         ,p.count_dislikes
                     FROM
                         project_rating r
                     inner join stat_projects p on r.project_id = p.project_id and p.status = 100
                     WHERE
                         r.member_id = :member_id
                         and r.rating_active = 1
                     order by r.created_at desc
         ";
         $result = $this->_db->query($sql, array('member_id' => $member_id))->fetchAll();
         return $result;
     }
 
 }
diff --git a/application/models/Jwt.php b/application/models/Jwt.php
new file mode 100644
index 0000000..49eaee1
--- /dev/null
+++ b/application/models/Jwt.php
@@ -0,0 +1,72 @@
+<?php
+
+include_once APPLICATION_LIB . '/JWT.php';
+
+/**
+ *  ocs-webserver
+ *
+ *  Copyright 2016 by pling GmbH.
+ *
+ *    This file is part of ocs-webserver.
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Affero General Public License as
+ *    published by the Free Software Foundation, either version 3 of the
+ *    License, or (at your option) any later version.
+ *
+ *    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 Affero General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Affero General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Created: 10.10.2018
+ */
+class Application_Model_Jwt
+{
+
+    public static function encode($member_id)
+    {
+        $config = Zend_Registry::get('config')->settings->jwt;
+        $member_data = self::getMemberData($member_id);
+        $payload = self::buildPayload($member_data, $config);
+
+        return JWT::encode($payload, $config->secret, $algo = 'HS256');
+    }
+
+    private static function getMemberData($member_id)
+    {
+        $model = new Default_Model_Member();
+
+        return $model->fetchMemberData($member_id)->toArray();
+    }
+
+    private static function buildPayload($member_data, $config)
+    {
+        $date = new DateTime();
+        $interval = DateInterval::createFromDateString($config->expire->cookie);
+        $payload['exp'] = $date->add($interval)->getTimestamp();
+        $payload['vt'] = 4; //type=cookie_ltat
+        $payload['user'] = $member_data['external_id'];
+        $payload['hash'] = crc32($member_data['username'] . $member_data['mail'] . $member_data['password']);
+
+        return $payload;
+    }
+
+    public static function decode($jwt, $verify = true)
+    {
+        $config = Zend_Registry::get('config')->settings->jwt;
+
+        return JWT::decode($jwt, $config->secret, $verify);
+    }
+
+    public static function encodeFromArray(array $payload)
+    {
+        $config = Zend_Registry::get('config')->settings->jwt;
+
+        return JWT::encode($payload, $config->secret, $algo = 'HS256');
+    }
+
+}
\ No newline at end of file
diff --git a/application/models/Member.php b/application/models/Member.php
index 7d138e8..9172148 100644
--- a/application/models/Member.php
+++ b/application/models/Member.php
@@ -1,1328 +1,1369 @@
 <?php
 
 /**
  *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
 //use YoHang88\LetterAvatar\LetterAvatar;
 
 class Application_Model_Member extends Application_Model_DbTable_Member
 {
     const CASE_INSENSITIVE = 1;
 
+    public static function cleanAuthMemberForJson(array $authMember)
+    {
+        if (empty($authMember)) {
+            return $authMember;
+        }
+
+        $unwantedKeys = array(
+            'mail'              => 0,
+            'firstname'         => 0,
+            'lastname'          => 0,
+            'street'            => 0,
+            'zip'               => 0,
+            'phone'             => 0,
+            'paypal_mail'       => 0,
+            'gravatar_email'    => 0,
+            'source_pk'         => 0,
+            'source_id'         => 0,
+            'password_old'      => 0,
+            'password_type_old' => 0,
+            'username_old'      => 0,
+            'mail_old' => 0
+        );
+
+        $authMember = array_diff_key($authMember, $unwantedKeys);
+
+        return $authMember;
+    }
+
     /**
      * @param int    $count
      * @param string $orderBy
      * @param string $dir
      *
      * @return Zend_Db_Table_Rowset
      * @throws Zend_Exception
      */
     public function fetchNewActiveMembers($count = 100, $orderBy = 'created_at', $dir = 'DESC')
     {
         if (empty($count)) {
             return $this->generateRowSet($this->createRow());
         }
 
         $allowedDirection = array('desc' => true, 'asc' => true);
         if (false == isset($allowedDirection[strtolower($dir)])) {
             $dir = null;
         }
 
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         $cacheName = __FUNCTION__ . md5($count . $orderBy . $dir);
         $members = $cache->load($cacheName);
 
         if ($members) {
             return $members;
         } else {
 
             $sql = '
               SELECT count(*) AS `total_count`
               FROM `member`
               WHERE `is_active` = :activeVal
                  AND `type` = :typeVal
                AND `profile_image_url` <> :defaultImgUrl
                AND `profile_image_url` LIKE :likeImgUrl
           ';
 
             $resultCnt = $this->_db->fetchRow($sql, array(
                 'activeVal'     => Application_Model_Member::MEMBER_ACTIVE,
                 'typeVal'       => Application_Model_Member::MEMBER_TYPE_PERSON,
                 'defaultImgUrl' => 'hive/user-pics/nopic.png',
                 'likeImgUrl'    => 'hive/user-bigpics/0/%'
             ));
 
             $totalcnt = $resultCnt['total_count'];
 
             if ($totalcnt > $count) {
                 $offset = ' offset ' . rand(0, $totalcnt - $count);
             } else {
                 $offset = '';
             }
 
             $sql = '
                 SELECT *
                 FROM `member`
                 WHERE `is_active` = :activeVal
                    AND `type` = :typeVal
             	   AND `profile_image_url` <> :defaultImgUrl
                  AND `profile_image_url` LIKE :likeImgUrl
             ';
             //$sql .= ' ORDER BY ' . $this->_db->quoteIdentifier($orderBy) . ' ' . $dir;
 
             $sql .= ' LIMIT ' . $this->_db->quote($count, Zend_Db::INT_TYPE);
             $sql .= $offset;
 
             $resultMembers = $this->getAdapter()->query($sql, array(
                 'activeVal'     => Application_Model_Member::MEMBER_ACTIVE,
                 'typeVal'       => Application_Model_Member::MEMBER_TYPE_PERSON,
                 'defaultImgUrl' => 'hive/user-pics/nopic.png',
                 'likeImgUrl'    => 'hive/user-bigpics/0/%'
             ))->fetchAll();
 
             $resultSet = $this->generateRowSet($resultMembers);
 
             $cache->save($resultSet, $cacheName, array(), 14400);
 
             return $resultSet;
         }
     }
 
     /**
      * @param $data
      *
      * @return Zend_Db_Table_Rowset
      */
     protected function generateRowSet($data)
     {
         $classRowSet = $this->getRowsetClass();
 
         $returnRowSet = new $classRowSet(array(
             'table'    => $this,
             'rowClass' => $this->getRowClass(),
             'stored'   => true,
             'data'     => $data
         ));
 
         return $returnRowSet;
     }
 
     /**
      * @return array
      * @deprecated
      */
     public function getMembersForSelectList()
     {
         $selectArr =
             $this->_db->fetchAll("SELECT `member_id`,`username`,`firstname`, `lastname` FROM {$this->_name} WHERE is_active=1 AND is_deleted=0 ORDER BY username");
 
         $arrayModified = array();
 
         $arrayModified[0] = "Benutzer wählen";
         foreach ($selectArr as $item) {
             $tmpStr = ($item['firstname']) ? $item['firstname'] : "";
             $tmpStr .= ($item['lastname']) ? ", " . $item['lastname'] : "";
             $tmpStr = ($tmpStr != "") ? " (" . $tmpStr . ")" : "";
 
             $arrayModified[$item['member_id']] = stripslashes($item['username'] . $tmpStr);
         }
 
         return $arrayModified;
     }
 
     /**
      * @param int $member_id
      *
      * @param     $verification_value
      *
      * @return boolean returns true if successful
      * @throws Zend_Db_Statement_Exception
      */
     public function activateMemberFromVerification($member_id, $verification_value)
     {
         $sql = "
             UPDATE `member`
               STRAIGHT_JOIN `member_email` ON `member`.`member_id` = `member_email`.`email_member_id` AND `member_email`.`email_checked` IS NULL AND `member`.`is_deleted` = 0 AND `member_email`.`email_deleted` = 0
             SET `member`.`mail_checked` = 1, `member`.`is_active` = 1, `member`.`changed_at` = NOW(), `member_email`.`email_checked` = NOW()
             WHERE `member`.`member_id` = :memberId AND `member_email`.`email_verification_value` = :verificationValue;
         ";
         $stmnt = $this->_db->query($sql, array('memberId' => $member_id, 'verificationValue' => $verification_value));
 
         return $stmnt->rowCount() > 0 ? true : false;
     }
 
+    //User ist mind. 1 jahr alt, user ist supporter, user hat minimum 20 kommentare
+
     /**
      * @param int $member_id
      *
      * @throws Zend_Exception
      */
     public function setDeleted($member_id)
     {
         $updateValues = array(
             'is_active'  => 0,
             'is_deleted' => 1,
             'deleted_at' => new Zend_Db_Expr('Now()'),
         );
         $this->update($updateValues, $this->_db->quoteInto('member_id=?', $member_id, 'INTEGER'));
 
         $memberLog = new Application_Model_MemberDeactivationLog();
         $memberLog->logMemberAsDeleted($member_id);
 
 
         $this->setMemberProjectsDeleted($member_id);
         $this->setMemberCommentsDeleted($member_id);
         $this->setMemberRatingsDeleted($member_id);
         $this->setMemberReportingsDeleted($member_id);
         $this->setMemberEmailsDeleted($member_id);
         //$this->setMemberPlingsDeleted($member_id);
         //$this->removeMemberProjectsFromSearch($member_id);
         $this->setDeletedInMaterializedView($member_id);
         $this->setDeletedInSubSystems($member_id);
     }
 
-    //User ist mind. 1 jahr alt, user ist supporter, user hat minimum 20 kommentare
-
     private function setMemberProjectsDeleted($member_id)
     {
         $modelProject = new Application_Model_Project();
         $modelProject->setAllProjectsForMemberDeleted($member_id);
     }
 
     private function setMemberCommentsDeleted($member_id)
     {
         $modelComments = new Application_Model_ProjectComments();
         $modelComments->setAllCommentsForUserDeleted($member_id);
     }
 
     private function setMemberRatingsDeleted($member_id)
     {
         $modelRatings = new Application_Model_DbTable_ProjectRating();
         $affectedRows = $modelRatings->setDeletedByMemberId($member_id);
         if (false === empty($affectedRows)) {
             $modelProject = new Application_Model_DbTable_Project();
             $modelProject->deleteLikes($affectedRows);
         }
     }
 
     private function setMemberReportingsDeleted($member_id)
     {
         $modelReportsProject = new Application_Model_DbTable_ReportProducts();
         $modelReportsProject->setDeleteByMember($member_id);
         $modelReportsComments = new Application_Model_DbTable_ReportComments();
         $modelReportsComments->setDeleteByMember($member_id);
     }
 
     private function setMemberEmailsDeleted($member_id)
     {
         $modelEmail = new Application_Model_DbTable_MemberEmail();
         $modelEmail->setDeletedByMember($member_id);
     }
 
     private function setDeletedInMaterializedView($member_id)
     {
         $sql = "UPDATE `stat_projects` SET `status` = :new_status WHERE `member_id` = :member_id";
 
         $this->_db->query($sql,
             array('new_status' => Application_Model_DbTable_Project::PROJECT_DELETED, 'member_id' => $member_id))
                   ->execute();
     }
 
     private function setDeletedInSubSystems($member_id)
     {
-        
+
     }
 
     public function validDeleteMemberFromSpam($member_id)
     {
         $sql = 'SELECT 
               `m`.`created_at`
               , (`m`.`created_at`+ INTERVAL 12 MONTH < NOW()) `is_old`
               ,(SELECT count(1) FROM `comments` `c` WHERE `c`.`comment_member_id` = `m`.`member_id` AND `comment_active` = 1) `comments`
               ,(SELECT (DATE_ADD(max(`active_time`), INTERVAL 1 YEAR) > now()) FROM `support` `s`  WHERE `s`.`status_id` = 2  AND `s`.`member_id` =`m`.`member_id`) `is_supporter`
               FROM `member` `m` WHERE `member_id` = :member_id';
         $result = $this->_db->fetchRow($sql, array(
             'member_id' => $member_id,
         ));
         if ($result['is_supporter'] && $result['is_supporter'] == 1) {
             return false;
         }
         if ($result['is_old'] == 1 || $result['comments'] > 20) {
             return false;
         }
 
         return true;
     }
 
     /**
      * @param int $member_id
      *
      * @throws Zend_Db_Exception
      */
     public function setActivated($member_id)
     {
         $updateValues = array(
             'is_active'  => 1,
             'is_deleted' => 0,
             'changed_at' => new Zend_Db_Expr('Now()'),
             'deleted_at' => null
         );
 
         $this->update($updateValues, $this->_db->quoteInto('member_id=?', $member_id, 'INTEGER'));
 
         $memberLog = new Application_Model_MemberDeactivationLog();
         $memberLog->removeLogMemberAsDeleted($member_id);
 
         $this->setMemberProjectsActivated($member_id);
         $this->setMemberCommentsActivated($member_id);
         $this->setMemberEmailsActivated($member_id);
 
         $this->setActivatedInSubsystems($member_id);
 
         //$this->setMemberPlingsActivated($member_id);
     }
 
     private function setMemberProjectsActivated($member_id)
     {
         $modelProject = new Application_Model_Project();
         $modelProject->setAllProjectsForMemberActivated($member_id);
     }
 
     private function setMemberCommentsActivated($member_id)
     {
         $modelComment = new Application_Model_ProjectComments();
         $modelComment->setAllCommentsForUserActivated($member_id);
     }
 
     private function setMemberEmailsActivated($member_id)
     {
         $modelEmail = new Application_Model_DbTable_MemberEmail();
         $modelEmail->setActivatedByMember($member_id);
     }
 
     private function setActivatedInSubsystems($member_id)
     {
-        
+
     }
 
     /**
      * @param int  $member_id
      *
      * @param bool $onlyNotDeleted
      *
      * @return Zend_Db_Table_Row
      * @throws Zend_Db_Statement_Exception
      */
     public function fetchMemberData($member_id, $onlyNotDeleted = true)
     {
         if (null === $member_id) {
             return null;
         }
 
         $sql = '
                 SELECT `m`.*, `member_email`.`email_address` AS `mail`, IF(ISNULL(`member_email`.`email_checked`),0,1) AS `mail_checked`, `member_email`.`email_address`, `mei`.`external_id`, `mei`.`gitlab_user_id`
                 FROM `member` AS `m`
                 JOIN `member_email` ON `m`.`member_id` = `member_email`.`email_member_id` AND `member_email`.`email_primary` = 1
                 LEFT JOIN `member_external_id` AS `mei` ON `mei`.`member_id` = `m`.`member_id`
                 WHERE
                     (`m`.`member_id` = :memberId)
         ';
 
         if ($onlyNotDeleted) {
             $sql .= " AND (m.is_deleted = " . self::MEMBER_NOT_DELETED . ")";
         }
 
         $result = $this->getAdapter()->query($sql, array('memberId' => $member_id))->fetch();
 
         $classRow = $this->getRowClass();
 
         return new $classRow(array('table' => $this, 'stored' => true, 'data' => $result));
     }
 
+    /**
+     * @param int  $member_id
+     *
+     * @param bool $onlyNotDeleted
+     *
+     * @return Zend_Db_Table_Row
+     * @throws Zend_Db_Statement_Exception
+     */
+    public function fetchMemberDataByExternalId($external_id, $onlyNotDeleted = true)
+    {
+        if (null === $external_id) {
+            return null;
+        }
+
+        $sql = '
+                SELECT `m`.*, `member_email`.`email_address` AS `mail`, IF(ISNULL(`member_email`.`email_checked`),0,1) AS `mail_checked`, `member_email`.`email_address`, `mei`.`external_id`, `mei`.`gitlab_user_id`
+                FROM `member` AS `m`
+                JOIN `member_email` ON `m`.`member_id` = `member_email`.`email_member_id` AND `member_email`.`email_primary` = 1
+                JOIN `member_external_id` AS `mei` ON `mei`.`member_id` = `m`.`member_id`
+                WHERE
+                    (`mei`.`external_id` = :externalId)
+        ';
+
+        if ($onlyNotDeleted) {
+            $sql .= " AND (m.is_deleted = " . self::MEMBER_NOT_DELETED . ")";
+        }
+
+        $result = $this->getAdapter()->query($sql, array('externalId' => $external_id))->fetch();
+
+        $classRow = $this->getRowClass();
+
+        return new $classRow(array('table' => $this, 'stored' => true, 'data' => $result));
+    }
+
     /**
      * @param      $member_id
      * @param bool $onlyActive
      *
      * @return null|Zend_Db_Table_Row_Abstract
      * @throws Zend_Db_Statement_Exception
      */
     public function fetchMember($member_id, $onlyActive = true)
     {
         if (empty($member_id)) {
             return null;
         }
 
         $sql = "
                 SELECT `m`.*, `member_email`.`email_address` AS `mail`, IF(ISNULL(`member_email`.`email_checked`),0,1) AS `mail_checked`, `member_email`.`email_address`, `mei`.`external_id`
                 FROM `member` AS `m`
                 JOIN `member_email` ON `m`.`member_id` = `member_email`.`email_member_id` AND `member_email`.`email_primary` = 1
                 LEFT JOIN `member_external_id` AS `mei` ON `mei`.`member_id` = `m`.`member_id`
                 WHERE `m`.`member_id` = :memberId";
 
         if ($onlyActive) {
             $sql .= " AND `m`.`is_deleted` = " . self::MEMBER_NOT_DELETED . " AND `m`.`is_active` = " . self::MEMBER_ACTIVE;
         }
 
         $stmnt = $this->_db->query($sql, array('memberId' => $member_id));
 
         if ($stmnt->rowCount() == 0) {
             return null;
         }
 
         return $this->generateRowClass($stmnt->fetch());
     }
 
     /**
      * @param string $user_name
      *
      * @return Zend_Db_Table_Row
      */
     public function fetchMemberFromHiveUserName($user_name)
     {
         $sql = "
                 SELECT *
                 FROM `member`
         		WHERE `source_id` = :sourceId
                   AND `username` = :userName
                 ";
 
         return $this->_db->fetchRow($sql,
             array('sourceId' => Application_Model_Member::SOURCE_HIVE, 'userName' => $user_name));
     }
 
     /**
      * @param string $user_name
      *
      * @return Zend_Db_Table_Row
      */
     public function fetchMemberFromHiveUserId($user_id)
     {
         $sql = "
                 SELECT *
                 FROM `member`
         	WHERE `source_id` = :sourceId
                 AND `source_pk` = :userId
                 ";
 
-        return $this->_db->fetchRow($sql, array('sourceId' => Application_Model_Member::SOURCE_HIVE, 'userId' => $user_id));
+        return $this->_db->fetchRow($sql,
+            array('sourceId' => Application_Model_Member::SOURCE_HIVE, 'userId' => $user_id));
     }
 
     /**
      * @param int $member_id
      * @param int $limit
      *
      * @return Zend_Db_Table_Rowset
      */
     public function fetchFollowedMembers($member_id, $limit = null)
     {
         $sql = "
-                SELECT member_follower.member_id,
-                       member_follower.follower_id,
-                       member.*
-                FROM member_follower
-                LEFT JOIN member ON member_follower.member_id = member.member_id
-        		WHERE member_follower.follower_id = :followerId
-                  AND member.is_active = :activeVal
-                GROUP BY member_follower.member_id
-                ORDER BY max(member_follower.member_follower_id) DESC
+                SELECT `member_follower`.`member_id`,
+                       `member_follower`.`follower_id`,
+                       `member`.*
+                FROM `member_follower`
+                LEFT JOIN `member` ON `member_follower`.`member_id` = `member`.`member_id`
+        		WHERE `member_follower`.`follower_id` = :followerId
+                  AND `member`.`is_active` = :activeVal
+                GROUP BY `member_follower`.`member_id`
+                ORDER BY max(`member_follower`.`member_follower_id`) DESC
                 ";
 
         if (null != $limit) {
             $sql .= $this->_db->quoteInto(" limit ?", $limit, 'INTEGER');
         }
 
         $result = $this->_db->fetchAll($sql, array('followerId' => $member_id, 'activeVal' => self::MEMBER_ACTIVE));
 
         return $this->generateRowSet($result);
     }
 
     /**
      * @param int  $member_id
      * @param null $limit
      *
      * @return Zend_Db_Table_Rowset_Abstract
      */
     public function fetchFollowedProjects($member_id, $limit = null)
     {
         $sql = "
                 SELECT `project_follower`.`project_id`,
                         `project`.`title`,
                         `project`.`image_small`                                              
                 FROM `project_follower`
                   JOIN `project` ON `project_follower`.`project_id` = `project`.`project_id`                 
                   WHERE `project_follower`.`member_id` = :member_id
                   AND `project`.`status` = :project_status
                   AND `project`.`type_id` = 1               
                 ORDER BY `project_follower`.`project_follower_id` DESC
                 ";
 
         if (null != $limit) {
             $sql .= $this->_db->quoteInto(" limit ?", $limit, 'INTEGER');
         }
 
         $result =
             $this->_db->fetchAll($sql,
                 array('member_id' => $member_id, 'project_status' => Application_Model_Project::PROJECT_ACTIVE));
 
         return $this->generateRowSet($result);
     }
 
     public function fetchPlingedProjects($member_id, $limit = null)
     {
         $sql = "
                 SELECT project_category.title AS catTitle,
                        project.*,
         			   member.*,
     				   plings.*
                 FROM plings
                 LEFT JOIN project ON plings.project_id = project.project_id
                 LEFT JOIN project_category ON project.project_category_id = project_category.project_category_id
         		LEFT JOIN member ON project.member_id = member.member_id
         		WHERE plings.member_id = :member_id
     			  AND plings.status_id = 2
                   AND project.status = :project_status
                   AND project.type_id = 1
                 ORDER BY plings.create_time DESC
                 ";
 
         if (null != $limit) {
             $sql .= $this->_db->quoteInto(" limit ?", $limit, 'INTEGER');
         }
 
         $result =
             $this->_db->fetchAll($sql,
                 array('member_id' => $member_id, 'project_status' => Application_Model_Project::PROJECT_ACTIVE));
 
         return $this->generateRowSet($result);
     }
 
     public function fetchProjectsSupported($member_id, $limit = null)
     {
         $sql = "
                 SELECT `project_category`.`title` AS `catTitle`,
                        `project`.`project_id`,
                        `project`.`title`,
                        `project`.`image_small`,
                        `plings`.`member_id`,
                        `plings`.`amount`,
                        `plings`.`create_time`,
                        `member`.`profile_image_url`,
                        `member`.`username`
 
                 FROM `plings`
                 JOIN `project` ON `plings`.`project_id` = `project`.`project_id`
                 JOIN `project_category` ON `project`.`project_category_id` = `project_category`.`project_category_id`
                 JOIN `member` ON `plings`.`member_id` = `member`.`member_id`
                 WHERE `project`.`member_id` = :member_id
                   AND `plings`.`status_id` = 2
                   AND `project`.`status` = :project_status
                   AND `project`.`type_id` = 1
                 ORDER BY `plings`.`create_time` DESC
                 ";
 
         if (null != $limit) {
             $sql .= $this->_db->quoteInto(" limit ?", $limit, 'INTEGER');
         }
 
         $result =
             $this->_db->fetchAll($sql,
                 array('member_id' => $member_id, 'project_status' => Application_Model_Project::PROJECT_ACTIVE));
 
         return $this->generateRowSet($result);
     }
 
     /**
      * @param $userData
      *
      * @return array
      * @throws Exception
      */
     public function createNewUser($userData)
     {
         $uuidMember = Local_Tools_UUID::generateUUID();
 
         if (false == isset($userData['password'])) {
             throw new Exception(__METHOD__ . ' - user password is not set.');
         }
-        $userData['password'] = Local_Auth_Adapter_Ocs::getEncryptedPassword($userData['password'],Application_Model_DbTable_Member::SOURCE_LOCAL);
+        $userData['password'] = Local_Auth_Adapter_Ocs::getEncryptedPassword($userData['password'],
+            Application_Model_DbTable_Member::SOURCE_LOCAL);
         if (false == isset($userData['roleId'])) {
             $userData['roleId'] = self::ROLE_ID_DEFAULT;
         }
         if ((false == isset($userData['avatar'])) OR (false == isset($userData['profile_image_url']))) {
             $imageFilename = $this->generateIdentIcon($userData, $uuidMember);
             $userData['avatar'] = $imageFilename;
             $userData['profile_image_url'] = IMAGES_MEDIA_SERVER . '/cache/200x200-2/img/' . $imageFilename;
         }
         if (false == isset($userData['uuid'])) {
             $userData['uuid'] = $uuidMember;
         }
         if (false == isset($userData['mail_checked'])) {
             $userData['mail_checked'] = 0;
         }
 
         //email is allways lower case
         $userData['mail'] = strtolower(trim($userData['mail']));
 
         $newUser = $this->storeNewUser($userData)->toArray();
 
         $memberMail = $this->createPrimaryMailAddress($newUser);
         $externalId = $this->createExternalId($newUser['member_id']);
 
         $newUser['verificationVal'] = $memberMail->email_verification_value;
         $newUser['externalId'] = $externalId;
 
         return $newUser;
     }
 
     /**
      * @param $userData
      * @param $uuidMember
      *
      * @return string
      * @throws Exception
      */
     protected function generateIdentIcon($userData, $uuidMember)
     {
         /*require_once 'vendor/autoload.php';
         // $name = substr($userData['username'],0,1).' '.substr($userData['username'],1);
         $name = $userData['username'] . '  ';
         $avatar = new LetterAvatar($name, 'square', 400);
         $tmpImagePath = IMAGES_UPLOAD_PATH . 'tmp/' . $uuidMember . '.png';
         $avatar->saveAs($tmpImagePath, LetterAvatar::MIME_TYPE_PNG);
         $imageService = new Application_Model_DbTable_Image();
         $imageFilename = $imageService->saveImageOnMediaServer($tmpImagePath);
 
         return $imageFilename;*/
         return null;
     }
 
     /**
      * @param array $userData
      *
      * @return Zend_Db_Table_Row_Abstract
      */
     public function storeNewUser($userData)
     {
         $newUserData = $this->createRow($userData);
         $newUserData->save();
 
         //create a user specified main project in project table
         $projectId = $this->createPersonalProject($newUserData->toArray());
 
         //and save the id in member table
         $newUserData->main_project_id = $projectId;
         $newUserData->save();
 
         return $newUserData;
     }
 
     /**
      * @param array $userData
      *
      * @return mixed $projectId
      */
     protected function createPersonalProject($userData)
     {
         $tableProject = new Application_Model_Project();
         /** @var Application_Model_DbRow_Project $newPersonalProject */
         $newPersonalProject = $tableProject->createRow($userData);
         $newPersonalProject->uuid = Local_Tools_UUID::generateUUID();
         $newPersonalProject->project_category_id = $newPersonalProject::CATEGORY_DEFAULT_PROJECT;
         $newPersonalProject->status = $newPersonalProject::STATUS_PROJECT_ACTIVE;
         $newPersonalProject->image_big = $newPersonalProject::DEFAULT_AVATAR_IMAGE;
         $newPersonalProject->image_small = $newPersonalProject::DEFAULT_AVATAR_IMAGE;
         $newPersonalProject->creator_id = $userData['member_id'];
         $newPersonalProject->title = $newPersonalProject::PERSONAL_PROJECT_TITLE;
         $projectId = $newPersonalProject->save();
 
         return $projectId;
     }
 
     /**
      * @param array $newUser
      * @return Zend_Db_Table_Row_Abstract
      * @throws Zend_Db_Statement_Exception
      * @throws Zend_Db_Table_Exception
      * @throws Zend_Exception
      */
     private function createPrimaryMailAddress($newUser)
     {
         $modelEmail = new Application_Model_MemberEmail();
         $userMail = $modelEmail->saveEmailAsPrimary($newUser['member_id'], $newUser['mail'], $newUser['mail_checked']);
 
         return $userMail;
     }
 
     /**
      * @param int $member_id
      *
      * @return string
      */
     private function createExternalId($member_id)
     {
         $modelExternalId = new Application_Model_DbTable_MemberExternalId();
         $externalId = $modelExternalId->createExternalId($member_id);
 
         return $externalId;
     }
 
     public function fetchTotalMembersCount()
     {
         $sql = "
                 SELECT
                     count(1) AS `total_member_count`
                 FROM
                     `member`
                ";
 
         $result = $this->_db->fetchRow($sql);
 
         return $result['total_member_count'];
     }
 
     public function fetchTotalMembersInStoreCount()
     {
         $sql = "
                 SELECT
                     count(1) AS `total_member_count`
                 FROM
                     `member`
                ";
 
         $result = $this->_db->fetchRow($sql);
 
         return $result['total_member_count'];
     }
 
     /**
      * @param string $email
      *
      * @return null|Zend_Db_Table_Row_Abstract
      * @deprecated
      */
     public function fetchCheckedActiveLocalMemberByEmail($email)
     {
         $sel = $this->select()->where('mail=?', $email)->where('is_deleted = ?',
             Application_Model_DbTable_Member::MEMBER_NOT_DELETED)
                     ->where('is_active = ?', Application_Model_DbTable_Member::MEMBER_ACTIVE)
                     ->where('mail_checked = ?', Application_Model_DbTable_Member::MEMBER_MAIL_CHECKED)
                     ->where('login_method = ?', Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL);
 
         return $this->fetchRow($sel);
     }
 
     public function fetchEarnings($member_id, $limit = null)
     {
         $sql = "
                 SELECT `project_category`.`title` AS `catTitle`,
                        `project`.*,
                        `member`.*,
                        `plings`.*
                 FROM `plings`
                  JOIN `project` ON `plings`.`project_id` = `project`.`project_id`
                  JOIN `project_category` ON `project`.`project_category_id` = `project_category`.`project_category_id`
                  JOIN `member` ON `project`.`member_id` = `member`.`member_id`
                 WHERE `plings`.`status_id` = 2
                   AND `project`.`status` = :status
                   AND `project`.`type_id` = 1
                   AND `project`.`member_id` = :memberId
                 ORDER BY `plings`.`create_time` DESC
                 ";
 
         if (null != $limit) {
             $sql .= $this->_db->quoteInto(" limit ?", $limit, 'INTEGER');
         }
 
         $result = $this->_db->fetchAll($sql,
             array('memberId' => $member_id, 'status' => Application_Model_Project::PROJECT_ACTIVE));
 
         return $this->generateRowSet($result);
     }
 
     /**
      * Finds an active user by given username or email ($identity)
      * Returns an empty rowset when no user found.
      *
      * @param string $identity could be the username or users mail address
      * @param bool   $withLoginLocal
      *
      * @return Zend_Db_Table_Row_Abstract
      */
     public function findActiveMemberByIdentity($identity, $withLoginLocal = false)
     {
         $sqlName = "SELECT * FROM `member` WHERE `is_active` = :active AND `is_deleted` = :deleted AND `username` = :identity";
         $sqlMail = "SELECT * FROM `member` WHERE `is_active` = :active AND `is_deleted` = :deleted AND `mail` = :identity";
         if ($withLoginLocal) {
             $sqlName .= " AND login_method = '" . self::MEMBER_LOGIN_LOCAL . "'";
             $sqlMail .= " AND login_method = '" . self::MEMBER_LOGIN_LOCAL . "'";
         }
 
         // test identity as username
         $resultName = $this->getAdapter()->fetchRow($sqlName,
             array('active' => self::MEMBER_ACTIVE, 'deleted' => self::MEMBER_NOT_DELETED, 'identity' => $identity));
         if ((false !== $resultName) AND (count($resultName) > 0)) {
             return $this->generateRowClass($resultName);
         }
 
         // test identity as mail
         $resultMail = $this->getAdapter()->fetchRow($sqlMail,
             array('active' => self::MEMBER_ACTIVE, 'deleted' => self::MEMBER_NOT_DELETED, 'identity' => $identity));
         if ((false !== $resultMail) AND (count($resultMail) > 0)) {
             return $this->generateRowClass($resultMail);
         }
 
         return $this->createRow();
     }
 
     /**
      * @param string $username
      * @return mixed
      */
     public function findActiveMemberByName($username)
     {
         $sql = '
           select m.member_id,m.username,profile_image_url 
           from member m 
           where m.is_active=1 and m.is_deleted = 0 and m.username like "' . $username . '%"
           limit 10
       ';
         $result = $this->getAdapter()->fetchAll($sql);
 
         return $result;
     }
 
     /**
      * @param string $hash
      * @param bool   $only_active
      *
      * @return array | false
      */
     public function findMemberForMailHash($hash, $only_active = true)
     {
         $sql = "
             SELECT `m`.* 
             FROM `member_email` AS `me`
             JOIN `member` AS `m` ON `m`.`member_id` = `me`.`email_member_id`
             WHERE `me`.`email_hash` = :email_hash
         ";
 
         if ($only_active) {
             $sql .= " `m`.`is_active` = 1 AND `m`.`is_deleted` = 0";
         }
 
         $member = $this->getAdapter()->fetchRow($sql, array('email_hash' => $hash));
 
         if (empty($member)) {
             return false;
         }
 
         return $member;
     }
 
     /**
      * @param Zend_Db_Table_Row_Abstract $memberData
      *
      * @return bool
      */
     public function isHiveUser($memberData)
     {
         if (empty($memberData)) {
             return false;
         }
         //20180801 ronald: If a hive user change his password, he gets the ocs password type and we do
         //have to check against the old hive password style
         //if ($memberData->source_id == self::SOURCE_HIVE) {
         //    return true;
         //}
         if ($memberData->password_type == self::PASSWORD_TYPE_HIVE) {
             return true;
         }
 
         return false;
     }
 
     public function fetchActiveHiveUserByUsername($username)
     {
         $sql = 'SELECT * FROM member WHERE username = :username AND is_active = 1 AND member.source_id = 1 AND member.is_deleted = 0';
 
         $result = $this->getAdapter()->query($sql, array('username' => $username))->fetch();
 
         return $result;
     }
 
     /**
      * @param $username
      * @return int|null
      * @throws Zend_Db_Statement_Exception
      */
     public function fetchActiveUserByUsername($username)
     {
         $sql = 'SELECT DISTINCT `member`.`member_id`
                 FROM `member`
                 WHERE LOWER(`username`) = :username
                 AND `is_active` = 1 
                 AND `member`.`is_deleted` = 0';
 
         $result = $this->getAdapter()->query($sql, array('username' => strtolower($username)))->fetchAll();
 
         if ($result && count($result) > 0) {
             $member_id = (int)$result[0]['member_id'];
 
             return $member_id;
         }
 
         return null;
     }
 
     public function fetchCommentsCount($member_id)
     {
         $sql = "
                   SELECT
-                      count(1) AS count
+                      count(1) AS `count`
                   FROM
-                      comments 
-                  where comment_target_id <> 0 and comment_member_id = :member_id and comment_active = :comment_status
+                      `comments` 
+                  WHERE `comment_target_id` <> 0 AND `comment_member_id` = :member_id AND `comment_active` = :comment_status
                  ";
         $result = $this->_db->fetchRow($sql, array(
             'member_id'      => $member_id,
             'comment_status' => Application_Model_DbTable_Comments::COMMENT_ACTIVE
         ));
 
         return $result['count'];
     }
 
     /**
      * @param      $member_id
      * @param null $limit
      *
      * @return Zend_Paginator
      * @throws Zend_Paginator_Exception
      */
     public function fetchComments($member_id, $limit = null)
     {
         $result = $this->fetchCommentsList($member_id, $limit);
         if (count($result) > 0) {
             return new Zend_Paginator(new Zend_Paginator_Adapter_Array($result));
         } else {
             return new Zend_Paginator(new Zend_Paginator_Adapter_Array(array()));
         }
     }
 
     /**
      * @param      $member_id
      * @param null $limit
      *
      * @return Zend_Paginator
      * @throws Zend_Paginator_Exception
      */
     public function fetchCommentsList($member_id, $limit = null)
     {
         $sql = '
             SELECT
                 `comment_id`
                 ,`comment_text`
                 ,`member`.`member_id`
                 ,`member`.`profile_image_url`
                 ,`comment_created_at`
                 ,`stat_projects`.`username`
                 ,`stat_projects`.`project_member_id`
                 ,`comment_target_id`
                 ,`stat_projects`.`title`
                 ,`stat_projects`.`project_id`      
                 ,`stat_projects`.`laplace_score`
                 ,`stat_projects`.`count_likes`
                 ,`stat_projects`.`count_dislikes`
                 ,`stat_projects`.`image_small` 
                 ,`stat_projects`.`version`
                 ,`stat_projects`.`cat_title`
                 ,`stat_projects`.`count_comments`
                 ,`stat_projects`.`changed_at`
                 ,`stat_projects`.`created_at`        
             FROM `comments`
             INNER JOIN  `member` ON `comments`.`comment_member_id` = `member`.`member_id`
             INNER JOIN `stat_projects` ON `comments`.`comment_target_id` = `stat_projects`.`project_id` AND `comments`.`comment_type` = 0
             WHERE `comments`.`comment_active` = :comment_status
             AND `stat_projects`.`status` = :project_status
             AND `comments`.`comment_member_id` = :member_id
             ORDER BY `comments`.`comment_created_at` DESC
         ';
 
         if (isset($limit)) {
             $sql .= ' limit ' . (int)$limit;
         }
         $result = $this->_db->fetchAll($sql, array(
             'member_id'      => $member_id,
             'project_status' => Application_Model_DbTable_Project::PROJECT_ACTIVE,
             'comment_status' => Application_Model_DbTable_Comments::COMMENT_ACTIVE
         ));
 
         return $result;
     }
 
     public function fetchCntSupporters($member_id)
     {
         $sql = '
                 SELECT DISTINCT `plings`.`member_id` FROM `plings`
                  JOIN `project` ON `plings`.`project_id` = `project`.`project_id`                
                  JOIN `member` ON `project`.`member_id` = `member`.`member_id`
                 WHERE `plings`.`status_id` = 2
                   AND `project`.`status` = :project_status
                   AND `project`.`type_id` = 1
                   AND `project`.`member_id` = :member_id
             ';
         $result =
             $this->_db->fetchAll($sql,
                 array('member_id' => $member_id, 'project_status' => Application_Model_Project::PROJECT_ACTIVE));
 
         return count($result);
     }
 
     public function fetchSupporterDonationInfo($member_id)
     {
         /*$sql = 'SELECT max(active_time) AS active_time_max
                             ,min(active_time)  AS active_time_min
                             ,(DATE_ADD(max(active_time), INTERVAL 1 YEAR) > now()) AS issupporter
                             ,count(1)  AS cnt from support  where status_id = 2 AND type_id = 0 AND member_id = :member_id ';*/
         $sql = "
                 select 
                 member_id,
                 max(active_time_max) as active_time_max,
                 min(active_time_min) as active_time_min,
                 max(is_valid) as issupporter,
                 count(1) AS cnt
                 from v_support
                 where member_id = :member_id
         ";
         $result = $this->getAdapter()->fetchRow($sql, array('member_id' => $member_id));
 
         return $result;
     }
 
     public function fetchSupporterSubscriptionInfo($member_id)
     {
         $sql = 'SELECT create_time,amount,period,period_frequency from support  where status_id = 2 AND type_id = 1 
                 AND member_id = :member_id
                 ORDER BY create_time desc
                 LIMIT 1';
         $result = $this->getAdapter()->fetchRow($sql, array('member_id' => $member_id));
 
         return $result;
     }
 
     public function fetchSupporterSectionInfo($member_id)
     {
         $sql = "select GROUP_CONCAT(distinct c.name) sections from 
                 section_support s, support t , section c
                 where s.support_id = t.id and s.section_id = c.section_id
                 and  t.member_id = :member_id and t.status_id=2
                 and s.is_active = 1
                 order by c.order";
-        $result = $this->getAdapter()->fetchRow($sql, array('member_id' => $member_id));        
+        $result = $this->getAdapter()->fetchRow($sql, array('member_id' => $member_id));
+
         return $result;
     }
 
     public function fetchLastActiveTime($member_id)
     {
         $sql_page_views =
             "SELECT `created_at` AS `lastactive` FROM `stat_page_views` WHERE `member_id` = :member_id ORDER BY `created_at` DESC LIMIT 1";
-        $sql_activities = "SELECT `time` AS lastactive FROM activity_log WHERE member_id = :member_id ORDER BY `time` DESC LIMIT 1";
+        $sql_activities = "SELECT `time` AS `lastactive` FROM `activity_log` WHERE `member_id` = :member_id ORDER BY `time` DESC LIMIT 1";
 
         $result_page_views = $this->getAdapter()->fetchRow($sql_page_views, array('member_id' => $member_id));
         $result_activities = $this->getAdapter()->fetchRow($sql_activities, array('member_id' => $member_id));
 
         if (count($result_page_views) > 0 AND count($result_activities) > 0) {
             return $result_page_views['lastactive'] > $result_activities['lastactive'] ? $result_page_views['lastactive']
                 : $result_activities['lastactive'];
         }
         if (count($result_page_views) > count($result_activities)) {
             return $result_page_views['lastactive'];
         }
         if (count($result_activities) > count($result_page_views)) {
             return $result_activities['lastactive'];
         }
 
         return null;
     }
 
     /**
      * @param int $member_id
      *
      * @return array
      */
     public function fetchContributedProjectsByCat($member_id)
     {
         $projects = $this->fetchSupportedProjects($member_id);
         $catArray = array();
         if (count($projects) == 0) {
             return $catArray;
         }
 
         foreach ($projects as $pro) {
             $catArray[$pro->catTitle] = array();
         }
 
         $helperProductUrl = new Default_View_Helper_BuildProductUrl();
         foreach ($projects as $pro) {
             $projArr = array();
             $projArr['id'] = $pro->project_id;
             $projArr['name'] = $pro->title;
             $projArr['image'] = $pro->image_small;
             $projArr['url'] = $helperProductUrl->buildProductUrl($pro->project_id, '', null, true);
             $projArr['sumAmount'] = $pro->sumAmount;
             array_push($catArray[$pro->catTitle], $projArr);
         }
 
         return $catArray;
     }
 
     /**
      * @param int  $member_id
      * @param null $limit
      *
      * @return Zend_Db_Table_Rowset_Abstract
      */
     public function fetchSupportedProjects($member_id, $limit = null)
     {
         $sql = "
-                SELECT plings.project_id,                       
-                       project.title,
-                       project.image_small,                       
-                       project_category.title AS catTitle,                       
-                       (SELECT SUM(amount) FROM plings WHERE plings.project_id=project.project_id AND plings.status_id=2) AS sumAmount
-                FROM plings
-                 JOIN project ON plings.project_id = project.project_id
-                 JOIN project_category ON project.project_category_id = project_category.project_category_id                 
-                WHERE plings.status_id IN (2,3,4)
-                  AND plings.member_id = :member_id
-                  AND project.status = :project_status
-                  AND project.type_id = 1
-                GROUP BY plings.project_id
-                ORDER BY sumAmount DESC
+                SELECT `plings`.`project_id`,                       
+                       `project`.`title`,
+                       `project`.`image_small`,                       
+                       `project_category`.`title` AS `catTitle`,                       
+                       (SELECT SUM(`amount`) FROM `plings` WHERE `plings`.`project_id`=`project`.`project_id` AND `plings`.`status_id`=2) AS `sumAmount`
+                FROM `plings`
+                 JOIN `project` ON `plings`.`project_id` = `project`.`project_id`
+                 JOIN `project_category` ON `project`.`project_category_id` = `project_category`.`project_category_id`                 
+                WHERE `plings`.`status_id` IN (2,3,4)
+                  AND `plings`.`member_id` = :member_id
+                  AND `project`.`status` = :project_status
+                  AND `project`.`type_id` = 1
+                GROUP BY `plings`.`project_id`
+                ORDER BY `sumAmount` DESC
                 ";
 
         if (null != $limit) {
             $sql .= $this->_db->quoteInto(" limit ?", $limit, 'INTEGER');
         }
 
         $result =
             $this->_db->fetchAll($sql,
                 array('member_id' => $member_id, 'project_status' => Application_Model_Project::PROJECT_ACTIVE));
 
         return $this->generateRowSet($result);
     }
 
     /**
      * @param string $value
      * @param int    $test_case_sensitive
      * @param array  $omitMember
      * @param bool   $onlyActive
      *
      * @return array return an array of rows
      */
-    public function findUsername($value, $test_case_sensitive = self::CASE_INSENSITIVE, $omitMember = array(), $onlyActive = false)
-    {
+    public function findUsername(
+        $value,
+        $test_case_sensitive = self::CASE_INSENSITIVE,
+        $omitMember = array(),
+        $onlyActive = false
+    ) {
         $sql = "
             SELECT *
             FROM `member`
         ";
         if ($test_case_sensitive == self::CASE_INSENSITIVE) {
             $sql .= "WHERE LCASE(member.username) = LCASE(:username)";
         } else {
             $sql .= "WHERE member.username = :username";
         }
 
         if (count($omitMember) > 0) {
             $sql .= " AND member.member_id NOT IN (" . implode(',', $omitMember) . ")";
         }
 
         if ($onlyActive) {
             $sql .= " AND member.is_active = 1 and member.is_deleted = 0";
         }
 
         return $this->_db->fetchAll($sql, array('username' => $value));
     }
 
     /**
      * @param string $login
      *
      * @return int
      */
     public function generateUniqueUsername($login)
     {
         $sql = "SELECT COUNT(*) AS `counter` FROM `member` WHERE `username` REGEXP CONCAT(:user_name,'[_0-9]*$')";
         $result = $this->_db->fetchRow($sql, array('user_name' => $login));
 
         return $login . '_' . $result['counter'];
     }
 
     /**
      * @param int    $member_id
      * @param string $email
      *
      * @return bool
      * @throws Zend_Db_Statement_Exception
      */
     public function setActive($member_id, $email)
     {
         $sql = "
             UPDATE `member`
               STRAIGHT_JOIN `member_email` ON `member`.`member_id` = `member_email`.`email_member_id` AND `member_email`.`email_checked` IS NULL AND `member`.`is_deleted` = 0 AND `member_email`.`email_deleted` = 0
             SET `member`.`mail_checked` = 1, `member`.`is_active` = 1, `member`.`changed_at` = NOW(), `member_email`.`email_checked` = NOW()
             WHERE `member`.`member_id` = :memberId AND `member_email`.`email_address` = :mailAddress;
         ";
         $stmnt = $this->_db->query($sql, array('memberId' => $member_id, 'mailAddress' => $email));
 
         return $stmnt->rowCount() > 0 ? true : false;
     }
 
     /**
      * @param string $identity
      *
      * @return Zend_Db_Table_Row_Abstract
      */
     public function findActiveMemberByMail($identity)
     {
         $sqlMail = "
                     SELECT `m`.*, `me`.`email_address` AS `mail`, IF(ISNULL(`me`.`email_checked`),0,1) AS `mail_checked`
                     FROM `member` AS `m`
                     JOIN `member_email` AS `me` ON `me`.`email_member_id` = `m`.`member_id` AND `me`.`email_primary` = 1
                     WHERE `is_active` = :active AND `is_deleted` = :deleted AND `me`.`email_address` = :identity
         ";
 
         // test identity as mail
         $resultMail = $this->getAdapter()->fetchRow($sqlMail,
             array('active' => self::MEMBER_ACTIVE, 'deleted' => self::MEMBER_NOT_DELETED, 'identity' => $identity));
         if ((false !== $resultMail) AND (count($resultMail) > 0)) {
             return $this->generateRowClass($resultMail);
         }
 
         return $this->createRow();
     }
 
     public function getMembersAvatarOldAutogenerated($orderby = 'member_id desc', $limit = null, $offset = null)
     {
         $sql = "
                      SELECT * FROM `tmp_member_avatar_unknow` 
              ";
 
 
         if (isset($orderby)) {
             $sql = $sql . '  order by ' . $orderby;
         }
 
         if (isset($limit)) {
             $sql .= ' limit ' . (int)$limit;
         }
 
         if (isset($offset)) {
             $sql .= ' offset ' . (int)$offset;
         }
 
         $resultSet = $this->_db->fetchAll($sql);
 
         return $resultSet;
     }
 
     public function getMembersAvatarOldAutogeneratedTotalCount()
     {
         $sql = " 
                       select count(1) as cnt
                       from tmp_member_avatar_unknow 
         ";
         $result = $this->getAdapter()->query($sql, array())->fetchAll();
 
         return $result[0]['cnt'];
     }
 
     public function updateAvatarTypeId($member_id, $type_id)
     {
         $sql = "
                       update member set avatar_type_id = :type_id where member_id = :member_id
                    ";
         $this->getAdapter()->query($sql, array('type_id' => $type_id, 'member_id' => $member_id));
     }
 
     /**
      * @param $userData
      * @param $uuidMember
      *
      * @return string
      * @throws Exception
      */
     protected function generateIdentIcon_old($userData, $uuidMember)
     {
         $identIcon = new Local_Tools_Identicon();
         $tmpImagePath = IMAGES_UPLOAD_PATH . 'tmp/' . $uuidMember . '.png';
         imagepng($identIcon->renderIdentIcon(sha1($userData['mail']), 1100), $tmpImagePath);
 
         $imageService = new Application_Model_DbTable_Image();
         $imageFilename = $imageService->saveImageOnMediaServer($tmpImagePath);
 
         return $imageFilename;
     }
 
     /**
      * @param int $member_id
      *
      * @throws Exception
      * @deprecated since we're using solr server for searching
      */
     private function removeMemberProjectsFromSearch($member_id)
     {
         $modelProject = new Application_Model_Project();
         $memberProjects = $modelProject->fetchAllProjectsForMember($member_id);
         $modelSearch = new Application_Model_Search_Lucene();
         foreach ($memberProjects as $memberProject) {
             $product = array();
             $product['project_id'] = $memberProject->project_id;
             $product['project_category_id'] = $memberProject->project_category_id;
             $modelSearch->deleteDocument($product);
         }
     }
-
-    public static function cleanAuthMemberForJson(array $authMember)
-    {
-        if (empty($authMember)) {
-            return $authMember;
-        }
-
-        $unwantedKeys = array(
-            'mail' => 0,
-            'firstname' => 0,
-            'lastname' => 0,
-            'street' => 0,
-            'zip' => 0,
-            'phone' => 0,
-            'paypal_mail' => 0,
-            'gravatar_email' => 0,
-            'source_pk' => 0,
-            'source_id' => 0,
-            'password_old' => 0,
-            'password_type_old' => 0,
-            'username_old' => 0,
-            'mail_old' => 0
-        );
-
-        $authMember = array_diff_key($authMember, $unwantedKeys);
-
-        return $authMember;
-    }
 }
\ No newline at end of file
diff --git a/application/models/PpLoad.php b/application/models/PpLoad.php
new file mode 100644
index 0000000..bab8442
--- /dev/null
+++ b/application/models/PpLoad.php
@@ -0,0 +1,205 @@
+<?php
+
+/**
+ *  ocs-webserver
+ *
+ *  Copyright 2016 by pling GmbH.
+ *
+ *    This file is part of ocs-webserver.
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Affero General Public License as
+ *    published by the Free Software Foundation, either version 3 of the
+ *    License, or (at your option) any later version.
+ *
+ *    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 Affero General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Affero General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Created: 26.01.2017
+ */
+class Application_Model_PpLoad
+{
+    /**
+     * @inheritDoc
+     */
+    public function __construct()
+    {
+    }
+
+    public static function createDownloadUrl($collection_id, $file_name, array $params)
+    {
+        $valid_until = time() + 3600; // one hour valid
+        $hash = self::createDownloadHash($collection_id, $valid_until);
+        $url = PPLOAD_API_URI . 'files/download';
+        foreach ($params as $key => $param) {
+            $url .= '/' . $key . '/' . $param;
+        }
+
+        return $url . '/s/' . $hash . '/t/' . $valid_until . '/' . $file_name;
+    }
+
+    /**
+     * @param int $collection_id
+     * @param int $valid_until
+     * @return string
+     */
+    public static function createDownloadHash($collection_id, $valid_until)
+    {
+        return hash('sha512',
+            PPLOAD_DOWNLOAD_SECRET . $collection_id . $valid_until); // order isn't important at all... just do the same when verifying
+    }
+
+    /**
+     * @param int    $collection_id
+     * @param string $file_name
+     * @param array  $payload
+     * @return string
+     */
+    public static function createDownloadUrlJwt($collection_id, $file_name, array $payload)
+    {
+        $valid_until = time() + 3600; // one hour valid
+        $hash = self::createDownloadHash($collection_id, $valid_until);
+        $payload['s'] = $hash;
+        $payload['t'] = $valid_until;
+        try {
+            $session = new Zend_Session_Namespace();
+            $payload['stfp'] = $session->stat_fp;
+            $payload['stip'] = $session->stat_ipv6 ? $session->stat_ipv6 : $session->stat_ipv4;
+        } catch (Zend_Session_Exception $e) {
+            Zend_Registry::get('logger')->err(__METHOD__ . '   ' . $e->getMessage());
+//            error_log(__METHOD__ . '   ' . $e->getMessage());
+        }
+        $jwt = Application_Model_Jwt::encodeFromArray($payload);
+
+        return PPLOAD_API_URI . 'files/download/j/' . $jwt . '/' . $file_name;
+    }
+
+    /**
+     * @param int    $projectId
+     * @param string $url
+     * @param string $filename
+     * @param string $fileDescription
+     * @return bool|mixed
+     * @throws Zend_Auth_Storage_Exception
+     * @throws Zend_Exception
+     */
+    public function uploadEmptyFileWithLink($projectId, $url, $filename, $fileDescription)
+    {
+        $projectId = (int)$projectId;
+
+        $projectData = $this->getProjectData($projectId);
+
+        if (empty($projectData)) {
+            Zend_Registry::get('logger')->err(__METHOD__ . ' - ppload upload error. no project data found. project_id:'
+                                              . $projectId);
+
+            return false;
+        }
+
+        $pploadApi = $this->getPpLoadApi();
+
+        // create empty text file
+        $fileDummy = '../../data/files/empty';
+
+        $fileRequest = array(
+            //            'file' => $fileDummy,
+            'local_file_path' => $fileDummy,
+            'local_file_name' => $filename,
+            'owner_id'        => $projectData->member_id,
+            'tags'            => 'link##' . urlencode($url)
+        );
+
+        if ($projectData->ppload_collection_id) {
+            // Append to existing collection
+            $fileRequest['collection_id'] = $projectData->ppload_collection_id;
+        }
+        if (false == empty($fileDescription)) {
+            $fileRequest['description'] = mb_substr($fileDescription, 0, 140);
+        }
+
+        //upload to ppload
+        $fileResponse = $pploadApi->postFile($fileRequest);
+
+        Zend_Registry::get('logger')->debug(__METHOD__ . ' - fileResponse: ' . print_r($fileResponse, true));
+
+        if (empty($fileResponse) OR empty($fileResponse->file) OR $fileResponse->status <> 'success') {
+            Zend_Registry::get('logger')->err(__METHOD__
+                                              . ' - ppload upload error. requestData:'
+                                              . print_r($fileRequest, true) . "\n" . 'response:'
+                                              . print_r($fileResponse, true)
+            );
+
+            return false;
+        }
+        $log = Zend_Registry::get('logger');
+        if ($projectData->ppload_collection_id <> $fileResponse->file->collection_id) {
+            $projectData->ppload_collection_id = $fileResponse->file->collection_id;
+            if ($this->isAuthmemberProjectCreator($projectData->member_id)) {
+                $projectData->changed_at = new Zend_Db_Expr('NOW()');
+            } else {
+                $auth = Zend_Auth::getInstance();
+                $authMember = $auth->getStorage()->read();
+                $log->info('********** ' . __METHOD__ . ' Project ChangedAt is not set: Auth-Member (' . $authMember->member_id . ') != Project-Owner (' . $projectData->member_id . '): **********' . "\n");
+            }
+            $projectData->save();
+        } else {
+            if ($this->isAuthmemberProjectCreator($projectData->member_id)) {
+                $projectData->changed_at = new Zend_Db_Expr('NOW()');
+                $projectData->save();
+            } else {
+                $auth = Zend_Auth::getInstance();
+                $authMember = $auth->getStorage()->read();
+                $log->info('********** ' . __METHOD__ . ' Project ChangedAt is not set: Auth-Member (' . $authMember->member_id . ') != Project-Owner (' . $projectData->member_id . '): **********' . "\n");
+            }
+        }
+
+        return $fileResponse;
+    }
+
+    /**
+     * @param int $projectId
+     *
+     * @return Zend_Db_Table_Row_Abstract
+     * @throws Zend_Db_Table_Exception
+     */
+    protected function getProjectData($projectId)
+    {
+        $projectTable = new Default_Model_DbTable_Project();
+
+        return $projectTable->find($projectId)->current();
+    }
+
+    /**
+     * @return Ppload_Api
+     */
+    protected function getPpLoadApi()
+    {
+        return new Ppload_Api(array(
+            'apiUri'   => PPLOAD_API_URI,
+            'clientId' => PPLOAD_CLIENT_ID,
+            'secret'   => PPLOAD_SECRET
+        ));
+    }
+
+    /**
+     * @param int $creator_id
+     * @return bool
+     * @throws Zend_Auth_Storage_Exception
+     */
+    public function isAuthmemberProjectCreator($creator_id)
+    {
+        $auth = Zend_Auth::getInstance();
+        $authMember = $auth->getStorage()->read();
+        if ($authMember->member_id == $creator_id) {
+            return true;
+        }
+
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/library/JWT.php b/library/JWT.php
new file mode 100644
index 0000000..a4805c4
--- /dev/null
+++ b/library/JWT.php
@@ -0,0 +1,206 @@
+<?php
+
+/**
+ * JSON Web Token implementation, based on this spec:
+ * http://tools.ietf.org/html/draft-ietf-oauth-json-web-token-06
+ *
+ * PHP version 5
+ *
+ * @category Authentication
+ * @package  Authentication_JWT
+ * @author   Neuman Vong <neuman@twilio.com>
+ * @author   Anant Narayanan <anant@php.net>
+ * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
+ * @link     https://github.com/firebase/php-jwt
+ */
+class JWT
+{
+    /**
+     * Decodes a JWT string into a PHP object.
+     *
+     * @param string      $jwt    The JWT
+     * @param string|null $key    The secret key
+     * @param bool        $verify Don't skip verification process
+     *
+     * @return object      The JWT's payload as a PHP object
+     * @throws UnexpectedValueException Provided JWT was invalid
+     * @throws DomainException          Algorithm was not provided
+     *
+     * @uses jsonDecode
+     * @uses urlsafeB64Decode
+     */
+    public static function decode($jwt, $key = null, $verify = true)
+    {
+        $tks = explode('.', $jwt);
+        if (count($tks) != 3) {
+            throw new UnexpectedValueException('Wrong number of segments');
+        }
+        list($headb64, $bodyb64, $cryptob64) = $tks;
+        if (null === ($header = JWT::jsonDecode(JWT::urlsafeB64Decode($headb64)))) {
+            throw new UnexpectedValueException('Invalid segment encoding');
+        }
+        if (null === $payload = JWT::jsonDecode(JWT::urlsafeB64Decode($bodyb64))) {
+            throw new UnexpectedValueException('Invalid segment encoding');
+        }
+        $sig = JWT::urlsafeB64Decode($cryptob64);
+        if ($verify) {
+            if (empty($header->alg)) {
+                throw new DomainException('Empty algorithm');
+            }
+            if ($sig != JWT::sign("$headb64.$bodyb64", $key, $header->alg)) {
+                throw new UnexpectedValueException('Signature verification failed');
+            }
+        }
+
+        return $payload;
+    }
+
+    /**
+     * Decode a JSON string into a PHP object.
+     *
+     * @param string $input JSON string
+     *
+     * @return object          Object representation of JSON string
+     * @throws DomainException Provided string was invalid JSON
+     */
+    public static function jsonDecode($input)
+    {
+        $obj = json_decode($input);
+        if (function_exists('json_last_error') && $errno = json_last_error()) {
+            JWT::_handleJsonError($errno);
+        } else if ($obj === null && $input !== 'null') {
+            throw new DomainException('Null result with non-null input');
+        }
+
+        return $obj;
+    }
+
+    /**
+     * Helper method to create a JSON error.
+     *
+     * @param int $errno An error number from json_last_error()
+     *
+     * @return void
+     */
+    private static function _handleJsonError($errno)
+    {
+        $messages = array(
+            JSON_ERROR_DEPTH     => 'Maximum stack depth exceeded',
+            JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+            JSON_ERROR_SYNTAX    => 'Syntax error, malformed JSON'
+        );
+        throw new DomainException(isset($messages[$errno]) ? $messages[$errno] : 'Unknown JSON error: ' . $errno);
+    }
+
+    /**
+     * Decode a string with URL-safe Base64.
+     *
+     * @param string $input A Base64 encoded string
+     *
+     * @return string A decoded string
+     */
+    public static function urlsafeB64Decode($input)
+    {
+        $remainder = strlen($input) % 4;
+        if ($remainder) {
+            $padlen = 4 - $remainder;
+            $input .= str_repeat('=', $padlen);
+        }
+
+        return base64_decode(strtr($input, '-_', '+/'));
+    }
+
+    /**
+     * Sign a string with a given key and algorithm.
+     *
+     * @param string $msg    The message to sign
+     * @param string $key    The secret key
+     * @param string $method The signing algorithm. Supported
+     *                       algorithms are 'HS256', 'HS384' and 'HS512'
+     *
+     * @return string          An encrypted message
+     * @throws DomainException Unsupported algorithm was specified
+     */
+    public static function sign($msg, $key, $method = 'HS256')
+    {
+        $methods = array(
+            'HS256' => 'sha256',
+            'HS384' => 'sha384',
+            'HS512' => 'sha512',
+        );
+        if (empty($methods[$method])) {
+            throw new DomainException('Algorithm not supported');
+        }
+
+        return hash_hmac($methods[$method], $msg, $key, true);
+    }
+
+    /**
+     * Converts and signs a PHP object or array into a JWT string.
+     *
+     * @param object|array $payload PHP object or array
+     * @param string       $key     The secret key
+     * @param string       $algo    The signing algorithm. Supported
+     *                              algorithms are 'HS256', 'HS384' and 'HS512'
+     *
+     * @return string      A signed JWT
+     * @uses jsonEncode
+     * @uses urlsafeB64Encode
+     */
+    public static function encode($payload, $key, $algo = 'HS256')
+    {
+        $header = array('typ' => 'JWT', 'alg' => $algo);
+        $segments = array();
+        $segments[] = JWT::urlsafeB64Encode(JWT::jsonEncode($header));
+        $segments[] = JWT::urlsafeB64Encode(JWT::jsonEncode($payload));
+        $signing_input = implode('.', $segments);
+        $signature = JWT::sign($signing_input, $key, $algo);
+        $segments[] = JWT::urlsafeB64Encode($signature);
+
+        return implode('.', $segments);
+    }
+
+    /**
+     * Encode a string with URL-safe Base64.
+     *
+     * @param string $input The string you want encoded
+     *
+     * @return string The base64 encode of what you passed in
+     */
+    public static function urlsafeB64Encode($input)
+    {
+        return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
+    }
+
+    /**
+     * Encode a PHP object into a JSON string.
+     *
+     * @param object|array $input A PHP object or array
+     *
+     * @return string          JSON representation of the PHP object or array
+     * @throws DomainException Provided object could not be encoded to valid JSON
+     */
+    public static function jsonEncode($input)
+    {
+        $json = json_encode($input);
+        if (function_exists('json_last_error') && $errno = json_last_error()) {
+            JWT::_handleJsonError($errno);
+        } else if ($json === 'null' && $input !== null) {
+            throw new DomainException('Null result with non-null input');
+        }
+
+        return $json;
+    }
+
+    public static function hashCode($a)
+    {
+        if ($a == null) {
+            return 0;
+        }
+
+        $result = crc32($a);
+
+        return $result;
+    }
+
+}
\ No newline at end of file
diff --git a/library/Local/Application.php b/library/Local/Application.php
index d6be35c..30fa8ce 100644
--- a/library/Local/Application.php
+++ b/library/Local/Application.php
@@ -1,137 +1,137 @@
 <?php
 
 /**
  *  ocs-apiserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-apiserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 class Local_Application extends Zend_Application
 {
-    const CACHE_APP_INI = 'cache_app_ini';
+    const CACHE_APP_INI = 'cache_api_ini';
 
     /**
      *
      * @var Zend_Cache_Core|null
      */
     protected $_configCache;
 
     //Override
 
     /**
      * Constructor
      *
      * Initialize application. Potentially initializes include_paths, PHP
      * settings, and bootstrap class.
      *
      * @param  string                   $environment
      * @param  string|array|Zend_Config $options String path to configuration file, or array/Zend_Config of configuration options
      * @param Zend_Cache_Core           $configCache
      *
      * @throws Zend_Application_Exception
      * @return \Local_Application
      */
     public function __construct($environment, $options = null)
     {
         $this->_configCache = $this->_initCache();
         parent::__construct($environment, $options);
     }
 
     protected function _initCache()
     {
         $frontendOptions = array(
             'lifetime'                => null,
             'automatic_serialization' => true
         );
 
         $backendOptions = array(
             'cache_dir'              => APPLICATION_CACHE,
             'file_locking'           => true,
             'read_control'           => true,
             'read_control_type'      => 'crc32',
             'hashed_directory_level' => 0,
             'hashed_directory_perm'  => 0700,
             'file_name_prefix'       => 'ocs',
             'cache_file_perm'        => 0700
         );
 
         return Zend_Cache::factory('Core', 'File', $frontendOptions, $backendOptions);
     }
 
     public function getApplicationConfig()
     {
         $cacheName = APPLICATION_ENV . '_' . self::CACHE_APP_INI;
         if (false === ($config = $this->_configCache->load($cacheName))) {
             $config = new Zend_Config($this->getOptions(), true);
             $this->_configCache->save($config, $cacheName, array(), 300);
         }
 
         return $config;
     }
 
     /**
      * Load configuration file of options
      *
      * @param  string $file
      *
      * @return array
      * @throws Zend_Application_Exception When invalid configuration file is provided
      * @throws Zend_Cache_Exception
      */
     protected function _loadConfig($file)
     {
         $suffix = strtolower(pathinfo($file, PATHINFO_EXTENSION));
 
         if ($this->_configCache === null OR $suffix == 'php' OR $suffix == 'inc') { //No need for caching those
             return parent::_loadConfig($file);
         }
 
         $cacheId = $this->_cacheId($file);
 
         if (false === ($config = $this->_configCache->load($cacheId))) {
             $config = parent::_loadConfig($file);
             $this->_configCache->save($config, $cacheId, array(), null);
         }
 
         return $config;
     }
 
     protected function _cacheId($file)
     {
         return 'config_' . $this->getEnvironment() . '_' . md5_file($file);
     }
 
     /**
      * @param string $file
      * @param        $cacheId
      *
      * @return bool|string
      */
     protected function _testCache($file, $cacheId)
     {
         $configMTime = filemtime($file);
 
         $cacheLastMTime = $this->_configCache->test($cacheId);
 
         if ($cacheLastMTime !== false AND $configMTime < $cacheLastMTime) { //Valid cache?
             return true;
         }
 
         return false;
     }
 
 } 
\ No newline at end of file
diff --git a/library/Local/Auth/Adapter/Interface.php b/library/Local/Auth/Adapter/Interface.php
index 285ef50..95c5a91 100644
--- a/library/Local/Auth/Adapter/Interface.php
+++ b/library/Local/Auth/Adapter/Interface.php
@@ -1,49 +1,52 @@
 <?php
 
 /**
- *  ocs-apiserver
+ *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
- *    This file is part of ocs-apiserver.
+ *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *    Created: 24.10.2016
  **/
 interface Local_Auth_Adapter_Interface extends Zend_Auth_Adapter_Interface
 {
 
     /**
      * @param string $identity
+     *
      * @return Zend_Auth_Adapter_Interface
      */
     public function setIdentity($identity);
 
     /**
      * @param string $credential
+     *
      * @return Zend_Auth_Adapter_Interface
      */
     public function setCredential($credential);
 
     /**
      * getResultRowObject() - Returns the result row as a stdClass object
      *
      * @param  string|array $returnColumns
      * @param  string|array $omitColumns
+     *
      * @return stdClass|boolean
      */
     public function getResultRowObject($returnColumns = null, $omitColumns = null);
 
 }
\ No newline at end of file
diff --git a/library/Local/Auth/Adapter/Ocs.php b/library/Local/Auth/Adapter/Ocs.php
index f8a13cc..cf16170 100644
--- a/library/Local/Auth/Adapter/Ocs.php
+++ b/library/Local/Auth/Adapter/Ocs.php
@@ -1,241 +1,313 @@
 <?php
 
 /**
- *  ocs-apiserver
+ *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
- *    This file is part of ocs-apiserver.
+ *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 class Local_Auth_Adapter_Ocs implements Local_Auth_Adapter_Interface
 {
 
     const MD5 = 'enc01';
     const SHA = 'enc02';
     const PASSWORDSALT = 'ghdfklsdfgjkldfghdklgioerjgiogkldfgndfohgfhhgfhgfhgfhgfhfghfgnndf';
+    const USER_DEACTIVATED = '_double';
+    const EMAIL_DEACTIVATED = '_double';
 
     protected $_db;
     protected $_tableName;
     protected $_identity;
     protected $_credential;
     protected $_encryption;
     protected $_resultRow;
 
     /**
      * __construct() - Sets configuration options
      *
-     * @param  Zend_Db_Adapter_Abstract $dbAdapter If null, default database adapter assumed
-     * @param string $tableName
+     * @param Zend_Db_Adapter_Abstract $dbAdapter If null, default database adapter assumed
+     * @param string                   $tableName
+     *
      * @throws Zend_Auth_Adapter_Exception
      */
     public function __construct(Zend_Db_Adapter_Abstract $dbAdapter = null, $tableName = null)
     {
         $this->_db = $dbAdapter;
         if (empty($this->_db)) {
             $this->_db = Zend_Db_Table_Abstract::getDefaultAdapter();
             if (empty($this->_db)) {
                 throw new Zend_Auth_Adapter_Exception('No database adapter present');
             }
         }
 
         $this->_tableName = $tableName;
     }
 
-    public static function getEncryptedPassword($password, $userSource)
+    /**
+     * @param string $password
+     * @param int    $passwordType
+     * @return string
+     */
+    public static function getEncryptedPassword($password, $passwordType)
+    {
+        return $passwordType == Application_Model_DbTable_Member::PASSWORD_TYPE_HIVE
+            ? sha1((self::PASSWORDSALT . $password . self::PASSWORDSALT))
+            : md5($password);
+    }
+
+    /**
+     * @param string $password
+     * @return string
+     */
+    public static function getEncryptedLdapPass($password)
     {
-        return $userSource == Application_Model_DbTable_Member::SOURCE_HIVE ? sha1((self::PASSWORDSALT . $password . self::PASSWORDSALT)) : md5($password);
+        return '{MD5}' . base64_encode(md5($password, true));
     }
 
     /**
      * Performs an authentication attempt
      *
-     * @throws Zend_Auth_Adapter_Exception If authentication cannot be performed
      * @return Zend_Auth_Result
+     * @throws Zend_Exception
      */
     public function authenticate()
     {
         $validator = new Zend_Validate_EmailAddress();
         if ($validator->isValid($this->_identity)) {
             $resultSet = $this->fetchUserByEmail();
         } else {
             $resultSet = $this->fetchUserByUsername();
         }
 
         if (count($resultSet) == 0) {
             return $this->createAuthResult(Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND, $this->_identity,
                 array('A record with the supplied identity could not be found.'));
         }
 
         if (count($resultSet) > 1) {
             return $this->createAuthResult(Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS, $this->_identity,
                 array('More than one record matches the supplied identity.'));
         }
 
+        if (empty($resultSet[0]['email_checked'])) {
+            return $this->createAuthResult(Local_Auth_Result::MAIL_ADDRESS_NOT_VALIDATED, $resultSet[0]['member_id'],
+                array('Mail address not validated.'));
+        }
+
+        if ($resultSet[0]['is_active'] == 0) {
+            return $this->createAuthResult(Local_Auth_Result::ACCOUNT_INACTIVE, $this->_identity,
+                array('User account is inactive.'));
+        }
+
         $this->_resultRow = array_shift($resultSet);
+
         return $this->createAuthResult(Zend_Auth_Result::SUCCESS, $this->_identity,
             array('Authentication successful.'));
     }
 
+    /**
+     * @return array
+     * @throws Zend_Exception
+     */
     private function fetchUserByEmail()
     {
         $sql = "
-            SELECT * 
-            FROM {$this->_tableName} 
-            WHERE 
-            is_active = :active AND 
-            is_deleted = :deleted AND 
-            login_method = :login AND 
-            mail = :mail AND 
-            password = :password";
+            SELECT `m`.*, `member_email`.`email_verification_value`, `member_email`.`email_checked`, `mei`.`external_id` 
+            FROM `member` AS `m`
+            JOIN `member_email` ON `m`.`member_id` = `member_email`.`email_member_id` AND `member_email`.`email_primary` = 1 AND `member_email`.`email_deleted` = 0
+            LEFT JOIN `member_external_id` AS `mei` ON `mei`.`member_id` = `m`.`member_id`
+            WHERE  
+            `m`.`is_active` = :active AND
+            `m`.`is_deleted` = :deleted AND 
+            `m`.`login_method` = :login AND 
+            (LOWER(`m`.`mail`) = LOWER(:mail) OR
+            LOWER(`m`.`mail`) = CONCAT(LOWER(:mail),:user_deactivated)
+            ) AND
+            `m`.`password` = :pwd";
 
         $this->_db->getProfiler()->setEnabled(true);
         $resultSet = $this->_db->fetchAll($sql, array(
-            'active' => Application_Model_DbTable_Member::MEMBER_ACTIVE,
-            'deleted' => Application_Model_DbTable_Member::MEMBER_NOT_DELETED,
-            'login' => Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
-            'mail' => $this->_identity,
-            'password' => $this->_credential
+            'active'           => Application_Model_DbTable_Member::MEMBER_ACTIVE,
+            'deleted'          => Application_Model_DbTable_Member::MEMBER_NOT_DELETED,
+            'login'            => Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
+            'mail'             => $this->_identity,
+            'user_deactivated' => $this::EMAIL_DEACTIVATED,
+            'pwd'              => $this->_credential
         ));
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - sql take seconds: ' . $this->_db->getProfiler()->getLastQueryProfile()->getElapsedSecs());
+
+        $sql = str_replace(':active', Application_Model_DbTable_Member::MEMBER_ACTIVE, $sql);
+        $sql = str_replace(':deleted', Application_Model_DbTable_Member::MEMBER_NOT_DELETED, $sql);
+        $sql = str_replace(':login', "'" . Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL . "'", $sql);
+        $sql = str_replace(':mail', "'" . $this->_identity . "'", $sql);
+        $sql = str_replace(':pwd', "'" . $this->_credential . "'", $sql);
+
+        Zend_Registry::get('logger')->debug(__METHOD__ . ' - SQL: ' . $sql . ' - sql take seconds: ' . $this->_db->getProfiler()
+                                                                                                                 ->getLastQueryProfile()
+                                                                                                                 ->getElapsedSecs());
         $this->_db->getProfiler()->setEnabled(false);
 
         return $resultSet;
     }
 
+    /**
+     * Fetches a user by username, username ist not case sensitve
+     *
+     * @return array
+     * @throws Zend_Exception
+     */
     private function fetchUserByUsername()
     {
         $sql = "
-            SELECT * 
-            FROM {$this->_tableName} 
-            WHERE 
-            is_active = :active AND 
-            is_deleted = :deleted AND 
-            login_method = :login AND 
-            username = :username AND 
-            password = :password";
+            SELECT `m`.*, `member_email`.`email_verification_value`, `member_email`.`email_checked`, `mei`.`external_id` 
+            FROM `member` AS `m`
+            JOIN `member_email` ON `m`.`member_id` = `member_email`.`email_member_id` AND `member_email`.`email_primary` = 1 AND `member_email`.`email_deleted` = 0
+            LEFT JOIN `member_external_id` AS `mei` ON `mei`.`member_id` = `m`.`member_id`
+            WHERE  
+            `m`.`is_active` = :active AND 
+            `m`.`is_deleted` = :deleted AND 
+            `m`.`login_method` = :login AND 
+            (LOWER(`m`.`username`) = LOWER(:username) OR
+            LOWER(`m`.`username`) = CONCAT(LOWER(:username),:user_deactivated)
+            ) 
+            AND 
+            `m`.`password` = :pwd";
 
         $this->_db->getProfiler()->setEnabled(true);
         $resultSet = $this->_db->fetchAll($sql, array(
-            'active' => Application_Model_DbTable_Member::MEMBER_ACTIVE,
-            'deleted' => Application_Model_DbTable_Member::MEMBER_NOT_DELETED,
-            'login' => Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
-            'username' => $this->_identity,
-            'password' => $this->_credential
+            'active'           => Application_Model_DbTable_Member::MEMBER_ACTIVE,
+            'deleted'          => Application_Model_DbTable_Member::MEMBER_NOT_DELETED,
+            'login'            => Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
+            'username'         => $this->_identity,
+            'user_deactivated' => $this::USER_DEACTIVATED,
+            'pwd'              => $this->_credential
         ));
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - sql take seconds: ' . $this->_db->getProfiler()->getLastQueryProfile()->getElapsedSecs());
+
+        $sql = str_replace(':active', Application_Model_DbTable_Member::MEMBER_ACTIVE, $sql);
+        $sql = str_replace(':deleted', Application_Model_DbTable_Member::MEMBER_NOT_DELETED, $sql);
+        $sql = str_replace(':login', "'" . Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL . "'", $sql);
+        $sql = str_replace(':username', "'" . $this->_identity . "'", $sql);
+        $sql = str_replace(':user_deactivated', "'" . $this::USER_DEACTIVATED . "'", $sql);
+        $sql = str_replace(':pwd', "'" . $this->_credential . "'", $sql);
+
+        Zend_Registry::get('logger')->debug(__METHOD__ . ' - SQL: ' . $sql . ' - sql take seconds: ' . $this->_db->getProfiler()
+                                                                                                                 ->getLastQueryProfile()
+                                                                                                                 ->getElapsedSecs());
         $this->_db->getProfiler()->setEnabled(false);
 
         return $resultSet;
     }
 
     protected function createAuthResult($code, $identity, $messages)
     {
-        return new Zend_Auth_Result(
-            $code,
-            $identity,
-            $messages
-        );
+        return new Local_Auth_Result($code, $identity, $messages);
     }
 
     /**
      * @param string $identity
+     *
      * @return Local_Auth_Adapter_Ocs
      */
     public function setIdentity($identity)
     {
         $this->_identity = $identity;
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - ' . print_r($identity, true));
+
         return $this;
     }
 
     /**
      * @param string $credential
+     *
      * @return Local_Auth_Adapter_Ocs
      * @throws Zend_Exception
      */
     public function setCredential($credential)
     {
         switch ($this->_encryption) {
             case self::MD5 :
                 $this->_credential = md5($credential);
-                Zend_Registry::get('logger')->info(__METHOD__ . ' - pling: ' . $this->_credential);
                 break;
             case self::SHA :
                 $this->_credential = sha1((self::PASSWORDSALT . $credential . self::PASSWORDSALT));
-                Zend_Registry::get('logger')->info(__METHOD__ . ' - hive: ' . $this->_credential);
                 break;
             default:
                 throw new Zend_Exception('There is no default case for credential encryption.');
         }
 
         return $this;
     }
 
     /**
      * @param mixed $encryption
+     *
      * @return Local_Auth_Adapter_Ocs
      */
     public function setEncryption($encryption)
     {
         $this->_encryption = $encryption;
+
         return $this;
     }
 
     /**
      * getResultRowObject() - Returns the result row as a stdClass object
      *
-     * @param  string|array $returnColumns
-     * @param  string|array $omitColumns
+     * @param string|array $returnColumns
+     * @param string|array $omitColumns
+     *
      * @return stdClass|boolean
      */
     public function getResultRowObject($returnColumns = null, $omitColumns = null)
     {
         if (!$this->_resultRow) {
             return false;
         }
 
         $returnObject = new stdClass();
 
         if (null !== $returnColumns) {
 
             $availableColumns = array_keys($this->_resultRow);
             foreach ((array)$returnColumns as $returnColumn) {
                 if (in_array($returnColumn, $availableColumns)) {
                     $returnObject->{$returnColumn} = $this->_resultRow[$returnColumn];
                 }
             }
+
             return $returnObject;
+        } else {
+            if (null !== $omitColumns) {
+
+                $omitColumns = (array)$omitColumns;
+                foreach ($this->_resultRow as $resultColumn => $resultValue) {
+                    if (!in_array($resultColumn, $omitColumns)) {
+                        $returnObject->{$resultColumn} = $resultValue;
+                    }
+                }
 
-        } elseif (null !== $omitColumns) {
+                return $returnObject;
+            } else {
 
-            $omitColumns = (array)$omitColumns;
-            foreach ($this->_resultRow as $resultColumn => $resultValue) {
-                if (!in_array($resultColumn, $omitColumns)) {
+                foreach ($this->_resultRow as $resultColumn => $resultValue) {
                     $returnObject->{$resultColumn} = $resultValue;
                 }
-            }
-            return $returnObject;
 
-        } else {
-
-            foreach ($this->_resultRow as $resultColumn => $resultValue) {
-                $returnObject->{$resultColumn} = $resultValue;
+                return $returnObject;
             }
-            return $returnObject;
         }
     }
 
 }
\ No newline at end of file
diff --git a/library/Local/Auth/Adapter/RememberMe.php b/library/Local/Auth/Adapter/RememberMe.php
index fe848d7..2506e3d 100644
--- a/library/Local/Auth/Adapter/RememberMe.php
+++ b/library/Local/Auth/Adapter/RememberMe.php
@@ -1,179 +1,207 @@
 <?php
 
 /**
- *  ocs-apiserver
+ *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
- *    This file is part of ocs-apiserver.
+ *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *    Created: 22.10.2016
  **/
 class Local_Auth_Adapter_RememberMe implements Local_Auth_Adapter_Interface
 {
 
     protected $_identity;
     protected $_credential;
     protected $_db;
     protected $_resultRow;
 
     /**
      * __construct() - Sets configuration options
      *
      * @param  Zend_Db_Adapter_Abstract $dbAdapter If null, default database adapter assumed
-     * @param string $tableName
+     * @param string                    $tableName
+     *
      * @throws Zend_Auth_Adapter_Exception
      */
     public function __construct(Zend_Db_Adapter_Abstract $dbAdapter = null, $tableName = null)
     {
         $this->_db = $dbAdapter;
         if (empty($this->_db)) {
             $this->_db = Zend_Db_Table_Abstract::getDefaultAdapter();
             if (empty($this->_db)) {
                 throw new Zend_Auth_Adapter_Exception('No database adapter present');
             }
         }
     }
 
     /**
      * @param string $identity
+     *
      * @return Zend_Auth_Adapter_Interface
+     * @throws Zend_Exception
      */
     public function setIdentity($identity)
     {
         $this->_identity = $identity;
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - ' . print_r($identity, true));
+
         return $this;
     }
 
     /**
      * @param string $credential
+     *
      * @return Zend_Auth_Adapter_Interface
+     * @throws Zend_Exception
      */
     public function setCredential($credential)
     {
         $this->_credential = $credential;
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - ' . print_r($credential, true));
+
         return $this;
     }
 
     /**
      * Performs an authentication attempt
      *
-     * @throws Zend_Auth_Adapter_Exception If authentication cannot be performed
      * @return Zend_Auth_Result
+     * @throws Zend_Exception
      */
     public function authenticate()
     {
         $resultSet = $this->fetchUserData();
 
         if (count($resultSet) == 0) {
             return $this->createAuthResult(Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND, $this->_identity,
                 array('A record with the supplied identity could not be found.'));
         }
 
         if (count($resultSet) > 1) {
             return $this->createAuthResult(Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS, $this->_identity,
                 array('More than one record matches the supplied identity.'));
         }
 
+        if (empty($resultSet[0]['email_checked'])) {
+            return $this->createAuthResult(Local_Auth_Result::MAIL_ADDRESS_NOT_VALIDATED, $resultSet[0]['member_id'],
+                array('Mail address not validated.'));
+        }
+
+        if ($resultSet[0]['is_active'] == 0) {
+            return $this->createAuthResult(Local_Auth_Result::ACCOUNT_INACTIVE, $this->_identity, array('User account is inactive.'));
+        }
+
         $this->_resultRow = array_shift($resultSet);
-        return $this->createAuthResult(Zend_Auth_Result::SUCCESS, $this->_identity,
-            array('Authentication successful.'));
+
+        return $this->createAuthResult(Zend_Auth_Result::SUCCESS, $this->_identity, array('Authentication successful.'));
     }
 
+    /**
+     * @return array
+     * @throws Zend_Exception
+     */
     private function fetchUserData()
     {
         $sql = "
-            SELECT member.* 
+            SELECT `m`.*, `me`.`email_verification_value`, `me`.`email_checked`, `mei`.`external_id` 
             FROM `session`
-            JOIN member ON member.member_id = `session`.member_id
-            WHERE member.is_active = :active
-            AND member.is_deleted = :deleted
-            AND member.login_method = :login
-            AND `session`.member_id = :member
-            AND `session`.remember_me_id = :uuid
-            AND `session`.expiry >= NOW()
+            JOIN `member` AS `m` ON `m`.`member_id` = `session`.`member_id`
+            JOIN member_email AS `me` ON m.member_id = me.email_member_id AND me.email_primary = 1
+            LEFT JOIN `member_external_id` AS `mei` ON `mei`.`member_id` = `m`.`member_id`
+            WHERE `m`.`is_active` = :active
+            AND `m`.`is_deleted` = :deleted
+            AND `m`.`login_method` = :login
+            AND `session`.`member_id` = :member
+            AND `session`.`remember_me_id` = :uuid
+            AND `session`.`expiry` >= NOW()
             ";
 
         $this->_db->getProfiler()->setEnabled(true);
         $resultSet = $this->_db->fetchAll($sql, array(
-            'active' => Application_Model_DbTable_Member::MEMBER_ACTIVE,
+            'active'  => Application_Model_DbTable_Member::MEMBER_ACTIVE,
             'deleted' => Application_Model_DbTable_Member::MEMBER_NOT_DELETED,
-            'login' => Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
-            'member' => $this->_identity,
-            'uuid' => $this->_credential
+            'login'   => Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
+            'member'  => $this->_identity,
+            'uuid'    => $this->_credential
         ));
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - sql take seconds: ' . $this->_db->getProfiler()->getLastQueryProfile()->getElapsedSecs());
+        Zend_Registry::get('logger')->debug(__METHOD__ . ' - sql take seconds: ' . $this->_db->getProfiler()
+                                                                                             ->getLastQueryProfile()
+                                                                                             ->getElapsedSecs())
+        ;
         $this->_db->getProfiler()->setEnabled(false);
 
         return $resultSet;
     }
 
+    /**
+     * @param $code
+     * @param $identity
+     * @param $messages
+     *
+     * @return Zend_Auth_Result
+     */
     protected function createAuthResult($code, $identity, $messages)
     {
-        return new Zend_Auth_Result(
-            $code,
-            $identity,
-            $messages
-        );
+        return new Zend_Auth_Result($code, $identity, $messages);
     }
 
     /**
      * getResultRowObject() - Returns the result row as a stdClass object
      *
      * @param  string|array $returnColumns
      * @param  string|array $omitColumns
+     *
      * @return stdClass|boolean
      */
     public function getResultRowObject($returnColumns = null, $omitColumns = null)
     {
         if (!$this->_resultRow) {
             return false;
         }
 
         $returnObject = new stdClass();
 
         if (null !== $returnColumns) {
 
             $availableColumns = array_keys($this->_resultRow);
             foreach ((array)$returnColumns as $returnColumn) {
                 if (in_array($returnColumn, $availableColumns)) {
                     $returnObject->{$returnColumn} = $this->_resultRow[$returnColumn];
                 }
             }
-            return $returnObject;
 
-        } elseif (null !== $omitColumns) {
+            return $returnObject;
+        } else if (null !== $omitColumns) {
 
             $omitColumns = (array)$omitColumns;
             foreach ($this->_resultRow as $resultColumn => $resultValue) {
                 if (!in_array($resultColumn, $omitColumns)) {
                     $returnObject->{$resultColumn} = $resultValue;
                 }
             }
-            return $returnObject;
 
+            return $returnObject;
         } else {
 
             foreach ($this->_resultRow as $resultColumn => $resultValue) {
                 $returnObject->{$resultColumn} = $resultValue;
             }
+
             return $returnObject;
         }
     }
 
 }
\ No newline at end of file
diff --git a/library/Local/Auth/Adapter/SsoToken.php b/library/Local/Auth/Adapter/SsoToken.php
index bbd6107..448f5ac 100644
--- a/library/Local/Auth/Adapter/SsoToken.php
+++ b/library/Local/Auth/Adapter/SsoToken.php
@@ -1,175 +1,192 @@
 <?php
 
 /**
- *  ocs-apiserver
+ *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
- *    This file is part of ocs-apiserver.
+ *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *    Created: 22.10.2016
  **/
 class Local_Auth_Adapter_SsoToken implements Local_Auth_Adapter_Interface
 {
 
     protected $_identity;
     protected $_credential;
     protected $_db;
     protected $_resultRow;
 
     /**
      * __construct() - Sets configuration options
      *
      * @param  Zend_Db_Adapter_Abstract $dbAdapter If null, default database adapter assumed
-     * @param string $tableName
+     * @param string                    $tableName
+     *
      * @throws Zend_Auth_Adapter_Exception
      */
     public function __construct(Zend_Db_Adapter_Abstract $dbAdapter = null, $tableName = null)
     {
         $this->_db = $dbAdapter;
         if (empty($this->_db)) {
             $this->_db = Zend_Db_Table_Abstract::getDefaultAdapter();
             if (empty($this->_db)) {
                 throw new Zend_Auth_Adapter_Exception('No database adapter present');
             }
         }
     }
 
     /**
      * @param string $identity
+     *
      * @return Zend_Auth_Adapter_Interface
+     * @throws Zend_Exception
      */
     public function setIdentity($identity)
     {
         $this->_identity = $identity;
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - ' . print_r($identity, true));
+
         return $this;
     }
 
     /**
      * @param string $credential
+     *
      * @return Zend_Auth_Adapter_Interface
+     * @throws Zend_Exception
      */
     public function setCredential($credential)
     {
         $this->_credential = $credential;
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - ' . print_r($credential, true));
+
         return $this;
     }
 
     /**
      * Performs an authentication attempt
      *
-     * @throws Zend_Auth_Adapter_Exception If authentication cannot be performed
      * @return Zend_Auth_Result
+     * @throws Zend_Exception
      */
     public function authenticate()
     {
         $resultSet = $this->fetchUserData();
 
         if (count($resultSet) == 0) {
             return $this->createAuthResult(Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND, $this->_identity,
                 array('A record with the supplied identity could not be found.'));
         }
 
         if (count($resultSet) > 1) {
             return $this->createAuthResult(Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS, $this->_identity,
                 array('More than one record matches the supplied identity.'));
         }
 
         $this->_resultRow = array_shift($resultSet);
-        return $this->createAuthResult(Zend_Auth_Result::SUCCESS, $this->_identity,
-            array('Authentication successful.'));
+
+        return $this->createAuthResult(Zend_Auth_Result::SUCCESS, $this->_identity, array('Authentication successful.'));
     }
 
+    /**
+     * @return array
+     * @throws Zend_Exception
+     */
     private function fetchUserData()
     {
         $sql = "
-            SELECT member.*
-            FROM member
-            WHERE member.is_active = :active
-            AND member.is_deleted = :deleted
-            AND member.login_method = :login
-            AND member.member_id = :memberId
+            SELECT `member`.*
+            FROM `member`
+            WHERE `member`.`is_active` = :active
+            AND `member`.`is_deleted` = :deleted
+            AND `member`.`login_method` = :login
+            AND `member`.`member_id` = :memberId
             ";
 
         $this->_db->getProfiler()->setEnabled(true);
         $resultSet = $this->_db->fetchAll($sql, array(
-            'active' => Application_Model_DbTable_Member::MEMBER_ACTIVE,
-            'deleted' => Application_Model_DbTable_Member::MEMBER_NOT_DELETED,
-            'login' => Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
+            'active'   => Application_Model_DbTable_Member::MEMBER_ACTIVE,
+            'deleted'  => Application_Model_DbTable_Member::MEMBER_NOT_DELETED,
+            'login'    => Application_Model_DbTable_Member::MEMBER_LOGIN_LOCAL,
             'memberId' => $this->_identity
         ));
-        Zend_Registry::get('logger')->info(__METHOD__ . ' - sql take seconds: ' . $this->_db->getProfiler()->getLastQueryProfile()->getElapsedSecs());
+        Zend_Registry::get('logger')->debug(__METHOD__ . ' - sql take seconds: ' . $this->_db->getProfiler()
+                                                                                             ->getLastQueryProfile()
+                                                                                             ->getElapsedSecs())
+        ;
         $this->_db->getProfiler()->setEnabled(false);
 
         return $resultSet;
     }
 
+    /**
+     * @param $code
+     * @param $identity
+     * @param $messages
+     *
+     * @return Zend_Auth_Result
+     */
     protected function createAuthResult($code, $identity, $messages)
     {
-        return new Zend_Auth_Result(
-            $code,
-            $identity,
-            $messages
-        );
+        return new Zend_Auth_Result($code, $identity, $messages);
     }
 
     /**
      * getResultRowObject() - Returns the result row as a stdClass object
      *
      * @param  string|array $returnColumns
      * @param  string|array $omitColumns
+     *
      * @return stdClass|boolean
      */
     public function getResultRowObject($returnColumns = null, $omitColumns = null)
     {
         if (!$this->_resultRow) {
             return false;
         }
 
         $returnObject = new stdClass();
 
         if (null !== $returnColumns) {
 
             $availableColumns = array_keys($this->_resultRow);
             foreach ((array)$returnColumns as $returnColumn) {
                 if (in_array($returnColumn, $availableColumns)) {
                     $returnObject->{$returnColumn} = $this->_resultRow[$returnColumn];
                 }
             }
-            return $returnObject;
 
-        } elseif (null !== $omitColumns) {
+            return $returnObject;
+        } else if (null !== $omitColumns) {
 
             $omitColumns = (array)$omitColumns;
             foreach ($this->_resultRow as $resultColumn => $resultValue) {
                 if (!in_array($resultColumn, $omitColumns)) {
                     $returnObject->{$resultColumn} = $resultValue;
                 }
             }
-            return $returnObject;
 
+            return $returnObject;
         } else {
 
             foreach ($this->_resultRow as $resultColumn => $resultValue) {
                 $returnObject->{$resultColumn} = $resultValue;
             }
+
             return $returnObject;
         }
     }
 
 }
\ No newline at end of file
diff --git a/library/Local/Auth/AdapterFactory.php b/library/Local/Auth/AdapterFactory.php
index 80aff4f..44c1a55 100644
--- a/library/Local/Auth/AdapterFactory.php
+++ b/library/Local/Auth/AdapterFactory.php
@@ -1,85 +1,119 @@
 <?php
 
 /**
- *  ocs-apiserver
+ *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
- *    This file is part of ocs-apiserver.
+ *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 class Local_Auth_AdapterFactory
 {
 
     const LOGIN_INFINITY = 'infinity';
     const LOGIN_HIVE = 'encryptionHive01';
     const LOGIN_PLING = 'encryptionPling01';
     const LOGIN_DEFAULT = 'default';
     const LOGIN_SSO = 'singleSingOn';
 
     /**
      * @param null $userIdentity
      * @param null $loginMethod
+     *
      * @return Local_Auth_Adapter_Interface
+     * @throws Zend_Auth_Adapter_Exception
+     * @throws Zend_Exception
      */
-    public static function getAuthAdapter($userIdentity = null, $loginMethod = null)
+    public static function getAuthAdapter($userIdentity = null, $credential = null, $loginMethod = null)
     {
         if (empty($loginMethod)) {
-            $loginMethod = self::findAlternativeMethod($userIdentity);
+            $loginMethod = self::detectHashMethod($userIdentity, $credential);
         }
 
         return self::createAuthAdapter($loginMethod);
     }
 
-    protected static function findAlternativeMethod($identity)
+    /**
+     * @param $identity
+     *
+     * @return string
+     */
+    protected static function detectHashMethod($identity, $credential)
     {
-        $modelMember = new Application_Model_Member();
-        $memberData = $modelMember->findActiveMemberByIdentity($identity);
+        //$modelMember = new Application_Model_Member();
+        //$memberData = $modelMember->findActiveMemberByIdentity($identity, $credential);
+        $validator = new Zend_Validate_EmailAddress();
+        if ($validator->isValid($identity)) {
+            $sql = "SELECT * FROM member AS m WHERE mail = :identity AND (`password` = :passHive OR `password` = :passOcs)";
+        } else {
+            $sql = "SELECT * FROM member AS m WHERE username = :identity AND (`password` = :passHive OR `password` = :passOcs)";
+        }
+
+        $memberData = Zend_Db_Table::getDefaultAdapter()->fetchRow($sql, array('identity' => $identity,
+                                                                               'passHive' => Local_Auth_Adapter_Ocs::getEncryptedPassword($credential, Application_Model_DbTable_Member::PASSWORD_TYPE_HIVE),
+                                                                               'passOcs' => Local_Auth_Adapter_Ocs::getEncryptedPassword($credential, Application_Model_DbTable_Member::PASSWORD_TYPE_OCS)
+            )
+        );
 
-        if ($modelMember->isHiveUser($memberData)) {
+        if (count($memberData) == 0) {
+            return self::LOGIN_DEFAULT;
+        }
+
+        if (Application_Model_Member::PASSWORD_TYPE_HIVE == $memberData['password_type']) {
             return self::LOGIN_HIVE;
         }
+        //if ($modelMember->isHiveUser($memberData)) {
+        //    return self::LOGIN_HIVE;
+        //}
 
         return self::LOGIN_DEFAULT;
     }
 
+    /**
+     * @param $provider
+     *
+     * @return Local_Auth_Adapter_Ocs|Local_Auth_Adapter_RememberMe|Local_Auth_Adapter_SsoToken
+     * @throws Zend_Auth_Adapter_Exception
+     * @throws Zend_Exception
+     */
     protected static function createAuthAdapter($provider)
     {
         switch ($provider) {
             case self::LOGIN_INFINITY:
                 $authAdapter = new Local_Auth_Adapter_RememberMe(Zend_Registry::get('db'));
                 break;
 
             case self::LOGIN_SSO:
                 $authAdapter = new Local_Auth_Adapter_SsoToken(Zend_Registry::get('db'));
                 break;
 
             case self::LOGIN_HIVE:
                 $authAdapter = new Local_Auth_Adapter_Ocs(Zend_Registry::get('db'), 'member');
                 $authAdapter->setEncryption(Local_Auth_Adapter_Ocs::SHA);
                 break;
 
             case self::LOGIN_PLING:
             case self::LOGIN_DEFAULT:
             default:
                 $authAdapter = new Local_Auth_Adapter_Ocs(Zend_Registry::get('db'), 'member');
                 $authAdapter->setEncryption(Local_Auth_Adapter_Ocs::MD5);
                 break;
         }
 
         return $authAdapter;
     }
 
 }
\ No newline at end of file
diff --git a/library/Local/Auth/Adapter/Interface.php b/library/Local/Auth/Result.php
similarity index 52%
copy from library/Local/Auth/Adapter/Interface.php
copy to library/Local/Auth/Result.php
index 285ef50..5647d01 100644
--- a/library/Local/Auth/Adapter/Interface.php
+++ b/library/Local/Auth/Result.php
@@ -1,49 +1,48 @@
 <?php
 
 /**
- *  ocs-apiserver
+ *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
- *    This file is part of ocs-apiserver.
+ *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *    Created: 24.10.2016
- **/
-interface Local_Auth_Adapter_Interface extends Zend_Auth_Adapter_Interface
+ * Created: 30.05.2018
+ */
+class Local_Auth_Result extends Zend_Auth_Result
 {
 
-    /**
-     * @param string $identity
-     * @return Zend_Auth_Adapter_Interface
-     */
-    public function setIdentity($identity);
+    const MAIL_ADDRESS_NOT_VALIDATED = -10;
 
-    /**
-     * @param string $credential
-     * @return Zend_Auth_Adapter_Interface
-     */
-    public function setCredential($credential);
+    const ACCOUNT_INACTIVE = -20;
 
     /**
-     * getResultRowObject() - Returns the result row as a stdClass object
+     * Sets the result code, identity, and failure messages
      *
-     * @param  string|array $returnColumns
-     * @param  string|array $omitColumns
-     * @return stdClass|boolean
+     * @param int   $code
+     * @param mixed $identity
+     * @param array $messages
      */
-    public function getResultRowObject($returnColumns = null, $omitColumns = null);
+    public function __construct($code, $identity, array $messages = array())
+    {
+        $code = (int)$code;
+
+        $this->_code = $code;
+        $this->_identity = $identity;
+        $this->_messages = $messages;
+    }
 
 }
\ No newline at end of file
diff --git a/library/Local/Session/Handler/Memcache.php b/library/Local/Session/Handler/Memcache.php
index 33df1d5..f60df85 100644
--- a/library/Local/Session/Handler/Memcache.php
+++ b/library/Local/Session/Handler/Memcache.php
@@ -1,71 +1,85 @@
 <?php
 /**
- *  ocs-apiserver
+ *  ocs-webserver
  *
  *  Copyright 2016 by pling GmbH.
  *
- *    This file is part of ocs-apiserver.
+ *    This file is part of ocs-webserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
 class Local_Session_Handler_Memcache implements Zend_Session_SaveHandler_Interface
 {
 
     /** @var Zend_Cache_Backend_Interface $cache */
     public $cache = null;
     private $maxlifetime = 3600;
 
     public function __construct($cacheHandler)
     {
-        $this->cache = $cacheHandler;
+        if ($cacheHandler instanceof Zend_Cache_Backend_Interface) {
+            $this->cache = $cacheHandler;
+
+            return $this;
+        }
+
+        $cacheClass = 'Zend_Cache_Backend_' . $cacheHandler['cache']['type'];
+        $_cache = new $cacheClass($cacheHandler);
+        $this->cache = $_cache;
+
+        if (isset($cacheHandler['cache']['maxlifetime'])) {
+            $this->maxlifetime = (int)$cacheHandler['cache']['maxlifetime'];
+        }
+
+        return $this;
     }
 
     public function open($save_path, $name)
     {
         return true;
     }
 
     public function close()
     {
         return true;
     }
 
     public function read($id)
     {
         if (false === ($data = $this->cache->load($id))) {
             return '';
         } else {
             return $data;
         }
     }
 
     public function write($id, $sessionData)
     {
         $this->cache->save($sessionData, $id, array(), $this->maxlifetime);
         return true;
     }
 
     public function destroy($id)
     {
         $this->cache->remove($id);
         return true;
     }
 
     public function gc($notusedformemcache)
     {
         return true;
     }
 
 }
\ No newline at end of file
diff --git a/library/Local/Tools/ParseDomain.php b/library/Local/Tools/ParseDomain.php
index 43f927a..64efaf0 100644
--- a/library/Local/Tools/ParseDomain.php
+++ b/library/Local/Tools/ParseDomain.php
@@ -1,121 +1,122 @@
 <?php
 
 /**
  *  ocs-apiserver
  *
  *  Copyright 2016 by pling GmbH.
  *
  *    This file is part of ocs-apiserver.
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Affero General Public License as
  *    published by the Free Software Foundation, either version 3 of the
  *    License, or (at your option) any later version.
  *
  *    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 Affero General Public License for more details.
  *
  *    You should have received a copy of the GNU Affero General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *    Created: 18.11.2016
  **/
 class Local_Tools_ParseDomain
 {
 
     /**
-     * @param $domain
      * @param bool $debug
      * @return string
      */
-    public static function get_domain($domain, $debug = false)
+    public static function get_domain($debug = false)
     {
-        if (false == isset($domain)) {
-            return null;
-        }
+        //Note the HTTP Host header may includes the port.
+        //$host = strtok($_SERVER['HTTP_HOST'], ':');
+        //$host = parse_url($_SERVER['HTTP_HOST'],PHP_URL_HOST);
+        list($host) = explode(':', $_SERVER['HTTP_HOST']);
 
-        $original = $domain = strtolower($domain);
+        $original = $domain = strtolower($host);
         if (filter_var($domain, FILTER_VALIDATE_IP)) {
             return $domain;
         }
         $debug ? print('<strong style="color:green">&raquo;</strong> Parsing: ' . $original) : false;
         $arr = array_slice(array_filter(explode('.', $domain, 4), function ($value) {
             return $value !== 'www';
         }), 0); //rebuild array indexes
         if (count($arr) > 2) {
             $count = count($arr);
             $_sub = explode('.', $count === 4 ? $arr[3] : $arr[2]);
             $debug ? print(" (parts count: {$count})") : false;
             if (count($_sub) === 2) // two level TLD
             {
                 $removed = array_shift($arr);
                 if ($count === 4) // got a subdomain acting as a domain
                 {
                     $removed = array_shift($arr);
                 }
                 $debug ? print("<br>\n" . '[*] Two level TLD: <strong>' . join('.', $_sub) . '</strong> ') : false;
             } elseif (count($_sub) === 1) // one level TLD
             {
                 $removed = array_shift($arr); //remove the subdomain
                 if (strlen($_sub[0]) === 2 && $count === 3) // TLD domain must be 2 letters
                 {
                     array_unshift($arr, $removed);
                 } else {
                     // non country TLD according to IANA
                     $tlds = array(
                         'aero',
                         'arpa',
                         'asia',
                         'biz',
                         'cat',
                         'com',
                         'coop',
                         'edu',
                         'gov',
                         'info',
                         'jobs',
                         'mil',
                         'mobi',
                         'museum',
                         'name',
                         'net',
                         'org',
                         'post',
                         'pro',
                         'tel',
                         'travel',
                         'xxx',
                     );
                     if (count($arr) > 2 && in_array($_sub[0], $tlds) !== false) //special TLD don't have a country
                     {
                         array_shift($arr);
                     }
                 }
                 $debug ? print("<br>\n" . '[*] One level TLD: <strong>' . join('.', $_sub) . '</strong> ') : false;
             } else // more than 3 levels, something is wrong
             {
                 for ($i = count($_sub); $i > 1; $i--) {
                     $removed = array_shift($arr);
                 }
                 $debug ? print("<br>\n" . '[*] Three level TLD: <strong>' . join('.', $_sub) . '</strong> ') : false;
             }
         } elseif (count($arr) === 2) {
             $arr0 = array_shift($arr);
             if (strpos(join('.', $arr), '.') === false
                 && in_array($arr[0], array('localhost', 'test', 'invalid')) === false
             ) // not a reserved domain
             {
                 $debug ? print("<br>\n" . 'Seems invalid domain: <strong>' . join('.',
                         $arr) . '</strong> re-adding: <strong>' . $arr0 . '</strong> ') : false;
                 // seems invalid domain, restore it
                 array_unshift($arr, $arr0);
             }
         }
         $debug ? print("<br>\n" . '<strong style="color:gray">&laquo;</strong> Done parsing: <span style="color:red">' . $original . '</span> as <span style="color:blue">' . join('.',
                 $arr) . "</span><br>\n") : false;
+
         return join('.', $arr);
     }
 
 }
\ No newline at end of file
diff --git a/public/info-local.php b/public/info-local.php
deleted file mode 100644
index 98a3c20..0000000
--- a/public/info-local.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Grendel
- * Date: 06.12.2017
- * Time: 16:17
- */
-phpinfo();
\ No newline at end of file
diff --git a/public/swagger/index.html b/public/swagger/index.html
new file mode 100644
index 0000000..6eea661
--- /dev/null
+++ b/public/swagger/index.html
@@ -0,0 +1,82 @@
+<!--
+  ~
+  ~   ocs-apiserver
+  ~
+  ~   Copyright 2016 by pling GmbH.
+  ~
+  ~    This file is part of ocs-apiserver.
+  ~
+  ~    This program is free software: you can redistribute it and/or modify
+  ~    it under the terms of the GNU Affero General Public License as
+  ~    published by the Free Software Foundation, either version 3 of the
+  ~    License, or (at your option) any later version.
+  ~
+  ~    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 Affero General Public License for more details.
+  ~
+  ~    You should have received a copy of the GNU Affero General Public License
+  ~    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Swagger UI</title>
+    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
+    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+    <style>
+        html
+        {
+            box-sizing: border-box;
+            overflow: -moz-scrollbars-vertical;
+            overflow-y: scroll;
+        }
+
+        *,
+        *:before,
+        *:after
+        {
+            box-sizing: inherit;
+        }
+
+        body
+        {
+            margin:0;
+            background: #fafafa;
+        }
+
+
+    </style>
+</head>
+
+<body>
+<div id="swagger-ui"></div>
+
+<script src="./swagger-ui-bundle.js"> </script>
+<script src="./swagger-ui-standalone-preset.js"> </script>
+<script>
+    window.onload = function() {
+        // Begin Swagger UI call region
+        const ui = SwaggerUIBundle({
+            url: "https://api.opendesktop.cc/swagger/openapi.json",
+            dom_id: '#swagger-ui',
+            deepLinking: true,
+            presets: [
+                SwaggerUIBundle.presets.apis,
+                SwaggerUIStandalonePreset.slice(1)
+            ],
+            layout: "StandaloneLayout"
+        });
+        // End Swagger UI call region
+
+        window.ui = ui
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/public/swagger/oauth2-redirect.html b/public/swagger/oauth2-redirect.html
new file mode 100644
index 0000000..ad3a8e8
--- /dev/null
+++ b/public/swagger/oauth2-redirect.html
@@ -0,0 +1,91 @@
+<!--
+  ~
+  ~   ocs-apiserver
+  ~
+  ~   Copyright 2016 by pling GmbH.
+  ~
+  ~    This file is part of ocs-apiserver.
+  ~
+  ~    This program is free software: you can redistribute it and/or modify
+  ~    it under the terms of the GNU Affero General Public License as
+  ~    published by the Free Software Foundation, either version 3 of the
+  ~    License, or (at your option) any later version.
+  ~
+  ~    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 Affero General Public License for more details.
+  ~
+  ~    You should have received a copy of the GNU Affero General Public License
+  ~    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<!doctype html>
+<html lang="en-US">
+<title>Swagger UI: OAuth2 Redirect</title>
+<body onload="run()">
+</body>
+</html>
+<script>
+    'use strict';
+    function run () {
+        var oauth2 = window.opener.swaggerUIRedirectOauth2;
+        var sentState = oauth2.state;
+        var redirectUrl = oauth2.redirectUrl;
+        var isValid, qp, arr;
+
+        if (/code|token|error/.test(window.location.hash)) {
+            qp = window.location.hash.substring(1);
+        } else {
+            qp = location.search.substring(1);
+        }
+
+        arr = qp.split("&")
+        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
+        qp = qp ? JSON.parse('{' + arr.join() + '}',
+            function (key, value) {
+                return key === "" ? value : decodeURIComponent(value)
+            }
+        ) : {}
+
+        isValid = qp.state === sentState
+
+        if ((
+            oauth2.auth.schema.get("flow") === "accessCode"||
+            oauth2.auth.schema.get("flow") === "authorizationCode"
+        ) && !oauth2.auth.code) {
+            if (!isValid) {
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "warning",
+                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                });
+            }
+
+            if (qp.code) {
+                delete oauth2.state;
+                oauth2.auth.code = qp.code;
+                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
+            } else {
+                let oauthErrorMsg
+                if (qp.error) {
+                    oauthErrorMsg = "["+qp.error+"]: " +
+                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
+                        (qp.error_uri ? "More info: "+qp.error_uri : "");
+                }
+
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "error",
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                });
+            }
+        } else {
+            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
+        }
+        window.close();
+    }
+</script>
\ No newline at end of file
diff --git a/public/swagger/openapi.json b/public/swagger/openapi.json
new file mode 100644
index 0000000..3d9a09c
--- /dev/null
+++ b/public/swagger/openapi.json
@@ -0,0 +1,1406 @@
+{
+  "openapi": "3.0.0",
+  "info": {
+    "title": "OCS API",
+    "description": "Partial implementation of the Open Collaboration Services v1.6 (https://www.freedesktop.org/wiki/Specifications/open-collaboration-services/).",
+    "version": "0.0.1",
+    "termsOfService": "https://www.opendesktop.org/terms",
+    "contact": {
+      "email": "contect@opendesktop.org"
+    },
+    "license": {
+      "name": "GNU Affero General Public License",
+      "url": "http://www.gnu.org/licenses/"
+    }
+  },
+  "servers": [
+    {
+      "url": "https://api.opendesktop.cc/ocs/v1",
+      "description": "Sandbox server (uses test data)"
+    },
+    {
+      "url": "https://api.opendesktop.org/ocs/v1",
+      "description": "Production server (uses live data)"
+    }
+  ],
+  "paths": {
+    "/content/categories": {
+      "get": {
+        "description": "Returns a list of available categories",
+        "tags": [
+          "content"
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Category"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "categories": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Category"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  },
+                  "xml": {
+                    "name": "ocs",
+                    "wrapped": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/content/data": {
+      "get": {
+        "description": "Gets a list of a specific set of contents.",
+        "tags": [
+          "content"
+        ],
+        "security": [
+          {
+            "BasicAuth": []
+          },
+          {
+            "BearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "in": "query",
+            "name": "categories",
+            "schema": {
+              "type": "string"
+            },
+            "description": "Requested category IDs separated by \",\". For backward compatibility with the OCS API specification, the values can also be separated by \"x\"."
+          },
+          {
+            "in": "query",
+            "name": "search",
+            "schema": {
+              "type": "string"
+            },
+            "description": "The part of the name of the item you want to find."
+          },
+          {
+            "in": "query",
+            "name": "tags",
+            "schema": {
+              "type": "string"
+            },
+            "description": "tags parameter values separated by \",\" and \"|\" for or filter"
+          },
+          {
+            "in": "query",
+            "name": "xdg_types",
+            "schema": {
+              "type": "string"
+            },
+            "description": "xdg_types parameter values separated by \",\""
+          },
+          {
+            "in": "query",
+            "name": "ghns_excluded",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "user",
+            "schema": {
+              "type": "string"
+            },
+            "description": "show only contents from one specific user."
+          },
+          {
+            "in": "query",
+            "name": "showfavorites",
+            "schema": {
+              "type": "string"
+            },
+            "description": "Show only favorites for auhtorized user"
+          },
+          {
+            "in": "query",
+            "name": "sortmode",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "new",
+                "alpha",
+                "high",
+                "down"
+              ]
+            }
+          },
+          {
+            "in": "query",
+            "name": "page",
+            "schema": {
+              "type": "string"
+            },
+            "description": "The content page. You can control the size of a page with the pagesize argument. The first page is 0, the second is 1, ..."
+          },
+          {
+            "in": "query",
+            "name": "pagesize",
+            "schema": {
+              "type": "string"
+            },
+            "description": "The amount of entries per page."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ContentCategories"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "categories": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ContentCategories"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  },
+                  "xml": {
+                    "name": "ocs",
+                    "wrapped": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/content/data/{contentid}": {
+      "get": {
+        "description": "Read content data of one specific content.",
+        "tags": [
+          "content"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "contentid",
+            "schema": {
+              "type": "integer"
+            },
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ContentDetails"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "categories": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ContentDetails"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  },
+                  "xml": {
+                    "name": "ocs",
+                    "wrapped": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/content/download/{contentid}/{itemid}": {
+      "get": {
+        "description": "Download or buy one specific content item. links to the package and links to repositories are supported. You get the dowloadlink or the packagename/packagerepository comination in the XML.",
+        "tags": [
+          "content"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "contentid",
+            "schema": {
+              "type": "integer"
+            },
+            "required": true
+          },
+          {
+            "in": "path",
+            "name": "itemid",
+            "schema": {
+              "type": "integer"
+            },
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ContentDownload"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "categories": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ContentDownload"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  },
+                  "xml": {
+                    "name": "ocs",
+                    "wrapped": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/content/previewpic/{contentid}": {
+      "get": {
+        "description": "tbd",
+        "tags": [
+          "content"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "contentid",
+            "schema": {
+              "type": "integer"
+            },
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation"
+          }
+        }
+      }
+    },
+    "/content/vote/{contentid}": {
+      "get": {
+        "description": "Vote for one specific content.",
+        "tags": [
+          "content"
+        ],
+        "security": [
+          {
+            "BasicAuth": []
+          },
+          {
+            "BearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "contentid",
+            "schema": {
+              "type": "integer"
+            },
+            "required": true
+          },
+          {
+            "in": "query",
+            "name": "vote",
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            },
+            "required": true
+          },
+          {
+            "in": "query",
+            "name": "msg",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/MetaVote"
+                    },
+                    "data": {
+                      "type": "object",
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/MetaVote"
+                    },
+                    "data": {
+                      "type": "object",
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  },
+                  "xml": {
+                    "name": "ocs",
+                    "wrapped": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/person/check": {
+      "post": {
+        "description": "Check if the given login and password or the API key is valid. It returns the associated username.",
+        "tags": [
+          "person"
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "login": {
+                    "type": "string"
+                  },
+                  "password": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "login",
+                  "password"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    {
+                      "$ref": "#/components/schemas/PersonId"
+                    }
+                  ]
+                },
+                "example": {
+                  "status": "ok",
+                  "statuscode": "100",
+                  "message": "ok",
+                  "data": {
+                    "details": "check",
+                    "personid": "frank"
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/PersonId"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  },
+                  "xml": {
+                    "name": "ocs",
+                    "wrapped": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/person/data/{person_id}": {
+      "get": {
+        "description": "Response Get the data from one specific person. Unauthorized request => The response contains only the public part of the personal data. Only authenticated users are allowed to access full data set. Authentication is done by sending a Basic HTTP Authorisation header.",
+        "tags": [
+          "person"
+        ],
+        "security": [
+          {
+            "BasicAuth": []
+          },
+          {
+            "BearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "person_id",
+            "schema": {
+              "type": "string"
+            },
+            "required": true,
+            "description": "ID of the user to get"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Person"
+                    }
+                  ]
+                },
+                "example": {
+                  "status": "ok",
+                  "statuscode": "100",
+                  "message": "ok",
+                  "data": {
+                    "details": "full",
+                    "personid": "dummy",
+                    "privacy": 0,
+                    "privacytext": "public",
+                    "firstname": "dummy_firstname",
+                    "lastname": "dummy_lastname",
+                    "gender": "",
+                    "communityrole": "",
+                    "homepage": "www.pling.com",
+                    "company": "",
+                    "avatarpic": "http://www.pling.com/member/avatar/96515bebd8e2ecbd1cf4625035ddf045/800",
+                    "avatarpicfound": 1,
+                    "bigavatarpic": "http://www.pling.com/member/avatar/96515bebd8e2ecbd1cf4625035ddf045/800",
+                    "bigavatarpicfound": 1,
+                    "birthday": "",
+                    "jobstatus": "",
+                    "city": "Berlin",
+                    "country": "Germany",
+                    "latitude": "",
+                    "longitude": "",
+                    "ircnick": "",
+                    "ircchannels": "",
+                    "irclink": "",
+                    "likes": "",
+                    "dontlikes": "",
+                    "interests": "",
+                    "languages": "",
+                    "programminglanguages": "",
+                    "favouritequote": "",
+                    "favouritemusic": "",
+                    "favouritetvshows": "",
+                    "favouritemovies": "",
+                    "favouritebooks": "",
+                    "favouritegames": "",
+                    "description": "",
+                    "profilepage": "http://www.pling.com/u/dummy"
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Person"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  },
+                  "xml": {
+                    "name": "ocs",
+                    "wrapped": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/person/self": {
+      "get": {
+        "description": "get the data from yourself. Only authenticated users are allowed to access this method. Authentication is done by sending a Basic HTTP Authorisation header.",
+        "tags": [
+          "person"
+        ],
+        "security": [
+          {
+            "BasicAuth": []
+          },
+          {
+            "BearerAuth": []
+          },
+          {
+            "OpenID": []
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "anyOf": [
+                    {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Person"
+                    }
+                  ]
+                },
+                "example": {
+                  "status": "ok",
+                  "statuscode": "100",
+                  "message": "ok",
+                  "data": {
+                    "details": "full",
+                    "personid": "dummy",
+                    "privacy": 0,
+                    "privacytext": "public",
+                    "firstname": "dummy_firstname",
+                    "lastname": "dummy_lastname",
+                    "gender": "",
+                    "communityrole": "",
+                    "homepage": "www.pling.com",
+                    "company": "",
+                    "avatarpic": "http://www.pling.com/member/avatar/96515bebd8e2ecbd1cf4625035ddf045/800",
+                    "avatarpicfound": 1,
+                    "bigavatarpic": "http://www.pling.com/member/avatar/96515bebd8e2ecbd1cf4625035ddf045/800",
+                    "bigavatarpicfound": 1,
+                    "birthday": "",
+                    "jobstatus": "",
+                    "city": "Berlin",
+                    "country": "Germany",
+                    "latitude": "",
+                    "longitude": "",
+                    "ircnick": "",
+                    "ircchannels": "",
+                    "irclink": "",
+                    "likes": "",
+                    "dontlikes": "",
+                    "interests": "",
+                    "languages": "",
+                    "programminglanguages": "",
+                    "favouritequote": "",
+                    "favouritemusic": "",
+                    "favouritetvshows": "",
+                    "favouritemovies": "",
+                    "favouritebooks": "",
+                    "favouritegames": "",
+                    "description": "",
+                    "profilepage": "http://www.pling.com/u/dummy"
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "$ref": "#/components/schemas/Meta"
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Person"
+                      },
+                      "xml": {
+                        "name": "data",
+                        "wrapped": true
+                      }
+                    }
+                  },
+                  "xml": {
+                    "name": "ocs",
+                    "wrapped": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/comments/data/{comment_type}/{contentid}/{second_id}": {
+      "get": {
+        "description": "Gets a list of comments.",
+        "tags": [
+          "comments"
+        ],
+        "security": [
+          {
+            "BasicAuth": []
+          },
+          {
+            "BearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "comment_type",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "in": "path",
+            "name": "contentid",
+            "schema": {
+              "type": "integer"
+            },
+            "required": true
+          },
+          {
+            "in": "path",
+            "name": "second_id",
+            "schema": {
+              "type": "integer"
+            },
+            "required": true
+          },
+          {
+            "in": "query",
+            "name": "page",
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "in": "query",
+            "name": "pagesize",
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Meta": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string"
+          },
+          "statuscode": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "message": {
+            "type": "string"
+          },
+          "totalitems": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "itemsperpage": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "xml": {
+          "name": "meta"
+        }
+      },
+      "Category": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "display-name": {
+            "type": "string"
+          },
+          "parent_id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "xdg_type": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "xml": {
+          "name": "category"
+        }
+      },
+      "ContentCategories": {
+        "type": "object",
+        "properties": {
+          "details": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string"
+          },
+          "typeid": {
+            "type": "integer"
+          },
+          "typename": {
+            "type": "string"
+          },
+          "xdg_type": {
+            "type": "string"
+          },
+          "language": {
+            "type": "string"
+          },
+          "personid": {
+            "type": "string"
+          },
+          "created": {
+            "type": "string"
+          },
+          "changed": {
+            "type": "string"
+          },
+          "downloads": {
+            "type": "integer"
+          },
+          "score": {
+            "type": "integer"
+          },
+          "summary": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "comments": {
+            "type": "integer"
+          },
+          "ghns_excluded": {
+            "type": "integer"
+          },
+          "preview1": {
+            "type": "string"
+          },
+          "detailpage": {
+            "type": "string"
+          },
+          "tags": {
+            "type": "string"
+          },
+          "previewpic1": {
+            "type": "string"
+          },
+          "previewpic2": {
+            "type": "string"
+          },
+          "smallpreviewpic1": {
+            "type": "string"
+          },
+          "smalpreviewpic2": {
+            "type": "string"
+          },
+          "downloadway1": {
+            "type": "integer"
+          },
+          "downloadtype1": {
+            "type": "string"
+          },
+          "downloadprice1": {
+            "type": "number"
+          },
+          "downloadlink1": {
+            "type": "string"
+          },
+          "downloadname1": {
+            "type": "string"
+          },
+          "downloadsize1": {
+            "type": "integer"
+          },
+          "downloadgpgfingerprint1": {
+            "type": "string"
+          },
+          "downloadgpgsignature1": {
+            "type": "string"
+          },
+          "downloadpackagename1": {
+            "type": "string"
+          },
+          "downloadrepository1": {
+            "type": "string"
+          },
+          "download_package_type1": {
+            "type": "string"
+          },
+          "download_package_arch1": {
+            "type": "string"
+          },
+          "downloadtags1": {
+            "type": "string"
+          }
+        },
+        "xml": {
+          "name": "content"
+        }
+      },
+      "ContentDetails": {
+        "type": "object",
+        "properties": {
+          "details": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string"
+          },
+          "typeid": {
+            "type": "integer"
+          },
+          "typename": {
+            "type": "string"
+          },
+          "xdg_type": {
+            "type": "string"
+          },
+          "language": {
+            "type": "string"
+          },
+          "personid": {
+            "type": "string"
+          },
+          "created": {
+            "type": "string"
+          },
+          "changed": {
+            "type": "string"
+          },
+          "downloads": {
+            "type": "integer"
+          },
+          "score": {
+            "type": "integer"
+          },
+          "summary": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "changelog": {
+            "type": "string"
+          },
+          "feedbackurl": {
+            "type": "string"
+          },
+          "homepage": {
+            "type": "string"
+          },
+          "homepagetype": {
+            "type": "string"
+          },
+          "donationpage": {
+            "type": "string"
+          },
+          "comments": {
+            "type": "integer"
+          },
+          "commentspage": {
+            "type": "string"
+          },
+          "fans": {
+            "type": "integer"
+          },
+          "fanspage": {
+            "type": "string"
+          },
+          "knowledgebaseentries": {
+            "type": "integer"
+          },
+          "knowledgebasepage": {
+            "type": "string"
+          },
+          "depend": {
+            "type": "string"
+          },
+          "preview1": {
+            "type": "string"
+          },
+          "icon": {
+            "type": "string"
+          },
+          "video": {
+            "type": "string"
+          },
+          "detailpage": {
+            "type": "string"
+          },
+          "ghns_excluded": {
+            "type": "integer"
+          },
+          "tags": {
+            "type": "string"
+          },
+          "previewpic1": {
+            "type": "string"
+          },
+          "previewpic2": {
+            "type": "string"
+          },
+          "smallpreviewpic1": {
+            "type": "string"
+          },
+          "smalpreviewpic2": {
+            "type": "string"
+          },
+          "downloadway1": {
+            "type": "integer"
+          },
+          "downloadtype1": {
+            "type": "string"
+          },
+          "downloadprice1": {
+            "type": "number"
+          },
+          "downloadlink1": {
+            "type": "string"
+          },
+          "downloadname1": {
+            "type": "string"
+          },
+          "downloadsize1": {
+            "type": "integer"
+          },
+          "downloadgpgfingerprint1": {
+            "type": "string"
+          },
+          "downloadgpgsignature1": {
+            "type": "string"
+          },
+          "downloadpackagename1": {
+            "type": "string"
+          },
+          "downloadrepository1": {
+            "type": "string"
+          },
+          "download_package_type1": {
+            "type": "string"
+          },
+          "download_package_arch1": {
+            "type": "string"
+          },
+          "downloadtags1": {
+            "type": "string"
+          }
+        },
+        "xml": {
+          "name": "content"
+        }
+      },
+      "ContentDownload": {
+        "type": "object",
+        "properties": {
+          "details": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "downloadway": {
+            "type": "string"
+          },
+          "downloadlink": {
+            "type": "string"
+          },
+          "mimetype": {
+            "type": "string"
+          },
+          "gpgfingerprint": {
+            "type": "string"
+          },
+          "gpgsignature": {
+            "type": "string"
+          },
+          "packagename": {
+            "type": "string"
+          },
+          "repository": {
+            "type": "string"
+          },
+          "download_package_type": {
+            "type": "string"
+          },
+          "download_package_arch": {
+            "type": "string"
+          },
+          "downloadtags": {
+            "type": "string"
+          }
+        },
+        "xml": {
+          "name": "content"
+        }
+      },
+      "Person": {
+        "type": "object",
+        "properties": {
+          "details": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "personid": {
+            "type": "string"
+          },
+          "privacy": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "privacytext": {
+            "type": "string"
+          },
+          "firstname": {
+            "type": "string"
+          },
+          "lastname": {
+            "type": "string"
+          },
+          "gender": {
+            "type": "string"
+          },
+          "communityrole": {
+            "type": "string"
+          },
+          "homepage": {
+            "type": "string"
+          },
+          "company": {
+            "type": "string"
+          },
+          "avatarpic": {
+            "type": "string"
+          },
+          "avatarpicfound": {
+            "type": "integer"
+          },
+          "birthday": {
+            "type": "string"
+          },
+          "jobstatus": {
+            "type": "string"
+          },
+          "city": {
+            "type": "string"
+          },
+          "country": {
+            "type": "string"
+          },
+          "latitude": {
+            "type": "string"
+          },
+          "longtitude": {
+            "type": "string"
+          },
+          "ircnick": {
+            "type": "string"
+          },
+          "ircchannels": {
+            "type": "string"
+          },
+          "irclink": {
+            "type": "string"
+          },
+          "likes": {
+            "type": "integer"
+          },
+          "dontlikes": {
+            "type": "integer"
+          },
+          "interests": {
+            "type": "string"
+          },
+          "languages": {
+            "type": "string"
+          },
+          "programminglanguages": {
+            "type": "string"
+          },
+          "favouritequote": {
+            "type": "string"
+          },
+          "favouritemusic": {
+            "type": "string"
+          },
+          "favouritetvshows": {
+            "type": "string"
+          },
+          "favouritemovies": {
+            "type": "string"
+          },
+          "favouritebooks": {
+            "type": "string"
+          },
+          "favouritegames": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "profilepage": {
+            "type": "string"
+          }
+        },
+        "xml": {
+          "name": "person"
+        }
+      },
+      "PersonId": {
+        "type": "object",
+        "properties": {
+          "details": {
+            "type": "string",
+            "xml": {
+              "attribute": true
+            }
+          },
+          "personid": {
+            "type": "string"
+          }
+        },
+        "xml": {
+          "name": "person"
+        }
+      },
+      "MetaVote": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string"
+          },
+          "statuscode": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "message": {
+            "type": "string"
+          },
+          "score": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "xml": {
+          "name": "meta"
+        }
+      }
+    },
+    "securitySchemes": {
+      "BasicAuth": {
+        "type": "http",
+        "scheme": "basic"
+      },
+      "BearerAuth": {
+        "type": "http",
+        "scheme": "bearer"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/swagger/openapi.yaml b/public/swagger/openapi.yaml
new file mode 100644
index 0000000..e587cd7
--- /dev/null
+++ b/public/swagger/openapi.yaml
@@ -0,0 +1,934 @@
+openapi: "3.0.0"
+info:
+  title: OCS API
+  description: Partial implementation of the Open Collaboration Services v1.6 (https://www.freedesktop.org/wiki/Specifications/open-collaboration-services/).  
+  version: 0.0.1
+  termsOfService: "https://www.opendesktop.org/terms"
+  contact:
+    email: "contect@opendesktop.org"
+  license:
+    name: "GNU Affero General Public License"
+    url: "http://www.gnu.org/licenses/"
+servers:
+  - url: http://localhost:8070/ocs/v1
+    description: DEV server
+  - url: https://api.opendesktop.cc/ocs/v1
+    description: Sandbox server (uses test data)
+  - url: https://api.opendesktop.org/ocs/v1
+    description: Production server (uses live data)
+paths:
+  /content/categories:
+    get:
+      description: Returns a list of available categories
+      tags:
+        - content
+      responses:
+        200:
+          description: "successful operation"
+          content:
+            application/json:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  data:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/Category"
+                    xml:
+                      name: "data"
+                      wrapped: true
+            application/xml:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  categories:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/Category"
+                    xml:
+                      name: "data"
+                      wrapped: true
+                xml:
+                  name: "ocs"
+                  wrapped: true
+  /content/data:
+    get:
+      description: Gets a list of a specific set of contents. 
+      tags: 
+        - content
+      security:
+        - BasicAuth: []
+        - BearerAuth: []
+      parameters:
+        - in: query
+          name: categories
+          schema:
+            type: string
+          description: Requested category IDs separated by ",". For backward compatibility with the OCS API specification, the values can also be separated by "x".
+        - in: query
+          name: search
+          schema:
+            type: string
+          description: The part of the name of the item you want to find.
+        - in: query
+          name: tags
+          schema:
+            type: string
+          description: tags parameter values separated by "," and "|" for or filter 
+        - in: query
+          name: xdg_types
+          schema:
+            type: string
+          description: xdg_types parameter values separated by ","
+        - in: query
+          name: ghns_excluded
+          schema:
+            type: string
+        - in: query
+          name: user
+          schema:
+            type: string
+          description: show only contents from one specific user.  
+        - in: query
+          name: showfavorites
+          schema:
+            type: string
+          description: Show only favorites for auhtorized user 
+        - in: query
+          name: sortmode
+          schema:
+            type: string
+            enum: [new,alpha,high,down]
+        - in: query
+          name: page
+          schema:
+            type: string
+          description: The content page. You can control the size of a page with the pagesize argument. The first page is 0, the second is 1, ... 
+        - in: query
+          name: pagesize
+          schema:
+            type: string
+          description: The amount of entries per page.
+      responses:
+        200:
+          description: "successful operation"
+          content:
+            application/json:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  data:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/ContentCategories"
+                    xml:
+                      name: "data"
+                      wrapped: true
+            application/xml:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  categories:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/ContentCategories"
+                    xml:
+                      name: "data"
+                      wrapped: true
+                xml:
+                  name: "ocs"
+                  wrapped: true
+  /content/data/{contentid}:
+    get:
+      description: Read content data of one specific content. 
+      tags:
+        - content
+      parameters: 
+        - in: path
+          name: contentid
+          schema:
+            type: integer
+          required: true
+      responses:
+        200: 
+          description: "successful operation"
+          content:
+            application/json:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  data:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/ContentDetails"
+                    xml:
+                      name: "data"
+                      wrapped: true
+            application/xml:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  categories:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/ContentDetails"
+                    xml:
+                      name: "data"
+                      wrapped: true
+                xml:
+                  name: "ocs"
+                  wrapped: true
+  /content/download/{contentid}/{itemid}:
+    get:
+      description: Download or buy one specific content item. links to the package and links to repositories are supported. You get the dowloadlink or the packagename/packagerepository comination in the XML.
+      tags:
+        - content
+      parameters:
+        - in: path
+          name: contentid
+          schema: 
+            type: integer
+          required: true
+        - in: path
+          name: itemid
+          schema:
+            type: integer
+          required: true
+      responses: 
+        200:
+          description: "successful operation"
+          content:
+            application/json:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  data:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/ContentDownload"
+                    xml:
+                      name: "data"
+                      wrapped: true
+            application/xml:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  categories:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/ContentDownload"
+                    xml:
+                      name: "data"
+                      wrapped: true
+                xml:
+                  name: "ocs"
+                  wrapped: true
+  /content/previewpic/{contentid}:
+    get:
+      description: tbd
+      tags:
+       - content
+      parameters:
+        - in: path
+          name: contentid
+          schema:
+            type: integer
+          required: true
+      responses:
+        200:
+          description: "successful operation"
+  /content/vote/{contentid}:
+    get:
+      description: Vote for one specific content. 
+      tags:
+        - content
+      security:
+        - BasicAuth: []
+        - BearerAuth: []
+      parameters:
+        - in: path
+          name: contentid
+          schema:
+            type: integer
+          required: true
+        - in: query
+          name: vote
+          schema:
+            type: integer
+            minimum: 0
+            maximum: 100
+          required: true
+        - in: query
+          name: msg
+          schema:
+            type: string
+      responses:
+        200:
+          description: "successful operation"
+          content:
+            application/json:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/MetaVote"
+                  data:
+                    type: "object"
+                    xml:
+                      name: "data"
+                      wrapped: true
+            application/xml:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/MetaVote"
+                  data:
+                    type: "object"
+                    xml:
+                      name: "data"
+                      wrapped: true
+                xml:
+                  name: "ocs"
+                  wrapped: true
+  /person/check:
+    post:
+      description: Check if the given login and password or the API key is valid. It returns the associated username.
+      tags:
+        - person
+      requestBody:
+        required: true
+        content:
+          application/x-www-form-urlencoded:
+            schema:
+              type: object
+              properties:
+                login:      # <!--- form field name
+                  type: string
+                password:   # <!--- form field name
+                  type: string
+              required:
+                - login
+                - password
+      responses:
+        200:
+          description: "successful operation"
+          content:
+            application/json:
+              schema:
+                anyOf:
+                  - $ref: "#/components/schemas/Meta"
+                  - $ref: "#/components/schemas/PersonId"
+              example: 
+                status: "ok"
+                statuscode: "100"
+                message: "ok"
+                data: 
+                  details: "check"
+                  personid: "frank"
+            application/xml:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  data:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/PersonId"
+                    xml:
+                      name: "data"
+                      wrapped: true
+                xml:
+                  name: "ocs"
+                  wrapped: true
+  /person/data/{person_id}:
+    get:
+      description: Response Get the data from one specific person. Unauthorized request => The response contains only the public part of the personal data. Only authenticated users are allowed to access full data set. Authentication is done by sending a Basic HTTP Authorisation header.
+      tags:
+        - person
+      security:
+        - BasicAuth: []
+        - BearerAuth: []
+      parameters:
+        - in: path
+          name: person_id
+          schema:
+            type: string
+          required: true
+          description: ID of the user to get
+      responses:
+        "200":
+          description: "successful operation"
+          content:
+            application/json:
+              schema:
+                anyOf:
+                  - $ref: "#/components/schemas/Meta"
+                  - $ref: "#/components/schemas/Person"
+              example: 
+                status: "ok"
+                statuscode: "100"
+                message: "ok"
+                data:
+                  details: "full"
+                  personid: "dummy"
+                  privacy: 0
+                  privacytext: "public"
+                  firstname: "dummy_firstname"
+                  lastname: "dummy_lastname"
+                  gender: ""
+                  communityrole: ""
+                  homepage: "www.pling.com"
+                  company: ""
+                  avatarpic: "http://www.pling.com/member/avatar/96515bebd8e2ecbd1cf4625035ddf045/800"
+                  avatarpicfound: 1
+                  bigavatarpic: "http://www.pling.com/member/avatar/96515bebd8e2ecbd1cf4625035ddf045/800"
+                  bigavatarpicfound: 1
+                  birthday: ""
+                  jobstatus: ""
+                  city: "Berlin"
+                  country: "Germany"
+                  latitude: ""
+                  longitude: ""
+                  ircnick: ""
+                  ircchannels: ""
+                  irclink: ""
+                  likes: ""
+                  dontlikes: ""
+                  interests: ""
+                  languages: ""
+                  programminglanguages: ""
+                  favouritequote: ""
+                  favouritemusic: ""
+                  favouritetvshows: ""
+                  favouritemovies: ""
+                  favouritebooks: ""
+                  favouritegames: ""
+                  description: ""
+                  profilepage: "http://www.pling.com/u/dummy"
+            application/xml:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  data:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/Person"
+                    xml:
+                      name: "data"
+                      wrapped: true
+                xml:
+                  name: "ocs"
+                  wrapped: true
+  /person/self:
+    get:
+      description: get the data from yourself. Only authenticated users are allowed to access this method. Authentication is done by sending a Basic HTTP Authorisation header. 
+      tags:
+        - person
+      security:
+        - BasicAuth: []
+        - BearerAuth: []
+        - OpenID: []
+      responses:
+        "200":
+          description: "successful operation"
+          content:
+            application/json:
+              schema:
+                anyOf:
+                  - $ref: "#/components/schemas/Meta"
+                  - $ref: "#/components/schemas/Person"
+              example: 
+                status: "ok"
+                statuscode: "100"
+                message: "ok"
+                data:
+                  details: "full"
+                  personid: "dummy"
+                  privacy: 0
+                  privacytext: "public"
+                  firstname: "dummy_firstname"
+                  lastname: "dummy_lastname"
+                  gender: ""
+                  communityrole: ""
+                  homepage: "www.pling.com"
+                  company: ""
+                  avatarpic: "http://www.pling.com/member/avatar/96515bebd8e2ecbd1cf4625035ddf045/800"
+                  avatarpicfound: 1
+                  bigavatarpic: "http://www.pling.com/member/avatar/96515bebd8e2ecbd1cf4625035ddf045/800"
+                  bigavatarpicfound: 1
+                  birthday: ""
+                  jobstatus: ""
+                  city: "Berlin"
+                  country: "Germany"
+                  latitude: ""
+                  longitude: ""
+                  ircnick: ""
+                  ircchannels: ""
+                  irclink: ""
+                  likes: ""
+                  dontlikes: ""
+                  interests: ""
+                  languages: ""
+                  programminglanguages: ""
+                  favouritequote: ""
+                  favouritemusic: ""
+                  favouritetvshows: ""
+                  favouritemovies: ""
+                  favouritebooks: ""
+                  favouritegames: ""
+                  description: ""
+                  profilepage: "http://www.pling.com/u/dummy"
+            application/xml:
+              schema:
+                type: "object"
+                properties:
+                  meta:
+                    $ref: "#/components/schemas/Meta"
+                  data:
+                    type: "array"
+                    items:
+                      $ref: "#/components/schemas/Person"
+                    xml:
+                      name: "data"
+                      wrapped: true
+                xml:
+                  name: "ocs"
+                  wrapped: true
+  /comments/data/{comment_type}/{contentid}/{second_id}:
+    get:
+      description: Gets a list of comments.
+      tags:
+        - comments
+      security:
+        - BasicAuth: []
+        - BearerAuth: []
+      parameters:
+        - in: path
+          name: comment_type
+          schema:
+            type: "string"
+          required: true
+        - in: path
+          name: contentid
+          schema:
+            type: "integer"
+          required: true
+        - in: path
+          name: second_id
+          schema: 
+            type: integer
+          required: true
+        - in: query
+          name: page
+          schema:
+            type: integer
+        - in: query
+          name: pagesize
+          schema:
+            type: integer
+      responses:
+        200:
+          description: "successful operation"
+components:
+  schemas:
+    Meta:
+      type: "object"
+      properties:
+        status:
+          type: "string"
+        statuscode:
+          type: "integer"
+          format: "int64"
+        message:
+          type: "string"
+        totalitems:
+          type: "integer"
+          format: "int64"
+        itemsperpage:
+          type: "integer"
+          format: "int64"
+      xml:
+        name: "meta"
+    Category:
+      type: "object"
+      properties:
+        id:
+          type: "integer"
+          format: "int64"
+        name:
+          type: "string"
+        display-name:
+          type: "string"
+        parent_id:
+          type: "integer"
+          format: "int64"
+        xdg_type:
+          type: "integer"
+          format: "int64"
+      xml:
+        name: "category"
+    ContentCategories:
+      type: "object"
+      properties:
+        details:
+          type: "string"
+          xml:
+            attribute: true
+        id:
+          type: "integer"
+          format: "int64"
+        name:
+          type: "string"
+        version:
+          type: "string"
+        typeid:
+          type: "integer"
+        typename: 
+          type: "string"
+        xdg_type:
+          type: "string"
+        language:
+          type: "string"
+        personid:
+          type: "string"
+        created:
+          type: "string"
+        changed: 
+          type: "string"
+        downloads:
+          type: "integer"
+        score:
+          type: "integer"
+        summary:
+          type: "string"
+        description:
+          type: "string"
+        comments:
+          type: "integer"
+        ghns_excluded:
+          type: "integer"
+        preview1:
+          type: "string"
+        detailpage:
+          type: "string"
+        tags:
+          type: "string"
+        previewpic1:
+          type: "string"
+        previewpic2:
+          type: "string"
+        smallpreviewpic1:
+          type: "string"
+        smalpreviewpic2:
+          type: "string"
+        downloadway1:
+          type: "integer"
+        downloadtype1:
+          type: "string"
+        downloadprice1:
+          type: "number"
+        downloadlink1:
+          type: "string"
+        downloadname1:
+          type: "string"
+        downloadsize1:
+          type: "integer"
+        downloadgpgfingerprint1:
+          type: "string"
+        downloadgpgsignature1:
+          type: "string"
+        downloadpackagename1:
+          type: "string"
+        downloadrepository1:
+          type: "string"
+        download_package_type1:
+          type: "string"
+        download_package_arch1:
+          type: "string"
+        downloadtags1:
+          type: "string"
+      xml:
+        name: "content"
+    ContentDetails:
+      type: "object"
+      properties:
+        details:
+          type: "string"
+          xml:
+            attribute: true
+        id:
+          type: "integer"
+          format: "int64"
+        name:
+          type: "string"
+        version:
+          type: "string"
+        typeid:
+          type: "integer"
+        typename: 
+          type: "string"
+        xdg_type:
+          type: "string"
+        language:
+          type: "string"
+        personid:
+          type: "string"
+        created:
+          type: "string"
+        changed: 
+          type: "string"
+        downloads:
+          type: "integer"
+        score:
+          type: "integer"
+        summary:
+          type: "string"
+        description:
+          type: "string"
+        changelog:
+          type: "string"
+        feedbackurl:
+          type: "string"
+        homepage:
+          type: "string"
+        homepagetype:
+          type: "string"
+        donationpage:
+          type: "string"
+        comments:
+          type: "integer"
+        commentspage:
+          type: "string"
+        fans:
+          type: "integer"
+        fanspage:
+          type: "string"
+        knowledgebaseentries:
+          type: "integer"
+        knowledgebasepage:
+          type: "string"
+        depend:
+          type: "string"
+        preview1:
+          type: "string"
+        icon:
+          type: "string"
+        video:
+          type: "string"
+        detailpage:
+          type: "string"
+        ghns_excluded:
+          type: "integer"
+        tags:
+          type: "string"
+        previewpic1:
+          type: "string"
+        previewpic2:
+          type: "string"
+        smallpreviewpic1:
+          type: "string"
+        smalpreviewpic2:
+          type: "string"
+        downloadway1:
+          type: "integer"
+        downloadtype1:
+          type: "string"
+        downloadprice1:
+          type: "number"
+        downloadlink1:
+          type: "string"
+        downloadname1:
+          type: "string"
+        downloadsize1:
+          type: "integer"
+        downloadgpgfingerprint1:
+          type: "string"
+        downloadgpgsignature1:
+          type: "string"
+        downloadpackagename1:
+          type: "string"
+        downloadrepository1:
+          type: "string"
+        download_package_type1:
+          type: "string"
+        download_package_arch1:
+          type: "string"
+        downloadtags1:
+          type: "string"        
+      xml:
+        name: "content"
+    ContentDownload:
+      type: "object"
+      properties:
+        details:
+          type: "string"
+          xml:
+            attribute: true
+        downloadway:
+          type: "string"
+        downloadlink:
+          type: "string"
+        mimetype:
+          type: "string"
+        gpgfingerprint:
+          type: "string"
+        gpgsignature:
+          type: "string"
+        packagename:
+          type: "string"
+        repository:
+          type: "string"
+        download_package_type:
+          type: "string"
+        download_package_arch:
+          type: "string"
+        downloadtags:
+          type: "string"
+      xml:
+        name: "content"
+    Person:
+      type: "object"
+      properties:
+        details:
+          type: "string"
+          xml:
+            attribute: true
+        personid:
+          type: "string"
+        privacy:
+          type: "integer"
+          format: "int64"
+        privacytext:
+          type: "string"
+        firstname:
+          type: "string"
+        lastname:
+          type: "string"
+        gender:
+          type: "string"
+        communityrole:
+          type: "string"
+        homepage:
+          type: "string"
+        company:
+          type: "string"
+        avatarpic:
+          type: "string"
+        avatarpicfound:
+          type: "integer"
+        birthday:
+          type: "string"
+        jobstatus:
+          type: "string"
+        city:
+          type: "string"
+        country:
+          type: "string"
+        latitude:
+          type: "string"
+        longtitude:
+          type: "string"
+        ircnick:
+          type: "string"
+        ircchannels:
+          type: "string"
+        irclink:
+          type: "string"
+        likes:
+          type: "integer"
+        dontlikes:
+          type: "integer"
+        interests:
+          type: "string"
+        languages:
+          type: "string"
+        programminglanguages:
+          type: "string"
+        favouritequote:
+          type: "string"
+        favouritemusic:
+          type: "string"
+        favouritetvshows:
+          type: "string"
+        favouritemovies:
+          type: "string"
+        favouritebooks:
+          type: "string"
+        favouritegames:
+          type: "string"
+        description:
+          type: "string"
+        profilepage:
+          type: "string"
+      xml:
+        name: "person"
+    PersonId:
+      type: "object"
+      properties:
+        details:
+          type: "string"
+          xml:
+            attribute: true
+        personid:
+          type: "string"
+      xml:
+        name: "person"
+    MetaVote:
+      type: "object"
+      properties:
+        status:
+          type: "string"
+        statuscode:
+          type: "integer"
+          format: "int64"
+        message:
+          type: "string"
+        score:
+          type: "integer"
+          format: "int64"
+      xml:
+        name: "meta"
+  securitySchemes:
+    BasicAuth:
+      type: http
+      scheme: basic
+    BearerAuth:
+      type: http
+      scheme: bearer
+#    ApiKeyAuth:
+#      type: apiKey
+#      in: header
+#      name: X-API-Key
+#    OpenID:
+#      type: openIdConnect
+#      openIdConnectUrl: http://localhost:8889/.well-known/openid-configuration
+#    OAuth2:
+#      type: oauth2
+#      flows:
+#        authorizationCode:
+#          authorizationUrl: http://localhost:8889/oauth/authorize
+#          tokenUrl: http://localhost:8889/oauth/token
+#          scopes:
+#            profile: Grants read access
+#            write: Grants write access
+#            admin: Grants access to admin operations
\ No newline at end of file