Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

function declaration

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-08-15 14:28:34 +02:00
parent 7c6f41e04f
commit 7bb781eea8
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
37 changed files with 383 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/setup/codesniffer/ruleset.xml
View File

@ -12,6 +12,7 @@
<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
<exclude-pattern type="relative">*.min.css</exclude-pattern>
<exclude-pattern type="relative">*.js</exclude-pattern>
<!-- List of all tests -->
@ -157,7 +158,7 @@
<!-- Disabled as this does not support tab -->
<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
<rule ref="Squiz.Functions.MultiLineFunctionDeclaration" />
<!-- Rules from PEAR Standard -->

48
htdocs/accountancy/class/accountancyexport.class.php
View File

@ -78,7 +78,8 @@ class AccountancyExport
*
* @param DoliDb $db Database handler
*/
public function __construct(DoliDB &$db) {
public function __construct(DoliDB &$db)
{
global $conf;
$this->db = &$db;
@ -91,7 +92,8 @@ class AccountancyExport
*
* @return array of type
*/
public static function getType() {
public static function getType()
{
global $langs;
return array (
@ -113,7 +115,8 @@ class AccountancyExport
*
* @return array of type
*/
public static function getTypeConfig() {
public static function getTypeConfig()
{
global $conf, $langs;
return array (
@ -175,7 +178,8 @@ class AccountancyExport
*
* @return void
*/
public static function downloadFile() {
public static function downloadFile()
{
global $conf;
$filename = 'general_ledger';
include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
@ -186,7 +190,8 @@ class AccountancyExport
*
* @param unknown $TData data
*/
public function export(&$TData) {
public function export(&$TData)
{
global $conf, $langs;
self::downloadFile();
@ -235,7 +240,8 @@ class AccountancyExport
*
* @return void
*/
public function exportNormal($objectLines) {
public function exportNormal($objectLines)
{
global $conf;
foreach ( $objectLines as $line ) {
@ -259,7 +265,8 @@ class AccountancyExport
*
* @return void
*/
public function exportCegid($objectLines) {
public function exportCegid($objectLines)
{
foreach ( $objectLines as $line ) {
$date = dol_print_date($line->doc_date, '%d%m%Y');
$separator = ";";
@ -284,7 +291,8 @@ class AccountancyExport
*
* @return void
*/
public function exportCogilog($objectLines) {
public function exportCogilog($objectLines)
{
foreach ( $objectLines as $line ) {
$date = dol_print_date($line->doc_date, '%d%m%Y');
$separator = ";";
@ -317,7 +325,8 @@ class AccountancyExport
*
* @return void
*/
public function exportCoala($objectLines) {
public function exportCoala($objectLines)
{
// Coala export
$separator = ";";
$end_line = "\n";
@ -344,7 +353,8 @@ class AccountancyExport
*
* @return void
*/
public function exportBob50($objectLines) {
public function exportBob50($objectLines)
{
// Bob50
$separator = ";";
@ -382,7 +392,8 @@ class AccountancyExport
*
* @return void
*/
public function exportCiel(&$TData) {
public function exportCiel(&$TData)
{
global $conf;
$end_line ="\r\n";
@ -422,7 +433,8 @@ class AccountancyExport
*
* @return void
*/
public function exportQuadratus(&$TData) {
public function exportQuadratus(&$TData)
{
global $conf;
$end_line ="\r\n";
@ -505,7 +517,8 @@ class AccountancyExport
*
* @return void
*/
public function exportEbp($objectLines) {
public function exportEbp($objectLines)
{
$separator = ',';
$end_line = "\n";
@ -537,7 +550,8 @@ class AccountancyExport
*
* @return void
*/
public function exportAgiris($objectLines) {
public function exportAgiris($objectLines)
{
$separator = ';';
$end_line = "\n";
@ -574,7 +588,8 @@ class AccountancyExport
*
* @return void
*/
public function exportConfigurable($objectLines) {
public function exportConfigurable($objectLines)
{
global $conf;
foreach ($objectLines as $line) {
@ -603,7 +618,8 @@ class AccountancyExport
* @param unknown $str data
* @param integer $size data
*/
public static function trunc($str, $size) {
public static function trunc($str, $size)
{
return dol_trunc($str, $size, 'right', 'UTF-8', 1);
}
}

51
htdocs/accountancy/class/bookkeeping.class.php
View File

@ -88,7 +88,8 @@ class BookKeeping extends CommonObject
*
* @param DoliDb $db Database handler
*/
public function __construct(DoliDB $db) {
public function __construct(DoliDB $db)
{
$this->db = $db;
}
@ -99,7 +100,8 @@ class BookKeeping extends CommonObject
* @param bool $notrigger false=launch triggers after, true=disable triggers
* @return int <0 if KO, Id of created object if OK
*/
public function create(User $user, $notrigger = false) {
public function create(User $user, $notrigger = false)
{
global $conf, $langs;
dol_syslog(__METHOD__, LOG_DEBUG);
@ -420,7 +422,8 @@ class BookKeeping extends CommonObject
* @param string $mode Mode
* @return int <0 if KO, Id of created object if OK
*/
public function createStd(User $user, $notrigger = false, $mode='') {
public function createStd(User $user, $notrigger = false, $mode='')
{
global $conf;
dol_syslog(__METHOD__, LOG_DEBUG);
@ -590,7 +593,8 @@ class BookKeeping extends CommonObject
*
* @return int <0 if KO, 0 if not found, >0 if OK
*/
public function fetch($id, $ref = null, $mode='') {
public function fetch($id, $ref = null, $mode='')
{
global $conf;
dol_syslog(__METHOD__, LOG_DEBUG);
@ -687,7 +691,8 @@ class BookKeeping extends CommonObject
*
* @return int <0 if KO, >=0 if OK
*/
public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
{
global $conf;
dol_syslog(__METHOD__, LOG_DEBUG);
@ -811,7 +816,8 @@ class BookKeeping extends CommonObject
*
* @return int <0 if KO, >0 if OK
*/
public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
{
global $conf;
dol_syslog(__METHOD__, LOG_DEBUG);
@ -1016,7 +1022,8 @@ class BookKeeping extends CommonObject
* @param string $mode Mode
* @return int <0 if KO, >0 if OK
*/
public function update(User $user, $notrigger = false, $mode='') {
public function update(User $user, $notrigger = false, $mode='')
{
$error = 0;
dol_syslog(__METHOD__, LOG_DEBUG);
@ -1185,7 +1192,8 @@ class BookKeeping extends CommonObject
* @param string $mode Mode
* @return int <0 if KO, >0 if OK
*/
public function delete(User $user, $notrigger = false, $mode='') {
public function delete(User $user, $notrigger = false, $mode='')
{
dol_syslog(__METHOD__, LOG_DEBUG);
$error = 0;
@ -1234,7 +1242,8 @@ class BookKeeping extends CommonObject
* @param string $importkey Import key
* @return int Result
*/
function deleteByImportkey($importkey) {
function deleteByImportkey($importkey)
{
$this->db->begin();
// first check if line not yet in bookkeeping
@ -1263,7 +1272,8 @@ class BookKeeping extends CommonObject
* @param string $mode Mode
* @return int <0 if KO, >0 if OK
*/
function deleteByYearAndJournal($delyear='', $journal='', $mode='') {
function deleteByYearAndJournal($delyear='', $journal='', $mode='')
{
global $conf;
if (empty($delyear) && empty($journal))
@ -1302,7 +1312,8 @@ class BookKeeping extends CommonObject
* @param int $piecenum Piecenum to delete
* @return int Result
*/
function deleteMvtNum($piecenum) {
function deleteMvtNum($piecenum)
{
global $conf;
$this->db->begin();
@ -1336,7 +1347,8 @@ class BookKeeping extends CommonObject
*
* @return int New id of clone
*/
public function createFromClone($fromid) {
public function createFromClone($fromid)
{
dol_syslog(__METHOD__, LOG_DEBUG);
global $user;
@ -1381,7 +1393,8 @@ class BookKeeping extends CommonObject
*
* @return void
*/
public function initAsSpecimen() {
public function initAsSpecimen()
{
global $user;
$now=dol_now();
@ -1417,7 +1430,8 @@ class BookKeeping extends CommonObject
* @param string $mode Mode
* @return int <0 if KO, >0 if OK
*/
public function fetchPerMvt($piecenum, $mode='') {
public function fetchPerMvt($piecenum, $mode='')
{
global $conf;
$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type,date_creation";
@ -1481,7 +1495,8 @@ class BookKeeping extends CommonObject
* @param string $mode Mode
* @return int <0 if KO, >0 if OK
*/
function fetchAllPerMvt($piecenum, $mode='') {
function fetchAllPerMvt($piecenum, $mode='')
{
global $conf;
$sql = "SELECT rowid, doc_date, doc_type,";
@ -1539,7 +1554,8 @@ class BookKeeping extends CommonObject
* @param string $model Model
* @return int Result
*/
function export_bookkeping($model = 'ebp') {
function export_bookkeping($model = 'ebp')
{
global $conf;
$sql = "SELECT rowid, doc_date, doc_type,";
@ -1696,7 +1712,8 @@ class BookKeeping extends CommonObject
* @param int $aabase Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
* @return string String with HTML select
*/
function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '')
{
global $conf;
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

3
htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
View File

@ -69,7 +69,8 @@ class PrestaShopWebservice
* @param string $key Authentification key
* @param mixed $debug Debug mode Activated (true) or deactivated (false)
*/
function __construct($url, $key, $debug = true) {
function __construct($url, $key, $debug = true)
{
if (!extension_loaded('curl'))
throw new PrestaShopWebserviceException('Please activate the PHP extension \'curl\' to allow use of PrestaShop webservice library');
$this->url = $url;

5
htdocs/cashdesk/class/Facturation.class.php
View File

@ -310,7 +310,7 @@ class Facturation
* @return string Ref
*/
public function ref($aRef=null)
{
{
if (is_null($aRef))
{
@ -652,7 +652,7 @@ class Facturation
{
return $this->prix_total_ttc;
}
else if ( $aTotalTtc == 'RESET' )
elseif ( $aTotalTtc == 'RESET' )
{
$this->prix_total_ttc = null;
}
@ -663,4 +663,3 @@ class Facturation
}
}

6
htdocs/categories/class/api_categories.class.php
View File

@ -103,7 +103,8 @@ class Categories extends DolibarrApi
*
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -266,7 +267,8 @@ class Categories extends DolibarrApi
* @param Categorie $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

3
htdocs/comm/mailing/class/advtargetemailing.class.php
View File

@ -916,7 +916,8 @@ class AdvanceTargetingMailing extends CommonObject
* For exemple jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
* @return string Sql to use for the where condition
*/
public function transformToSQL($column_to_test,$criteria) {
public function transformToSQL($column_to_test,$criteria)
{
$return_sql_criteria = '(';
//This is a multiple value test

23
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
View File

@ -34,7 +34,8 @@ class FormAdvTargetEmailing extends Form
*
* @param DoliDB $db handler
*/
function __construct($db) {
function __construct($db)
{
global $langs;
$this->db = $db;
@ -47,7 +48,8 @@ class FormAdvTargetEmailing extends Form
* @param string $htmlname select field
* @return string select field
*/
function multiselectProspectionStatus($selected_array = array(), $htmlname = 'cust_prospect_status') {
function multiselectProspectionStatus($selected_array = array(), $htmlname = 'cust_prospect_status')
{
global $conf, $langs;
$options_array = array();
@ -83,7 +85,8 @@ class FormAdvTargetEmailing extends Form
* @param array $selected_array or Code or Label of preselected country
* @return string HTML string with select
*/
function multiselectCountry($htmlname = 'country_id', $selected_array=array()) {
function multiselectCountry($htmlname = 'country_id', $selected_array=array())
{
global $conf, $langs;
$langs->load("dict");
@ -143,7 +146,8 @@ class FormAdvTargetEmailing extends Form
* @param User $user User action
* @return string combo list code
*/
function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user) {
function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user)
{
global $conf;
@ -184,7 +188,8 @@ class FormAdvTargetEmailing extends Form
* @param array $selected_array selected array
* @return string combo list code
*/
function multiselectselectLanguage($htmlname='', $selected_array=array()) {
function multiselectselectLanguage($htmlname='', $selected_array=array())
{
global $conf,$langs;
@ -330,7 +335,8 @@ class FormAdvTargetEmailing extends Form
* @param int $showempty show empty
* @return string HTML combo
*/
function advMultiselectarray($htmlname, $options_array = array(), $selected_array = array(), $showempty = 0) {
function advMultiselectarray($htmlname, $options_array = array(), $selected_array = array(), $showempty = 0)
{
global $conf, $langs;
$form=new Form($this->db);
@ -417,7 +423,8 @@ class FormAdvTargetEmailing extends Form
* @param string $type_element Type element. Example: 'mailing'
* @return string HTML combo
*/
public function selectAdvtargetemailingTemplate($htmlname='template_id', $selected=0, $showempty=0, $type_element='mailing') {
public function selectAdvtargetemailingTemplate($htmlname='template_id', $selected=0, $showempty=0, $type_element='mailing')
{
global $conf, $user, $langs;
$out = '';
@ -460,4 +467,4 @@ class FormAdvTargetEmailing extends Form
$this->db->free ( $resql );
return $out;
}
}
}

45
htdocs/comm/propal/class/api_proposals.class.php
View File

@ -97,7 +97,8 @@ class Proposals extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
* @return array Array of order objects
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -215,7 +216,8 @@ class Proposals extends DolibarrApi
*
* @return int
*/
function getLines($id) {
function getLines($id)
{
if(! DolibarrApiAccess::$user->rights->propal->lire) {
throw new RestException(401);
}
@ -381,7 +383,8 @@ class Proposals extends DolibarrApi
* @throws 401
* @throws 404
*/
function deleteLine($id, $lineid) {
function deleteLine($id, $lineid)
{
if(! DolibarrApiAccess::$user->rights->propal->creer) {
throw new RestException(401);
}
@ -415,7 +418,8 @@ class Proposals extends DolibarrApi
*
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->propal->creer) {
throw new RestException(401);
}
@ -703,23 +707,24 @@ class Proposals extends DolibarrApi
}
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);
$object = parent::_cleanObjectDatas($object);
unset($object->note);
unset($object->name);
unset($object->lastname);
unset($object->firstname);
unset($object->civility_id);
unset($object->address);
unset($object->note);
unset($object->name);
unset($object->lastname);
unset($object->firstname);
unset($object->civility_id);
unset($object->address);
return $object;
}
return $object;
}
}

60
htdocs/commande/class/api_orders.class.php
View File

@ -97,9 +97,10 @@ class Orders extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @return array Array of order objects
*
* @throws RestException
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -218,7 +219,8 @@ class Orders extends DolibarrApi
*
* @return int
*/
function getLines($id) {
function getLines($id)
{
if(! DolibarrApiAccess::$user->rights->commande->lire) {
throw new RestException(401);
}
@ -249,7 +251,8 @@ class Orders extends DolibarrApi
*
* @return int
*/
function postLine($id, $request_data = null) {
function postLine($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
}
@ -311,7 +314,8 @@ class Orders extends DolibarrApi
*
* @return object
*/
function putLine($id, $lineid, $request_data = null) {
function putLine($id, $lineid, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
}
@ -371,7 +375,8 @@ class Orders extends DolibarrApi
* @throws 401
* @throws 404
*/
function deleteLine($id, $lineid) {
function deleteLine($id, $lineid)
{
if(! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
}
@ -403,7 +408,8 @@ class Orders extends DolibarrApi
*
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
if (! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
}
@ -544,7 +550,8 @@ class Orders extends DolibarrApi
* @throws 404
* @throws 405
*/
function reopen($id) {
function reopen($id)
{
if(! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
@ -581,7 +588,8 @@ class Orders extends DolibarrApi
* @throws 404
* @throws 405
*/
function setinvoiced($id) {
function setinvoiced($id)
{
if(! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
@ -706,21 +714,22 @@ class Orders extends DolibarrApi
}
/**
* Create an order using an existing proposal.
*
*
* @param int $proposalid Id of the proposal
*
* @url POST /createfromproposal/{proposalid}
*
* @return int
* @throws 400
* @throws 401
* @throws 404
* @throws 405
*/
function createOrderFromProposal($proposalid) {
/**
* Create an order using an existing proposal.
*
*
* @param int $proposalid Id of the proposal
*
* @url POST /createfromproposal/{proposalid}
*
* @return int
* @throws 400
* @throws 401
* @throws 404
* @throws 405
*/
function createOrderFromProposal($proposalid)
{
require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
@ -756,7 +765,8 @@ class Orders extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

54
htdocs/compta/facture/class/api_invoices.class.php
View File

@ -32,7 +32,7 @@ class Invoices extends DolibarrApi
* @var array $FIELDS Mandatory fields, checked when create and update object
*/
static $FIELDS = array(
'socid'
'socid',
);
/**
@ -104,7 +104,8 @@ class Invoices extends DolibarrApi
*
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids='', $status='', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids='', $status='', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -245,7 +246,8 @@ class Invoices extends DolibarrApi
* @throws 404
* @throws 405
*/
function createInvoiceFromOrder($orderid) {
function createInvoiceFromOrder($orderid)
{
require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
@ -282,7 +284,8 @@ class Invoices extends DolibarrApi
*
* @return int
*/
function getLines($id) {
function getLines($id)
{
if(! DolibarrApiAccess::$user->rights->facture->lire) {
throw new RestException(401);
}
@ -319,7 +322,8 @@ class Invoices extends DolibarrApi
* @throws 401
* @throws 404
*/
function putLine($id, $lineid, $request_data = null) {
function putLine($id, $lineid, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
}
@ -383,7 +387,8 @@ class Invoices extends DolibarrApi
* @throws 404
* @throws 405
*/
function deleteLine($id, $lineid) {
function deleteLine($id, $lineid)
{
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
@ -511,7 +516,8 @@ class Invoices extends DolibarrApi
* @throws 404
* @throws 400
*/
function postLine($id, $request_data = null) {
function postLine($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
}
@ -849,7 +855,8 @@ class Invoices extends DolibarrApi
* @throws 404
* @throws 405
*/
function useDiscount($id, $discountid) {
function useDiscount($id, $discountid)
{
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
@ -894,7 +901,8 @@ class Invoices extends DolibarrApi
* @throws 404
* @throws 405
*/
function useCreditNote($id, $discountid) {
function useCreditNote($id, $discountid)
{
require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
@ -938,7 +946,8 @@ class Invoices extends DolibarrApi
* @throws 404
* @throws 405
*/
function getPayments($id) {
function getPayments($id)
{
if(! DolibarrApiAccess::$user->rights->facture->lire) {
throw new RestException(401);
@ -985,8 +994,9 @@ class Invoices extends DolibarrApi
* @throws 401
* @throws 404
*/
function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='') {
global $conf;
function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='')
{
global $conf;
require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
@ -1215,18 +1225,19 @@ class Invoices extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);
$object = parent::_cleanObjectDatas($object);
unset($object->note);
unset($object->address);
unset($object->barcode_type);
unset($object->barcode_type_code);
unset($object->barcode_type_label);
unset($object->barcode_type_coder);
unset($object->address);
unset($object->barcode_type);
unset($object->barcode_type_code);
unset($object->barcode_type_label);
unset($object->barcode_type_coder);
return $object;
return $object;
}
/**
@ -1241,8 +1252,9 @@ class Invoices extends DolibarrApi
{
$invoice = array();
foreach (Invoices::$FIELDS as $field) {
if (!isset($data[$field]))
if (!isset($data[$field])) {
throw new RestException(400, "$field field missing");
}
$invoice[$field] = $data[$field];
}
return $invoice;

27
htdocs/contrat/class/api_contracts.class.php
View File

@ -100,7 +100,8 @@ class Contracts extends DolibarrApi
*
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -216,7 +217,8 @@ class Contracts extends DolibarrApi
*
* @return int
*/
function getLines($id) {
function getLines($id)
{
if(! DolibarrApiAccess::$user->rights->contrat->lire) {
throw new RestException(401);
}
@ -247,7 +249,8 @@ class Contracts extends DolibarrApi
*
* @return int
*/
function postLine($id, $request_data = null) {
function postLine($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->contrat->creer) {
throw new RestException(401);
}
@ -300,7 +303,8 @@ class Contracts extends DolibarrApi
*
* @return object
*/
function putLine($id, $lineid, $request_data = null) {
function putLine($id, $lineid, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->contrat->creer) {
throw new RestException(401);
}
@ -359,7 +363,8 @@ class Contracts extends DolibarrApi
*
* @return object
*/
function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null) {
function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null)
{
if(! DolibarrApiAccess::$user->rights->contrat->creer) {
throw new RestException(401);
}
@ -396,7 +401,8 @@ class Contracts extends DolibarrApi
*
* @return object
*/
function unactivateLine($id, $lineid, $datestart, $comment = null) {
function unactivateLine($id, $lineid, $datestart, $comment = null)
{
if(! DolibarrApiAccess::$user->rights->contrat->creer) {
throw new RestException(401);
}
@ -436,7 +442,8 @@ class Contracts extends DolibarrApi
* @throws 401
* @throws 404
*/
function deleteLine($id, $lineid) {
function deleteLine($id, $lineid)
{
if(! DolibarrApiAccess::$user->rights->contrat->creer) {
throw new RestException(401);
}
@ -470,7 +477,8 @@ class Contracts extends DolibarrApi
*
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->contrat->creer) {
throw new RestException(401);
}
@ -632,7 +640,8 @@ class Contracts extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

3
htdocs/contrat/class/contrat.class.php
View File

@ -2350,7 +2350,8 @@ class Contrat extends CommonObject
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int New id of clone
*/
function createFromClone($socid = 0, $notrigger=0) {
function createFromClone($socid = 0, $notrigger=0)
{
global $db, $user, $langs, $conf, $hookmanager;
dol_include_once('/projet/class/project.class.php');

3
htdocs/core/class/commonobject.class.php
View File

@ -6873,7 +6873,8 @@ abstract class CommonObject
* @param array $fieldsentry Properties of field
* @return string
*/
protected function quote($value, $fieldsentry) {
protected function quote($value, $fieldsentry)
{
if (is_null($value)) return 'NULL';
else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
else return "'".$this->db->escape($value)."'";

3
htdocs/core/class/utils.class.php
View File

@ -677,7 +677,8 @@ class Utils
*
* @return int 0 if OK, < 0 if KO
*/
function compressSyslogs() {
function compressSyslogs()
{
global $conf;
if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled

3
htdocs/opensurvey/fonctions.php
View File

@ -29,7 +29,8 @@
* @param Opensurveysondage $object Current viewing poll
* @return array Tabs for the opensurvey section
*/
function opensurvey_prepare_head(Opensurveysondage $object) {
function opensurvey_prepare_head(Opensurveysondage $object)
{
global $langs, $conf;

8
htdocs/product/admin/price_rules.php
View File

@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*
* Page to set how to autocalculate price for each level when option
* PRODUCT_MULTIPRICE is on.
*/
@ -145,7 +145,7 @@ for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$price_options[$i] = $langs->trans('SellingPrice').' '.$i;
}
$genPriceOptions = function($level) use ($price_options) {
$genPriceOptions = function ($level) use ($price_options) {
$return = array();
@ -190,14 +190,14 @@ $genPriceOptions = function($level) use ($price_options) {
<?php endfor ?>
</table>
<?php
<?php
dol_fiche_end();
print '<div style="text-align: center">
<input type="submit" value="'.$langs->trans('Save').'" class="button">
</div>';
print '</form>';
llxFooter();

8
htdocs/product/class/api_products.class.php
View File

@ -102,7 +102,8 @@ class Products extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
* @return array Array of product objects
*/
function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $category=0, $sqlfilters = '') {
function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $category=0, $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -340,7 +341,7 @@ class Products extends DolibarrApi
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
}
return $result;
@ -467,7 +468,8 @@ class Products extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

3
htdocs/product/class/html.formproduct.class.php
View File

@ -167,7 +167,8 @@ class FormProduct
* @param String $final_label full label with all parents, separated by ' >> ' (completed on each call)
* @return String full label with all parents, separated by ' >> '
*/
private function get_parent_path($tab, $final_label='') {
private function get_parent_path($tab, $final_label='')
{
if(empty($final_label)) $final_label = $tab['label'];

3
htdocs/product/class/product.class.php
View File

@ -4505,7 +4505,8 @@ class Product extends CommonObject
*
* @param int[]|int $categories Category or categories IDs
*/
public function setCategories($categories) {
public function setCategories($categories)
{
// Handle single category
if (! is_array($categories)) {
$categories = array($categories);

23
htdocs/product/class/productcustomerprice.class.php
View File

@ -54,7 +54,8 @@ class Productcustomerprice extends CommonObject
*
* @param DoliDb $db handler
*/
function __construct($db) {
function __construct($db)
{
$this->db = $db;
return 1;
@ -68,7 +69,8 @@ class Productcustomerprice extends CommonObject
* @param int $forceupdateaffiliate update price on each soc child
* @return int <0 if KO, Id of created object if OK
*/
function create($user, $notrigger = 0, $forceupdateaffiliate = 0) {
function create($user, $notrigger = 0, $forceupdateaffiliate = 0)
{
global $conf, $langs;
$error = 0;
@ -342,7 +344,7 @@ class Productcustomerprice extends CommonObject
$sql .= " AND prod.rowid=t.fk_product ";
$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
$sql .= " AND t.entity IN (" . getEntity('productprice') . ")";
// Manage filter
if (count($filter) > 0) {
foreach ( $filter as $key => $value ) {
@ -522,7 +524,8 @@ class Productcustomerprice extends CommonObject
* @param int $forceupdateaffiliate update price on each soc child
* @return int <0 if KO, >0 if OK
*/
function update($user = 0, $notrigger = 0, $forceupdateaffiliate = 0) {
function update($user = 0, $notrigger = 0, $forceupdateaffiliate = 0)
{
global $conf, $langs;
$error = 0;
@ -719,7 +722,8 @@ class Productcustomerprice extends CommonObject
* @param int $forceupdateaffiliate update price on each soc child
* @return int <0 if KO, >0 if OK
*/
function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate) {
function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate)
{
$error = 0;
@ -811,7 +815,8 @@ class Productcustomerprice extends CommonObject
* @param int $notrigger triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK
*/
function delete($user, $notrigger = 0) {
function delete($user, $notrigger = 0)
{
global $conf, $langs;
$error = 0;
@ -864,7 +869,8 @@ class Productcustomerprice extends CommonObject
* @param int $fromid of object to clone
* @return int id of clone
*/
function createFromClone($fromid) {
function createFromClone($fromid)
{
global $user, $langs;
@ -914,7 +920,8 @@ class Productcustomerprice extends CommonObject
*
* @return void
*/
function initAsSpecimen() {
function initAsSpecimen()
{
$this->id = 0;

7
htdocs/product/class/propalmergepdfproduct.class.php
View File

@ -647,7 +647,8 @@ class PropalmergepdfproductLine
var $tms='';
var $import_key;
function __construct() {
return 1;
}
function __construct()
{
return 1;
}
}

24
htdocs/product/stock/class/api_stockmovements.class.php
View File

@ -93,7 +93,8 @@ class StockMovements extends DolibarrApi
*
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -153,15 +154,15 @@ class StockMovements extends DolibarrApi
return $obj_ret;
}
/*
* @param int $product_id Id product id {@min 1}
* @param int $warehouse_id Id warehouse {@min 1}
* @param float $qty Qty to add (Use negative value for a stock decrease) {@min 0} {@message qty must be higher than 0}
* @param string $lot Lot
* @param string $movementcode Movement code {@example INV123}
* @param string $movementlabel Movement label {@example Inventory number 123}
* @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0).
*/
/*
* @param int $product_id Id product id {@min 1}
* @param int $warehouse_id Id warehouse {@min 1}
* @param float $qty Qty to add (Use negative value for a stock decrease) {@min 0} {@message qty must be higher than 0}
* @param string $lot Lot
* @param string $movementcode Movement code {@example INV123}
* @param string $movementlabel Movement label {@example Inventory number 123}
* @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0).
*/
/**
@ -279,7 +280,8 @@ class StockMovements extends DolibarrApi
* @param MouvementStock $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

6
htdocs/product/stock/class/api_warehouses.class.php
View File

@ -92,7 +92,8 @@ class Warehouses extends DolibarrApi
*
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -248,7 +249,8 @@ class Warehouses extends DolibarrApi
* @param Entrepot $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

5
htdocs/product/stock/class/entrepot.class.php
View File

@ -690,7 +690,8 @@ class Entrepot extends CommonObject
* @param array() $TChildWarehouses array which will contain all children (param by reference)
* @return array() $TChildWarehouses array which will contain all children
*/
function get_children_warehouses($id, &$TChildWarehouses) {
function get_children_warehouses($id, &$TChildWarehouses)
{
$sql = 'SELECT rowid
FROM '.MAIN_DB_PREFIX.'entrepot
@ -707,7 +708,7 @@ class Entrepot extends CommonObject
return $TChildWarehouses;
}
/**
* Create object on disk
*

21
htdocs/projet/class/api_projects.class.php
View File

@ -98,7 +98,8 @@ class Projects extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @return array Array of project objects
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -214,7 +215,8 @@ class Projects extends DolibarrApi
*
* @url GET {id}/tasks
*/
function getLines($id, $includetimespent=0) {
function getLines($id, $includetimespent=0)
{
if(! DolibarrApiAccess::$user->rights->projet->lire) {
throw new RestException(401);
}
@ -256,7 +258,8 @@ class Projects extends DolibarrApi
*
* @return int
*/
function getRoles($id, $userid=0) {
function getRoles($id, $userid=0)
{
global $db;
if(! DolibarrApiAccess::$user->rights->projet->lire) {
@ -300,7 +303,8 @@ class Projects extends DolibarrApi
* @return int
*/
/*
function postLine($id, $request_data = null) {
function postLine($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->projet->creer) {
throw new RestException(401);
}
@ -362,7 +366,8 @@ class Projects extends DolibarrApi
* @return object
*/
/*
function putLine($id, $lineid, $request_data = null) {
function putLine($id, $lineid, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->projet->creer) {
throw new RestException(401);
}
@ -418,7 +423,8 @@ class Projects extends DolibarrApi
*
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->projet->creer) {
throw new RestException(401);
}
@ -535,7 +541,8 @@ class Projects extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

21
htdocs/projet/class/api_tasks.class.php
View File

@ -106,7 +106,8 @@ class Tasks extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @return array Array of project objects
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -221,7 +222,8 @@ class Tasks extends DolibarrApi
* @url GET {id}/tasks
*/
/*
function getLines($id, $includetimespent=0) {
function getLines($id, $includetimespent=0)
{
if(! DolibarrApiAccess::$user->rights->projet->lire) {
throw new RestException(401);
}
@ -263,7 +265,8 @@ class Tasks extends DolibarrApi
*
* @return int
*/
function getRoles($id, $userid=0) {
function getRoles($id, $userid=0)
{
global $db;
if(! DolibarrApiAccess::$user->rights->projet->lire) {
@ -305,7 +308,8 @@ class Tasks extends DolibarrApi
* @return int
*/
/*
function postLine($id, $request_data = null) {
function postLine($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->projet->creer) {
throw new RestException(401);
}
@ -367,7 +371,8 @@ class Tasks extends DolibarrApi
* @return object
*/
/*
function putLine($id, $lineid, $request_data = null) {
function putLine($id, $lineid, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->projet->creer) {
throw new RestException(401);
}
@ -422,7 +427,8 @@ class Tasks extends DolibarrApi
*
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->projet->creer) {
throw new RestException(401);
}
@ -550,7 +556,8 @@ class Tasks extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);

8
htdocs/public/emailing/mailing-read.php
View File

@ -36,13 +36,17 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no
*
* @return void
*/
function llxHeader() { }
function llxHeader()
{
}
/**
* Footer empty
*
* @return void
*/
function llxFooter() { }
function llxFooter()
{
}
require '../../main.inc.php';

8
htdocs/public/emailing/mailing-unsubscribe.php
View File

@ -35,13 +35,17 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no
*
* @return void
*/
function llxHeader() { }
function llxHeader()
{
}
/**
* Footer empty
*
* @return void
*/
function llxFooter() { }
function llxFooter()
{
}
require '../../main.inc.php';

9
htdocs/public/website/index.php
View File

@ -34,13 +34,17 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
*
* @return void
*/
function llxHeader() { }
function llxHeader()
{
}
/**
* Footer empty
*
* @return void
*/
function llxFooter() { }
function llxFooter()
{
}
require '../../master.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@ -204,4 +208,3 @@ print '<!-- Page content '.$original_file.' rendered with DOLIBARR SERVER : Html
include_once $original_file_osencoded; // Note: The pageXXX.tpl.php showed here contains a formatage with dolWebsiteOutput() at end of page.
if (is_object($db)) $db->close();

9
htdocs/public/website/styles.css.php
View File

@ -33,13 +33,17 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
*
* @return void
*/
function llxHeader() { }
function llxHeader()
{
}
/**
* Footer empty
*
* @return void
*/
function llxFooter() { }
function llxFooter()
{
}
require '../../master.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@ -145,4 +149,3 @@ require_once $original_file_osencoded;
if (is_object($db)) $db->close();

25
htdocs/societe/class/api_contacts.class.php
View File

@ -34,7 +34,7 @@ class Contacts extends DolibarrApi
* @var array $FIELDS Mandatory fields, checked when create and update object
*/
static $FIELDS = array(
'lastname'
'lastname',
);
/**
@ -101,8 +101,9 @@ class Contacts extends DolibarrApi
* @return array Array of contact objects
*
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -195,7 +196,8 @@ class Contacts extends DolibarrApi
* @param array $request_data Request datas
* @return int ID of contact
*/
function post($request_data = null) {
function post($request_data = null)
{
if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
{
throw new RestException(401, 'No permission to create/update contacts');
@ -220,7 +222,8 @@ class Contacts extends DolibarrApi
* @param array $request_data Datas
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
{
throw new RestException(401, 'No permission to create/update contacts');
@ -255,7 +258,8 @@ class Contacts extends DolibarrApi
* @param int $id Contact ID
* @return integer
*/
function delete($id) {
function delete($id)
{
if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer)
{
throw new RestException(401, 'No permission to delete contacts');
@ -283,7 +287,8 @@ class Contacts extends DolibarrApi
*
* @url POST {id}/createUser
*/
function createUser($id, $request_data = null) {
function createUser($id, $request_data = null)
{
//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
//throw new RestException(401);
//}
@ -365,7 +370,8 @@ class Contacts extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);
@ -389,7 +395,8 @@ class Contacts extends DolibarrApi
* @return array
* @throws RestException
*/
function _validate($data) {
function _validate($data)
{
$contact = array();
foreach (Contacts::$FIELDS as $field)
{

38
htdocs/supplier_proposal/class/api_supplier_proposals.class.php
View File

@ -94,7 +94,8 @@ class Supplierproposals extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
* @return array Array of order objects
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -190,24 +191,25 @@ class Supplierproposals extends DolibarrApi
}
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);
$object = parent::_cleanObjectDatas($object);
unset($object->name);
unset($object->lastname);
unset($object->firstname);
unset($object->civility_id);
unset($object->address);
unset($object->datec);
unset($object->datev);
unset($object->name);
unset($object->lastname);
unset($object->firstname);
unset($object->civility_id);
unset($object->address);
unset($object->datec);
unset($object->datev);
return $object;
}
return $object;
}
}

11
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1775,7 +1775,8 @@ class SupplierProposal extends CommonObject
* @param User $user Object user
* @return int <0 if KO, >0 if OK
*/
function updatePriceFournisseur($idProductFournPrice, $product, $user) {
function updatePriceFournisseur($idProductFournPrice, $product, $user)
{
$price=price2num($product->subprice*$product->qty,'MU');
$unitPrice = price2num($product->subprice,'MU');
@ -1787,7 +1788,7 @@ class SupplierProposal extends CommonObject
$this->db->rollback();
return -1;
}
}
}
/**
* Create ProductFournisseur
@ -1796,7 +1797,8 @@ class SupplierProposal extends CommonObject
* @param User $user Object user
* @return int <0 if KO, >0 if OK
*/
function createPriceFournisseur($product, $user) {
function createPriceFournisseur($product, $user)
{
$price=price2num($product->subprice*$product->qty,'MU');
$qty=price2num($product->qty);
$unitPrice = price2num($product->subprice,'MU');
@ -1823,7 +1825,7 @@ class SupplierProposal extends CommonObject
$this->db->rollback();
return -1;
}
}
}
/**
* Set draft status
@ -3180,4 +3182,3 @@ class SupplierProposalLine extends CommonObjectLine
}
}

26
htdocs/user/class/api_users.class.php
View File

@ -32,7 +32,7 @@ class Users extends DolibarrApi
* @var array $FIELDS Mandatory fields, checked when create and update object
*/
static $FIELDS = array(
'login'
'login',
);
/**
@ -43,7 +43,8 @@ class Users extends DolibarrApi
/**
* Constructor
*/
function __construct() {
function __construct()
{
global $db, $conf;
$this->db = $db;
$this->useraccount = new User($this->db);
@ -63,7 +64,8 @@ class Users extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @return array Array of User objects
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@ -136,7 +138,8 @@ class Users extends DolibarrApi
*
* @throws RestException
*/
function get($id) {
function get($id)
{
//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
//throw new RestException(401);
//}
@ -162,7 +165,8 @@ class Users extends DolibarrApi
* @param array $request_data New user data
* @return int
*/
function post($request_data = null) {
function post($request_data = null)
{
// check user authorization
//if(! DolibarrApiAccess::$user->rights->user->creer) {
// throw new RestException(401, "User creation not allowed");
@ -194,7 +198,8 @@ class Users extends DolibarrApi
* @param array $request_data Datas
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
//throw new RestException(401);
//}
@ -236,7 +241,8 @@ class Users extends DolibarrApi
*
* @url GET {id}/setGroup/{group}
*/
function setGroup($id, $group, $entity = 1) {
function setGroup($id, $group, $entity = 1)
{
global $conf;
@ -280,7 +286,8 @@ class Users extends DolibarrApi
* @param int $id Account ID
* @return array
*/
function delete($id) {
function delete($id)
{
//if (!DolibarrApiAccess::$user->rights->user->user->supprimer) {
//throw new RestException(401);
//}
@ -363,7 +370,8 @@ class Users extends DolibarrApi
* @return array
* @throws RestException
*/
function _validate($data) {
function _validate($data)
{
$account = array();
foreach (Users::$FIELDS as $field)
{

8
htdocs/viewimage.php
View File

@ -66,13 +66,17 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
*
* @return void
*/
function llxHeader() { }
function llxHeader()
{
}
/**
* Footer empty
*
* @return void
*/
function llxFooter() { }
function llxFooter()
{
}
require 'main.inc.php'; // Load $user and permissions
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

3
test/phpunit/RestAPIUserTest.php
View File

@ -173,7 +173,8 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
$this->assertEquals(1, $object['statut']);
}
public function testRestCreateUser() {
public function testRestCreateUser()
{
// attemp to create without mandatory fields :
$url = $this->api_url.'/users?api_key='.$this->api_key;