diff --git a/application/modules/default/controllers/Ocsv1Controller.php b/application/modules/default/controllers/Ocsv1Controller.php
index 4c5293223..84a62bb5b 100644
--- a/application/modules/default/controllers/Ocsv1Controller.php
+++ b/application/modules/default/controllers/Ocsv1Controller.php
@@ -1,2009 +1,2009 @@
 <?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/>.
  **/
 
 /**
  * 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)
  * 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;
 
     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'  => 'pling.me'
     );
 
     protected $_params = array();
 
     public function init()
     {
         parent::init();
         $this->initView();
         $this->_initUriScheme();
         $this->_initRequestParamsAndFormat();
         $this->_initConfig();
         $this->_initResponseHeader();
     }
 
     public function initView()
     {
         // Disable render view
         $this->_helper->layout->disableLayout();
         $this->_helper->viewRenderer->setNoRender(true);
     }
 
     protected function _initUriScheme()
     {
         if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] === '1')) {
             $this->_uriScheme = 'https';
         } else {
             $this->_uriScheme = 'http';
         }
     }
 
     /**
      * @throws Zend_Exception
      */
     protected function _initRequestParamsAndFormat()
     {
         // Set request parameters
         switch (strtoupper($_SERVER['REQUEST_METHOD'])) {
             case 'GET':
                 $this->_params = $_GET;
                 break;
             case 'PUT':
                 parse_str(file_get_contents('php://input'), $_PUT);
                 $this->_params = $_PUT;
                 break;
             case 'POST':
                 $this->_params = $_POST;
                 break;
             default:
                 Zend_Registry::get('logger')->err(__METHOD__ . ' - request method not supported - ' . $_SERVER['REQUEST_METHOD']);
                 exit('request method not supported');
         }
 
         // Set format option
         if (isset($this->_params['format']) && strtolower($this->_params['format']) == 'json') {
             $this->_format = 'json';
         }
     }
 
     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 = $_SERVER['SERVER_NAME'];
 
         //Mask api.kde-look.org to store.kde.org
         if (strpos($_SERVER['SERVER_NAME'], 'api.kde-look.org') !== false) {
             $webSite = 'store.kde.org';
         }
 
         $this->_config = array(
                 'id'         => $_SERVER['SERVER_NAME'],
                 'location'   => $baseUri . '/ocs/v1/',
                 'name'       => $clientConfig['head']['browser_title'],
                 'icon'       => $baseUri . $clientConfig['logo'],
                 'termsofuse' => $baseUri . '/content/terms',
                 'register'   => $baseUri . '/register',
                 'website'    => $webSite,
                 'host'       => $_SERVER['SERVER_NAME']
             ) + $this->_config;
     }
 
     /**
      * @return array|null
      */
     protected function _loadClientConfig()
     {
         $clientConfigReader = new Backend_Model_ClientFileConfig($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
      */
     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('Last-Modified', $modifiedTime, true)
              ->setHeader('Expires', $expires, true)
              ->setHeader('Pragma', 'cache', true)
              ->setHeader('Cache-Control', 'max-age=1800, public', true)
         ;
     }
 
     public function indexAction()
     {
         $this->_sendErrorResponse(999, 'unknown request');
     }
 
     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)
                 )
             );
         }
 
         $this->_sendResponse($response, $this->_format);
     }
 
     protected function _sendResponse($response, $format = 'xml', $xmlRootTag = 'ocs', $local = false)
     {
         header('Pragma: public');
         header('Cache-Control: cache, must-revalidate');
         $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');
             if($local) {
                 echo json_encode($response);
             } else {
                 echo $response;
             }
         } else {
             header('Content-Type: application/xml; charset=UTF-8');
             if($local) {
                 echo $this->_convertXmlDom($response, $xmlRootTag)->saveXML();
             } else {
                 echo $response;
             }
         }
 
         exit;
     }
 
     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', true);
     }
 
     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, 'ocs', true);
     }
 
     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'];
         }
 
         if (!$identity) {
             $this->_sendErrorResponse(101, 'please specify all mandatory fields');
         } else {
             if (!$this->_authenticateUser($identity, $credential)) {
                 $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
                     )
                 )
             );
         } 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)
                     )
                 )
             );
         }
 
         $this->_sendResponse($response, $this->_format, 'ocs', true);
     }
 
     protected function _authenticateUser($identity = null, $credential = null, $force = false)
     {
         ////////////////////////////////////////////////////////
         // 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'];
         }
 
         $loginMethod = null;
         //if ($identity && !$credential) {
         //    $loginMethod = 'api-key';
         //}
 
         if ($identity && ($credential || $loginMethod == 'api-key')) {
             $authModel = new Default_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;
     }
 
     public function personselfAction()
     {
         $this->persondataAction(true);
     }
 
     public function persondataAction($self = false)
     {
         if (!$this->_authenticateUser()) {
             $this->_sendErrorResponse(101, 'person not found');
         }
 
         $tableMember = new Default_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) {
                 $this->_sendErrorResponse(101, 'person not found');
             }
 
             $profilePage = $this->_uriScheme . '://' . $this->_config['user_host'] . '/member/' . $member->member_id;
 
             if ($this->_format == 'json') {
                 $response = array(
                     'status'     => 'ok',
                     'statuscode' => 100,
                     'message'    => '',
                     'data'       => array(
                         array(
                             'details'              => 'full',
                             'personid'             => $member->username,
                             'privacy'              => 0,
                             'privacytext'          => 'public',
                             'firstname'            => $member->firstname,
                             'lastname'             => $member->lastname,
                             'gender'               => '',
                             'communityrole'        => '',
                             'homepage'             => $member->link_website,
                             'company'              => '',
                             'avatarpic'            => $member->profile_image_url,
                             'avatarpicfound'       => true,
                             'bigavatarpic'         => $member->profile_image_url,
                             'bigavatarpicfound'    => true,
                             'birthday'             => '',
                             'jobstatus'            => '',
                             'city'                 => $member->city,
                             'country'              => $member->country,
                             'latitude'             => '',
                             'longitude'            => '',
                             'ircnick'              => '',
                             'ircchannels'          => '',
                             'irclink'              => '',
                             'likes'                => '',
                             'dontlikes'            => '',
                             'interests'            => '',
                             'languages'            => '',
                             'programminglanguages' => '',
                             'favouritequote'       => '',
                             'favouritemusic'       => '',
                             'favouritetvshows'     => '',
                             'favouritemovies'      => '',
                             'favouritebooks'       => '',
                             'favouritegames'       => '',
                             'description'          => $member->biography,
                             'profilepage'          => $profilePage
                         )
                     )
                 );
             } else {
                 $response = array(
                     'meta' => array(
                         'status'     => array('@text' => 'ok'),
                         'statuscode' => array('@text' => 100),
                         'message'    => array('@text' => '')
                     ),
                     'data' => array(
                         'person' => array(
                             'details'              => 'full',
                             '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' => ''),
                             'homepage'             => array('@text' => $member->link_website),
                             'company'              => array('@text' => ''),
                             'avatarpic'            => array('@text' => $member->profile_image_url),
                             'avatarpicfound'       => array('@text' => true),
                             'bigavatarpic'         => array('@text' => $member->profile_image_url),
                             'bigavatarpicfound'    => array('@text' => true),
                             'birthday'             => array('@text' => ''),
                             'jobstatus'            => array('@text' => ''),
                             'city'                 => array('@text' => $member->city),
                             'country'              => array('@text' => $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' => $member->biography),
                             'profilepage'          => array('@text' => $profilePage)
                         )
                     )
                 );
             }
 
             $this->_sendResponse($response, $this->_format, 'ocs', true);
         } // Find a specific list of persons
         else {
             $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, 'ocs', true);
             }
 
             $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, 'ocs', true);
         }
     }
 
     public function contentcategoriesAction()
     {
-        
+
         if (!$this->_authenticateUser()) {
             //    $this->_sendErrorResponse(999, '');
         }
 
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         $storeName = $this->_getNameForStoreClient();
         $cacheName = 'api_content_categories'.md5($storeName);
 
         if (false == ($categoriesList = $cache->load($cacheName))) {
             $categoriesList = $this->_buildCategories();
             $cache->save($categoriesList, $cacheName, array(), 1800);
         }
 
         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);
             }
         }
 
         $this->_sendResponse($response, $this->_format, 'ocs', true);
     }
 
     protected function _buildCategories()
     {
         $modelCategoryTree = new Default_Model_ProjectCategory();
         $tree = $modelCategoryTree->fetchCategoryTreeCurrentStore();
 
         return $this->buildResponseTree($tree);
     }
 
     protected function buildResponseTree($tree)
     {
         $modelCategory = new Default_Model_DbTable_ProjectCategory();
         $result = array();
         foreach ($tree as $element) {
             if ($this->_format == 'json') {
                 $name = (false === empty($element['name_legacy'])) ? $element['name_legacy'] : $element['title'];
                 //set parent name to name, if neeed
                 if(isset($element['parent_id'])) {
                     $parent = $modelCategory->find($element['parent_id'])->current();
                     if($parent) {
                         $name = $parent['title'] . "/ " . $name;
                     }
                 }
                 $result[] = array(
                     'id'           => $element['id'],
                     'name'         => $name,
                     '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 {
                 $name = (false === empty($element['name_legacy'])) ? $element['name_legacy'] : $element['title'];
-                
+
                 //set parent name to name, if neeed
                 if(isset($element['parent_id'])) {
                     $parent = $modelCategory->find($element['parent_id'])->current();
                     if($parent) {
                         $name = $parent['title'] . "/ " . $name;
                     }
                 }
-                
+
                 $result[] = array(
                     'id'           => array('@text' => $element['id']),
                     'name'         => array('@text' => $name),
                     '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()
     {
-        
+
         $uri = $this->view->url();
-        
+
         $params = $this->getRequest()->getParams();
         $params['domain_store_id'] = $this->_getNameForStoreClient();
-        
+
         $result = $this->_request('GET', $uri, $params);
         $this->_sendResponse($result, $this->_format);
-        
+
         /*
-        
+
         if (!$this->_authenticateUser()) {
             //    $this->_sendErrorResponse(999, '');
         }
 
         $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
         );
 
         // Specific content data
         $requestedId = (int)$this->getParam('contentid') ? (int)$this->getParam('contentid') : null;
         $requestedTags = $this->getParam('tags') ? $this->getParam('tags') : null;
         if ($requestedId) {
             $response = $this->fetchContent($requestedId, $requestedTags, $previewPicSize, $smallPreviewPicSize, $pploadApi);
 
             $this->_sendResponse($response, $this->_format);
         } // Gets a list of a specific set of contents
         else {
             $response = $this->fetchCategoryContent($requestedTags, $previewPicSize, $smallPreviewPicSize, $pploadApi);
 
             $this->_sendResponse($response, $this->_format);
         }
-         * 
+         *
          */
     }
 
     /**
      * @param int        $contentId
      * @param array|null $tags
      * @param array      $previewPicSize
      * @param array      $smallPreviewPicSize
      * @param Ppload_Api $pploadApi
      *
      * @return array
      */
     protected function fetchContent(
         $contentId,
         $tags,
         $previewPicSize,
         $smallPreviewPicSize,
         $pploadApi
     ) {
         if(null == $tags) {
             $tags = '';
         }
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         $cacheName = 'api_fetch_content_by_id_' . $contentId . '_tags_' . md5($tags) . '_format_' . $this->_format;
 
         if (($response = $cache->load($cacheName))) {
             return $response;
         }
 
         $tableProject = new Default_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 = Default_Model_HtmlPurify::purify($project->title);
         $project->description = Default_Model_BBCode::renderHtml(Default_Model_HtmlPurify::purify($project->description));
         $project->version = Default_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, $tags);
-        
+
         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'                => $project->laplace_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'                 => $project->tags
                     ) + $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' => $project->laplace_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' => $project->tags)
                         ) + $previewPics + $smallPreviewPics + $downloadItems
                 )
             );
         }
 
         $cache->save($response, $cacheName);
 
         return $response;
     }
 
     /**
      * @param Zend_Db_Table $tableProject
      *
      * @param bool          $withSqlCalcFoundRows
      *
      * @return Zend_Db_Table_Select
      */
     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'
         ))->where('project.status = ?', Default_Model_Project::PROJECT_ACTIVE)
           ->where('project.ppload_collection_id IS NOT NULL')
         ;
 
         return $tableProjectSelect;
     }
 
     /**
      * @param Zend_Db_Table_Row_Abstract $project
      * @param array                      $previewPicSize
      * @param array                      $smallPreviewPicSize
      *
      * @return array
      */
     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 Default_View_Helper_Image();
         $previewPics = array(
             'previewpic1' => $viewHelperImage->Image($project->image_small, $previewPicSize)
         );
         $smallPreviewPics = array(
             'smallpreviewpic1' => $viewHelperImage->Image($project->image_small, $smallPreviewPicSize)
         );
 
         $tableProject = new Default_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
      *
      * @return array
      */
     protected function getPPLoadInfo($project, $pploadApi, $downloads, $tags)
     {
         $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 . '_tags_'.md5($tags);
 
         if (($pploadInfo = $cache->load($cacheName))) {
             return $pploadInfo;
         }
 
         $filesRequest = array(
             'collection_id'     => $project->ppload_collection_id,
             'ocs_compatibility' => 'compatible',
             'tags'              => $tags,
             'perpage'           => 1000
         );
-        
+
         $filesResponse = $pploadApi->getFiles($filesRequest);
 
         if (isset($filesResponse->status) && $filesResponse->status == 'success') {
             $i = 1;
             foreach ($filesResponse->files as $file) {
                 //create ppload download hash: secret + collection_id + expire-timestamp
                 $salt = PPLOAD_DOWNLOAD_SECRET;
                 $collectionID = $project->ppload_collection_id;
                 $timestamp = time() + (3600 * 12); // 12 hours valid
                 $hash = md5($salt . $collectionID . $timestamp);
 
                 $downloads += (int)$file->downloaded_count;
                 $tags = $this->_parseFileTags($file->tags);
-                $downloadLink = PPLOAD_API_URI . 'files/downloadfile/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;
                 $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] = $tags['packagetypeid'];
                 $downloadItems['download_package_arch' . $i] = $tags['packagearch'];
                 $downloadItems['download_architecture' . $i] = $tags['architectureid'];
                 $downloadItems['downloadtags' . $i] = empty($tags['filetags'])?'':implode(',',$tags['filetags']);
                 $i++;
             }
         }
 
         $cache->save(array($downloadItems, $downloads), $cacheName);
 
         return array($downloadItems, $downloads);
     }
 
     /**
      * @param string $fileTags
      *
      * @return array
      */
     protected function _parseFileTags($fileTags)
     {
         $tags = explode(',', $fileTags);
         $parsedTags = array(
             'link'          => '',
             'licensetype'   => '',
             'packagetypeid' => '',
             'packagearch'   => '',
             'filetags'      => '',
             'architectureid'  => ''
         );
         foreach ($tags as $tag) {
             $tag = trim($tag);
             if (strpos($tag, 'link##') === 0) {
                 $parsedTags['link'] = urldecode(str_replace('link##', '', $tag));
             } elseif (strpos($tag, 'licensetype-') === 0) {
                     $parsedTags['licensetype'] = str_replace('licensetype-', '', $tag);
             } elseif (strpos($tag, 'packagetypeid-') === 0) {
                     $parsedTags['packagetypeid'] = str_replace('packagetypeid-', '', $tag);
             } elseif (strpos($tag, 'packagearch-') === 0) {
                     $parsedTags['packagearch'] = str_replace('packagearch-', '', $tag);
             } elseif (strpos($tag, 'architectureid-') === 0) {
                     $parsedTags['architectureid'] = str_replace('architectureid-', '', $tag);
             } elseif (strpos($tag, '@@@') === 0) {
                 $strTags = substr($tag, 3, strlen($tag) - 2);
                 $parsedTags['filetags'] = explode('@@', $strTags);
             }
         }
 
         return $parsedTags;
     }
 
     /**
      * @param array      $tags
      * @param array      $previewPicSize
      * @param array      $smallPreviewPicSize
      * @param Ppload_Api $pploadApi
      *
      * @return array
      */
     protected function fetchCategoryContent(
         $tags,
         $previewPicSize,
         $smallPreviewPicSize,
         $pploadApi
     ) {
         $limit = 10; // 1 - 100
         $offset = 0;
 
         $tableProject = new Default_Model_Project();
         $tableProjectSelect = $this->_buildProjectSelect($tableProject, true);
 
         if (!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 Default_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);
         }
 
         if (!empty($this->_params['package_types'])) {
             // package_types parameter: values separated by ","
             $packageTypeList = explode(',', $this->_params['package_types']);
 
             $storeConfig = Zend_Registry::isRegistered('store_config') ? Zend_Registry::get('store_config') : null;
             $storePackageTypeIds = null;
             if ($storeConfig) {
                 $storePackageTypeIds = $storeConfig->package_type;
             }
 
             if ($storePackageTypeIds) {
                 $tableProjectSelect->join(array(
                     'package_type' => new Zend_Db_Expr('(SELECT DISTINCT project_id FROM project_package_type WHERE '
                         . $tableProject->getAdapter()->quoteInto('package_type_id IN (?)', $packageTypeList) . ')')
                 ), 'project.project_id = package_type.project_id', array());
             }
         }
-        
+
         if (!empty($this->_params['tags'])) {
             // package_types parameter: values separated by ","
             $tagList = explode(',', $this->_params['tags']);
-            
+
             foreach ($tagList as $tag) {
                 $tagKeyValue = explode('-', $tag);
                 $tagName = $tagKeyValue[0];
                 $tagValue = $tagKeyValue[1];
-                
+
                 if($tagName == 'architectureid') {
                     $tableProjectSelect->join(array(
                         $tagName => new Zend_Db_Expr('(SELECT DISTINCT tag_parent_object_id as project_id FROM tag_object WHERE  is_deleted = 0 and '
                             . $tableProject->getAdapter()->quoteInto('tag_id = ?', $tagValue)
                             . ' AND ' . $tableProject->getAdapter()->quoteInto('tag_type_id = ?', Default_Model_Tags::TAG_TYPE_FILE)
                             . ')')
                     ), 'project.project_id = '.$tagName. '.project_id', array());
                 } else {
                     $tableProjectSelect->join(array(
                         $tagName => new Zend_Db_Expr('(SELECT DISTINCT tag_object_id as project_id FROM tag_object WHERE is_deleted = 0 and  '
                             . $tableProject->getAdapter()->quoteInto('tag_id = ?', $tagValue) . ')')
                     ), 'project.project_id = '.$tagName. '.project_id', array());
                 }
             }
-            
+
         }
