assertLessThan($result, 0);
@@ -175,15 +175,15 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
*/
public function testMyObjectDelete($id)
{
- global $conf,$user,$langs,$db;
- $conf=$this->savconf;
- $user=$this->savuser;
- $langs=$this->savlangs;
- $db=$this->savdb;
+ global $conf, $user, $langs, $db;
+ $conf = $this->savconf;
+ $user = $this->savuser;
+ $langs = $this->savlangs;
+ $db = $this->savdb;
- $localobject=new MyObject($this->savdb);
- $result=$localobject->fetch($id);
- $result=$localobject->delete($user);
+ $localobject = new MyObject($this->savdb);
+ $result = $localobject->fetch($id);
+ $result = $localobject->delete($user);
print __METHOD__." id=".$id." result=".$result."\n";
$this->assertLessThan($result, 0);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3c76d25df8b..8fd41228b83 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4238,15 +4238,15 @@ class Product extends CommonObject
if ($mode == 0) {
$sql .= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;
} elseif ($mode == -1) {
- $sql .= " WHERE pa.fk_product_fils = ".$this->id; // We are a child, so we found lines that link to parents (can have several parents)
+ $sql .= " WHERE pa.fk_product_fils = ".$this->id; // We are a child, so we found lines that link to parents (can have several parents)
} elseif ($mode == 1) {
- $sql .= " WHERE pa.fk_product_pere = ".$this->id; // We are a parent, so we found lines that link to children (can have several children)
+ $sql .= " WHERE pa.fk_product_pere = ".$this->id; // We are a parent, so we found lines that link to children (can have several children)
}
$resql = $this->db->query($sql);
if ($resql) {
$obj = $this->db->fetch_object($resql);
- if ($obj) { $nb = $obj->nb; }
+ if ($obj) { $nb = $obj->nb; }
} else {
return -1;
}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index d30c10408f1..4853d04f120 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -610,17 +610,17 @@ if ($id > 0 || $ref)
';
}
- if (!empty($conf->multicurrency->enabled)) {
- // Currency
- print '| '.$langs->trans("Currency").' | ';
- print '';
- $currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
- if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
- print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
- print ' '.$langs->trans("CurrencyRate").' ';
- print '';
- print ' | ';
- print '
';
+ if (!empty($conf->multicurrency->enabled)) {
+ // Currency
+ print '| '.$langs->trans("Currency").' | ';
+ print '';
+ $currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
+ if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
+ print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
+ print ' '.$langs->trans("CurrencyRate").' ';
+ print '';
+ print ' | ';
+ print '
';
// Currency price qty min
print '| '.$langs->trans("PriceQtyMinCurrency").' | ';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 12a6c807515..86b8b62fc81 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -243,7 +243,7 @@ if ($conf->global->PRODUIT_MULTIPRICES) {
//var_dump($arraypricelevel);
// Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
@@ -1283,58 +1283,58 @@ if ($resql)
// Multiprices
if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
- if (! isset($productpricescache)) {
- $productpricescache=array();
- }
- if (! isset($productpricescache[$obj->rowid])) {
- $productpricescache[$obj->rowid] = array();
- }
+ if (! isset($productpricescache)) {
+ $productpricescache=array();
+ }
+ if (! isset($productpricescache[$obj->rowid])) {
+ $productpricescache[$obj->rowid] = array();
+ }
- if ($obj->tosell)
- {
- // Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
- // then reuse the cache array if we need prices for other price levels
- $sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
- $sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
- $sqlp .= " WHERE fk_product = ".$obj->rowid;
- $sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
- $resultp = $db->query($sqlp);
- if ($resultp)
- {
- $nump = $db->num_rows($resultp);
- $j = 0;
- while ($j < $nump)
- {
- $objp = $db->fetch_object($resultp);
+ if ($obj->tosell)
+ {
+ // Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
+ // then reuse the cache array if we need prices for other price levels
+ $sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
+ $sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
+ $sqlp .= " WHERE fk_product = ".$obj->rowid;
+ $sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+ $resultp = $db->query($sqlp);
+ if ($resultp)
+ {
+ $nump = $db->num_rows($resultp);
+ $j = 0;
+ while ($j < $nump)
+ {
+ $objp = $db->fetch_object($resultp);
- if (empty($productpricescache[$obj->rowid][$objp->price_level]))
- {
- $productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price;
- $productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc;
- $productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type;
- }
+ if (empty($productpricescache[$obj->rowid][$objp->price_level]))
+ {
+ $productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price;
+ $productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc;
+ $productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type;
+ }
- $j++;
- }
+ $j++;
+ }
- $db->free($resultp);
- } else {
- dol_print_error($db);
- }
- }
+ $db->free($resultp);
+ } else {
+ dol_print_error($db);
+ }
+ }
foreach ($arraypricelevel as $key => $value)
{
if (!empty($arrayfields['p.sellprice'.$key]['checked']))
{
print '';
- if (! empty($productpricescache[$obj->rowid]))
+ if (!empty($productpricescache[$obj->rowid]))
{
- if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') {
- print price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC");
- } else {
- print price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT");
- }
+ if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') {
+ print price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC");
+ } else {
+ print price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT");
+ }
}
print ' | ';
if (!$i) $totalarray['nbfield']++;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 74d6946d6e4..a4c5de4c47d 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -112,7 +112,7 @@ if (empty($reshook))
// We must define tva_tx, npr and local taxes
$tva_tx = $tva_tx_txt;
- $reg = array();
+ $reg = array();
$vatratecode = '';
if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
{
@@ -330,7 +330,7 @@ if (empty($reshook))
'price' => $newprice,
'price_min' => $newprice_min,
'price_base_type' => $newpricebase,
- 'default_vat_code' => $vatratecode,
+ 'default_vat_code' => $vatratecode,
'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
'npr' => $npr, // default_vat_code should be used in priority in a future
'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2) // default_vat_code should be used in priority in a future
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 38cc5fedd88..535da42eeba 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -102,7 +102,7 @@ if (empty($reshook))
$object->address = (string) GETPOST("address", "alpha");
$object->zip = (string) GETPOST("zipcode", "alpha");
$object->town = (string) GETPOST("town", "alpha");
- $object->country_id = GETPOST("country_id");
+ $object->country_id = GETPOST("country_id");
$object->phone = (string) GETPOST("phone", "alpha");
$object->fax = (string) GETPOST("fax", "alpha");
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 8e13553113a..c97c56b2887 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -159,7 +159,7 @@ class MouvementStock extends CommonObject
dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
// Clean parameters
- $price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value.
+ $price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value.
if (empty($price)) $price = 0;
$now = (!empty($datem) ? $datem : dol_now());
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 76724dfd80f..9e15a580358 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -620,7 +620,7 @@ if ($test) $isavailable[$daytoparse] = array('morning'=>false, 'afternoon'=>fals
$tmparray = dol_getdate($daytoparse, true); // detail of current day
// For monday, must be 0 for monday if MAIN_START_WEEK = 1, must be 1 for monday if MAIN_START_WEEK = 0
-$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK)?0:1));
+$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1));
// numstartworkingday and numendworkingday are default start and end date of working days (1 means sunday if MAIN_START_WEEK is 0, 1 means monday if MAIN_START_WEEK is 1)
$cssweekend = '';
if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) // This is a day is not inside the setup of working days, so we use a week-end css.
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index d1d02db3485..d71ac0852bc 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -922,7 +922,7 @@ class Task extends CommonObject
$tasks[$i]->planned_workload = $obj->planned_workload;
if ($includebilltime) {
- $tasks[$i]->tobill = $obj->tobill;
+ $tasks[$i]->tobill = $obj->tobill;
$tasks[$i]->billed = $obj->billed;
}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 9939d8f0d32..e076bee598d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -963,7 +963,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
print $langs->trans('InvoiceToUse');
print '';
print '';
- $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'), 1, 0, 0, 'maxwidth500', '', 'all');
+ $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'), 1, 0, 0, 'maxwidth500', '', 'all');
print ' | ';
print '
';
/*print '';
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index b52cc3afe84..07e32b64432 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -390,7 +390,7 @@ class Reception extends CommonObject
$this->ref = $obj->ref;
$this->socid = $obj->socid;
$this->ref_supplier = $obj->ref_supplier;
- $this->ref_ext = $obj->ref_ext;
+ $this->ref_ext = $obj->ref_ext;
$this->statut = $obj->fk_statut;
$this->user_author_id = $obj->fk_user_author;
$this->date_creation = $this->db->jdate($obj->date_creation);
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 8c76fdbb28e..9d05674d656 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -247,7 +247,7 @@ if (empty($reshook))
$nuser->personal_mobile = $object->phone;
$nuser->birth = $object->date_birth;
$nuser->salary = $object->remuneration_proposed;
- $nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor
+ $nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor
$result = $nuser->create($user);
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index c942975a91d..1891d9ce822 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -269,20 +269,20 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
$sql .= $hookmanager->resPrint;
/* If a group by is required */
-$sql.= " GROUP BY ";
+$sql .= " GROUP BY ";
foreach ($object->fields as $key => $val)
{
- $sql.='t.'.$key.', ';
+ $sql .= 't.'.$key.', ';
}
// Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
}
// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/', '', $sql);
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index ac26eed537a..49b58d61d08 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -813,14 +813,14 @@ print '';
print '
';
print '';
-print '| ' . $langs->trans("AddEmailPhoneTownInContactList") . ' | ';
+print ''.$langs->trans("AddEmailPhoneTownInContactList").' | ';
print ' | ';
print '';
if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
- print '';
+ print '';
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '';
+ print '';
print img_picto($langs->trans("Disabled"), 'switch_off');
}
print ' | ';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 56e774e7a9b..5a843e9856a 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -214,7 +214,7 @@ $arrayfields = array(
's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
);
// Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 893748deee7..ade660ef1b4 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -257,7 +257,7 @@ if (empty($reshook))
{
if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) {
$object->ref = GETPOST('ref');
- $object->date_livraison = $date_delivery; // deprecated
+ $object->date_livraison = $date_delivery; // deprecated
$object->delivery_date = $date_delivery;
$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
$object->cond_reglement_id = GETPOST('cond_reglement_id');
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 9a6ed7e1d38..b46ed476629 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1240,7 +1240,7 @@ class SupplierProposal extends CommonObject
$this->datev = $this->db->jdate($obj->datev); // TODO deprecated
$this->date_creation = $this->db->jdate($obj->datec); //Creation date
$this->date_validation = $this->db->jdate($obj->datev); //Validation date
- $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated
+ $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated
$this->delivery_date = $this->db->jdate($obj->delivery_date);
$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 9e6f9d2a448..72f25a86ce4 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -64,8 +64,8 @@ if ($action == "getTables")
$rows = array();
while ($row = $db->fetch_array($resql)) {
$invoice = new Facture($db);
- $result=$invoice->fetch('', '(PROV-POS'.$_SESSION['takeposterminal'].'-'.$row['rowid'].')');
- if ($result>0) $row['occupied']="red";
+ $result = $invoice->fetch('', '(PROV-POS'.$_SESSION['takeposterminal'].'-'.$row['rowid'].')');
+ if ($result > 0) $row['occupied'] = "red";
$rows[] = $row;
}
echo json_encode($rows);
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 81da82087ec..f5e40806f5a 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -420,9 +420,9 @@ if ($action == 'creditnote')
}
}
-if ($action == 'history' || $action=='creditnote')
+if ($action == 'history' || $action == 'creditnote')
{
- if ($action=='creditnote') $placeid = $creditnote->id;
+ if ($action == 'creditnote') $placeid = $creditnote->id;
else $placeid = (int) GETPOST('placeid', 'int');
$invoice = new Facture($db);
$invoice->fetch($placeid);
@@ -679,8 +679,8 @@ if ($action == "order" and $placeid != 0)
}
$sql = "SELECT label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
- $resql = $db->query($sql);
- $row = $db->fetch_object($resql);
+ $resql = $db->query($sql);
+ $row = $db->fetch_object($resql);
$headerorder = '
'.$langs->trans('Place').' '.$row->label.'
| '.$langs->trans("Label").' | '.$langs->trans("Qty").' |
|---|
';
$footerorder = '
'.dol_print_date(dol_now(), 'dayhour').'
';
$order_receipt_printer1 = "";
@@ -858,7 +858,7 @@ $(document).ready(function() {
global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true){
+ if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
?>
$.ajax({
type: "POST",
@@ -880,7 +880,7 @@ if ($action == "order" and $order_receipt_printer1 != "") {
}
if ($action == "order" and $order_receipt_printer2 != "") {
- if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true){
+ if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
?>
$.ajax({
type: "POST",
@@ -902,7 +902,7 @@ if ($action == "order" and $order_receipt_printer2 != "") {
}
if ($action == "order" and $order_receipt_printer3 != "") {
- if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true){
+ if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
?>
$.ajax({
type: "POST",
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 5ba67060552..4a0bcbe7b92 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -29,544 +29,544 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
*/
class Tickets extends DolibarrApi
{
- /**
- * @var array $FIELDS Mandatory fields, checked when create and update object
- */
- public static $FIELDS = array(
- 'subject',
- 'message'
- );
+ /**
+ * @var array $FIELDS Mandatory fields, checked when create and update object
+ */
+ public static $FIELDS = array(
+ 'subject',
+ 'message'
+ );
- /**
- * @var array $FIELDS_MESSAGES Mandatory fields, checked when create and update object
- */
- public static $FIELDS_MESSAGES = array(
- 'track_id',
- 'message'
- );
+ /**
+ * @var array $FIELDS_MESSAGES Mandatory fields, checked when create and update object
+ */
+ public static $FIELDS_MESSAGES = array(
+ 'track_id',
+ 'message'
+ );
- /**
- * @var Ticket $ticket {@type Ticket}
- */
- public $ticket;
+ /**
+ * @var Ticket $ticket {@type Ticket}
+ */
+ public $ticket;
- /**
- * Constructor
- */
- public function __construct()
- {
- global $db;
- $this->db = $db;
- $this->ticket = new Ticket($this->db);
- }
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ global $db;
+ $this->db = $db;
+ $this->ticket = new Ticket($this->db);
+ }
- /**
- * Get properties of a Ticket object.
- *
- * Return an array with ticket informations
- *
- * @param int $id ID of ticket
- * @return array|mixed Data without useless information
- *
- * @throws RestException 401
- * @throws RestException 403
- * @throws RestException 404
- */
- public function get($id)
- {
- return $this->getCommon($id, '', '');
- }
+ /**
+ * Get properties of a Ticket object.
+ *
+ * Return an array with ticket informations
+ *
+ * @param int $id ID of ticket
+ * @return array|mixed Data without useless information
+ *
+ * @throws RestException 401
+ * @throws RestException 403
+ * @throws RestException 404
+ */
+ public function get($id)
+ {
+ return $this->getCommon($id, '', '');
+ }
- /**
- * Get properties of a Ticket object from track id
- *
- * Return an array with ticket informations
- *
- * @param string $track_id Tracking ID of ticket
- * @return array|mixed Data without useless information
- *
- * @url GET track_id/{track_id}
- *
- * @throws RestException 401
- * @throws RestException 403
- * @throws RestException 404
- */
- public function getByTrackId($track_id)
- {
- return $this->getCommon(0, $track_id, '');
- }
+ /**
+ * Get properties of a Ticket object from track id
+ *
+ * Return an array with ticket informations
+ *
+ * @param string $track_id Tracking ID of ticket
+ * @return array|mixed Data without useless information
+ *
+ * @url GET track_id/{track_id}
+ *
+ * @throws RestException 401
+ * @throws RestException 403
+ * @throws RestException 404
+ */
+ public function getByTrackId($track_id)
+ {
+ return $this->getCommon(0, $track_id, '');
+ }
- /**
- * Get properties of a Ticket object from ref
- *
- * Return an array with ticket informations
- *
- * @param string $ref Reference for ticket
- * @return array|mixed Data without useless information
- *
- * @url GET ref/{ref}
- *
- * @throws RestException 401
- * @throws RestException 403
- * @throws RestException 404
- */
- public function getByRef($ref)
- {
- try {
- return $this->getCommon(0, '', $ref);
- } catch (Exception $e)
- {
- throw $e;
- }
- }
+ /**
+ * Get properties of a Ticket object from ref
+ *
+ * Return an array with ticket informations
+ *
+ * @param string $ref Reference for ticket
+ * @return array|mixed Data without useless information
+ *
+ * @url GET ref/{ref}
+ *
+ * @throws RestException 401
+ * @throws RestException 403
+ * @throws RestException 404
+ */
+ public function getByRef($ref)
+ {
+ try {
+ return $this->getCommon(0, '', $ref);
+ } catch (Exception $e)
+ {
+ throw $e;
+ }
+ }
- /**
- * Get properties of a Ticket object
- * Return an array with ticket informations
- *
- * @param int $id ID of ticket
- * @param string $track_id Tracking ID of ticket
- * @param string $ref Reference for ticket
- * @return array|mixed Data without useless information
- */
- private function getCommon($id = 0, $track_id = '', $ref = '')
- {
- if (!DolibarrApiAccess::$user->rights->ticket->read) {
- throw new RestException(403);
- }
+ /**
+ * Get properties of a Ticket object
+ * Return an array with ticket informations
+ *
+ * @param int $id ID of ticket
+ * @param string $track_id Tracking ID of ticket
+ * @param string $ref Reference for ticket
+ * @return array|mixed Data without useless information
+ */
+ private function getCommon($id = 0, $track_id = '', $ref = '')
+ {
+ if (!DolibarrApiAccess::$user->rights->ticket->read) {
+ throw new RestException(403);
+ }
- // Check parameters
- if (($id < 0) && !$track_id && !$ref) {
- throw new RestException(401, 'Wrong parameters');
- }
+ // Check parameters
+ if (($id < 0) && !$track_id && !$ref) {
+ throw new RestException(401, 'Wrong parameters');
+ }
if ($id == 0) {
$result = $this->ticket->initAsSpecimen();
} else {
$result = $this->ticket->fetch($id, $ref, $track_id);
}
- if (!$result) {
- throw new RestException(404, 'Ticket not found');
- }
+ if (!$result) {
+ throw new RestException(404, 'Ticket not found');
+ }
- // String for user assigned
- if ($this->ticket->fk_user_assign > 0) {
- $userStatic = new User($this->db);
- $userStatic->fetch($this->ticket->fk_user_assign);
- $this->ticket->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
- }
+ // String for user assigned
+ if ($this->ticket->fk_user_assign > 0) {
+ $userStatic = new User($this->db);
+ $userStatic->fetch($this->ticket->fk_user_assign);
+ $this->ticket->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
+ }
- // Messages of ticket
- $messages = array();
- $this->ticket->loadCacheMsgsTicket();
- if (is_array($this->ticket->cache_msgs_ticket) && count($this->ticket->cache_msgs_ticket) > 0) {
- $num = count($this->ticket->cache_msgs_ticket);
- $i = 0;
- while ($i < $num) {
- if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
- $user_action = new User($this->db);
- $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
- }
+ // Messages of ticket
+ $messages = array();
+ $this->ticket->loadCacheMsgsTicket();
+ if (is_array($this->ticket->cache_msgs_ticket) && count($this->ticket->cache_msgs_ticket) > 0) {
+ $num = count($this->ticket->cache_msgs_ticket);
+ $i = 0;
+ while ($i < $num) {
+ if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
+ $user_action = new User($this->db);
+ $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
+ }
- // Now define messages
- $messages[] = array(
- 'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
- 'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
- 'fk_user_action_socid' => $user_action->socid,
- 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
- 'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
- 'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'],
- 'private' => $this->ticket->cache_msgs_ticket[$i]['private']
- );
- $i++;
- }
- $this->ticket->messages = $messages;
- }
+ // Now define messages
+ $messages[] = array(
+ 'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
+ 'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
+ 'fk_user_action_socid' => $user_action->socid,
+ 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
+ 'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
+ 'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'],
+ 'private' => $this->ticket->cache_msgs_ticket[$i]['private']
+ );
+ $i++;
+ }
+ $this->ticket->messages = $messages;
+ }
- // History
- $history = array();
- $this->ticket->loadCacheLogsTicket();
- if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) {
- $num = count($this->ticket->cache_logs_ticket);
- $i = 0;
- while ($i < $num) {
- if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) {
- $user_action = new User($this->db);
- $user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']);
- }
+ // History
+ $history = array();
+ $this->ticket->loadCacheLogsTicket();
+ if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) {
+ $num = count($this->ticket->cache_logs_ticket);
+ $i = 0;
+ while ($i < $num) {
+ if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) {
+ $user_action = new User($this->db);
+ $user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']);
+ }
- // Now define messages
- $history[] = array(
- 'id' => $this->ticket->cache_logs_ticket[$i]['id'],
- 'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
- 'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
- 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
- 'message' => $this->ticket->cache_logs_ticket[$i]['message'],
- 'datec' => $this->ticket->cache_logs_ticket[$i]['datec'],
- );
- $i++;
- }
- $this->ticket->history = $history;
- }
+ // Now define messages
+ $history[] = array(
+ 'id' => $this->ticket->cache_logs_ticket[$i]['id'],
+ 'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
+ 'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
+ 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
+ 'message' => $this->ticket->cache_logs_ticket[$i]['message'],
+ 'datec' => $this->ticket->cache_logs_ticket[$i]['datec'],
+ );
+ $i++;
+ }
+ $this->ticket->history = $history;
+ }
- if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
- return $this->_cleanObjectDatas($this->ticket);
- }
+ if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+ return $this->_cleanObjectDatas($this->ticket);
+ }
- /**
- * List tickets
- *
- * Get a list of tickets
- *
- * @param int $socid Filter list with thirdparty ID
- * @param string $sortfield Sort field
- * @param string $sortorder Sort order
- * @param int $limit Limit for list
- * @param int $page Page number
- * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
- *
- * @return array Array of ticket objects
- *
- */
- public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '')
- {
- global $db, $conf;
+ /**
+ * List tickets
+ *
+ * Get a list of tickets
+ *
+ * @param int $socid Filter list with thirdparty ID
+ * @param string $sortfield Sort field
+ * @param string $sortorder Sort order
+ * @param int $limit Limit for list
+ * @param int $page Page number
+ * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
+ *
+ * @return array Array of ticket objects
+ *
+ */
+ public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '')
+ {
+ global $db, $conf;
- $obj_ret = array();
+ $obj_ret = array();
- if (!$socid && DolibarrApiAccess::$user->socid) {
- $socid = DolibarrApiAccess::$user->socid;
- }
+ if (!$socid && DolibarrApiAccess::$user->socid) {
+ $socid = DolibarrApiAccess::$user->socid;
+ }
- // If the internal user must only see his customers, force searching by him
- if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
- $search_sale = DolibarrApiAccess::$user->id;
- }
+ // If the internal user must only see his customers, force searching by him
+ if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+ $search_sale = DolibarrApiAccess::$user->id;
+ }
- $sql = "SELECT t.rowid";
- if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
- $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
- }
- $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+ $sql = "SELECT t.rowid";
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+ $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+ }
+ $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
- if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
- $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
- }
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+ $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+ }
- $sql .= ' WHERE t.entity IN ('.getEntity('ticket', 1).')';
- if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
- $sql .= " AND t.fk_soc = sc.fk_soc";
- }
- if ($socid > 0) {
- $sql .= " AND t.fk_soc = ".$socid;
- }
- if ($search_sale > 0) {
- $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
- }
+ $sql .= ' WHERE t.entity IN ('.getEntity('ticket', 1).')';
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+ $sql .= " AND t.fk_soc = sc.fk_soc";
+ }
+ if ($socid > 0) {
+ $sql .= " AND t.fk_soc = ".$socid;
+ }
+ if ($search_sale > 0) {
+ $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+ }
- // Insert sale filter
- if ($search_sale > 0) {
- $sql .= " AND sc.fk_user = ".$search_sale;
- }
- // Add sql filters
- if ($sqlfilters) {
- if (!DolibarrApi::_checkFilters($sqlfilters)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
- }
- $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
- $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
- }
+ // Insert sale filter
+ if ($search_sale > 0) {
+ $sql .= " AND sc.fk_user = ".$search_sale;
+ }
+ // Add sql filters
+ if ($sqlfilters) {
+ if (!DolibarrApi::_checkFilters($sqlfilters)) {
+ throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+ }
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+ $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+ }
- $sql .= $this->db->order($sortfield, $sortorder);
+ $sql .= $this->db->order($sortfield, $sortorder);
- if ($limit) {
- if ($page < 0) {
- $page = 0;
- }
- $offset = $limit * $page;
+ if ($limit) {
+ if ($page < 0) {
+ $page = 0;
+ }
+ $offset = $limit * $page;
- $sql .= $this->db->plimit($limit, $offset);
- }
+ $sql .= $this->db->plimit($limit, $offset);
+ }
- $result = $this->db->query($sql);
- if ($result) {
- $num = $this->db->num_rows($result);
- $i = 0;
- while ($i < $num) {
- $obj = $this->db->fetch_object($result);
- $ticket_static = new Ticket($this->db);
- if ($ticket_static->fetch($obj->rowid)) {
- if ($ticket_static->fk_user_assign > 0) {
- $userStatic = new User($this->db);
- $userStatic->fetch($ticket_static->fk_user_assign);
- $ticket_static->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
- }
- $obj_ret[] = $this->_cleanObjectDatas($ticket_static);
- }
- $i++;
- }
- } else {
- throw new RestException(503, 'Error when retrieve ticket list');
- }
- if (!count($obj_ret)) {
- throw new RestException(404, 'No ticket found');
- }
- return $obj_ret;
- }
+ $result = $this->db->query($sql);
+ if ($result) {
+ $num = $this->db->num_rows($result);
+ $i = 0;
+ while ($i < $num) {
+ $obj = $this->db->fetch_object($result);
+ $ticket_static = new Ticket($this->db);
+ if ($ticket_static->fetch($obj->rowid)) {
+ if ($ticket_static->fk_user_assign > 0) {
+ $userStatic = new User($this->db);
+ $userStatic->fetch($ticket_static->fk_user_assign);
+ $ticket_static->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
+ }
+ $obj_ret[] = $this->_cleanObjectDatas($ticket_static);
+ }
+ $i++;
+ }
+ } else {
+ throw new RestException(503, 'Error when retrieve ticket list');
+ }
+ if (!count($obj_ret)) {
+ throw new RestException(404, 'No ticket found');
+ }
+ return $obj_ret;
+ }
- /**
- * Create ticket object
- *
- * @param array $request_data Request datas
- * @return int ID of ticket
- */
- public function post($request_data = null)
- {
- $ticketstatic = new Ticket($this->db);
- if (!DolibarrApiAccess::$user->rights->ticket->write) {
- throw new RestException(401);
- }
- // Check mandatory fields
- $result = $this->_validate($request_data);
+ /**
+ * Create ticket object
+ *
+ * @param array $request_data Request datas
+ * @return int ID of ticket
+ */
+ public function post($request_data = null)
+ {
+ $ticketstatic = new Ticket($this->db);
+ if (!DolibarrApiAccess::$user->rights->ticket->write) {
+ throw new RestException(401);
+ }
+ // Check mandatory fields
+ $result = $this->_validate($request_data);
- foreach ($request_data as $field => $value) {
- $this->ticket->$field = $value;
- }
- if (empty($this->ticket->ref)) {
- $this->ticket->ref = $ticketstatic->getDefaultRef();
- }
- if (empty($this->ticket->track_id)) {
- $this->ticket->track_id = generate_random_id(16);
- }
+ foreach ($request_data as $field => $value) {
+ $this->ticket->$field = $value;
+ }
+ if (empty($this->ticket->ref)) {
+ $this->ticket->ref = $ticketstatic->getDefaultRef();
+ }
+ if (empty($this->ticket->track_id)) {
+ $this->ticket->track_id = generate_random_id(16);
+ }
- if ($this->ticket->create(DolibarrApiAccess::$user) < 0) {
- throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors));
- }
+ if ($this->ticket->create(DolibarrApiAccess::$user) < 0) {
+ throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors));
+ }
- return $this->ticket->id;
- }
+ return $this->ticket->id;
+ }
- /**
- * Create ticket object
- *
- * @param array $request_data Request datas
- * @return int ID of ticket
- *
- */
- public function postNewMessage($request_data = null)
- {
- $ticketstatic = new Ticket($this->db);
- if (!DolibarrApiAccess::$user->rights->ticket->write) {
- throw new RestException(401);
- }
- // Check mandatory fields
- $result = $this->_validateMessage($request_data);
+ /**
+ * Create ticket object
+ *
+ * @param array $request_data Request datas
+ * @return int ID of ticket
+ *
+ */
+ public function postNewMessage($request_data = null)
+ {
+ $ticketstatic = new Ticket($this->db);
+ if (!DolibarrApiAccess::$user->rights->ticket->write) {
+ throw new RestException(401);
+ }
+ // Check mandatory fields
+ $result = $this->_validateMessage($request_data);
- foreach ($request_data as $field => $value) {
- $this->ticket->$field = $value;
- }
- $ticketMessageText = $this->ticket->message;
- $result = $this->ticket->fetch('', '', $this->ticket->track_id);
- if (!$result) {
- throw new RestException(404, 'Ticket not found');
- }
- $this->ticket->message = $ticketMessageText;
- if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) {
- throw new RestException(500);
- }
- return $this->ticket->id;
- }
+ foreach ($request_data as $field => $value) {
+ $this->ticket->$field = $value;
+ }
+ $ticketMessageText = $this->ticket->message;
+ $result = $this->ticket->fetch('', '', $this->ticket->track_id);
+ if (!$result) {
+ throw new RestException(404, 'Ticket not found');
+ }
+ $this->ticket->message = $ticketMessageText;
+ if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) {
+ throw new RestException(500);
+ }
+ return $this->ticket->id;
+ }
- /**
- * Update ticket
- *
- * @param int $id Id of ticket to update
- * @param array $request_data Datas
- * @return int
- *
- */
- public function put($id, $request_data = null)
- {
- if (!DolibarrApiAccess::$user->rights->ticket->write) {
- throw new RestException(401);
- }
+ /**
+ * Update ticket
+ *
+ * @param int $id Id of ticket to update
+ * @param array $request_data Datas
+ * @return int
+ *
+ */
+ public function put($id, $request_data = null)
+ {
+ if (!DolibarrApiAccess::$user->rights->ticket->write) {
+ throw new RestException(401);
+ }
- $result = $this->ticket->fetch($id);
- if (!$result) {
- throw new RestException(404, 'Ticket not found');
- }
+ $result = $this->ticket->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'Ticket not found');
+ }
- if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
+ if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
- foreach ($request_data as $field => $value) {
- $this->ticket->$field = $value;
- }
+ foreach ($request_data as $field => $value) {
+ $this->ticket->$field = $value;
+ }
- if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
- return $this->get($id);
- }
+ if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
+ return $this->get($id);
+ }
- return false;
- }
+ return false;
+ }
- /**
- * Delete ticket
- *
- * @param int $id Ticket ID
- * @return array
- *
- */
- public function delete($id)
- {
- if (!DolibarrApiAccess::$user->rights->ticket->delete) {
- throw new RestException(401);
- }
- $result = $this->ticket->fetch($id);
- if (!$result) {
- throw new RestException(404, 'Ticket not found');
- }
+ /**
+ * Delete ticket
+ *
+ * @param int $id Ticket ID
+ * @return array
+ *
+ */
+ public function delete($id)
+ {
+ if (!DolibarrApiAccess::$user->rights->ticket->delete) {
+ throw new RestException(401);
+ }
+ $result = $this->ticket->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'Ticket not found');
+ }
- if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
+ if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
- if (!$this->ticket->delete($id)) {
- throw new RestException(500);
- }
+ if (!$this->ticket->delete($id)) {
+ throw new RestException(500);
+ }
- return array(
- 'success' => array(
- 'code' => 200,
- 'message' => 'Ticket deleted'
- )
- );
- }
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Ticket deleted'
+ )
+ );
+ }
- /**
- * Validate fields before create or update object
- *
- * @param array $data Data to validate
- * @return array
- *
- * @throws RestException
- */
- private function _validate($data)
- {
- $ticket = array();
- foreach (Tickets::$FIELDS as $field) {
- if (!isset($data[$field])) {
- throw new RestException(400, "$field field missing");
- }
- $ticket[$field] = $data[$field];
- }
- return $ticket;
- }
+ /**
+ * Validate fields before create or update object
+ *
+ * @param array $data Data to validate
+ * @return array
+ *
+ * @throws RestException
+ */
+ private function _validate($data)
+ {
+ $ticket = array();
+ foreach (Tickets::$FIELDS as $field) {
+ if (!isset($data[$field])) {
+ throw new RestException(400, "$field field missing");
+ }
+ $ticket[$field] = $data[$field];
+ }
+ return $ticket;
+ }
- /**
- * Validate fields before create or update object message
- *
- * @param array $data Data to validate
- * @return array
- *
- * @throws RestException
- */
- private function _validateMessage($data)
- {
- $ticket = array();
- foreach (Tickets::$FIELDS_MESSAGES as $field) {
- if (!isset($data[$field])) {
- throw new RestException(400, "$field field missing");
- }
- $ticket[$field] = $data[$field];
- }
- return $ticket;
- }
+ /**
+ * Validate fields before create or update object message
+ *
+ * @param array $data Data to validate
+ * @return array
+ *
+ * @throws RestException
+ */
+ private function _validateMessage($data)
+ {
+ $ticket = array();
+ foreach (Tickets::$FIELDS_MESSAGES as $field) {
+ if (!isset($data[$field])) {
+ throw new RestException(400, "$field field missing");
+ }
+ $ticket[$field] = $data[$field];
+ }
+ return $ticket;
+ }
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
- /**
- * Clean sensible object datas
- *
- * @param Object $object Object to clean
- * @return Object Object with cleaned properties
- *
- * @todo use an array for properties to clean
- *
- */
- protected function _cleanObjectDatas($object)
- {
- // phpcs:enable
- $object = parent::_cleanObjectDatas($object);
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+ /**
+ * Clean sensible object datas
+ *
+ * @param Object $object Object to clean
+ * @return Object Object with cleaned properties
+ *
+ * @todo use an array for properties to clean
+ *
+ */
+ protected function _cleanObjectDatas($object)
+ {
+ // phpcs:enable
+ $object = parent::_cleanObjectDatas($object);
- // Other attributes to clean
- $attr2clean = array(
- "contact",
- "contact_id",
- "ref_previous",
- "ref_next",
- "ref_ext",
- "table_element_line",
- "statut",
- "country",
- "country_id",
- "country_code",
- "barcode_type",
- "barcode_type_code",
- "barcode_type_label",
- "barcode_type_coder",
- "mode_reglement_id",
- "cond_reglement_id",
- "cond_reglement",
- "fk_delivery_address",
- "shipping_method_id",
- "modelpdf",
- "fk_account",
- "note_public",
- "note_private",
- "note",
- "total_ht",
- "total_tva",
- "total_localtax1",
- "total_localtax2",
- "total_ttc",
- "fk_incoterms",
- "label_incoterms",
- "location_incoterms",
- "name",
- "lastname",
- "firstname",
- "civility_id",
- "canvas",
- "cache_msgs_ticket",
- "cache_logs_ticket",
- "cache_types_tickets",
- "cache_category_tickets",
- "regeximgext",
- "statuts_short",
- "statuts"
- );
- foreach ($attr2clean as $toclean) {
- unset($object->$toclean);
- }
+ // Other attributes to clean
+ $attr2clean = array(
+ "contact",
+ "contact_id",
+ "ref_previous",
+ "ref_next",
+ "ref_ext",
+ "table_element_line",
+ "statut",
+ "country",
+ "country_id",
+ "country_code",
+ "barcode_type",
+ "barcode_type_code",
+ "barcode_type_label",
+ "barcode_type_coder",
+ "mode_reglement_id",
+ "cond_reglement_id",
+ "cond_reglement",
+ "fk_delivery_address",
+ "shipping_method_id",
+ "modelpdf",
+ "fk_account",
+ "note_public",
+ "note_private",
+ "note",
+ "total_ht",
+ "total_tva",
+ "total_localtax1",
+ "total_localtax2",
+ "total_ttc",
+ "fk_incoterms",
+ "label_incoterms",
+ "location_incoterms",
+ "name",
+ "lastname",
+ "firstname",
+ "civility_id",
+ "canvas",
+ "cache_msgs_ticket",
+ "cache_logs_ticket",
+ "cache_types_tickets",
+ "cache_category_tickets",
+ "regeximgext",
+ "statuts_short",
+ "statuts"
+ );
+ foreach ($attr2clean as $toclean) {
+ unset($object->$toclean);
+ }
- // If object has lines, remove $db property
- if (isset($object->lines) && count($object->lines) > 0) {
- $nboflines = count($object->lines);
- for ($i = 0; $i < $nboflines; $i++) {
- $this->_cleanObjectDatas($object->lines[$i]);
- }
- }
+ // If object has lines, remove $db property
+ if (isset($object->lines) && count($object->lines) > 0) {
+ $nboflines = count($object->lines);
+ for ($i = 0; $i < $nboflines; $i++) {
+ $this->_cleanObjectDatas($object->lines[$i]);
+ }
+ }
- // If object has linked objects, remove $db property
- if (isset($object->linkedObjects) && count($object->linkedObjects) > 0) {
- foreach ($object->linkedObjects as $type_object => $linked_object) {
- foreach ($linked_object as $object2clean) {
- $this->_cleanObjectDatas($object2clean);
- }
- }
- }
- return $object;
- }
+ // If object has linked objects, remove $db property
+ if (isset($object->linkedObjects) && count($object->linkedObjects) > 0) {
+ foreach ($object->linkedObjects as $type_object => $linked_object) {
+ foreach ($linked_object as $object2clean) {
+ $this->_cleanObjectDatas($object2clean);
+ }
+ }
+ }
+ return $object;
+ }
}
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index bd28149627f..fc1cca1aa0f 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -112,7 +112,7 @@ foreach ($object->fields as $key => $val)
if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
}
// Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
@@ -316,7 +316,7 @@ if ($socid > 0)
foreach ($search as $key => $val)
{
- if ($key == 'fk_statut' && !empty($search['fk_statut']))
+ if ($key == 'fk_statut' && !empty($search['fk_statut']))
{
$newarrayofstatus = array();
foreach ($search['fk_statut'] as $key2 => $val2) {
@@ -636,9 +636,9 @@ foreach ($object->fields as $key => $val)
$formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
print '';
} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') {
- print '';
- print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150'));
- print ' | ';
+ print '';
+ print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150'));
+ print ' | ';
} elseif ($key == 'fk_statut') {
$arrayofstatus = array();
$arrayofstatus['openall'] = '-- '.$langs->trans('OpenAll').' --';
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index d17507b3b33..126bfd0bac1 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -343,7 +343,7 @@ if ($search_thirdparty != '') $sql .= natural_search(array('s.nom'), $search_thi
if ($search_login != '') $sql .= natural_search("u.login", $search_login);
if ($search_lastname != '') $sql .= natural_search("u.lastname", $search_lastname);
if ($search_firstname != '') $sql .= natural_search("u.firstname", $search_firstname);
-if ($search_gender != '' && $search_gender != '-1') $sql .= " AND u.gender = '".$db->escape($search_gender)."'"; // Cannot use natural_search as looking for %man% also includes woman
+if ($search_gender != '' && $search_gender != '-1') $sql .= " AND u.gender = '".$db->escape($search_gender)."'"; // Cannot use natural_search as looking for %man% also includes woman
if (is_numeric($search_employee) && $search_employee >= 0) {
$sql .= ' AND u.employee = '.(int) $search_employee;
}
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 631de0a5fa8..42b39e7e902 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -882,7 +882,7 @@ class Website extends CommonObject
global $user;
$this->id = 0;
- $this->specimen =1;
+ $this->specimen = 1;
$this->entity = 1;
$this->ref = 'myspecimenwebsite';
$this->description = 'A specimen website';
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index bb3e42f5f05..945a6a69a8f 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -244,7 +244,7 @@ class ZapierApi extends DolibarrApi
$fields = array(
'url',
);
- dol_syslog("API Zapier create hook receive : " . print_r($request_data, true), LOG_DEBUG);
+ dol_syslog("API Zapier create hook receive : ".print_r($request_data, true), LOG_DEBUG);
$result = $this->validate($request_data, $fields);
foreach ($request_data as $field => $value) {
diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index ed10aded257..59c7e5372dd 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -77,12 +77,12 @@ if (!$myfile)
}
$tmp = 1;
-while ($tmp!=null)
+while ($tmp != null)
{
- $groupofemails=array();
- for ($i=0; $i < MAXEMAILS; $i++)
+ $groupofemails = array();
+ for ($i = 0; $i < MAXEMAILS; $i++)
{
- $tmp =fgets($myfile);
+ $tmp = fgets($myfile);
if ($tmp == null)
{
break;
@@ -99,7 +99,7 @@ while ($tmp!=null)
{
// Loop on each record and update the email to null if email into $groupofemails
- $sql=$sql_base."societe as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';";
+ $sql = $sql_base."societe as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';";
$db->query($sql);
}
@@ -107,7 +107,7 @@ while ($tmp!=null)
{
// Loop on each record and update the email to null if email into $groupofemails
- $sql=$sql_base."socpeople as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';";
+ $sql = $sql_base."socpeople as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';";
$db->query($sql);
}
@@ -115,7 +115,7 @@ while ($tmp!=null)
{
// Loop on each record and update the email to null if email into $groupofemails
- $sql=$sql_base."user as u SET u.email = NULL WHERE u.email = '".$db->escape($email)."';";
+ $sql = $sql_base."user as u SET u.email = NULL WHERE u.email = '".$db->escape($email)."';";
$db->query($sql);
}
@@ -123,8 +123,8 @@ while ($tmp!=null)
{
// Loop on each record and update the email to null if email into $groupofemails
- $sql=$sql_base."adherent as a SET a.email = NULL WHERE a.email = '".$db->escape($email)."';";
- $resql=$db->query($sql);
+ $sql = $sql_base."adherent as a SET a.email = NULL WHERE a.email = '".$db->escape($email)."';";
+ $resql = $db->query($sql);
}
echo $email;
}