Merge branch 'master' of /home/rdb/DEV/PhpstormProjects/sysPass with conflicts.

This commit is contained in:
Rubén D
2019-01-15 16:21:15 +01:00
parent 12dc771f84
commit 1c9e5e48bf
290 changed files with 74421 additions and 44683 deletions

View File

@@ -1,74 +1,74 @@
<?php
/**
* sysPass
*
* @author nuxsmin
* @link http://syspass.org
* @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
* sysPass is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* sysPass is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with sysPass. If not, see <http://www.gnu.org/licenses/>.
*/
namespace SP\DataModel;
/**
* Class FileExtData
*
* @package SP\DataModel
*/
class FileExtData extends FileData
{
/**
* @var string
*/
public $customer_name = '';
/**
* @var string
*/
public $account_name = '';
/**
* @return string
*/
public function getCustomerName()
{
return $this->customer_name;
}
/**
* @param string $customer_name
*/
public function setCustomerName($customer_name)
{
$this->customer_name = $customer_name;
}
/**
* @return string
*/
public function getAccountName()
{
return $this->account_name;
}
/**
* @param string $account_name
*/
public function setAccountName($account_name)
{
$this->account_name = $account_name;
}
<?php
/**
* sysPass
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
* sysPass is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* sysPass is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with sysPass. If not, see <http://www.gnu.org/licenses/>.
*/
namespace SP\DataModel;
/**
* Class FileExtData
*
* @package SP\DataModel
*/
class FileExtData extends FileData
{
/**
* @var string
*/
public $clientName = '';
/**
* @var string
*/
public $accountName = '';
/**
* @return string
*/
public function getClientName()
{
return $this->clientName;
}
/**
* @param string $clientName
*/
public function setClientName($clientName)
{
$this->clientName = $clientName;
}
/**
* @return string
*/
public function getAccountName()
{
return $this->accountName;
}
/**
* @param string $accountName
*/
public function setAccountName($accountName)
{
$this->accountName = $accountName;
}
}