-        
+
         $hasSearchPart = false;
         if (!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 (!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['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(new Zend_Db_Expr('laplace_score(project.count_likes,project.count_dislikes) DESC'));
                     break;
                 case 'down':
                     $tableProjectSelect->joinLeft(array('stat_downloads_quarter_year' => 'stat_downloads_quarter_year'),
                         'project.project_id = stat_downloads_quarter_year.project_id', array());
                     $tableProjectSelect->order('stat_downloads_quarter_year.amount 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);
-        
+
         $projects = $tableProject->fetchAll($tableProjectSelect);
         $count = $tableProject->getAdapter()->fetchRow('select FOUND_ROWS() AS counter');
 
         if ($this->_format == 'json') {
             $response = array(
                 'status'       => 'ok',
                 'statuscode'   => 100,
                 'message'      => '',
                 'totalitems'   => $count['counter'],
                 'itemsperpage' => $limit,
                 'data'         => array()
             );
         } else {
             $response = array(
                 'meta' => array(
                     'status'       => array('@text' => 'ok'),
                     'statuscode'   => array('@text' => 100),
                     'message'      => array('@text' => ''),
                     'totalitems'   => array('@text' => $count['counter']),
                     'itemsperpage' => array('@text' => $limit)
                 ),
                 'data' => array()
             );
         }
 
         if (!count($projects)) {
             return $response;
         }
 
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         $cacheName = 'api_fetch_category_' . md5($tableProjectSelect->__toString().'-'.$tags);
         $contentsList = false;
 
         if (false === $hasSearchPart) {
             $contentsList = $cache->load($cacheName);
         }
 
         if (false == $contentsList) {
             $contentsList = $this->_buildContentList($previewPicSize, $smallPreviewPicSize, $pploadApi, $projects, $tags);
-            
+
             if (!count($contentsList)) {
                 if ($this->_format == 'json') {
                     $response = array(
                         'status'       => 'ok',
                         'statuscode'   => 100,
                         'message'      => '',
                         'totalitems'   => 0,
                         'itemsperpage' => $limit,
                         'data'         => array()
                     );
                 } else {
                     $response = array(
                         'meta' => array(
                             'status'       => array('@text' => 'ok'),
                             'statuscode'   => array('@text' => 100),
                             'message'      => array('@text' => ''),
                             'totalitems'   => array('@text' => 0),
                             'itemsperpage' => array('@text' => $limit)
                         ),
                         'data' => array()
                     );
                 }
                 return $response;
             }
-            
+
             if (false === $hasSearchPart) {
                 $cache->save($contentsList, $cacheName, array(), 1800);
             }
         }
 
         if ($this->_format == 'json') {
             $response['totalitems'] = count($contentsList);
             $response['data'] = $contentsList;
         } else {
             $response['meta']['totalitems'] = array('@text' => count($contentsList));
             $response['data'] = array('content' => $contentsList);
         }
 
         return $response;
     }
 
     /**
      * @param $previewPicSize
      * @param $smallPreviewPicSize
      * @param $pploadApi
      * @param $projects
      *
      * @return array
      */
     protected function _buildContentList($previewPicSize, $smallPreviewPicSize, $pploadApi, $projects, $tags)
     {
         $contentsList = array();
         $helperTruncate = new Default_View_Helper_Truncate();
         foreach ($projects as $project) {
             $project->description = $helperTruncate->truncate(Default_Model_BBCode::renderHtml(Default_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;
             list($downloadItems, $downloads) = $this->getPPLoadInfo($project, $pploadApi, $downloads, $tags);
-            
+
             if(count($downloadItems)>0) {
                 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'       => $project->laplace_score,
                             'summary'     => '',
                             'description' => $project->description,
                             'comments'    => $project->count_comments,
                             'ghns_excluded' => $project->ghns_excluded,
                             'preview1'    => $previewPage,
                             'detailpage'  => $previewPage,
                             'tags'        => $project->tags
                         ) + $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' => $project->laplace_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' => $project->tags)
                         ) + $previewPics + $smallPreviewPics + $downloadItems;
                 }
             }
         }
 
         return $contentsList;
     }
 
     public function contentdownloadAction()
     {
-        
+
         $uri = $this->view->url();
-        
+
         $params = $this->getRequest()->getParams();
         $params['domain_store_id'] = $this->_getNameForStoreClient();
-        
+
         $result = $this->_request('GET', $uri, $params);
         $this->_sendResponse($result, $this->_format);
-        
+
         /*
-        
+
         if (!$this->_authenticateUser()) {
             //$this->_sendErrorResponse(999, '');
         }
 
         $pploadApi = new Ppload_Api(array(
             'apiUri'   => PPLOAD_API_URI,
             'clientId' => PPLOAD_CLIENT_ID,
             'secret'   => PPLOAD_SECRET
         ));
 
         $project = null;
         $file = null;
 
         if ($this->getParam('contentid')) {
             $tableProject = new Default_Model_Project();
             $project = $tableProject->fetchRow(
                 $tableProject->select()
                              ->where('project_id = ?', $this->getParam('contentid'))
                              ->where('status = ?', Default_Model_Project::PROJECT_ACTIVE));
         }
 
         if (!$project) {
             $this->_sendErrorResponse(101, 'content not found');
         }
 
         if ($project->ppload_collection_id
             && $this->getParam('itemid')
             && ctype_digit((string)$this->getParam('itemid'))
         ) {
             $filesRequest = array(
                 'collection_id'     => $project->ppload_collection_id,
                 'ocs_compatibility' => 'compatible',
                 'perpage'           => 1,
                 'page'              => $this->getParam('itemid')
             );
 
             $filesResponse = $pploadApi->getFiles($filesRequest);
 
             if (isset($filesResponse->status)
                 && $filesResponse->status == 'success') {
                 $i = 0;
                 $file = $filesResponse->files->$i;
             }
         }
 
         if (!$file) {
             $this->_sendErrorResponse(103, 'content item not found');
         }
 
         //create ppload download hash: secret + collection_id + expire-timestamp
         $salt = PPLOAD_DOWNLOAD_SECRET;
         $collectionID = $project->ppload_collection_id;
         $timestamp = time() + (3600 * 12); // 12 hours valid
         $hash = md5($salt . $collectionID . $timestamp);
 
         $tags = $this->_parseFileTags($file->tags);
-        $downloadLink = PPLOAD_API_URI . 'files/downloadfile/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;
 
         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' => $tags['packagetypeid'],
                         'download_package_arch' => $tags['packagearch'],
                         'architecture' => $tags['architectureid'],
                         'downloadtags'          => empty($tags['filetags'])?'':implode(',',$tags['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' => $tags['packagetypeid']),
                         'download_package_arch' => array('@text' => $tags['packagearch']),
                         'architecture' => array('@text' => $tags['architectureid']),
                         'downloadtags'          => array('@text' => empty($tags['filetags'])?'':implode(',',$tags['filetags']))
                     )
                 )
             );
         }
 
         $this->_sendResponse($response, $this->_format);
-         * 
+         *
          */
     }
 
     public function contentpreviewpicAction()
     {
-        
+
         $uri = $this->view->url();
-        
+
         $params = $this->getRequest()->getParams();
         $params['domain_store_id'] = $this->_getNameForStoreClient();
-        
+
         $result = $this->_request('GET', $uri, $params);
         $this->_sendResponse($result, $this->_format);
-        
-        
-        
+
+
+
         /*
         if (!$this->_authenticateUser()) {
             //$this->_sendErrorResponse(999, '');
         }
 
         $project = null;
 
         if ($this->getParam('contentid')) {
             $tableProject = new Default_Model_Project();
             $project = $tableProject->fetchRow($tableProject->select()
                                                             ->where('project_id = ?', $this->getParam('contentid'))
                                                             ->where('status = ?', Default_Model_Project::PROJECT_ACTIVE));
         }
 
         if (!$project) {
             //$this->_sendErrorResponse(101, 'content not found');
             header('Location: ' . $this->_config['icon']);
             exit;
         }
 
         $viewHelperImage = new Default_View_Helper_Image();
         $previewPicSize = array(
             'width'  => 100,
             'height' => 100
         );
 
         if (!empty($this->_params['size'])
             && strtolower($this->_params['size']) == 'medium') {
             $previewPicSize = array(
                 'width'  => 770,
                 'height' => 540
             );
         }
 
         $previewPicUri = $viewHelperImage->Image($project->image_small, $previewPicSize);
 
         header('Location: ' . $previewPicUri);
         exit;
-         * 
+         *
          */
     }
 
     /**
      * @param null  $tableCategories
      * @param null  $parentCategoryId
      * @param array $categoriesList
      *
      * @return array
      * @deprecated
      */
     protected function _buildCategoriesList($tableCategories = null, $parentCategoryId = null, $categoriesList = array())
     {
         $categories = null;
 
         // Top-level categories
         if (!$tableCategories) {
             $tableCategories = new Default_Model_DbTable_ProjectCategory();
             if (Zend_Registry::isRegistered('store_category_list')) {
                 $categories = $tableCategories->fetchActive(Zend_Registry::get('store_category_list'));
             } else {
                 $categories = $tableCategories->fetchAllActive();
             }
         } // Sub-categories
         else {
             if ($parentCategoryId) {
                 $categories = $tableCategories->fetchImmediateChildren($parentCategoryId);
             }
         }
 
         // Build categories list
         if (!empty($categories)) {
             foreach ($categories as $category) {
                 if (is_array($category)) {
                     $category = (object)$category;
                 }
 
                 $categoryName = $category->title;
                 $categoryDisplayName = $category->title;
                 if (!empty($category->name_legacy)) {
                     $categoryName = $category->name_legacy;
                 }
                 $categoryParentId = '';
                 if (!empty($parentCategoryId)) {
                     $categoryParentId = $parentCategoryId;
                 }
                 $categoryXdgType = '';
                 if (!empty($category->xdg_type)) {
                     $categoryXdgType = $category->xdg_type;
                 }
 
                 if ($this->_format == 'json') {
                     $categoriesList[] = array(
                         'id'           => $category->project_category_id,
                         'name'         => $categoryName,
                         'display_name' => $categoryDisplayName,
                         'parent_id'    => $categoryParentId,
                         'xdg_type'     => $categoryXdgType
                     );
                 } else {
                     $categoriesList[] = array(
                         'id'           => array('@text' => $category->project_category_id),
                         'name'         => array('@text' => $categoryName),
                         'display_name' => array('@text' => $categoryDisplayName),
                         'parent_id'    => array('@text' => $categoryParentId),
                         'xdg_type'     => array('@text' => $categoryXdgType)
                     );
                 }
 
                 // Update the list recursive
                 $categoriesList = $this->_buildCategoriesList($tableCategories, $category->project_category_id, $categoriesList);
             }
         }
 
         return $categoriesList;
     }
 
     public function commentsAction()
     {
         $uri = $this->view->url();
-        
+
         $params = $this->getRequest()->getParams();
         $params['domain_store_id'] = $this->_getNameForStoreClient();
-        
+
         $result = $this->_request('GET', $uri, $params);
         $this->_sendResponse($result, $this->_format);
-        
+
         /*
         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}, {$page}, {$pagesize}" . '_format_' . $this->_format);
 
         if (($cachedResponse = $cache->load($cacheName))) {
             $this->_sendResponse($cachedResponse, $this->_format);
         }
 
         $modelComments = new Default_Model_ProjectComments();
         $comments = $modelComments->getCommentsHierarchic($contentId);
 
         if ($comments->count() == 0) {
             $this->_sendResponse($response, $this->_format);
         }
 
         $comments->setCurrentPageNumber($page);
         $comments->setItemCountPerPage($pagesize);
 
         $response['data'] = array('comment' => $this->_buildCommentList($comments->getCurrentItems()));
         $cache->save($response, $cacheName, array(), 1800);
 
         $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'    => '',
                     'text'       => Default_Model_HtmlPurify::purify($current_item['comment_text']),
                     'childcount' => $current_item['childcount'],
                     'user'       => $current_item['username'],
                     'date'       => date('c', strtotime($current_item['comment_created_at'])),
                     'score'      => 0
                 );
                 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' => ''),
                     'text'       => array('@text' => Default_Model_HtmlPurify::purify($current_item['comment_text'])),
                     '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' => 0)
                 );
                 if ($current_item['childcount'] > 0) {
                     $comment['children'] = $this->_buildCommentList($current_item['children']);
                 }
             }
             $commentList[] = $comment;
         }
 
         return $commentList;
     }
-    
-    
+
+
     protected function _request($method, $uri = '', array $params = null)
     {
-        
+
         $config = Zend_Registry::get('config');
         $static_config = $config->settings->ocs_server;
-        
+
         $ocsServer = $static_config->apiUri;
-        
+
         $timeout = 60;
         $postFields = array();
         if ($params) {
             $postFields = $postFields + $params;
         }
         if (isset($postFields['file'])) {
             $timeout = 600;
             if ($postFields['file'][0] != '@') {
                 $postFields['file'] = $this->_getCurlValue($postFields['file']);
             }
         }
         else {
             $postFields = http_build_query($postFields, '', '&');
         }
-        
+
         //var_dump($ocsServer . $uri . '?' . $postFields);
-        
-        
+
+
         $curl = curl_init();
         curl_setopt_array($curl, array(
             CURLOPT_URL => $ocsServer . $uri,
             CURLOPT_HEADER => false,
             CURLOPT_POST => true,
             CURLOPT_POSTFIELDS => $postFields,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT => $timeout
         ));
-        
+
         $response = curl_exec($curl);
         curl_close($curl);
 
         if ($response) {
             return $response;
         }
         return false;
     }
 
 }
diff --git a/application/modules/default/views/scripts/product/add.phtml b/application/modules/default/views/scripts/product/add.phtml
index 5f6f68f0d..8e81c4381 100644
--- a/application/modules/default/views/scripts/product/add.phtml
+++ b/application/modules/default/views/scripts/product/add.phtml
@@ -1,1979 +1,1979 @@
 <?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/>.
  **/
 
 //$this->os = Zend_Registry::get('application_os');
 $this->tab = 'add';
 $helperImage = new Default_View_Helper_Image();
 $helpMemberUrl = new Default_View_Helper_BuildMemberUrl();
 $helpProductUrl = new Default_View_Helper_BuildProductUrl();
 $architectureListHelper = new Default_View_Helper_FetchArchitectureTags();
 $packagetypeListHelper = new Default_View_Helper_FetchPackagetypeTags();
 
 $modelCategory = new Default_Model_DbTable_ProjectCategory();
 $valueCatId = $this->form->project_category_id->getValue();
 //$valueCatId = 55;
 $categories = $modelCategory->fetchCategoriesForForm($valueCatId);
 $categoryAncestors = $modelCategory->fetchAncestorsAsId($valueCatId);
 if (count($categoryAncestors) > 0) {
     $categoryPath = explode(',',$categoryAncestors['ancestors']);
 }
 $categoryPath[] = $valueCatId;
 
 $this->headLink()->appendStylesheet('/theme/flatui/css/chosen.css');
 $this->inlineScript()->appendFile('/theme/flatui/js/lib/chosen.jquery.min.js');
 $this->inlineScript()->appendScript('
                                     $(document).ready(function(){
                                         $("select.chosen").chosen({
                                         width: "100%",
                                         max_selected_options: "5",
                                         disable_search: "false",
                                         disable_search_threshold: "5"
                                         });
                                     });
                                 ');
 
 ?>
     <style>
 
         .wizard, .tabcontrol {
             overflow: visible;
         }
 
         .wizard > .content {
             overflow: visible;
         }
 
         .wizard > .content > .body {
             position: relative;
         }
 
         input[type=checkbox] {
             display: none;
         }
 
         div.datafiledroparea{
             overflow-y: scroll !important;
         }
 
         /*
         - Style each label that is directly after the input
         - position: relative; will ensure that any position: absolute children will position themselves in relation to it
         */
         input[type=checkbox] + label {
             display: block;
             border-radius: 50%;
             position: relative;
             box-shadow: 0 0 1px #FFF; /* Soften the jagged edge */
             background: #2184be none repeat scroll 0 0;
             border: 3px solid #9dc8e2;
             color: white;
             height: 25px;
             transition: all 0.4s ease 0s;
             width: 25px;
         }
 
         /* Provide a border when hovered and when the checkbox before it is checked */
         input[type=checkbox] + label:hover,
         input[type=checkbox]:checked + label {
             border: 3px solid #9dc8e2;
             box-shadow: 0 0 1px #fff;
         }
 
         /*
         - Create a pseudo element :after when checked and provide a tick
         - Center the content
         */
         input[type=checkbox]:checked + label:after {
             content: '\2714'; /*content is required, though it can be empty - content: '';*/
             bottom: 2px;
             color: white;
             display: block;
             height: 1em;
             left: 3px;
             margin: auto;
             position: absolute;
             right: 0;
             top: -4px;
             width: 1em;
         }
 
         .add-product-page {
             padding-top: 15px;
         }
 
         section.body {
             width: 100% !important;
         }
     </style>
     <main class="user-admin-page">
 
         <section class="head-wrap">
 
             <!-- HEADER -->
 
             <section class="wrapper about-me-header">
 
                 <figure>
                     <img src="<?php echo $helperImage->Image($this->member->profile_image_url,array('width' => 110, 'height' => 110, 'crop' => 2)); ?>" alt="profile-image" width="110" height="110">
                 </figure>
 
                 <div class="user-menu well">
 
                     <div class="pull-left">
                         <div class="intro">
                             <div class="large">
                                 Hi <span class="lightblue"><?= $this->member->username; ?></span><?= $this->translate(', welcome to your personal start page!') ?>
                             </div>
                             <div class="small lightgrey">
                                 <a href="<?= $helpMemberUrl->buildMemberUrl($this->member->member_id); ?>">
                                     <?= $this->translate('Click here to go to your About Me page.') ?>
                                 </a>
                             </div>
                         </div>
                     </div>
 
                 </div>
 
             </section>
 
             <!-- /HEADER -->
 
         </section>
 
         <section class="body-wrap">
 
             <section class="wrapper product-page">
 
                 <!-- PAGE BODY -->
 
                 <section class="my-products-page">
 
                     <!-- NAVIGATION -->
 
                     <?php echo $this->render('user/partials/userHeader.phtml'); ?>
 
                     <!-- /NAVIGATION -->
 
                     <!-- PAGE BODY -->
 
                     <section class="add-product-page">
 
                         <form enctype="multipart/form-data" role="application" class="wizard clearfix" action="" method="post" id="add-product-form">
                             <?= $this->form->project_id ?>
                             <h3>Basics</h3>
                             <section id="required">
                                 <div class="form-group"><p class="col-sm-10">(*) Mandatory fields.</p></div>
                                 <div id="preview_img_msg">
 
                                 </div>
                                 <?php // $this->form->title ?>
                                 <div class="form-group">
                                     <div class="col-sm-12 margin-top-15">
                                         <div class="small grey bold-font pull-left margin-right-5">*</div>
                                         <label class="form-label" for="title">Product Name (4 letters min.)</label>
                                     </div>
                                     <div class="col-sm-12">
                                         <input id="title"
                                                class="required form-control valid"
                                                type="text"
                                                name="title"
                                                pattern="[^'\x22]+"
                                                <?php //pattern="^[ .\-&_A-z0-9]{1,}$" ?>
                                                <?php //  pattern="^[^\\'\^;*!\u0022\$]{1,}$" ?>
                                                value="<?= $this->escape($this->form->title->getValue()) ?>"
                                                title="Please use only letters."
                                                maxlength="60"
                                                aria-required="true"
                                                aria-invalid="false"
                                                data-rule-minlength="4"
                                                data-rule-maxlength="60"
                                                data-msg-minlength="At least 4 chars"
                                                data-msg-maxlength="At most 60 chars">
                                         <?php if ($this->form->title->getMessages()) {
                                             $errorHtml = '';
                                             foreach ($this->form->title->getMessages() as $currentError) {
                                                 $errorHtml .= '<label id="<?=$this->escape($this->form->title->getName())?>-error" class="error" for="<?=$this->escape($this->form->title->getName())?>">' . $currentError . '</label>';
                                             }
                                             ?>
                                             <?php echo $errorHtml ?>
                                         <?php } ?>
                                     </div>
                                 </div>
 
                                 <?= $this->form->project_category_id ?>
                                 <?= $this->form->project_subcategory_id ?>
                                 <?= $this->form->project_sub_subcategory_id ?>
                                 <?= $this->form->description ?>
                                 <?= $this->form->version ?>
                                 <?= $this->form->image_small ?>
                                 <?= $this->form->image_small_upload ?>
                                 <?php //$this->form->image_big ?>
                                 <?php //$this->form->image_big_upload ?>
                                 <?= $this->form->gallery ?>
                                 <?= $this->form->embed_code ?>
 
                                 <?= $this->form->source_url ?>
                                 <?= $this->form->license_tag_id ?>
                                  <?php
                                     if($this->project_id)
                                     {
                                                 $tagmodel = new Default_Model_Tags();
                                                 $tagscat = $tagmodel->getTagsCategory($this->project_id, Default_Model_Tags::TAG_TYPE_PROJECT);
                                                 if(strlen($tagscat)>0)
                                                 {
                                         ?>
                                     <div class="form-group">
                                         <div class="col-sm-12 margin-top-15">
                                             <label class="form-label"> System Auto Tags</label>
                                         </div>
                                         <div class="col-sm-12">
                                           <?php
 
                                                 echo $tagscat ;
                                           ?>
                                         </div>
                                     </div>
                                     <?php
                                     }}
                                     ?>
 
                                 <?= $this->form->tagsuser ?>
 
 
                                 <?= $this->form->link_1 ?>
                                 <?= $this->form->facebook_code ?>
                                 <?= $this->form->twitter_code ?>
                                 <?= $this->form->google_code ?>
 
                             </section>
 
                             <h3>Files</h3>
                             <section id="files">
 
                                 <!-- ppload -->
 
                                 <div id="modal-ppload" aria-labelledby="modal-ppload-label"
                                      data-ppload-api-uri="<?= PPLOAD_API_URI ?>"
                                      data-ppload-collection-id="<?= $this->ppload_collection_id ?>" data-product-id=""
                                      data-addpploadfile-uri="<?= $helpProductUrl->buildProductUrl('@@project_id@@', 'addpploadfile') ?>"
                                      data-updatepploadfile-uri="<?= $helpProductUrl->buildProductUrl('@@project_id@@', 'updatepploadfile') ?>"
                                      data-updatepackagetype-uri="<?= $helpProductUrl->buildProductUrl('@@project_id@@', 'updatepackagetype') ?>"
                                      data-updatearchitecture-uri="<?= $helpProductUrl->buildProductUrl('@@project_id@@', 'updatearchitecture') ?>"
                                      data-deletepploadfile-uri="<?= $helpProductUrl->buildProductUrl('@@project_id@@', 'deletepploadfile') ?>"
                                      data-deletepploadfiles-uri="<?= $helpProductUrl->buildProductUrl('@@project_id@@', 'deletepploadfiles') ?>">
                                     <div class="pling-modal" style="width: 100%;">
                                         <div class="">
                                             <div class="modal-header">
                                                 <!-- <h3 id="modal-ppload-label"><?= $this->translate('Add your Files') ?></h3> -->
                                             </div>
                                             <div class="modal-body">
                                                 <input type="file" style="display: none;" data-file-upload="" multiple>
                                                 <input type="file" style="display: none;" data-file-upload-update="" data-ppload-file-id="">
 
                                                 <p data-file-upload-msg=""><?= $this->translate('Drop file(s) here') ?>:</p>
 
                                                 <div data-file-upload="" dropzone class="datafiledroparea">
                                                     <table class="table" data-ppload-files="">
                                                         <thead>
                                                         <tr>
                                                             <th><?= $this->translate('Filename') ?></th>
                                                             <th><?= $this->translate('Version') ?></th>
                                                             <th><?= $this->translate('Description') ?></th>
                                                             <!--<th><?= $this->translate('License') ?></th>-->
                                                             <!--<th><?= $this->translate('Filetype') ?></th>-->
                                                             <th><?= $this->translate('Packagetype') ?></th>
                                                             <th><?= $this->translate('Architecture') ?></th>
                                                             <th><?= $this->translate('Date added') ?></th>
                                                             <th style="text-align: right"><?= $this->translate('Filesize') ?></th>
                                                             <th></th>
                                                             <th></th>
                                                         </tr>
                                                         </thead>
                                                         <tbody></tbody>
                                                     </table>
                                                     <table class="table" data-file-upload="">
                                                         <tbody></tbody>
                                                     </table>
                                                 </div>
 
                                                 </div>
                                                 <div style="float: right; padding-top: 10px;" class="small light">
                                                     Deleted files are archived. Number of downloads are kept. *
                                                 </div>
                                             </div>
 
                                             <div class="modal-footer" style="margin-top: 20px;">
                                             <span class="pull-left">
                                                 <input type="checkbox" data-accept-checkbox=""> <?= $this->translate('I accept the ') ?>
                                                 <a href="/content/terms"><?= $this->translate('Terms and Conditions') ?></a>
                                             </span>
                                             </div>
                                             <div class="modal-footer">
                                                 <button class="btn btn-native pull-left" data-addpploadfile-btn="">
                                                     <?= $this->translate('Add File(s)') ?>
                                                 </button>
                                                 <button class="btn btn-danger pull-right" data-file-upload-cancel-btn="">
                                                     <?= $this->translate('Cancel Upload') ?>
                                                 </button>
                                                 <a role="button" id="github_picker" class="btn btn-native pull-left" data-toggle="" data-target="#generic-dialog" data-username="<?=$this->member->link_github?>" title="add an URL here">
                                                     <?= $this->translate('Add URL') ?>
                                                 </a>
                                             </div>
                                         </div>
 
                                     </div>
                                 </div>
 
                                 <!-- /ppload -->
 
                             </section>
 
 
                         <?php if(isset($this->project_id)) { ?>
                             <h3>Changelog</h3>
                             <section id="changlog">
 
                                     <div id="modal-changlog" data-product-id="">
                                         <div class="row">
                                             <div class="modal-header">
                                                 <h3 id="modal-ppload-label"><?= $this->translate('Changelog') ?></h3>
                                             </div>
                                             <div class="modal-body" style="font-size: small;">
                                                 <div role="form" class="">
                                                     <input type="hidden" data-update-id="" id="update-id" value="">
                                                     <div class="form-group">
                                                       <label for="tile">Changelog Title:</label>
                                                       <input type="text" id="update-title" data-update-title="" class="form-control input-sm" placeholder="Enter Changelog Title">
                                                     </div>
                                                     <div class="form-group">
                                                       <label for="text">Changelog Text:</label>
                                                       <textarea id="update-text" data-update-text="" class="form-control input-sm" rows="3" placeholder="Enter Changelog Text"></textarea>
                                                     </div>
                                                     <button type="submit" class="btn btn-native" data-add-update-btn="">Save Changelog</button>
                                                 </div>
 
                                                 <h4 style="padding-top: 15px;"> Your Entries:</h4>
                                                 <article id="update-list">
 
                                                 </article>
                                             </div>
                                         </div>
                                     </div>
                                 <!-- changlog -->
                             </section>
                         <?php } ?>
 
 
                         </form>
 
                         <!-- /PAGE BODY -->
 
                     </section>
 
                     <!-- /PAGE BODY -->
 
                 </section>
 
             </section>
         </section>
     </main>
 
     <script>
 
         /**
         $(document).ready(function() {
             $('.add-tag-btn').on('click', function(event) {
                 event.stopPropagation();
                 var data = jQuery(this).parents('.form-group').find('input.personal-tag-name').val();
                 $.post('/tag/add/', {'t' : data})
                     .done(function(response) {
                         alert(response.data.id);
                         alert(response.data.label);
                         var template = '<div class="message-form-template">\n' +
                             '\t<div class="new-tag">\n' +
                             '\t\t<span class="tag"><a class="message-form-delete-tag" data-id="'+response.data.id+'" href="javascript:;">\n' +
                             '<span class="tag-icon"></span>\n' +
                             '</a> &nbsp;<span class="tag-label">'+response.data.label+'</span> </span>\n' +
                             '\t</div>\n' +
                             '</div>';
                         $('#form-added-tags').empty().append(template);
                     });
             });
 
             $('.message-form-delete-tag').on('click', function (event) {
                 event.stopPropagation();
                 var id =  parseInt(jQuery(this).attr('data-id'));
                 var jqxhr = $.post('/tag/del/',{'ti': id})
                     .done(function(data) {
                         alert('Response :' + data);
                         jQuery(this).parents('.tag').remove();
                     });
 
                 return false;
             });
         });
         **/
 
         $(document).ready(function () {
 
             var formElement = $('#add-product-form');
             var validator = formElement.validate({
                 ignore: ":disabled,:hidden"
             });
             formElement.steps({
                 headerTag: "h3",
                 bodyTag: "section",
                 enableAllSteps: <?php echo ($this->mode == 'edit') ? "true" : "false"; ?>,
                 enableCancelButton: true,
                 showFinishButtonAlways: true,
                 transitionEffect: "slideLeft",
               /* Labels */
                 labels: {
                     cancel: "Cancel",
                     finish: "Save"
                 },
                 onStepChanging: function (event, currentIndex, newIndex) {
                     // Allways allow previous action even if the current form is not valid!
                     if (currentIndex > newIndex) {
                         return true;
                     }
                     // Needed in some cases if the user went back (clean up)
                     if (currentIndex < newIndex) {
                         // To remove error styles
                         formElement.find(".body:eq(" + newIndex + ") label.error").remove();
                         formElement.find(".body:eq(" + newIndex + ") .error").removeClass("error");
                     }
 
                     if (currentIndex == 0) {
                         if (ImagePreview.hasError) {
                             return false;
                         }
                         //logo OR preview pic mandatory!
                         var logoSrc = $('#product-picture-preview').attr('src');
                         var gallery = $('.product-gallery div:first-child');
                         var galleryPic = gallery.find('.image');
 
                         if (!logoSrc && !galleryPic.attr('style')) {
                             var msg = $('#preview_img_msg');
                             msg.text('');
                             msg.append('<label id="description-error" class="error" for="product-gallery">Please add a product logo or at least one product gallery picture!</label>');
 
                             return false;
                         }
 
                         if (formElement.valid()) {
                             if (ProductForm.mode == 'add' && (ProductForm.project_id == '' || ProductForm.project_id == undefined)) {
                                 var result = ProductForm.saveSection(formElement.find('.body:eq(' + currentIndex + ')').attr('id'));
                                 if (result == false) {
                                     validator.showErrors(ProductForm.errors);
                                     return result;
                                 }
                                 formElement.find("#modal-ppload").attr('data-product-id', ProductForm.project_id);
                                 formElement.find("#modal-changlog").attr('data-product-id', ProductForm.project_id);
                             }
                             return true;
                         }
                         return false;
                     }
                     return formElement.valid();
                 },
 
                 onFinished: function (event, currentIndex) {
                     //logo OR preview pic mandatory!
                     var logoSrc = $('#product-picture-preview').attr('src');
                     var gallery = $('.product-gallery div:first-child');
                     var galleryPic = gallery.find('.image');
 
                     if (!logoSrc && !galleryPic.attr('style')) {
                         var msg = $('#preview_img_msg');
                         msg.text('');
                         msg.append('<label id="description-error" class="error" for="product-gallery">Please add a product logo or at least one product gallery picture!</label>');
 
                         return false;
                     }
 
                     if (currentIndex == 0) {
                         if (ImagePreview.hasError) {
                             return false;
                         }
                         if (ProductForm.mode == 'add' && (ProductForm.project_id == '' || ProductForm.project_id == undefined)) {
                             var result = ProductForm.saveSection(formElement.find('.body:eq(' + currentIndex + ')').attr('id'));
                             if (result == false) {
                                 validator.showErrors(ProductForm.errors);
                                 return result;
                             }
                             formElement.find("#modal-ppload").attr('data-product-id', ProductForm.project_id);
                              formElement.find("#modal-changlog").attr('data-product-id', ProductForm.project_id);
                         }
                     }
 
 
                     $('[name=project_id]').val(ProductForm.project_id);
                     formElement.submit();
                 },
 
                 onCanceled: function (event, currentIndex) {
                     window.location.href = "/member/<?php echo $this->member->member_id; ?>/products/";
                 }
 
             });
 
 
             $('body').on("click", "#github_picker", function (event) {
 
                 html = '<form id="get-url-form">' +
                     '<div class="form-group">' +
                     '<input type="url" class="form-control" id="get-url" placeholder="Enter a URL where the files can be downloaded" required="required">' +
                     '<span id="get-url-help" class="help-block small">e.g. https://github.com/mongodb/mongo/archive/r3.5.2.tar.gz</span></div>' +
                     '<span id="get-url-error" class="help-block small"></span></div>' +
                     '<button type="submit" class="btn btn-native btn-sm" id="get-url-submit">Submit</button>' +
                     '</form>';
 
                 var msgBox = $('#generic-dialog');
                 msgBox.modal('hide');
                 msgBox.find('.modal-header-text').empty().append('Enter a download URL:');
                 msgBox.find('.modal-body').empty().append(html);
                 setTimeout(function () {
                     msgBox.modal('show');
                 }, 900);
 
             });
 
             $('body').on('submit', '#get-url-form', function(event) {
                 if (! $('#get-url-form').validate()) {
                     return true;
                 }
                 event.preventDefault();
                 $.ajax({
                     url: '/file/link/',
                     type: 'post',
                     data: {
                         project_id: ProductForm.project_id,
                         u: $('#get-url').val()
                     },
                     success: function(returned_data) {
                         if (!returned_data.file) {
                             $('#get-url').addClass('hasError').focus();
                             $('#get-url-error').html('An Error occurred. Please check your URL or try again later.');
                             return;
                         }
                         data_file = returned_data.file;
                         $modalPpload.attr('data-ppload-collection-id', data_file.collection_id);
                         $('#get-url').val('').removeClass('hasError');
                         $('#get-url-error').html('');
                         $('#generic-dialog').modal('hide');
                         getPploadFiles();
                     },
                     error: function() {
                         $('#get-url').addClass('hasError').focus();
                         $('#get-url-error').html('An Error occurred. Please check your URL or try again later.');
                     }
                 });
             });
 
             $('body').on('change', '#get-url', function(event) {
                 $('#get-url-error').empty();
             });
 
 
                 var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}}
                 $('button[rel="tooltip"]').tooltip();
 
                 var $modalPpload = $('#modal-ppload');
                 var $modalChanglog = $('#modal-changlog');
 
                 var pploadApiUri = $modalPpload.attr('data-ppload-api-uri');
 
                 var pploadUploads = {
                     queue: {},
                     currentUploadId: null,
                     uploading: null
                 };
 
                 function keysrt(key, asc) {
                     if(asc) {
                         return function(a,b){
                             if (a[key] > b[key]) return 1;
                             if (a[key] < b[key]) return -1;
                             return 0;
                         }
                     } else {
                         return function(a,b){
                             if (a[key] < b[key]) return 1;
                             if (a[key] > b[key]) return -1;
                             return 0;
                         }
                     }
                 }
 
                 function getUpdates(page) {
 
                     $modalChanglog.find('#update-list').html('');
                     var productId = <?= isset($this->project_id)?$this->project_id:0 ?>;
                     $.ajax({
                         url: '<?=$helpProductUrl->buildProductUrl($this->project_id, 'getupdatesajax')?>',
                         type: 'GET',
                         data: {
                             format: 'json',
                             ignore_status_code: 1
                         },
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'success') {
                                 return;
                             }
                             $.each(data.updates, function () {
                                 var id = '';
                                 if (this.project_update_id) {
                                     id = this.project_update_id;
                                 }
                                 var title = '';
                                 if (this.title) {
                                     title = this.title;
                                 }
                                 var text = '';
                                 if (this.text) {
                                     text = this.text;
                                 }
                                 var date = '';
                                 if (this.created_at) {
                                     date = this.created_at;
                                 }
 
                                 Changelog.setLogMsg(id, this.raw_title, this.raw_text);
 
                                 var divEl = $('<div />');
                                 divEl.attr('data-update-id', id);
                                 divEl.append(
                                     '<a name="anker_'+id+'"></a>'
                                     + '<h4>'+title+'</h4>'
                                     + '<div class="small light lightgrey product-update-date">'+date+ '</div>'
                                     + text + '<br/><br/>'
                                 );
 
                                 var btnEdit = $('<button type="submit" class="btn btn-native btn-sm" style="line-height: 10px;margin: 5px;">Edit</button>');
                                 btnEdit.attr('data-change-update-btn',id);
                                 btnEdit.attr('data-change-title',title);
                                 btnEdit.attr('data-change-text',text);
 
 
                                 var btnDelete = $('<button type="submit" class="btn btn-native btn-sm" style="line-height: 10px;margin: 5px;">Delete</button>');
                                 btnDelete.attr('data-delete-update-btn',id);
 
                                 divEl.append(btnEdit);
                                 divEl.append(btnDelete);
                                 divEl.append('<br/><br/><br/><br/>');
 
                                 // $modalPpload.find('#update-list').append(divEl);
                                  $modalChanglog.find('#update-list').append(divEl);
                             });
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             return;
                         }
                     });
 
                 }
 
                 function getPploadFiles(page) {
                     var collectionId = $modalPpload.attr('data-ppload-collection-id');
 
                     if (!page) {
                         page = 1;
                         $modalPpload.find('table[data-ppload-files] tbody').empty();
                     }
                     $.ajax({
                         url: pploadApiUri + 'files/index',
                         type: 'GET',
                         data: {
                             collection_id: collectionId,
                             perpage: 1000,
                             page: page,
                             format: 'json',
                             ignore_status_code: 0,
                             status: 'active'
                         },
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'success') {
                                 return;
                             }
                             var deletePploadFileBtn = '<a href="#" class="btn btn-native btn-xs btn-file-dropzone" data-deletepploadfile-btn=""><span class="glyphicon glyphicon-trash"></span></a>';
                             var deletePploadFileBtnPerFile = '';
 
                             var myArray = $.map(data.files, function(entry) {
                                 return entry;
                             });
                             myArray.sort(keysrt('created_timestamp'), false);
 
 
                             $.each(myArray, function () {
 
                                 var fileDescription = '';
                                 if (this.description) {
                                     fileDescription = this.description;
                                     fileDescription = fileDescription.replace(/<\/?[^>]+(>|$)/g, "");
                                 }
 
                                 var inputFileDescription = '<input data-ppload-file-description="" class="form-control input-sm"'
                                     + ' type="text" maxlength="140" placeholder="File description"'
                                     + ' value="' + fileDescription + '">';
                                 if(this.active == '0') {
                                     inputFileDescription = '<input disabled="disabled" data-ppload-file-description="" class="form-control input-sm"'
                                         + ' type="text" maxlength="140" placeholder="File description"'
                                         + ' value="' + fileDescription + '">';
                                 }
 
                                 var versionText;
                                 if(this.version==null) {versionText = '';} else{versionText = this.version;}
                                 versionText = versionText.replace(/<\/?[^>]+(>|$)/g, "");
 
                                 var version = '<input data-ppload-file-version="" class="form-control input-sm"'
                                     + ' type="text" maxlength="140" placeholder="File version"'
                                     + ' value="' + versionText + '">';
                                 if(this.active == '0') {
                                     version = '<input disabled="disabled" data-ppload-file-version="" class="form-control input-sm"'
                                         + ' type="text" maxlength="140" placeholder="File version"'
                                         + ' value="' + versionText + '">';
                                 }
 
                                 var fileCategory = '';
                                 if (this.category) {
                                     fileCategory = this.category;
                                 }
                                 var link = '';
                                 var fileTags = '';
                                 var osId = null;
                                 var licensetype = null;
                                 var license = '';
                                 var licenseId = '';
                                 var packagetypeId = '';
                                 var architectureId = '';
 
 
                                 //var packageId = null;
                                 //var archId = null;
                                 //var deviceId = null;
                                 if (this.tags) {
                                     fileTags = this.tags;
                                     $.each(fileTags.split(','), function () {
                                         if(this.indexOf("##")==-1) {
                                             var tagStr = this.split('-');
                                             if (tagStr.length == 2 && tagStr[0] == 'os') {
                                                 osId = tagStr[1];
                                             } else if (tagStr.length == 2 && tagStr[0] == 'licensetype') {
                                                 licenseId = tagStr[1];
                                             } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                 packagetypeId = tagStr[1];
                                             } else if (tagStr.length == 2 && tagStr[0] == 'architectureid') {
                                                 architectureId = tagStr[1];
                                             }
                                         } else {
                                             var tagStr = this.split('##');
                                             if (tagStr.length == 2 && tagStr[0] == 'link') {
                                                 link = tagStr[1];
                                             } else if (tagStr.length == 2 && tagStr[0] == 'license') {
                                                 license = tagStr[1];
                                                 license = Base64.decode(license);
                                             } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                 packagetypeId = tagStr[1];
                                             } else if (tagStr.length == 2 && tagStr[0] == 'architectureid') {
                                                 architectureId = tagStr[1];
                                             }
                                         }
                                     });
                                 }
 
-                                //downloadlink is now: domain/api/files/downloadfile/id/ID/s/TOKEN/t/TIMESTAMP/u/USERID/FILE_NAME
+                                //downloadlink is now: domain/api/files/download/id/ID/s/TOKEN/t/TIMESTAMP/u/USERID/FILE_NAME
                                 var hash = '<?= $this->download_hash ?>';
                                 var timetamp = '<?= $this->download_timestamp ?>';
                                 var userid = '<?= $this->member_id?>';
 
-                                var downloadUrl = pploadApiUri + 'files/downloadfile/id/' + this.id + '/o/1/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name;
+                                var downloadUrl = pploadApiUri + 'files/download/id/' + this.id + '/o/1/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name;
                                 var downloadLinkFilename = link ? this.name + ' (External Link)' : this.name;
                                 var downloadLink = '<a href="' + downloadUrl + '" id="data-link' + this.id + '">' + downloadLinkFilename + '</a>';
 
                                 if(this.active == '1') {
                                     deletePploadFileBtnPerFile = deletePploadFileBtn;
                                 } else {
                                     deletePploadFileBtnPerFile = '';
                                 }
 
                                 $modalPpload.find('table[data-ppload-files] tbody').append(
                                     '<tr data-ppload-file-id="' + this.id + '" data-ppload-file-category="' + fileCategory + '" data-ppload-file-tags="' + fileTags + '">'
                                     + '<td>' + downloadLink + '</td>'
                                     + '<td>' + version + '</td>'
                                     + '<td>' + inputFileDescription + '</td>'
                                     /*
                                     + '<td>'
                                     + '<select id="data-select-license' + this.id + '" data-license-id="" name="license" class="form-control input-sm" style="width: 200px;">'
                                     + '<option value=\"1000\"></option><option value=\"16\">AGPL</option><option value=\"3\">Artistic 2.0</option><option value=\"6\">BSD</option><option value=\"17\">CC0 1.0 Universal (Public Domain)</option><option value=\"9\">CPL 1.0</option><option value=\"10\">Creative Commons by</option><option value=\"13\">Creative Commons by-nc</option><option value=\"15\">Creative Commons by-nc-nd</option><option value=\"14\">Creative Commons by-nc-sa</option><option value=\"12\">Creative Commons by-nd</option><option value=\"11\">Creative Commons by-sa</option><option value=\"8\">GFDL</option><option value=\"1\">GPLv2 or later</option><option value=\"18\">GPLv2 only</option><option value=\"19\">GPLv3</option><option value=\"2\">LGPL</option><option value=\"0\">Other</option><option value=\"7\">Proprietary License</option><option value=\"5\">QPL</option><option value=\"4\">X11</option>'
                                     + '</select>'
                                     + '</td>'
                                     */
                                     /*
                                     + '<td>' + this.type + '</td>'
                                     */
                                     + '<td>'
                                     + '<select id="data-select-packagetype' + this.id + '" data-packagetype-id="" name="packagetype" class="form-control input-sm" style="width: 150px;">'
                                     + '<option value=\"\"></option>'
                                         <?php
                                         // force $value to array so we can compare multiple values to multiple
                                         // options; also ensure it's a string for comparison purposes.
                                         $tagList = $packagetypeListHelper->fetchList();
                                         foreach ($tagList as $opt_value => $opt_label) {
                                         ?>
                                           + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                         <?php
                                         }
                                         ?>
                                     + '</select>'
                                     + '</td>'
 
                                     + '<td>'
                                     + '<select class="form-control input-sm" id="data-select-architecture' + this.id + '" data-architecture-id="" name="architecture">'
                                     + '    <option value=""></option>'
                                         <?php
                                         // force $value to array so we can compare multiple values to multiple
                                         // options; also ensure it's a string for comparison purposes.
                                         $tagList = $architectureListHelper->fetchList();
                                         foreach ($tagList as $opt_value => $opt_label) {
                                         ?>
                                           + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                         <?php
                                         }
                                         ?>
                                     + '</select>'
                                     + '</td>'
 
                                     + '<td>' + this.created_timestamp + '</td>'
                                     + '<td style="text-align: right">' + humanFileSize(this.size) + '</td>'
                                     + '<td>' + deletePploadFileBtnPerFile + '</td>'
                                     + '</tr>'
                                 );
 
                                 //$("#data-select-license" + this.id + " option[value='"+licenseId+"']").attr('selected', 'selected');
                                 $("#data-select-packagetype" + this.id + " option[value='"+packagetypeId+"']").attr('selected', 'selected');
 
                                 $("#data-select-architecture" + this.id + " option[value='"+architectureId+"']").attr('selected', 'selected');
 
                                 /*
                                 $licenseSelect = $modalPpload.find('#data-select-license' + this.id);
                                 if(this.active == '0') {
                                     $licenseSelect.prop('disabled', 'disabled');
                                 }
                                 */
 
                                 $packagetypeSelect = $modalPpload.find('#data-select-packagetype' + this.id);
                                 if(this.active == '0') {
                                     $packagetypeSelect.prop('disabled', 'disabled');
                                 }
 
                                 $architectureSelect = $modalPpload.find('#data-select-architecture' + this.id);
                                 if(this.active == '0') {
                                     $architectureSelect.prop('disabled', 'disabled');
                                 }
 
 
                                 if ((typeof link != 'undefined') && (link != "")) {
                                     //$("#data-link" + this.id).attr('href', decodeURIComponent(link));
                                     $("#data-link" + this.id).attr('target','_blank');
                                     $("#data-link" + this.id).html($("#data-link" + this.id).html() + " (External Link)");
                                 }
                             });
 
                             $modalPpload.find('p[data-file-upload-msg]').show();
                             $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
                             $modalPpload.find('#github_picker').attr('disabled', 'disabled');
 
                             if ($modalPpload.find('input[data-accept-checkbox]').is(':checked')) {
                                 $modalPpload.find('button[data-addpploadfile-btn]').removeAttr('disabled');
                                 $modalPpload.find('#github_picker').removeAttr('disabled');
                             } else {
                                 $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                                 $modalPpload.find('#github_picker').attr('disabled', 'disabled');
                             }
                             if (data.pagination.next) {
                                 getPploadFiles(data.pagination.next);
                             }
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             return;
                         }
                     });
                 }
 
                 function addFileToPploadUploadQueue(fileId, fileUpload) {
                     var uploadId = 'file-upload-' + Math.floor(Math.random() * 1000) + '-' + new Date().getTime();
                     pploadUploads.queue[uploadId] = {
                         fileId: fileId,
                         fileUpload: fileUpload
                     };
 
                     $modalPpload.find('table[data-file-upload] tbody').append(
                         '<tr data-file-upload-id="' + uploadId + '">'
                         + '<td>' + this.name + ' (' + humanFileSize(this.size) + ')</td>'
                         + '<td>'
                         + '<progress max="100" value="0" data-file-upload-progress=""></progress>'
                         + '<br>'
                         + '<span'
                         + ' data-file-upload-progress=""'
                         + ' data-file-upload-loaded="0"'
                         + ' data-file-upload-time="0"></span>'
                         + '</td>'
                         + '<td><a href="#" data-file-upload-cancel-btn="">×</a></td>'
                         + '</tr>'
                     );
                 }
 
                 function startUploadPploadFiles() {
                     if ($.isEmptyObject(pploadUploads.queue) || pploadUploads.uploading) {
                         return;
                     }
 
                     //var productId = $modalPpload.attr('data-product-id');
                     var uploadId = null;
                     var formData = new FormData();
                     $.each(pploadUploads.queue, function (key, value) {
                         uploadId = key;
                         if (value.fileId) {
                             formData.append('file_id', value.fileId);
                         }
                         formData.append('file_upload', value.fileUpload);
                         return false;
                     });
                     var $uploadContainer = $modalPpload.find('tr[data-file-upload-id="' + uploadId + '"]');
                     var $uploadProgressBar = $uploadContainer.find('progress[data-file-upload-progress]');
                     var $uploadProgress = $uploadContainer.find('span[data-file-upload-progress]');
                     $uploadProgress.attr('data-file-upload-time', new Date().getTime());
 
                     $modalPpload.find('button[data-file-upload-cancel-btn]').removeAttr('disabled');
 
                     pploadUploads.currentUploadId = uploadId;
 
                     var url = '';
                     if (formData.has('file_id')) {
                         url = ($modalPpload.attr('data-updatepploadfile-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                         if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                             url = ($modalPpload.attr('data-updatepploadfile-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                         }
                     } else {
                         url = ($modalPpload.attr('data-addpploadfile-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                         if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                             url = ($modalPpload.attr('data-addpploadfile-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                         }
                     }
 
                     pploadUploads.uploading = $.ajax({
                         xhr: function () {
                             var xhr = $.ajaxSettings.xhr();
                             if (xhr.upload) {
                                 xhr.upload.addEventListener('progress', function (event) {
                                     var progress = parseInt(event.loaded / event.total * 10000) / 100;
                                     var previousLoaded = parseInt($uploadProgress.attr('data-file-upload-loaded'));
                                     var previousTime = parseInt($uploadProgress.attr('data-file-upload-time'));
                                     var currentTime = new Date().getTime();
                                     var rate = '--';
                                     if (previousTime < currentTime) {
                                         $uploadProgress.attr('data-file-upload-loaded', event.loaded);
                                         $uploadProgress.attr('data-file-upload-time', currentTime);
                                         rate = humanFileSize(Math.floor((event.loaded - previousLoaded) / (currentTime - previousTime) * 1000));
                                     }
                                     $uploadProgressBar.attr('value', progress);
                                     $uploadProgress.html(progress + '% | ' + rate + '/s');
                                 }, false);
                             }
                             xhr.addEventListener('abort', function (event) {
                                 if (pploadUploads.queue[uploadId].fileId) {
                                     $modalPpload.find('tr[data-ppload-file-id="' + pploadUploads.queue[uploadId].fileId + '"]').show();
                                 }
                                 delete pploadUploads.queue[uploadId];
                                 pploadUploads.currentUploadId = null;
                                 pploadUploads.uploading = null;
                                 $uploadContainer.remove();
                                 $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
                                 startUploadPploadFiles();
                             }, false);
                             return xhr;
                         },
                         url: url,
                         type: 'POST',
                         data: formData,
                         dataType: 'json',
                         contentType: false,
                         processData: false,
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'ok') {
                                 return;
                             }
 
                             if (pploadUploads.queue[uploadId].fileId) {
                                 $modalPpload.find('tr[data-ppload-file-id="' + pploadUploads.queue[uploadId].fileId + '"]').remove();
                             }
                             delete pploadUploads.queue[uploadId];
                             pploadUploads.currentUploadId = null;
                             pploadUploads.uploading = null;
                             $uploadContainer.remove();
                             $('a[href="#modal-ppload"][data-product-id="' + $modalPpload.attr('data-product-id') + '"]')
                                 .attr('data-ppload-collection-id', data.file.collection_id);
                             $modalPpload.attr('data-ppload-collection-id', data.file.collection_id);
 
                             var versionText;
                             if(data.file.version==null) {versionText = '';} else{versionText = data.file.version;}
                             versionText = versionText.replace(/<\/?[^>]+(>|$)/g, "");
 
                             var version = '<input data-ppload-file-version="" class="form-control input-sm"'
                                 + ' type="text" maxlength="140" placeholder="File version"'
                                 + ' value="' + versionText + '">';
 
                             var fileDescription = '';
                             if (data.file.description) {
                                 fileDescription = data.file.description;
                             }
                             var fileCategory = '';
                             if (data.file.category) {
                                 fileCategory = data.file.category;
                             }
                             var fileTags = '';
                             if (data.file.tags) {
                                 fileTags = data.file.tags;
                             }
 
 
                             $modalPpload.find('table[data-ppload-files] tbody').append(
                                 '<tr data-ppload-file-id="' + data.file.id + '" data-ppload-file-category="' + fileCategory + '" data-ppload-file-tags="' + fileTags + '">'
                                 + '<td><a href="' + pploadApiUri + 'files/download/'
                                 + 'id/' + data.file.id + '/' + data.file.name + '">' + data.file.name + '</a></td>'
                                 + '<td>' + version + '</td>'
                                 + '<td><input data-ppload-file-description="" class="form-control input-sm"'
                                 + ' type="text" maxlength="140" placeholder="File description"'
                                 + ' value="' + fileDescription + '"></td>'
                                 /*
                                 + '<td>'
                                 + '<select id="data-select-license' + data.file.id + '" data-license-id="" name="license" class="form-control input-sm">'
                                 + '<option value=\"1000\"></option><option value=\"16\">AGPL</option><option value=\"3\">Artistic 2.0</option><option value=\"6\">BSD</option><option value=\"17\">CC0 1.0 Universal (Public Domain)</option><option value=\"9\">CPL 1.0</option><option value=\"10\">Creative Commons by</option><option value=\"13\">Creative Commons by-nc</option><option value=\"15\">Creative Commons by-nc-nd</option><option value=\"14\">Creative Commons by-nc-sa</option><option value=\"12\">Creative Commons by-nd</option><option value=\"11\">Creative Commons by-sa</option><option value=\"8\">GFDL</option><option value=\"1\">GPLv2 or later</option><option value=\"18\">GPLv2 only</option><option value=\"19\">GPLv3</option><option value=\"2\">LGPL</option><option value=\"0\">Other</option><option value=\"7\">Proprietary License</option><option value=\"5\">QPL</option><option value=\"4\">X11</option>'
                                 + '</select>'
                                 + '</td>'
                                 */
 
                                 /*
                                 + '<td>' + data.file.type + '</td>'
                                 */
                                 + '<td>'
                                 + '<select id="data-select-packagetype' + data.file.id + '" data-packagetype-id="" name="packagetype" class="form-control input-sm" style="width: 200px;">'
                                 + '<option value=\"\"></option>'
                                     <?php
                                     // force $value to array so we can compare multiple values to multiple
                                     // options; also ensure it's a string for comparison purposes.
                                     $tagList = $packagetypeListHelper->fetchList();
                                     foreach ($tagList as $opt_value => $opt_label) {
                                     ?>
                                       + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                     <?php
                                     }
                                     ?>
                                 + '</select>'
                                 + '</td>'
 
                                 + '<td>'
                                 + '<select class="form-control input-sm" id="data-select-architecture' + data.file.id + '" data-architecture-id="" name="architecture">'
                                 + '    <option value=""></option>'
                                     <?php
                                     // force $value to array so we can compare multiple values to multiple
                                     // options; also ensure it's a string for comparison purposes.
                                     $tagList = $architectureListHelper->fetchList();
                                     foreach ($tagList as $opt_value => $opt_label) {
                                     ?>
                                       + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                     <?php
                                     }
                                     ?>
                                 + '</select>'
                                 + '</td>'
                                 + '<td>' + data.file.created_timestamp + '</td>'
                                 + '<td style="text-align: right">' + humanFileSize(data.file.size) + '</td>'
                                 // "Update" button is hidden currently
                                 + '<td><a href="#" class="btn btn-native btn-xs btn-file-dropzone" data-updatepploadfile-btn="" style="display: none;">Update</a></td>'
                                 + '<td><a href="#" class="btn btn-native btn-xs btn-file-dropzone" data-deletepploadfile-btn=""><span class="glyphicon glyphicon-trash"></span></a></td>'
                                 + '</tr>'
                             );
 
                             UserTags.activateSelect(data.file.id, '');
 
                             $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
                             startUploadPploadFiles();
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             alert("Error: " + textStatus + ", " + errorThrown);
                             return;
                         }
                     });
                 }
 
                 function updatePploadFile(fileId, fileDescription, fileCategory, fileTags) {
                     var url = ($modalPpload.attr('data-updatepploadfile-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                     if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                         url = ($modalPpload.attr('data-updatepploadfile-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                     }
                     fileDescription = fileDescription.replace(/<\/?[^>]+(>|$)/g, "");
 
 
                     $.ajax({
                         url: url,
                         type: 'POST',
                         data: {
                             file_id: fileId,
                             file_description: fileDescription,
                             file_category: fileCategory
                         },
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'ok') {
                                 return;
                             }
 
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             alert("Error: " + textStatus + ", " + errorThrown);
                             return;
                         }
                     });
                 }
 
                 function updatePackageType(fileId, packagetypeId) {
                     var url = ($modalPpload.attr('data-updatepackagetype-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                     if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                         url = ($modalPpload.attr('data-updatepackagetype-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                     }
 
                     $.ajax({
                         url: url,
                         type: 'POST',
                         data: {
                             file_id: fileId,
                             package_type_id: packagetypeId
                         },
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'ok') {
                                 return;
                             }
 
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             alert("Error: " + textStatus + ", " + errorThrown);
                             return;
                         }
                     });
                 }
 
 
                 function updateArchitecture(fileId, architectureId) {
                     var url = ($modalPpload.attr('data-updatearchitecture-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                     if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                         url = ($modalPpload.attr('data-updatearchitecture-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                     }
 
                     $.ajax({
                         url: url,
                         type: 'POST',
                         data: {
                             file_id: fileId,
                             architecture_id: architectureId
                         },
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'ok') {
                                 return;
                             }
 
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             alert("Error: " + textStatus + ", " + errorThrown);
                             return;
                         }
                     });
                 }
 
                 function updatePploadFileVersion(fileId, version) {
                     var url = ($modalPpload.attr('data-updatepploadfile-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                     if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                         url = ($modalPpload.attr('data-updatepploadfile-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                     }
                     version = version.replace(/<\/?[^>]+(>|$)/g, "");
 
                     $.ajax({
                         url: url,
                         type: 'POST',
                         data: {
                             file_id: fileId,
                             file_version: version
                         },
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'ok') {
                                 return;
                             }
 
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             alert("Error: " + textStatus + ", " + errorThrown);
                             return;
                         }
                     });
                 }
 
                 function updatePploadFileTags(fileId, fileTags) {
                     var url = ($modalPpload.attr('data-updatepploadfile-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                     if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                         url = ($modalPpload.attr('data-updatepploadfile-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                     }
 
                     $.ajax({
                         url: url,
                         type: 'POST',
                         data: {
                             file_id: fileId,
                             file_tags: fileTags
                         },
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'ok') {
                                 return;
                             }
 
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             alert("Error: " + textStatus + ", " + errorThrown);
                             return;
                         }
                     });
                 }
 
                 function deletePploadFile(fileId) {
                     var url = ($modalPpload.attr('data-deletepploadfile-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                     if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                         url = ($modalPpload.attr('data-deletepploadfile-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                     }
 
                     $.ajax({
                         url: url,
                         type: 'POST',
                         data: {file_id: fileId},
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'ok') {
                                 alert("Error: " + data.error_text);
                                 return;
                             }
                             $modalPpload.find('table[data-ppload-files] tbody').html('');
                             $modalPpload.find('table[data-file-upload] tbody').html('');
                             getPploadFiles();
                             /**
                              $modalPpload.find('tr[data-ppload-file-id="' + fileId + '"]').remove();
                              if ($modalPpload.find('tr[data-ppload-file-id]').size() === 0) {
                                                         $modalPpload.find('table[data-ppload-files] tbody').html('');
                                                         $modalPpload.find('table[data-file-upload] tbody').html('');
                                                         $modalPpload.find('p[data-file-upload-msg]').show();
                                                         $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
 
                                                         if ($modalPpload.find('input[data-accept-checkbox]').is('checked')) {
                                                             $modalPpload.find('button[data-addpploadfile-btn]').removeAttr('disabled');
                                                         } else {
                                                             $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                                                         }
                                                     }**/
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             alert("Error: " + textStatus + ", " + errorThrown);
                             return;
                         }
                     });
                 }
 
                 function deletePploadFiles() {
                     var url = ($modalPpload.attr('data-deletepploadfiles-uri')).replace(/@@project_id@@/i, ProductForm.project_id);
                     if (typeof ProductForm.project_id == 'undefined' || ProductForm.project_id == '' || ProductForm.project_id == '0') {
                         url = ($modalPpload.attr('data-deletepploadfiles-uri')).replace(/@@project_id@@/i, <?= (isset($this->project_id))?$this->project_id:0  ?>);
                     }
                     $.ajax({
                         url: url,
                         type: 'POST',
                         data: {},
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'ok') {
                                 return;
                             }
                             $modalPpload.find('table[data-ppload-files] tbody').html('');
                             $modalPpload.find('table[data-file-upload] tbody').html('');
                             $modalPpload.find('p[data-file-upload-msg]').show();
 
                             $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
 
                             $modalPpload.find('input[data-accept-checkbox]').removeAttr('disabled');
                             $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                             $modalPpload.find('#github_picker').attr('disabled', 'disabled');
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             alert("Error: " + textStatus + ", " + errorThrown);
                             return;
                         }
                     });
                 }
 
                 function humanFileSize(bytes) {
                     var size = '';
                     size = (bytes / 1048576).toFixed(2) + ' MB';
                     /*
                      if (bytes >= 1073741824) {
                      size = (bytes / 1073741824).toFixed(2) + 'GB';
                      }
                      else if (bytes >= 1048576) {
                      size = (bytes / 1048576).toFixed(2) + 'MB';
                      }
                      else if (bytes >= 1024) {
                      size = (bytes / 1024).toFixed(2) + 'KB';
                      }
                      else {
                      size = bytes + 'bytes';
                      }*/
                     return size;
                 }
 
                 $modalPpload.attr('data-ppload-collection-id', $(this).attr('data-ppload-collection-id'));
                 $modalPpload.attr('data-product-id', $(this).attr('data-product-id'));
                 $modalPpload.attr('data-addpploadfile-uri', $(this).attr('data-addpploadfile-uri'));
                 $modalPpload.attr('data-updatepploadfile-uri', $(this).attr('data-updatepploadfile-uri'));
                 $modalPpload.attr('data-deletepploadfile-uri', $(this).attr('data-deletepploadfile-uri'));
                 $modalPpload.find('div[data-file-upload]').css({
                     'min-height': '200px',
                     'max-height': '400px',
                     'border-width': '5px',
                     'border-style': 'dashed',
                     'border-color': '#cccccc',
                     'overflow': 'inherit'
                 });
                 $modalPpload.find('table[data-ppload-files] tbody').html('');
                 $modalPpload.find('table[data-file-upload] tbody').html('');
                 $modalPpload.find('p[data-file-upload-msg]').show();
 
                 $modalPpload.find('input[data-accept-checkbox]').removeAttr('disabled');
 
                 $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                 $modalPpload.find('#github_picker').attr('disabled', 'disabled');
                 $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
 
                 if ($modalPpload.attr('data-ppload-collection-id')) {
                     getPploadFiles();
                 }
 
                 if(<?= (isset($this->project_id))?$this->project_id:0  ?> != 0) {
                     getUpdates();
                 }
 
                 $modalPpload.on('dragover', 'div[data-file-upload]', function (event) {
                     event.preventDefault();
                 });
 
                 $modalPpload.on('dragenter', 'div[data-file-upload]', function (event) {
                     event.preventDefault();
                     $(this).css('border-color', '#00ccff');
                 });
 
                 $modalPpload.on('dragleave', 'div[data-file-upload]', function (event) {
                     event.preventDefault();
                     $(this).css('border-color', '#cccccc');
                 });
 
                 $modalPpload.on('drop', 'div[data-file-upload]', function (event) {
                     event.preventDefault();
                     $.each(event.originalEvent.dataTransfer.files, function () {
                         addFileToPploadUploadQueue(null, this);
                     });
                     startUploadPploadFiles();
                     $(this).css('border-color', '#cccccc');
                 });
 
                 $modalPpload.on('change', 'input[data-file-upload]', function (event) {
                     $.each(this.files, function () {
                         addFileToPploadUploadQueue(null, this);
                     });
                     startUploadPploadFiles();
                 });
 
                 $modalPpload.on('click', 'button[data-addpploadfile-btn]', function (event) {
                     event.preventDefault();
                     $modalPpload.find('input[data-file-upload]').click();
                 });
 
                 $modalPpload.on('change', 'input[data-file-upload-update]', function (event) {
                     if ($(this).attr('data-ppload-file-id')) {
                         var fileId = $(this).attr('data-ppload-file-id');
                         $modalPpload.find('tr[data-ppload-file-id="' + fileId + '"]').hide();
                         addFileToPploadUploadQueue(fileId, this.files[0]);
                         startUploadPploadFiles();
                     }
                 });
 
                 $modalPpload.on('click', 'tr[data-ppload-file-id] a[data-updatepploadfile-btn]', function (event) {
                     event.preventDefault();
                     var $inputForm = $modalPpload.find('input[data-file-upload-update]');
                     $inputForm.attr('data-ppload-file-id', $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id'));
                     $inputForm.click();
                 });
 
                 $modalPpload.on('click', 'input[data-accept-checkbox]', function (event) {
                     if ($modalPpload.find('input[data-accept-checkbox]').is(':checked')) {
                         $modalPpload.find('button[data-addpploadfile-btn]').removeAttr('disabled');
                         $modalPpload.find('#github_picker').removeAttr('disabled');
                     } else {
                         $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                         $modalPpload.find('#github_picker').attr('disabled', 'disabled');
                     }
                 });
 
                 $modalPpload.on('click', 'tr[data-ppload-file-id] a[data-deletepploadfile-btn]', function (event) {
                     event.preventDefault();
                     deletePploadFile($(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id'));
                 });
 
                 $modalPpload.on('click', 'button[data-file-upload-cancel-btn]', function (event) {
                     event.preventDefault();
                     pploadUploads.uploading.abort();
                     pploadUploads.queue = {};
                     $modalPpload.find('table[data-file-upload] tbody').html('');
                 });
 
                 $modalPpload.on('click', 'tr[data-file-upload-id] a[data-file-upload-cancel-btn]', function (event) {
                     event.preventDefault();
                     var uploadId = $(this).closest('tr[data-file-upload-id]').attr('data-file-upload-id');
                     if (uploadId == pploadUploads.currentUploadId) {
                         pploadUploads.uploading.abort();
                     }
                     else {
                         delete pploadUploads.queue[uploadId];
                         $modalPpload.find('tr[data-file-upload-id="' + uploadId + '"]').remove();
                     }
                 });
 
                 $modalPpload.on('change', 'input[data-ppload-file-description]', function (event) {
                     event.preventDefault();
                     var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
                     var fileDescription = $(this).closest('input[data-ppload-file-description]').val();
                     var fileCategory = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-category');
                     var fileTags = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-tags');
 
                     $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-tags', fileTags);
                     updatePploadFile(fileId, fileDescription, fileCategory, fileTags);
                 });
 
                 $modalPpload.on('change', 'input[data-ppload-file-version]', function (event) {
                     event.preventDefault();
                     var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
                     var fileVersion = $(this).closest('input[data-ppload-file-version]').val();
                     updatePploadFileVersion(fileId, fileVersion);
                 });
 
                  $modalChanglog.on('click', 'button[data-add-update-btn]', function (event) {
                     var update_id = $modalChanglog.find('#update-id').val();
                     var title = $modalChanglog.find('#update-title').val();
                     var text = $modalChanglog.find('#update-text').val();
                     var productId = <?= isset($this->project_id)?$this->project_id:0 ?>;
                     event.preventDefault();
 
                     $.ajax({
                         url: '<?=$helpProductUrl->buildProductUrl($this->project_id, 'saveupdateajax')?>',
                         type: 'POST',
                         data: {title: title, text: text, update_id: update_id},
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'success') {
                                 return;
                             }
                             $modalChanglog.find('#update-title').val('');
                             $modalChanglog.find('#update-text').val('');
                             $modalChanglog.find('#update-id').val('');
                             getUpdates();
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             return;
                         }
                     });
 
                 });
 
                 $modalChanglog.on('click', 'button[data-delete-update-btn]', function (event) {
                     var updateId = $(this).attr('data-delete-update-btn');
                     var productId = <?= isset($this->project_id)?$this->project_id:0 ?>;
                     event.preventDefault();
 
                     $.ajax({
                         url: '<?=$helpProductUrl->buildProductUrl($this->project_id, 'deleteupdateajax')?>',
                         type: 'POST',
                         data: {update_id: updateId},
                         dataType: 'json',
                         success: function (data, textStatus, jqXHR) {
                             if (data.status != 'success') {
                                 alert('Update could not be deleted!');
                                 return;
                             }
                             getUpdates();
                         },
                         error: function (jqXHR, textStatus, errorThrown) {
                             return;
                         }
                     });
 
                 });
 
                 $modalChanglog.on('click', 'button[data-change-update-btn]', function (event) {
                     var updateId = $(this).attr('data-change-update-btn');
                     //var title = $(this).attr('data-change-title');
                     //var text = $(this).attr('data-change-text');
                     var changelog = Changelog.getLogMsg(updateId);
                     var title = changelog.msg_title;
                     var text = changelog.msg_text;
 
                     $modalChanglog.find('#update-title').val(title);
                     $modalChanglog.find('#update-text').val(text);
                     $modalChanglog.find('#update-id').val(updateId);
 
                     $modalChanglog.find('#update-title').focus();
 
                     event.preventDefault();
                 });
 
 
 
                 $modalPpload.on('change', 'select.chosen', function (event) {
                     event.preventDefault();
                     var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
                     var currentTags = $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags');
                     var chosenTags = $(this).val();
 
                     var newTags = UserTags.removeOldTags(currentTags);
                     newTags = UserTags.setNewTags(newTags, chosenTags);
 
                     updatePploadFileTags(fileId, newTags);
                     $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags',newTags);
                 });
 
                 /*
                 $modalPpload.on('change', 'select[id*=data-select-license]', function(event) {
                     event.preventDefault();
                     var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
                     var fileTags = $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags');
                     var licenseId = $modalPpload.find('#data-select-license' + fileId).val();
 
                     var newFileTags = '';
 
                     if (fileTags) {
 
                         $.each(fileTags.split(','), function () {
                             // skip old entries
                             if ((this.length == 0) || (this.indexOf('licensetype-') == 0) || (this.indexOf('license##') == 0)) {
                                 return true;
                             }
                             newFileTags += ',' + this;
                         });
 
                     }
                     newFileTags += ',licensetype-'+licenseId;
                     updatePploadFileTags(fileId, newFileTags);
                     $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags',newFileTags);
                 });
 
                 */
 
                 $modalPpload.on('change', 'select[id*=data-select-packagetype]', function(event) {
                     event.preventDefault();
                     var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
                     var fileTags = $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags');
                     var packagetypeId = $modalPpload.find('#data-select-packagetype' + fileId).val();
 
                     var newFileTags = '';
                     if (fileTags) {
 
                         $.each(fileTags.split(','), function () {
                             // skip old entries
                             if ((this.length == 0) || (this.indexOf('packagetypeid-') == 0) || (this.indexOf('packagetypeid##') == 0)) {
                                 return true;
                             }
                             newFileTags += ',' + this;
                         });
 
                     }
                     newFileTags += ',packagetypeid-'+packagetypeId;
                     updatePploadFileTags(fileId, newFileTags);
                     $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags',newFileTags);
                     updatePackageType(fileId, packagetypeId);
                 });
 
                 $modalPpload.on('change', 'select[id*=data-select-architecture]', function(event) {
                     event.preventDefault();
                     var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
                     var fileTags = $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags');
                     var architectureId = $modalPpload.find('#data-select-architecture' + fileId).val();
 
                     var newFileTags = '';
                     if (fileTags) {
 
                         $.each(fileTags.split(','), function () {
                             // skip old entries
                             if ((this.length == 0) || (this.indexOf('architectureid-') == 0) || (this.indexOf('architectureid##') == 0)) {
                                 return true;
                             }
                             newFileTags += ',' + this;
                         });
 
                     }
                     newFileTags += ',architectureid-'+architectureId;
                     updatePploadFileTags(fileId, newFileTags);
                     $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags',newFileTags);
                     updateArchitecture(fileId, architectureId);
                 });
 
         });
 
 
 
         var LogCollection=function()
         {
             this.changelogs = {};
 
             this.setLogMsg =
                 function(id, title, msg) {
                     this.changelogs[id] = {msg_title:title, msg_text:msg};
             };
 
             this.getLogMsg =
                 function(id) {
                     return this.changelogs[id];
                 }
         };
 
         var Changelog = new LogCollection();
     </script>
   <script>
           $.fn.sortSelect = function() {
               var op = this.children("option");
               op.sort(function(a, b) {
                   return a.text > b.text ? 1 : -1;
               })
               return this.empty().append(op);
           }
 
           $.fn.sort_select_box = function(){
               var my_options = $("option", $(this));
               my_options.sort(function(a,b) {
                   if (a.text > b.text) return 1;
                   else if (a.text < b.text) return -1;
                   else return 0
               });
               $(this).empty().append(my_options);
           }
 
           function setSourceNeededForCategoryInfo(element_id, cat_id) {
             $('.cat_source_info').remove();
             jQuery.ajax({
                 data: {'cat_id': cat_id},
                 url: '/productcategory/fetchsourceneeded/',
                 type: 'get',
                 success: function (results) {
                     var isSourceRequired = results.source_required;
 
                     if(isSourceRequired == 1) {
                         $('#wrapper_cat_id').append('<div class="cat_source_info" id="' + element_id + '_cat_source_info">*for this category a Source-Code Repository is needed for plings</div>');
                     }
                 }
             });
           }
 
 
 
           ProductForm = {
 
               mode: "<?=$this->mode?>",
               project_id: <?php echo ($this->mode == 'edit') ? $this->project_id : '$(\'#project_id\').val()'?>,
               errors: "",
               cat_id_data: <?=json_encode($categories)?>,
               cat_id_path: <?=json_encode($categoryPath)?>,
 
 
               setup: function () {
                   this.setupCategorySelect();
                   this.setupCategoryAjax();
               },
 
               setupCategorySelect: function() {
                   var level = 0;
                   for (var form_elem_name in this.cat_id_data) {
                       var nextElementName = form_elem_name.substring(0, form_elem_name.length - 1) + (level + 1);
                       var new_html_element = '<select name="' + form_elem_name + '" id="' + form_elem_name + '" class="required form-control product_select_cat" data-target="'+nextElementName+'" data-level="'+level+'">';
                       new_html_element += '<option value=""> </option>';
                       for (var form_select_option in this.cat_id_data[form_elem_name]) {
                           var attr_selected = '';
                           if (form_select_option == this.cat_id_path[level]) {
                               attr_selected = ' selected="selected"'
                           }
                           new_html_element += '<option value="' + form_select_option + '" ' + attr_selected + '>' + this.cat_id_data[form_elem_name][form_select_option] + '</option>';
                       }
                       new_html_element += '</select>';
 
                       $('#wrapper_cat_id').append(new_html_element);
                       this.sortOptionByValue(form_elem_name);
 
                       var size = <?=count($categories)?>;
                       if((size-1) == level) {
                             this.setSourceNeededForCategoryInfo(form_elem_name, this.cat_id_path[level]);
                       }
 
                       level++;
                   }
               },
 
               setSourceNeededForCategoryInfo: function(element_id, cat_id) {
 
                 jQuery.ajax({
                     data: {'cat_id': cat_id},
                     url: '/productcategory/fetchsourceneeded/',
                     type: 'get',
                     success: function (results) {
                         var isSourceRequired = results.source_required;
                         if(isSourceRequired == 1) {
                             $('#wrapper_cat_id').append('<div class="cat_source_info" id="' + element_id + '_cat_source_info">*for this category a Source-Code Repository is needed for plings</div>');
                         }
                     }
                 });
               },
 
               sortOptionByValue: function(element_id) {
                   var my_options = $("#"+element_id + " option");
                   var selected = $("#"+element_id).val();
 
                   my_options.sort(function(a,b) {
                       if (a.text > b.text) return 1;
                       else if (a.text < b.text) return -1;
                       else return 0;
                   })
                   $("#"+element_id).empty().append( my_options );
                   $("#"+element_id).val(selected);
               },
 
 
               setupCategoryAjax: function () {
                   $('body').on('change', 'div#wrapper_cat_id select.product_select_cat', function () {
 
                       var cat_id = $(this).val();
                       var name_old_elem = $(this).attr('name');
                       var name_new_elem = $(this).data('target');
                       var level_elem = $(this).data('level') + 1;
                       var level_new_elem = level_elem + 1;
                       var name_new_target = name_new_elem.substring(0,name_new_elem.length - 1) + level_new_elem;
 
                       if (!cat_id) {
                           $('#wrapper_form_cat input:hidden:first').val($('#wrapper_cat_id').find("[data-level]:lt(" + (level_elem - 1) + ")").val());
                           $('#wrapper_cat_id').find("[data-level]:gt(" + (level_elem - 1) + ")").remove();
                           $('.cat_source_info').remove();
                           return;
                       }
                       $('#wrapper_form_cat input:hidden:first').val(cat_id);
 
                       jQuery.ajax({
                           data: {'cat_id': cat_id},
                           url: '/productcategory/fetchchildren/',
                           type: 'post',
                           success: function (results) {
                               $('#wrapper_cat_id').find("[data-level]:gt(" + (level_elem - 1) + ")").remove();
                               $('#' + (level_elem - 1) + '_cat_source_info').remove();
                               $('.cat_source_info').remove();
                               if (!$.isEmptyObject(results)) {
                                   var new_html_element = '<select name="' + name_new_elem + '" id="' + name_new_elem + '" class="required form-control product_select_cat" data-target="'+name_new_target+'" data-level="'+level_elem+'">';
                                   new_html_element += '<option value=""> </option>';
                                   for (var i in results) {
                                       new_html_element += '<option value="' + results[i].project_category_id + '">' + results[i].title + '</option>';
                                   }
                                   new_html_element += '</select>';
 
                                   $('#wrapper_cat_id').append(new_html_element);
                              } else {
                                 var name_elem = name_old_elem;
                                 setSourceNeededForCategoryInfo(name_elem, cat_id);
                              }
                         }
                       });
                   });
               },
 
               saveSection: function (sectionId) {
                   var pid = <?php echo ($this->mode == 'edit') ? $this->project_id : '$(\'#project_id\').val()'?>;
                   if (pid != '') {
                       return;
                   }
 
                   var url = '/p/save/';
                   var data = $('#' + sectionId + ' :input').serialize();
                   var result = false;
 
                   jQuery.ajax({
                       data: data,
                       url: url,
                       type: 'post',
                       async: false
                   }).done(function (data, textStatus, jqXHR) {
                       if (data.project_id == undefined) {
                           ProductForm.project_id = '';
                       } else {
                           ProductForm.project_id = data.project_id;
                       }
                       if (data.status == 'error') {
                           ProductForm.errors = data.messages;
                           result = false;
                       } else {
                           result = true;
                       }
 
                   }).fail(function (jqXHR, textStatus, errorThrown) {
 
                   }).always(function (data, textStatus, errorThrown) {
 
                   });
 
                   return result;
               },
 
               showErrors: function () {
                   $.each(this.errors, function (index, value) {
                       $('[name=' + index + ']').append('<label id="title-error" class="error" for="title">' + value + '</label>');
                   });
               }
 
           };
 
           var ProductGallery = (function () {
               var maxImageCount = 5;
 
               return {
 
                   setup: function () {
                       $('body').on({
                           mouseenter: function () {
                               $(this).find('.icon-check').hide();
                               $(this).find('.icon-cross').show();
                           },
                           mouseleave: function () {
                               $(this).find('.icon-check').show();
                               $(this).find('.icon-cross').hide();
                           }
                       }, '.product-image');
                       $('body').on('click', '.icon-cross', function () {
                           $(this).closest('.product-image').remove();
                           ProductGallery.incImageCount();
                       });
                   },
 
                   previewImage: function (input) {
 
                       if (!input.files.length) {
                           return;
                       }
 
                       maxImageCount--;
 
                       var reader = new FileReader();
                       var image = new Image();
                       var file = input.files[0];
 
                       reader.readAsDataURL(file);
                       reader.onload = function (_image) {
 
                           $('#gallery-error').remove();
 
                           $('.product-image').last().append('<div class="absolute icon-check"></div>' +
                               '<div class="absolute icon-cross"></div>' +
                               '<div class="image" style="background-image: url(' + _image.target.result + ');"></div>'
                           );
                           $('.product-image').last().after('<div class="product-image relative">' +
                               '<input type="file" name="upload_picture[]" class="gallery-picture" onchange="ProductGallery.previewImage(this);"></div>'
                           );
                           if (maxImageCount <= 0) {
                               $('.upload-image-container').hide();
                           }
 
                           image.src = _image.target.result;              // url.createObjectURL(file);
                           image.onload = function () {
                               var w = this.width,
                                   h = this.height,
                                   t = file.type,                           // ext only: // file.type.split('/')[1],
                                   n = file.name,
                                   s = ~~(file.size / 5120)// +'KB';
                               if (s > 5120) {
                                   $('.product-image').last().prev()
                                       .find('div.icon-check')
                                       .after('<div class="image-error">File too large</div>')
                                       .removeClass('icon-check')
                                       .addClass('icon-report')
                                   ;
                                   $('.product-image').last().prev()
                                       .find('input.gallery-picture').remove()
                                       .append('<input type="file" name="upload_picture[]" class="gallery-picture" onchange="ProductGallery.previewImage(this);"></div>')
                                   ;
                               }
                           };
                           ;
                           image.onerror = function () {
                               $('.product-image').last().prev().find('div.image').append('Invalid file type: ' + file.type);
                           };
                       }
                   },
                   thumbClick: function (element) {
                       var index = $(element).attr('data-index');
                       $('.thumb').removeClass('thumb-active');
                       $(element).parent().addClass('thumb-active');
                       $('#gallery-carousel').find('.active').removeClass('active');
                       $('#gallery-carousel').find('.item[data-index="' + index + '"]').addClass('active');
 
                   },
                   gallerySlide: function () {
                       var index = $('#gallery-carousel').find('.active').attr('data-index');
                       $('.thumb-active').removeClass('thumb-active');
                       $('.thumb a[data-index="' + index + '"]').parent().addClass('thumb-active');
                   },
                   incImageCount: function () {
                       if (maxImageCount < 5) {
                           maxImageCount = maxImageCount + 1;
                       }
                       $('.upload-image-container').show();
                   }
 
               };
           })();
 
   </script>
 <?php $this->inlineScript()->appendScript(
     '    $(document).ready(function(){
             ImagePreview.setup();
             ProductForm.setup();
             ProductGallery.setup();
         });
     ');
diff --git a/application/modules/default/views/scripts/product/partials/ppload.phtml b/application/modules/default/views/scripts/product/partials/ppload.phtml
index aa934165d..09d5c852e 100644
--- a/application/modules/default/views/scripts/product/partials/ppload.phtml
+++ b/application/modules/default/views/scripts/product/partials/ppload.phtml
@@ -1,973 +1,973 @@
 <?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/>.
  **/
 $architectureListHelper = new Default_View_Helper_FetchArchitectureTags();
 $packagetypeListHelper = new Default_View_Helper_FetchPackagetypeTags();
 ?>
 
   <!-- ppload -->
          <?php if ($this->product->ppload_collection_id): ?>
              <?php
              $helperCatXdgType = new Default_View_Helper_CatXdgType();
              $xdgType = $helperCatXdgType->catXdgType($this->product->project_category_id);
 
              $helperUserRole = new Backend_View_Helper_UserRole();
              $userRoleName = $helperUserRole->userRole();
 
              ?>
                  <article>
                      <div id="modal-installation-instructions"
                           class="modal fade"
                           role="dialog"
                           aria-labelledby="modal-installation-instructions-label">
                         <div class="modal-dialog content-modal" style="width: 640px; font-size: 12pt;">
                             <div class="modal-content">
                                 <div class="modal-header">
                                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                                     <h3 id="modal-installation-instructions-label"><?= $this->translate('Installation Instructions') ?></h3>
                                 </div>
                                 <div class="modal-body">
 <?php /*
                                 <iframe src="https://opendesktop.github.io/ocs-url/opendesktoporg-help.html" width="100%" height="500" frameborder="0" seamless id="iframeInstallInstruction"></iframe>
               */
                                 ?>
                                 </div>
                             </div>
                         </div>
                      </div>
 
                      <div data-ppload-api-uri="<?= PPLOAD_API_URI ?>"
                           data-ppload-collection-id="<?= $this->product->ppload_collection_id ?>"
                           data-xdg-type="<?= $xdgType ?>">
 
                          <!--
                          <iframe src="" width="0" height="0" frameborder="0"
                                  data-pling-music-uri="/pling-music-html5/embed.html"
                                  seamless></iframe>
                          -->
 
                          <!--table-bordered-->
                          <table class="table table-ocs-file" data-ppload-files="">
                              <thead>
                              <tr>
                                  <th><?= $this->translate('File (click to download)'); ?></th>
                                  <th><?= $this->translate('Version'); ?></th>
                                  <th><?= $this->translate('Description'); ?></th>
-                            
+
                                  <th><?= $this->translate('Packagetype'); ?></th>
                                  <th><?= $this->translate('Architecture'); ?></th>
-                             
+
                                  <th style="text-align: right"><?= $this->translate('Downloads'); ?></th>
                                  <th><?= $this->translate('Date'); ?></th>
 
                                  <th style="text-align: right"><?= $this->translate('Filesize'); ?></th>
-                                
+
                                  <th style="text-align: right">DL</th>
                                   <th style="text-align: right;white-space:nowrap"><?= $this->translate('OCS-Install'); ?>
                                      <a href="#modal-installation-instructions" role="button" data-toggle="modal"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span></a>
                                  </th>
                                  <?php if (Default_Model_DbTable_MemberRole::ROLE_NAME_ADMIN == $userRoleName) : ?>
                                  <th>Compatible</th>
                                  <?php endif; ?>
                              </tr>
                              </thead>
                              <tbody></tbody>
                              <tfoot>
                              </tfoot>
                          </table>
 
 
                      </div>
                  </article>
 
 
                  <?php /*
              <div class="item active" style="max-width: 800px; max-height: 550px; margin:0 auto; display: none" id="carouselPPlay">
                     <div data-ppload-api-uri="<?= PPLOAD_API_URI ?>"
                           data-ppload-collection-id="<?= $this->product->ppload_collection_id ?>">
 
                           <iframe src="" width="0" height="0" frameborder="0" id="pplayiframe"
                                  data-pling-music-uri="/pling-music-html5/embed.html"
                                  seamless></iframe>
                     </div>
              </div>
              */?>
 
 
              <script type="text/javascript">
 
                  $(function () {
                      var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}};
 
                      var $pploadCollection = $('div[data-ppload-collection-id]');
                      var $plingMusic = $pploadCollection.find('iframe[data-pling-music-uri]');
                      var pploadApiUri = $pploadCollection.attr('data-ppload-api-uri');
                      var hasFilesPanelOpened = false;
 
                      function keysrt(key, asc) {
                          if(asc) {
                               return function(a,b){
                                if (a[key] > b[key]) return 1;
                                if (a[key] < b[key]) return -1;
                                return 0;
                               }
                          } else {
                              return function(a,b){
                                    if (a[key] < b[key]) return 1;
                                    if (a[key] > b[key]) return -1;
                                    return 0;
                              }
                          }
                     }
 
                     function activeCarouselFirstImg()
                     {
                           $('.carousel-inner .item').first().addClass('active');
                            $('.carousel-indicators > li').first().addClass('active');
                            $( '.carousel-indicators > li').each(function( index ) {
                                 $( this ).attr("data-slide-to",index);
                             });
                     }
 
 
                      function getPploadFiles(page) {
                           activeCarouselFirstImg();
-                          
+
                          var collectionId = $pploadCollection.attr('data-ppload-collection-id');
                          if (!page) {
                              page = 1;
                          }
                          $.ajax({
                              url: pploadApiUri + 'files/index',
                              type: 'GET',
                              data: {
                                  format: 'json',
                                  ignore_status_code: 1,
                                  status: 'all',
                                  collection_id: collectionId,
                                  perpage: 1000,
                                  page: page
                              },
                              dataType: 'json',
                              success: function (data, textStatus, jqXHR) {
                                  if (data.status != 'success') {
                                     activeCarouselFirstImg();
                                      return;
                                  }
 
                                  var isPlayable = false;
                                  var fileSizeSum = 0;
 
                                  var downloaded_count_total = 0;
                                  var firstRow = true;
 
                                 var myArray = $.map(data.files, function(entry) {
                                     return entry;
                                 });
 
                                 //myArray = myArray.sortOn('active');
                                 myArray.sort(keysrt('active'), false);
                                 myArrayActive = [];
                                 myArrayInactive = [];
                                 $.each(myArray, function () {
                                         if(this.active == '1') {
                                                 myArrayActive.push(this);
                                         } else {
                                                 myArrayInactive.push(this);
                                         }
                                 });
 
                                 //sort
                                 myArrayActive.sort(keysrt('created_timestamp'), false);
                                 myArrayInactive.sort(keysrt('created_timestamp'), false);
 
                                 var oldestFileId = null;
                                 //Active Files
                                  $.each(myArrayActive, function () {
                                     if(firstRow) {
                                         //this.downloaded_count = parseInt(this.downloaded_count) + parseInt(<?= $this->product->count_downloads_hive?>);
                                         oldestFileId = this.id;
                                         firstRow = false;
                                     }
 
                                     if(this.id < oldestFileId) {
                                             oldestFileId = this.id;
                                     }
 
                                     count_downloads = this.downloaded_count || 0;
                                     downloaded_count_total = downloaded_count_total+parseInt(count_downloads);
 
-                                    //downloadlink is now: domain/api/files/downloadfile/id/ID/s/TOKEN/t/TIMESTAMP/u/USERID/FILE_NAME
+                                    //downloadlink is now: domain/api/files/download/id/ID/s/TOKEN/t/TIMESTAMP/u/USERID/FILE_NAME
                                     var hash = '<?= $this->download_hash ?>';
                                     var timetamp = '<?= $this->download_timestamp ?>';
                                     var userid = '<?= $this->member_id?>';
 
-                                    var downloadUrl = "https://<?= $_SERVER["SERVER_NAME"]?>/p/<?= $this->product->project_id ?>/startdownload?file_id=" + this.id + "&file_name=" + this.name + "&file_type=" + this.type + "&file_size=" + this.size + "&url=" + encodeURIComponent(pploadApiUri + 'files/downloadfile/id/' + this.id + '/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name);
+                                    var downloadUrl = "https://<?= $_SERVER["SERVER_NAME"]?>/p/<?= $this->product->project_id ?>/startdownload?file_id=" + this.id + "&file_name=" + this.name + "&file_type=" + this.type + "&file_size=" + this.size + "&url=" + encodeURIComponent(pploadApiUri + 'files/download/id/' + this.id + '/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name);
                                     var downloadLink = '<a href="' + downloadUrl + '" id="data-link' + this.id + '">' + this.name + '</a>';
 
                                     /*
                                     var fileNameBtnLink = this.name;
                                     if(fileNameBtnLink.length > 25) {
                                         fileNameBtnLink = fileNameBtnLink.substring(0,22) + '...';
                                     }*/
                                     var downloadBtnLink = downloadUrl;
                                     var downloadLinkFilename = shortFilename(this.name);
 
                                     var link = '';
 
                                     var fileDescription = '';
                                     if (this.description) {
                                         fileDescription = this.description;
                                     }
                                     var licenseId = '';
                                     var license = '';
                                     var packagetypeId = '';
                                     var architectureId = '';
                                     if (this.tags) {
                                          fileTags = this.tags;
 
                                          $.each(fileTags.split(','), function () {
 
                                              if(this.indexOf("##")==-1) {
                                               var tagStr = this.split('-');
                                               if (tagStr.length == 2 && tagStr[0] == 'os') {
                                                   osId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'licensetype') {
                                                   licenseId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                   packagetypeId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'architectureid') {
                                                   architectureId = tagStr[1];
                                               }
                                              } else {
                                               var tagStr = this.split('##');
                                               if (tagStr.length == 2 && tagStr[0] == 'link') {
                                                   link = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'license') {
                                                   license = tagStr[1];
                                                   license = Base64.decode(license);
                                               } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                   packagetypeId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'architectureid') {
                                                   architectureId = tagStr[1];
                                               }
                                              }
                                              /*else if (tagStr.length == 2 && tagStr[0] == 'package') {
                                               packageId = tagStr[1];
                                               }
                                               else if (tagStr.length == 2 && tagStr[0] == 'arch') {
                                               archId = tagStr[1];
                                               }
                                               else if (tagStr.length == 2 && tagStr[0] == 'device') {
                                               deviceId = tagStr[1];
                                               }*/
                                          });
                                      }
 
                                      var ocsUrl = '';
                                      if (typeof link !== 'undefined' && link) {
                                          ocsUrl = generateOcsUrl(
                                              decodeURIComponent(link),
                                              $pploadCollection.attr('data-xdg-type')
                                          );
                                      } else if (!link) {
                                          ocsUrl = generateOcsUrl(
                                              downloadUrl,
                                              $pploadCollection.attr('data-xdg-type'),
                                              this.name
                                          );
                                      }
 
                                      var installButton = '';
                                      var installLink = '';
                                      var installLinkFilename = '';
 
                                      if ( ocsUrl) {
                                             if(this.active && this.ocs_compatible == 1){
                                                 installButton = '<a href="' + ocsUrl + '" class="btn btn-native btn-min-width">Install</a>';
                                                 installLink = ocsUrl;
                                                 installLinkFilename = shortFilename(this.name);
 
                                             } else {
                                                 installButton = '<a href="#" class="btn btn-min-width disabled">INCOMPATIBLE</a>';
                                                 installLink = '';
                                                 installLinkFilename = '';
                                             }
                                      }
 
                                     //if(this.active == '1') {
                                     var greyText = ' class="activerows"';
                                     if(this.active == '0') {
                                            greyText = ' style="color: #ccc;"';
                                     }
 
                                     var downloadButton = '';
                                     var username = '<?= $this->product->username?>';
                                     downloadButton = '<a href="'+downloadUrl+'" data-username="'+username+'" class="btn btn-native btn-min-width opendownloadfile" ><img src="/images/system/download.svg" alt="download" style="width:20px; height:20px"></a>' ;
 
                                     if(this.version==null) {version = '';} else{version = this.version;}
                                     var isExternLink = false;
                                     if ((typeof link != 'undefined') && (link != "")) {
                                        isExternLink = true;
                                     }
 
 
 
                                     var mnt = moment(this.created_timestamp);
 
                                         $pploadCollection.find('table[data-ppload-files] tbody').append(
                                             '<tr data-ppload-file-id="' + this.id + '"' + greyText + '>'
                                             + '<td>' + downloadLink + '</td>'
                                             + '<td>' + version + '</td>'
-                                            + '<td>' + fileDescription + '</td>'                                            
+                                            + '<td>' + fileDescription + '</td>'
                                             + '<td>'
                                             + '<select id="data-select-packagetype' + this.id + '" data-packagetype-id="" name="packagetype" class="form-control input-sm" style="width: 200px;">'
                                             + '<option value=\"\"></option>'
                                                 <?php
                                                 // force $value to array so we can compare multiple values to multiple
                                                 // options; also ensure it's a string for comparison purposes.
                                                 $tagList = $packagetypeListHelper->fetchList();
                                                 foreach ($tagList as $opt_value => $opt_label) {
                                                 ?>
                                                   + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                                 <?php
                                                 }
                                                 ?>
                                             + '</select><span id="file-tag-packagetype'+this.id+'">'
                                             + '</td>'
                                             + '<td>'
                                             + '<select class="form-control input-sm" id="data-select-architecture' + this.id + '" data-architecture-id="" name="architecture">'
                                             + '    <option value=""></option>'
                                                 <?php
                                                 // force $value to array so we can compare multiple values to multiple
                                                 // options; also ensure it's a string for comparison purposes.
                                                 $tagList = $architectureListHelper->fetchList();
                                                 foreach ($tagList as $opt_value => $opt_label) {
                                                 ?>
                                                   + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                                 <?php
                                                 }
                                                 ?>
                                             + '</select><span id="file-tag-architecture'+this.id+'">'
                                             + '</td>'
                                             + '<td style="text-align: right"><span id="download_counter_' + this.id + '">' + count_downloads + '</td>'
                                             + '<td>' +mnt.format('YYYY-MM-DD') + '</td>'
                                             + '<td style="text-align: right">' + humanFileSize(this.size,false) + '</td>'
                                             + '<td style="text-align: right; ">' + downloadButton+ '</td>'
-                                            + '<td style="text-align: right; ">' + installButton + '</td>'                                            
+                                            + '<td style="text-align: right; ">' + installButton + '</td>'
                                             <?php if (Default_Model_DbTable_MemberRole::ROLE_NAME_ADMIN == $userRoleName) : ?>
                                             + '<td style="text-align: center; "><input type="checkbox" id="data-checkbox-compatible-'+this.id+'" data-is-compatible="" ></td>'
                                             <?php endif; ?>
                                             + '</tr>'
                                         );
 
                                         <?php /*  download/install dropdown btn  */
                                         ?>
                                         var username = '<?= $this->product->username?>';
-                                        $('#dropdown_downloads').append(                                       
+                                        $('#dropdown_downloads').append(
                                             '<li><a data-username="' + username + '" href="' + downloadBtnLink + '" style="white-space: normal; color: #23527c;" class="opendownloadfile" id="data-link-dl' + this.id + '"><span id="download-link-filename' + this.id + '" style="white-space: normal; color: #23527c;">' + downloadLinkFilename + '</span><span class="right">&nbsp;' + humanFileSize(this.size,false) + '&nbsp;</span></a></li>'
                                         );
                                         $('#dropdown_downloads').addClass("active");
                                         $('#dropdown_downloads').removeClass('hide');
                                         $('#project_btn_download').enable();
                                         $('#project_btn_download').removeClass('disabled');
                                         $('#project_btn_download').addClass("active");
                                         $('#project_btn_download').addClass("btn-primary");
 
                                         if(ocsUrl && this.active && this.ocs_compatible == 1){
                                             $('#dropdown_installs').addClass("active");
                                             $('#dropdown_installs').removeClass('hide');
                                             $('#project_btn_install').enable();
                                             $('#project_btn_install').removeClass('disabled');
                                             $('#project_btn_install').removeClass('hide');
                                             $('#project_btn_install').addClass("active");
                                             $('#project_btn_grp_install').removeClass("hide");
 
                                             $('#dropdown_installs').append(
                                                 '<li><a href="' + installLink + '" style="white-space: normal; color: #23527c;"><span id="install-link-filename' + this.id + '" style="white-space: normal; color: #23527c;">' + installLinkFilename + '</span><span class="right">&nbsp;' + humanFileSize(this.size,false) + '&nbsp;</span></a></li>'
 
                                             );
                                         }
-                                      
+
 
                                         if ((typeof osId != 'undefined') && (osId != "")) {
                                             $("#data-updatepploadfile" + this.id + " option[value='" + osId + "']").attr('selected', 'selected');
                                             $os = $("#data-updatepploadfile" + this.id + " option[value='" + osId + "']").text();
                                             //alert("Text: " + $os);
                                             $("#data-updatepploadfile" + this.id).hide();
                                             $("#file-tag-os" + this.id).text($os);
                                         }
 
                                         if ((typeof licenseId != 'undefined') && (licenseId != "")) {
                                             $("#data-select-license" + this.id + " option[value='" + licenseId + "']").attr('selected', 'selected');
                                             $licenseIdText = $("#data-select-license" + this.id + " option[value='" + licenseId + "']").text();
                                             $("#data-select-license" + this.id).hide();
                                             $("#file-tag-license" + this.id).text($licenseIdText);
                                         } else {
                                          $("#data-select-license" + this.id).hide();
                                         }
 
                                         if ((typeof license != 'undefined') && (license != "")) {
                                             $("#file-tag-license-text" + this.id).text(license);
                                         }
 
                                         $("#data-select-license" + this.id).hide();
 
                                         if ((typeof packagetypeId != 'undefined') && (packagetypeId != "")) {
                                             $("#data-select-packagetype" + this.id + " option[value='" + packagetypeId + "']").attr('selected', 'selected');
                                             $packagetypeIdText = $("#data-select-packagetype" + this.id + " option[value='" + packagetypeId + "']").text();
                                             $("#data-select-packagetype" + this.id).hide();
                                             $("#file-tag-packagetype" + this.id).text($packagetypeIdText);
                                             if($packagetypeIdText.toUpperCase() == 'APPIMAGE'){
                                                 $("#file-tag-packagetype" + this.id).append(' <i class="fa fa-question-circle appimagequestion" style="cursor: pointer;"></i>');
                                             }
 
                                         } else {
                                          $("#data-select-packagetype" + this.id).hide();
                                         }
 
                                         $("#data-select-packagetype" + this.id).hide();
-                                        
+
                                         if ((typeof architectureId != 'undefined') && (architectureId != "")) {
                                             $("#data-select-architecture" + this.id + " option[value='" + architectureId + "']").attr('selected', 'selected');
                                             $architectureIdText = $("#data-select-architecture" + this.id + " option[value='" + architectureId + "']").text();
                                             $("#data-select-architecture" + this.id).hide();
                                             $("#file-tag-architecture" + this.id).text($architectureIdText);
                                         } else {
                                          $("#data-select-architecture" + this.id).hide();
                                         }
 
                                         $("#data-select-architecture" + this.id).hide();
-                                        
+
                                         if ((typeof this.ocs_compatible != 'undefined') && (this.ocs_compatible != "") && this.ocs_compatible == 1) {
                                             $("#data-checkbox-compatible-" + this.id).attr('checked', 'checked');
                                         }
 
 
                                         if (isExternLink) {
                                             $fileserverLink = $("#data-link" + this.id).attr('href');
                                             $("#data-link" + this.id).attr('href', decodeURIComponent(link));
                                             $("#data-link" + this.id).attr('data-link-org', $fileserverLink);
 
                                             $("#data-link" + this.id).attr('target','_blank');
                                             $("#data-link" + this.id).html($("#data-link" + this.id).html() + " (External Link)");
 
                                             $("#data-link" + this.id).click(function (event) {
                                                 event.preventDefault();
                                                 $fileserverLink = $(this).attr('data-link-org');
                                                 window.open($fileserverLink, '_blank');
                                             });
 
 
                                             $fileserverLink = $("#data-link-dl" + this.id).attr('href');
                                             $("#data-link-dl" + this.id).attr('href', decodeURIComponent(link));
                                             $("#data-link-dl" + this.id).attr('data-link-org', $fileserverLink);
 
                                             $("#data-link-dl" + this.id).attr('target','_blank');
 
                                             $("#download-link-filename" + this.id).html($("#download-link-filename" + this.id).html() + " (External Link)");
 
                                             $("#data-link-dl" + this.id).click(function (event) {
                                                 event.preventDefault();
                                                 $fileserverLink = $(this).attr('data-link-org');
                                                 window.open($fileserverLink, '_blank');
                                             });
 
                                             $("#install-link-filename" + this.id).html($("#install-link-filename" + this.id).html() + " (External Link)");
                                         }
 
 
                                         $compatibleCheckbox = $("#data-checkbox-compatible-" + this.id);
 
                                         if(this.active == '0') {
                                             $compatibleCheckbox.prop('disabled', 'disabled');
                                         }
 
                                         $compatibleCheckbox.click(function (event) {
                                             event.preventDefault();
                                             $fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
                                             $isCompatible = this.checked;
                                             updateOcsCompatible($fileId, $isCompatible);
                                         });
 
 
                                         //fileSizeSum += parseInt(this.size);
                                         if(parseInt(this.size)>0) {
                                             fileSizeSum += roundFileSizeInMB(parseInt(this.size));
                                         }
 
                                     //if (!isExternLink)
                                     //{
                                        //fileSizeSum += roundFileSizeInMB(parseInt(this.size));
                                     //}
 
 
                                     if (this.type == 'audio/mpeg' || this.type == 'application/ogg') {
                                         isPlayable = true;
                                     }
 
                                     //}
 
                                  });
 
                                  //
                                  //Inactive Fiels
                                  //
                                  $.each(myArrayInactive, function () {
                                     if(null == oldestFileId) {
                                             oldestFileId = this.id;
                                     }
 
                                     if(this.id < oldestFileId) {
                                             oldestFileId = this.id;
                                     }
 
                                     cout_downloads = this.downloaded_count || 0;
 
                                     downloaded_count_total = downloaded_count_total+parseInt(cout_downloads);
 
                                     var hash = '<?= $this->download_hash ?>';
                                     var timetamp = '<?= $this->download_timestamp ?>';
                                     var userid = '<?= $this->product->member_id?>';
-                                    var downloadUrl = "https://<?= $_SERVER["SERVER_NAME"]?>/p/<?= $this->product->project_id ?>/startdownload?file_id=" + this.id + "&file_name=" + this.name + "&file_type=" + this.type + "&file_size=" + this.size + "&url=" + encodeURIComponent(pploadApiUri + 'files/downloadfile/id/' + this.id + '/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name);
+                                    var downloadUrl = "https://<?= $_SERVER["SERVER_NAME"]?>/p/<?= $this->product->project_id ?>/startdownload?file_id=" + this.id + "&file_name=" + this.name + "&file_type=" + this.type + "&file_size=" + this.size + "&url=" + encodeURIComponent(pploadApiUri + 'files/download/id/' + this.id + '/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name);
                                     var downloadLink = '<a class="inactiverows" style="color: #ccc; display:none;"" href="' + downloadUrl + '" id="data-link' + this.id + '">' + this.name + '</a>';
 
 
                                      var fileDescription = '';
                                      if (this.description) {
                                          fileDescription = this.description;
                                      }
 
                                      var licenseId = '';
                                      var license = '';
                                      var architectureId = '';
                                      var packagetypeId = '';
-                                     
-                                     
-                                     
+
+
+
                                      if (this.tags) {
                                          fileTags = this.tags;
                                          $.each(fileTags.split(','), function () {
 
                                              if(this.indexOf("##")==-1) {
                                               var tagStr = this.split('-');
                                               if (tagStr.length == 2 && tagStr[0] == 'os') {
                                                   osId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'licensetype') {
                                                   licenseId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                   packagetypeId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'architectureid') {
                                                   architectureId = tagStr[1];
                                               }
                                              } else {
                                               var tagStr = this.split('##');
                                               if (tagStr.length == 2 && tagStr[0] == 'link') {
                                                   link = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'license') {
                                                   license = tagStr[1];
                                                   license = Base64.decode(license);
                                               } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                   packagetypeId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'architectureid') {
                                                   architectureId = tagStr[1];
                                               }
                                              }
                                              /*else if (tagStr.length == 2 && tagStr[0] == 'package') {
                                               packageId = tagStr[1];
                                               }
                                               else if (tagStr.length == 2 && tagStr[0] == 'arch') {
                                               archId = tagStr[1];
                                               }
                                               else if (tagStr.length == 2 && tagStr[0] == 'device') {
                                               deviceId = tagStr[1];
                                               }*/
                                          });
                                      }
 
                                      //if(this.active == '1') {
                                        var greyText = ' class="inactiverows" style="color: #ccc; display:none;"';
 
                                        if(this.version==null) {version = '';} else{version = this.version;}
 
                                          var isExternLink = false;
                                          if ((typeof link != 'undefined') && (link != "")) {
                                             isExternLink = true;
                                             downloadLink = '<a href="' + decodeURIComponent(link) + '" id="data-link' + this.id + '" style="color: #ccc;">' + this.name + '</a>';
                                          }
                                          var mnt = moment(this.created_timestamp);
                                          $pploadCollection.find('table[data-ppload-files] tbody').append(
                                             '<tr' + greyText + '>'
                                             + '<td>' + downloadLink + '</td>'
                                             + '<td>' + version + '</td>'
                                             + '<td>' + fileDescription + '</td>'
                                             + '<td>'
                                             + '<select id="data-select-packagetype' + this.id + '" data-packagetype-id=" name="packagetype" class="form-control input-sm" style="width: 200px;">'
                                             + '<option value=\"\"></option>'
                                             <?php
                                             // force $value to array so we can compare multiple values to multiple
                                             // options; also ensure it's a string for comparison purposes.
                                             $tagList = $packagetypeListHelper->fetchList();
                                             foreach ($tagList as $opt_value => $opt_label) {
                                             ?>
                                               + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                             <?php
                                             }
                                             ?>
                                             + '</select><span id="file-tag-packagetype'+this.id+'">'
                                             + '</td>'
                                             + '<td>'
                                             + '<select class="form-control input-sm" id="data-select-architecture' + this.id + '" data-architecture-id="" name="architecture">'
                                             + '    <option value=""></option>'
                                                 <?php
                                                 // force $value to array so we can compare multiple values to multiple
                                                 // options; also ensure it's a string for comparison purposes.
                                                 $tagList = $architectureListHelper->fetchList();
                                                 foreach ($tagList as $opt_value => $opt_label) {
                                                 ?>
                                                   + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                                 <?php
                                                 }
                                                 ?>
                                             + '</select><span id="file-tag-architecture'+this.id+'">'
                                             + '</td>'
 
                                             + '<td style="text-align: right"><span id="download_counter_' + this.id + '">' + cout_downloads + '</td>'
                                             + '<td>' +mnt.format('YYYY-MM-DD')  + '</td>'
                                             + '<td style="text-align: right">' + humanFileSize(this.size,false) + '</td>'
                                                 + '<td></td>'
                                                 + '<td></td>'
                                             + '</tr>'
                                          );
 
                                          if ((typeof osId != 'undefined') && (osId != "")) {
                                              $("#data-updatepploadfile" + this.id + " option[value='" + osId + "']").attr('selected', 'selected');
                                              $os = $("#data-updatepploadfile" + this.id + " option[value='" + osId + "']").text();
                                              //alert("Text: " + $os);
                                              $("#data-updatepploadfile" + this.id).hide();
                                              $("#file-tag-os" + this.id).text($os);
                                          }
 
                                          if ((typeof licenseId != 'undefined') && (licenseId != "")) {
                                              $("#data-select-license" + this.id + " option[value='" + licenseId + "']").attr('selected', 'selected');
                                              $licenseIdText = $("#data-select-license" + this.id + " option[value='" + licenseId + "']").text();
                                              $("#data-select-license" + this.id).hide();
                                              $("#file-tag-license" + this.id).text($licenseIdText);
                                          } else {
                                           $("#data-select-license" + this.id).hide();
                                          }
 
                                          $("#data-select-license" + this.id).hide();
 
                                          if ((typeof license != 'undefined') && (license != "")) {
                                              $("#file-tag-license-text" + this.id).text(license);
                                          }
 
                                          if ((typeof packagetypeId != 'undefined') && (packagetypeId != "")) {
                                              $("#data-select-packagetype" + this.id + " option[value='" + packagetypeId + "']").attr('selected', 'selected');
                                              $packagetypeIdText = $("#data-select-packagetype" + this.id + " option[value='" + packagetypeId + "']").text();
                                              $("#data-select-packagetype" + this.id).hide();
                                              $("#file-tag-packagetype" + this.id).text($packagetypeIdText);
                                              if($packagetypeIdText.toUpperCase() == 'APPIMAGE'){
                                                 $("#file-tag-packagetype" + this.id).append(' <i class="fa fa-question-circle appimagequestion" style="cursor: pointer;"></i>');
                                              }
 
                                          } else {
                                           $("#data-select-packagetype" + this.id).hide();
                                          }
 
                                          $("#data-select-packagetype" + this.id).hide();
 
                                           if ((typeof architectureId != 'undefined') && (architectureId != "")) {
                                               $("#data-select-architecture" + this.id + " option[value='" + architectureId + "']").attr('selected', 'selected');
                                               $architectureIdText = $("#data-select-architecture" + this.id + " option[value='" + architectureId + "']").text();
                                               $("#data-select-architecture" + this.id).hide();
                                               $("#file-tag-architecture" + this.id).text($architectureIdText);
                                           } else {
                                            $("#data-select-architecture" + this.id).hide();
                                           }
 
                                           $("#data-select-architecture" + this.id).hide();
 
                                          /**
                                          if ((typeof architectureId != 'undefined') && (architectureId != "")) {
                                              $("#data-select-architecture" + this.id + " option[value='" + architectureId + "']").attr('selected', 'selected');
                                              $architectureIdText = $("#data-select-architecture" + this.id + " option[value='" + architectureId + "']").text();
                                              $("#data-select-architecture" + this.id).hide();
                                              $("#file-tag-architecture" + this.id).text($architectureIdText);
                                          } else {
                                           $("#data-select-architecture" + this.id).hide();
                                          }
 
                                          $("#data-select-architecture" + this.id).hide();
                                          */
 
                                          if (isExternLink) {
                                             //$("#data-link" + this.id).attr('href', decodeURIComponent(link));
                                                 $("#data-link" + this.id).attr('target','_blank');
                                             $("#data-link" + this.id).html($("#data-link" + this.id).html() + " (External Link)");
                                          }
 
 
 
                                         //fileSizeSum += parseInt(this.size);
                                             if(parseInt(this.size)>0) {
                                                 fileSizeSum += roundFileSizeInMB(parseInt(this.size));
                                             }
                                          //if (!isExternLink)
                                          //{
                                             //fileSizeSum += roundFileSizeInMB(parseInt(this.size));
                                          //}
 
 
                                          if (this.type == 'audio/mpeg' || this.type == 'application/ogg') {
                                              isPlayable = true;
                                          }
 
                                      //}
 
                                  });
 
- 
+
                                  //add old download counter
                                  downloaded_count_total += parseInt(<?= $this->product->count_downloads_hive?>);
 
                                  //add old download counter to oldest file
                                  var fileCount = $('#download_counter_'+ oldestFileId).html();
                                  var oldNewCounter = parseInt(fileCount) + parseInt(<?= $this->product->count_downloads_hive?>);
                                  $('#download_counter_'+ oldestFileId).html(oldNewCounter);
 
 
 
                                 //$('#downloadscnt').html(downloaded_count_total);
 
                                  $pploadCollection.find('table[data-ppload-files] tfoot').append(
                                      '<tr>'
                                      + '<th colspan="5">' + myArrayActive.length + ' <?= $this->translate("files")?> (<span style="color: #ccc;" ><a style="cursor:pointer" onclick="fnToggleInactiveFiles();return false;">'+myArrayInactive.length+' archived</a></span>)</th>'
                                      + '<th style="text-align: right">' + downloaded_count_total + '</th>'
                                      + '<th></th>'
                                     + '<th style="text-align: right">' + fileSizeSum.toFixed(2) + ' MB</th>'
                                      //+ '<th style="text-align: right">' + humanFileSize(fileSizeSum) + '</th>'
                                      + '<th></th>'
                                        + '<th></th>'
                                      + '</tr>'
                                  );
 
                                  $pploadCollection.find('a[data-ppload-download-link]').attr(
                                      'href',
                                      pploadApiUri + 'collections/download/id/' + collectionId
                                  );
 
-                                 
+
                                  /*
                                  var b= false;
                                  if (isPlayable && !$plingMusic.attr('src')) {
                                      $plingMusic.attr({
                                          src: $plingMusic.attr('data-pling-music-uri')
                                          + '?play_collection=' + collectionId,
                                          width: '100%',
                                          height: '550'
                                      });
 
                                  $('.carousel-inner').prepend($('#carouselPPlay').show());
                                  $('.carousel-indicators').prepend('<li data-target="#myCarousel" data-slide-to="0"></li>');
                                  $('.carousel-indicators > li').first().addClass('active');
                                     b = true;
                                  }
-                                 
+
                                  if(!b){
                                    activeCarouselFirstImg();
                                  }
                                   */
 
 
                                  if (data.pagination.next) {
                                      getPploadFiles(data.pagination.next);
                                  }
 
                              },
                              error: function (jqXHR, textStatus, errorThrown) {
 
                                   activeCarouselFirstImg();
 
 
                              }
                          });
                      }
 
                      function generateOcsUrl(url, type, filename) {
                          if (!url || !type) {
                              return '';
                          }
                          if (!filename) {
                              filename = url.split('/').pop().split('?').shift();
                          }
                          return 'ocs://install'
                             + '?url=' + encodeURIComponent(url)
                             + '&type=' + encodeURIComponent(type)
                             + '&filename=' + encodeURIComponent(filename);
                      }
 
 
                      function updateOcsCompatible(fileId, isCompatible) {
                         var $url = "/p/<?= $this->product->project_id ?>/updatepploadfile";
 
                         if(fileId != 'undefined' && fileId != null) {
 
                             $.ajax({
                                 url: $url,
                                 type: 'POST',
                                 data: {
                                     file_id: fileId,
                                     ocs_compatible: (isCompatible==true?1:0)
                                 },
                                 dataType: 'json',
                                 success: function (data, textStatus, jqXHR) {
                                     if (data.status == 'ok') {
                                         $("#files-panel").find('table[data-ppload-files] tbody').html('');
                                         $('#dropdown_downloads').html('');
                                         $("#files-panel").find('table[data-ppload-files] tfoot').html('');
                                         getPploadFiles();
 
                                     }
 
                                 },
                                 error: function (jqXHR, textStatus, errorThrown) {
                                     alert("Error: " + textStatus + ", " + errorThrown);
 
                                 }
                             });
                         }
                     }
 
                     function shortFilename(filename) {
                         var returnString = filename;
                         if(filename.length > 25) {
                             var name = filename.substring(0,22);
                             var fileExt = filename.split('.').pop();
                             if(fileExt.length>3) {
                                 name = name.substring(0,(25-fileExt.length));
                             }
                             returnString = name + '...' + fileExt;
                         }
                         return returnString;
                     }
 
 
                      function roundFileSizeInMB(bytes)
                      {
                         // min size 0.01MB
                         if(bytes>0)
                         {
                             var size = (bytes / 1048576).toFixed(2);
                             if(size == '0.00')
                             {
                                 return Number('0.01');
                             }else
                             {
                                 return Number(size);
                             }
                         }
                      }
 
 
 
                       fnToggleInactiveFiles = function(){
                            $('.inactiverows').toggle();
                       };
 
 
 
                      function humanFileSize(bytes,isExternLink) {
                          if(isExternLink) return '----';
                          if(bytes>0)
                          {
                              var size = '';
                              size = (bytes / 1048576).toFixed(2);
                              if(size == '0.00')
                              {
                                 return '0.01 MB';
                              }else
                              {
                                 return size+' MB';
                              }
                          }
                          else
                          {
                             return '0.00 MB';
                          }
                      }
 
                      function humanFileSize_(bytes) {
                          if(bytes>0)
                          {
                              var size = '';
                              size = (bytes / 1048576).toFixed(2);
                              /*
                               if (bytes >= 1073741824) {
                               size = (bytes / 1073741824).toFixed(2) + 'GB';
                               }
                               else if (bytes >= 1048576) {
                               size = (bytes / 1048576).toFixed(2) + 'MB';
                               }
                               else if (bytes >= 1024) {
                               size = (bytes / 1024).toFixed(2) + 'KB';
                               }
                               else {
                               size = bytes + 'bytes';
                               }*/
 
                              if(size == '0.00')
                              {
                                 return '0.01 MB';
                              }else
                              {
                                 return size+' MB';
                              }
                          }
                          else
                          {
                             return '0.00 MB';
                          }
                      }
 
                      //$('a[href="#files-panel"][data-toggle="tab"]').on('click', function () {
                      if (!hasFilesPanelOpened) {
                          getPploadFiles();
                          hasFilesPanelOpened = true;
 
 
                      }
                      //});
 
                  });
 
                 $(function() {
 
                     $('#modal-installation-instructions').on('show.bs.modal', function (e) {
                               var framehtml = '<iframe src="https://opendesktop.github.io/ocs-url/opendesktoporg-help.html" width="100%" height="500" frameborder="0" seamless id="iframeInstallInstruction"></iframe>';
-                              $('#modal-installation-instructions').find('.modal-body').html(framehtml);                              
+                              $('#modal-installation-instructions').find('.modal-body').html(framehtml);
                         });
 
                 });
              </script>
          <?php endif; ?>
          <!-- /ppload -->
diff --git a/application/modules/default/views/scripts/product/partials/pploadajax.phtml b/application/modules/default/views/scripts/product/partials/pploadajax.phtml
index fdd104d76..80bd94f95 100755
--- a/application/modules/default/views/scripts/product/partials/pploadajax.phtml
+++ b/application/modules/default/views/scripts/product/partials/pploadajax.phtml
@@ -1,749 +1,749 @@
 <?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/>.
  **/
 ?>
 
 <style type="text/css">
   .pploadajax .btn{
     padding: 3px 5px;
   }
   .pploadajax td{
     padding: 3px;
   }
-  
+
 </style>
 
   <!-- ppload -->
          <?php if ($this->product->ppload_collection_id): ?>
              <?php
              $helperCatXdgType = new Default_View_Helper_CatXdgType();
-             $xdgType = $helperCatXdgType->catXdgType($this->product->project_category_id);           
+             $xdgType = $helperCatXdgType->catXdgType($this->product->project_category_id);
              ?>
 
              <article>
                 <div style="border: 1px solid #ddd; height: 300px; width: 100%; display: flex; align-items: center;">
                       <h1 style="flex:1; text-align: center;   ">  Welcome to download !</h1>
-                </div>                 
+                </div>
              </article>
 
-                 <article style="font-size: smaller;" class="pploadajax">                  
+                 <article style="font-size: smaller;" class="pploadajax">
                      <div data-ppload-api-uri="<?= PPLOAD_API_URI ?>"
                           data-ppload-collection-id="<?= $this->product->ppload_collection_id ?>"
                           data-xdg-type="<?= $xdgType ?>">
-                
+
                          <!--table-bordered-->
                          <table class="table table-ocs-file" data-ppload-files-ajax="" style="width: 1200px; ">
                              <thead>
                              <tr>
                                  <th><?= $this->translate('File (click to download)'); ?></th>
                                  <th><?= $this->translate('Version'); ?></th>
                                  <th><?= $this->translate('Description'); ?></th>
-                            
+
                                  <th><?= $this->translate('Packagetype'); ?></th>
-                             
+
                                  <th style="text-align: right"><?= $this->translate('Downloads'); ?></th>
                                  <th><?= $this->translate('Date'); ?></th>
 
                                  <th style="text-align: right"><?= $this->translate('Filesize'); ?></th>
-                                
+
                                  <th style="text-align: right">DL</th>
                                   <th style="text-align: right;white-space:nowrap"><?= $this->translate('OCS-Install'); ?>
                                      <a href="#modal-installation-instructions" role="button" data-toggle="modal"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span></a>
                                  </th>
-                               
+
                              </tr>
                              </thead>
                              <tbody></tbody>
                              <tfoot>
                              </tfoot>
                          </table>
 
 
                      </div>
                  </article>
 
 
-             
+
 
 
              <script type="text/javascript">
 
                  $(function () {
                      var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}};
 
-                     var $pploadCollection = $('div[data-ppload-collection-id]');                     
+                     var $pploadCollection = $('div[data-ppload-collection-id]');
                      var pploadApiUri = $pploadCollection.attr('data-ppload-api-uri');
                      var hasFilesPanelOpened = false;
 
                      function keysrt(key, asc) {
                          if(asc) {
                               return function(a,b){
                                if (a[key] > b[key]) return 1;
                                if (a[key] < b[key]) return -1;
                                return 0;
                               }
                          } else {
                              return function(a,b){
                                    if (a[key] < b[key]) return 1;
                                    if (a[key] > b[key]) return -1;
                                    return 0;
                              }
                          }
                     }
 
-                 
+
 
 
                      function getPploadFiles(page) {
-                          
+
                          var collectionId = $pploadCollection.attr('data-ppload-collection-id');
                          if (!page) {
                              page = 1;
                          }
                          $.ajax({
                              url: pploadApiUri + 'files/index',
                              type: 'GET',
                              data: {
                                  format: 'json',
                                  ignore_status_code: 1,
                                  status: 'all',
                                  collection_id: collectionId,
                                  perpage: 1000,
                                  page: page
                              },
                              dataType: 'json',
-                             success: function (data, textStatus, jqXHR) {                                 
+                             success: function (data, textStatus, jqXHR) {
                                  var isPlayable = false;
                                  var fileSizeSum = 0;
 
                                  var downloaded_count_total = 0;
                                  var firstRow = true;
 
                                 var myArray = $.map(data.files, function(entry) {
                                     return entry;
                                 });
 
                                 //myArray = myArray.sortOn('active');
                                 myArray.sort(keysrt('active'), false);
                                 myArrayActive = [];
                                 myArrayInactive = [];
                                 $.each(myArray, function () {
                                         if(this.active == '1') {
                                                 myArrayActive.push(this);
                                         } else {
                                                 myArrayInactive.push(this);
                                         }
                                 });
 
                                 //sort
                                 myArrayActive.sort(keysrt('created_timestamp'), false);
                                 myArrayInactive.sort(keysrt('created_timestamp'), false);
 
                                 var oldestFileId = null;
                                 //Active Files
                                  $.each(myArrayActive, function () {
                                     if(firstRow) {
                                         //this.downloaded_count = parseInt(this.downloaded_count) + parseInt(<?= $this->product->count_downloads_hive?>);
                                         oldestFileId = this.id;
                                         firstRow = false;
                                     }
 
                                     if(this.id < oldestFileId) {
                                             oldestFileId = this.id;
                                     }
 
                                     count_downloads = this.downloaded_count || 0;
                                     downloaded_count_total = downloaded_count_total+parseInt(count_downloads);
 
-                                    //downloadlink is now: domain/api/files/downloadfile/id/ID/s/TOKEN/t/TIMESTAMP/u/USERID/FILE_NAME
+                                    //downloadlink is now: domain/api/files/download/id/ID/s/TOKEN/t/TIMESTAMP/u/USERID/FILE_NAME
                                     var hash = '<?= $this->download_hash ?>';
                                     var timetamp = '<?= $this->download_timestamp ?>';
                                     var userid = '<?= $this->product->member_id?>';
 
-                                    var downloadUrl = "https://<?= $_SERVER["SERVER_NAME"]?>/p/<?= $this->product->project_id ?>/startdownload?file_id=" + this.id + "&file_name=" + this.name + "&file_type=" + this.type + "&file_size=" + this.size + "&url=" + encodeURIComponent(pploadApiUri + 'files/downloadfile/id/' + this.id + '/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name);
+                                    var downloadUrl = "https://<?= $_SERVER["SERVER_NAME"]?>/p/<?= $this->product->project_id ?>/startdownload?file_id=" + this.id + "&file_name=" + this.name + "&file_type=" + this.type + "&file_size=" + this.size + "&url=" + encodeURIComponent(pploadApiUri + 'files/download/id/' + this.id + '/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name);
                                     var downloadLink = '<a href="' + downloadUrl + '" id="data-link-ajax' + this.id + '">' + this.name + '</a>';
 
                                     /*
                                     var fileNameBtnLink = this.name;
                                     if(fileNameBtnLink.length > 25) {
                                         fileNameBtnLink = fileNameBtnLink.substring(0,22) + '...';
                                     }*/
                                     var downloadBtnLink = downloadUrl;
                                     var downloadLinkFilename = shortFilename(this.name);
 
                                     var link = '';
 
                                     var fileDescription = '';
                                     if (this.description) {
                                         fileDescription = this.description;
                                     }
                                      var licenseId = '';
                                      var license = '';
                                      var packagetypeId = '';
                                      if (this.tags) {
                                          fileTags = this.tags;
 
                                          $.each(fileTags.split(','), function () {
 
                                              if(this.indexOf("##")==-1) {
                                               var tagStr = this.split('-');
                                               if (tagStr.length == 2 && tagStr[0] == 'os') {
                                                   osId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'licensetype') {
                                                   licenseId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                   packagetypeId = tagStr[1];
                                               }
                                              } else {
                                               var tagStr = this.split('##');
                                               if (tagStr.length == 2 && tagStr[0] == 'link') {
                                                   link = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'license') {
                                                   license = tagStr[1];
                                                   license = Base64.decode(license);
                                               } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                   packagetypeId = tagStr[1];
                                               }
                                              }
-                                          
+
                                          });
                                      }
 
                                      var ocsUrl = '';
                                      if (typeof link !== 'undefined' && link) {
                                          ocsUrl = generateOcsUrl(
                                              decodeURIComponent(link),
                                              $pploadCollection.attr('data-xdg-type')
                                          );
                                      } else if (!link) {
                                          ocsUrl = generateOcsUrl(
                                              downloadUrl,
                                              $pploadCollection.attr('data-xdg-type'),
                                              this.name
                                          );
                                      }
 
                                      var installButton = '';
                                      var installLink = '';
                                      var installLinkFilename = '';
 
                                      if ( ocsUrl) {
                                             if(this.active && this.ocs_compatible == 1){
                                                 installButton = '<a href="' + ocsUrl + '" class="btn btn-native btn-min-width">Install</a>';
                                                 installLink = ocsUrl;
                                                 installLinkFilename = shortFilename(this.name);
 
                                             } else {
                                                 installButton = '<a href="#" class="btn btn-min-width disabled">INCOMPATIBLE</a>';
                                                 installLink = '';
                                                 installLinkFilename = '';
                                             }
                                      }
 
                                     //if(this.active == '1') {
                                     var greyText = ' class="activerows"';
                                     if(this.active == '0') {
                                            greyText = ' style="color: #ccc;"';
                                     }
 
                                     var downloadButton = '';
                                     var username = '<?= $this->product->username?>';
                                     downloadButton = '<a href="'+downloadUrl+'" data-username="'+username+'" class="btn btn-native btn-min-width opendownloadfile" ><img src="/images/system/download.svg" alt="download" style="width:20px; height:20px"></a>' ;
 
                                     if(this.version==null) {version = '';} else{version = this.version;}
                                     var isExternLink = false;
                                     if ((typeof link != 'undefined') && (link != "")) {
                                        isExternLink = true;
                                     }
 
 
 
                                     var mnt = moment(this.created_timestamp);
 
                                         $pploadCollection.find('table[data-ppload-files-ajax] tbody').append(
                                             '<tr data-ppload-file-id="' + this.id + '"' + greyText + '>'
                                             + '<td>' + downloadLink + '</td>'
                                             + '<td>' + version + '</td>'
-                                            + '<td>' + fileDescription + '</td>'                                            
+                                            + '<td>' + fileDescription + '</td>'
                                             + '<td>'
                                             + '<select id="data-select-packagetype-ajax' + this.id + '" data-packagetype-id="" name="packagetype" class="form-control input-sm" style="width: 200px;">'
                                             + '<option value=\"\"></option>'
                                             + '<option value=\"2\">Android (APK)</option>'
                                             + '<option value=\"1\">AppImage</option>'
                                             + '<option value=\"9\">Arch</option>'
                                             + '<option value=\"5\">Debian</option>'
                                             + '<option value=\"8\">Electron-Webapp</option>'
                                             + '<option value=\"7\">Flatpak</option>'
                                             + '<option value=\"10\">open/Suse</option>'
                                             + '<option value=\"3\">OS X compatible</option>'
                                             + '<option value=\"11\">Redhat</option>'
                                             + '<option value=\"6\">Snappy</option>'
                                             + '<option value=\"12\">Source Code</option>'
                                             + '<option value=\"4\">Windows executable</option>'
                                             + '</select><span id="file-tag-packagetype-ajax'+this.id+'">'
                                             + '</td>'
 
                                             + '<td style="text-align: right"><span id="download_counter_' + this.id + '">' + count_downloads + '</td>'
                                             + '<td>' +mnt.format('YYYY-MM-DD') + '</td>'
                                             + '<td style="text-align: right">' + humanFileSize(this.size,false) + '</td>'
                                             + '<td style="text-align: right; ">' + downloadButton+ '</td>'
-                                            + '<td style="text-align: right; ">' + installButton + '</td>'                                            
-                                           
+                                            + '<td style="text-align: right; ">' + installButton + '</td>'
+
                                             + '</tr>'
                                         );
 
-                                    
+
 
                                         if ((typeof osId != 'undefined') && (osId != "")) {
                                             $("#data-updatepploadfile" + this.id + " option[value='" + osId + "']").attr('selected', 'selected');
                                             $os = $("#data-updatepploadfile" + this.id + " option[value='" + osId + "']").text();
                                             //alert("Text: " + $os);
                                             $("#data-updatepploadfile" + this.id).hide();
                                             $("#file-tag-os" + this.id).text($os);
                                         }
 
                                         if ((typeof licenseId != 'undefined') && (licenseId != "")) {
                                             $("#data-select-license" + this.id + " option[value='" + licenseId + "']").attr('selected', 'selected');
                                             $licenseIdText = $("#data-select-license" + this.id + " option[value='" + licenseId + "']").text();
                                             $("#data-select-license" + this.id).hide();
                                             $("#file-tag-license" + this.id).text($licenseIdText);
                                         } else {
                                          $("#data-select-license" + this.id).hide();
                                         }
 
                                         if ((typeof license != 'undefined') && (license != "")) {
                                             $("#file-tag-license-text" + this.id).text(license);
                                         }
 
                                         $("#data-select-license" + this.id).hide();
 
                                         if ((typeof packagetypeId != 'undefined') && (packagetypeId != "")) {
                                             $("#data-select-packagetype-ajax" + this.id + " option[value='" + packagetypeId + "']").attr('selected', 'selected');
                                             $packagetypeIdText = $("#data-select-packagetype-ajax" + this.id + " option[value='" + packagetypeId + "']").text();
-                                            $("#data-select-packagetype-ajax" + this.id).hide();                                         
+                                            $("#data-select-packagetype-ajax" + this.id).hide();
                                             $("#file-tag-packagetype-ajax" + this.id).text($packagetypeIdText);
 
                                         } else {
                                          $("#data-select-packagetype-ajax" + this.id).hide();
                                         }
 
                                         console.log($("#data-select-packagetype-ajax" + this.id));
                                         $("#data-select-packagetype-ajax" + this.id).hide();
 
                                         if ((typeof this.ocs_compatible != 'undefined') && (this.ocs_compatible != "") && this.ocs_compatible == 1) {
                                             $("#data-checkbox-compatible-" + this.id).attr('checked', 'checked');
                                         }
 
 
                                         if (isExternLink) {
                                             $fileserverLink = $("#data-link-ajax" + this.id).attr('href');
                                             $("#data-link-ajax" + this.id).attr('href', decodeURIComponent(link));
                                             $("#data-link-ajax" + this.id).attr('data-link-ajax-org', $fileserverLink);
 
                                             $("#data-link-ajax" + this.id).attr('target','_blank');
                                             $("#data-link-ajax" + this.id).html($("#data-link-ajax" + this.id).html() + " (External Link)");
 
                                             $("#data-link-ajax" + this.id).click(function (event) {
                                                 event.preventDefault();
                                                 $fileserverLink = $(this).attr('data-link-ajax-org');
                                                 window.open($fileserverLink, '_blank');
                                             });
 
 
                                             $fileserverLink = $("#data-link-ajax-dl" + this.id).attr('href');
                                             $("#data-link-ajax-dl" + this.id).attr('href', decodeURIComponent(link));
                                             $("#data-link-ajax-dl" + this.id).attr('data-link-ajax-org', $fileserverLink);
 
                                             $("#data-link-ajax-dl" + this.id).attr('target','_blank');
 
                                             $("#download-link-filename" + this.id).html($("#download-link-filename" + this.id).html() + " (External Link)");
 
                                             $("#data-link-ajax-dl" + this.id).click(function (event) {
                                                 event.preventDefault();
                                                 $fileserverLink = $(this).attr('data-link-ajax-org');
                                                 window.open($fileserverLink, '_blank');
                                             });
 
                                             $("#install-link-filename" + this.id).html($("#install-link-filename" + this.id).html() + " (External Link)");
                                         }
 
 
                                         $compatibleCheckbox = $("#data-checkbox-compatible-" + this.id);
 
                                         if(this.active == '0') {
                                             $compatibleCheckbox.prop('disabled', 'disabled');
                                         }
 
-                                     
+
 
                                         //fileSizeSum += parseInt(this.size);
                                         if(parseInt(this.size)>0) {
                                             fileSizeSum += roundFileSizeInMB(parseInt(this.size));
                                         }
 
                                     //if (!isExternLink)
                                     //{
                                        //fileSizeSum += roundFileSizeInMB(parseInt(this.size));
                                     //}
 
 
                                     if (this.type == 'audio/mpeg' || this.type == 'application/ogg') {
                                         isPlayable = true;
                                     }
 
                                     //}
 
                                  });
 
                                  //
                                  //Inactive Fiels
                                  //
                                  $.each(myArrayInactive, function () {
                                     if(null == oldestFileId) {
                                             oldestFileId = this.id;
                                     }
 
                                     if(this.id < oldestFileId) {
                                             oldestFileId = this.id;
                                     }
 
                                     cout_downloads = this.downloaded_count || 0;
 
                                     downloaded_count_total = downloaded_count_total+parseInt(cout_downloads);
 
                                     downloadLink = this.name;
 
                                      var fileDescription = '';
                                      if (this.description) {
                                          fileDescription = this.description;
                                      }
 
                                      var licenseId = '';
                                      var license = '';
                                      if (this.tags) {
                                          fileTags = this.tags;
                                          $.each(fileTags.split(','), function () {
 
                                              if(this.indexOf("##")==-1) {
                                               var tagStr = this.split('-');
                                               if (tagStr.length == 2 && tagStr[0] == 'os') {
                                                   osId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'licensetype') {
                                                   licenseId = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                   packagetypeId = tagStr[1];
                                               }
                                              } else {
                                               var tagStr = this.split('##');
                                               if (tagStr.length == 2 && tagStr[0] == 'link') {
                                                   link = tagStr[1];
                                               } else if (tagStr.length == 2 && tagStr[0] == 'license') {
                                                   license = tagStr[1];
                                                   license = Base64.decode(license);
                                               } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                                   packagetypeId = tagStr[1];
                                               }
                                              }
                                              /*else if (tagStr.length == 2 && tagStr[0] == 'package') {
                                               packageId = tagStr[1];
                                               }
                                               else if (tagStr.length == 2 && tagStr[0] == 'arch') {
                                               archId = tagStr[1];
                                               }
                                               else if (tagStr.length == 2 && tagStr[0] == 'device') {
                                               deviceId = tagStr[1];
                                               }*/
                                          });
                                      }
 
                                      //if(this.active == '1') {
                                        var greyText = ' class="inactiverows" style="color: #ccc; display:none;"';
 
                                        if(this.version==null) {version = '';} else{version = this.version;}
 
                                          var isExternLink = false;
                                          if ((typeof link != 'undefined') && (link != "")) {
                                             isExternLink = true;
                                             downloadLink = '<a href="' + decodeURIComponent(link) + '" id="data-link-ajax' + this.id + '" style="color: #ccc;">' + this.name + '</a>';
                                          }
                                          var mnt = moment(this.created_timestamp);
                                          $pploadCollection.find('table[data-ppload-files-ajax] tbody').append(
                                             '<tr' + greyText + '>'
                                             + '<td>' + downloadLink + '</td>'
                                                 + '<td>' + version + '</td>'
                                             + '<td>' + fileDescription + '</td>'
                                                 + '<td>'
                                                 + '<select id="data-select-packagetype-ajax' + this.id + '" data-packagetype-id=" name="packagetype" class="form-control input-sm" style="width: 200px;">'
                                                 + '<option value=\"\"></option>'
                                                 + '<option value=\"2\">Android (APK)</option>'
                                                 + '<option value=\"1\">AppImage</option>'
                                                 + '<option value=\"9\">Arch</option>'
                                                 + '<option value=\"5\">Debian</option>'
                                                 + '<option value=\"8\">Electron-Webapp</option>'
                                                 + '<option value=\"7\">Flatpak</option>'
                                                 + '<option value=\"10\">open/Suse</option>'
                                                 + '<option value=\"3\">OS X compatible</option>'
                                                 + '<option value=\"11\">Redhat</option>'
                                                 + '<option value=\"6\">Snappy</option>'
                                                 + '<option value=\"12\">Source Code</option>'
                                                 + '<option value=\"4\">Windows executable</option>'
                                                 + '</select><span id="file-tag-packagetype-ajax'+this.id+'">'
                                                 + '</td>'
-                                            
+
                                             + '<td style="text-align: right"><span id="download_counter_' + this.id + '">' + cout_downloads + '</td>'
                                             + '<td>' +mnt.format('YYYY-MM-DD')  + '</td>'
                                             + '<td style="text-align: right">' + humanFileSize(this.size,false) + '</td>'
                                                 + '<td></td>'
                                                 + '<td></td>'
                                             + '</tr>'
                                          );
 
                                          if ((typeof osId != 'undefined') && (osId != "")) {
                                              $("#data-updatepploadfile" + this.id + " option[value='" + osId + "']").attr('selected', 'selected');
                                              $os = $("#data-updatepploadfile" + this.id + " option[value='" + osId + "']").text();
                                              //alert("Text: " + $os);
                                              $("#data-updatepploadfile" + this.id).hide();
                                              $("#file-tag-os" + this.id).text($os);
                                          }
 
                                          if ((typeof licenseId != 'undefined') && (licenseId != "")) {
                                              $("#data-select-license" + this.id + " option[value='" + licenseId + "']").attr('selected', 'selected');
                                              $licenseIdText = $("#data-select-license" + this.id + " option[value='" + licenseId + "']").text();
                                              $("#data-select-license" + this.id).hide();
                                              $("#file-tag-license" + this.id).text($licenseIdText);
                                          } else {
                                           $("#data-select-license" + this.id).hide();
                                          }
 
                                          $("#data-select-license" + this.id).hide();
 
                                          if ((typeof license != 'undefined') && (license != "")) {
                                              $("#file-tag-license-text" + this.id).text(license);
                                          }
 
                                              if ((typeof packagetypeId != 'undefined') && (packagetypeId != "")) {
                                              $("#data-select-packagetype-ajax" + this.id + " option[value='" + packagetypeId + "']").attr('selected', 'selected');
                                              $packagetypeIdText = $("#data-select-packagetype-ajax" + this.id + " option[value='" + packagetypeId + "']").text();
                                              $("#data-select-packagetype-ajax" + this.id).hide();
                                              $("#file-tag-packagetype-ajax" + this.id).text($packagetypeIdText);
                                          } else {
                                           $("#data-select-packagetype-ajax" + this.id).hide();
                                          }
 
                                          $("#data-select-packagetype-ajax" + this.id).hide();
 
 
 
                                          if (isExternLink) {
                                             //$("#data-link-ajax" + this.id).attr('href', decodeURIComponent(link));
                                                 $("#data-link-ajax" + this.id).attr('target','_blank');
                                             $("#data-link-ajax" + this.id).html($("#data-link-ajax" + this.id).html() + " (External Link)");
                                          }
 
 
 
                                         //fileSizeSum += parseInt(this.size);
                                             if(parseInt(this.size)>0) {
                                                 fileSizeSum += roundFileSizeInMB(parseInt(this.size));
                                             }
                                          //if (!isExternLink)
                                          //{
                                             //fileSizeSum += roundFileSizeInMB(parseInt(this.size));
                                          //}
 
 
                                          if (this.type == 'audio/mpeg' || this.type == 'application/ogg') {
                                              isPlayable = true;
                                          }
 
                                      //}
 
                                  });
 
- 
+
                                  //add old download counter
                                  downloaded_count_total += parseInt(<?= $this->product->count_downloads_hive?>);
 
                                  //add old download counter to oldest file
                                  var fileCount = $('#download_counter_'+ oldestFileId).html();
                                  var oldNewCounter = parseInt(fileCount) + parseInt(<?= $this->product->count_downloads_hive?>);
                                  $('#download_counter_'+ oldestFileId).html(oldNewCounter);
 
 
 
                                 //$('#downloadscnt').html(downloaded_count_total);
 
                                  $pploadCollection.find('table[data-ppload-files-ajax] tfoot').append(
                                      '<tr>'
                                      + '<th colspan="4">' + myArrayActive.length + ' <?= $this->translate("files")?> (<span style="color: #ccc;" ><a style="cursor:pointer" onclick="fnToggleInactiveFiles();return false;">'+myArrayInactive.length+' archived</a></span>)</th>'
                                      + '<th style="text-align: right">' + downloaded_count_total + '</th>'
                                      + '<th></th>'
                                     + '<th style="text-align: right">' + fileSizeSum.toFixed(2) + ' MB</th>'
                                      //+ '<th style="text-align: right">' + humanFileSize(fileSizeSum) + '</th>'
                                      + '<th></th>'
                                        + '<th></th>'
                                      + '</tr>'
                                  );
 
                                  $pploadCollection.find('a[data-ppload-download-link]').attr(
                                      'href',
                                      pploadApiUri + 'collections/download/id/' + collectionId
                                  );
 
-                        
+
 
 
                                  if (data.pagination.next) {
                                      getPploadFiles(data.pagination.next);
                                  }
 
                              },
                              error: function (jqXHR, textStatus, errorThrown) {
 
-                                 
+
 
                              }
                          });
                      }
 
                      function generateOcsUrl(url, type, filename) {
                          if (!url || !type) {
                              return '';
                          }
                          if (!filename) {
                              filename = url.split('/').pop().split('?').shift();
                          }
                          return 'ocs://install'
                             + '?url=' + encodeURIComponent(url)
                             + '&type=' + encodeURIComponent(type)
                             + '&filename=' + encodeURIComponent(filename);
                      }
 
 
-                   
+
 
                     function shortFilename(filename) {
                         var returnString = filename;
                         if(filename.length > 25) {
                             var name = filename.substring(0,22);
                             var fileExt = filename.split('.').pop();
                             if(fileExt.length>3) {
                                 name = name.substring(0,(25-fileExt.length));
                             }
                             returnString = name + '...' + fileExt;
                         }
                         return returnString;
                     }
 
 
                      function roundFileSizeInMB(bytes)
                      {
                         // min size 0.01MB
                         if(bytes>0)
                         {
                             var size = (bytes / 1048576).toFixed(2);
                             if(size == '0.00')
                             {
                                 return Number('0.01');
                             }else
                             {
                                 return Number(size);
                             }
                         }
                      }
 
 
 
                       fnToggleInactiveFiles = function(){
                            $('.inactiverows').toggle();
                       };
 
 
 
                      function humanFileSize(bytes,isExternLink) {
                          if(isExternLink) return '----';
                          if(bytes>0)
                          {
                              var size = '';
                              size = (bytes / 1048576).toFixed(2);
                              if(size == '0.00')
                              {
                                 return '0.01 MB';
                              }else
                              {
                                 return size+' MB';
                              }
                          }
                          else
                          {
                             return '0.00 MB';
                          }
                      }
 
                      function humanFileSize_(bytes) {
                          if(bytes>0)
                          {
                              var size = '';
                              size = (bytes / 1048576).toFixed(2);
-                             
+
 
                              if(size == '0.00')
                              {
                                 return '0.01 MB';
                              }else
                              {
                                 return size+' MB';
                              }
                          }
                          else
                          {
                             return '0.00 MB';
                          }
                      }
 
                      //$('a[href="#files-panel"][data-toggle="tab"]').on('click', function () {
                      if (!hasFilesPanelOpened) {
                          getPploadFiles();
                          hasFilesPanelOpened = true;
 
 
                      }
                      //});
 
                  });
 
                 $(function() {
                     $('#modal-installation-instructions').on('hidden.bs.modal', function (e) {
                               var iframe = document.getElementById('iframeInstallInstruction');
                               var leg=$(iframe).attr("src");
                               $(iframe).attr("src","");
                         });
 
                     $('#modal-installation-instructions').on('show.bs.modal', function (e) {
                               var iframe = document.getElementById('iframeInstallInstruction');
                               var leg=$(iframe).attr("src");
                               $(iframe).attr("src","https://opendesktop.github.io/ocs-url/opendesktoporg-help.html");
                         });
 
                 });
              </script>
          <?php endif; ?>
          <!-- /ppload -->
diff --git a/application/modules/default/views/scripts/user/products.phtml b/application/modules/default/views/scripts/user/products.phtml
index d5d2ab734..0f4b0ec29 100644
--- a/application/modules/default/views/scripts/user/products.phtml
+++ b/application/modules/default/views/scripts/user/products.phtml
@@ -1,1661 +1,1661 @@
 <?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/>.
  **/
 
 $this->headLink()->appendStylesheet('/theme/flatui/css/stylesheets/general.css');
 $this->headLink()->appendStylesheet('/theme/flatui/css/select2.min.css');
 $this->headLink()->appendStylesheet('/theme/flatui/css/select2.custmized.css');
 $this->inlineScript()->appendFile('/theme/flatui/js/lib/select2.min.js');
 $architectureListHelper = new Default_View_Helper_FetchArchitectureTags();
 $packagetypeListHelper = new Default_View_Helper_FetchPackagetypeTags();
 
 $this->tab = 'products';
 ?>
 <link href="/theme/flatui/css/chosen.css" media="screen" rel="stylesheet" type="text/css" />
 <style type="text/css">
     div.datafiledroparea{
         overflow-y: scroll !important;
     }
 </style>
 <main class="user-admin-page">
 
     <?php echo $this->render('user/partials/userHeader_top.phtml'); ?>
 
     <section class="body-wrap">
 
         <section class="wrapper product-page">
 
             <!-- PAGE BODY -->
 
             <section class="my-products-page">
 
                 <!-- NAVIGATION -->
 
                 <?php echo $this->render('user/partials/userHeader.phtml'); ?>
 
                 <!-- /NAVIGATION -->
 
                 <div class="my-products-heading">
                     <h1 class="page-title left"><?= $this->translate('Products') ?></h1>
 
                     <div class="right light lightgrey num-products">
                         <span class="label label-default">
                             <?= $this->products->getTotalItemCount() ?> <?= $this->translate('products') ?>
                         </span>
                     </div>
                 </div>
 
                 <div class="my-products-list">
                     <div class="row">
                         <?php echo $this->partialLoop('user/partials/loopMyProducts.phtml', $this->products, $this->productFiles); ?>
                     </div>
                 </div>
 
                 <section style="text-align: center;">
                     <?php echo $this->paginationControl($this->products, 'Sliding', '/partials/paginationControlBootstrap.phtml',
                         array('dom_target' => 'section.my-products-page')); ?>
                 </section>
 
             </section>
 
             <!-- /PAGE BODY -->
 
         </section>
 
     </section>
 
 </main>
 
 <script type="text/javascript">
     var myProducts = (function () {
         return {
             setup: function () {
                 this.initBtnPublish();
             },
 
             initBtnPublish: function () {
                 $('body').on('click', 'a[data-target]', function (event) {
                     event.preventDefault();
                     var url = this.href;
                     var target = $(this).attr("data-target");
 
                     $(target).empty().html('<img src="/images/system/ajax-loader.gif" style="display: inline;height: 20px; margin: 1px;"/>').load(url + ' ' + target + ' > *', function (response, status, xhr) {
                         if (status == "error") {
                             $(target).find('#error').html('Sorry, but there was an error. Please try again later.');
                             return;
                         } else {
                             return response;
                         }
                     });
                     return false;
                 });
             }
 
         }
     })();
 </script>
 <?php
 $this->inlineScript()->appendScript(
     '    $(document).ready(function(){
             myProducts.setup();
             Partials.setup();
         });
     ');
 ?>
 <!-- updates -->
 <div id="modal-updates"
      class="modal fade"
      role="dialog"
      aria-labelledby="modal-updates-label"
      data-product-id=""
      data-product-title="">
     <div class="modal-dialog content-modal" style="width: 95%">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                 <h3 id="modal-updates-label" data-updates-label=""><?= $this->translate('Changelog') ?></h3>
             </div>
             <div class="modal-body" style="font-size: small;">
                 <div role="form" class="">
                     <input type="hidden" id="update-id" data-update-id="" value="">
                         <?php /**
                     <div class="form-group">
                       <label for="tile">Product Version:</label>
                       <input type="text" id="product-version" data-product-version="" class="form-control input-sm" placeholder="Product Version Number">
                     </div>
                          *
                          */?>
                     <div class="form-group">
                       <label for="tile">Changelog Title:</label>
                       <input type="text" id="update-title" data-update-title="" class="form-control input-sm" placeholder="Enter a Changelog Title">
                     </div>
                     <div class="form-group">
                       <label for="text">Changelog Text:</label>
                       <textarea id="update-text" data-update-text="" class="form-control input-sm" rows="3" placeholder="Enter a Changelog Text"></textarea>
                     </div>
                     <button class="btn btn-native pull-right btn-xs btn-file-action" data-updates-cancel-btn=""><?= $this->translate('Cancel') ?></button>
                     <button type="submit" class="btn btn-native pull-right btn-xs btn-file-action" data-add-update-btn="">Save</button>
                 </div>
 
                 <article id="update-list">
                 </article>
 
 
             </div>
             <div class="modal-footer">
 
             </div>
         </div>
     </div>
 </div>
 
 <script type="text/javascript">
     $(function () {
         var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}}
 
         $('button[rel="tooltip"]').tooltip();
 
         var $modalPpload = $('#modal-updates');
 
         $('a[href="#modal-updates"]').on('click', function (event) {
             event.preventDefault();
             $modalPpload.attr('data-product-id', $(this).attr('data-product-id'));
             $modalPpload.attr('data-product-title', $(this).attr('data-product-title'));
 
             $modalPpload.find('h3[data-ppload-label]').html('Changelog for ' + $modalPpload.attr('data-product-tile'));
 
             $modalPpload.find('#update-list').html('');
 
             if ($modalPpload.attr('data-product-id')) {
                 getUpdates();
             }
 
         });
 
 
         function getUpdates(page) {
             $modalPpload.find('#update-list').html('');
 
             var productId = $modalPpload.attr('data-product-id');
             $.ajax({
                 url: '/p/'+productId+'/getupdatesajax/',
                 type: 'GET',
                 data: {
                     format: 'json',
                     ignore_status_code: 1
                 },
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'success') {
                         return;
                     }
                     $modalPpload.find('#update-list').append('<br/><br/><br/>');
 
                     $.each(data.updates, function () {
                         var id = '';
                         if (this.project_update_id) {
                             id = this.project_update_id;
                         }
                         var title = '';
                         if (this.title) {
                             title = this.title;
                         }
                         var text = '';
                         if (this.text) {
                             text = this.text;
                         }
                         var date = '';
                         if (this.created_at) {
                             date = this.created_at;
                         }
 
 
                         var divEl = $('<div />');
                         divEl.attr('data-uptdate-id', id);
                         divEl.append(
                                  '<a name="anker_'+id+'"></a>'
                                 + '<h4>'+title+'</h4>'
                                 + '<div class="small light lightgrey product-update-date">'+date+ '</div>'
                                 + text + '<br/><br/>'
                             );
 
                         var btnEdit = $('<button type="submit" class="btn btn-native btn-sm">Edit</button>');
                         btnEdit.attr('data-change-update-btn',id);
                         btnEdit.attr('data-change-title',title);
                         btnEdit.attr('data-change-text',text);
 
 
                         var btnDelete = $('<button type="submit" class="btn btn-native btn-sm">Delete</button>');
                         btnDelete.attr('data-delete-update-btn',id);
 
                         divEl.append(btnEdit);
                         divEl.append('&nbsp;&nbsp;');
                         divEl.append(btnDelete);
                         divEl.append('<br/><br/><br/><br/>');
 
                         $modalPpload.find('#update-list').append(divEl);
 
                     });
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     return;
                 }
             });
 
         }
 
         $modalPpload.on('click', 'button[data-add-update-btn]', function (event) {
             //var product_version = $modalPpload.find('#product-version').val();
             var update_id = $modalPpload.find('#update-id').val();
             var title = $modalPpload.find('#update-title').val();
             var text = $modalPpload.find('#update-text').val();
             var productId = $modalPpload.attr('data-product-id');
             event.preventDefault();
 
             $.ajax({
                 url: '/p/'+productId+'/saveupdateajax',
                 type: 'POST',
                 data: {title: title, text: text, update_id: update_id/*, product_version: product_version*/},
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'success') {
                         return;
                     }
                     //$modalPpload.find('#product-version').val('');
                     $modalPpload.find('#update-title').val('');
                     $modalPpload.find('#update-text').val('');
                     $modalPpload.find('#update-id').val('');
 
                     //if(update_id) {
                         getUpdates();
                     //} else {
                     //  $modalPpload.modal('hide');
                     //  location.reload();
                     //}
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     return;
                 }
             });
 
         });
 
 
         $modalPpload.on('click', 'button[data-delete-update-btn]', function (event) {
             var updateId = $(this).attr('data-delete-update-btn');
             var productId = $modalPpload.attr('data-product-id');
                 event.preventDefault();
 
             $.ajax({
                 url: '/p/'+productId+'/deleteupdateajax',
                 type: 'POST',
                 data: {update_id: updateId},
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'success') {
                         alert('Update could not be deleted!');
                         return;
                     }
                     getUpdates();
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     return;
                 }
             });
 
         });
 
         $modalPpload.on('click', 'button[data-change-update-btn]', function (event) {
             var updateId = $(this).attr('data-change-update-btn');
             var title = $(this).attr('data-change-title');
             var text = $(this).attr('data-change-text');
 
                 $modalPpload.find('#update-title').val(title);
             $modalPpload.find('#update-text').val(text);
             $modalPpload.find('#update-id').val(updateId);
 
             $modalPpload.find('#update-title').focus();
 
                 event.preventDefault();
 
         });
 
         $modalPpload.on('click', 'button[data-updates-cancel-btn]', function (event) {
             event.preventDefault();
             $modalPpload.modal('hide');
         });
 
     });
 
 </script>
 
 <!-- ppload -->
 
 <div id="modal-ppload"
      class="modal fade"
      role="dialog"
      aria-labelledby="modal-ppload-label"
      data-ppload-api-uri="<?= PPLOAD_API_URI ?>"
      data-ppload-collection-id=""
      data-product-version=""
      data-product-id=""
      data-product-tile=""
      data-addpploadfile-uri=""
      data-updatepploadfile-uri=""
      data-updatepackagetype-uri=""
      data-updatearchitecture-uri=""
      data-deletepploadfile-uri=""
      data-deletepploadfiles-uri="">
     <div class="modal-dialog content-modal" style="width: 95%">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                 <h3 id="modal-ppload-label" data-ppload-label=""><?= $this->translate('Files') ?></h3>
             </div>
             <div class="modal-body">
                 <input type="file" style="display: none;" data-file-upload="" multiple>
                 <input type="file" style="display: none;" data-file-upload-update="" data-ppload-file-id="">
 
                 <p data-file-upload-msg=""><?= $this->translate('Drop file(s) here') ?>:</p>
 
                 <div data-file-upload="" dropzone style="font-size: small; " class="datafiledroparea">
                     <table class="table" data-ppload-files="">
                         <thead>
                         <tr>
                             <th><?= $this->translate('Filename') ?></th>
                             <th><?= $this->translate('Version') ?></th>
                             <th><?= $this->translate('Description') ?></th>
                             <!--<th><?= $this->translate('License') ?></th>-->
                             <th><?= $this->translate('Filetype') ?></th>
                             <th><?= $this->translate('Packagetype') ?></th>
                             <th><?= $this->translate('Architecture') ?></th>
                             <th><?= $this->translate('Date added') ?></th>
                             <th style="text-align: right"><?= $this->translate('Filesize') ?></th>
                             <th style="text-align: right"><?= $this->translate('# of Downloads') ?></th>
                             <th></th>
                             <th></th>
                         </tr>
                         </thead>
                         <tbody></tbody>
                     </table>
                     <table class="table" data-file-upload="">
                         <tbody></tbody>
                     </table>
                 </div>
 
 
                 <div style="float: right; padding-top: 10px;" class="small light">
                     Deleted files are archived. Number of downloads are kept. *
                 </div>
             </div>
 
             <div class="modal-footer" style="margin-top: 20px;">
                 <span class="pull-left">
                     <input type="checkbox" data-accept-checkbox="">
                     <?= $this->translate('I accept the ') ?>
                     <a href="/content/terms"><?= $this->translate('Terms and Conditions') ?></a>
                 </span>
 
             </div>
             <div class="modal-footer">
                 <button class="btn btn-native pull-left" data-addpploadfile-btn="">
                     <?= $this->translate('Add File(s)') ?>
                 </button>
                 <button class="btn btn-danger pull-left" data-file-upload-cancel-btn="">
                     <?= $this->translate('Cancel Upload') ?>
                 </button>
                 <button id="github_picker" class="btn btn-native pull-left" data-toggle="" data-target="#generic-dialog" data-username="<?=$this->member->link_github?>" title="add an URL here">
                     <?= $this->translate('Add URL') ?>
                 </button>
                 <button class="btn btn-native pull-right" data-ppload-cancel-btn=""><?= $this->translate('Close') ?></button>
             </div>
             <div class="modal-footer">
 
             </div>
        </div>
    </div>
 </div>
 
 <script type="text/javascript">
 
     $(function () {
 
         $('body').on("click", "#github_picker", function (event) {
 
             html = '<form id="get-url-form">' +
                 '<div class="form-group">' +
                 '<input type="url" class="form-control" id="get-url" placeholder="Enter a URL where the files can be downloaded" required="required" />' +
                 '<span id="get-url-help" class="help-block small">e.g. https://github.com/mongodb/mongo/archive/r3.5.2.tar.gz</span></div>' +
                 '<button type="submit" class="btn btn-native btn-sm" id="get-url-submit">Submit</button>' +
                 '</form>';
 
             var msgBox = $('#generic-dialog');
             msgBox.modal('hide');
             msgBox.find('.modal-header-text').empty().append('Enter a download URL:');
             msgBox.find('.modal-body').empty().append(html);
             setTimeout(function () {
                 msgBox.modal('show');
             }, 900);
 
         });
 
         $('body').on('submit', '#get-url-form', function(event) {
             if (! $('#get-url-form').validate()) {
                 return true;
             }
             event.preventDefault();
             $.ajax({
                 url: '/file/link/',
                 type: 'post',
                 data: {
                     project_id: $('#modal-ppload').attr('data-product-id'),
                     u: $('#get-url').val()
                 },
                 success: function(returned_data) {
                     if (!returned_data.file) {
                         $('#get-url').addClass('hasError').focus();
                         $('#get-url-help').html('An Error occurred. Please check your URL or try again later.');
                         return;
                     }
                     data_file = returned_data.file;
                     $modalPpload.attr('data-ppload-collection-id', data_file.collection_id);
                     $('#get-url').val('').removeClass('hasError');
                     $('#get-url-help').html('');
                     $('#generic-dialog').modal('hide');
                     getPploadFiles();
                 },
                 error: function() {
                     $('#get-url').addClass('hasError').focus();
                     $('#get-url-help').html('An Error occurred. Please check your URL or try again later.');
                 }
             });
         });
 
         $('body').on('change', '#get-url', function(event) {
             $('#get-url-help').empty();
         });
 
         var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}}
 
         $('button[rel="tooltip"]').tooltip();
 
         var $modalPpload = $('#modal-ppload');
 
         var pploadApiUri = $modalPpload.attr('data-ppload-api-uri');
 
         var pploadUploads = {
             queue: {},
             currentUploadId: null,
             uploading: null
         };
 
         function keysrt(key, asc) {
             if(asc) {
                   return function(a,b){
                    if (a[key] > b[key]) return 1;
                    if (a[key] < b[key]) return -1;
                    return 0;
                   }
             } else {
              return function(a,b){
                        if (a[key] < b[key]) return 1;
                        if (a[key] > b[key]) return -1;
                        return 0;
              }
             }
         }
 
         function getUpdates(page) {
             $modalPpload.find('#update-list').html('');
 
             var productId = $modalPpload.attr('data-product-id');
             $.ajax({
                 url: '/p/'+productId+'/getupdatesajax/',
                 type: 'GET',
                 data: {
                     format: 'json',
                     ignore_status_code: 1
                 },
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'success') {
                         return;
                     }
                     $modalPpload.find('#update-list').append('<br/><br/><br/>');
 
                     $.each(data.updates, function () {
                         var id = '';
                         if (this.project_update_id) {
                             id = this.project_update_id;
                         }
                         var title = '';
                         if (this.title) {
                             title = this.title;
                         }
                         var text = '';
                         if (this.text) {
                             text = this.text;
                         }
                         var date = '';
                         if (this.created_at) {
                             date = this.created_at;
                         }
 
 
                         var divEl = $('<div />');
                         divEl.attr('data-uptdate-id', id);
                         divEl.append(
                                  '<a name="anker_'+id+'"></a>'
                                 + '<h4>'+title+'</h4>'
                                 + '<div class="small light lightgrey product-update-date">'+date+ '</div>'
                                 + text + '<br/><br/>'
                             );
 
                         var btnEdit = $('<button type="submit" class="btn btn-native btn-sm">Edit</button>');
                         btnEdit.attr('data-change-update-btn',id);
                         btnEdit.attr('data-change-title',title);
                         btnEdit.attr('data-change-text',text);
 
 
                         var btnDelete = $('<button type="submit" class="btn btn-native btn-sm">Delete</button>');
                         btnDelete.attr('data-delete-update-btn',id);
 
                         divEl.append(btnEdit);
                         divEl.append(btnDelete);
                         divEl.append('<br/><br/><br/><br/>');
 
                         $modalPpload.find('#update-list').append(divEl);
 
                     });
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     return;
                 }
             });
 
         }
 
         function getPploadFiles(page) {
             var collectionId = $modalPpload.attr('data-ppload-collection-id');
 
             if (!page) {
                 page = 1;
                 $modalPpload.find('table[data-ppload-files] tbody').empty();
             }
             $.ajax({
                 url: pploadApiUri + 'files/index',
                 type: 'GET',
                 data: {
                     collection_id: collectionId,
                     perpage: 1000,
                     page: page,
                     format: 'json',
                     ignore_status_code: 0,
                     status: 'active'
                 },
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'success') {
                         return;
                     }
                     var deletePploadFileBtn = '<a href="#" class="btn btn-native btn-xs btn-file-dropzone" data-deletepploadfile-btn=""><span class="glyphicon glyphicon-trash"></span></a>';
                     var deletePploadFileBtnPerFile = '';
 
                     var myArray = $.map(data.files, function(entry) {
                         return entry;
                     });
                     myArray.sort(keysrt('created_timestamp'), false);
 
                     //var tagOptions = UserTags.getTagOptions();
 
                     $.each(myArray, function () {
 
                         var fileDescription = '';
                         if (this.description) {
                             fileDescription = this.description;
                             fileDescription = fileDescription.replace(/<\/?[^>]+(>|$)/g, "");
                         }
 
                         var inputFileDescription = '<input data-ppload-file-description="" class="form-control input-sm"'
                             + ' type="text" maxlength="140" placeholder="File description"'
                             + ' value="' + fileDescription + '">';
                         if(this.active == '0') {
                             inputFileDescription = '<input disabled="disabled" data-ppload-file-description="" class="form-control input-sm"'
                                 + ' type="text" maxlength="140" placeholder="File description"'
                                 + ' value="' + fileDescription + '">';
                         }
 
                         var versionText;
                         if(this.version==null) {versionText = '';} else{versionText = this.version;}
                         versionText = versionText.replace(/<\/?[^>]+(>|$)/g, "");
 
                         var version = '<input data-ppload-file-version="" class="form-control input-sm"'
                             + ' type="text" maxlength="140" placeholder="File version"'
                             + ' value="' + versionText + '">';
                         if(this.active == '0') {
                             version = '<input disabled="disabled" data-ppload-file-version="" class="form-control input-sm"'
                                 + ' type="text" maxlength="140" placeholder="File version"'
                                 + ' value="' + versionText + '">';
                         }
 
                         var fileCategory = '';
                         if (this.category) {
                             fileCategory = this.category;
                         }
                         var link = '';
                         var fileTags = '';
                         var osId = '';
                         var licensetype = null;
                         var licenseId = '';
                         var license = '';
                         var packagetypeId = '';
                         var architectureId = '';
 
 
                         //var packageId = null;
                         //var archId = null;
                         //var deviceId = null;
                         if (this.tags) {
                             fileTags = this.tags;
                             $.each(fileTags.split(','), function() {
                                 if(this.indexOf("##")==-1) {
                                     var tagStr = this.split('-');
                                     if (tagStr.length == 2 && tagStr[0] == 'os') {
                                         osId = tagStr[1];
                                     } else if (tagStr.length == 2 && tagStr[0] == 'licensetype') {
                                         licenseId = tagStr[1];
                                     } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                         packagetypeId = tagStr[1];
                                     } else if (tagStr.length == 2 && tagStr[0] == 'architectureid') {
                                         architectureId = tagStr[1];
                                     }
                                 } else {
                                     var tagStr = this.split('##');
                                     if (tagStr.length == 2 && tagStr[0] == 'link') {
                                         link = tagStr[1];
                                     } else if (tagStr.length == 2 && tagStr[0] == 'license') {
                                         license = tagStr[1];
                                         license = Base64.decode(license);
                                     } else if (tagStr.length == 2 && tagStr[0] == 'packagetypeid') {
                                         packagetypeId = tagStr[1];
                                     } else if (tagStr.length == 2 && tagStr[0] == 'architectureid') {
                                         architectureId = tagStr[1];
                                     }
                                 }
                             });
                         }
 
-                        //downloadlink is now: domain/api/files/downloadfile/id/ID/s/TOKEN/t/TIMESTAMP/u/USERID/FILE_NAME
+                        //downloadlink is now: domain/api/files/download/id/ID/s/TOKEN/t/TIMESTAMP/u/USERID/FILE_NAME
                         var hash = '<?= $this->download_hash ?>';
                         var timetamp = '<?= $this->download_timestamp ?>';
                         var userid = '<?= $this->member_id?>';
 
-                        var downloadUrl = pploadApiUri + 'files/downloadfile/id/' + this.id + '/o/1/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name;
+                        var downloadUrl = pploadApiUri + 'files/download/id/' + this.id + '/o/1/s/' + hash + '/t/' + timetamp + '/u/' + userid + '/' + this.name;
                         var downloadLinkFilename = link ? this.name + ' (External Link)' : this.name;
                         var downloadLink = '<a href="' + downloadUrl + '" id="data-link' + this.id + '">' + downloadLinkFilename + '</a>';
 
                         if(this.active == '1') {
                             deletePploadFileBtnPerFile = deletePploadFileBtn;
                         } else {
                             deletePploadFileBtnPerFile = '';
                         }
 
                         var numDownloads = this.downloaded_count;
                         numDownloads = numDownloads || 0;
 
                         $modalPpload.find('table[data-ppload-files] tbody').append(
                             '<tr data-ppload-file-id="' + this.id + '" data-ppload-file-category="' + fileCategory + '" data-ppload-file-tags="' + fileTags + '">'
                             + '<td>' + downloadLink + '</td>'
                             + '<td>' + version + '</td>'
                             + '<td>' + inputFileDescription + '</td>'
                             /**
                             + '<td>' + '<select id="data-select-tags' + this.id + '" data-license-id="" name="file_tags[]" class="form-control input-sm chosen" multiple="multiple" style="width: 150px;"><option value=""></option>' + tagOptions + '</select></td>'
                             **/
                             /*
                             + '<td>'
                             + '<select id="data-select-license' + this.id + '" data-license-id="" name="license" class="form-control input-sm">'
                             + '<option value=\"1000\"></option><option value=\"16\">AGPL</option><option value=\"3\">Artistic 2.0</option><option value=\"6\">BSD</option><option value=\"17\">CC0 1.0 Universal (Public Domain)</option><option value=\"9\">CPL 1.0</option><option value=\"10\">Creative Commons by</option><option value=\"13\">Creative Commons by-nc</option><option value=\"15\">Creative Commons by-nc-nd</option><option value=\"14\">Creative Commons by-nc-sa</option><option value=\"12\">Creative Commons by-nd</option><option value=\"11\">Creative Commons by-sa</option><option value=\"8\">GFDL</option><option value=\"1\">GPLv2 or later</option><option value=\"18\">GPLv2 only</option><option value=\"19\">GPLv3</option><option value=\"2\">LGPL</option><option value=\"0\">Other</option><option value=\"7\">Proprietary License</option><option value=\"5\">QPL</option><option value=\"4\">X11</option>'
                             + '</select><span id="file-tag-license'+this.id+'"><span id="file-tag-license-text'+this.id+'">'
                             + '</td>'
                             */
                             + '<td>' + this.type + '</td>'
                             + '<td>'
                             + '<select id="data-select-packagetype' + this.id + '" data-packagetype-id="" name="packagetype" class="form-control input-sm" style="width: 200px;">'
                             + '<option value=\"\"></option>'
                                 <?php
                                 // force $value to array so we can compare multiple values to multiple
                                 // options; also ensure it's a string for comparison purposes.
                                 $tagList = $packagetypeListHelper->fetchList();
                                 foreach ($tagList as $opt_value => $opt_label) {
                                 ?>
                                   + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                 <?php
                                 }
                                 ?>
                             + '</select>'
                             + '</td>'
 
                             + '<td>'
                             + '<select class="form-control input-sm" id="data-select-architecture' + this.id + '" data-architecture-id="" name="architecture">'
                             + '    <option value=""></option>'
                                 <?php
                                 // force $value to array so we can compare multiple values to multiple
                                 // options; also ensure it's a string for comparison purposes.
                                 $tagList = $architectureListHelper->fetchList();
                                 foreach ($tagList as $opt_value => $opt_label) {
                                 ?>
                                   + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                                 <?php
                                 }
                                 ?>
                             + '</select>'
                             + '</td>'
 
                             + '<td>' + this.created_timestamp + '</td>'
                             + '<td style="text-align: right">' + humanFileSize(this.size) + '</td>'
                             + '<td style="text-align: right">' + numDownloads + '</td>'
                             + '<td>' + deletePploadFileBtnPerFile + '</td>'
                             + '</tr>'
                         );
 
                         //$("#data-select-license" + this.id + " option[value='"+licenseId+"']").attr('selected', 'selected');
                         $("#data-select-packagetype" + this.id + " option[value='"+packagetypeId+"']").attr('selected', 'selected');
                         $("#data-select-architecture" + this.id + " option[value='"+architectureId+"']").attr('selected', 'selected');
                         //UserTags.activateSelect(this.id, this.tags);
 
                         /*
                         $licenseSelect = $modalPpload.find('#data-select-license' + this.id);
                         if(this.active == '0') {
                             $licenseSelect.prop('disabled', 'disabled');
                         }
                         */
 
                         $packagetypeSelect = $modalPpload.find('#data-select-packagetype' + this.id);
                         if(this.active == '0') {
                             $packagetypeSelect.prop('disabled', 'disabled');
                         }
 
 
                         $architectureSelect = $modalPpload.find('#data-select-architecture' + this.id);
                         if(this.active == '0') {
                             $architectureSelect.prop('disabled', 'disabled');
                         }
 
                         if ((typeof link != 'undefined') && (link != "")) {
                             //$("#data-link" + this.id).attr('href', decodeURIComponent(link));
                             $("#data-link" + this.id).attr('target','_blank');
                             $("#data-link" + this.id).html($("#data-link" + this.id).html() + " (External Link)");
                         }
                     });
 
                     $modalPpload.find('p[data-file-upload-msg]').show();
                     $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
                     $modalPpload.find('button[data-file-upload-ok-btn]').removeAttr('disabled');
 
                     $modalPpload.find('button[data-deletepploadfiles-btn]').removeAttr('disabled');
 
                     if ($modalPpload.find('input[data-accept-checkbox]').is(':checked')) {
                         $modalPpload.find('button[data-addpploadfile-btn]').removeAttr('disabled');
                         $modalPpload.find('#github_picker').removeAttr('disabled');
                     } else {
                         $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                         $modalPpload.find('#github_picker').attr('disabled', 'disabled');
                     }
 
                     if (data.pagination.next) {
                         getPploadFiles(data.pagination.next);
                     }
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     return;
                 }
             });
         }
 
         function addFileToPploadUploadQueue(fileId, fileUpload) {
             var uploadId = 'file-upload-' + Math.floor(Math.random() * 1000) + '-' + new Date().getTime();
             pploadUploads.queue[uploadId] = {
                 fileId: fileId,
                 fileUpload: fileUpload
             };
 
             $modalPpload.find('table[data-file-upload] tbody').append(
                 '<tr data-file-upload-id="' + uploadId + '">'
                 + '<td>' + this.name + ' (' + humanFileSize(this.size) + ')</td>'
                 + '<td>'
                 + '<progress max="100" value="0" data-file-upload-progress=""></progress>'
                 + '<br>'
                 + '<span'
                 + ' data-file-upload-progress=""'
                 + ' data-file-upload-loaded="0"'
                 + ' data-file-upload-time="0"></span>'
                 + '</td>'
                 + '<td><a href="#" data-file-upload-cancel-btn="">×</a></td>'
                 + '</tr>'
             );
         }
 
         function startUploadPploadFiles() {
             if ($.isEmptyObject(pploadUploads.queue) || pploadUploads.uploading) {
                 return;
             }
 
             //var productId = $modalPpload.attr('data-product-id');
             var uploadId = null;
             var formData = new FormData();
             $.each(pploadUploads.queue, function (key, value) {
                 uploadId = key;
                 if (value.fileId) {
                     formData.append('file_id', value.fileId);
                 }
                 formData.append('file_upload', value.fileUpload);
                 return false;
             });
             var $uploadContainer = $modalPpload.find('tr[data-file-upload-id="' + uploadId + '"]');
             var $uploadProgressBar = $uploadContainer.find('progress[data-file-upload-progress]');
             var $uploadProgress = $uploadContainer.find('span[data-file-upload-progress]');
             $uploadProgress.attr('data-file-upload-time', new Date().getTime());
 
             $modalPpload.find('button[data-deletepploadfiles-btn]').attr('disabled', 'disabled');
             $modalPpload.find('button[data-file-upload-ok-btn]').attr('disabled', 'disabled');
             $modalPpload.find('button[data-file-upload-cancel-btn]').removeAttr('disabled');
 
             pploadUploads.currentUploadId = uploadId;
 
             var url = '';
             if (formData.has('file_id')) {
                 url = $modalPpload.attr('data-updatepploadfile-uri');
             } else {
                 url = $modalPpload.attr('data-addpploadfile-uri');
             }
 
             pploadUploads.uploading = $.ajax({
                 xhr: function () {
                     var xhr = $.ajaxSettings.xhr();
                     if (xhr.upload) {
                         xhr.upload.addEventListener('progress', function (event) {
                             var progress = parseInt(event.loaded / event.total * 10000) / 100;
                             var previousLoaded = parseInt($uploadProgress.attr('data-file-upload-loaded'));
                             var previousTime = parseInt($uploadProgress.attr('data-file-upload-time'));
                             var currentTime = new Date().getTime();
                             var rate = '--';
                             if (previousTime < currentTime) {
                                 $uploadProgress.attr('data-file-upload-loaded', event.loaded);
                                 $uploadProgress.attr('data-file-upload-time', currentTime);
                                 rate = humanFileSize(Math.floor((event.loaded - previousLoaded) / (currentTime - previousTime) * 1000));
                             }
                             $uploadProgressBar.attr('value', progress);
                             $uploadProgress.html(progress + '% | ' + rate + '/s');
                         }, false);
                     }
                     xhr.addEventListener('abort', function (event) {
                         if (pploadUploads.queue[uploadId].fileId) {
                             $modalPpload.find('tr[data-ppload-file-id="' + pploadUploads.queue[uploadId].fileId + '"]').show();
                         }
                         delete pploadUploads.queue[uploadId];
                         pploadUploads.currentUploadId = null;
                         pploadUploads.uploading = null;
                         $uploadContainer.remove();
                         if ($modalPpload.attr('data-ppload-collection-id')) {
                             $modalPpload.find('button[data-deletepploadfiles-btn]').removeAttr('disabled');
                         }
                         $modalPpload.find('button[data-file-upload-ok-btn]').removeAttr('disabled');
                         $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
                         startUploadPploadFiles();
                     }, false);
                     return xhr;
                 },
                 url: url,
                 type: 'POST',
                 data: formData,
                 dataType: 'json',
                 contentType: false,
                 processData: false,
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'ok') {
                         return;
                     }
 
                     if (pploadUploads.queue[uploadId].fileId) {
                         $modalPpload.find('tr[data-ppload-file-id="' + pploadUploads.queue[uploadId].fileId + '"]').remove();
                     }
                     delete pploadUploads.queue[uploadId];
                     pploadUploads.currentUploadId = null;
                     pploadUploads.uploading = null;
                     $uploadContainer.remove();
                     $('a[href="#modal-ppload"][data-product-id="' + $modalPpload.attr('data-product-id') + '"]')
                         .attr('data-ppload-collection-id', data.file.collection_id);
                     $modalPpload.attr('data-ppload-collection-id', data.file.collection_id);
 
                     var versionText;
                     if(data.file.version==null) {versionText = '';} else{versionText = data.file.version;}
                     versionText = versionText.replace(/<\/?[^>]+(>|$)/g, "");
 
                     var version = '<input data-ppload-file-version="" class="form-control input-sm"'
                         + ' type="text" maxlength="140" placeholder="File version"'
                         + ' value="' + versionText + '">';
 
                     var fileDescription = '';
                     if (data.file.description) {
                         fileDescription = data.file.description;
                     }
                     var fileCategory = '';
                     if (data.file.category) {
                         fileCategory = data.file.category;
                     }
                     var fileTags = '';
                     if (data.file.tags) {
                         fileTags = data.file.tags;
                     }
 
                     //var tagOptions = UserTags.getTagOptions();
 
                     $modalPpload.find('table[data-ppload-files] tbody').append(
                         '<tr data-ppload-file-id="' + data.file.id + '" data-ppload-file-category="' + fileCategory + '" data-ppload-file-tags="' + fileTags + '">'
                         + '<td><a href="' + pploadApiUri + 'files/download/id/' + data.file.id + '/' + data.file.name + '">' + data.file.name + '</a></td>'
                         + '<td>' + version + '</td>'
                         + '<td><input data-ppload-file-description="" class="form-control input-sm"'
                         + ' type="text" maxlength="140" placeholder="File description"'
                         + ' value="' + fileDescription + '"></td>'
                         /**
                         + '<td>' + '<select id="data-select-tags' + data.file.id + '" data-tag-id="" name="file_tags[]" class="form-control input-sm chosen" multiple="multiple" style="width: 150px;"><option value=""></option>' + tagOptions + '</select></td>'
                         **/
                         /*
                         + '<td>'
                         + '<select id="data-select-license' + data.file.id + '" data-license-id="" name="license" class="form-control input-sm">'
                         + '<option value=\"1000\"></option><option value=\"16\">AGPL</option><option value=\"3\">Artistic 2.0</option><option value=\"6\">BSD</option><option value=\"17\">CC0 1.0 Universal (Public Domain)</option><option value=\"9\">CPL 1.0</option><option value=\"10\">Creative Commons by</option><option value=\"13\">Creative Commons by-nc</option><option value=\"15\">Creative Commons by-nc-nd</option><option value=\"14\">Creative Commons by-nc-sa</option><option value=\"12\">Creative Commons by-nd</option><option value=\"11\">Creative Commons by-sa</option><option value=\"8\">GFDL</option><option value=\"1\">GPLv2 or later</option><option value=\"18\">GPLv2 only</option><option value=\"19\">GPLv3</option><option value=\"2\">LGPL</option><option value=\"0\">Other</option><option value=\"7\">Proprietary License</option><option value=\"5\">QPL</option><option value=\"4\">X11</option>'
                         + '</select>'
                         + '</td>'
                         */
                         + '<td>' + data.file.type + '</td>'
                         + '<td>'
                         + '<select id="data-select-packagetype' + data.file.id + '" data-packagetype-id="" name="packagetype" class="form-control input-sm" style="width: 200px;">'
                         + '<option value=\"\"></option>'
                             <?php
                             // force $value to array so we can compare multiple values to multiple
                             // options; also ensure it's a string for comparison purposes.
                             $tagList = $packagetypeListHelper->fetchList();
                             foreach ($tagList as $opt_value => $opt_label) {
                             ?>
                               + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                             <?php
                             }
                             ?>
                         + '</select>'
                         + '</td>'
                         + '<td>'
                         + '<select class="form-control input-sm" id="data-select-architecture' + data.file.id + '" data-architecture-id="" name="architecture">'
                         + '    <option value=""></option>'
                             <?php
                             // force $value to array so we can compare multiple values to multiple
                             // options; also ensure it's a string for comparison purposes.
                             $tagList = $architectureListHelper->fetchList();
                             foreach ($tagList as $opt_value => $opt_label) {
                             ?>
                               + '<option value="<?= $opt_value ?>"><?= $opt_label ?></option>'
                             <?php
                             }
                             ?>
                         + '</select>'
                         + '</td>'
                         + '<td>' + data.file.created_timestamp + '</td>'
                         + '<td style="text-align: right">' + humanFileSize(data.file.size) + '</td>'
                         + '<td style="text-align: right">0</td>'
                         // "Update" button is hidden currently
                         + '<td><a href="#" class="btn btn-native btn-xs btn-file-dropzone" data-updatepploadfile-btn="" style="display: none;">Update</a></td>'
                         + '<td><a href="#" class="btn btn-native btn-xs btn-file-dropzone" data-deletepploadfile-btn=""><span class="glyphicon glyphicon-trash"></span></a></td>'
                         + '</tr>'
                     );
 
                     //UserTags.activateSelect(data.file.id, '');
 
                     $modalPpload.find('button[data-deletepploadfiles-btn]').removeAttr('disabled');
                     $modalPpload.find('button[data-file-upload-ok-btn]').removeAttr('disabled');
                     $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
                     startUploadPploadFiles();
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     alert("Error: " + textStatus + ", " + errorThrown);
                     return;
                 }
             });
         }
 
         function updatePploadFile(fileId, fileDescription, fileCategory, fileTags) {
             $.ajax({
                 url: $modalPpload.attr('data-updatepploadfile-uri'),
                 type: 'POST',
                 data: {
                     file_id: fileId,
                     file_description: fileDescription,
                     file_category: fileCategory
                 },
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'ok') {
                         return;
                     }
 
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     alert("Error: " + textStatus + ", " + errorThrown);
                     return;
                 }
             });
         }
 
         function updatePackageType(fileId, packagetypeId) {
             $.ajax({
                 url: $modalPpload.attr('data-updatepackagetype-uri'),
                 type: 'POST',
                 data: {
                     file_id: fileId,
                     package_type_id: packagetypeId
                 },
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'ok') {
                         return;
                     }
 
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     //alert("Error: " + textStatus + ", " + errorThrown);
                     return;
                 }
             });
         }
 
         function updateArchitecture(fileId, architectureId) {
             $.ajax({
                 url: $modalPpload.attr('data-updatearchitecture-uri'),
                 type: 'POST',
                 data: {
                     file_id: fileId,
                     architecture_id: architectureId
                 },
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'ok') {
                         return;
                     }
 
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     //alert("Error: " + textStatus + ", " + errorThrown);
                     return;
                 }
             });
         }
 
         function updatePploadFileVersion(fileId, version) {
             version = version.replace(/<\/?[^>]+(>|$)/g, "");
             $.ajax({
                 url: $modalPpload.attr('data-updatepploadfile-uri'),
                 type: 'POST',
                 data: {
                     file_id: fileId,
                     file_version: version
                 },
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'ok') {
                         return;
                     }
 
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     alert("Error: " + textStatus + ", " + errorThrown);
                     return;
                 }
             });
         }
 
         function updatePploadFileTags(fileId, fileTags) {
             $.ajax({
                 url: $modalPpload.attr('data-updatepploadfile-uri'),
                 type: 'POST',
                 data: {
                     file_id: fileId,
                     file_tags: fileTags
                 },
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'ok') {
                         return;
                     }
 
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     alert("Error: " + textStatus + ", " + errorThrown);
                     return;
                 }
             });
         }
 
         function deletePploadFile(fileId) {
             $.ajax({
                 url: $modalPpload.attr('data-deletepploadfile-uri'),
                 type: 'POST',
                 data: {file_id: fileId},
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'ok') {
                         alert('Error: ' + data.error_text);
                         return;
                     }
                     $modalPpload.find('table[data-ppload-files] tbody').html('');
                     $modalPpload.find('table[data-file-upload] tbody').html('');
                     getPploadFiles();
                     /**
                     $modalPpload.find('tr[data-ppload-file-id="' + fileId + '"]').remove();
                     if ($modalPpload.find('tr[data-ppload-file-id]').size() === 0) {
                         $modalPpload.find('table[data-ppload-files] tbody').html('');
                         $modalPpload.find('table[data-file-upload] tbody').html('');
                         $modalPpload.find('p[data-file-upload-msg]').show();
                         $modalPpload.find('button[data-deletepploadfiles-btn]').attr('disabled', 'disabled');
                         $modalPpload.find('button[data-file-upload-ok-btn]').removeAttr('disabled');
                         $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
 
                         if ($modalPpload.find('input[data-accept-checkbox]').is('checked')) {
                             $modalPpload.find('button[data-addpploadfile-btn]').removeAttr('disabled');
                         } else {
                             $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                         }
 
                     }
                     **/
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     alert("Error: " + textStatus + ", " + errorThrown);
                     return;
                 }
             });
         }
 
         function deletePploadFiles() {
             $.ajax({
                 url: $modalPpload.attr('data-deletepploadfiles-uri'),
                 type: 'POST',
                 data: {},
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'ok') {
                         return;
                     }
                     $modalPpload.find('table[data-ppload-files] tbody').html('');
                     $modalPpload.find('table[data-file-upload] tbody').html('');
                     $modalPpload.find('p[data-file-upload-msg]').show();
 
                     //$modalPpload.find('button[data-addpploadfile-btn]').removeAttr('disabled');
                     $modalPpload.find('button[data-deletepploadfiles-btn]').attr('disabled', 'disabled');
                     $modalPpload.find('button[data-file-upload-ok-btn]').removeAttr('disabled');
                     $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
 
                     $modalPpload.find('input[data-accept-checkbox]').removeAttr('disabled');
                     $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     return;
                 }
             });
         }
 
         function humanFileSize(bytes) {
             var size = '';
             size = (bytes / 1048576).toFixed(2) + ' MB';
             /*
              if (bytes >= 1073741824) {
              size = (bytes / 1073741824).toFixed(2) + 'GB';
              }
              else if (bytes >= 1048576) {
              size = (bytes / 1048576).toFixed(2) + 'MB';
              }
              else if (bytes >= 1024) {
              size = (bytes / 1024).toFixed(2) + 'KB';
              }
              else {
              size = bytes + 'bytes';
              }*/
             return size;
         }
 
         $('a[href="#modal-ppload"]').on('click', function (event) {
             event.preventDefault();
             $modalPpload.attr('data-ppload-collection-id', $(this).attr('data-ppload-collection-id'));
             $modalPpload.attr('data-product-id', $(this).attr('data-product-id'));
             $modalPpload.attr('data-product-tile', $(this).attr('data-product-title'));
             $modalPpload.attr('data-product-version', $(this).attr('data-product-version'));
             $modalPpload.attr('data-addpploadfile-uri', $(this).attr('data-addpploadfile-uri'));
             $modalPpload.attr('data-updatepploadfile-uri', $(this).attr('data-updatepploadfile-uri'));
             $modalPpload.attr('data-updatepackagetype-uri', $(this).attr('data-updatepackagetype-uri'));
             $modalPpload.attr('data-updatearchitecture-uri', $(this).attr('data-updatearchitecture-uri'));
             $modalPpload.attr('data-deletepploadfile-uri', $(this).attr('data-deletepploadfile-uri'));
             $modalPpload.attr('data-deletepploadfiles-uri', $(this).attr('data-deletepploadfiles-uri'));
             $modalPpload.find('div[data-file-upload]').css({
                 'min-height': '200px',
                 'max-height': '400px',
                 'border-width': '5px',
                 'border-style': 'dashed',
                 'border-color': '#cccccc',
                 'overflow': 'inherit'
             });
 
             $modalPpload.find('h3[data-ppload-label]').html('Files for ' + $modalPpload.attr('data-product-tile'));
             $modalPpload.find('#product-version').val($modalPpload.attr('data-product-version'));
 
             $modalPpload.find('table[data-ppload-files] tbody').html('');
             $modalPpload.find('table[data-file-upload] tbody').html('');
             $modalPpload.find('p[data-file-upload-msg]').show();
 
             $modalPpload.find('#update-list').html('');
 
             $modalPpload.find('input[data-accept-checkbox]').removeAttr('disabled');
 
             $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
             $modalPpload.find('button[data-deletepploadfiles-btn]').attr('disabled', 'disabled');
             $modalPpload.find('button[data-file-upload-ok-btn]').removeAttr('disabled');
             $modalPpload.find('button[data-file-upload-cancel-btn]').attr('disabled', 'disabled');
 
             if ($modalPpload.attr('data-ppload-collection-id')) {
                 getPploadFiles();
             }
 
             //if ($modalPpload.attr('data-product-id')) {
             //    getUpdates();
             //}
 
         });
 
         $modalPpload.on('dragover', 'div[data-file-upload]', function (event) {
             event.preventDefault();
         });
 
         $modalPpload.on('dragenter', 'div[data-file-upload]', function (event) {
             event.preventDefault();
             $(this).css('border-color', '#00ccff');
         });
 
         $modalPpload.on('dragleave', 'div[data-file-upload]', function (event) {
             event.preventDefault();
             $(this).css('border-color', '#cccccc');
         });
 
         $modalPpload.on('drop', 'div[data-file-upload]', function (event) {
             event.preventDefault();
             $.each(event.originalEvent.dataTransfer.files, function () {
                 addFileToPploadUploadQueue(null, this);
             });
             startUploadPploadFiles();
             $(this).css('border-color', '#cccccc');
         });
 
         $modalPpload.on('change', 'input[data-file-upload]', function (event) {
             $.each(this.files, function () {
                 addFileToPploadUploadQueue(null, this);
             });
             startUploadPploadFiles();
         });
 
         $modalPpload.on('click', 'button[data-addpploadfile-btn]', function (event) {
             event.preventDefault();
             $modalPpload.find('input[data-file-upload]').click();
         });
 
         $modalPpload.on('change', 'input[data-file-upload-update]', function (event) {
             if ($(this).attr('data-ppload-file-id')) {
                 var fileId = $(this).attr('data-ppload-file-id');
                 $modalPpload.find('tr[data-ppload-file-id="' + fileId + '"]').hide();
                 addFileToPploadUploadQueue(fileId, this.files[0]);
                 startUploadPploadFiles();
             }
         });
 
         $modalPpload.on('click', 'tr[data-ppload-file-id] a[data-updatepploadfile-btn]', function (event) {
             event.preventDefault();
             var $inputForm = $modalPpload.find('input[data-file-upload-update]');
             $inputForm.attr('data-ppload-file-id', $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id'));
             $inputForm.click();
         });
 
         $modalPpload.on('click', 'input[data-accept-checkbox]', function (event) {
             if ($modalPpload.find('input[data-accept-checkbox]').is(':checked')) {
                 $modalPpload.find('button[data-addpploadfile-btn]').removeAttr('disabled');
                 $modalPpload.find('#github_picker').removeAttr('disabled');
             } else {
                 $modalPpload.find('button[data-addpploadfile-btn]').attr('disabled', 'disabled');
                 $modalPpload.find('#github_picker').attr('disabled', 'disabled');
             }
         });
 
         $modalPpload.on('click', 'tr[data-ppload-file-id] a[data-deletepploadfile-btn]', function (event) {
             event.preventDefault();
             deletePploadFile($(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id'));
         });
 
         $modalPpload.on('click', 'button[data-deletepploadfiles-btn]', function (event) {
             event.preventDefault();
             deletePploadFiles();
         });
 
         $modalPpload.on('click', 'button[data-ppload-cancel-btn]', function (event) {
             event.preventDefault();
             $modalPpload.modal('hide');
         });
 
         $modalPpload.on('click', 'button[data-file-upload-cancel-btn]', function (event) {
             event.preventDefault();
             pploadUploads.uploading.abort();
             pploadUploads.queue = {};
             $modalPpload.find('table[data-file-upload] tbody').html('');
         });
 
         $modalPpload.on('click', 'tr[data-file-upload-id] a[data-file-upload-cancel-btn]', function (event) {
             event.preventDefault();
             var uploadId = $(this).closest('tr[data-file-upload-id]').attr('data-file-upload-id');
             if (uploadId == pploadUploads.currentUploadId) {
                 pploadUploads.uploading.abort();
             }
             else {
                 delete pploadUploads.queue[uploadId];
                 $modalPpload.find('tr[data-file-upload-id="' + uploadId + '"]').remove();
             }
         });
 
         $modalPpload.on('change', 'input[data-ppload-file-description]', function (event) {
             event.preventDefault();
             var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
             var fileDescription = $(this).closest('input[data-ppload-file-description]').val();
             var fileCategory = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-category');
             var fileTags = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-tags');
 
             $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-tags', fileTags);
             fileDescription = fileDescription.replace(/<\/?[^>]+(>|$)/g, "");
             updatePploadFile(fileId, fileDescription, fileCategory, fileTags);
         });
 
         $modalPpload.on('change', 'input[data-ppload-file-version]', function (event) {
             event.preventDefault();
             var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
             var fileVersion = $(this).closest('input[data-ppload-file-version]').val();
             updatePploadFileVersion(fileId, fileVersion);
         });
 
         $modalPpload.on('click', 'button[data-add-update-btn]', function (event) {
             var product_version = $modalPpload.find('#product-version').val();
             var update_id = $modalPpload.find('#update-id').val();
             var title = $modalPpload.find('#update-title').val();
             var text = $modalPpload.find('#update-text').val();
             var productId = $modalPpload.attr('data-product-id');
             event.preventDefault();
 
             $.ajax({
                 url: '/p/'+productId+'/saveupdateajax',
                 type: 'POST',
                 data: {title: title, text: text, update_id: update_id, product_version: product_version},
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'success') {
                         return;
                     }
                     $modalPpload.find('#update-title').val('');
                     $modalPpload.find('#update-text').val('');
                     $modalPpload.find('#update-id').val('');
 
                     if(update_id) {
                         getUpdates();
                     } else {
                         $modalPpload.modal('hide');
                         location.reload();
                     }
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     return;
                 }
             });
 
         });
 
 
         $modalPpload.on('click', 'button[data-delete-update-btn]', function (event) {
             var updateId = $(this).attr('data-delete-update-btn');
             var productId = $modalPpload.attr('data-product-id');
             event.preventDefault();
 
             $.ajax({
                 url: '/p/'+productId+'/deleteupdateajax',
                 type: 'POST',
                 data: {update_id: updateId},
                 dataType: 'json',
                 success: function (data, textStatus, jqXHR) {
                     if (data.status != 'success') {
                         alert('Update could not be deleted!');
                         return;
                     }
                     getUpdates();
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
                     return;
                 }
             });
 
         });
 
         $modalPpload.on('click', 'button[data-change-update-btn]', function (event) {
             var updateId = $(this).attr('data-change-update-btn');
             var title = $(this).attr('data-change-title');
             var text = $(this).attr('data-change-text');
             var productId = $modalPpload.attr('data-product-id');
 
             $modalPpload.find('#update-title').val(title);
             $modalPpload.find('#update-text').val(text);
             $modalPpload.find('#update-id').val(updateId);
 
             $modalPpload.find('#update-title').focus();
 
             event.preventDefault();
 
         });
 
 
         /*
         $modalPpload.on('change', 'select.chosen', function (event) {
             event.preventDefault();
             var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
             var currentTags = $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags');
             var chosenTags = $(this).val();
 
             var newTags = UserTags.removeOldTags(currentTags);
             newTags = UserTags.setNewTags(newTags, chosenTags);
 
             updatePploadFileTags(fileId, newTags);
             $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags',newTags);
         });
         */
 
         $modalPpload.on('change', 'select[id*=data-select-license]', function(event) {
             event.preventDefault();
             var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
             var fileTags = $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags');
             var licenseId = $modalPpload.find('#data-select-license' + fileId).val();
 
             var newFileTags = '';
 
             if (fileTags) {
 
                 $.each(fileTags.split(','), function () {
                     // skip old entries
                     if ((this.length == 0) || (this.indexOf('licensetype-') == 0) || (this.indexOf('license##') == 0)) {
                         return true;
                     }
                     newFileTags += ',' + this;
                 });
 
             }
             newFileTags += ',licensetype-'+licenseId;
             updatePploadFileTags(fileId, newFileTags);
             $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags',newFileTags);
         });
 
         $modalPpload.on('change', 'select[id*=data-select-packagetype]', function(event) {
             event.preventDefault();
             var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
             var fileTags = $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags');
             var packagetypeId = $modalPpload.find('#data-select-packagetype' + fileId).val();
 
             var newFileTags = '';
             if (fileTags) {
 
                 $.each(fileTags.split(','), function () {
                     // skip old entries
                     if ((this.length == 0) || (this.indexOf('packagetypeid-') == 0) || (this.indexOf('packagetypeid##') == 0)) {
                         return true;
                     }
                     newFileTags += ',' + this;
                 });
 
             }
             newFileTags += ',packagetypeid-'+packagetypeId;
             updatePploadFileTags(fileId, newFileTags);
             $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags',newFileTags);
             updatePackageType(fileId, packagetypeId);
         });
 
         $modalPpload.on('change', 'select[id*=data-select-architecture]', function(event) {
             event.preventDefault();
             var fileId = $(this).closest('tr[data-ppload-file-id]').attr('data-ppload-file-id');
             var fileTags = $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags');
             var architectureId = $modalPpload.find('#data-select-architecture' + fileId).val();
 
             var newFileTags = '';
             if (fileTags) {
 
                 $.each(fileTags.split(','), function () {
                     // skip old entries
                     if ((this.length == 0) || (this.indexOf('architectureid-') == 0) || (this.indexOf('architectureid##') == 0)) {
                         return true;
                     }
                     newFileTags += ',' + this;
                 });
 
             }
             newFileTags += ',architectureid-'+architectureId;
             updatePploadFileTags(fileId, newFileTags);
             $(this).closest('tr[data-ppload-file-tags]').attr('data-ppload-file-tags',newFileTags);
             updateArchitecture(fileId, architectureId);
         });
 
         <?php /*
         var UserTags = (function () {
             return {
                 removeOldTags : function(stringOldTags) {
                     if (!stringOldTags) {
                         return '';
                     }
 
                     var stringNewTags = '';
                     $.each(stringOldTags.split(','), function() {
                         if (this.length == 0) {
                             return true;
                         }
                         if (this.indexOf('@@@')==-1) {
                             stringNewTags += ',' + this;
                         }
                     });
 
                     return stringNewTags;
                 },
                 setNewTags : function(stringOldTags, arrayNewTags) {
                     if (arrayNewTags.length == 0) {
                         return stringOldTags;
                     }
                     var newTags = '@@@';
                     $.each(arrayNewTags, function() {
                         newTags += this + '@@';
                     });
 
                     return stringOldTags + ',' + newTags;
                 },
                 getTagArray : function(stringTags) {
                     if (!stringTags) {
                         return [];
                     }
                     var result;
                     $.each(stringTags.split(','), function() {
                         if (this.indexOf('@@@') == 0) {
                             var strTags = this.substring(3);
                             strTags = strTags.substring(0,strTags.length - 2);
                             result = strTags.split('@@');
                         }
                     });
 
                     return result;
                 },
                 getTagOptions: function() {
                     <?php
                     $modelTagGroup = new Default_Model_TagGroup();
                     $groups = $modelTagGroup->fetchGroupHierarchy();
                     $tagOptions = '';
                     foreach($groups as $label => $opt):
                         $tagOptions .= '<optgroup label="'.$label.'">';
                         foreach ($opt as $id => $name):
                             $tagOptions .= '<option value="'.$name.'">'.$name.'</option>';
                         endforeach;
                         $tagOptions .= '</optgroup>';
                     endforeach;
                     ?>
                     return '<?=$tagOptions?>';
 
                 },
                 activateSelect: function(elementId, elementTags) {
                     console.log(elementId);
                     console.log(elementTags);
                     var userTagArray = UserTags.getTagArray(elementTags);
                     console.log(userTagArray);
                     $.each(userTagArray, function() {
                         $("#data-select-tags" + elementId + " option[value='"+this+"']").attr('selected', 'selected');
                     });
                     $("#data-select-tags" + elementId).chosen({
                         width: "100%",
                         max_selected_options: "5",
                         disable_search: "false",
                         disable_search_threshold: "5"
                     });
                 },
             }
         })();
     */
         ?>
 
     });
 
 </script>
 <script type="text/javascript" src="/theme/flatui/js/lib/chosen.jquery.min.js"></script>
 <!-- /ppload -->
 
 <?php
             $this->inlineScript()->appendScript(
                 '    $(document).ready(function(){
                         TagingLoopMyProducts.setup();
                     });
                 ');
 
      ?>