';
@@ -5034,8 +5060,9 @@ elseif ($id > 0 || !empty($ref))
print '';
// Show object lines
- if (!empty($object->lines))
+ if (!empty($object->lines)) {
$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+ }
// Form to add new line
if ($object->statut == 0 && $usercancreate && $action != 'valid' && $action != 'editline')
@@ -5125,14 +5152,16 @@ elseif ($id > 0 || !empty($ref))
}
// Send by mail
- if (($object->statut == Facture::STATUS_VALIDATED || $object->statut == Facture::STATUS_CLOSED) || !empty($conf->global->FACTURE_SENDBYEMAIL_FOR_ALL_STATUS)) {
- if ($objectidnext) {
- print ''.$langs->trans('SendMail').' ';
- } else {
- if ($usercansend) {
- print ''.$langs->trans('SendMail').' ';
- } else
- print ''.$langs->trans('SendMail').' ';
+ if (empty($user->socid)) {
+ if (($object->statut == Facture::STATUS_VALIDATED || $object->statut == Facture::STATUS_CLOSED) || !empty($conf->global->FACTURE_SENDBYEMAIL_FOR_ALL_STATUS)) {
+ if ($objectidnext) {
+ print ''.$langs->trans('SendMail').' ';
+ } else {
+ if ($usercansend) {
+ print ''.$langs->trans('SendMail').' ';
+ } else
+ print ''.$langs->trans('SendMail').' ';
+ }
}
}
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 961d07eda2e..85da9cd5c37 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -502,8 +502,7 @@ class Invoices extends DolibarrApi
}
$result = $this->invoice->delete_contact($rowid);
-
- if (!$result) {
+ if ($result < 0) {
throw new RestException(500, 'Error when deleted the contact');
}
@@ -591,7 +590,7 @@ class Invoices extends DolibarrApi
}
}
- if($this->invoice->update(DolibarrApiAccess::$user))
+ if ($this->invoice->update(DolibarrApiAccess::$user))
return $this->get($id);
return false;
@@ -600,7 +599,7 @@ class Invoices extends DolibarrApi
/**
* Delete invoice
*
- * @param int $id Invoice ID
+ * @param int $id Invoice ID
* @return array
*/
public function delete($id)
@@ -617,7 +616,8 @@ class Invoices extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- if ($this->invoice->delete($id) < 0)
+ $result = $this->invoice->delete(DolibarrApiAccess::$user);
+ if ($result < 0)
{
throw new RestException(500);
}
@@ -961,11 +961,11 @@ class Invoices extends DolibarrApi
$result = $this->invoice->fetch($id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'Invoice not found');
}
- if (! DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+ if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -987,7 +987,7 @@ class Invoices extends DolibarrApi
*/
public function markAsCreditAvailable($id)
{
- if( ! DolibarrApiAccess::$user->rights->facture->creer) {
+ if (!DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
}
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index e07f631efd4..a64cac0e97c 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -6,7 +6,7 @@
* Copyright (C) 2012 Cedric Salvador
* Copyright (C) 2013 Florian Henry
* Copyright (C) 2015 Marcos García
- * Copyright (C) 2017 Frédéric France
+ * Copyright (C) 2017-2020 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -69,6 +69,11 @@ class FactureRec extends CommonInvoice
*/
public $entity;
+ /**
+ * {@inheritdoc}
+ */
+ protected $table_ref_field = 'titre';
+
public $number;
public $date;
public $remise;
@@ -82,7 +87,14 @@ class FactureRec extends CommonInvoice
public $nb_gen_done;
public $nb_gen_max;
+ /**
+ * @var int Frequency
+ */
public $frequency;
+
+ /**
+ * @var string Unit frequency
+ */
public $unit_frequency;
public $rang;
@@ -120,9 +132,9 @@ class FactureRec extends CommonInvoice
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
+ public $fields = array(
'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
- 'titre' =>array('type'=>'varchar(100)', 'label'=>'Titre', 'enabled'=>1, 'visible'=>-1, 'position'=>15),
+ 'titre' =>array('type'=>'varchar(100)', 'label'=>'Titre', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>15),
'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>20, 'index'=>1),
'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
@@ -330,7 +342,7 @@ class FactureRec extends CommonInvoice
if ($objectline->fetch($result_insert))
{
// Extrafields
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($facsrc->lines[$i], 'fetch_optionals')) {
+ if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->rowid);
$objectline->array_options = $facsrc->lines[$i]->array_options;
}
@@ -426,7 +438,7 @@ class FactureRec extends CommonInvoice
$resql = $this->db->query($sql);
if ($resql)
{
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@@ -463,10 +475,9 @@ class FactureRec extends CommonInvoice
* @param int $rowid Id of object to load
* @param string $ref Reference of recurring invoice
* @param string $ref_ext External reference of invoice
- * @param int $ref_int Internal reference of other object
* @return int >0 if OK, <0 if KO, 0 if not found
*/
- public function fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '')
+ public function fetch($rowid, $ref = '', $ref_ext = '')
{
$sql = 'SELECT f.rowid, f.entity, f.titre as title, f.suspended, f.fk_soc, f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc';
$sql .= ', f.remise_percent, f.remise_absolue, f.remise';
@@ -737,9 +748,13 @@ class FactureRec extends CommonInvoice
$error = 0;
$this->db->begin();
+ $main = MAIN_DB_PREFIX . 'facturedet_rec';
+ $ef = $main . "_extrafields";
+ $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture = $rowid)";
+ dol_syslog($sqlef);
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_rec WHERE fk_facture = ".$rowid;
dol_syslog($sql);
- if ($this->db->query($sql))
+ if ($this->db->query($sqlef) && $this->db->query($sql))
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_rec WHERE rowid = ".$rowid;
dol_syslog($sql);
@@ -748,6 +763,9 @@ class FactureRec extends CommonInvoice
// Delete linked object
$res = $this->deleteObjectLinked();
if ($res < 0) $error = -3;
+ // Delete extrafields
+ $res = $this->deleteExtraFields();
+ if ($res < 0) $error = -4;
}
else
{
@@ -1955,6 +1973,14 @@ class FactureLigneRec extends CommonInvoiceLine
}
}
+ if (!$error)
+ {
+ $result = $this->deleteExtraFields();
+ if ($result < 0) {
+ $error++;
+ }
+ }
+
if (!$error)
{
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
@@ -2101,7 +2127,7 @@ class FactureLigneRec extends CommonInvoiceLine
$resql = $this->db->query($sql);
if ($resql)
{
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 606d84b256b..e3757e15e85 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -302,9 +302,9 @@ class Facture extends CommonInvoice
'situation_cycle_ref' =>array('type'=>'smallint(6)', 'label'=>'Situation cycle ref', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION', 'visible'=>-1, 'position'=>230),
'situation_counter' =>array('type'=>'smallint(6)', 'label'=>'Situation counter', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION', 'visible'=>-1, 'position'=>235),
'situation_final' =>array('type'=>'smallint(6)', 'label'=>'Situation final', 'enabled'=>'empty($conf->global->INVOICE_USE_SITUATION) ? 0 : 1', 'visible'=>-1, 'position'=>240),
- 'retained_warranty' =>array('type'=>'double', 'label'=>'Retained warranty', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>245),
- 'retained_warranty_date_limit' =>array('type'=>'date', 'label'=>'Retained warranty date limit', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>250),
- 'retained_warranty_fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Retained warranty fk cond reglement', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>255),
+ 'retained_warranty' =>array('type'=>'double', 'label'=>'Retained warranty', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>245),
+ 'retained_warranty_date_limit' =>array('type'=>'date', 'label'=>'Retained warranty date limit', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>250),
+ 'retained_warranty_fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Retained warranty fk cond reglement', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>255),
'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>260),
'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLabel', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>265),
'date_pointoftax' =>array('type'=>'date', 'label'=>'DatePointOfTax', 'enabled'=>'$conf->global->INVOICE_POINTOFTAX_DATE', 'visible'=>-1, 'position'=>270),
@@ -813,12 +813,12 @@ class Facture extends CommonInvoice
$vatrate = $line->tva_tx;
if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
- if(!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
- $originid=$line->origin_id;
- $origintype=$line->origin;
+ if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
+ $originid = $line->origin_id;
+ $origintype = $line->origin;
} else {
- $originid=$line->id;
- $origintype=$this->element;
+ $originid = $line->id;
+ $origintype = $this->element;
}
$result = $this->addline(
@@ -1452,9 +1452,10 @@ class Facture extends CommonInvoice
$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
if ($txttoshow)
{
- $notetoshow = $langs->trans("ViewPrivateNote").':';
- $result .= '';
+ $result .= ' ';
$result .= img_picto('', 'note');
$result .= ' ';
//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
@@ -1881,7 +1882,7 @@ class Facture extends CommonInvoice
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
- if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
+ if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@@ -2185,13 +2186,16 @@ class Facture extends CommonInvoice
}
}
-
+ // Invoice line extrafileds
+ $main = MAIN_DB_PREFIX . 'facturedet';
+ $ef = $main . "_extrafields";
+ $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture = $rowid)";
// Delete invoice line
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facturedet WHERE fk_facture = '.$rowid;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
- if ($this->db->query($sql) && $this->delete_linked_contact())
+ if ($this->db->query($sqlef) && $this->db->query($sql) && $this->delete_linked_contact())
{
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE rowid = '.$rowid;
@@ -3733,44 +3737,44 @@ class Facture extends CommonInvoice
}
if (!empty($addon)) {
- dol_syslog("Call getNextNumRef with " . $addonConstName . " = " . $conf->global->FACTURE_ADDON . ", thirdparty=" . $soc->nom . ", type=" . $soc->typent_code, LOG_DEBUG);
+ dol_syslog("Call getNextNumRef with ".$addonConstName." = ".$conf->global->FACTURE_ADDON.", thirdparty=".$soc->nom.", type=".$soc->typent_code, LOG_DEBUG);
$mybool = false;
- $file = $addon . '.php';
+ $file = $addon.'.php';
$classname = $addon;
// Include file with class
$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
foreach ($dirmodels as $reldir) {
- $dir = dol_buildpath($reldir . 'core/modules/' . $moduleName . '/');
+ $dir = dol_buildpath($reldir.'core/modules/'.$moduleName.'/');
// Load file with numbering class (if found)
- if (is_file($dir . $file) && is_readable($dir . $file)) {
- $mybool |= include_once $dir . $file;
+ if (is_file($dir.$file) && is_readable($dir.$file)) {
+ $mybool |= include_once $dir.$file;
}
}
// For compatibility
if (!$mybool) {
- $file = $addon . '/' . $addon . '.modules.php';
- $classname = 'mod_' . $moduleName . '_' . $addon;
+ $file = $addon.'/'.$addon.'.modules.php';
+ $classname = 'mod_'.$moduleName.'_'.$addon;
$classname = preg_replace('/\-.*$/', '', $classname);
// Include file with class
foreach ($conf->file->dol_document_root as $dirroot) {
- $dir = $dirroot . '/core/modules/' . $moduleName . '/';
+ $dir = $dirroot.'/core/modules/'.$moduleName.'/';
// Load file with numbering class (if found)
- if (is_file($dir . $file) && is_readable($dir . $file)) {
- $mybool |= include_once $dir . $file;
+ if (is_file($dir.$file) && is_readable($dir.$file)) {
+ $mybool |= include_once $dir.$file;
}
}
}
if (!$mybool) {
- dol_print_error('', 'Failed to include file ' . $file);
+ dol_print_error('', 'Failed to include file '.$file);
return '';
}
@@ -3789,7 +3793,7 @@ class Facture extends CommonInvoice
return $numref;
} else {
$langs->load('errors');
- print $langs->trans('Error') . ' ' . $langs->trans('ErrorModuleSetupNotComplete', $langs->transnoentitiesnoconv($moduleSourceName));
+ print $langs->trans('Error').' '.$langs->trans('ErrorModuleSetupNotComplete', $langs->transnoentitiesnoconv($moduleSourceName));
return '';
}
}
@@ -4742,6 +4746,43 @@ class Facture extends CommonInvoice
return $hasDelay;
}
+ /**
+ * Currently used for documents generation : to know if retained warranty need to be displayed
+ * @return bool
+ */
+ public function displayRetainedWarranty()
+ {
+ global $conf;
+
+ // TODO : add a flag on invoices to store this conf : INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION
+
+ // note : we dont need to test INVOICE_USE_RETAINED_WARRANTY because if $this->retained_warranty is not empty it's because it was set when this conf was active
+
+ $displayWarranty = false;
+ if (!empty($this->retained_warranty)) {
+ $displayWarranty = true;
+
+ if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION)) {
+ // Check if this situation invoice is 100% for real
+ $displayWarranty = false;
+ if (!empty($this->situation_final)) {
+ $displayWarranty = true;
+ } elseif (!empty($this->lines) && $this->status == Facture::STATUS_DRAFT) {
+ // $object->situation_final need validation to be done so this test is need for draft
+ $displayWarranty = true;
+
+ foreach ($this->lines as $i => $line) {
+ if ($line->product_type < 2 && $line->situation_percent < 100) {
+ $displayWarranty = false;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return $displayWarranty;
+ }
/**
* @param int $rounding Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)
@@ -4757,7 +4798,7 @@ class Facture extends CommonInvoice
$retainedWarrantyAmount = 0;
// Billed - retained warranty
- if ($this->type == Facture::TYPE_SITUATION)
+ if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION))
{
$displayWarranty = true;
// Check if this situation invoice is 100% for real
@@ -4795,7 +4836,10 @@ class Facture extends CommonInvoice
if ($rounding < 0) {
$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
- return round($retainedWarrantyAmount, 2);
+ }
+
+ if ($rounding > 0) {
+ return round($retainedWarrantyAmount, $rounding);
}
return $retainedWarrantyAmount;
@@ -5197,7 +5241,7 @@ class FactureLigne extends CommonInvoiceLine
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
$this->rowid = $this->id; // For backward compatibility
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ if (!$error)
{
$result = $this->insertExtraFields();
if ($result < 0)
@@ -5383,7 +5427,7 @@ class FactureLigne extends CommonInvoiceLine
$resql = $this->db->query($sql);
if ($resql)
{
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ if (!$error)
{
$this->id = $this->rowid;
$result = $this->insertExtraFields();
@@ -5436,6 +5480,13 @@ class FactureLigne extends CommonInvoiceLine
}
// End call triggers
+ // extrafields
+ $result = $this->deleteExtraFields();
+ if ($result < 0)
+ {
+ $this->db->rollback();
+ return -1;
+ }
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".$this->rowid;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -5528,7 +5579,7 @@ class FactureLigne extends CommonInvoiceLine
$sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd';
$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON (f.rowid = fd.fk_facture) ';
$sql .= ' WHERE fd.fk_prev_id ='.$this->fk_prev_id;
- $sql .= ' AND f.situation_cycle_ref = '.$tmpinvoice->situation_cycle_ref; // Prevent cycle outed
+ $sql .= ' AND f.situation_cycle_ref = '.$invoicecache[$invoiceid]->situation_cycle_ref; // Prevent cycle outed
$sql .= ' AND f.type = '.Facture::TYPE_CREDIT_NOTE;
$res = $this->db->query($sql);
@@ -5536,6 +5587,8 @@ class FactureLigne extends CommonInvoiceLine
while ($obj = $this->db->fetch_object($res)) {
$returnPercent = $returnPercent + floatval($obj->situation_percent);
}
+ } else {
+ dol_print_error($this->db);
}
}
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index c8ba0d41725..427daf445c5 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -35,7 +35,7 @@ class PaymentTerm // extends CommonObject
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* @var string[] Error codes (or messages)
@@ -44,7 +44,7 @@ class PaymentTerm // extends CommonObject
//public $element='c_payment_term'; //!< Id that identify managed objects
//public $table_element='c_payment_term'; //!< Name of table without prefix where object is stored
- public $context =array();
+ public $context = array();
/**
* @var int ID
@@ -84,18 +84,18 @@ class PaymentTerm // extends CommonObject
public function create($user, $notrigger = 0)
{
global $conf, $langs;
- $error=0;
+ $error = 0;
// Clean parameters
- if (isset($this->code)) $this->code=trim($this->code);
- if (isset($this->sortorder)) $this->sortorder=trim($this->sortorder);
- if (isset($this->active)) $this->active=trim($this->active);
- if (isset($this->libelle)) $this->libelle=trim($this->libelle);
- if (isset($this->libelle_facture)) $this->libelle_facture=trim($this->libelle_facture);
- if (isset($this->type_cdr)) $this->type_cdr=trim($this->type_cdr);
- if (isset($this->nbjour)) $this->nbjour=trim($this->nbjour);
- if (isset($this->decalage)) $this->decalage=trim($this->decalage);
+ if (isset($this->code)) $this->code = trim($this->code);
+ if (isset($this->sortorder)) $this->sortorder = trim($this->sortorder);
+ if (isset($this->active)) $this->active = trim($this->active);
+ if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+ if (isset($this->libelle_facture)) $this->libelle_facture = trim($this->libelle_facture);
+ if (isset($this->type_cdr)) $this->type_cdr = trim($this->type_cdr);
+ if (isset($this->nbjour)) $this->nbjour = trim($this->nbjour);
+ if (isset($this->decalage)) $this->decalage = trim($this->decalage);
// Check parameters
@@ -103,34 +103,34 @@ class PaymentTerm // extends CommonObject
// Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_payment_term(";
- $sql.= "entity,";
- $sql.= "code,";
- $sql.= "sortorder,";
- $sql.= "active,";
- $sql.= "libelle,";
- $sql.= "libelle_facture,";
- $sql.= "type_cdr,";
- $sql.= "nbjour,";
- $sql.= "decalage";
- $sql.= ") VALUES (";
- $sql.= " ".(! isset($this->entity)?getEntity('c_payment_term'):"'".$this->db->escape($this->entity)."'").",";
- $sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
- $sql.= " ".(! isset($this->sortorder)?'NULL':"'".$this->db->escape($this->sortorder)."'").",";
- $sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'").",";
- $sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
- $sql.= " ".(! isset($this->libelle_facture)?'NULL':"'".$this->db->escape($this->libelle_facture)."'").",";
- $sql.= " ".(! isset($this->type_cdr)?'NULL':"'".$this->db->escape($this->type_cdr)."'").",";
- $sql.= " ".(! isset($this->nbjour)?'NULL':"'".$this->db->escape($this->nbjour)."'").",";
- $sql.= " ".(! isset($this->decalage)?'NULL':"'".$this->db->escape($this->decalage)."'")."";
- $sql.= ")";
+ $sql .= "entity,";
+ $sql .= "code,";
+ $sql .= "sortorder,";
+ $sql .= "active,";
+ $sql .= "libelle,";
+ $sql .= "libelle_facture,";
+ $sql .= "type_cdr,";
+ $sql .= "nbjour,";
+ $sql .= "decalage";
+ $sql .= ") VALUES (";
+ $sql .= " ".(!isset($this->entity) ?getEntity('c_payment_term') : "'".$this->db->escape($this->entity)."'").",";
+ $sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+ $sql .= " ".(!isset($this->sortorder) ? 'NULL' : "'".$this->db->escape($this->sortorder)."'").",";
+ $sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'").",";
+ $sql .= " ".(!isset($this->libelle) ? 'NULL' : "'".$this->db->escape($this->libelle)."'").",";
+ $sql .= " ".(!isset($this->libelle_facture) ? 'NULL' : "'".$this->db->escape($this->libelle_facture)."'").",";
+ $sql .= " ".(!isset($this->type_cdr) ? 'NULL' : "'".$this->db->escape($this->type_cdr)."'").",";
+ $sql .= " ".(!isset($this->nbjour) ? 'NULL' : "'".$this->db->escape($this->nbjour)."'").",";
+ $sql .= " ".(!isset($this->decalage) ? 'NULL' : "'".$this->db->escape($this->decalage)."'")."";
+ $sql .= ")";
$this->db->begin();
dol_syslog(get_class($this)."::create", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ $resql = $this->db->query($sql);
+ if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
- if (! $error)
+ if (!$error)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_payment_term");
}
@@ -138,13 +138,13 @@ class PaymentTerm // extends CommonObject
// Commit or rollback
if ($error)
{
- foreach($this->errors as $errmsg)
+ foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
+ $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
$this->db->rollback();
- return -1*$error;
+ return -1 * $error;
}
else
{
@@ -164,31 +164,31 @@ class PaymentTerm // extends CommonObject
{
global $langs;
$sql = "SELECT";
- $sql.= " t.rowid,";
- $sql.= " t.entity,";
+ $sql .= " t.rowid,";
+ $sql .= " t.entity,";
- $sql.= " t.code,";
- $sql.= " t.sortorder,";
- $sql.= " t.active,";
- $sql.= " t.libelle,";
- $sql.= " t.libelle_facture,";
- $sql.= " t.type_cdr,";
- $sql.= " t.nbjour,";
- $sql.= " t.decalage";
+ $sql .= " t.code,";
+ $sql .= " t.sortorder,";
+ $sql .= " t.active,";
+ $sql .= " t.libelle,";
+ $sql .= " t.libelle_facture,";
+ $sql .= " t.type_cdr,";
+ $sql .= " t.nbjour,";
+ $sql .= " t.decalage";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
- $sql.= " WHERE t.rowid = ".$id;
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+ $sql .= " WHERE t.rowid = ".$id;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
+ $this->id = $obj->rowid;
$this->code = $obj->code;
$this->sortorder = $obj->sortorder;
@@ -205,7 +205,7 @@ class PaymentTerm // extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
}
@@ -220,29 +220,29 @@ class PaymentTerm // extends CommonObject
{
global $langs;
- $ret=0;
+ $ret = 0;
$sql = "SELECT";
- $sql.= " t.rowid";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
- $sql.= " WHERE t.code = 'RECEP'";
- $sql.= " AND t.entity IN (".getEntity('c_payment_term').")";
+ $sql .= " t.rowid";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+ $sql .= " WHERE t.code = 'RECEP'";
+ $sql .= " AND t.entity IN (".getEntity('c_payment_term').")";
dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
{
$obj = $this->db->fetch_object($resql);
- if ($obj) $ret=$obj->rowid;
+ if ($obj) $ret = $obj->rowid;
}
$this->db->free($resql);
return $ret;
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
}
@@ -259,18 +259,18 @@ class PaymentTerm // extends CommonObject
{
global $conf, $langs;
- $error=0;
+ $error = 0;
// Clean parameters
- if (isset($this->code)) $this->code=trim($this->code);
- if (isset($this->sortorder)) $this->sortorder=trim($this->sortorder);
- if (isset($this->active)) $this->active=trim($this->active);
- if (isset($this->libelle)) $this->libelle=trim($this->libelle);
- if (isset($this->libelle_facture)) $this->libelle_facture=trim($this->libelle_facture);
- if (isset($this->type_cdr)) $this->type_cdr=trim($this->type_cdr);
- if (isset($this->nbjour)) $this->nbjour=trim($this->nbjour);
- if (isset($this->decalage)) $this->decalage=trim($this->decalage);
+ if (isset($this->code)) $this->code = trim($this->code);
+ if (isset($this->sortorder)) $this->sortorder = trim($this->sortorder);
+ if (isset($this->active)) $this->active = trim($this->active);
+ if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+ if (isset($this->libelle_facture)) $this->libelle_facture = trim($this->libelle_facture);
+ if (isset($this->type_cdr)) $this->type_cdr = trim($this->type_cdr);
+ if (isset($this->nbjour)) $this->nbjour = trim($this->nbjour);
+ if (isset($this->decalage)) $this->decalage = trim($this->decalage);
@@ -279,32 +279,32 @@ class PaymentTerm // extends CommonObject
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."c_payment_term SET";
- $sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
- $sql.= " sortorder=".(isset($this->sortorder)?$this->sortorder:"null").",";
- $sql.= " active=".(isset($this->active)?$this->active:"null").",";
- $sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
- $sql.= " libelle_facture=".(isset($this->libelle_facture)?"'".$this->db->escape($this->libelle_facture)."'":"null").",";
- $sql.= " type_cdr=".(isset($this->type_cdr)?$this->type_cdr:"null").",";
- $sql.= " nbjour=".(isset($this->nbjour)?$this->nbjour:"null").",";
- $sql.= " decalage=".(isset($this->decalage)?$this->decalage:"null")."";
- $sql.= " WHERE rowid = " . $this->id;
+ $sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+ $sql .= " sortorder=".(isset($this->sortorder) ? $this->sortorder : "null").",";
+ $sql .= " active=".(isset($this->active) ? $this->active : "null").",";
+ $sql .= " libelle=".(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").",";
+ $sql .= " libelle_facture=".(isset($this->libelle_facture) ? "'".$this->db->escape($this->libelle_facture)."'" : "null").",";
+ $sql .= " type_cdr=".(isset($this->type_cdr) ? $this->type_cdr : "null").",";
+ $sql .= " nbjour=".(isset($this->nbjour) ? $this->nbjour : "null").",";
+ $sql .= " decalage=".(isset($this->decalage) ? $this->decalage : "null")."";
+ $sql .= " WHERE rowid = ".$this->id;
$this->db->begin();
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
// Commit or rollback
if ($error)
{
- foreach($this->errors as $errmsg)
+ foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
+ $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
$this->db->rollback();
- return -1*$error;
+ return -1 * $error;
}
else
{
@@ -324,27 +324,27 @@ class PaymentTerm // extends CommonObject
public function delete($user, $notrigger = 0)
{
global $conf, $langs;
- $error=0;
+ $error = 0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_payment_term";
- $sql.= " WHERE rowid = " . $this->id;
+ $sql .= " WHERE rowid = ".$this->id;
$this->db->begin();
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
// Commit or rollback
if ($error)
{
- foreach($this->errors as $errmsg)
+ foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
+ $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
$this->db->rollback();
- return -1*$error;
+ return -1 * $error;
}
else
{
@@ -364,35 +364,35 @@ class PaymentTerm // extends CommonObject
*/
public function createFromClone(User $user, $fromid)
{
- $error=0;
+ $error = 0;
- $object=new PaymentTerm($this->db);
+ $object = new PaymentTerm($this->db);
$this->db->begin();
// Load source object
$object->fetch($fromid);
- $object->id=0;
- $object->statut=0;
+ $object->id = 0;
+ $object->statut = 0;
// Clear fields
// ...
// Create clone
$object->context['createfromclone'] = 'createfromclone';
- $result=$object->create($user);
+ $result = $object->create($user);
// Other options
if ($result < 0)
{
- $this->error=$object->error;
+ $this->error = $object->error;
$error++;
}
unset($object->context['createfromclone']);
// End
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $object->id;
@@ -414,15 +414,15 @@ class PaymentTerm // extends CommonObject
*/
public function initAsSpecimen()
{
- $this->id=0;
+ $this->id = 0;
- $this->code='';
- $this->sortorder='';
- $this->active='';
- $this->libelle='';
- $this->libelle_facture='';
- $this->type_cdr='';
- $this->nbjour='';
- $this->decalage='';
+ $this->code = '';
+ $this->sortorder = '';
+ $this->active = '';
+ $this->libelle = '';
+ $this->libelle_facture = '';
+ $this->type_cdr = '';
+ $this->nbjour = '';
+ $this->decalage = '';
}
}
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index c340d68242e..8eb47268186 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -31,21 +31,21 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (! empty($conf->projet->enabled)) {
- require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
}
// Load translation files required by the page
$langs->loadLangs(array('bills', 'companies'));
-$id = (GETPOST('id')?GETPOST('id', 'int'):GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
$ref = GETPOST('ref', 'alpha');
$lineid = GETPOST('lineid', 'int');
$socid = GETPOST('socid', 'int');
$action = GETPOST('action', 'alpha');
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'facture', $id);
$object = new Facture($db);
@@ -148,51 +148,51 @@ if ($id > 0 || !empty($ref))
// Invoice content
- $linkback = '' . $langs->trans("BackToList") . ' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
- $morehtmlref='';
+ $morehtmlref = '
';
// Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
- $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
+ $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
// Project
- if (! empty($conf->projet->enabled))
+ if (!empty($conf->projet->enabled))
{
$langs->load("projects");
- $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ $morehtmlref .= '
'.$langs->trans('Project').' ';
if ($user->rights->facture->creer)
{
if ($action != 'classify') {
//$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
+ $morehtmlref .= ' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
+ $morehtmlref .= '
';
} else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
}
} else {
- if (! empty($object->fk_project)) {
+ if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref.='
';
- $morehtmlref.=$proj->ref;
- $morehtmlref.=' ';
+ $morehtmlref .= '
';
+ $morehtmlref .= $proj->ref;
+ $morehtmlref .= ' ';
} else {
- $morehtmlref.='';
+ $morehtmlref .= '';
}
}
}
- $morehtmlref.='
';
+ $morehtmlref .= '
'.$langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).' ';
- if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
print '';
print ' ';
}
@@ -941,7 +943,7 @@ if ($resql)
print '';
@@ -1135,7 +1137,7 @@ if ($resql)
$facturestatic->note_public = $obj->note_public;
$facturestatic->note_private = $obj->note_private;
- if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+ if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY)
{
$facturestatic->retained_warranty = $obj->retained_warranty;
$facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
@@ -1441,7 +1443,7 @@ if ($resql)
}
// Author
- if (! empty($arrayfields['u.login']['checked']))
+ if (!empty($arrayfields['u.login']['checked']))
{
$userstatic->id = $obj->fk_user_author;
$userstatic->login = $obj->login;
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 07084a0cf2c..954c48ec0c9 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -29,34 +29,34 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-if (! empty($conf->projet->enabled)) {
- require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
}
// Load translation files required by the page
$langs->loadLangs(array('companies', 'bills'));
-$id=(GETPOST('id', 'int')?GETPOST('id', 'int'):GETPOST('facid', 'int')); // For backward compatibility
-$ref=GETPOST('ref', 'alpha');
-$socid=GETPOST('socid', 'int');
-$action=GETPOST('action', 'alpha');
+$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'alpha');
// Security check
-$socid=0;
-if ($user->socid) $socid=$user->socid;
-$result=restrictedArea($user, 'facture', $id, '');
+$socid = 0;
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'facture', $id, '');
$object = new Facture($db);
$object->fetch($id);
-$permissionnote=$user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
/*
* Actions
*/
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 1fa2749190d..337aea12033 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -41,28 +41,28 @@ if (!$user->rights->facture->lire) accessforbidden();
// Load translation files required by the page
$langs->loadLangs(array('bills', 'banks', 'withdrawals', 'companies'));
-$id=(GETPOST('id', 'int')?GETPOST('id', 'int'):GETPOST('facid', 'int')); // For backward compatibility
-$ref=GETPOST('ref', 'alpha');
-$socid=GETPOST('socid', 'int');
-$action=GETPOST('action', 'alpha');
+$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'alpha');
-$fieldid = (! empty($ref)?'ref':'rowid');
-if ($user->socid) $socid=$user->socid;
+$fieldid = (!empty($ref) ? 'ref' : 'rowid');
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
$object = new Facture($db);
// Load object
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
{
- $ret=$object->fetch($id, $ref);
+ $ret = $object->fetch($id, $ref);
if ($ret > 0)
{
$object->fetch_thirdparty();
}
}
-$hookmanager->initHooks(array('directdebitcard','globalcard'));
+$hookmanager->initHooks(array('directdebitcard', 'globalcard'));
@@ -174,51 +174,51 @@ if ($object->id > 0)
// Invoice content
- $linkback = '' . $langs->trans("BackToList") . ' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
- $morehtmlref='';
+ $morehtmlref = '
';
// Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
- $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+ $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
// Project
- if (! empty($conf->projet->enabled))
+ if (!empty($conf->projet->enabled))
{
$langs->load("projects");
- $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ $morehtmlref .= '
'.$langs->trans('Project').' ';
if ($user->rights->facture->creer)
{
if ($action != 'classify') {
//$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
+ $morehtmlref .= ' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
+ $morehtmlref .= '
';
} else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
}
} else {
- if (! empty($object->fk_project)) {
+ if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref.='
';
- $morehtmlref.=$proj->ref;
- $morehtmlref.=' ';
+ $morehtmlref .= '
';
+ $morehtmlref .= $proj->ref;
+ $morehtmlref .= ' ';
} else {
- $morehtmlref.='';
+ $morehtmlref .= '';
}
}
}
- $morehtmlref.='
';
+ $morehtmlref .= '
';
print ''.$langs->trans("Filter").' '.$langs->trans("ThirdParty").' ';
-if ($mode == 'customer') $filter='s.client in (1,2,3)';
-if ($mode == 'supplier') $filter='s.fournisseur = 1';
+if ($mode == 'customer') $filter = 's.client in (1,2,3)';
+if ($mode == 'supplier') $filter = 's.fournisseur = 1';
print $form->selectarray('socid', $companies, $socid, 1, 0, 0, 'style="width: 95%"', 0, 0, 0, '', '', 1);
print ' '.$langs->trans("Status").' ';
if ($mode == 'customer')
{
- $liststatus=array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
+ $liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
print $form->selectarray('object_status', $liststatus, $object_status, 1);
}
if ($mode == 'supplier')
{
- $liststatus=array('0'=>$langs->trans("BillStatusDraft"),'1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
+ $liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
print $form->selectarray('object_status', $liststatus, $object_status, 1);
}
print ' '.$langs->trans("Year").' ';
-if (! in_array($year, $arrayyears)) $arrayyears[$year]=$year;
-if (! in_array($nowyear, $arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
+if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
arsort($arrayyears);
print $form->selectarray('year', $arrayyears, $year, 0);
print ' '.$langs->trans("AmountAverage").' ';
print '% ';
print '';
-$oldyear=0;
+$oldyear = 0;
foreach ($data as $val)
{
$year = $val['year'];
- while ($year && $oldyear > $year+1)
+ while ($year && $oldyear > $year + 1)
{ // If we have empty year
$oldyear--;
print '';
- print '0?'&userid='.$userid:'').'">'.$oldyear.' 0 ? '&userid='.$userid : '').'">'.$oldyear.' 0 ';
print '0 ';
@@ -307,15 +307,15 @@ foreach ($data as $val)
}
print ' ';
- print '0?'&userid='.$userid:'').'">'.$year.' 0 ? '&userid='.$userid : '').'">'.$year.' '.$val['nb'].' ';
- print ''.round($val['nb_diff']).' ';
+ print ''.round($val['nb_diff']).' ';
print ''.price(price2num($val['total'], 'MT'), 1).' ';
- print ''.round($val['total_diff']).' ';
+ print ''.round($val['total_diff']).' ';
print ''.price(price2num($val['avg'], 'MT'), 1).' ';
- print ''.round($val['avg_diff']).' ';
+ print ''.round($val['avg_diff']).' ';
print ' ';
- $oldyear=$year;
+ $oldyear = $year;
}
print '
';
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index d591c8b45f3..a02a0fc1682 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -18,7 +18,7 @@
*/
// Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
@@ -36,14 +36,14 @@ $langs->load("bills");
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
-$total=0;
-$ilink=0;
-foreach($linkedObjectBlock as $key => $objectlink)
+$total = 0;
+$ilink = 0;
+foreach ($linkedObjectBlock as $key => $objectlink)
{
$ilink++;
- $trclass='oddeven';
- if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+ $trclass = 'oddeven';
+ if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
print ' ';
print '';
switch ($objectlink->type) {
@@ -91,7 +91,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
}
if (count($linkedObjectBlock) > 1)
{
- print ' ';
+ print ' ';
print ''.$langs->trans("Total").' ';
print '
trans("RepeatableInvoice"); ?>
@@ -64,7 +64,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
if (count($linkedObjectBlock) > 1)
{
?>
-
+
trans("Total"); ?>
';
print '
';
print "";
- print ''.$langs->trans("OrdersDeliveredToBill").' '.$num.' ';
+ print ''.$langs->trans("OrdersDeliveredToBill").' '.$num.' ';
if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
print ''.$langs->trans("AmountTTC").' ';
print ''.$langs->trans("ToBill").' ';
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 54a8513fc0c..1459bbf2402 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -37,17 +37,17 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
// Load translation files required by the page
$langs->loadlangs(array('companies', 'other', 'bills', 'compta'));
-$date_startmonth=GETPOST('date_startmonth');
-$date_startday=GETPOST('date_startday');
-$date_startyear=GETPOST('date_startyear');
-$date_endmonth=GETPOST('date_endmonth');
-$date_endday=GETPOST('date_endday');
-$date_endyear=GETPOST('date_endyear');
+$date_startmonth = GETPOST('date_startmonth');
+$date_startday = GETPOST('date_startday');
+$date_startyear = GETPOST('date_startyear');
+$date_endmonth = GETPOST('date_endmonth');
+$date_endday = GETPOST('date_endday');
+$date_endyear = GETPOST('date_endyear');
// Security check
if ($user->socid > 0) $socid = $user->socid;
-if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user, 'compta', '', '', 'resultat');
-if (! empty($conf->accounting->enabled)) $result=restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
+if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
/*
@@ -61,11 +61,11 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user, 'accounti
* View
*/
-$morequery='&date_startyear='.$date_startyear.'&date_startmonth='.$date_startmonth.'&date_startday='.$date_startday.'&date_endyear='.$date_endyear.'&date_endmonth='.$date_endmonth.'&date_endday='.$date_endday;
+$morequery = '&date_startyear='.$date_startyear.'&date_startmonth='.$date_startmonth.'&date_startday='.$date_startday.'&date_endyear='.$date_endyear.'&date_endmonth='.$date_endmonth.'&date_endday='.$date_endday;
llxHeader('', $langs->trans("PurchasesJournal"), '', '', 0, 0, '', '', $morequery);
-$form=new Form($db);
+$form = new Form($db);
$year_current = strftime("%Y", dol_now());
$pastmonth = strftime("%m", dol_now()) - 1;
@@ -76,23 +76,23 @@ if ($pastmonth == 0)
$pastmonthyear--;
}
-$date_start=dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
-$date_end=dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
- $date_start=dol_get_first_day($pastmonthyear, $pastmonth, false);
- $date_end=dol_get_last_day($pastmonthyear, $pastmonth, false);
+ $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+ $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
}
-$name=$langs->trans("PurchasesJournal");
-$periodlink='';
-$exportlink='';
-$builddate=dol_now();
-$description=$langs->trans("DescPurchasesJournal").'".$langs->trans("Type")." ".$langs->trans("Debi
print " \n";
-$invoicestatic=new FactureFournisseur($db);
-$companystatic=new Fournisseur($db);
+$invoicestatic = new FactureFournisseur($db);
+$companystatic = new Fournisseur($db);
foreach ($tabfac as $key => $val)
{
@@ -236,13 +236,13 @@ foreach ($tabfac as $key => $val)
if (isset($line['inv']))
{
- print ''.($mt<0?price(-$mt):'')." ";
- print ''.($mt>=0?price($mt):'')." ";
+ print ''.($mt < 0 ?price(-$mt) : '')." ";
+ print ''.($mt >= 0 ?price($mt) : '')." ";
}
else
{
- print ''.($mt>=0?price($mt):'')." ";
- print ''.($mt<0?price(-$mt):'')." ";
+ print ''.($mt >= 0 ?price($mt) : '')." ";
+ print ''.($mt < 0 ?price(-$mt) : '')." ";
}
print "";
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 859f1372b1d..98bd5e989f7 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -39,17 +39,17 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
// Load translation files required by the page
$langs->loadLangs(array('companies', 'other', 'bills', 'compta'));
-$date_startmonth=GETPOST('date_startmonth');
-$date_startday=GETPOST('date_startday');
-$date_startyear=GETPOST('date_startyear');
-$date_endmonth=GETPOST('date_endmonth');
-$date_endday=GETPOST('date_endday');
-$date_endyear=GETPOST('date_endyear');
+$date_startmonth = GETPOST('date_startmonth');
+$date_startday = GETPOST('date_startday');
+$date_startyear = GETPOST('date_startyear');
+$date_endmonth = GETPOST('date_endmonth');
+$date_endday = GETPOST('date_endday');
+$date_endyear = GETPOST('date_endyear');
// Security check
if ($user->socid > 0) $socid = $user->socid;
-if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user, 'compta', '', '', 'resultat');
-if (! empty($conf->accounting->enabled)) $result=restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
+if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
/*
* Actions
@@ -63,9 +63,9 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user, 'accounti
* View
*/
-$form=new Form($db);
+$form = new Form($db);
-$morequery='&date_startyear='.$date_startyear.'&date_startmonth='.$date_startmonth.'&date_startday='.$date_startday.'&date_endyear='.$date_endyear.'&date_endmonth='.$date_endmonth.'&date_endday='.$date_endday;
+$morequery = '&date_startyear='.$date_startyear.'&date_startmonth='.$date_startmonth.'&date_startday='.$date_startday.'&date_endyear='.$date_endyear.'&date_endmonth='.$date_endmonth.'&date_endday='.$date_endday;
llxHeader('', $langs->trans("SellsJournal"), '', '', 0, 0, '', '', $morequery);
@@ -79,49 +79,49 @@ if ($pastmonth == 0)
$pastmonthyear--;
}
-$date_start=dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
-$date_end=dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
- $date_start=dol_get_first_day($pastmonthyear, $pastmonth, false); $date_end=dol_get_last_day($pastmonthyear, $pastmonth, false);
+ $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false); $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
}
-$name=$langs->trans("SellsJournal");
-$periodlink='';
-$exportlink='';
-$builddate=dol_now();
-$description=$langs->trans("DescSellsJournal").''.$langs->trans('Type').' '.$langs->trans('Debi
print "\n";
-$invoicestatic=new Facture($db);
-$companystatic=new Client($db);
+$invoicestatic = new Facture($db);
+$companystatic = new Client($db);
foreach ($tabfac as $key => $val)
{
- $invoicestatic->id=$key;
- $invoicestatic->ref=$val["ref"];
- $invoicestatic->type=$val["type"];
+ $invoicestatic->id = $key;
+ $invoicestatic->ref = $val["ref"];
+ $invoicestatic->type = $val["type"];
- $companystatic->id=$tabcompany[$key]['id'];
- $companystatic->name=$tabcompany[$key]['name'];
- $companystatic->client=$tabcompany[$key]['client'];
+ $companystatic->id = $tabcompany[$key]['id'];
+ $companystatic->name = $tabcompany[$key]['name'];
+ $companystatic->client = $tabcompany[$key]['client'];
$lines = array(
array(
@@ -266,13 +266,13 @@ foreach ($tabfac as $key => $val)
if (isset($line['inv']))
{
- print ' '.($mt>=0?price($mt):'')." ";
- print ''.($mt<0?price(-$mt):'')." ";
+ print ''.($mt >= 0 ?price($mt) : '')." ";
+ print ''.($mt < 0 ?price(-$mt) : '')." ";
}
else
{
- print ''.($mt<0?price(-$mt):'')." ";
- print ''.($mt>=0?price($mt):'')." ";
+ print ''.($mt < 0 ?price(-$mt) : '')." ";
+ print ''.($mt >= 0 ?price($mt) : '')." ";
}
print "";
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 7d62d8441b7..51275c7159f 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -31,29 +31,29 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
// Load translation files required by the page
$langs->loadLangs(array('compta', 'banks', 'bills'));
-$id=GETPOST("id", 'int');
-$action=GETPOST("action", "alpha");
-$refund=GETPOST("refund", "int");
-if (empty($refund)) $refund=0;
+$id = GETPOST("id", 'int');
+$action = GETPOST("action", "alpha");
+$refund = GETPOST("refund", "int");
+if (empty($refund)) $refund = 0;
-$lttype=GETPOST('localTaxType', 'int');
+$lttype = GETPOST('localTaxType', 'int');
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'tax', '', '', 'charges');
$object = new Localtax($db);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('localtaxvatcard','globalcard'));
+$hookmanager->initHooks(array('localtaxvatcard', 'globalcard'));
/**
* Actions
*/
-if ($_POST["cancel"] == $langs->trans("Cancel") && ! $id)
+if ($_POST["cancel"] == $langs->trans("Cancel") && !$id)
{
header("Location: list.php?localTaxType=".$lttype);
exit;
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 47eb20d5348..6aa7c2b1a87 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -20,7 +20,7 @@
* \ingroup tax
*/
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
/**
@@ -31,17 +31,17 @@ class Localtax extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='localtax';
+ public $element = 'localtax';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='localtax';
+ public $table_element = 'localtax';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
- public $picto='payment';
+ public $picto = 'payment';
public $ltt;
public $tms;
@@ -90,50 +90,50 @@ class Localtax extends CommonObject
{
global $conf, $langs;
- $error=0;
+ $error = 0;
// Clean parameters
- $this->amount=trim($this->amount);
- $this->label=trim($this->label);
- $this->note=trim($this->note);
+ $this->amount = trim($this->amount);
+ $this->label = trim($this->label);
+ $this->note = trim($this->note);
// Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax(";
- $sql.= "localtaxtype,";
- $sql.= "tms,";
- $sql.= "datep,";
- $sql.= "datev,";
- $sql.= "amount,";
- $sql.= "label,";
- $sql.= "note,";
- $sql.= "fk_bank,";
- $sql.= "fk_user_creat,";
- $sql.= "fk_user_modif";
- $sql.= ") VALUES (";
- $sql.= " ".$this->ltt.",";
- $sql.= " '".$this->db->idate($this->tms)."',";
- $sql.= " '".$this->db->idate($this->datep)."',";
- $sql.= " '".$this->db->idate($this->datev)."',";
- $sql.= " '".$this->db->escape($this->amount)."',";
- $sql.= " '".$this->db->escape($this->label)."',";
- $sql.= " '".$this->db->escape($this->note)."',";
- $sql.= " ".($this->fk_bank <= 0 ? "NULL" : (int) $this->fk_bank).",";
- $sql.= " ".((int) $this->fk_user_creat).",";
- $sql.= " ".((int) $this->fk_user_modif);
- $sql.= ")";
+ $sql .= "localtaxtype,";
+ $sql .= "tms,";
+ $sql .= "datep,";
+ $sql .= "datev,";
+ $sql .= "amount,";
+ $sql .= "label,";
+ $sql .= "note,";
+ $sql .= "fk_bank,";
+ $sql .= "fk_user_creat,";
+ $sql .= "fk_user_modif";
+ $sql .= ") VALUES (";
+ $sql .= " ".$this->ltt.",";
+ $sql .= " '".$this->db->idate($this->tms)."',";
+ $sql .= " '".$this->db->idate($this->datep)."',";
+ $sql .= " '".$this->db->idate($this->datev)."',";
+ $sql .= " '".$this->db->escape($this->amount)."',";
+ $sql .= " '".$this->db->escape($this->label)."',";
+ $sql .= " '".$this->db->escape($this->note)."',";
+ $sql .= " ".($this->fk_bank <= 0 ? "NULL" : (int) $this->fk_bank).",";
+ $sql .= " ".((int) $this->fk_user_creat).",";
+ $sql .= " ".((int) $this->fk_user_modif);
+ $sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
// Call trigger
- $result=$this->call_trigger('LOCALTAX_CREATE', $user);
+ $result = $this->call_trigger('LOCALTAX_CREATE', $user);
if ($result < 0) $error++;
// End call triggers
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $this->id;
@@ -146,7 +146,7 @@ class Localtax extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
$this->db->rollback();
return -1;
}
@@ -163,46 +163,46 @@ class Localtax extends CommonObject
{
global $conf, $langs;
- $error=0;
+ $error = 0;
// Clean parameters
- $this->amount=trim($this->amount);
- $this->label=trim($this->label);
- $this->note=trim($this->note);
+ $this->amount = trim($this->amount);
+ $this->label = trim($this->label);
+ $this->note = trim($this->note);
$this->db->begin();
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."localtax SET";
- $sql.= " localtaxtype=".$this->ltt.",";
- $sql.= " tms='".$this->db->idate($this->tms)."',";
- $sql.= " datep='".$this->db->idate($this->datep)."',";
- $sql.= " datev='".$this->db->idate($this->datev)."',";
- $sql.= " amount=".price2num($this->amount).",";
- $sql.= " label='".$this->db->escape($this->label)."',";
- $sql.= " note='".$this->db->escape($this->note)."',";
- $sql.= " fk_bank=".(int) $this->fk_bank.",";
- $sql.= " fk_user_creat=".(int) $this->fk_user_creat.",";
- $sql.= " fk_user_modif=".(int) $this->fk_user_modif;
- $sql.= " WHERE rowid=".$this->id;
+ $sql .= " localtaxtype=".$this->ltt.",";
+ $sql .= " tms='".$this->db->idate($this->tms)."',";
+ $sql .= " datep='".$this->db->idate($this->datep)."',";
+ $sql .= " datev='".$this->db->idate($this->datev)."',";
+ $sql .= " amount=".price2num($this->amount).",";
+ $sql .= " label='".$this->db->escape($this->label)."',";
+ $sql .= " note='".$this->db->escape($this->note)."',";
+ $sql .= " fk_bank=".(int) $this->fk_bank.",";
+ $sql .= " fk_user_creat=".(int) $this->fk_user_creat.",";
+ $sql .= " fk_user_modif=".(int) $this->fk_user_modif;
+ $sql .= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql)
+ if (!$resql)
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
$error++;
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('LOCALTAX_MODIFY', $user);
+ $result = $this->call_trigger('LOCALTAX_MODIFY', $user);
if ($result < 0) $error++;
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 1;
@@ -225,26 +225,26 @@ class Localtax extends CommonObject
{
global $langs;
$sql = "SELECT";
- $sql.= " t.rowid,";
- $sql.= " t.localtaxtype,";
- $sql.= " t.tms,";
- $sql.= " t.datep,";
- $sql.= " t.datev,";
- $sql.= " t.amount,";
- $sql.= " t.label,";
- $sql.= " t.note,";
- $sql.= " t.fk_bank,";
- $sql.= " t.fk_user_creat,";
- $sql.= " t.fk_user_modif,";
- $sql.= " b.fk_account,";
- $sql.= " b.fk_type,";
- $sql.= " b.rappro";
- $sql.= " FROM ".MAIN_DB_PREFIX."localtax as t";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
- $sql.= " WHERE t.rowid = ".$id;
+ $sql .= " t.rowid,";
+ $sql .= " t.localtaxtype,";
+ $sql .= " t.tms,";
+ $sql .= " t.datep,";
+ $sql .= " t.datev,";
+ $sql .= " t.amount,";
+ $sql .= " t.label,";
+ $sql .= " t.note,";
+ $sql .= " t.fk_bank,";
+ $sql .= " t.fk_user_creat,";
+ $sql .= " t.fk_user_modif,";
+ $sql .= " b.fk_account,";
+ $sql .= " b.fk_type,";
+ $sql .= " b.rappro";
+ $sql .= " FROM ".MAIN_DB_PREFIX."localtax as t";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
+ $sql .= " WHERE t.rowid = ".$id;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
@@ -273,7 +273,7 @@ class Localtax extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
}
@@ -288,18 +288,18 @@ class Localtax extends CommonObject
public function delete($user)
{
// Call trigger
- $result=$this->call_trigger('LOCALTAX_DELETE', $user);
+ $result = $this->call_trigger('LOCALTAX_DELETE', $user);
if ($result < 0) return -1;
// End call triggers
$sql = "DELETE FROM ".MAIN_DB_PREFIX."localtax";
- $sql.= " WHERE rowid=".$this->id;
+ $sql .= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql)
+ if (!$resql)
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
@@ -318,18 +318,18 @@ class Localtax extends CommonObject
{
global $user;
- $this->id=0;
+ $this->id = 0;
- $this->tms='';
- $this->ltt=0;
- $this->datep='';
- $this->datev='';
- $this->amount='';
- $this->label='';
- $this->note='';
- $this->fk_bank=0;
- $this->fk_user_creat=$user->id;
- $this->fk_user_modif=$user->id;
+ $this->tms = '';
+ $this->ltt = 0;
+ $this->datep = '';
+ $this->datev = '';
+ $this->amount = '';
+ $this->label = '';
+ $this->note = '';
+ $this->fk_bank = 0;
+ $this->fk_user_creat = $user->id;
+ $this->fk_user_modif = $user->id;
}
@@ -484,61 +484,61 @@ class Localtax extends CommonObject
*/
public function addPayment($user)
{
- global $conf,$langs;
+ global $conf, $langs;
$this->db->begin();
// Check parameters
- $this->amount=price2num($this->amount);
- if (! $this->label)
+ $this->amount = price2num($this->amount);
+ if (!$this->label)
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
return -3;
}
if ($this->amount <= 0)
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
return -4;
}
- if (! empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+ if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
return -5;
}
- if (! empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
+ if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
return -5;
}
// Insertion dans table des paiement localtax
$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
- if ($this->note) $sql.=", note";
- if ($this->label) $sql.=", label";
- $sql.= ", fk_user_creat, fk_bank";
- $sql.= ") ";
- $sql.= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
- $sql.= "'".$this->db->idate($this->datev)."'," . $this->amount;
- if ($this->note) $sql.=", '".$this->db->escape($this->note)."'";
- if ($this->label) $sql.=", '".$this->db->escape($this->label)."'";
- $sql.=", ".((int) $user->id).", NULL";
- $sql.= ")";
+ if ($this->note) $sql .= ", note";
+ if ($this->label) $sql .= ", label";
+ $sql .= ", fk_user_creat, fk_bank";
+ $sql .= ") ";
+ $sql .= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
+ $sql .= "'".$this->db->idate($this->datev)."',".$this->amount;
+ if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+ if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
+ $sql .= ", ".((int) $user->id).", NULL";
+ $sql .= ")";
dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
if ($this->id > 0)
{
- $ok=1;
- if (! empty($conf->banque->enabled))
+ $ok = 1;
+ if (!empty($conf->banque->enabled))
{
// Insertion dans llx_bank
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$acc = new Account($this->db);
- $result=$acc->fetch($this->accountid);
+ $result = $acc->fetch($this->accountid);
if ($result <= 0) dol_print_error($this->db);
$bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
@@ -550,16 +550,16 @@ class Localtax extends CommonObject
}
else
{
- $this->error=$acc->error;
- $ok=0;
+ $this->error = $acc->error;
+ $ok = 0;
}
// Mise a jour liens
- $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
+ $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
if ($result < 0)
{
- $this->error=$acc->error;
- $ok=0;
+ $this->error = $acc->error;
+ $ok = 0;
}
}
@@ -576,14 +576,14 @@ class Localtax extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
$this->db->rollback();
return -2;
}
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
}
@@ -600,7 +600,7 @@ class Localtax extends CommonObject
{
// phpcs:enable
$sql = 'UPDATE '.MAIN_DB_PREFIX.'localtax SET fk_bank = '.$id;
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql .= ' WHERE rowid = '.$this->id;
$result = $this->db->query($sql);
if ($result) {
return 1;
@@ -624,17 +624,17 @@ class Localtax extends CommonObject
{
global $langs;
- $result='';
- $label=$langs->trans("ShowVatPayment").': '.$this->ref;
+ $result = '';
+ $label = $langs->trans("ShowVatPayment").': '.$this->ref;
$link = '';
- $linkend=' ';
+ $linkend = '';
- $picto='payment';
+ $picto = 'payment';
- if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
- if ($withpicto && $withpicto != 2) $result.=' ';
- if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+ if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+ if ($withpicto && $withpicto != 2) $result .= ' ';
+ if ($withpicto != 2) $result .= $link.$this->ref.$linkend;
return $result;
}
@@ -660,7 +660,7 @@ class Localtax extends CommonObject
public function LibStatut($status, $mode = 0)
{
// phpcs:enable
- global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+ global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
return '';
}
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 911eb7e88f3..47a0f44be47 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -48,7 +48,7 @@ if ($user->rights->tax->charges->creer)
$newcardbutton .= dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt);
}
-print load_fiche_titre($langs->transcountry($ltt == 2 ? "LT2Payments" : "LT1Payments", $mysoc->country_code), $newcardbutton, 'invoicing');
+print load_fiche_titre($langs->transcountry($ltt == 2 ? "LT2Payments" : "LT1Payments", $mysoc->country_code), $newcardbutton, 'title_accountancy');
$sql = "SELECT rowid, amount, label, f.datev, f.datep";
$sql .= " FROM ".MAIN_DB_PREFIX."localtax as f ";
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index b4da848ea5a..4a7e387987c 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -357,11 +357,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
// Invoice with Paypal transaction
- // TODO add hook possibility (regis)
- if (!empty($conf->paypalplus->enabled) && $conf->global->PAYPAL_ENABLE_TRANSACTION_MANAGEMENT && !empty($facture->ref_int))
+ // TODO add hook here
+ if (!empty($conf->paypalplus->enabled) && $conf->global->PAYPAL_ENABLE_TRANSACTION_MANAGEMENT && !empty($facture->ref_ext))
{
if (!empty($conf->global->PAYPAL_BANK_ACCOUNT)) $accountid = $conf->global->PAYPAL_BANK_ACCOUNT;
- $paymentnum = $facture->ref_int;
+ $paymentnum = $facture->ref_ext;
}
// Add realtime total information
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 887fe2ec570..29d6f982d59 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -222,7 +222,7 @@ print '';
// Payment type (VIR, LIQ, ...)
$labeltype = $langs->trans("PaymentType".$object->type_code) != ("PaymentType".$object->type_code) ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
print ''.$langs->trans('PaymentMode').' '.$labeltype;
-print $object->num_payment? ' - '.$object->num_payment : '';
+print $object->num_payment ? ' - '.$object->num_payment : '';
print ' '.$langs->trans("ShowCheckReceipt").' ';
- $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id;
if ($option != 'nolink')
{
// Add param to save lastsearch_values or not
- $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
- if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
- if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+ if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
}
- $linkclose='';
+ $linkclose = '';
if (empty($notooltip))
{
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
- $label=$langs->trans("ShowCheckReceipt");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowCheckReceipt");
+ $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
- $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+ $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
}
- else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+ else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
$linkstart = '';
- $linkend=' ';
+ $linkstart .= $linkclose.'>';
+ $linkend = '';
$result .= $linkstart;
- if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
- if ($withpicto != 2) $result.= $this->ref;
+ if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ if ($withpicto != 2) $result .= $this->ref;
$result .= $linkend;
return $result;
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 8d2104303fe..c85553d59a8 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -32,12 +32,12 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->loadLangs(array('banks', 'categories', 'compta', 'bills'));
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'banque', '', '');
-$checkdepositstatic=new RemiseCheque($db);
-$accountstatic=new Account($db);
+$checkdepositstatic = new RemiseCheque($db);
+$accountstatic = new Account($db);
/*
@@ -46,18 +46,18 @@ $accountstatic=new Account($db);
llxHeader('', $langs->trans("ChequesArea"));
-print load_fiche_titre($langs->trans("ChequesArea"), '', 'bank');
+print load_fiche_titre($langs->trans("ChequesArea"), '', 'bank_account');
print '';
$sql = "SELECT count(b.rowid)";
-$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
-$sql.= " WHERE ba.rowid = b.fk_account";
-$sql.= " AND ba.entity IN (".getEntity('bank_account').")";
-$sql.= " AND b.fk_type = 'CHQ'";
-$sql.= " AND b.fk_bordereau = 0";
-$sql.= " AND b.amount > 0";
+$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+$sql .= " WHERE ba.rowid = b.fk_account";
+$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+$sql .= " AND b.fk_type = 'CHQ'";
+$sql .= " AND b.fk_bordereau = 0";
+$sql .= " AND b.amount > 0";
$resql = $db->query($sql);
@@ -67,7 +67,7 @@ print '
'.$langs->trans("BankChecks")." \n";
print "\n";
if ($resql) {
- if ($row = $db->fetch_row($resql) ) {
+ if ($row = $db->fetch_row($resql)) {
$num = $row[0];
}
print '
';
@@ -85,18 +85,18 @@ else
print '';
-$max=10;
+$max = 10;
$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref,";
-$sql.= " bc.statut, bc.nbcheque,";
-$sql.= " ba.ref as bref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";
-$sql.= " aj.code";
-$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal";
-$sql.= " WHERE ba.rowid = bc.fk_bank_account";
-$sql.= " AND bc.entity = ".$conf->entity;
-$sql.= " ORDER BY bc.date_bordereau DESC, rowid DESC";
-$sql.= $db->plimit($max);
+$sql .= " bc.statut, bc.nbcheque,";
+$sql .= " ba.ref as bref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";
+$sql .= " aj.code";
+$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal";
+$sql .= " WHERE ba.rowid = bc.fk_bank_account";
+$sql .= " AND bc.entity = ".$conf->entity;
+$sql .= " ORDER BY bc.date_bordereau DESC, rowid DESC";
+$sql .= $db->plimit($max);
$resql = $db->query($sql);
if ($resql)
@@ -111,20 +111,20 @@ if ($resql)
print '
'.$langs->trans("Status").' ';
print " \n";
- while ( $objp = $db->fetch_object($resql) )
+ while ($objp = $db->fetch_object($resql))
{
- $checkdepositstatic->id=$objp->rowid;
- $checkdepositstatic->ref=($objp->ref?$objp->ref:$objp->rowid);
- $checkdepositstatic->statut=$objp->statut;
+ $checkdepositstatic->id = $objp->rowid;
+ $checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+ $checkdepositstatic->statut = $objp->statut;
- $accountstatic->id=$objp->bid;
- $accountstatic->ref=$objp->bref;
- $accountstatic->label=$objp->label;
- $accountstatic->number=$objp->number;
- $accountstatic->currency_code=$objp->currency_code;
- $accountstatic->account_number=$objp->account_number;
- $accountstatic->accountancy_journal=$objp->code;
- $accountstatic->fk_accountancy_journal=$objp->fk_accountancy_journal;
+ $accountstatic->id = $objp->bid;
+ $accountstatic->ref = $objp->bref;
+ $accountstatic->label = $objp->label;
+ $accountstatic->number = $objp->number;
+ $accountstatic->currency_code = $objp->currency_code;
+ $accountstatic->account_number = $objp->account_number;
+ $accountstatic->accountancy_journal = $objp->code;
+ $accountstatic->fk_accountancy_journal = $objp->fk_accountancy_journal;
print '
'."\n";
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 4534f08dbb1..fe1f7c31050 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -35,14 +35,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$langs->loadLangs(array('banks', 'categories', 'bills'));
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'banque', '', '');
$search_ref = GETPOST('search_ref', 'alpha');
$search_account = GETPOST('search_account', 'int');
$search_amount = GETPOST('search_amount', 'alpha');
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -85,20 +85,20 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
llxHeader('', $langs->trans("ChequesReceipts"));
$sql = "SELECT bc.rowid, bc.ref as ref, bc.date_bordereau as dp,";
-$sql.= " bc.nbcheque, bc.amount, bc.statut,";
-$sql.= " ba.rowid as bid, ba.label";
-$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc,";
-$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
-$sql.= " WHERE bc.fk_bank_account = ba.rowid";
-$sql.= " AND bc.entity = ".$conf->entity;
+$sql .= " bc.nbcheque, bc.amount, bc.statut,";
+$sql .= " ba.rowid as bid, ba.label";
+$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc,";
+$sql .= " ".MAIN_DB_PREFIX."bank_account as ba";
+$sql .= " WHERE bc.fk_bank_account = ba.rowid";
+$sql .= " AND bc.entity = ".$conf->entity;
// Search criteria
-if ($search_ref) $sql.=natural_search("bc.ref", $search_ref);
-if ($search_account > 0) $sql.=" AND bc.fk_bank_account=".$search_account;
-if ($search_amount) $sql.=natural_search("bc.amount", price2num($search_amount));
-$sql.= dolSqlDateFilter('bc.date_bordereau', 0, $month, $year);
+if ($search_ref) $sql .= natural_search("bc.ref", $search_ref);
+if ($search_account > 0) $sql .= " AND bc.fk_bank_account=".$search_account;
+if ($search_amount) $sql .= natural_search("bc.amount", price2num($search_amount));
+$sql .= dolSqlDateFilter('bc.date_bordereau', 0, $month, $year);
-$sql.= $db->order($sortfield, $sortorder);
+$sql .= $db->order($sortfield, $sortorder);
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -120,14 +120,14 @@ if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
- $param='';
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ $param = '';
+ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
- $newcardbutton='';
+ $newcardbutton = '';
if ($user->rights->banque->cheque)
{
- $newcardbutton.= dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new');
+ $newcardbutton .= dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new');
}
print ' \n";
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index 9a0e4b6c5fe..5b66dbec15e 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -109,35 +109,35 @@ class Cpaiement
// Put here code to add control on parameters values
// Insert request
- $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
- $sql.= 'entity,';
- $sql.= 'code,';
- $sql.= 'libelle,';
- $sql.= 'type,';
- $sql.= 'active,';
- $sql.= 'accountancy_code,';
- $sql.= 'module';
+ $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
+ $sql .= 'entity,';
+ $sql .= 'code,';
+ $sql .= 'libelle,';
+ $sql .= 'type,';
+ $sql .= 'active,';
+ $sql .= 'accountancy_code,';
+ $sql .= 'module';
$sql .= ') VALUES (';
- $sql .= ' '.(! isset($this->entity)?getEntity('c_paiement'):$this->entity).',';
- $sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
- $sql .= ' '.(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").',';
- $sql .= ' '.(! isset($this->type)?'NULL':$this->type).',';
- $sql .= ' '.(! isset($this->active)?'NULL':$this->active).',';
- $sql .= ' '.(! isset($this->accountancy_code)?'NULL':"'".$this->db->escape($this->accountancy_code)."'").',';
- $sql .= ' '.(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'");
+ $sql .= ' '.(!isset($this->entity) ?getEntity('c_paiement') : $this->entity).',';
+ $sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
+ $sql .= ' '.(!isset($this->libelle) ? 'NULL' : "'".$this->db->escape($this->libelle)."'").',';
+ $sql .= ' '.(!isset($this->type) ? 'NULL' : $this->type).',';
+ $sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active).',';
+ $sql .= ' '.(!isset($this->accountancy_code) ? 'NULL' : "'".$this->db->escape($this->accountancy_code)."'").',';
+ $sql .= ' '.(!isset($this->module) ? 'NULL' : "'".$this->db->escape($this->module)."'");
$sql .= ')';
$this->db->begin();
$resql = $this->db->query($sql);
if (!$resql) {
- $error ++;
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+ $error++;
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
}
if (!$error) {
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
// Uncomment this and change MYOBJECT to your own tag if you
// want this action to call a trigger.
@@ -154,7 +154,7 @@ class Cpaiement
if ($error) {
$this->db->rollback();
- return - 1 * $error;
+ return -1 * $error;
} else {
$this->db->commit();
@@ -182,12 +182,12 @@ class Cpaiement
$sql .= " t.active,";
$sql .= " t.accountancy_code,";
$sql .= " t.module";
- $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
if (null !== $ref) {
$sql .= ' WHERE t.entity IN ('.getEntity('c_paiement').')';
- $sql .= ' AND t.code = ' . '\'' . $ref . '\'';
+ $sql .= ' AND t.code = '.'\''.$ref.'\'';
} else {
- $sql .= ' WHERE t.id = ' . $id;
+ $sql .= ' WHERE t.id = '.$id;
}
$resql = $this->db->query($sql);
@@ -214,10 +214,10 @@ class Cpaiement
return 0;
}
} else {
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
- return - 1;
+ return -1;
}
}
@@ -265,23 +265,23 @@ class Cpaiement
// Put here code to add a control on parameters values
// Update request
- $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
- $sql .= ' id = '.(isset($this->id)?$this->id:"null").',';
- $sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
- $sql .= ' libelle = '.(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").',';
- $sql .= ' type = '.(isset($this->type)?$this->type:"null").',';
- $sql .= ' active = '.(isset($this->active)?$this->active:"null").',';
- $sql .= ' accountancy_code = '.(isset($this->accountancy_code)?"'".$this->db->escape($this->accountancy_code)."'":"null").',';
- $sql .= ' module = '.(isset($this->module)?"'".$this->db->escape($this->module)."'":"null");
- $sql .= ' WHERE id=' . $this->id;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
+ $sql .= ' id = '.(isset($this->id) ? $this->id : "null").',';
+ $sql .= ' code = '.(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
+ $sql .= ' libelle = '.(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").',';
+ $sql .= ' type = '.(isset($this->type) ? $this->type : "null").',';
+ $sql .= ' active = '.(isset($this->active) ? $this->active : "null").',';
+ $sql .= ' accountancy_code = '.(isset($this->accountancy_code) ? "'".$this->db->escape($this->accountancy_code)."'" : "null").',';
+ $sql .= ' module = '.(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null");
+ $sql .= ' WHERE id='.$this->id;
$this->db->begin();
$resql = $this->db->query($sql);
if (!$resql) {
- $error ++;
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+ $error++;
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
}
// Uncomment this and change MYOBJECT to your own tag if you
@@ -298,7 +298,7 @@ class Cpaiement
if ($error) {
$this->db->rollback();
- return - 1 * $error;
+ return -1 * $error;
} else {
$this->db->commit();
@@ -333,14 +333,14 @@ class Cpaiement
//}
if (!$error) {
- $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
- $sql .= ' WHERE id=' . $this->id;
+ $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' WHERE id='.$this->id;
$resql = $this->db->query($sql);
if (!$resql) {
- $error ++;
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+ $error++;
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
}
}
@@ -348,7 +348,7 @@ class Cpaiement
if ($error) {
$this->db->rollback();
- return - 1 * $error;
+ return -1 * $error;
} else {
$this->db->commit();
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index c78a010777a..87bdaa9641d 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -45,27 +45,27 @@ $optioncss = GETPOST('optioncss', 'alpha');
$facid = GETPOST('facid', 'int');
$socid = GETPOST('socid', 'int');
-$userid = GETPOST('userid', 'int');
-$day = GETPOST('day', 'int');
+$userid = GETPOST('userid', 'int');
+$day = GETPOST('day', 'int');
$month = GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
+$year = GETPOST('year', 'int');
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'facture', $facid, '');
-$paymentstatic=new Paiement($db);
-$accountstatic=new Account($db);
-$companystatic=new Societe($db);
+$paymentstatic = new Paiement($db);
+$accountstatic = new Account($db);
+$companystatic = new Societe($db);
-$search_ref=GETPOST("search_ref", "alpha");
-$search_account=GETPOST("search_account", "int");
-$search_paymenttype=GETPOST("search_paymenttype");
-$search_amount=GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
-$search_company=GETPOST("search_company", 'alpha');
-$search_payment_num=GETPOST('search_payment_num', 'alpha');
+$search_ref = GETPOST("search_ref", "alpha");
+$search_account = GETPOST("search_account", "int");
+$search_paymenttype = GETPOST("search_paymenttype");
+$search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
+$search_company = GETPOST("search_company", 'alpha');
+$search_payment_num = GETPOST('search_payment_num', 'alpha');
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -115,68 +115,68 @@ if (GETPOST("orphelins", "alpha"))
{
// Payments not linked to an invoice. Should not happend. For debug only.
$sql = "SELECT p.rowid, p.ref, p.datep as dp, p.amount,";
- $sql.= " p.statut, p.num_paiement as num_payment,";
- $sql.= " c.code as paiement_code";
+ $sql .= " p.statut, p.num_paiement as num_payment,";
+ $sql .= " c.code as paiement_code";
// Add fields from hooks
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
- $sql.=$hookmanager->resPrint;
- $sql.= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
- $sql.= " WHERE p.entity IN (" . getEntity('invoice').")";
- $sql.= " AND pf.fk_facture IS NULL";
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+ $sql .= $hookmanager->resPrint;
+ $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+ $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+ $sql .= " AND pf.fk_facture IS NULL";
// Add where from hooks
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
- $sql.=$hookmanager->resPrint;
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+ $sql .= $hookmanager->resPrint;
}
else
{
$sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
- $sql.= " p.statut, p.num_paiement as num_payment,";
- $sql.= " c.code as paiement_code,";
- $sql.= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
- $sql.= " s.rowid as socid, s.nom as name, s.email";
+ $sql .= " p.statut, p.num_paiement as num_payment,";
+ $sql .= " c.code as paiement_code,";
+ $sql .= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
+ $sql .= " s.rowid as socid, s.nom as name, s.email";
// Add fields from hooks
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
- $sql.=$hookmanager->resPrint;
- $sql.= " FROM ".MAIN_DB_PREFIX."paiement as p";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+ $sql .= $hookmanager->resPrint;
+ $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
if (!$user->rights->societe->client->voir && !$socid)
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
}
- $sql.= " WHERE p.entity IN (" . getEntity('invoice') . ")";
- if (! $user->rights->societe->client->voir && ! $socid)
+ $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+ if (!$user->rights->societe->client->voir && !$socid)
{
- $sql.= " AND sc.fk_user = " .$user->id;
+ $sql .= " AND sc.fk_user = ".$user->id;
}
- if ($socid > 0) $sql.= " AND f.fk_soc = ".$socid;
+ if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
if ($userid)
{
- if ($userid == -1) $sql.= " AND f.fk_user_author IS NULL";
- else $sql.= " AND f.fk_user_author = ".$userid;
+ if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
+ else $sql .= " AND f.fk_user_author = ".$userid;
}
// Search criteria
- $sql.= dolSqlDateFilter("p.datep", $day, $month, $year);
+ $sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
- if ($search_account > 0) $sql .=" AND b.fk_account=".$search_account;
- if ($search_paymenttype != "") $sql .=" AND c.code='".$db->escape($search_paymenttype)."'";
+ if ($search_account > 0) $sql .= " AND b.fk_account=".$search_account;
+ if ($search_paymenttype != "") $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
if ($search_payment_num != '') $sql .= natural_search('p.num_paiement', $search_payment_num);
if ($search_amount) $sql .= natural_search('p.amount', $search_amount, 1);
if ($search_company) $sql .= natural_search('s.nom', $search_company);
// Add where from hooks
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
- $sql.=$hookmanager->resPrint;
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+ $sql .= $hookmanager->resPrint;
}
-$sql.= $db->order($sortfield, $sortorder);
+$sql .= $db->order($sortfield, $sortorder);
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -215,10 +215,9 @@ if ($resql)
print '
';
print '
';
print '
';
- print '
';
- print '
';
+ print '
';
- print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit);
+ print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit, 0, 0, 1);
print '
';
print '
'."\n";
@@ -252,10 +251,10 @@ if ($resql)
print '';
- $searchpicto=$form->showFilterAndCheckAddButtons(0);
+ $searchpicto = $form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
- if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+ if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{
print '';
print ' ';
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 0cbd34fb069..2fb87440d78 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -29,11 +29,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
// Security check
-if (! $user->rights->facture->lire) accessforbidden();
+if (!$user->rights->facture->lire) accessforbidden();
-$action=GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
-$socid=0;
+$socid = 0;
if ($user->socid > 0)
{
$action = '';
@@ -41,10 +41,10 @@ if ($user->socid > 0)
}
$dir = $conf->facture->dir_output.'/payments';
-if (! $user->rights->societe->client->voir || $socid) $dir.='/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
+if (!$user->rights->societe->client->voir || $socid) $dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
$year = GETPOST('year', 'int');
-if (! $year) { $year=date("Y"); }
+if (!$year) { $year = date("Y"); }
/*
@@ -64,14 +64,14 @@ if ($action == 'builddoc')
// We save charset_output to restore it because write_file can change it if needed for
// output format that does not support UTF8.
- $sav_charset_output=$outputlangs->charset_output;
+ $sav_charset_output = $outputlangs->charset_output;
if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
{
- $outputlangs->charset_output=$sav_charset_output;
+ $outputlangs->charset_output = $sav_charset_output;
}
else
{
- $outputlangs->charset_output=$sav_charset_output;
+ $outputlangs->charset_output = $sav_charset_output;
dol_print_error($db, $obj->error);
}
@@ -83,19 +83,19 @@ if ($action == 'builddoc')
* View
*/
-$formother=new FormOther($db);
+$formother = new FormOther($db);
llxHeader();
-$titre=($year?$langs->trans("PaymentsReportsForYear", $year):$langs->trans("PaymentsReports"));
+$titre = ($year ? $langs->trans("PaymentsReportsForYear", $year) : $langs->trans("PaymentsReports"));
print load_fiche_titre($titre, '', 'invoicing');
// Formulaire de generation
print ''."\n";
$boxcontent .= ''."\n";
- if (! empty($conf->use_javascript_ajax)) {
+ if (!empty($conf->use_javascript_ajax)) {
$boxcontent .= '';
- }
+ }
- // Contact and type
- print ''.$langs->trans("Contact").' ';
- // If no socid, set to -1 to avoid full contacts list
- $selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1;
- $nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
- print ' ';
- $formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly');
- print ' '.$langs->trans("Contact").' ';
+ // If no socid, set to -1 to avoid full contacts list
+ $selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1;
+ $nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
+ print ' ';
+ $formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly');
+ print ' '.$langs->trans("TicketNotifyTiersAtCreation").' ';
- print ' '.$langs->trans("TicketNotifyTiersAtCreation").' ';
+ print ' '.$langs->trans("Project").' ';
- print $formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1);
- print ' '.$langs->trans("Project").' ';
+ print $formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+ print ' ';
- $out .= ''.$langs->trans("MailFile").' ';
- $out .= '';
- // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
- $out .= '';
- $out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
- if (!$this->withfilereadonly) {
- $out .= '
';
- }
- } else {
- $out .= $langs->trans("NoAttachedFiles").' \n";
+ $out = '';
+ $out .= ''.$langs->trans("MailFile").' ';
+ $out .= '';
+ // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+ $out .= '';
+ $out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
+ if (!$this->withfilereadonly) {
+ $out .= '
';
+ }
+ } else {
+ $out .= $langs->trans("NoAttachedFiles").' \n";
- print $out;
- }
+ print $out;
+ }
- // Other attributes
- $parameters = array();
- $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $this->action); // Note that $action and $object may have been modified by hook
- if (empty($reshook))
- {
- print $ticketstat->showOptionals($extrafields, 'create');
- }
+ // Other attributes
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $this->action); // Note that $action and $object may have been modified by hook
+ if (empty($reshook))
+ {
+ print $ticketstat->showOptionals($extrafields, 'create');
+ }
- print '
';
+ print '
';
- if ($withdolfichehead) dol_fiche_end();
+ if ($withdolfichehead) dol_fiche_end();
print '
';
- print '
';
- print "\n";
- print "\n";
- }
-
- /**
- * Return html list of tickets type
- *
- * @param string $selected Id du type pre-selectionne
- * @param string $htmlname Nom de la zone select
- * @param string $filtertype To filter on field type in llx_c_ticket_type (array('code'=>xx,'label'=>zz))
- * @param int $format 0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
- * @param int $empty 1=peut etre vide, 0 sinon
- * @param int $noadmininfo 0=Add admin info, 1=Disable admin info
- * @param int $maxlength Max length of label
- * @param string $morecss More CSS
- * @return void
- */
- public function selectTypesTickets($selected = '', $htmlname = 'tickettype', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
- {
- global $langs, $user;
-
- $ticketstat = new Ticket($this->db);
-
- dol_syslog(get_class($this)."::select_types_tickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
-
- $filterarray = array();
-
- if ($filtertype != '' && $filtertype != '-1') {
- $filterarray = explode(',', $filtertype);
- }
-
- $ticketstat->loadCacheTypesTickets();
-
- print '
';
- if ($empty) {
- print ' ';
- }
-
- if (is_array($ticketstat->cache_types_tickets) && count($ticketstat->cache_types_tickets)) {
- foreach ($ticketstat->cache_types_tickets as $id => $arraytypes) {
- // On passe si on a demande de filtrer sur des modes de paiments particuliers
- if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) {
- continue;
- }
-
- // We discard empty line if showempty is on because an empty line has already been output.
- if ($empty && empty($arraytypes['code'])) {
- continue;
- }
-
- if ($format == 0) {
- print '';
- $value = ' ';
- if ($format == 0) {
- $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
- } elseif ($format == 1) {
- $value = $arraytypes['code'];
- } elseif ($format == 2) {
- $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
- } elseif ($format == 3) {
- $value = $arraytypes['code'];
- }
-
- print $value;
- print ' ';
- }
- }
- print ' ';
- if ($user->admin && !$noadmininfo) {
- print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
- }
-
- print ajax_combobox('select'.$htmlname);
- }
-
- /**
- * Return html list of ticket anaytic codes
- *
- * @param string $selected Id categorie pre-selectionnée
- * @param string $htmlname Nom de la zone select
- * @param string $filtertype To filter on field type in llx_c_ticket_category (array('code'=>xx,'label'=>zz))
- * @param int $format 0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
- * @param int $empty 1=peut etre vide, 0 sinon
- * @param int $noadmininfo 0=Add admin info, 1=Disable admin info
- * @param int $maxlength Max length of label
- * @param string $morecss More CSS
- * @return void
- */
- public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
- {
- global $langs, $user;
-
- $ticketstat = new Ticket($this->db);
-
- dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
-
- $filterarray = array();
-
- if ($filtertype != '' && $filtertype != '-1') {
- $filterarray = explode(',', $filtertype);
- }
-
- $ticketstat->loadCacheCategoriesTickets();
-
- print '
';
- if ($empty) {
- print ' ';
- }
-
- if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {
- foreach ($ticketstat->cache_category_tickets as $id => $arraycategories) {
- // On passe si on a demande de filtrer sur des modes de paiments particuliers
- if (count($filterarray) && !in_array($arraycategories['type'], $filterarray)) {
- continue;
- }
-
- // We discard empty line if showempty is on because an empty line has already been output.
- if ($empty && empty($arraycategories['code'])) {
- continue;
- }
-
- if ($format == 0) {
- print '';
-
- if ($format == 0) {
- $value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);
- }
-
- if ($format == 1) {
- $value = $arraycategories['code'];
- }
-
- if ($format == 2) {
- $value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);
- }
-
- if ($format == 3) {
- $value = $arraycategories['code'];
- }
-
- print $value ? $value : ' ';
- print ' ';
- }
- }
- print ' ';
- if ($user->admin && !$noadmininfo) {
- print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
- }
-
- print ajax_combobox('select'.$htmlname);
- }
-
- /**
- * Return html list of ticket severitys
- *
- * @param string $selected Id severity pre-selectionnée
- * @param string $htmlname Nom de la zone select
- * @param string $filtertype To filter on field type in llx_c_ticket_severity (array('code'=>xx,'label'=>zz))
- * @param int $format 0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
- * @param int $empty 1=peut etre vide, 0 sinon
- * @param int $noadmininfo 0=Add admin info, 1=Disable admin info
- * @param int $maxlength Max length of label
- * @param string $morecss More CSS
- * @return void
- */
- public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketseverity', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
- {
- global $langs, $user;
-
- $ticketstat = new Ticket($this->db);
-
- dol_syslog(get_class($this)."::selectSeveritiesTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
-
- $filterarray = array();
-
- if ($filtertype != '' && $filtertype != '-1') {
- $filterarray = explode(',', $filtertype);
- }
-
- $ticketstat->loadCacheSeveritiesTickets();
-
- print '
';
- if ($empty) {
- print ' ';
- }
-
- if (is_array($ticketstat->cache_severity_tickets) && count($ticketstat->cache_severity_tickets)) {
- foreach ($ticketstat->cache_severity_tickets as $id => $arrayseverities) {
- // On passe si on a demande de filtrer sur des modes de paiments particuliers
- if (count($filterarray) && !in_array($arrayseverities['type'], $filterarray)) {
- continue;
- }
-
- // We discard empty line if showempty is on because an empty line has already been output.
- if ($empty && empty($arrayseverities['code'])) {
- continue;
- }
-
- if ($format == 0) {
- print '';
- if ($format == 0) {
- $value = ($maxlength ? dol_trunc($arrayseverities['label'], $maxlength) : $arrayseverities['label']);
- }
-
- if ($format == 1) {
- $value = $arrayseverities['code'];
- }
-
- if ($format == 2) {
- $value = ($maxlength ? dol_trunc($arrayseverities['label'], $maxlength) : $arrayseverities['label']);
- }
-
- if ($format == 3) {
- $value = $arrayseverities['code'];
- }
-
- print $value ? $value : ' ';
- print ' ';
- }
- }
- print ' ';
- if ($user->admin && !$noadmininfo) {
- print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
- }
-
- print ajax_combobox('select'.$htmlname);
- }
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Clear list of attached files in send mail form (also stored in session)
- *
- * @return void
- */
- public function clear_attached_files()
- {
- // phpcs:enable
- global $conf, $user;
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
- // Set tmp user directory
- $vardir = $conf->user->dir_output."/".$user->id;
- $upload_dir = $vardir.'/temp/'; // TODO Add $keytoavoidconflict in upload_dir path
- if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
-
- $keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
- unset($_SESSION["listofpaths".$keytoavoidconflict]);
- unset($_SESSION["listofnames".$keytoavoidconflict]);
- unset($_SESSION["listofmimes".$keytoavoidconflict]);
- }
-
- /**
- * Show the form to add message on ticket
- *
- * @param string $width Width of form
- * @return void
- */
- public function showMessageForm($width = '40%')
- {
- global $conf, $langs, $user, $hookmanager, $form, $mysoc;
-
- $formmail = new FormMail($this->db);
- $addfileaction = 'addfile';
-
- if (!is_object($form)) $form = new Form($this->db);
-
- // Load translation files required by the page
- $langs->loadLangs(array('other', 'mails'));
-
- // Clear temp files. Must be done at beginning, before call of triggers
- if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
- {
- $this->clear_attached_files();
- }
-
- // Define output language
- $outputlangs = $langs;
- $newlang = '';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $this->param['langsmodels'];
- if (!empty($newlang))
- {
- $outputlangs = new Translate("", $conf);
- $outputlangs->setDefaultLang($newlang);
- $outputlangs->load('other');
- }
-
- // Get message template for $this->param["models"] into c_email_templates
- $arraydefaultmessage = -1;
- if ($this->param['models'] != 'none')
- {
- $model_id = 0;
- if (array_key_exists('models_id', $this->param))
- {
- $model_id = $this->param["models_id"];
- }
-
- $arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); // If $model_id is empty, preselect the first one
- }
-
- // Define list of attached files
- $listofpaths = array();
- $listofnames = array();
- $listofmimes = array();
- $keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
-
- if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
- {
- if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))
- {
- foreach ($this->param['fileinit'] as $file)
- {
- $this->add_attached_files($file, basename($file), dol_mimetype($file));
- }
- }
- }
-
- if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
- if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
- if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
-
- // Define output language
- $outputlangs = $langs;
- $newlang = '';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
- $newlang = $this->param['langsmodels'];
- }
- if (!empty($newlang)) {
- $outputlangs = new Translate("", $conf);
- $outputlangs->setDefaultLang($newlang);
- $outputlangs->load('other');
- }
-
- print "\n\n";
-
- $send_email = GETPOST('send_email', 'int') ? GETPOST('send_email', 'int') : 0;
-
- // Example 1 : Adding jquery code
- print '';
- print '
\n";
- print "\n";
- }
+ print "\n";
+ print "\n";
+ }
}
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 460dbe6e90c..f1daafeb9e7 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -112,7 +112,7 @@ class Interfaces
$fullpathfiles = array();
while (($file = readdir($handle)) !== false)
{
- $reg=array();
+ $reg = array();
if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))
{
$part1 = $reg[1];
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 10d34afd867..ea4ec500405 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -32,7 +32,7 @@ class Ldap
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* @var string[] Array of error strings
@@ -42,7 +42,7 @@ class Ldap
/**
* Tableau des serveurs (IP addresses ou nom d'hotes)
*/
- public $server=array();
+ public $server = array();
/**
* Base DN (e.g. "dc=foo,dc=com")
@@ -97,7 +97,7 @@ class Ldap
public $uacf;
public $pwdlastset;
- public $ldapcharset='UTF-8'; // LDAP should be UTF-8 encoded
+ public $ldapcharset = 'UTF-8'; // LDAP should be UTF-8 encoded
/**
@@ -118,8 +118,8 @@ class Ldap
global $conf;
// Server
- if (! empty($conf->global->LDAP_SERVER_HOST)) $this->server[] = $conf->global->LDAP_SERVER_HOST;
- if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+ if (!empty($conf->global->LDAP_SERVER_HOST)) $this->server[] = $conf->global->LDAP_SERVER_HOST;
+ if (!empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
$this->serverPort = $conf->global->LDAP_SERVER_PORT;
$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
$this->dn = $conf->global->LDAP_SERVER_DN;
@@ -130,8 +130,8 @@ class Ldap
$this->people = $conf->global->LDAP_USER_DN;
$this->groups = $conf->global->LDAP_GROUP_DN;
- $this->filter = $conf->global->LDAP_FILTER_CONNECTION; // Filter on user
- $this->filtermember = $conf->global->LDAP_MEMBER_FILTER; // Filter on member
+ $this->filter = $conf->global->LDAP_FILTER_CONNECTION; // Filter on user
+ $this->filtermember = $conf->global->LDAP_MEMBER_FILTER; // Filter on member
// Users
$this->attr_login = $conf->global->LDAP_FIELD_LOGIN; //unix
@@ -162,22 +162,22 @@ class Ldap
// phpcs:enable
global $langs, $conf;
- $connected=0;
- $this->bind=0;
+ $connected = 0;
+ $this->bind = 0;
// Check parameters
if (count($this->server) == 0 || empty($this->server[0]))
{
- $this->error='LDAP setup (file conf.php) is not complete';
+ $this->error = 'LDAP setup (file conf.php) is not complete';
dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
return -1;
}
- if (! function_exists("ldap_connect"))
+ if (!function_exists("ldap_connect"))
{
- $this->error='LDAPFunctionsNotAvailableOnPHP';
+ $this->error = 'LDAPFunctionsNotAvailableOnPHP';
dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
- $return=-1;
+ $return = -1;
}
if (empty($this->error))
@@ -196,9 +196,9 @@ class Ldap
if (is_resource($this->connection))
{
// Begin TLS if requested by the configuration
- if (! empty($conf->global->LDAP_SERVER_USE_TLS))
+ if (!empty($conf->global->LDAP_SERVER_USE_TLS))
{
- if (! ldap_start_tls($this->connection))
+ if (!ldap_start_tls($this->connection))
{
dol_syslog(get_class($this)."::connect_bind failed to start tls", LOG_WARNING);
$connected = 0;
@@ -213,18 +213,18 @@ class Ldap
if ($this->serverType == "activedirectory")
{
- $result=$this->setReferrals();
+ $result = $this->setReferrals();
dol_syslog(get_class($this)."::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser." password=".preg_replace('/./', '*', $this->searchPassword), LOG_DEBUG);
- $this->result=$this->bindauth($this->searchUser, $this->searchPassword);
+ $this->result = $this->bindauth($this->searchUser, $this->searchPassword);
if ($this->result)
{
- $this->bind=$this->result;
- $connected=2;
+ $this->bind = $this->result;
+ $connected = 2;
break;
}
else
{
- $this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+ $this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
}
}
else
@@ -233,50 +233,50 @@ class Ldap
if ($this->searchUser && $this->searchPassword)
{
dol_syslog(get_class($this)."::connect_bind try bindauth on ".$host." user=".$this->searchUser." password=".preg_replace('/./', '*', $this->searchPassword), LOG_DEBUG);
- $this->result=$this->bindauth($this->searchUser, $this->searchPassword);
+ $this->result = $this->bindauth($this->searchUser, $this->searchPassword);
if ($this->result)
{
- $this->bind=$this->result;
- $connected=2;
+ $this->bind = $this->result;
+ $connected = 2;
break;
}
else
{
- $this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+ $this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
}
}
// Try in anonymous
- if (! $this->bind)
+ if (!$this->bind)
{
dol_syslog(get_class($this)."::connect_bind try bind on ".$host, LOG_DEBUG);
- $result=$this->bind();
+ $result = $this->bind();
if ($result)
{
- $this->bind=$this->result;
- $connected=1;
+ $this->bind = $this->result;
+ $connected = 1;
break;
}
else
{
- $this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+ $this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
}
}
}
}
- if (! $connected) $this->close();
+ if (!$connected) $this->close();
}
}
if ($connected)
{
- $return=$connected;
+ $return = $connected;
dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
}
else
{
- $this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:'');
- $return=-1;
+ $this->error = 'Failed to connect to LDAP'.($this->error ? ': '.$this->error : '');
+ $return = -1;
dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
}
return $return;
@@ -292,7 +292,7 @@ class Ldap
*/
public function close()
{
- if ($this->connection && ! @ldap_close($this->connection))
+ if ($this->connection && !@ldap_close($this->connection))
{
return false;
}
@@ -310,11 +310,11 @@ class Ldap
*/
public function bind()
{
- if (! $this->result=@ldap_bind($this->connection))
+ if (!$this->result = @ldap_bind($this->connection))
{
$this->ldapErrorCode = ldap_errno($this->connection);
$this->ldapErrorText = ldap_error($this->connection);
- $this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+ $this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
return false;
}
else
@@ -335,11 +335,11 @@ class Ldap
*/
public function bindauth($bindDn, $pass)
{
- if (! $this->result = @ldap_bind($this->connection, $bindDn, $pass))
+ if (!$this->result = @ldap_bind($this->connection, $bindDn, $pass))
{
$this->ldapErrorCode = ldap_errno($this->connection);
$this->ldapErrorText = ldap_error($this->connection);
- $this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+ $this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
return false;
}
else
@@ -355,7 +355,7 @@ class Ldap
*/
public function unbind()
{
- if (!$this->result=@ldap_unbind($this->connection))
+ if (!$this->result = @ldap_unbind($this->connection))
{
return false;
} else {
@@ -417,28 +417,28 @@ class Ldap
dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',', $info));
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
// Encode to LDAP page code
- $dn=$this->convFromOutputCharset($dn, $this->ldapcharset);
- foreach($info as $key => $val)
+ $dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+ foreach ($info as $key => $val)
{
- if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val, $this->ldapcharset);
+ if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
}
$this->dump($dn, $info);
//print_r($info);
- $result=@ldap_add($this->connection, $dn, $info);
+ $result = @ldap_add($this->connection, $dn, $info);
if ($result)
{
@@ -449,7 +449,7 @@ class Ldap
{
$this->ldapErrorCode = @ldap_errno($this->connection);
$this->ldapErrorText = @ldap_error($this->connection);
- $this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+ $this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
dol_syslog(get_class($this)."::add failed: ".$this->error, LOG_ERR);
return -1;
}
@@ -471,28 +471,28 @@ class Ldap
dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',', $info));
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
// Encode to LDAP page code
- $dn=$this->convFromOutputCharset($dn, $this->ldapcharset);
- foreach($info as $key => $val)
+ $dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+ foreach ($info as $key => $val)
{
- if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val, $this->ldapcharset);
+ if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
}
$this->dump($dn, $info);
//print_r($info);
- $result=@ldap_modify($this->connection, $dn, $info);
+ $result = @ldap_modify($this->connection, $dn, $info);
if ($result)
{
@@ -501,7 +501,7 @@ class Ldap
}
else
{
- $this->error=@ldap_error($this->connection);
+ $this->error = @ldap_error($this->connection);
dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
return -1;
}
@@ -522,27 +522,27 @@ class Ldap
{
global $conf;
- dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn?1:0));
+ dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn ? 1 : 0));
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
// Encode to LDAP page code
- $dn=$this->convFromOutputCharset($dn, $this->ldapcharset);
- $newrdn=$this->convFromOutputCharset($newrdn, $this->ldapcharset);
- $newparent=$this->convFromOutputCharset($newparent, $this->ldapcharset);
+ $dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+ $newrdn = $this->convFromOutputCharset($newrdn, $this->ldapcharset);
+ $newparent = $this->convFromOutputCharset($newparent, $this->ldapcharset);
//print_r($info);
- $result=@ldap_rename($this->connection, $dn, $newrdn, $newparent, $deleteoldrdn);
+ $result = @ldap_rename($this->connection, $dn, $newrdn, $newparent, $deleteoldrdn);
if ($result)
{
@@ -551,7 +551,7 @@ class Ldap
}
else
{
- $this->error=@ldap_error($this->connection);
+ $this->error = @ldap_error($this->connection);
dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
return -1;
}
@@ -576,20 +576,20 @@ class Ldap
dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
- if (! $olddn || $olddn != $dn)
+ if (!$olddn || $olddn != $dn)
{
- if (! empty($olddn) && ! empty($newrdn) && ! empty($newparent) && $conf->global->LDAP_SERVER_PROTOCOLVERSION === '3')
+ if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $conf->global->LDAP_SERVER_PROTOCOLVERSION === '3')
{
// This function currently only works with LDAPv3
$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
@@ -598,14 +598,14 @@ class Ldap
{
// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
$result = $this->add($dn, $info, $user);
- if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
+ if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
}
}
else
{
//$result = $this->delete($olddn);
- $result = $this->add($dn, $info, $user); // If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
- $result = $this->modify($dn, $info, $user); // We use add/modify instead of delete/add when olddn is received
+ $result = $this->add($dn, $info, $user); // If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
+ $result = $this->modify($dn, $info, $user); // We use add/modify instead of delete/add when olddn is received
}
if ($result <= 0)
{
@@ -636,21 +636,21 @@ class Ldap
dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
// Encode to LDAP page code
- $dn=$this->convFromOutputCharset($dn, $this->ldapcharset);
+ $dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
- $result=@ldap_delete($this->connection, $dn);
+ $result = @ldap_delete($this->connection, $dn);
if ($result) return 1;
return -1;
@@ -667,33 +667,33 @@ class Ldap
public function dump_content($dn, $info)
{
// phpcs:enable
- $content='';
+ $content = '';
// Create file content
if (preg_match('/^ldap/', $this->server[0]))
{
- $target="-H ".join(',', $this->server);
+ $target = "-H ".join(',', $this->server);
}
else
{
- $target="-h ".join(',', $this->server)." -p ".$this->serverPort;
+ $target = "-h ".join(',', $this->server)." -p ".$this->serverPort;
}
- $content.="# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
- $content.="# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
- $content.="# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
- if (in_array('localhost', $this->server)) $content.="# If commands fails to connect, try without -h and -p\n";
- $content.="dn: ".$dn."\n";
- foreach($info as $key => $value)
+ $content .= "# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+ $content .= "# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+ $content .= "# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+ if (in_array('localhost', $this->server)) $content .= "# If commands fails to connect, try without -h and -p\n";
+ $content .= "dn: ".$dn."\n";
+ foreach ($info as $key => $value)
{
- if (! is_array($value))
+ if (!is_array($value))
{
- $content.="$key: $value\n";
+ $content .= "$key: $value\n";
}
else
{
- foreach($value as $valuekey => $valuevalue)
+ foreach ($value as $valuekey => $valuevalue)
{
- $content.="$key: $valuevalue\n";
+ $content .= "$key: $valuevalue\n";
}
}
}
@@ -712,18 +712,18 @@ class Ldap
global $conf;
// Create content
- $content=$this->dump_content($dn, $info);
+ $content = $this->dump_content($dn, $info);
//Create file
- $result=dol_mkdir($conf->ldap->dir_temp);
+ $result = dol_mkdir($conf->ldap->dir_temp);
- $outputfile=$conf->ldap->dir_temp.'/ldapinput.in';
- $fp=fopen($outputfile, "w");
+ $outputfile = $conf->ldap->dir_temp.'/ldapinput.in';
+ $fp = fopen($outputfile, "w");
if ($fp)
{
fputs($fp, $content);
fclose($fp);
- if (! empty($conf->global->MAIN_UMASK))
+ if (!empty($conf->global->MAIN_UMASK))
@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
return 1;
}
@@ -778,28 +778,28 @@ class Ldap
dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',', $info));
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
// Encode to LDAP page code
- $dn=$this->convFromOutputCharset($dn, $this->ldapcharset);
- foreach($info as $key => $val)
+ $dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+ foreach ($info as $key => $val)
{
- if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val, $this->ldapcharset);
+ if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
}
$this->dump($dn, $info);
//print_r($info);
- $result=@ldap_mod_add($this->connection, $dn, $info);
+ $result = @ldap_mod_add($this->connection, $dn, $info);
if ($result)
{
@@ -808,7 +808,7 @@ class Ldap
}
else
{
- $this->error=@ldap_error($this->connection);
+ $this->error = @ldap_error($this->connection);
dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
return -1;
}
@@ -830,28 +830,28 @@ class Ldap
dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',', $info));
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
// Encode to LDAP page code
- $dn=$this->convFromOutputCharset($dn, $this->ldapcharset);
- foreach($info as $key => $val)
+ $dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+ foreach ($info as $key => $val)
{
- if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val, $this->ldapcharset);
+ if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
}
$this->dump($dn, $info);
//print_r($info);
- $result=@ldap_mod_replace($this->connection, $dn, $info);
+ $result = @ldap_mod_replace($this->connection, $dn, $info);
if ($result)
{
@@ -860,7 +860,7 @@ class Ldap
}
else
{
- $this->error=@ldap_error($this->connection);
+ $this->error = @ldap_error($this->connection);
dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
return -1;
}
@@ -882,28 +882,28 @@ class Ldap
dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',', $info));
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
// Encode to LDAP page code
- $dn=$this->convFromOutputCharset($dn, $this->ldapcharset);
- foreach($info as $key => $val)
+ $dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+ foreach ($info as $key => $val)
{
- if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val, $this->ldapcharset);
+ if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
}
$this->dump($dn, $info);
//print_r($info);
- $result=@ldap_mod_del($this->connection, $dn, $info);
+ $result = @ldap_mod_del($this->connection, $dn, $info);
if ($result)
{
@@ -912,7 +912,7 @@ class Ldap
}
else
{
- $this->error=@ldap_error($this->connection);
+ $this->error = @ldap_error($this->connection);
dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
return -1;
}
@@ -928,14 +928,14 @@ class Ldap
public function getAttribute($dn, $filter)
{
// Check parameters
- if (! $this->connection)
+ if (!$this->connection)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -2;
}
- if (! $this->bind)
+ if (!$this->bind)
{
- $this->error="NotConnected";
+ $this->error = "NotConnected";
return -3;
}
@@ -944,15 +944,15 @@ class Ldap
// Only one entry should ever be returned
$entry = ldap_first_entry($this->connection, $search);
- if (! $entry)
+ if (!$entry)
{
$this->ldapErrorCode = -1;
$this->ldapErrorText = "Couldn't find entry";
- return 0; // Couldn't find entry...
+ return 0; // Couldn't find entry...
}
// Get values
- if (! ($values = ldap_get_attributes($this->connection, $entry)))
+ if (!($values = ldap_get_attributes($this->connection, $entry)))
{
$this->ldapErrorCode = ldap_errno($this->connection);
$this->ldapErrorText = ldap_error($this->connection);
@@ -972,7 +972,7 @@ class Ldap
*/
public function getAttributeValues($filterrecord, $attribute)
{
- $attributes=array();
+ $attributes = array();
$attributes[0] = $attribute;
// We need to search for this user in order to get their entry.
@@ -988,11 +988,11 @@ class Ldap
{
$this->ldapErrorCode = -1;
$this->ldapErrorText = "Couldn't find user";
- return false; // Couldn't find the user...
+ return false; // Couldn't find the user...
}
// Get values
- if (! $values = @ldap_get_values($this->connection, $entry, $attribute))
+ if (!$values = @ldap_get_values($this->connection, $entry, $attribute))
{
$this->ldapErrorCode = ldap_errno($this->connection);
$this->ldapErrorText = ldap_error($this->connection);
@@ -1017,7 +1017,7 @@ class Ldap
*/
public function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())
{
- $fulllist=array();
+ $fulllist = array();
dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',', $attributeArray).") activefilter=".$activefilter);
@@ -1029,7 +1029,7 @@ class Ldap
}
// Define filter
- if (! empty($activefilter))
+ if (!empty($activefilter))
{
if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
{
@@ -1052,8 +1052,8 @@ class Ldap
if (is_array($attributeArray))
{
// Return list with required fields
- $attributeArray=array_values($attributeArray); // This is to force to have index reordered from 0 (not make ldap_search fails)
- dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',', $attributeArray).")");
+ $attributeArray = array_values($attributeArray); // This is to force to have index reordered from 0 (not make ldap_search fails)
+ dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter." attributeArray=(".join(',', $attributeArray).")");
//var_dump($attributeArray);
$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
}
@@ -1077,30 +1077,30 @@ class Ldap
for ($i = 0; $i < $info["count"]; $i++)
{
- $recordid=$this->convToOutputCharset($info[$i][$useridentifier][0], $this->ldapcharset);
+ $recordid = $this->convToOutputCharset($info[$i][$useridentifier][0], $this->ldapcharset);
if ($recordid)
{
//print "Found record with key $useridentifier=".$recordid."
\n";
- $fulllist[$recordid][$useridentifier]=$recordid;
+ $fulllist[$recordid][$useridentifier] = $recordid;
// Add to the array for each attribute in my list
$num = count($attributeArray);
for ($j = 0; $j < $num; $j++)
{
- $keyattributelower=strtolower($attributeArray[$j]);
+ $keyattributelower = strtolower($attributeArray[$j]);
//print " Param ".$attributeArray[$j]."=".$info[$i][$keyattributelower][0]."
\n";
//permet de recuperer le SID avec Active Directory
if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid")
{
$objectsid = $this->getObjectSid($recordid);
- $fulllist[$recordid][$attributeArray[$j]] = $objectsid;
+ $fulllist[$recordid][$attributeArray[$j]] = $objectsid;
}
else
{
- if(in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
+ if (in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
$valueTab = array();
- foreach($info[$i][$keyattributelower] as $key => $value) {
+ foreach ($info[$i][$keyattributelower] as $key => $value) {
$valueTab[$key] = $this->convToOutputCharset($value, $this->ldapcharset);
}
$fulllist[$recordid][$attributeArray[$j]] = $valueTab;
@@ -1125,7 +1125,7 @@ class Ldap
*/
public function littleEndian($hex)
{
- for ($x=dol_strlen($hex)-2; $x >= 0; $x=$x-2) {
+ for ($x = dol_strlen($hex) - 2; $x >= 0; $x = $x - 2) {
$result .= substr($hex, $x, 2);
}
return $result;
@@ -1141,7 +1141,7 @@ class Ldap
*/
public function getObjectSid($ldapUser)
{
- $criteria = '('.$this->getUserIdentifier().'='.$ldapUser.')';
+ $criteria = '('.$this->getUserIdentifier().'='.$ldapUser.')';
$justthese = array("objectsid");
// if the directory is AD, then bind first with the search user first
@@ -1200,14 +1200,14 @@ class Ldap
*/
public function binSIDtoText($binsid)
{
- $hex_sid=bin2hex($binsid);
- $rev = hexdec(substr($hex_sid, 0, 2)); // Get revision-part of SID
- $subcount = hexdec(substr($hex_sid, 2, 2)); // Get count of sub-auth entries
- $auth = hexdec(substr($hex_sid, 4, 12)); // SECURITY_NT_AUTHORITY
+ $hex_sid = bin2hex($binsid);
+ $rev = hexdec(substr($hex_sid, 0, 2)); // Get revision-part of SID
+ $subcount = hexdec(substr($hex_sid, 2, 2)); // Get count of sub-auth entries
+ $auth = hexdec(substr($hex_sid, 4, 12)); // SECURITY_NT_AUTHORITY
$result = "$rev-$auth";
- for ($x=0;$x < $subcount; $x++)
+ for ($x = 0; $x < $subcount; $x++)
{
- $result .= "-".hexdec($this->littleEndian(substr($hex_sid, 16+($x*8), 8))); // get all SECURITY_NT_AUTHORITY
+ $result .= "-".hexdec($this->littleEndian(substr($hex_sid, 16 + ($x * 8), 8))); // get all SECURITY_NT_AUTHORITY
}
return $result;
}
@@ -1228,8 +1228,8 @@ class Ldap
{
dol_syslog(get_class($this)."::search checkDn=".$checkDn." filter=".$filter);
- $checkDn=$this->convFromOutputCharset($checkDn, $this->ldapcharset);
- $filter=$this->convFromOutputCharset($filter, $this->ldapcharset);
+ $checkDn = $this->convFromOutputCharset($checkDn, $this->ldapcharset);
+ $filter = $this->convFromOutputCharset($filter, $this->ldapcharset);
// if the directory is AD, then bind first with the search user first
if ($this->serverType == "activedirectory") {
@@ -1239,7 +1239,7 @@ class Ldap
$this->result = @ldap_search($this->connection, $checkDn, $filter);
$result = @ldap_get_entries($this->connection, $this->result);
- if (! $result)
+ if (!$result)
{
$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
return -1;
@@ -1269,10 +1269,10 @@ class Ldap
$this->bindauth($this->searchUser, $this->searchPassword);
}
- $searchDN = $this->people; // TODO Why searching in people then domain ?
+ $searchDN = $this->people; // TODO Why searching in people then domain ?
$result = '';
- $i=0;
+ $i = 0;
while ($i <= 2)
{
dol_syslog(get_class($this)."::fetch search with searchDN=".$searchDN." filter=".$filter);
@@ -1291,7 +1291,7 @@ class Ldap
return -1;
}
- if (! $result)
+ if (!$result)
{
// Si pas de resultat on cherche dans le domaine
$searchDN = $this->domain;
@@ -1303,7 +1303,7 @@ class Ldap
}
}
- if (! $result)
+ if (!$result)
{
$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
return -1;
@@ -1322,7 +1322,7 @@ class Ldap
$this->uacf = $this->parseUACF($this->convToOutputCharset($result[0]["useraccountcontrol"][0], $this->ldapcharset));
if (isset($result[0]["pwdlastset"][0])) // If expiration on password exists
{
- $this->pwdlastset = ($result[0]["pwdlastset"][0] != 0)?$this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0], $this->ldapcharset)):0;
+ $this->pwdlastset = ($result[0]["pwdlastset"][0] != 0) ? $this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0], $this->ldapcharset)) : 0;
}
else
{
@@ -1338,7 +1338,7 @@ class Ldap
// Set ldapUserDn (each user can have a different dn)
//var_dump($result[0]);exit;
- $this->ldapUserDN=$result[0]['dn'];
+ $this->ldapUserDN = $result[0]['dn'];
ldap_free_result($this->result);
return 1;
@@ -1434,7 +1434,7 @@ class Ldap
break;
}
}
- if (empty($retval)) $retval = "UNKNOWN_TYPE_" . $samtype;
+ if (empty($retval)) $retval = "UNKNOWN_TYPE_".$samtype;
return($retval);
}
@@ -1449,10 +1449,10 @@ class Ldap
public function convert_time($value)
{
// phpcs:enable
- $dateLargeInt=$value; // nano secondes depuis 1601 !!!!
+ $dateLargeInt = $value; // nano secondes depuis 1601 !!!!
$secsAfterADEpoch = $dateLargeInt / (10000000); // secondes depuis le 1 jan 1601
- $ADToUnixConvertor=((1970-1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
- $unixTimeStamp=intval($secsAfterADEpoch-$ADToUnixConvertor); // Unix time stamp
+ $ADToUnixConvertor = ((1970 - 1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
+ $unixTimeStamp = intval($secsAfterADEpoch - $ADToUnixConvertor); // Unix time stamp
return $unixTimeStamp;
}
@@ -1467,8 +1467,8 @@ class Ldap
private function convToOutputCharset($str, $pagecodefrom = 'UTF-8')
{
global $conf;
- if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_encode($str);
- if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_decode($str);
+ if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str = utf8_encode($str);
+ if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str = utf8_decode($str);
return $str;
}
@@ -1482,8 +1482,8 @@ class Ldap
public function convFromOutputCharset($str, $pagecodeto = 'UTF-8')
{
global $conf;
- if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_decode($str);
- if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_encode($str);
+ if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str = utf8_decode($str);
+ if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str = utf8_encode($str);
return $str;
}
@@ -1498,21 +1498,21 @@ class Ldap
{
global $conf;
- if (empty($keygroup)) $keygroup='LDAP_KEY_GROUPS';
+ if (empty($keygroup)) $keygroup = 'LDAP_KEY_GROUPS';
- $search='('.$conf->global->$keygroup.'=*)';
+ $search = '('.$conf->global->$keygroup.'=*)';
$result = $this->search($this->groups, $search);
if ($result)
{
$c = $result['count'];
$gids = array();
- for($i=0;$i<$c;$i++)
+ for ($i = 0; $i < $c; $i++)
{
$gids[] = $result[$i]['gidnumber'][0];
}
rsort($gids);
- return $gids[0]+1;
+ return $gids[0] + 1;
}
return 0;
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 2da23504440..210c3d3c29d 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -65,7 +65,7 @@ class Lessc {
// attempts to find the path of an import url, returns null for css files
protected function findImport($url) {
- foreach ((array)$this->importDir as $dir) {
+ foreach ((array) $this->importDir as $dir) {
$full = $dir.(substr($dir, -1) != '/' ? '/' : '').$url;
if ($this->fileExists($file = $full.'.less') || $this->fileExists($file = $full)) {
return $file;
@@ -158,7 +158,7 @@ class Lessc {
$oldImport = $this->importDir;
// TODO: this is because the importDir api is stupid
- $this->importDir = (array)$this->importDir;
+ $this->importDir = (array) $this->importDir;
array_unshift($this->importDir, $importDir);
foreach ($props as $prop) {
@@ -202,9 +202,9 @@ class Lessc {
$this->compileMedia($block);
break;
case "directive":
- $name = "@" . $block->name;
+ $name = "@".$block->name;
if (!empty($block->value)) {
- $name .= " " . $this->compileValue($this->reduce($block->value));
+ $name .= " ".$this->compileValue($this->reduce($block->value));
}
$this->compileNestedBlock($block, array($name));
@@ -367,8 +367,8 @@ class Lessc {
break;
case "mediaExp":
if (isset($q[2])) {
- $parts[] = "($q[1]: " .
- $this->compileValue($this->reduce($q[2])) . ")";
+ $parts[] = "($q[1]: ".
+ $this->compileValue($this->reduce($q[2])).")";
} else {
$parts[] = "($q[1])";
}
@@ -380,13 +380,13 @@ class Lessc {
}
if (count($parts) > 0) {
- $compiledQueries[] = implode(" and ", $parts);
+ $compiledQueries[] = implode(" and ", $parts);
}
}
$out = "@media";
if (!empty($parts)) {
- $out .= " " .
+ $out .= " ".
implode($this->formatter->selectorSeparator, $compiledQueries);
}
return $out;
@@ -468,7 +468,7 @@ class Lessc {
if ($count > 0) {
$out[] = trim($child);
} else {
- $out[] = trim($parent . ' ' . $child);
+ $out[] = trim($parent.' '.$child);
}
}
}
@@ -579,7 +579,7 @@ class Lessc {
}
}
- protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip=array()) {
+ protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip = array()) {
$matches = null;
foreach ($blocks as $block) {
// skip seen blocks that don't have arguments
@@ -596,7 +596,7 @@ class Lessc {
}
// attempt to find blocks matched by path and args
- protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen=array()) {
+ protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen = array()) {
if ($searchIn == null) return null;
if (isset($seen[$searchIn->id])) return null;
$seen[$searchIn->id] = true;
@@ -651,7 +651,7 @@ class Lessc {
// has default value
$value = $a[2];
} else {
- $this->throwError("Failed to assign arg " . $a[1]);
+ $this->throwError("Failed to assign arg ".$a[1]);
$value = null; // :(
}
@@ -699,7 +699,7 @@ class Lessc {
$orderedArgs = array();
$keywordArgs = array();
- foreach ((array)$args as $arg) {
+ foreach ((array) $args as $arg) {
$argval = null;
switch ($arg[0]) {
case "arg":
@@ -714,7 +714,7 @@ class Lessc {
$orderedArgs[] = $this->reduce($arg[1]);
break;
default:
- $this->throwError("Unknown arg type: " . $arg[0]);
+ $this->throwError("Unknown arg type: ".$arg[0]);
}
}
@@ -773,7 +773,7 @@ class Lessc {
break;
case "directive":
list(, $name, $value) = $prop;
- $out->lines[] = "@$name " . $this->compileValue($this->reduce($value)).';';
+ $out->lines[] = "@$name ".$this->compileValue($this->reduce($value)).';';
break;
case "comment":
$out->lines[] = $prop[1];
@@ -789,8 +789,7 @@ class Lessc {
$result = $this->tryImport($importPath, $block, $out);
$this->env->imports[$importId] = $result === false ?
- array(false, "@import " . $this->compileValue($importPath).";") :
- $result;
+ array(false, "@import ".$this->compileValue($importPath).";") : $result;
break;
case "import_mixin":
@@ -844,7 +843,7 @@ class Lessc {
if ($this->numberPrecision !== null) {
$num = round($num, $this->numberPrecision);
}
- return $num . $unit;
+ return $num.$unit;
case 'string':
// [1] - contents of string (includes quotes)
list(, $delim, $content) = $value;
@@ -853,7 +852,7 @@ class Lessc {
$part = $this->compileValue($part);
}
}
- return $delim . implode($content) . $delim;
+ return $delim.implode($content).$delim;
case 'color':
// [1] - red component (either number or a %)
// [2] - green component
@@ -873,7 +872,7 @@ class Lessc {
if (!empty($this->formatter->compressColors)) {
// Converting hex color to short notation (e.g. #003399 to #039)
if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) {
- $h = '#' . $h[1] . $h[3] . $h[5];
+ $h = '#'.$h[1].$h[3].$h[5];
}
}
@@ -987,7 +986,7 @@ class Lessc {
);
}
- protected function lib_argb($color){
+ protected function lib_argb($color) {
return $this->lib_rgbahex($color);
}
@@ -1005,7 +1004,7 @@ class Lessc {
if ($fullpath && ($fsize = filesize($fullpath)) !== false) {
// IE8 can't handle data uris larger than 32KB
- if ($fsize/1024 < 32) {
+ if ($fsize / 1024 < 32) {
if (is_null($mime)) {
if (class_exists('finfo')) { // php 5.3+
$finfo = new finfo(FILEINFO_MIME);
@@ -1166,13 +1165,13 @@ class Lessc {
protected function lib_fadeout($args) {
list($color, $delta) = $this->colorArgs($args);
- $color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta/100);
+ $color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta / 100);
return $color;
}
protected function lib_fadein($args) {
list($color, $delta) = $this->colorArgs($args);
- $color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta/100);
+ $color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta / 100);
return $color;
}
@@ -1208,7 +1207,7 @@ class Lessc {
protected function lib_percentage($arg) {
$num = $this->assertNumber($arg);
- return array("number", $num*100, "%");
+ return array("number", $num * 100, "%");
}
/**
@@ -1225,9 +1224,9 @@ class Lessc {
protected function lib_tint($args) {
$white = ['color', 255, 255, 255];
if ($args[0] == 'color') {
- return $this->lib_mix([ 'list', ',', [$white, $args] ]);
+ return $this->lib_mix(['list', ',', [$white, $args]]);
} elseif ($args[0] == "list" && count($args[2]) == 2) {
- return $this->lib_mix([ $args[0], $args[1], [$white, $args[2][0], $args[2][1]] ]);
+ return $this->lib_mix([$args[0], $args[1], [$white, $args[2][0], $args[2][1]]]);
} else {
$this->throwError("tint expects (color, weight)");
}
@@ -1247,9 +1246,9 @@ class Lessc {
protected function lib_shade($args) {
$black = ['color', 0, 0, 0];
if ($args[0] == 'color') {
- return $this->lib_mix([ 'list', ',', [$black, $args] ]);
+ return $this->lib_mix(['list', ',', [$black, $args]]);
} elseif ($args[0] == "list" && count($args[2]) == 2) {
- return $this->lib_mix([ $args[0], $args[1], [$black, $args[2][0], $args[2][1]] ]);
+ return $this->lib_mix([$args[0], $args[1], [$black, $args[2][0], $args[2][1]]]);
} else {
$this->throwError("shade expects (color, weight)");
}
@@ -1278,7 +1277,7 @@ class Lessc {
$w = $weight * 2 - 1;
$a = $first_a - $second_a;
- $w1 = (($w * $a == -1 ? $w : ($w + $a)/(1 + $w * $a)) + 1) / 2.0;
+ $w1 = (($w * $a == -1 ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2.0;
$w2 = 1.0 - $w1;
$new = array('color',
@@ -1299,14 +1298,14 @@ class Lessc {
$lightColor = array('color', 255, 255, 255);
$threshold = 0.43;
- if ( $args[0] == 'list' ) {
- $inputColor = ( isset($args[2][0]) ) ? $this->assertColor($args[2][0]) : $lightColor;
- $darkColor = ( isset($args[2][1]) ) ? $this->assertColor($args[2][1]) : $darkColor;
- $lightColor = ( isset($args[2][2]) ) ? $this->assertColor($args[2][2]) : $lightColor;
- $threshold = ( isset($args[2][3]) ) ? $this->assertNumber($args[2][3]) : $threshold;
+ if ($args[0] == 'list') {
+ $inputColor = (isset($args[2][0])) ? $this->assertColor($args[2][0]) : $lightColor;
+ $darkColor = (isset($args[2][1])) ? $this->assertColor($args[2][1]) : $darkColor;
+ $lightColor = (isset($args[2][2])) ? $this->assertColor($args[2][2]) : $lightColor;
+ $threshold = (isset($args[2][3])) ? $this->assertNumber($args[2][3]) : $threshold;
}
else {
- $inputColor = $this->assertColor($args);
+ $inputColor = $this->assertColor($args);
}
$inputColor = $this->coerceColor($inputColor);
@@ -1314,14 +1313,14 @@ class Lessc {
$lightColor = $this->coerceColor($lightColor);
//Figure out which is actually light and dark!
- if ( $this->toLuma($darkColor) > $this->toLuma($lightColor) ) {
- $t = $lightColor;
+ if ($this->toLuma($darkColor) > $this->toLuma($lightColor)) {
+ $t = $lightColor;
$lightColor = $darkColor;
$darkColor = $t;
}
$inputColor_alpha = $this->lib_alpha($inputColor);
- if ( ( $this->toLuma($inputColor) * $inputColor_alpha) < $threshold) {
+ if (($this->toLuma($inputColor) * $inputColor_alpha) < $threshold) {
return $lightColor;
}
return $darkColor;
@@ -1357,7 +1356,7 @@ class Lessc {
$this->throwError($error);
}
- public function assertArgs($value, $expectedArgs, $name="") {
+ public function assertArgs($value, $expectedArgs, $name = "") {
if ($expectedArgs == 1) {
return $value;
} else {
@@ -1366,7 +1365,7 @@ class Lessc {
$numValues = count($values);
if ($expectedArgs != $numValues) {
if ($name) {
- $name = $name . ": ";
+ $name = $name.": ";
}
$this->throwError("${name}expecting $expectedArgs arguments, got $numValues");
@@ -1408,7 +1407,7 @@ class Lessc {
}
$out = array('hsl',
- ($H < 0 ? $H + 6 : $H)*60,
+ ($H < 0 ? $H + 6 : $H) * 60,
$S * 100,
$L * 100,
);
@@ -1434,7 +1433,7 @@ class Lessc {
return $temp2;
}
if (3 * $comp < 2) {
- return $temp1 + ($temp2 - $temp1)*((2/3) - $comp) * 6;
+ return $temp1 + ($temp2 - $temp1) * ((2 / 3) - $comp) * 6;
}
return $temp1;
@@ -1457,18 +1456,17 @@ class Lessc {
$r = $g = $b = $L;
} else {
$temp2 = $L < 0.5 ?
- $L * (1.0 + $S) :
- $L + $S - $L * $S;
+ $L * (1.0 + $S) : $L + $S - $L * $S;
$temp1 = 2.0 * $L - $temp2;
- $r = $this->toRGB_helper($H + 1/3, $temp1, $temp2);
+ $r = $this->toRGB_helper($H + 1 / 3, $temp1, $temp2);
$g = $this->toRGB_helper($H, $temp1, $temp2);
- $b = $this->toRGB_helper($H - 1/3, $temp1, $temp2);
+ $b = $this->toRGB_helper($H - 1 / 3, $temp1, $temp2);
}
// $out = array('color', round($r*255), round($g*255), round($b*255));
- $out = array('color', $r*255, $g*255, $b*255);
+ $out = array('color', $r * 255, $g * 255, $b * 255);
if (count($color) > 4) {
// copy alpha
$out[] = $color[4];
@@ -1552,7 +1550,7 @@ class Lessc {
case "interpolate":
$reduced = $this->reduce($value[1]);
$var = $this->compileValue($reduced);
- $res = $this->reduce(array("variable", $this->vPrefix . $var));
+ $res = $this->reduce(array("variable", $this->vPrefix.$var));
if ($res[0] == "raw_color") {
$res = $this->coerceColor($res);
@@ -1565,10 +1563,10 @@ class Lessc {
$key = $value[1];
if (is_array($key)) {
$key = $this->reduce($key);
- $key = $this->vPrefix . $this->compileValue($this->lib_e($key));
+ $key = $this->vPrefix.$this->compileValue($this->lib_e($key));
}
- $seen =& $this->env->seenNames;
+ $seen = & $this->env->seenNames;
if (!empty($seen[$key])) {
$this->throwError("infinite loop detected: $key");
@@ -1678,7 +1676,7 @@ class Lessc {
$t = $num % $width;
$num /= $width;
- $c[$i] = $t * (256/$width) + $t * floor(16/$width);
+ $c[$i] = $t * (256 / $width) + $t * floor(16 / $width);
}
return $c;
@@ -1743,7 +1741,7 @@ class Lessc {
}
if ($op == "=") {
- return $this->toBool($this->eq($left, $right) );
+ return $this->toBool($this->eq($left, $right));
}
if ($op == "+" && !is_null($str = $this->stringConcatenate($left, $right))) {
@@ -1760,7 +1758,7 @@ class Lessc {
// make the expression look it did before being parsed
$paddedOp = $op;
if ($whiteBefore) {
- $paddedOp = " " . $paddedOp;
+ $paddedOp = " ".$paddedOp;
}
if ($whiteAfter) {
$paddedOp .= " ";
@@ -1840,7 +1838,7 @@ class Lessc {
return $this->fixColor($out);
}
- public function lib_red($color){
+ public function lib_red($color) {
$color = $this->coerceColor($color);
if (is_null($color)) {
$this->throwError('color expected for red()');
@@ -1849,7 +1847,7 @@ class Lessc {
return $color[1];
}
- public function lib_green($color){
+ public function lib_green($color) {
$color = $this->coerceColor($color);
if (is_null($color)) {
$this->throwError('color expected for green()');
@@ -1858,7 +1856,7 @@ class Lessc {
return $color[2];
}
- public function lib_blue($color){
+ public function lib_blue($color) {
$color = $this->coerceColor($color);
if (is_null($color)) {
$this->throwError('color expected for blue()');
@@ -1946,7 +1944,7 @@ class Lessc {
protected function get($name) {
$current = $this->env;
- $isArguments = $name == $this->vPrefix . 'arguments';
+ $isArguments = $name == $this->vPrefix.'arguments';
while ($current) {
if ($isArguments && isset($current->arguments)) {
return array('list', ' ', $current->arguments);
@@ -1957,8 +1955,7 @@ class Lessc {
}
$current = isset($current->storeParent) ?
- $current->storeParent :
- $current->parent;
+ $current->storeParent : $current->parent;
}
$this->throwError("variable $name is undefined");
@@ -1970,10 +1967,10 @@ class Lessc {
$parser = new lessc_parser($this, __METHOD__);
foreach ($args as $name => $strValue) {
if ($name{0} !== '@') {
- $name = '@' . $name;
+ $name = '@'.$name;
}
$parser->count = 0;
- $parser->buffer = (string)$strValue;
+ $parser->buffer = (string) $strValue;
if (!$parser->propertyValue($value)) {
throw new Exception("failed to parse passed in variable $name: $strValue");
}
@@ -2028,7 +2025,7 @@ class Lessc {
$oldImport = $this->importDir;
- $this->importDir = (array)$this->importDir;
+ $this->importDir = (array) $this->importDir;
$this->importDir[] = $pi['dirname'].'/';
$this->addParsedFile($fname);
@@ -2187,11 +2184,11 @@ class Lessc {
}
public function setImportDir($dirs) {
- $this->importDir = (array)$dirs;
+ $this->importDir = (array) $dirs;
}
public function addImportDir($dir) {
- $this->importDir = (array)$this->importDir;
+ $this->importDir = (array) $this->importDir;
$this->importDir[] = $dir;
}
@@ -2687,7 +2684,7 @@ class lessc_parser {
// TODO: cache pattern in parser
$pattern = implode("|",
array_map(array("lessc", "preg_quote"), $directives));
- $pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i';
+ $pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
return preg_match($pattern, $dirname);
}
@@ -2968,7 +2965,7 @@ class lessc_parser {
}
// an unbounded string stopped by $end
- protected function openString($end, &$out, $nestingOpen=null, $rejectStrs = null) {
+ protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null) {
$oldWhite = $this->eatWhiteDefault;
$this->eatWhiteDefault = false;
@@ -2995,7 +2992,7 @@ class lessc_parser {
$tok = $m[2];
- $this->count-= strlen($tok);
+ $this->count -= strlen($tok);
if ($tok == $end) {
if ($nestingLevel == 0) {
break;
@@ -3019,7 +3016,7 @@ class lessc_parser {
}
$content[] = $tok;
- $this->count+= strlen($tok);
+ $this->count += strlen($tok);
}
$this->eatWhiteDefault = $oldWhite;
@@ -3048,7 +3045,7 @@ class lessc_parser {
$content = array();
// look for either ending delim , escape, or string interpolation
- $patt = '([^\n]*?)(@\{|\\\\|' .
+ $patt = '([^\n]*?)(@\{|\\\\|'.
lessc::preg_quote($delim).')';
$oldWhite = $this->eatWhiteDefault;
@@ -3577,7 +3574,7 @@ class lessc_parser {
return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
}
- protected function genericList(&$out, $parseItem, $delim="", $flatten=true) {
+ protected function genericList(&$out, $parseItem, $delim = "", $flatten = true) {
$s = $this->seek();
$items = array();
while ($this->$parseItem($value)) {
@@ -3650,7 +3647,7 @@ class lessc_parser {
}
// match something without consuming it
- protected function peek($regex, &$out = null, $from=null) {
+ protected function peek($regex, &$out = null, $from = null) {
if (is_null($from)) $from = $this->count;
$r = '/'.$regex.'/Ais';
$result = preg_match($r, $this->buffer, $out, null, $from);
@@ -3687,7 +3684,7 @@ class lessc_parser {
}
}
- protected function pushBlock($selectors=null, $type=null) {
+ protected function pushBlock($selectors = null, $type = null) {
$b = new stdclass;
$b->parent = $this->env;
@@ -3807,7 +3804,7 @@ class lessc_formatter_classic {
}
public function property($name, $value) {
- return $name . $this->assignSeparator . $value . ";";
+ return $name.$this->assignSeparator.$value.";";
}
protected function isEmpty($block) {
@@ -3833,18 +3830,18 @@ class lessc_formatter_classic {
$this->indentLevel++;
if ($this->breakSelectors) {
- $selectorSeparator = $this->selectorSeparator . $this->break . $pre;
+ $selectorSeparator = $this->selectorSeparator.$this->break.$pre;
} else {
$selectorSeparator = $this->selectorSeparator;
}
- echo $pre .
+ echo $pre.
implode($selectorSeparator, $block->selectors);
if ($isSingle) {
echo $this->openSingle;
$inner = "";
} else {
- echo $this->open . $this->break;
+ echo $this->open.$this->break;
$inner = $this->indentStr();
}
@@ -3852,7 +3849,7 @@ class lessc_formatter_classic {
if (!empty($block->lines)) {
$glue = $this->break.$inner;
- echo $inner . implode($glue, $block->lines);
+ echo $inner.implode($glue, $block->lines);
if (!$isSingle && !empty($block->children)) {
echo $this->break;
}
@@ -3866,9 +3863,9 @@ class lessc_formatter_classic {
if (!$isSingle && empty($block->children)) echo $this->break;
if ($isSingle) {
- echo $this->closeSingle . $this->break;
+ echo $this->closeSingle.$this->break;
} else {
- echo $pre . $this->close . $this->break;
+ echo $pre.$this->close.$this->break;
}
$this->indentLevel--;
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index cc60cba1abd..040cb4a3552 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -67,7 +67,7 @@ class Menu
*/
public function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
{
- $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+ $this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
}
/**
@@ -90,9 +90,9 @@ class Menu
*/
public function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
{
- $array_start = array_slice($this->liste, 0, ($idafter+1));
- $array_new = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
- $array_end = array_slice($this->liste, ($idafter+1));
+ $array_start = array_slice($this->liste, 0, ($idafter + 1));
+ $array_new = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
+ $array_end = array_slice($this->liste, ($idafter + 1));
$this->liste = array_merge($array_start, $array_new, $array_end);
}
@@ -117,10 +117,10 @@ class Menu
*/
public function getNbOfVisibleMenuEntries()
{
- $nb=0;
- foreach($this->liste as $val)
+ $nb = 0;
+ foreach ($this->liste as $val)
{
- if (! empty($val['enabled'])) $nb++;
+ if (!empty($val['enabled'])) $nb++;
}
return $nb;
}
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 7a3508c7d2f..982d38040b4 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -330,75 +330,75 @@ class Notify
$langs->load("other");
// Define $urlwithroot
- $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
- $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+ $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
// Define some vars
$application = 'Dolibarr';
- if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
$replyto = $conf->notification->email_from;
$object_type = '';
$link = '';
$num = 0;
$error = 0;
- $oldref=(empty($object->oldref)?$object->ref:$object->oldref);
- $newref=(empty($object->newref)?$object->ref:$object->newref);
+ $oldref = (empty($object->oldref) ? $object->ref : $object->oldref);
+ $newref = (empty($object->newref) ? $object->ref : $object->newref);
$sql = '';
// Check notification per third party
if ($object->socid > 0)
{
- $sql.= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
- $sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
- $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
- $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
- $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s";
- $sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
- $sql.= " AND n.fk_soc = s.rowid";
- $sql.= " AND c.statut = 1";
- if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode; // Old usage
- else $sql.= " AND a.code = '".$notifcode."'"; // New usage
+ $sql .= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
+ $sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+ $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+ $sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+ $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s";
+ $sql .= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
+ $sql .= " AND n.fk_soc = s.rowid";
+ $sql .= " AND c.statut = 1";
+ if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+ else $sql .= " AND a.code = '".$notifcode."'"; // New usage
$sql .= " AND s.rowid = ".$object->socid;
- $sql.= "\nUNION\n";
+ $sql .= "\nUNION\n";
}
// Check notification per user
- $sql.= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
- $sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
- $sql.= " FROM ".MAIN_DB_PREFIX."user as c,";
- $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
- $sql.= " ".MAIN_DB_PREFIX."notify_def as n";
- $sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
- $sql.= " AND c.statut = 1";
- if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode; // Old usage
- else $sql.= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
+ $sql .= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
+ $sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+ $sql .= " FROM ".MAIN_DB_PREFIX."user as c,";
+ $sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+ $sql .= " ".MAIN_DB_PREFIX."notify_def as n";
+ $sql .= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
+ $sql .= " AND c.statut = 1";
+ if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+ else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
$result = $this->db->query($sql);
if ($result)
{
$num = $this->db->num_rows($result);
- $projtitle='';
- if (! empty($object->fk_project))
+ $projtitle = '';
+ if (!empty($object->fk_project))
{
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$proj = new Project($this->db);
$proj->fetch($object->fk_project);
- $projtitle='('.$proj->title.')';
+ $projtitle = '('.$proj->title.')';
}
if ($num > 0)
{
$i = 0;
- while ($i < $num && ! $error) // For each notification couple defined (third party/actioncode)
+ while ($i < $num && !$error) // For each notification couple defined (third party/actioncode)
{
$obj = $this->db->fetch_object($result);
- $sendto = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <".$obj->email.">";
+ $sendto = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
$notifcodedefid = $obj->adid;
if (dol_strlen($obj->email))
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index 7fcb2a9cdb4..ed684529f33 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -185,7 +185,7 @@ class SimpleOpenID
{
// phpcs:enable
$e = $this->error;
- return array('code'=>$e[0],'description'=>$e[1]);
+ return array('code'=>$e[0], 'description'=>$e[1]);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -200,10 +200,10 @@ class SimpleOpenID
{
// phpcs:enable
$errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
- if ($desc == null){
+ if ($desc == null) {
$desc = $errs[$code];
}
- $this->error = array($code,$desc);
+ $this->error = array($code, $desc);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -235,7 +235,7 @@ class SimpleOpenID
{
$r = array();
$response = explode("\n", $response);
- foreach($response as $line) {
+ foreach ($response as $line) {
$line = trim($line);
if ($line != "") {
list($key, $value) = explode(":", $line, 2);
@@ -263,13 +263,13 @@ class SimpleOpenID
if (!isset($u['path']) || ($u['path'] == '/')) {
$u['path'] = '';
}
- if(substr($u['path'], -1, 1) == '/'){
- $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);
+ if (substr($u['path'], -1, 1) == '/') {
+ $u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);
}
- if (isset($u['query'])){ // If there is a query string, then use identity as is
- return $u['host'] . $u['path'] . '?' . $u['query'];
- }else{
- return $u['host'] . $u['path'];
+ if (isset($u['query'])) { // If there is a query string, then use identity as is
+ return $u['host'].$u['path'].'?'.$u['query'];
+ } else {
+ return $u['host'].$u['path'];
}
}
@@ -282,12 +282,12 @@ class SimpleOpenID
public function array2url($arr)
{
// converts associated array to URL Query String
- if (!is_array($arr)){
+ if (!is_array($arr)) {
return false;
}
$query = '';
- foreach($arr as $key => $value){
- $query .= $key . "=" . $value . "&";
+ foreach ($arr as $key => $value) {
+ $query .= $key."=".$value."&";
}
return $query;
}
@@ -309,7 +309,7 @@ class SimpleOpenID
$this->ErrorStore('OPENID_SOCKETERROR', $errstr);
return false;
} else {
- $request = $method . " /server HTTP/1.0\r\n";
+ $request = $method." /server HTTP/1.0\r\n";
$request .= "User-Agent: Dolibarr\r\n";
$request .= "Connection: close\r\n\r\n";
fwrite($fp, $request);
@@ -341,7 +341,7 @@ class SimpleOpenID
// Remember, SSL MUST BE SUPPORTED
if (is_array($params)) $params = $this->array2url($params);
- $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
+ $curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
@curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($curl, CURLOPT_HEADER, false);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
@@ -351,9 +351,9 @@ class SimpleOpenID
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
$response = curl_exec($curl);
- if (curl_errno($curl) == 0){
+ if (curl_errno($curl) == 0) {
$response;
- }else{
+ } else {
$this->ErrorStore('OPENID_CURL', curl_error($curl));
}
return $response;
@@ -400,7 +400,7 @@ class SimpleOpenID
global $conf;
include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
- if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+ if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
$response = getURLContent($url);
@@ -440,7 +440,7 @@ class SimpleOpenID
&& (count($this->fields['optional']) > 0)) {
$params['openid.sreg.optional'] = implode(',', $this->fields['optional']);
}
- return $this->URLs['openid_server'] . "?". $this->array2url($params);
+ return $this->URLs['openid_server']."?".$this->array2url($params);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -461,7 +461,7 @@ class SimpleOpenID
}
else
{ // Default Header Redirect
- header('Location: ' . $redirect_to);
+ header('Location: '.$redirect_to);
}
}
@@ -485,9 +485,9 @@ class SimpleOpenID
for ($i = 0; $i < $num; $i++)
{
$s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
- $c = $_GET['openid_' . $arr_signed[$i]];
+ $c = $_GET['openid_'.$arr_signed[$i]];
// if ($c != ""){
- $params['openid.' . $s] = urlencode($c);
+ $params['openid.'.$s] = urlencode($c);
// }
}
$params['openid.mode'] = "check_authentication";
@@ -523,11 +523,11 @@ class SimpleOpenID
global $conf;
include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
- if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+ if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
- $addheaders=array('Accept: application/xrds+xml');
+ $addheaders = array('Accept: application/xrds+xml');
$response = getURLContent($url, 'GET', '', 1, $addheaders);
/* response should like this:
@@ -542,12 +542,12 @@ class SimpleOpenID
*/
- $content=$response['content'];
+ $content = $response['content'];
- $server='';
+ $server = '';
if (preg_match('/'.preg_quote('
', '/').'(.*)'.preg_quote(' ', '/').'/is', $content, $reg))
{
- $server=$reg[1];
+ $server = $reg[1];
}
if (empty($server))
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index b75add06ec0..dd02bf365c1 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -26,714 +26,792 @@
*/
class RssParser
{
- /**
- * @var DoliDB Database handler.
- */
- public $db;
+ /**
+ * @var DoliDB Database handler.
+ */
+ public $db;
- /**
- * @var string Error code (or message)
- */
- public $error='';
+ /**
+ * @var string Error code (or message)
+ */
+ public $error = '';
- private $_format='';
- private $_urlRSS;
- private $_language;
- private $_generator;
- private $_copyright;
- private $_lastbuilddate;
- private $_imageurl;
- private $_link;
- private $_title;
- private $_description;
- private $_lastfetchdate; // Last successful fetch
- private $_rssarray=array();
+ private $_format = '';
+ private $_urlRSS;
+ private $_language;
+ private $_generator;
+ private $_copyright;
+ private $_lastbuilddate;
+ private $_imageurl;
+ private $_link;
+ private $_title;
+ private $_description;
+ private $_lastfetchdate; // Last successful fetch
+ private $_rssarray = array();
- // For parsing with xmlparser
- public $stack = array(); // parser stack
- private $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
+ // For parsing with xmlparser
+ public $stack = array(); // parser stack
+ private $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
- /**
- * Constructor
- *
- * @param DoliDB $db Database handler
- */
- public function __construct($db)
- {
- $this->db = $db;
- }
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ */
+ public function __construct($db)
+ {
+ $this->db = $db;
+ }
- /**
- * getFormat
- *
- * @return string
- */
- public function getFormat()
- {
- return $this->_format;
- }
+ /**
+ * getFormat
+ *
+ * @return string
+ */
+ public function getFormat()
+ {
+ return $this->_format;
+ }
- /**
- * getUrlRss
- *
- * @return string
- */
- public function getUrlRss()
- {
- return $this->_urlRSS;
- }
- /**
- * getLanguage
- *
- * @return string
- */
- public function getLanguage()
- {
- return $this->_language;
- }
- /**
- * getGenerator
- *
- * @return string
- */
- public function getGenerator()
- {
- return $this->_generator;
- }
- /**
- * getCopyright
- *
- * @return string
- */
- public function getCopyright()
- {
- return $this->_copyright;
- }
- /**
- * getLastBuildDate
- *
- * @return string
- */
- public function getLastBuildDate()
- {
- return $this->_lastbuilddate;
- }
- /**
- * getImageUrl
- *
- * @return string
- */
- public function getImageUrl()
- {
- return $this->_imageurl;
- }
- /**
- * getLink
- *
- * @return string
- */
- public function getLink()
- {
- return $this->_link;
- }
- /**
- * getTitle
- *
- * @return string
- */
- public function getTitle()
- {
- return $this->_title;
- }
- /**
- * getDescription
- *
- * @return string
- */
- public function getDescription()
- {
- return $this->_description;
- }
- /**
- * getLastFetchDate
- *
- * @return string
- */
- public function getLastFetchDate()
- {
- return $this->_lastfetchdate;
- }
- /**
- * getItems
- *
- * @return string
- */
- public function getItems()
- {
- return $this->_rssarray;
- }
+ /**
+ * getUrlRss
+ *
+ * @return string
+ */
+ public function getUrlRss()
+ {
+ return $this->_urlRSS;
+ }
+ /**
+ * getLanguage
+ *
+ * @return string
+ */
+ public function getLanguage()
+ {
+ return $this->_language;
+ }
+ /**
+ * getGenerator
+ *
+ * @return string
+ */
+ public function getGenerator()
+ {
+ return $this->_generator;
+ }
+ /**
+ * getCopyright
+ *
+ * @return string
+ */
+ public function getCopyright()
+ {
+ return $this->_copyright;
+ }
+ /**
+ * getLastBuildDate
+ *
+ * @return string
+ */
+ public function getLastBuildDate()
+ {
+ return $this->_lastbuilddate;
+ }
+ /**
+ * getImageUrl
+ *
+ * @return string
+ */
+ public function getImageUrl()
+ {
+ return $this->_imageurl;
+ }
+ /**
+ * getLink
+ *
+ * @return string
+ */
+ public function getLink()
+ {
+ return $this->_link;
+ }
+ /**
+ * getTitle
+ *
+ * @return string
+ */
+ public function getTitle()
+ {
+ return $this->_title;
+ }
+ /**
+ * getDescription
+ *
+ * @return string
+ */
+ public function getDescription()
+ {
+ return $this->_description;
+ }
+ /**
+ * getLastFetchDate
+ *
+ * @return string
+ */
+ public function getLastFetchDate()
+ {
+ return $this->_lastfetchdate;
+ }
+ /**
+ * getItems
+ *
+ * @return string
+ */
+ public function getItems()
+ {
+ return $this->_rssarray;
+ }
- /**
- * Parse rss URL
- *
- * @param string $urlRSS Url to parse
- * @param int $maxNb Max nb of records to get (0 for no limit)
- * @param int $cachedelay 0=No cache, nb of seconds we accept cache files (cachedir must also be defined)
- * @param string $cachedir Directory where to save cache file
- * @return int <0 if KO, >0 if OK
- */
- public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
- {
- global $conf;
+ /**
+ * Parse rss URL
+ *
+ * @param string $urlRSS Url to parse
+ * @param int $maxNb Max nb of records to get (0 for no limit)
+ * @param int $cachedelay 0=No cache, nb of seconds we accept cache files (cachedir must also be defined)
+ * @param string $cachedir Directory where to save cache file
+ * @return int <0 if KO, >0 if OK
+ */
+ public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
+ {
+ global $conf;
- include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $rss='';
- $str=''; // This will contain content of feed
+ $rss = '';
+ $str = ''; // This will contain content of feed
- // Check parameters
- if (! dol_is_url($urlRSS))
- {
- $this->error="ErrorBadUrl";
- return -1;
- }
+ // Check parameters
+ if (!dol_is_url($urlRSS))
+ {
+ $this->error = "ErrorBadUrl";
+ return -1;
+ }
- $this->_urlRSS = $urlRSS;
- $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
- $newmask='0644';
+ $this->_urlRSS = $urlRSS;
+ $newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
+ $newmask = '0644';
- //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
- $nowgmt = dol_now();
+ //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
+ $nowgmt = dol_now();
- // Search into cache
- $foundintocache=0;
- if ($cachedelay > 0 && $cachedir)
- {
- $filedate=dol_filemtime($newpathofdestfile);
- if ($filedate >= ($nowgmt - $cachedelay))
- {
- //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
- $foundintocache=1;
+ // Search into cache
+ $foundintocache = 0;
+ if ($cachedelay > 0 && $cachedir)
+ {
+ $filedate = dol_filemtime($newpathofdestfile);
+ if ($filedate >= ($nowgmt - $cachedelay))
+ {
+ //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
+ $foundintocache = 1;
- $this->_lastfetchdate=$filedate;
- }
- else
- {
- dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
- }
- }
+ $this->_lastfetchdate = $filedate;
+ }
+ else
+ {
+ dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+ }
+ }
- // Load file into $str
- if ($foundintocache) // Cache file found and is not too old
- {
- $str = file_get_contents($newpathofdestfile);
- }
- else
- {
- try {
- ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
- ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
- ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+ // Load file into $str
+ if ($foundintocache) // Cache file found and is not too old
+ {
+ $str = file_get_contents($newpathofdestfile);
+ }
+ else
+ {
+ try {
+ ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
+ ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+ ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
- $opts = array('http'=>array('method'=>"GET"));
- if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
- if (! empty($conf->global->MAIN_PROXY_USE)) $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
- //var_dump($opts);exit;
- $context = stream_context_create($opts);
+ $opts = array('http'=>array('method'=>"GET"));
+ if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+ if (!empty($conf->global->MAIN_PROXY_USE)) $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+ //var_dump($opts);exit;
+ $context = stream_context_create($opts);
- $str = file_get_contents($this->_urlRSS, false, $context);
- }
- catch (Exception $e) {
- print 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();
- }
- }
+ $str = file_get_contents($this->_urlRSS, false, $context);
+ }
+ catch (Exception $e) {
+ print 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();
+ }
+ }
- if ($str !== false)
- {
- // Convert $str into xml
- if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
- {
- //print 'xx'.LIBXML_NOCDATA;
- libxml_use_internal_errors(false);
- $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
- }
- else
- {
- $xmlparser=xml_parser_create('');
- if (!is_resource($xmlparser)) {
- $this->error="ErrorFailedToCreateParser"; return -1;
- }
+ if ($str !== false)
+ {
+ // Convert $str into xml
+ if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+ {
+ //print 'xx'.LIBXML_NOCDATA;
+ libxml_use_internal_errors(false);
+ $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
+ }
+ else
+ {
+ $xmlparser = xml_parser_create('');
+ if (!is_resource($xmlparser)) {
+ $this->error = "ErrorFailedToCreateParser"; return -1;
+ }
- xml_set_object($xmlparser, $this);
- xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
- xml_set_character_data_handler($xmlparser, 'feed_cdata');
- $status = xml_parse($xmlparser, $str);
- xml_parser_free($xmlparser);
- $rss=$this;
- //var_dump($rss->_format);exit;
- }
- }
+ xml_set_object($xmlparser, $this);
+ xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
+ xml_set_character_data_handler($xmlparser, 'feed_cdata');
+ $status = xml_parse($xmlparser, $str);
+ xml_parser_free($xmlparser);
+ $rss = $this;
+ //var_dump($rss->_format);exit;
+ }
+ }
- // If $rss loaded
- if ($rss)
- {
- // Save file into cache
- if (empty($foundintocache) && $cachedir)
- {
- dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
- if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
- $fp = fopen($newpathofdestfile, 'w');
- if ($fp)
- {
- fwrite($fp, $str);
- fclose($fp);
- if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
- @chmod($newpathofdestfile, octdec($newmask));
+ // If $rss loaded
+ if ($rss)
+ {
+ // Save file into cache
+ if (empty($foundintocache) && $cachedir)
+ {
+ dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
+ if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);
+ $fp = fopen($newpathofdestfile, 'w');
+ if ($fp)
+ {
+ fwrite($fp, $str);
+ fclose($fp);
+ if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+ @chmod($newpathofdestfile, octdec($newmask));
- $this->_lastfetchdate=$nowgmt;
- }
- else
- {
- print 'Error, failed to open file '.$newpathofdestfile.' for write';
- }
- }
+ $this->_lastfetchdate = $nowgmt;
+ }
+ else
+ {
+ print 'Error, failed to open file '.$newpathofdestfile.' for write';
+ }
+ }
- unset($str); // Free memory
+ unset($str); // Free memory
- if (empty($rss->_format)) // If format not detected automatically
- {
- $rss->_format='rss';
- if (empty($rss->channel)) $rss->_format='atom';
- }
+ if (empty($rss->_format)) // If format not detected automatically
+ {
+ $rss->_format = 'rss';
+ if (empty($rss->channel)) $rss->_format = 'atom';
+ }
- $items=array();
+ $items = array();
- // Save description entries
- if ($rss->_format == 'rss')
- {
- //var_dump($rss);
- if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
- {
- if (!empty($rss->channel->language)) $this->_language = (string) $rss->channel->language;
- if (!empty($rss->channel->generator)) $this->_generator = (string) $rss->channel->generator;
- if (!empty($rss->channel->copyright)) $this->_copyright = (string) $rss->channel->copyright;
- if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
- if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
- if (!empty($rss->channel->link)) $this->_link = (string) $rss->channel->link;
- if (!empty($rss->channel->title)) $this->_title = (string) $rss->channel->title;
- if (!empty($rss->channel->description)) $this->_description = (string) $rss->channel->description;
- }
- else
- {
- //var_dump($rss->channel);
- if (!empty($rss->channel['language'])) $this->_language = (string) $rss->channel['language'];
- if (!empty($rss->channel['generator'])) $this->_generator = (string) $rss->channel['generator'];
- if (!empty($rss->channel['copyright'])) $this->_copyright = (string) $rss->channel['copyright'];
- if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
- if (!empty($rss->image['url'])) $this->_imageurl = (string) $rss->image['url'];
- if (!empty($rss->channel['link'])) $this->_link = (string) $rss->channel['link'];
- if (!empty($rss->channel['title'])) $this->_title = (string) $rss->channel['title'];
- if (!empty($rss->channel['description'])) $this->_description = (string) $rss->channel['description'];
- }
+ // Save description entries
+ if ($rss->_format == 'rss')
+ {
+ //var_dump($rss);
+ if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+ {
+ if (!empty($rss->channel->language)) $this->_language = (string) $rss->channel->language;
+ if (!empty($rss->channel->generator)) $this->_generator = (string) $rss->channel->generator;
+ if (!empty($rss->channel->copyright)) $this->_copyright = (string) $rss->channel->copyright;
+ if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+ if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
+ if (!empty($rss->channel->link)) $this->_link = (string) $rss->channel->link;
+ if (!empty($rss->channel->title)) $this->_title = (string) $rss->channel->title;
+ if (!empty($rss->channel->description)) $this->_description = (string) $rss->channel->description;
+ }
+ else
+ {
+ //var_dump($rss->channel);
+ if (!empty($rss->channel['language'])) $this->_language = (string) $rss->channel['language'];
+ if (!empty($rss->channel['generator'])) $this->_generator = (string) $rss->channel['generator'];
+ if (!empty($rss->channel['copyright'])) $this->_copyright = (string) $rss->channel['copyright'];
+ if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+ if (!empty($rss->image['url'])) $this->_imageurl = (string) $rss->image['url'];
+ if (!empty($rss->channel['link'])) $this->_link = (string) $rss->channel['link'];
+ if (!empty($rss->channel['title'])) $this->_title = (string) $rss->channel['title'];
+ if (!empty($rss->channel['description'])) $this->_description = (string) $rss->channel['description'];
+ }
- if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item; // With simplexml
- else $items=$rss->items; // With xmlparse
- //var_dump($items);exit;
- }
- elseif ($rss->_format == 'atom')
- {
- //var_dump($rss);
- if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
- {
- if (!empty($rss->generator)) $this->_generator = (string) $rss->generator;
- if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
- if (!empty($rss->link->href)) $this->_link = (string) $rss->link->href;
- if (!empty($rss->title)) $this->_title = (string) $rss->title;
- if (!empty($rss->description)) $this->_description = (string) $rss->description;
- }
- else
- {
- //if (!empty($rss->channel['rss_language'])) $this->_language = (string) $rss->channel['rss_language'];
- if (!empty($rss->channel['generator'])) $this->_generator = (string) $rss->channel['generator'];
- //if (!empty($rss->channel['rss_copyright'])) $this->_copyright = (string) $rss->channel['rss_copyright'];
- if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
- //if (!empty($rss->image['rss_url'])) $this->_imageurl = (string) $rss->image['rss_url'];
- if (!empty($rss->channel['link'])) $this->_link = (string) $rss->channel['link'];
- if (!empty($rss->channel['title'])) $this->_title = (string) $rss->channel['title'];
- //if (!empty($rss->channel['rss_description'])) $this->_description = (string) $rss->channel['rss_description'];
- }
- if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
- $tmprss=xml2php($rss); $items=$tmprss['entry'];
- } // With simplexml
- else $items=$rss->items; // With xmlparse
- //var_dump($items);exit;
- }
+ if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
+ else $items = $rss->items; // With xmlparse
+ //var_dump($items);exit;
+ }
+ elseif ($rss->_format == 'atom')
+ {
+ //var_dump($rss);
+ if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+ {
+ if (!empty($rss->generator)) $this->_generator = (string) $rss->generator;
+ if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
+ if (!empty($rss->link->href)) $this->_link = (string) $rss->link->href;
+ if (!empty($rss->title)) $this->_title = (string) $rss->title;
+ if (!empty($rss->description)) $this->_description = (string) $rss->description;
+ }
+ else
+ {
+ //if (!empty($rss->channel['rss_language'])) $this->_language = (string) $rss->channel['rss_language'];
+ if (!empty($rss->channel['generator'])) $this->_generator = (string) $rss->channel['generator'];
+ //if (!empty($rss->channel['rss_copyright'])) $this->_copyright = (string) $rss->channel['rss_copyright'];
+ if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
+ //if (!empty($rss->image['rss_url'])) $this->_imageurl = (string) $rss->image['rss_url'];
+ if (!empty($rss->channel['link'])) $this->_link = (string) $rss->channel['link'];
+ if (!empty($rss->channel['title'])) $this->_title = (string) $rss->channel['title'];
+ //if (!empty($rss->channel['rss_description'])) $this->_description = (string) $rss->channel['rss_description'];
- $i = 0;
+ $this->_imageurl = $this->getAtomImageUrl($rss->channel);
+ }
+ if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+ $tmprss = xml2php($rss); $items = $tmprss['entry'];
+ } // With simplexml
+ else $items = $rss->items; // With xmlparse
+ //var_dump($items);exit;
+ }
- // Loop on each record
- if (is_array($items))
- {
- foreach($items as $item)
- {
- //var_dump($item);exit;
- if ($rss->_format == 'rss')
- {
- if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
- {
- $itemLink = (string) $item->link;
- $itemTitle = (string) $item->title;
- $itemDescription = (string) $item->description;
- $itemPubDate = (string) $item->pubDate;
- $itemId = '';
- $itemAuthor = '';
- }
- else
- {
- $itemLink = (string) $item['link'];
- $itemTitle = (string) $item['title'];
- $itemDescription = (string) $item['description'];
- $itemPubDate = (string) $item['pubdate'];
- $itemId = (string) $item['guid'];
- $itemAuthor = (string) $item['author'];
- }
+ $i = 0;
- // Loop on each category
- $itemCategory=array();
- if (is_array($item->category))
- {
- foreach ($item->category as $cat)
- {
- $itemCategory[] = (string) $cat;
- }
- }
- }
- elseif ($rss->_format == 'atom')
- {
- if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
- {
- $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
- $itemTitle = (string) $item['title'];
- $itemDescription = (string) $item['summary'];
- $itemPubDate = (string) $item['created'];
- $itemId = (string) $item['id'];
- $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
- }
- else
- {
- $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
- $itemTitle = (string) $item['title'];
- $itemDescription = (string) $item['summary'];
- $itemPubDate = (string) $item['created'];
- $itemId = (string) $item['id'];
- $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
- }
- }
- else print 'ErrorBadFeedFormat';
+ // Loop on each record
+ if (is_array($items))
+ {
+ foreach ($items as $item)
+ {
+ //var_dump($item);exit;
+ if ($rss->_format == 'rss')
+ {
+ if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+ {
+ $itemLink = (string) $item->link;
+ $itemTitle = (string) $item->title;
+ $itemDescription = (string) $item->description;
+ $itemPubDate = (string) $item->pubDate;
+ $itemId = '';
+ $itemAuthor = '';
+ }
+ else
+ {
+ $itemLink = (string) $item['link'];
+ $itemTitle = (string) $item['title'];
+ $itemDescription = (string) $item['description'];
+ $itemPubDate = (string) $item['pubdate'];
+ $itemId = (string) $item['guid'];
+ $itemAuthor = (string) $item['author'];
+ }
- // Add record to result array
- $this->_rssarray[$i] = array(
- 'link'=>$itemLink,
- 'title'=>$itemTitle,
- 'description'=>$itemDescription,
- 'pubDate'=>$itemPubDate,
- 'category'=>$itemCategory,
- 'id'=>$itemId,
- 'author'=>$itemAuthor);
- //var_dump($this->_rssarray);
+ // Loop on each category
+ $itemCategory = array();
+ if (is_array($item->category))
+ {
+ foreach ($item->category as $cat)
+ {
+ $itemCategory[] = (string) $cat;
+ }
+ }
+ }
+ elseif ($rss->_format == 'atom')
+ {
+ if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+ {
+ $itemLink = (isset($item['link']) ? (string) $item['link'] : '');
+ $itemTitle = (string) $item['title'];
+ $itemDescription = $this->getAtomItemDescription($item);
+ $itemPubDate = (string) $item['created'];
+ $itemId = (string) $item['id'];
+ $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
+ }
+ else
+ {
+ $itemLink = (isset($item['link']) ? (string) $item['link'] : '');
+ $itemTitle = (string) $item['title'];
+ $itemDescription = $this->getAtomItemDescription($item);
+ $itemPubDate = (string) $item['created'];
+ $itemId = (string) $item['id'];
+ $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
+ }
+ }
+ else print 'ErrorBadFeedFormat';
- $i++;
+ // Add record to result array
+ $this->_rssarray[$i] = array(
+ 'link'=>$itemLink,
+ 'title'=>$itemTitle,
+ 'description'=>$itemDescription,
+ 'pubDate'=>$itemPubDate,
+ 'category'=>$itemCategory,
+ 'id'=>$itemId,
+ 'author'=>$itemAuthor);
+ //var_dump($this->_rssarray);
- if ($i > $maxNb) break; // We get all records we want
- }
- }
+ $i++;
- return 1;
- }
- else
- {
- $this->error='ErrorFailedToLoadRSSFile';
- return -1;
- }
- }
+ if ($i > $maxNb) break; // We get all records we want
+ }
+ }
+
+ return 1;
+ }
+ else
+ {
+ $this->error = 'ErrorFailedToLoadRSSFile';
+ return -1;
+ }
+ }
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Triggered when opened tag is found
- *
- * @param string $p Start
- * @param string $element Tag
- * @param array $attrs Attributes of tags
- * @return void
- */
- public function feed_start_element($p, $element, &$attrs)
- {
- // phpcs:enable
- $el = $element = strtolower($element);
- $attrs = array_change_key_case($attrs, CASE_LOWER);
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Triggered when opened tag is found
+ *
+ * @param string $p Start
+ * @param string $element Tag
+ * @param array $attrs Attributes of tags
+ * @return void
+ */
+ public function feed_start_element($p, $element, &$attrs)
+ {
+ // phpcs:enable
+ $el = $element = strtolower($element);
+ $attrs = array_change_key_case($attrs, CASE_LOWER);
- // check for a namespace, and split if found
- $ns = false;
- if (strpos($element, ':'))
- {
- list($ns, $el) = explode(':', $element, 2);
- }
- if ( $ns and $ns != 'rdf' )
- {
- $this->current_namespace = $ns;
- }
+ // check for a namespace, and split if found
+ $ns = false;
+ if (strpos($element, ':'))
+ {
+ list($ns, $el) = explode(':', $element, 2);
+ }
+ if ($ns and $ns != 'rdf')
+ {
+ $this->current_namespace = $ns;
+ }
- // if feed type isn't set, then this is first element of feed identify feed from root element
- if (empty($this->_format))
- {
- if ( $el == 'rdf' ) {
- $this->_format = 'rss';
- $this->feed_version = '1.0';
- }
- elseif ( $el == 'rss' ) {
- $this->_format = 'rss';
- $this->feed_version = $attrs['version'];
- }
- elseif ( $el == 'feed' ) {
- $this->_format = 'atom';
- $this->feed_version = $attrs['version'];
- $this->inchannel = true;
- }
- return;
- }
+ // if feed type isn't set, then this is first element of feed identify feed from root element
+ if (empty($this->_format))
+ {
+ if ($el == 'rdf') {
+ $this->_format = 'rss';
+ $this->feed_version = '1.0';
+ }
+ elseif ($el == 'rss') {
+ $this->_format = 'rss';
+ $this->feed_version = $attrs['version'];
+ }
+ elseif ($el == 'feed') {
+ $this->_format = 'atom';
+ $this->feed_version = $attrs['version'];
+ $this->inchannel = true;
+ }
+ return;
+ }
- if ( $el == 'channel' )
- {
- $this->inchannel = true;
- }
- elseif ($el == 'item' or $el == 'entry' )
- {
- $this->initem = true;
- if ( isset($attrs['rdf:about']) ) {
- $this->current_item['about'] = $attrs['rdf:about'];
- }
- }
+ if ($el == 'channel')
+ {
+ $this->inchannel = true;
+ }
+ elseif ($el == 'item' or $el == 'entry')
+ {
+ $this->initem = true;
+ if (isset($attrs['rdf:about'])) {
+ $this->current_item['about'] = $attrs['rdf:about'];
+ }
+ }
- // if we're in the default namespace of an RSS feed,
- // record textinput or image fields
- elseif (
- $this->_format == 'rss' and
- $this->current_namespace == '' and
- $el == 'textinput' )
- {
- $this->intextinput = true;
- }
+ // if we're in the default namespace of an RSS feed,
+ // record textinput or image fields
+ elseif (
+ $this->_format == 'rss' and
+ $this->current_namespace == '' and
+ $el == 'textinput' )
+ {
+ $this->intextinput = true;
+ }
- elseif (
- $this->_format == 'rss' and
- $this->current_namespace == '' and
- $el == 'image' )
- {
- $this->inimage = true;
- }
+ elseif (
+ $this->_format == 'rss' and
+ $this->current_namespace == '' and
+ $el == 'image' )
+ {
+ $this->inimage = true;
+ }
- // handle atom content constructs
- elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
- {
- // avoid clashing w/ RSS mod_content
- if ($el == 'content' ) {
- $el = 'atom_content';
- }
+ // handle atom content constructs
+ elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
+ {
+ // avoid clashing w/ RSS mod_content
+ if ($el == 'content') {
+ $el = 'atom_content';
+ }
- $this->incontent = $el;
- }
+ $this->incontent = $el;
+ }
- // if inside an Atom content construct (e.g. content or summary) field treat tags as text
- elseif ($this->_format == 'atom' and $this->incontent )
- {
- // if tags are inlined, then flatten
- $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
+ // if inside an Atom content construct (e.g. content or summary) field treat tags as text
+ elseif ($this->_format == 'atom' and $this->incontent)
+ {
+ // if tags are inlined, then flatten
+ $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
- $this->append_content("<$element $attrs_str>");
+ $this->append_content("<$element $attrs_str>");
- array_unshift($this->stack, $el);
- }
+ array_unshift($this->stack, $el);
+ }
- // Atom support many links per containging element.
- // Magpie treats link elements of type rel='alternate'
- // as being equivalent to RSS's simple link element.
- //
- elseif ($this->_format == 'atom' and $el == 'link' )
- {
- if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
- {
- $link_el = 'link';
- }
- else {
- $link_el = 'link_' . $attrs['rel'];
- }
+ // Atom support many links per containging element.
+ // Magpie treats link elements of type rel='alternate'
+ // as being equivalent to RSS's simple link element.
+ //
+ elseif ($this->_format == 'atom' and $el == 'link')
+ {
+ if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
+ {
+ $link_el = 'link';
+ }
+ elseif (!isset($attrs['rel']))
+ {
+ $link_el = 'link';
+ }
+ else
+ {
+ $link_el = 'link_'.$attrs['rel'];
+ }
- $this->append($link_el, $attrs['href']);
- }
- // set stack[0] to current element
- else {
- array_unshift($this->stack, $el);
- }
- }
+ $this->append($link_el, $attrs['href']);
+ }
+ // set stack[0] to current element
+ else {
+ array_unshift($this->stack, $el);
+ }
+ }
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Triggered when CDATA is found
- *
- * @param string $p P
- * @param string $text Tag
- * @return void
- */
- public function feed_cdata($p, $text)
- {
- // phpcs:enable
- if ($this->_format == 'atom' and $this->incontent)
- {
- $this->append_content($text);
- }
- else
- {
- $current_el = join('_', array_reverse($this->stack));
- $this->append($current_el, $text);
- }
- }
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Triggered when CDATA is found
+ *
+ * @param string $p P
+ * @param string $text Tag
+ * @return void
+ */
+ public function feed_cdata($p, $text)
+ {
+ // phpcs:enable
+ if ($this->_format == 'atom' and $this->incontent)
+ {
+ $this->append_content($text);
+ }
+ else
+ {
+ $current_el = join('_', array_reverse($this->stack));
+ $this->append($current_el, $text);
+ }
+ }
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Triggered when closed tag is found
- *
- * @param string $p P
- * @param string $el Tag
- * @return void
- */
- public function feed_end_element($p, $el)
- {
- // phpcs:enable
- $el = strtolower($el);
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Triggered when closed tag is found
+ *
+ * @param string $p P
+ * @param string $el Tag
+ * @return void
+ */
+ public function feed_end_element($p, $el)
+ {
+ // phpcs:enable
+ $el = strtolower($el);
- if ($el == 'item' or $el == 'entry')
- {
- $this->items[] = $this->current_item;
- $this->current_item = array();
- $this->initem = false;
- }
- elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
- {
- $this->intextinput = false;
- }
- elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
- {
- $this->inimage = false;
- }
- elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
- {
- $this->incontent = false;
- }
- elseif ($el == 'channel' or $el == 'feed' )
- {
- $this->inchannel = false;
- }
- elseif ($this->_format == 'atom' and $this->incontent ) {
- // balance tags properly
- // note: i don't think this is actually neccessary
- if ( $this->stack[0] == $el )
- {
- $this->append_content("");
- }
- else {
- $this->append_content("<$el />");
- }
+ if ($el == 'item' or $el == 'entry')
+ {
+ $this->items[] = $this->current_item;
+ $this->current_item = array();
+ $this->initem = false;
+ }
+ elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
+ {
+ $this->intextinput = false;
+ }
+ elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
+ {
+ $this->inimage = false;
+ }
+ elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
+ {
+ $this->incontent = false;
+ }
+ elseif ($el == 'channel' or $el == 'feed')
+ {
+ $this->inchannel = false;
+ }
+ elseif ($this->_format == 'atom' and $this->incontent) {
+ // balance tags properly
+ // note: i don't think this is actually neccessary
+ if ($this->stack[0] == $el)
+ {
+ $this->append_content("");
+ }
+ else {
+ $this->append_content("<$el />");
+ }
- array_shift($this->stack);
- }
- else {
- array_shift($this->stack);
- }
+ array_shift($this->stack);
+ }
+ else {
+ array_shift($this->stack);
+ }
- $this->current_namespace = false;
- }
+ $this->current_namespace = false;
+ }
- /**
- * To concat 2 string with no warning if an operand is not defined
- *
- * @param string $str1 Str1
- * @param string $str2 Str2
- * @return string String cancatenated
- */
- public function concat(&$str1, $str2 = "")
- {
- if (!isset($str1) ) {
- $str1="";
- }
- $str1 .= $str2;
- }
+ /**
+ * To concat 2 string with no warning if an operand is not defined
+ *
+ * @param string $str1 Str1
+ * @param string $str2 Str2
+ * @return string String cancatenated
+ */
+ public function concat(&$str1, $str2 = "")
+ {
+ if (!isset($str1)) {
+ $str1 = "";
+ }
+ $str1 .= $str2;
+ }
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Enter description here ...
- *
- * @param string $text Text
- * @return void
- */
- public function append_content($text)
- {
- // phpcs:enable
- if ( $this->initem ) {
- $this->concat($this->current_item[ $this->incontent ], $text);
- }
- elseif ( $this->inchannel ) {
- $this->concat($this->channel[ $this->incontent ], $text);
- }
- }
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Enter description here ...
+ *
+ * @param string $text Text
+ * @return void
+ */
+ public function append_content($text)
+ {
+ // phpcs:enable
+ if ($this->initem) {
+ $this->concat($this->current_item[$this->incontent], $text);
+ }
+ elseif ($this->inchannel) {
+ $this->concat($this->channel[$this->incontent], $text);
+ }
+ }
- /**
- * smart append - field and namespace aware
- *
- * @param string $el El
- * @param string $text Text
- * @return void
- */
- public function append($el, $text)
- {
- if (!$el) {
- return;
- }
- if ( $this->current_namespace )
- {
- if ( $this->initem ) {
- $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
- }
- elseif ($this->inchannel) {
- $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
- }
- elseif ($this->intextinput) {
- $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
- }
- elseif ($this->inimage) {
- $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
- }
- }
- else {
- if ( $this->initem ) {
- $this->concat($this->current_item[ $el ], $text);
- }
- elseif ($this->intextinput) {
- $this->concat($this->textinput[ $el ], $text);
- }
- elseif ($this->inimage) {
- $this->concat($this->image[ $el ], $text);
- }
- elseif ($this->inchannel) {
- $this->concat($this->channel[ $el ], $text);
- }
- }
- }
+ /**
+ * smart append - field and namespace aware
+ *
+ * @param string $el El
+ * @param string $text Text
+ * @return void
+ */
+ public function append($el, $text)
+ {
+ if (!$el) {
+ return;
+ }
+ if ($this->current_namespace)
+ {
+ if ($this->initem) {
+ $this->concat($this->current_item[$this->current_namespace][$el], $text);
+ }
+ elseif ($this->inchannel) {
+ $this->concat($this->channel[$this->current_namespace][$el], $text);
+ }
+ elseif ($this->intextinput) {
+ $this->concat($this->textinput[$this->current_namespace][$el], $text);
+ }
+ elseif ($this->inimage) {
+ $this->concat($this->image[$this->current_namespace][$el], $text);
+ }
+ }
+ else {
+ if ($this->initem) {
+ $this->concat($this->current_item[$el], $text);
+ }
+ elseif ($this->intextinput) {
+ $this->concat($this->textinput[$el], $text);
+ }
+ elseif ($this->inimage) {
+ $this->concat($this->image[$el], $text);
+ }
+ elseif ($this->inchannel) {
+ $this->concat($this->channel[$el], $text);
+ }
+ }
+ }
+
+ /**
+ * Return a description/summary for one item from a ATOM feed
+ *
+ * @param array $item A parsed item of a ATOM feed
+ * @param int $maxlength (optional) The maximum length for the description
+ * @return string A summary description
+ */
+ private function getAtomItemDescription(array $item, $maxlength = 500)
+ {
+ $result = "";
+
+ if (isset($item['summary']))
+ {
+ $result = $item['summary'];
+ }
+ elseif (isset($item['atom_content']))
+ {
+ $result = $item['atom_content'];
+ }
+
+ // remove all HTML elements that can possible break the maximum size of a tooltip,
+ // like headings, image, video etc. and allow only simple style elements
+ $result = strip_tags($result, "
");
+
+ $result = str_replace("\n", "", $result);
+
+ if (strlen($result) > $maxlength)
+ {
+ $result = substr($result, 0, $maxlength);
+ $result .= "...";
+ }
+
+ return $result;
+ }
+
+ /**
+ * Return a URL to a image of the given ATOM feed
+ *
+ * @param array $feed The ATOM feed that possible contain a link to a logo or icon
+ * @return string A URL to a image from a ATOM feed when found, otherwise a empty string
+ */
+ private function getAtomImageUrl(array $feed)
+ {
+ if (isset($feed['icon']))
+ {
+ return $feed['logo'];
+ }
+
+ if (isset($feed['icon']))
+ {
+ return $feed['logo'];
+ }
+
+ if (isset($feed['webfeeds:logo']))
+ {
+ return $feed['webfeeds:logo'];
+ }
+
+ if (isset($feed['webfeeds:icon']))
+ {
+ return $feed['webfeeds:icon'];
+ }
+
+ if (isset($feed['webfeeds:wordmark']))
+ {
+ return $feed['webfeeds:wordmark'];
+ }
+
+ return "";
+ }
}
@@ -745,48 +823,48 @@ class RssParser
*/
function xml2php($xml)
{
- $fils = 0;
- $tab = false;
- $array = array();
- foreach($xml->children() as $key => $value)
- {
- $child = xml2php($value);
+ $fils = 0;
+ $tab = false;
+ $array = array();
+ foreach ($xml->children() as $key => $value)
+ {
+ $child = xml2php($value);
- //To deal with the attributes
- foreach($value->attributes() as $ak=>$av)
- {
- $child[$ak] = (string) $av;
- }
+ //To deal with the attributes
+ foreach ($value->attributes() as $ak=>$av)
+ {
+ $child[$ak] = (string) $av;
+ }
- //Let see if the new child is not in the array
- if ($tab === false && in_array($key, array_keys($array)))
- {
- //If this element is already in the array we will create an indexed array
- $tmp = $array[$key];
- $array[$key] = null;
- $array[$key][] = $tmp;
- $array[$key][] = $child;
- $tab = true;
- }
- elseif($tab === true)
- {
- //Add an element in an existing array
- $array[$key][] = $child;
- }
- else
- {
- //Add a simple element
- $array[$key] = $child;
- }
+ //Let see if the new child is not in the array
+ if ($tab === false && in_array($key, array_keys($array)))
+ {
+ //If this element is already in the array we will create an indexed array
+ $tmp = $array[$key];
+ $array[$key] = null;
+ $array[$key][] = $tmp;
+ $array[$key][] = $child;
+ $tab = true;
+ }
+ elseif ($tab === true)
+ {
+ //Add an element in an existing array
+ $array[$key][] = $child;
+ }
+ else
+ {
+ //Add a simple element
+ $array[$key] = $child;
+ }
- $fils++;
- }
+ $fils++;
+ }
- if ($fils==0)
- {
- return (string) $xml;
- }
+ if ($fils == 0)
+ {
+ return (string) $xml;
+ }
- return $array;
+ return $array;
}
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 2031d23eece..ba3c8199fca 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1379,9 +1379,10 @@ class SMTPs
$strContentAltText = '';
if ($strType == 'html')
{
- // Similar code to forge a text from html is also in CMailFile.class.php
- $strContentAltText = preg_replace("/]*>/", " ", $strContent);
- $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
+ // Similar code to forge a text from html is also in CMailFile.class.php
+ $strContentAltText = preg_replace('/.*<\/style><\/head>/', '', $strContent);
+ $strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);
+ $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
$strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));
}
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 2f2b44d6d79..5ea1a321bb5 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -810,7 +810,7 @@ class Translate
'uk'=>'uk_UA',
'vi'=>'vi_VN'
);
- if (strtolower($regs[1]) != strtolower($regs[2]) && ! in_array($dir, $arrayofspecialmainlanguages)) continue;
+ if (strtolower($regs[1]) != strtolower($regs[2]) && !in_array($dir, $arrayofspecialmainlanguages)) continue;
}
// We must keep only languages into MAIN_LANGUAGES_ALLOWED
if (!empty($conf->global->MAIN_LANGUAGES_ALLOWED) && !in_array($dir, explode(',', $conf->global->MAIN_LANGUAGES_ALLOWED))) continue;
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index ab009fa5f68..fc67eb2f2a0 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) Kai Blankenhorn <kaib@bitfolge.de>
* Copyright (C) 2005-2017 Laurent Destailleur <eldy@users.sourceforge.org>
+ * Copyright (C) 2020 Tobias Sekan <tobias.sekan@startmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -44,7 +45,7 @@ function encode($string)
*/
function dol_quoted_printable_encode($input, $line_max = 76)
{
- $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+ $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
$lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
$eol = "\r\n";
$linebreak = "=0D=0A";
@@ -57,23 +58,23 @@ function dol_quoted_printable_encode($input, $line_max = 76)
$line = $lines[$j];
$linlen = strlen($line);
$newline = "";
- for($i = 0; $i < $linlen; $i++) {
+ for ($i = 0; $i < $linlen; $i++) {
$c = substr($line, $i, 1);
$dec = ord($c);
- if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+ if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
$c = "=20";
- } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
- $h2 = floor($dec/16); $h1 = floor($dec%16);
+ } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+ $h2 = floor($dec / 16); $h1 = floor($dec % 16);
$c = $escape.$hex["$h2"].$hex["$h1"];
}
- if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+ if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
$newline = " ";
}
$newline .= $c;
} // end of for
$output .= $newline;
- if ($j<count($lines)-1) $output .= $linebreak;
+ if ($j < count($lines) - 1) $output .= $linebreak;
}
return trim($output);
}
@@ -88,7 +89,7 @@ class vCard
public $filename;
//var $encoding="UTF-8";
- public $encoding="ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+ public $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
/**
@@ -102,8 +103,8 @@ class vCard
{
// type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
$key = "TEL";
- if ($type!="") $key .= ";".$type;
- $key.= ";CHARSET=".$this->encoding;
+ if ($type != "") $key .= ";".$type;
+ $key .= ";CHARSET=".$this->encoding;
$this->properties[$key] = encode($number);
}
@@ -135,11 +136,11 @@ class vCard
/**
* mise en forme du nom complet
*
- * @param string $family Family
- * @param string $first First
- * @param string $additional Additionnal
- * @param string $prefix Prefix
- * @param string $suffix Suffix
+ * @param string $family Family name
+ * @param string $first First name
+ * @param string $additional Additional (e.g. second name, nick name)
+ * @param string $prefix Prefix (e.g. "Mr.", "Ms.", "Prof.")
+ * @param string $suffix Suffix (e.g. "sen." for senior, "jun." for junior)
* @return void
*/
public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
@@ -178,8 +179,8 @@ class vCard
{
// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
$key = "ADR";
- if ($type!="") $key.= ";$type";
- $key.= ";CHARSET=".$this->encoding;
+ if ($type != "") $key .= ";$type";
+ $key .= ";CHARSET=".$this->encoding;
$this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
@@ -204,27 +205,29 @@ class vCard
public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
{
$label = "";
- if ($postoffice!="") $label.= "$postoffice\r\n";
- if ($extended!="") $label.= "$extended\r\n";
- if ($street!="") $label.= "$street\r\n";
- if ($zip!="") $label.= "$zip ";
- if ($city!="") $label.= "$city\r\n";
- if ($region!="") $label.= "$region\r\n";
- if ($country!="") $country.= "$country\r\n";
+ if ($postoffice != "") $label .= "$postoffice\r\n";
+ if ($extended != "") $label .= "$extended\r\n";
+ if ($street != "") $label .= "$street\r\n";
+ if ($zip != "") $label .= "$zip ";
+ if ($city != "") $label .= "$city\r\n";
+ if ($region != "") $label .= "$region\r\n";
+ if ($country != "") $country .= "$country\r\n";
$this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
}
/**
- * mise en forme de l'email
+ * Add a e-mail address to this vCard
*
- * @param string $address EMail
- * @param string $type Vcard type
+ * @param string $address E-mail address
+ * @param string $type (optional) The type of the e-mail (typical "PREF;INTERNET" or "INTERNET")
* @return void
*/
- public function setEmail($address, $type = "internet,pref")
+ public function setEmail($address, $type = "TYPE=INTERNET;PREF")
{
- $this->properties["EMAIL;TYPE=".$type] = $address;
+ $key = "EMAIL";
+ if ($type != "") $key .= ";".$type;
+ $this->properties[$key] = $address;
}
/**
@@ -297,7 +300,7 @@ class vCard
{
// $type may be WORK | HOME
$key = "URL";
- if ($type!="") $key.= ";$type";
+ if ($type != "") $key .= ";$type";
$this->properties[$key] = $url;
}
@@ -309,15 +312,15 @@ class vCard
public function getVCard()
{
$text = "BEGIN:VCARD\r\n";
- $text.= "VERSION:3.0\r\n";
+ $text .= "VERSION:3.0\r\n";
//$text.= "VERSION:2.1\r\n";
- foreach($this->properties as $key => $value)
+ foreach ($this->properties as $key => $value)
{
- $text.= "$key:$value\r\n";
+ $text .= "$key:$value\r\n";
}
- $text.= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
- $text.= "MAILER: Dolibarr\r\n";
- $text.= "END:VCARD\r\n";
+ $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+ $text .= "MAILER: Dolibarr\r\n";
+ $text .= "END:VCARD\r\n";
return $text;
}
@@ -330,4 +333,32 @@ class vCard
{
return $this->filename;
}
+
+ /* Example from Microsoft Outlook 2019
+
+ BEGIN:VCARD
+ VERSION:2.1
+
+ N;LANGUAGE=de:surename;forename;secondname;Sir;jun.
+ FN:Sir surename secondname forename jun.
+ ORG:Companyname
+ TITLE:position
+ TEL;WORK;VOICE:work-phone-number
+ TEL;HOME;VOICE:private-phone-number
+ TEL;CELL;VOICE:mobile-phone-number
+ TEL;WORK;FAX:fax-phone-number
+ ADR;WORK;PREF:;;street and number;town;region;012345;Deutschland
+ LABEL;WORK;PREF;ENCODING=QUOTED-PRINTABLE:street and number=0D=0A=
+ =0D=0A=
+ 012345 town region
+ X-MS-OL-DEFAULT-POSTAL-ADDRESS:2
+ URL;WORK:www.mywebpage.de
+ EMAIL;PREF;INTERNET:test1@test1.de
+ EMAIL;INTERNET:test2@test2.de
+ EMAIL;INTERNET:test3@test3.de
+ X-MS-IMADDRESS:test@jabber.org
+ REV:20200424T104242Z
+
+ END:VCARD
+ */
}
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index 9f416079cce..204a30b4829 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -11,15 +11,15 @@ if (empty($keyforalias)) $keyforalias = 't';
dol_include_once($keyforclassfile);
if (class_exists($keyforclass))
{
- $tmpobject=new $keyforclass($this->db);
+ $tmpobject = new $keyforclass($this->db);
// Add common fields
- foreach($tmpobject->fields as $keyfield => $valuefield)
+ foreach ($tmpobject->fields as $keyfield => $valuefield)
{
- $fieldname = $keyforalias . '.' . $keyfield;
+ $fieldname = $keyforalias.'.'.$keyfield;
$fieldlabel = ucfirst($valuefield['label']);
$typeFilter = "Text";
- $typefield = preg_replace('/\(.*$/', '', $valuefield['type']); // double(24,8) -> double
+ $typefield = preg_replace('/\(.*$/', '', $valuefield['type']); // double(24,8) -> double
switch ($typefield) {
case 'int':
case 'integer':
@@ -48,7 +48,7 @@ if (class_exists($keyforclass))
*/
}
$helpfield = '';
- if (! empty($valuefield['help'])) {
+ if (!empty($valuefield['help'])) {
$helpfield = preg_replace('/\(.*$/', '', $valuefield['help']);
}
if ($valuefield['enabled']) {
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 9a93f886ef4..8375e5f6770 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -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/>.
*
- * This tool can be included into a list page with
+ * Note: This tool can be included into a list page with :
* define('USE_CUSTOME_REPORT_AS_INCLUDE', 1);
* include DOL_DOCUMENT_ROOT.'/core/customreports.php';
*/
@@ -214,6 +214,7 @@ if ($action == 'viewgraph') {
}
// Get all possible values of fields when a 'group by' is set, and save this into $arrayofvaluesforgroupby
+// $arrayofvaluesforgroupby will be used to forge lael of each grouped series
if (is_array($search_groupby) && count($search_groupby)) {
foreach ($search_groupby as $gkey => $gval) {
$gvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $gval);
@@ -260,11 +261,30 @@ if (is_array($search_groupby) && count($search_groupby)) {
$keytouse = (string) $obj->val;
$valuetranslated = $obj->val;
}
+
+ $regs = array();
if (!empty($object->fields[$gvalwithoutprefix]['arrayofkeyval'])) {
$valuetranslated = $object->fields[$gvalwithoutprefix]['arrayofkeyval'][$obj->val];
- if (is_null($valuetranslated)) $valuetranslated = $langs->transnoentitiesnoconv("UndefinedKey");
+ if (is_null($valuetranslated)) $valuetranslated = $langs->transnoentitiesnoconv("UndefinedKey");
$valuetranslated = $langs->trans($valuetranslated);
}
+ elseif (preg_match('/integer:([^:]+):([^:]+)$/', $object->fields[$gvalwithoutprefix]['type'], $regs)) {
+ $classname = $regs[1];
+ $classpath = $regs[2];
+ dol_include_once($classpath);
+ if (class_exists($classname)) {
+ $tmpobject = new $classname($db);
+ $tmpobject->fetch($obj->val);
+ foreach($tmpobject->fields as $fieldkey => $field) {
+ if ($field['showoncombobox']) {
+ $valuetranslated = $tmpobject->$fieldkey;
+ //if ($valuetranslated == '-') $valuetranslated = $langs->transnoentitiesnoconv("Unknown")
+ break;
+ }
+ }
+ //$valuetranslated = $tmpobject->ref.'eee';
+ }
+ }
$arrayofvaluesforgroupby['g_'.$gkey][$keytouse] = $valuetranslated;
}
@@ -313,7 +333,7 @@ foreach ($arrayoftype as $key => $val) {
}
}
print $form->selectarray('objecttype', $newarrayoftype, $objecttype, 0, 0, 0, '', 1, 0, 0, '', 'minwidth200', 1);
-if (empty($conf->use_javascript_ajax)) print '<input type="submit" class="button" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
+if (empty($conf->use_javascript_ajax)) print '<input type="submit" class="button buttongen" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
else {
print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
@@ -414,7 +434,7 @@ if ($mode == 'graph') {
print '</div>';
}
print '<div class="divadvancedsearchfield">';
-print '<input type="submit" class="button" value="'.$langs->trans("Refresh").'">';
+print '<input type="submit" class="button buttongen" value="'.$langs->trans("Refresh").'">';
print '</div>';
print '</div>';
print '</form>';
@@ -578,6 +598,8 @@ if ($sql) {
$fieldforxkey = 'x_0';
$xlabel = $obj->$fieldforxkey;
$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
+
+ // Define $xlabel
if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
}
@@ -657,6 +679,7 @@ if ($sql) {
$xlabel = $obj->$fieldforxkey;
$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
+ // Define $xlabel
if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
}
@@ -723,7 +746,12 @@ if ($mode == 'graph') {
$px1->draw($filenamenb, $fileurlnb);
- print $px1->show($totalnbofrecord ? 0 : $langs->trans("SelectYourGraphOptionsFirst"));
+ $texttoshow = $langs->trans("NoRecordFound");
+ if (! GETPOSTISSET('search_measures') || ! GETPOSTISSET('search_xaxis')) {
+ $texttoshow = $langs->trans("SelectYourGraphOptionsFirst");
+ }
+
+ print $px1->show($totalnbofrecord ? 0 : $texttoshow);
}
}
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index c37041967c2..3a75b4bdc90 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -26,26 +26,26 @@
* \brief File to manage popup date selector
*/
-if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1'); // disabled
+if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1'); // disabled
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
-if (! defined('NOLOGIN')) define('NOLOGIN', 1); // disabled
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN')) define('NOLOGIN', 1); // disabled
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
require_once '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
// Load translation files required by the page
-$langs->loadLangs(array("main","agenda"));
+$langs->loadLangs(array("main", "agenda"));
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
//var_dump($langs->defaultlang);
//var_dump($conf->format_date_short_java);
@@ -66,7 +66,7 @@ else
}
// Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8)
-$tradTemp=array(
+$tradTemp = array(
$langs->trans("January"),
$langs->trans("February"),
$langs->trans("March"),
@@ -82,7 +82,7 @@ $tradTemp=array(
);
print '<script type="text/javascript">';
print 'var tradMonths = [';
-foreach($tradTemp as $val)
+foreach ($tradTemp as $val)
{
print '"'.addslashes($val).'",';
}
@@ -93,15 +93,15 @@ print '</head>'."\n";
print '<body>'."\n";
-$qualified=true;
+$qualified = true;
-if (! isset($_GET["sd"])) $_GET["sd"]="00000000";
+if (!isset($_GET["sd"])) $_GET["sd"] = "00000000";
-if (! isset($_GET["m"]) || ! isset($_GET["y"])) $qualified=false;
+if (!isset($_GET["m"]) || !isset($_GET["y"])) $qualified = false;
if (isset($_GET["m"]) && isset($_GET["y"]))
{
- if ($_GET["m"] < 1 || $_GET["m"] > 12) $qualified=false;
- if ($_GET["y"] < 0 || $_GET["y"] > 9999) $qualified=false;
+ if ($_GET["m"] < 1 || $_GET["m"] > 12) $qualified = false;
+ if ($_GET["y"] < 0 || $_GET["y"] > 9999) $qualified = false;
}
// If parameters provided, we show calendar
@@ -126,10 +126,10 @@ print '</body></html>'."\n";
*/
function xyzToUnixTimestamp($mysqldate)
{
- $year=substr($mysqldate, 0, 4);
- $month=substr($mysqldate, 4, 2);
- $day=substr($mysqldate, 6, 2);
- $unixtimestamp=dol_mktime(12, 0, 0, $month, $day, $year);
+ $year = substr($mysqldate, 0, 4);
+ $month = substr($mysqldate, 4, 2);
+ $day = substr($mysqldate, 6, 2);
+ $unixtimestamp = dol_mktime(12, 0, 0, $month, $day, $year);
return $unixtimestamp;
}
@@ -143,22 +143,22 @@ function xyzToUnixTimestamp($mysqldate)
*/
function displayBox($selectedDate, $month, $year)
{
- global $langs,$conf;
+ global $langs, $conf;
//print "$selectedDate,$month,$year";
- $thedate=dol_mktime(12, 0, 0, $month, 1, $year);
+ $thedate = dol_mktime(12, 0, 0, $month, 1, $year);
//print "thedate=$thedate";
- $today=dol_now();
- $todayArray=dol_getdate($today);
- if($selectedDate != "00000000")
+ $today = dol_now();
+ $todayArray = dol_getdate($today);
+ if ($selectedDate != "00000000")
{
- $selDate=xyzToUnixTimestamp($selectedDate);
- $xyz=dol_print_date($selDate, "%Y%m%d");
+ $selDate = xyzToUnixTimestamp($selectedDate);
+ $xyz = dol_print_date($selDate, "%Y%m%d");
}
else
{
- $selDate=0;
- $xyz=0;
+ $selDate = 0;
+ $xyz = 0;
}
?>
<table class="dp">
@@ -175,40 +175,40 @@ function displayBox($selectedDate, $month, $year)
</tr>
<tr>
<td class="dpButtons"
- onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year-1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><<</td>
+ onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year - 1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><<</td>
<td class="dpButtons"
- onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if($month==1) echo "12"; else echo $month-1?>','<?php if($month==1) echo $year-1; else echo $year?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><</td>
+ onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if ($month == 1) echo "12"; else echo $month - 1?>','<?php if ($month == 1) echo $year - 1; else echo $year?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><</td>
<td colspan="3" class="dpButtons"
onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo (int) dol_print_date($today, '%m')?>','<?php echo $todayArray["year"]?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><?php echo '-' ?></td>
<td class="dpButtons"
- onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if($month==12) echo "1"; else echo $month+1?>','<?php if($month==12) echo $year+1; else echo $year;?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">></td>
+ onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if ($month == 12) echo "1"; else echo $month + 1?>','<?php if ($month == 12) echo $year + 1; else echo $year; ?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">></td>
<td class="dpButtons"
- onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year+1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">>></td>
+ onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year + 1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">>></td>
</tr>
<tr class="dpDayNames">
<?php
- $startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+ $startday = isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1;
$day_names = array('ShortSunday', 'ShortMonday', 'ShortTuesday', 'ShortWednesday', 'ShortThursday', 'ShortFriday', 'ShortSaturday');
- for( $i=0; $i < 7; $i++ )
+ for ($i = 0; $i < 7; $i++)
{
- echo '<td width="', (int) (($i+1)*100/7) - (int) ($i*100/7), '%">', $langs->trans($day_names[($i + $startday) % 7]), '</td>', "\n";
+ echo '<td width="', (int) (($i + 1) * 100 / 7) - (int) ($i * 100 / 7), '%">', $langs->trans($day_names[($i + $startday) % 7]), '</td>', "\n";
}
print '</tr>';
//print "x ".$thedate." y"; // $thedate = first day of month
- $firstdate=dol_getdate($thedate);
+ $firstdate = dol_getdate($thedate);
//var_dump($firstdateofweek);
- $mydate=dol_get_first_day_week(1, $month, $year, true); // mydate = cursor date
+ $mydate = dol_get_first_day_week(1, $month, $year, true); // mydate = cursor date
// Loop on each day of month
- $stoploop=0; $day=1; $cols=0;
- while (! $stoploop)
+ $stoploop = 0; $day = 1; $cols = 0;
+ while (!$stoploop)
{
//print_r($mydate);
if ($mydate < $firstdate) // At first run
{
echo "<tr class=\"dpWeek\">";
//echo $conf->global->MAIN_START_WEEK.' '.$firstdate["wday"].' '.$startday;
- $cols=0;
+ $cols = 0;
for ($i = 0; $i < 7; $i++)
{
$w = ($i + $startday) % 7;
@@ -226,15 +226,15 @@ function displayBox($selectedDate, $month, $year)
if ($mydate["wday"] == $startday)
{
echo "<tr class=\"dpWeek\">";
- $cols=0;
+ $cols = 0;
}
}
- $dayclass="dpReg";
- if($thedate==$selDate) $dayclass="dpSelected";
- elseif($thedate==$today) $dayclass="dpToday";
+ $dayclass = "dpReg";
+ if ($thedate == $selDate) $dayclass = "dpSelected";
+ elseif ($thedate == $today) $dayclass = "dpToday";
- if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput")
+ if ($langs->trans("FormatDateShortJavaInput") == "FormatDateShortJavaInput")
{
print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
exit;
@@ -251,29 +251,29 @@ function displayBox($selectedDate, $month, $year)
//$thedate=strtotime("tomorrow",$thedate);
$day++;
- $thedate=dol_mktime(12, 0, 0, $month, $day, $year);
+ $thedate = dol_mktime(12, 0, 0, $month, $day, $year);
if ($thedate == '')
{
- $stoploop=1;
+ $stoploop = 1;
}
else
{
- $mydate=dol_getdate($thedate);
- if ($firstdate["month"] != $mydate["month"]) $stoploop=1;
+ $mydate = dol_getdate($thedate);
+ if ($firstdate["month"] != $mydate["month"]) $stoploop = 1;
}
}
if ($cols < 7)
{
- for($i=6; $i>=$cols; $i--) echo "<td> </td>";
+ for ($i = 6; $i >= $cols; $i--) echo "<td> </td>";
echo "</tr>\n";
}
?>
<tr>
<td id="dpExp" class="dpExplanation" colspan="7"><?php
- if($selDate)
+ if ($selDate)
{
- $tempDate=dol_getdate($selDate);
+ $tempDate = dol_getdate($selDate);
print $langs->trans("Month".$selectMonth)." ";
print sprintf("%02s", $tempDate["mday"]);
print ", ".$selectYear;
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 8ca84e0dd10..96e76097877 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -22,7 +22,7 @@
* \brief Class file to manage Dolibarr database access
*/
-require_once DOL_DOCUMENT_ROOT .'/core/db/Database.interface.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/Database.interface.php';
/**
* Class to manage Dolibarr database access
@@ -34,9 +34,9 @@ abstract class DoliDB implements Database
/** @var string Database type */
public $type;
/** @var string Charset used to force charset when creating database */
- public $forcecharset='utf8';
+ public $forcecharset = 'utf8';
/** @var string Collate used to force collate when creating database */
- public $forcecollate='utf8_unicode_ci';
+ public $forcecollate = 'utf8_unicode_ci';
/** @var resource Resultset of last query */
private $_results;
/** @var bool true if connected, else false */
@@ -110,9 +110,9 @@ abstract class DoliDB implements Database
*/
public function begin()
{
- if (! $this->transaction_opened)
+ if (!$this->transaction_opened)
{
- $ret=$this->query("BEGIN");
+ $ret = $this->query("BEGIN");
if ($ret)
{
$this->transaction_opened++;
@@ -138,13 +138,13 @@ abstract class DoliDB implements Database
public function commit($log = '')
{
dol_syslog('', 0, -1);
- if ($this->transaction_opened<=1)
+ if ($this->transaction_opened <= 1)
{
- $ret=$this->query("COMMIT");
+ $ret = $this->query("COMMIT");
if ($ret)
{
- $this->transaction_opened=0;
- dol_syslog("COMMIT Transaction".($log?' '.$log:''), LOG_DEBUG);
+ $this->transaction_opened = 0;
+ dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
return 1;
}
else
@@ -168,11 +168,11 @@ abstract class DoliDB implements Database
public function rollback($log = '')
{
dol_syslog('', 0, -1);
- if ($this->transaction_opened<=1)
+ if ($this->transaction_opened <= 1)
{
- $ret=$this->query("ROLLBACK");
- $this->transaction_opened=0;
- dol_syslog("ROLLBACK Transaction".($log?' '.$log:''), LOG_DEBUG);
+ $ret = $this->query("ROLLBACK");
+ $this->transaction_opened = 0;
+ dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
return $ret;
}
else
@@ -193,7 +193,7 @@ abstract class DoliDB implements Database
{
global $conf;
if (empty($limit)) return "";
- if ($limit < 0) $limit=$conf->liste_limit;
+ if ($limit < 0) $limit = $conf->liste_limit;
if ($offset > 0) return " LIMIT $offset,$limit ";
else return " LIMIT $limit ";
}
@@ -227,18 +227,18 @@ abstract class DoliDB implements Database
*/
public function order($sortfield = null, $sortorder = null)
{
- if (! empty($sortfield))
+ if (!empty($sortfield))
{
- $return='';
- $fields=explode(',', $sortfield);
- $orders=explode(',', $sortorder);
- $i=0;
- foreach($fields as $val)
+ $return = '';
+ $fields = explode(',', $sortfield);
+ $orders = explode(',', $sortorder);
+ $i = 0;
+ foreach ($fields as $val)
{
- if (! $return) $return.=' ORDER BY ';
- else $return.=', ';
+ if (!$return) $return .= ' ORDER BY ';
+ else $return .= ', ';
- $return.=preg_replace('/[^0-9a-z_\.]/i', '', $val);
+ $return .= preg_replace('/[^0-9a-z_\.]/i', '', $val);
$tmpsortorder = trim($orders[$i]);
@@ -281,10 +281,10 @@ abstract class DoliDB implements Database
public function jdate($string, $gm = false)
{
// TODO GMT must set param gm to true by default
- if ($string==0 || $string=="0000-00-00 00:00:00") return '';
- $string=preg_replace('/([^0-9])/i', '', $string);
- $tmp=$string.'000000';
- $date=dol_mktime((int) substr($tmp, 8, 2), (int) substr($tmp, 10, 2), (int) substr($tmp, 12, 2), (int) substr($tmp, 4, 2), (int) substr($tmp, 6, 2), (int) substr($tmp, 0, 4), $gm);
+ if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
+ $string = preg_replace('/([^0-9])/i', '', $string);
+ $tmp = $string.'000000';
+ $date = dol_mktime((int) substr($tmp, 8, 2), (int) substr($tmp, 10, 2), (int) substr($tmp, 12, 2), (int) substr($tmp, 4, 2), (int) substr($tmp, 6, 2), (int) substr($tmp, 0, 4), $gm);
return $date;
}
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index 79d26949394..667f1986815 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -24,7 +24,7 @@
* \brief Fichier de la classe permettant de gerer une base MSSQL
*/
-require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
/**
* Classe de gestion de la database de dolibarr
@@ -32,15 +32,15 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
class DoliDBMssql extends DoliDB
{
//! Database type
- public $type='mssql';
+ public $type = 'mssql';
//! Database label
- const LABEL='MSSQL';
+ const LABEL = 'MSSQL';
//! Charset used to force charset when creating database
- public $forcecharset='latin1'; // Can't be static as it may be forced with a dynamic value
+ public $forcecharset = 'latin1'; // Can't be static as it may be forced with a dynamic value
//! Collate used to force collate when creating database
- public $forcecollate='latin1_swedish_ci'; // Can't be static as it may be forced with a dynamic value
+ public $forcecollate = 'latin1_swedish_ci'; // Can't be static as it may be forced with a dynamic value
//! Version min database
- const VERSIONMIN='2000';
+ const VERSIONMIN = '2000';
/** @var boolean|resource Resultset of last query */
private $_results;
@@ -59,25 +59,25 @@ class DoliDBMssql extends DoliDB
{
global $langs;
- $this->database_user=$user;
- $this->database_host=$host;
- $this->database_port=$port;
- $this->transaction_opened=0;
+ $this->database_user = $user;
+ $this->database_host = $host;
+ $this->database_port = $port;
+ $this->transaction_opened = 0;
- if (! function_exists("mssql_connect"))
+ if (!function_exists("mssql_connect"))
{
$this->connected = false;
$this->ok = false;
- $this->error="Mssql PHP functions for using MSSql driver are not available in this version of PHP";
+ $this->error = "Mssql PHP functions for using MSSql driver are not available in this version of PHP";
dol_syslog(get_class($this)."::DoliDBMssql : MSsql PHP functions for using MSsql driver are not available in this version of PHP", LOG_ERR);
return $this->ok;
}
- if (! $host)
+ if (!$host)
{
$this->connected = false;
$this->ok = false;
- $this->error=$langs->trans("ErrorWrongHostParameter");
+ $this->error = $langs->trans("ErrorWrongHostParameter");
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect, wrong host parameters", LOG_ERR);
return $this->ok;
}
@@ -96,7 +96,7 @@ class DoliDBMssql extends DoliDB
// host, login ou password incorrect
$this->connected = false;
$this->ok = false;
- $this->error=mssql_get_last_message();
+ $this->error = mssql_get_last_message();
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect mssql_get_last_message=".$this->error, LOG_ERR);
}
@@ -114,7 +114,7 @@ class DoliDBMssql extends DoliDB
$this->database_selected = false;
$this->database_name = '';
$this->ok = false;
- $this->error=$this->error();
+ $this->error = $this->error();
dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error, LOG_ERR);
}
}
@@ -166,15 +166,15 @@ class DoliDBMssql extends DoliDB
public function connect($host, $login, $passwd, $name, $port = 0)
{
dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
- $newhost=$host;
- if ($port) $newhost.=':'.$port;
- $this->db = @mssql_connect($newhost, $login, $passwd);
+ $newhost = $host;
+ if ($port) $newhost .= ':'.$port;
+ $this->db = @mssql_connect($newhost, $login, $passwd);
//force les enregistrement en latin1 si la base est en utf8 par defaut
// Supprime car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
// les nouvelles version de Dolibarr car force par l'install Dolibarr.
//$this->query('SET NAMES '.$this->forcecharset);
//print "Resultat fonction connect: ".$this->db;
- $set_options=array('SET ANSI_PADDING ON;',
+ $set_options = array('SET ANSI_PADDING ON;',
"SET ANSI_NULLS ON;",
"SET ANSI_WARNINGS ON;",
"SET ARITHABORT ON;",
@@ -193,10 +193,10 @@ class DoliDBMssql extends DoliDB
*/
public function getVersion()
{
- $resql=$this->query("SELECT @@VERSION");
+ $resql = $this->query("SELECT @@VERSION");
if ($resql)
{
- $version=$this->fetch_array($resql);
+ $version = $this->fetch_array($resql);
return $version['computed'];
}
else return '';
@@ -222,7 +222,7 @@ class DoliDBMssql extends DoliDB
{
if ($this->db) {
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
- $this->connected=false;
+ $this->connected = false;
return mssql_close($this->db);
}
return false;
@@ -237,13 +237,13 @@ class DoliDBMssql extends DoliDB
public function begin()
{
- $res=mssql_query('select @@TRANCOUNT');
- $this->transaction_opened=mssql_result($res, 0, 0);
+ $res = mssql_query('select @@TRANCOUNT');
+ $this->transaction_opened = mssql_result($res, 0, 0);
if ($this->transaction_opened == 0)
{
//return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTIONS ON' generate also a mess
- $ret=mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;", $this->db);
+ $ret = mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;", $this->db);
if ($ret)
{
dol_syslog("BEGIN Transaction", LOG_DEBUG);
@@ -264,13 +264,13 @@ class DoliDBMssql extends DoliDB
*/
public function commit($log = '')
{
- $res=mssql_query('select @@TRANCOUNT');
- $this->transaction_opened=mssql_result($res, 0, 0);
+ $res = mssql_query('select @@TRANCOUNT');
+ $this->transaction_opened = mssql_result($res, 0, 0);
if ($this->transaction_opened == 1)
{
//return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTION ON' generate also a mess
- $ret=mssql_query("COMMIT TRANSACTION", $this->db);
+ $ret = mssql_query("COMMIT TRANSACTION", $this->db);
if ($ret)
{
dol_syslog("COMMIT Transaction", LOG_DEBUG);
@@ -297,13 +297,13 @@ class DoliDBMssql extends DoliDB
*/
public function rollback($log = '')
{
- $res=mssql_query('select @@TRANCOUNT');
- $this->transaction_opened=mssql_result($res, 0, 0);
+ $res = mssql_query('select @@TRANCOUNT');
+ $this->transaction_opened = mssql_result($res, 0, 0);
if ($this->transaction_opened == 1)
{
- $ret=mssql_query("ROLLBACK TRANSACTION", $this->db);
- dol_syslog("ROLLBACK Transaction".($log?' '.$log:''), LOG_DEBUG);
+ $ret = mssql_query("ROLLBACK TRANSACTION", $this->db);
+ dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
return $ret;
}
elseif ($this->transaction_opened > 1)
@@ -334,51 +334,51 @@ class DoliDBMssql extends DoliDB
// Erreur SQL: cannot update timestamp field
$query = str_ireplace(", tms = tms", "", $query);
- $query=preg_replace("/([. ,\t(])(percent|file|public)([. ,=\t)])/", "$1[$2]$3", $query);
+ $query = preg_replace("/([. ,\t(])(percent|file|public)([. ,=\t)])/", "$1[$2]$3", $query);
- $original_query='';
+ $original_query = '';
- if ($type=="auto" || $type='dml')
+ if ($type == "auto" || $type = 'dml')
{
- $query=preg_replace('/AUTO_INCREMENT/i', 'IDENTITY', $query);
- $query=preg_replace('/double/i', 'float', $query);
- $query=preg_replace('/float\((.*)\)/', 'numeric($1)', $query);
- $query=preg_replace('/([ \t])unsigned|IF NOT EXISTS[ \t]/i', '$1', $query);
- $query=preg_replace('/([ \t])(MEDIUM|TINY|LONG){0,1}TEXT([ \t,])/i', "$1VARCHAR(MAX)$3", $query);
+ $query = preg_replace('/AUTO_INCREMENT/i', 'IDENTITY', $query);
+ $query = preg_replace('/double/i', 'float', $query);
+ $query = preg_replace('/float\((.*)\)/', 'numeric($1)', $query);
+ $query = preg_replace('/([ \t])unsigned|IF NOT EXISTS[ \t]/i', '$1', $query);
+ $query = preg_replace('/([ \t])(MEDIUM|TINY|LONG){0,1}TEXT([ \t,])/i', "$1VARCHAR(MAX)$3", $query);
- $matches=array();
+ $matches = array();
if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+(?:(UNIQUE)|INDEX)\h+(?:INDEX)?\h*(\w+?)\h*\((.+)\)/is', $query, $matches))
{
- $original_query=$query;
- $query="CREATE ".trim($matches[2])." INDEX [".trim($matches[3])."] ON [".trim($matches[1])."] (".trim($matches[4]).")";
+ $original_query = $query;
+ $query = "CREATE ".trim($matches[2])." INDEX [".trim($matches[3])."] ON [".trim($matches[1])."] (".trim($matches[4]).")";
if ($matches[2]) {
//check if columun is nullable cause Sql server only allow 1 null value if unique index.
- $fields=explode(",", trim($matches[4]));
- $fields_clear=array_map('trim', $fields);
- $infos=$this->GetFieldInformation(trim($matches[1]), $fields_clear);
- $query_comp=array();
+ $fields = explode(",", trim($matches[4]));
+ $fields_clear = array_map('trim', $fields);
+ $infos = $this->GetFieldInformation(trim($matches[1]), $fields_clear);
+ $query_comp = array();
if (is_array($infos)) {
- foreach($infos as $fld) {
+ foreach ($infos as $fld) {
if ($fld->IS_NULLABLE == 'YES') {
- $query_comp[]=$fld->COLUMN_NAME." IS NOT NULL";
+ $query_comp[] = $fld->COLUMN_NAME." IS NOT NULL";
}
}
}
- if (! empty($query_comp))
- $query.=" WHERE ".implode(" AND ", $query_comp);
+ if (!empty($query_comp))
+ $query .= " WHERE ".implode(" AND ", $query_comp);
}
}
else
{
if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
{
- $original_query=$query;
- $query="ALTER TABLE [".$matches[1]."] ADD CONSTRAINT [".$matches[2]."] PRIMARY KEY CLUSTERED (".$matches[3].")";
+ $original_query = $query;
+ $query = "ALTER TABLE [".$matches[1]."] ADD CONSTRAINT [".$matches[2]."] PRIMARY KEY CLUSTERED (".$matches[3].")";
}
}
}
- if ($type=="auto" || $type='ddl')
+ if ($type == "auto" || $type = 'ddl')
{
$itemfound = stripos($query, " limit ");
if ($itemfound !== false) {
@@ -414,20 +414,20 @@ class DoliDBMssql extends DoliDB
//var_dump($query);
//var_dump($matches);
//if (stripos($query,'llx_c_departements') !== false) var_dump($query);
- $sql='SET IDENTITY_INSERT ['.trim($matches[1]).'] ON;';
+ $sql = 'SET IDENTITY_INSERT ['.trim($matches[1]).'] ON;';
@mssql_query($sql, $this->db);
- $post_query='SET IDENTITY_INSERT ['.trim($matches[1]).'] OFF;';
+ $post_query = 'SET IDENTITY_INSERT ['.trim($matches[1]).'] OFF;';
}
}
//print "<!--".$query."-->";
- if (! in_array($query, array('BEGIN','COMMIT','ROLLBACK')))
+ if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
{
- $SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
+ $SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
}
- if (! $this->database_name)
+ if (!$this->database_name)
{
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
$ret = mssql_query($query, $this->db);
@@ -442,10 +442,10 @@ class DoliDBMssql extends DoliDB
@mssql_query($post_query, $this->db);
}
- if (! preg_match("/^COMMIT/i", $query) && ! preg_match("/^ROLLBACK/i", $query))
+ if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
{
// Si requete utilisateur, on la sauvegarde ainsi que son resultset
- if (! $ret)
+ if (!$ret)
{
$result = mssql_query("SELECT @@ERROR as code", $this->db);
$row = mssql_fetch_array($result);
@@ -458,7 +458,7 @@ class DoliDBMssql extends DoliDB
if ($original_query) dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
}
- $this->lastquery=$query;
+ $this->lastquery = $query;
$this->_results = $ret;
}
@@ -476,7 +476,7 @@ class DoliDBMssql extends DoliDB
{
// phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
return mssql_fetch_object($resultset);
}
@@ -491,7 +491,7 @@ class DoliDBMssql extends DoliDB
{
// phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
return mssql_fetch_array($resultset);
}
@@ -507,7 +507,7 @@ class DoliDBMssql extends DoliDB
{
// phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
return @mssql_fetch_row($resultset);
}
@@ -523,7 +523,7 @@ class DoliDBMssql extends DoliDB
{
// phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
return mssql_num_rows($resultset);
}
@@ -539,7 +539,7 @@ class DoliDBMssql extends DoliDB
{
// phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
// mssql necessite un link de base pour cette fonction contrairement
// a pqsql qui prend un resultset
$rsRows = mssql_query("select @@rowcount as rows", $this->db);
@@ -557,7 +557,7 @@ class DoliDBMssql extends DoliDB
public function free($resultset = null)
{
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
// Si resultset en est un, on libere la memoire
if (is_resource($resultset)) mssql_free_result($resultset);
}
@@ -593,7 +593,7 @@ class DoliDBMssql extends DoliDB
*/
public function errno()
{
- if (! $this->connected)
+ if (!$this->connected)
{
// Si il y a eu echec de connexion, $this->db n'est pas valide.
return 'DB_ERROR_FAILED_TO_CONNECT';
@@ -634,8 +634,8 @@ class DoliDBMssql extends DoliDB
{
return $errorcode_map[$this->lasterrno];
}
- $errno=$this->lasterrno;
- return ($errno?'DB_ERROR_'.$errno:'0');
+ $errno = $this->lasterrno;
+ return ($errno ? 'DB_ERROR_'.$errno : '0');
}
}
@@ -646,7 +646,7 @@ class DoliDBMssql extends DoliDB
*/
public function error()
{
- if (! $this->connected) {
+ if (!$this->connected) {
// Si il y a eu echec de connexion, $this->db n'est pas valide pour mssql_get_last_message.
return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
}
@@ -690,13 +690,13 @@ class DoliDBMssql extends DoliDB
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
- $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+ $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
//Encryption key
- $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+ $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
$return = $fieldorvalue;
- return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
+ return ($withQuotes ? "'" : "").$this->escape($return).($withQuotes ? "'" : "");
}
/**
@@ -710,10 +710,10 @@ class DoliDBMssql extends DoliDB
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
- $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+ $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
//Encryption key
- $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+ $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
$return = $value;
return $return;
@@ -729,10 +729,10 @@ class DoliDBMssql extends DoliDB
public function DDLGetConnectId()
{
// phpcs:enable
- $resql=$this->query('SELECT CONNECTION_ID()');
+ $resql = $this->query('SELECT CONNECTION_ID()');
if ($resql)
{
- $row=$this->fetch_row($resql);
+ $row = $this->fetch_row($resql);
return $row[0];
}
else return '?';
@@ -760,17 +760,17 @@ class DoliDBMssql extends DoliDB
$sql = 'CREATE DATABASE '.$this->EscapeFieldName($database);
//TODO: Check if we need to force a charset
//$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
- $ret=$this->query($sql);
+ $ret = $this->query($sql);
$this->select_db($database);
- $sql="CREATE USER [$owner] FOR LOGIN [$owner]";
+ $sql = "CREATE USER [$owner] FOR LOGIN [$owner]";
mssql_query($sql, $this->db);
- $sql="ALTER ROLE [db_owner] ADD MEMBER [$owner]";
+ $sql = "ALTER ROLE [db_owner] ADD MEMBER [$owner]";
mssql_query($sql, $this->db);
- $sql="ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
+ $sql = "ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
@mssql_query($sql, $this->db);
- $sql="ALTER DATABASE [$database] SET ANSI_NULL ON;";
+ $sql = "ALTER DATABASE [$database] SET ANSI_NULL ON;";
@mssql_query($sql, $this->db);
return $ret;
@@ -807,7 +807,7 @@ class DoliDBMssql extends DoliDB
// TODO: Implement
// May help: https://stackoverflow.com/questions/600446/sql-server-how-do-you-return-the-column-names-from-a-table
- $infotables=array();
+ $infotables = array();
return $infotables;
}
@@ -836,18 +836,18 @@ class DoliDBMssql extends DoliDB
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
$sql = "create table ".$table."(";
- $i=0;
- foreach($fields as $field_name => $field_desc)
+ $i = 0;
+ foreach ($fields as $field_name => $field_desc)
{
$sqlfields[$i] = $field_name." ";
- $sqlfields[$i] .= $field_desc['type'];
- if( preg_match("/^[^\s]/i", $field_desc['value']))
- $sqlfields[$i] .= "(".$field_desc['value'].")";
- elseif( preg_match("/^[^\s]/i", $field_desc['attribute']))
+ $sqlfields[$i] .= $field_desc['type'];
+ if (preg_match("/^[^\s]/i", $field_desc['value']))
+ $sqlfields[$i] .= "(".$field_desc['value'].")";
+ elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
$sqlfields[$i] .= " ".$field_desc['attribute'];
- elseif( preg_match("/^[^\s]/i", $field_desc['default']))
+ elseif (preg_match("/^[^\s]/i", $field_desc['default']))
{
- if(preg_match("/null/i", $field_desc['default']))
+ if (preg_match("/null/i", $field_desc['default']))
$sqlfields[$i] .= " default ".$field_desc['default'];
else
$sqlfields[$i] .= " default '".$field_desc['default']."'";
@@ -856,41 +856,41 @@ class DoliDBMssql extends DoliDB
$sqlfields[$i] .= " ".$field_desc['null'];
elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
- $sqlfields[$i] .= " ".$field_desc['extra'];
+ $sqlfields[$i] .= " ".$field_desc['extra'];
$i++;
}
- if($primary_key != "")
+ if ($primary_key != "")
$pk = "primary key(".$primary_key.")";
- if(is_array($unique_keys))
+ if (is_array($unique_keys))
{
$i = 0;
- foreach($unique_keys as $key => $value)
+ foreach ($unique_keys as $key => $value)
{
$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
$i++;
}
}
- if(is_array($keys))
+ if (is_array($keys))
{
$i = 0;
- foreach($keys as $key => $value)
+ foreach ($keys as $key => $value)
{
$sqlk[$i] = "KEY ".$key." (".$value.")";
$i++;
}
}
$sql .= implode(',', $sqlfields);
- if($primary_key != "")
+ if ($primary_key != "")
$sql .= ",".$pk;
- if(is_array($unique_keys))
+ if (is_array($unique_keys))
$sql .= ",".implode(',', $sqluq);
- if(is_array($keys))
+ if (is_array($keys))
$sql .= ",".implode(',', $sqlk);
- $sql .=") type=".$type;
+ $sql .= ") type=".$type;
dol_syslog($sql);
- if(! $this -> query($sql))
+ if (!$this -> query($sql))
return -1;
else
return 1;
@@ -908,7 +908,7 @@ class DoliDBMssql extends DoliDB
// phpcs:enable
$sql = "DROP TABLE ".$table;
- if (! $this->query($sql))
+ if (!$this->query($sql))
return -1;
else
return 1;
@@ -925,7 +925,7 @@ class DoliDBMssql extends DoliDB
public function DDLDescTable($table, $field = "")
{
// phpcs:enable
- $sql="DESC ".$table." ".$field;
+ $sql = "DESC ".$table." ".$field;
dol_syslog($sql);
$this->_results = $this->query($sql);
@@ -947,24 +947,24 @@ class DoliDBMssql extends DoliDB
// phpcs:enable
// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
- $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
+ $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
$sql .= $field_desc['type'];
- if( preg_match("/^[^\s]/i", $field_desc['value']))
+ if (preg_match("/^[^\s]/i", $field_desc['value']))
$sql .= "(".$field_desc['value'].")";
- if( preg_match("/^[^\s]/i", $field_desc['attribute']))
+ if (preg_match("/^[^\s]/i", $field_desc['attribute']))
$sql .= " ".$field_desc['attribute'];
- if( preg_match("/^[^\s]/i", $field_desc['null']))
+ if (preg_match("/^[^\s]/i", $field_desc['null']))
$sql .= " ".$field_desc['null'];
- if( preg_match("/^[^\s]/i", $field_desc['default']))
- if(preg_match("/null/i", $field_desc['default']))
+ if (preg_match("/^[^\s]/i", $field_desc['default']))
+ if (preg_match("/null/i", $field_desc['default']))
$sql .= " default ".$field_desc['default'];
else
$sql .= " default '".$field_desc['default']."'";
- if( preg_match("/^[^\s]/i", $field_desc['extra']))
+ if (preg_match("/^[^\s]/i", $field_desc['extra']))
$sql .= " ".$field_desc['extra'];
$sql .= " ".$field_position;
- if(! $this -> query($sql))
+ if (!$this -> query($sql))
return -1;
else
return 1;
@@ -985,11 +985,11 @@ class DoliDBMssql extends DoliDB
$sql = "ALTER TABLE ".$table;
$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
- $sql.="(".$field_desc['value'].")";
+ $sql .= "(".$field_desc['value'].")";
}
dol_syslog($sql, LOG_DEBUG);
- if (! $this->query($sql))
+ if (!$this->query($sql))
return -1;
else
return 1;
@@ -1006,11 +1006,11 @@ class DoliDBMssql extends DoliDB
public function DDLDropField($table, $field_name)
{
// phpcs:enable
- $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+ $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
dol_syslog($sql, LOG_DEBUG);
- if (! $this->query($sql))
+ if (!$this->query($sql))
{
- $this->error=$this->lasterror();
+ $this->error = $this->lasterror();
return -1;
}
else return 1;
@@ -1030,9 +1030,9 @@ class DoliDBMssql extends DoliDB
{
// phpcs:enable
$sql = "CREATE LOGIN ".$this->EscapeFieldName($dolibarr_main_db_user)." WITH PASSWORD='$dolibarr_main_db_pass'";
- dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
- $resql=$this->query($sql);
- if (! $resql)
+ dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+ $resql = $this->query($sql);
+ if (!$resql)
{
if ($this->lasterrno != '15025')
{
@@ -1044,9 +1044,9 @@ class DoliDBMssql extends DoliDB
dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
}
}
- $sql="SELECT name from sys.databases where name='".$dolibarr_main_db_name."'";
- $ressql=$this->query($sql);
- if (! $ressql)
+ $sql = "SELECT name from sys.databases where name='".$dolibarr_main_db_name."'";
+ $ressql = $this->query($sql);
+ if (!$ressql)
{
dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
return -1;
@@ -1056,9 +1056,9 @@ class DoliDBMssql extends DoliDB
if ($num)
{
$this->select_db($dolibarr_main_db_name);
- $sql="CREATE USER [$dolibarr_main_db_user] FOR LOGIN [$dolibarr_main_db_user]";
+ $sql = "CREATE USER [$dolibarr_main_db_user] FOR LOGIN [$dolibarr_main_db_user]";
$this->query($sql);
- $sql="ALTER ROLE [db_owner] ADD MEMBER [$dolibarr_main_db_user]";
+ $sql = "ALTER ROLE [db_owner] ADD MEMBER [$dolibarr_main_db_user]";
$this->query($sql);
}
}
@@ -1098,12 +1098,12 @@ class DoliDBMssql extends DoliDB
*/
public function getDefaultCollationDatabase()
{
- $resql=$this->query("SELECT SERVERPROPERTY('collation')");
+ $resql = $this->query("SELECT SERVERPROPERTY('collation')");
if (!$resql)
{
return $this->forcecollate;
}
- $liste=$this->fetch_array($resql);
+ $liste = $this->fetch_array($resql);
return $liste['computed'];
}
@@ -1158,7 +1158,7 @@ class DoliDBMssql extends DoliDB
// TODO: Implement
// May help: SELECT SERVERPROPERTY
- $result=array();
+ $result = array();
return $result;
}
@@ -1202,22 +1202,22 @@ class DoliDBMssql extends DoliDB
public function GetFieldInformation($table, $fields)
{
// phpcs:enable
- $sql="SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
+ $sql = "SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
if (is_array($fields))
{
- $where=" IN ('".implode("','", $fields)."')";
+ $where = " IN ('".implode("','", $fields)."')";
}
else
{
- $where="='".$this->escape($fields)."'";
+ $where = "='".$this->escape($fields)."'";
}
- $result=array();
- $ret=mssql_query($sql.$where, $this->db);
+ $result = array();
+ $ret = mssql_query($sql.$where, $this->db);
if ($ret)
{
- while($obj=mssql_fetch_object($ret))
+ while ($obj = mssql_fetch_object($ret))
{
- $result[]=$obj;
+ $result[] = $obj;
}
}
else
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index a6f35a69fb9..7c0d680662d 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -25,7 +25,7 @@
* \brief Class file to manage Dolibarr database access for a MySQL database
*/
-require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
/**
* Class to manage Dolibarr database access for a MySQL database using the MySQLi extension
@@ -35,11 +35,11 @@ class DoliDBMysqli extends DoliDB
/** @var mysqli Database object */
public $db;
//! Database type
- public $type='mysqli';
+ public $type = 'mysqli';
//! Database label
- const LABEL='MySQL or MariaDB';
+ const LABEL = 'MySQL or MariaDB';
//! Version min database
- const VERSIONMIN='5.0.3';
+ const VERSIONMIN = '5.0.3';
/** @var bool|mysqli_result Resultset of last query */
private $_results;
@@ -56,33 +56,33 @@ class DoliDBMysqli extends DoliDB
*/
public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
{
- global $conf,$langs;
+ global $conf, $langs;
// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
- if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
- if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+ if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+ if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
- $this->database_user=$user;
- $this->database_host=$host;
- $this->database_port=$port;
+ $this->database_user = $user;
+ $this->database_host = $host;
+ $this->database_port = $port;
- $this->transaction_opened=0;
+ $this->transaction_opened = 0;
//print "Name DB: $host,$user,$pass,$name<br>";
- if (! class_exists('mysqli'))
+ if (!class_exists('mysqli'))
{
$this->connected = false;
$this->ok = false;
- $this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
+ $this->error = "Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.", LOG_ERR);
}
- if (! $host)
+ if (!$host)
{
$this->connected = false;
$this->ok = false;
- $this->error=$langs->trans("ErrorWrongHostParameter");
+ $this->error = $langs->trans("ErrorWrongHostParameter");
dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters", LOG_ERR);
}
@@ -94,7 +94,7 @@ class DoliDBMysqli extends DoliDB
$this->connected = false;
$this->ok = false;
$this->error = $this->db->connect_error;
- dol_syslog(get_class($this) . "::DoliDBMysqli Connect error: " . $this->error, LOG_ERR);
+ dol_syslog(get_class($this)."::DoliDBMysqli Connect error: ".$this->error, LOG_ERR);
} else {
$this->connected = true;
$this->ok = true;
@@ -110,16 +110,16 @@ class DoliDBMysqli extends DoliDB
$this->ok = true;
// If client is old latin, we force utf8
- $clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
- if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+ $clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
+ if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
if ($this->db->character_set_name() != $clientmustbe) {
- $this->db->set_charset($clientmustbe); // This set charset, but with a bad collation
+ $this->db->set_charset($clientmustbe); // This set charset, but with a bad collation
$collation = $conf->db->dolibarr_main_db_collation;
- if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+ if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
- if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+ if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
}
}
else
@@ -127,7 +127,7 @@ class DoliDBMysqli extends DoliDB
$this->database_selected = false;
$this->database_name = '';
$this->ok = false;
- $this->error=$this->error();
+ $this->error = $this->error();
dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
}
}
@@ -139,18 +139,18 @@ class DoliDBMysqli extends DoliDB
if ($this->connected)
{
// If client is old latin, we force utf8
- $clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
- if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
- if (preg_match('/utf8mb4/', $clientmustbe)) $clientmustbe='utf8';
+ $clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
+ if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
+ if (preg_match('/utf8mb4/', $clientmustbe)) $clientmustbe = 'utf8';
if ($this->db->character_set_name() != $clientmustbe) {
- $this->db->set_charset($clientmustbe); // This set utf8_unicode_ci
+ $this->db->set_charset($clientmustbe); // This set utf8_unicode_ci
$collation = $conf->db->dolibarr_main_db_collation;
- if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
- if (preg_match('/utf8mb4/', $collation)) $collation='utf8_unicode_ci';
+ if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
+ if (preg_match('/utf8mb4/', $collation)) $collation = 'utf8_unicode_ci';
- if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+ if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
}
}
}
@@ -197,7 +197,7 @@ class DoliDBMysqli extends DoliDB
*/
public function connect($host, $login, $passwd, $name, $port = 0)
{
- dol_syslog(get_class($this) . "::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
+ dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
// Can also be
// mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
@@ -237,7 +237,7 @@ class DoliDBMysqli extends DoliDB
if ($this->db)
{
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
- $this->connected=false;
+ $this->connected = false;
return $this->db->close();
}
return false;
@@ -258,14 +258,14 @@ class DoliDBMysqli extends DoliDB
$query = trim($query);
- if (! in_array($query, array('BEGIN','COMMIT','ROLLBACK')))
+ if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
{
- $SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
+ $SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
}
- if (empty($query)) return false; // Return false = error if empty request
+ if (empty($query)) return false; // Return false = error if empty request
- if (! $this->database_name)
+ if (!$this->database_name)
{
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
$ret = $this->db->query($query);
@@ -275,20 +275,20 @@ class DoliDBMysqli extends DoliDB
$ret = $this->db->query($query);
}
- if (! preg_match("/^COMMIT/i", $query) && ! preg_match("/^ROLLBACK/i", $query))
+ if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
{
// Si requete utilisateur, on la sauvegarde ainsi que son resultset
- if (! $ret)
+ if (!$ret)
{
$this->lastqueryerror = $query;
$this->lasterror = $this->error();
$this->lasterrno = $this->errno();
- if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+ if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
//var_dump(debug_print_backtrace());
}
- $this->lastquery=$query;
+ $this->lastquery = $query;
$this->_results = $ret;
}
@@ -306,7 +306,7 @@ class DoliDBMysqli extends DoliDB
{
// phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
return $resultset->fetch_object();
}
@@ -322,7 +322,7 @@ class DoliDBMysqli extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
return $resultset->fetch_array();
}
@@ -337,9 +337,9 @@ class DoliDBMysqli extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_bool($resultset))
+ if (!is_bool($resultset))
{
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
return $resultset->fetch_row();
}
else
@@ -361,7 +361,7 @@ class DoliDBMysqli extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
return $resultset->num_rows;
}
@@ -377,7 +377,7 @@ class DoliDBMysqli extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
// mysql necessite un link de base pour cette fonction contrairement
// a pqsql qui prend un resultset
return $this->db->affected_rows;
@@ -393,7 +393,7 @@ class DoliDBMysqli extends DoliDB
public function free($resultset = null)
{
// If resultset not provided, we take the last used by connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
// Si resultset en est un, on libere la memoire
if (is_object($resultset)) $resultset->free_result();
}
@@ -416,7 +416,7 @@ class DoliDBMysqli extends DoliDB
*/
public function errno()
{
- if (! $this->connected) {
+ if (!$this->connected) {
// Si il y a eu echec de connexion, $this->db n'est pas valide.
return 'DB_ERROR_FAILED_TO_CONNECT';
} else {
@@ -448,15 +448,15 @@ class DoliDBMysqli extends DoliDB
1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
1216 => 'DB_ERROR_NO_PARENT',
1217 => 'DB_ERROR_CHILD_EXISTS',
- 1396 => 'DB_ERROR_USER_ALREADY_EXISTS', // When creating user already existing
+ 1396 => 'DB_ERROR_USER_ALREADY_EXISTS', // When creating user already existing
1451 => 'DB_ERROR_CHILD_EXISTS'
);
if (isset($errorcode_map[$this->db->errno])) {
return $errorcode_map[$this->db->errno];
}
- $errno=$this->db->errno;
- return ($errno?'DB_ERROR_'.$errno:'0');
+ $errno = $this->db->errno;
+ return ($errno ? 'DB_ERROR_'.$errno : '0');
}
}
@@ -467,7 +467,7 @@ class DoliDBMysqli extends DoliDB
*/
public function error()
{
- if (! $this->connected) {
+ if (!$this->connected) {
// Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
}
@@ -504,12 +504,12 @@ class DoliDBMysqli extends DoliDB
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
- $cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
+ $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
//Encryption key
- $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+ $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
- $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
+ $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
if ($cryptType && !empty($cryptKey))
{
@@ -537,10 +537,10 @@ class DoliDBMysqli extends DoliDB
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
- $cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
+ $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
//Encryption key
- $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+ $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
$return = $value;
@@ -569,10 +569,10 @@ class DoliDBMysqli extends DoliDB
public function DDLGetConnectId()
{
// phpcs:enable
- $resql=$this->query('SELECT CONNECTION_ID()');
+ $resql = $this->query('SELECT CONNECTION_ID()');
if ($resql)
{
- $row=$this->fetch_row($resql);
+ $row = $this->fetch_row($resql);
return $row[0];
}
else return '?';
@@ -593,21 +593,21 @@ class DoliDBMysqli extends DoliDB
public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
{
// phpcs:enable
- if (empty($charset)) $charset=$this->forcecharset;
- if (empty($collation)) $collation=$this->forcecollate;
+ if (empty($charset)) $charset = $this->forcecharset;
+ if (empty($collation)) $collation = $this->forcecollate;
// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
$sql = "CREATE DATABASE `".$this->escape($database)."`";
- $sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
+ $sql .= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
dol_syslog($sql, LOG_DEBUG);
- $ret=$this->query($sql);
- if (! $ret)
+ $ret = $this->query($sql);
+ if (!$ret)
{
// We try again for compatibility with Mysql < 4.1.1
$sql = "CREATE DATABASE `".$this->escape($database)."`";
dol_syslog($sql, LOG_DEBUG);
- $ret=$this->query($sql);
+ $ret = $this->query($sql);
}
return $ret;
}
@@ -623,16 +623,16 @@ class DoliDBMysqli extends DoliDB
public function DDLListTables($database, $table = '')
{
// phpcs:enable
- $listtables=array();
+ $listtables = array();
$like = '';
if ($table) $like = "LIKE '".$table."'";
- $sql="SHOW TABLES FROM ".$database." ".$like.";";
+ $sql = "SHOW TABLES FROM ".$database." ".$like.";";
//print $sql;
$result = $this->query($sql);
if ($result)
{
- while($row = $this->fetch_row($result))
+ while ($row = $this->fetch_row($result))
{
$listtables[] = $row[0];
}
@@ -650,15 +650,15 @@ class DoliDBMysqli extends DoliDB
public function DDLInfoTable($table)
{
// phpcs:enable
- $infotables=array();
+ $infotables = array();
- $sql="SHOW FULL COLUMNS FROM ".$table.";";
+ $sql = "SHOW FULL COLUMNS FROM ".$table.";";
dol_syslog($sql, LOG_DEBUG);
$result = $this->query($sql);
if ($result)
{
- while($row = $this->fetch_row($result))
+ while ($row = $this->fetch_row($result))
{
$infotables[] = $row;
}
@@ -687,19 +687,19 @@ class DoliDBMysqli extends DoliDB
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
$sql = "CREATE TABLE ".$table."(";
- $i=0;
- $sqlfields=array();
- foreach($fields as $field_name => $field_desc)
+ $i = 0;
+ $sqlfields = array();
+ foreach ($fields as $field_name => $field_desc)
{
$sqlfields[$i] = $field_name." ";
- $sqlfields[$i] .= $field_desc['type'];
- if( preg_match("/^[^\s]/i", $field_desc['value'])) {
+ $sqlfields[$i] .= $field_desc['type'];
+ if (preg_match("/^[^\s]/i", $field_desc['value'])) {
$sqlfields[$i] .= "(".$field_desc['value'].")";
}
- if( preg_match("/^[^\s]/i", $field_desc['attribute'])) {
+ if (preg_match("/^[^\s]/i", $field_desc['attribute'])) {
$sqlfields[$i] .= " ".$field_desc['attribute'];
}
- if( preg_match("/^[^\s]/i", $field_desc['default']))
+ if (preg_match("/^[^\s]/i", $field_desc['default']))
{
if ((preg_match("/null/i", $field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i", $field_desc['default']))) {
$sqlfields[$i] .= " default ".$field_desc['default'];
@@ -708,44 +708,44 @@ class DoliDBMysqli extends DoliDB
$sqlfields[$i] .= " default '".$field_desc['default']."'";
}
}
- if( preg_match("/^[^\s]/i", $field_desc['null'])) {
+ if (preg_match("/^[^\s]/i", $field_desc['null'])) {
$sqlfields[$i] .= " ".$field_desc['null'];
}
- if( preg_match("/^[^\s]/i", $field_desc['extra'])) {
+ if (preg_match("/^[^\s]/i", $field_desc['extra'])) {
$sqlfields[$i] .= " ".$field_desc['extra'];
}
$i++;
}
- if($primary_key != "")
+ if ($primary_key != "")
$pk = "primary key(".$primary_key.")";
- if(is_array($unique_keys)) {
+ if (is_array($unique_keys)) {
$i = 0;
- foreach($unique_keys as $key => $value)
+ foreach ($unique_keys as $key => $value)
{
$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
$i++;
}
}
- if(is_array($keys))
+ if (is_array($keys))
{
$i = 0;
- foreach($keys as $key => $value)
+ foreach ($keys as $key => $value)
{
$sqlk[$i] = "KEY ".$key." (".$value.")";
$i++;
}
}
$sql .= implode(',', $sqlfields);
- if($primary_key != "")
+ if ($primary_key != "")
$sql .= ",".$pk;
- if($unique_keys != "")
+ if ($unique_keys != "")
$sql .= ",".implode(',', $sqluq);
- if(is_array($keys))
+ if (is_array($keys))
$sql .= ",".implode(',', $sqlk);
- $sql .=") engine=".$type;
+ $sql .= ") engine=".$type;
- if(! $this->query($sql))
+ if (!$this->query($sql))
return -1;
else
return 1;
@@ -763,7 +763,7 @@ class DoliDBMysqli extends DoliDB
// phpcs:enable
$sql = "DROP TABLE ".$table;
- if (! $this->query($sql))
+ if (!$this->query($sql))
return -1;
else
return 1;
@@ -780,7 +780,7 @@ class DoliDBMysqli extends DoliDB
public function DDLDescTable($table, $field = "")
{
// phpcs:enable
- $sql="DESC ".$table." ".$field;
+ $sql = "DESC ".$table." ".$field;
dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
$this->_results = $this->query($sql);
@@ -802,35 +802,35 @@ class DoliDBMysqli extends DoliDB
// phpcs:enable
// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
- $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
- $sql.= $field_desc['type'];
+ $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
+ $sql .= $field_desc['type'];
if (preg_match("/^[^\s]/i", $field_desc['value']))
{
- if (! in_array($field_desc['type'], array('date','datetime')))
+ if (!in_array($field_desc['type'], array('date', 'datetime')))
{
- $sql.= "(".$field_desc['value'].")";
+ $sql .= "(".$field_desc['value'].")";
}
}
if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i", $field_desc['attribute']))
{
- $sql.= " ".$field_desc['attribute'];
+ $sql .= " ".$field_desc['attribute'];
}
if (isset($field_desc['null']) && preg_match("/^[^\s]/i", $field_desc['null']))
{
- $sql.= " ".$field_desc['null'];
+ $sql .= " ".$field_desc['null'];
}
if (isset($field_desc['default']) && preg_match("/^[^\s]/i", $field_desc['default']))
{
- if(preg_match("/null/i", $field_desc['default']))
- $sql.= " default ".$field_desc['default'];
+ if (preg_match("/null/i", $field_desc['default']))
+ $sql .= " default ".$field_desc['default'];
else
- $sql.= " default '".$field_desc['default']."'";
+ $sql .= " default '".$field_desc['default']."'";
}
if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
{
- $sql.= " ".$field_desc['extra'];
+ $sql .= " ".$field_desc['extra'];
}
- $sql.= " ".$field_position;
+ $sql .= " ".$field_position;
dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
if ($this->query($sql)) {
@@ -854,33 +854,33 @@ class DoliDBMysqli extends DoliDB
$sql = "ALTER TABLE ".$table;
$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
- $sql.="(".$field_desc['value'].")";
+ $sql .= "(".$field_desc['value'].")";
}
if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
{
// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
{
- $sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+ $sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
$this->query($sqlbis);
}
elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
{
- $sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+ $sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
$this->query($sqlbis);
}
- $sql.=" NOT NULL";
+ $sql .= " NOT NULL";
}
if ($field_desc['default'] != '')
{
- if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
- elseif ($field_desc['type'] != 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
+ if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
+ elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
}
dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
- if (! $this->query($sql))
+ if (!$this->query($sql))
return -1;
else
return 1;
@@ -897,12 +897,12 @@ class DoliDBMysqli extends DoliDB
public function DDLDropField($table, $field_name)
{
// phpcs:enable
- $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+ $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
if ($this->query($sql)) {
return 1;
}
- $this->error=$this->lasterror();
+ $this->error = $this->lasterror();
return -1;
}
@@ -921,9 +921,9 @@ class DoliDBMysqli extends DoliDB
{
// phpcs:enable
$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
- dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
- $resql=$this->query($sql);
- if (! $resql)
+ dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+ $resql = $this->query($sql);
+ if (!$resql)
{
if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
{
@@ -938,22 +938,22 @@ class DoliDBMysqli extends DoliDB
// Redo with localhost forced (sometimes user is created on %)
$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'@'localhost'";
- $resql=$this->query($sql);
+ $resql = $this->query($sql);
$sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
- dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
- $resql=$this->query($sql);
- if (! $resql)
+ dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+ $resql = $this->query($sql);
+ if (!$resql)
{
$this->error = "Connected user not allowed to GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '*****'";
return -1;
}
- $sql="FLUSH Privileges";
+ $sql = "FLUSH Privileges";
dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
- $resql=$this->query($sql);
- if (! $resql)
+ $resql = $this->query($sql);
+ if (!$resql)
{
return -1;
}
@@ -970,13 +970,13 @@ class DoliDBMysqli extends DoliDB
*/
public function getDefaultCharacterSetDatabase()
{
- $resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\'');
+ $resql = $this->query('SHOW VARIABLES LIKE \'character_set_database\'');
if (!$resql)
{
// version Mysql < 4.1.1
return $this->forcecharset;
}
- $liste=$this->fetch_array($resql);
+ $liste = $this->fetch_array($resql);
$tmpval = $liste['Value'];
return $tmpval;
@@ -989,12 +989,12 @@ class DoliDBMysqli extends DoliDB
*/
public function getListOfCharacterSet()
{
- $resql=$this->query('SHOW CHARSET');
+ $resql = $this->query('SHOW CHARSET');
$liste = array();
if ($resql)
{
$i = 0;
- while ($obj = $this->fetch_object($resql) )
+ while ($obj = $this->fetch_object($resql))
{
$liste[$i]['charset'] = $obj->Charset;
$liste[$i]['description'] = $obj->Description;
@@ -1016,13 +1016,13 @@ class DoliDBMysqli extends DoliDB
*/
public function getDefaultCollationDatabase()
{
- $resql=$this->query('SHOW VARIABLES LIKE \'collation_database\'');
+ $resql = $this->query('SHOW VARIABLES LIKE \'collation_database\'');
if (!$resql)
{
// version Mysql < 4.1.1
return $this->forcecollate;
}
- $liste=$this->fetch_array($resql);
+ $liste = $this->fetch_array($resql);
$tmpval = $liste['Value'];
return $tmpval;
@@ -1035,12 +1035,12 @@ class DoliDBMysqli extends DoliDB
*/
public function getListOfCollation()
{
- $resql=$this->query('SHOW COLLATION');
+ $resql = $this->query('SHOW COLLATION');
$liste = array();
if ($resql)
{
$i = 0;
- while ($obj = $this->fetch_object($resql) )
+ while ($obj = $this->fetch_object($resql))
{
$liste[$i]['collation'] = $obj->Collation;
$i++;
@@ -1060,14 +1060,14 @@ class DoliDBMysqli extends DoliDB
*/
public function getPathOfDump()
{
- $fullpathofdump='/pathtomysqldump/mysqldump';
+ $fullpathofdump = '/pathtomysqldump/mysqldump';
- $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+ $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
if ($resql)
{
- $liste=$this->fetch_array($resql);
- $basedir=$liste['Value'];
- $fullpathofdump=$basedir.(preg_match('/\/$/', $basedir)?'':'/').'bin/mysqldump';
+ $liste = $this->fetch_array($resql);
+ $basedir = $liste['Value'];
+ $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
}
return $fullpathofdump;
}
@@ -1079,14 +1079,14 @@ class DoliDBMysqli extends DoliDB
*/
public function getPathOfRestore()
{
- $fullpathofimport='/pathtomysql/mysql';
+ $fullpathofimport = '/pathtomysql/mysql';
- $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+ $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
if ($resql)
{
- $liste=$this->fetch_array($resql);
- $basedir=$liste['Value'];
- $fullpathofimport=$basedir.(preg_match('/\/$/', $basedir)?'':'/').'bin/mysql';
+ $liste = $this->fetch_array($resql);
+ $basedir = $liste['Value'];
+ $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
}
return $fullpathofimport;
}
@@ -1099,14 +1099,14 @@ class DoliDBMysqli extends DoliDB
*/
public function getServerParametersValues($filter = '')
{
- $result=array();
+ $result = array();
- $sql='SHOW VARIABLES';
- if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
- $resql=$this->query($sql);
+ $sql = 'SHOW VARIABLES';
+ if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+ $resql = $this->query($sql);
if ($resql)
{
- while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+ while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
}
return $result;
@@ -1120,14 +1120,14 @@ class DoliDBMysqli extends DoliDB
*/
public function getServerStatusValues($filter = '')
{
- $result=array();
+ $result = array();
- $sql='SHOW STATUS';
- if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
- $resql=$this->query($sql);
+ $sql = 'SHOW STATUS';
+ if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+ $resql = $this->query($sql);
if ($resql)
{
- while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+ while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
}
return $result;
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 455ae851a54..bf9b468d4a8 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -28,7 +28,7 @@
* \brief Fichier de la classe permettant de gerer une base pgsql
*/
-require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
/**
* Class to drive a Postgresql database for Dolibarr
@@ -36,15 +36,15 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
class DoliDBPgsql extends DoliDB
{
//! Database type
- public $type='pgsql'; // Name of manager
+ public $type = 'pgsql'; // Name of manager
//! Database label
- const LABEL='PostgreSQL'; // Label of manager
+ const LABEL = 'PostgreSQL'; // Label of manager
//! Charset
- public $forcecharset='UTF8'; // Can't be static as it may be forced with a dynamic value
+ public $forcecharset = 'UTF8'; // Can't be static as it may be forced with a dynamic value
//! Collate used to force collate when creating database
- public $forcecollate=''; // Can't be static as it may be forced with a dynamic value
+ public $forcecollate = ''; // Can't be static as it may be forced with a dynamic value
//! Version min database
- const VERSIONMIN='9.0.0'; // Version min database
+ const VERSIONMIN = '9.0.0'; // Version min database
/** @var resource Resultset of last query */
private $_results;
@@ -64,34 +64,34 @@ class DoliDBPgsql extends DoliDB
*/
public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
{
- global $conf,$langs;
+ global $conf, $langs;
// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
- if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
- if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+ if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+ if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
- $this->database_user=$user;
- $this->database_host=$host;
- $this->database_port=$port;
+ $this->database_user = $user;
+ $this->database_host = $host;
+ $this->database_port = $port;
- $this->transaction_opened=0;
+ $this->transaction_opened = 0;
//print "Name DB: $host,$user,$pass,$name<br>";
- if (! function_exists("pg_connect"))
+ if (!function_exists("pg_connect"))
{
$this->connected = false;
$this->ok = false;
- $this->error="Pgsql PHP functions are not available in this version of PHP";
+ $this->error = "Pgsql PHP functions are not available in this version of PHP";
dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP", LOG_ERR);
return $this->ok;
}
- if (! $host)
+ if (!$host)
{
$this->connected = false;
$this->ok = false;
- $this->error=$langs->trans("ErrorWrongHostParameter");
+ $this->error = $langs->trans("ErrorWrongHostParameter");
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters", LOG_ERR);
return $this->ok;
}
@@ -110,7 +110,7 @@ class DoliDBPgsql extends DoliDB
// host, login ou password incorrect
$this->connected = false;
$this->ok = false;
- $this->error='Host, login or password incorrect';
+ $this->error = 'Host, login or password incorrect';
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error, LOG_ERR);
}
@@ -128,7 +128,7 @@ class DoliDBPgsql extends DoliDB
$this->database_selected = false;
$this->database_name = '';
$this->ok = false;
- $this->error=$this->error();
+ $this->error = $this->error();
dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error, LOG_ERR);
}
}
@@ -174,103 +174,103 @@ class DoliDBPgsql extends DoliDB
if ($type == 'auto')
{
- if (preg_match('/ALTER TABLE/i', $line)) $type='dml';
- elseif (preg_match('/CREATE TABLE/i', $line)) $type='dml';
- elseif (preg_match('/DROP TABLE/i', $line)) $type='dml';
+ if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
+ elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
+ elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
}
- $line=preg_replace('/ as signed\)/i', ' as integer)', $line);
+ $line = preg_replace('/ as signed\)/i', ' as integer)', $line);
if ($type == 'dml')
{
- $line=preg_replace('/\s/', ' ', $line); // Replace tabulation with space
+ $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
// we are inside create table statement so lets process datatypes
if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
- $line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
- $line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
- $line=preg_replace('/,$/', '', $line);
+ $line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+ $line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+ $line = preg_replace('/,$/', '', $line);
}
// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
- $newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 SERIAL PRIMARY KEY', $line);
+ $newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 SERIAL PRIMARY KEY', $line);
//$line = "-- ".$line." replaced by --\n".$newline;
- $line=$newline;
+ $line = $newline;
}
if (preg_match('/[\s\t\(]*(\w*)[\s\t]+bigint.*auto_increment/i', $line, $reg)) {
- $newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+bigint.*auto_increment[^,]*/i', '\\1 \\2 BIGSERIAL PRIMARY KEY', $line);
+ $newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+bigint.*auto_increment[^,]*/i', '\\1 \\2 BIGSERIAL PRIMARY KEY', $line);
//$line = "-- ".$line." replaced by --\n".$newline;
- $line=$newline;
+ $line = $newline;
}
// tinyint type conversion
- $line=preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
- $line=preg_replace('/tinyint/i', 'smallint', $line);
+ $line = preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
+ $line = preg_replace('/tinyint/i', 'smallint', $line);
// nuke unsigned
- $line=preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
+ $line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
// blob -> text
- $line=preg_replace('/\w*blob/i', 'text', $line);
+ $line = preg_replace('/\w*blob/i', 'text', $line);
// tinytext/mediumtext -> text
- $line=preg_replace('/tinytext/i', 'text', $line);
- $line=preg_replace('/mediumtext/i', 'text', $line);
- $line=preg_replace('/longtext/i', 'text', $line);
+ $line = preg_replace('/tinytext/i', 'text', $line);
+ $line = preg_replace('/mediumtext/i', 'text', $line);
+ $line = preg_replace('/longtext/i', 'text', $line);
- $line=preg_replace('/text\([0-9]+\)/i', 'text', $line);
+ $line = preg_replace('/text\([0-9]+\)/i', 'text', $line);
// change not null datetime field to null valid ones
// (to support remapping of "zero time" to null
- $line=preg_replace('/datetime not null/i', 'datetime', $line);
- $line=preg_replace('/datetime/i', 'timestamp', $line);
+ $line = preg_replace('/datetime not null/i', 'datetime', $line);
+ $line = preg_replace('/datetime/i', 'timestamp', $line);
// double -> numeric
- $line=preg_replace('/^double/i', 'numeric', $line);
- $line=preg_replace('/(\s*)double/i', '\\1numeric', $line);
+ $line = preg_replace('/^double/i', 'numeric', $line);
+ $line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
// float -> numeric
- $line=preg_replace('/^float/i', 'numeric', $line);
- $line=preg_replace('/(\s*)float/i', '\\1numeric', $line);
+ $line = preg_replace('/^float/i', 'numeric', $line);
+ $line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
//Check tms timestamp field case (in Mysql this field is defautled to now and
// on update defaulted by now
- $line=preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
+ $line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
// nuke ON UPDATE CURRENT_TIMESTAMP
- $line=preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
+ $line = preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
// unique index(field1,field2)
if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
{
- $line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
+ $line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
}
// We remove end of requests "AFTER fieldxxx"
- $line=preg_replace('/\sAFTER [a-z0-9_]+/i', '', $line);
+ $line = preg_replace('/\sAFTER [a-z0-9_]+/i', '', $line);
// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
- $line=preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
+ $line = preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
// Translate order to rename fields
if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+ $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
}
// Translate order to modify field format
if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $newreg3=$reg[3];
- $newreg3=preg_replace('/ DEFAULT NULL/i', '', $newreg3);
- $newreg3=preg_replace('/ NOT NULL/i', '', $newreg3);
- $newreg3=preg_replace('/ NULL/i', '', $newreg3);
- $newreg3=preg_replace('/ DEFAULT 0/i', '', $newreg3);
- $newreg3=preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i', '', $newreg3);
- $line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+ $newreg3 = $reg[3];
+ $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+ $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+ $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+ $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+ $newreg3 = preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i', '', $newreg3);
+ $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
// TODO Add alter to set default value or null/not null if there is this in $reg[3]
}
@@ -279,7 +279,7 @@ class DoliDBPgsql extends DoliDB
if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $line.= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
+ $line .= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
}
// Translate order to drop primary keys
@@ -287,7 +287,7 @@ class DoliDBPgsql extends DoliDB
if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+ $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
}
// Translate order to drop foreign keys
@@ -295,42 +295,42 @@ class DoliDBPgsql extends DoliDB
if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+ $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
}
// Translate order to add foreign keys
// ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
{
- $line=preg_replace('/;$/', '', $line);
- $line.=" DEFERRABLE INITIALLY IMMEDIATE;";
+ $line = preg_replace('/;$/', '', $line);
+ $line .= " DEFERRABLE INITIALLY IMMEDIATE;";
}
// alter table add [unique] [index] (field1, field2 ...)
// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
{
- $fieldlist=$reg[4];
- $idxname=$reg[3];
- $tablename=$reg[1];
+ $fieldlist = $reg[4];
+ $idxname = $reg[3];
+ $tablename = $reg[1];
$line = "-- ".$line." replaced by --\n";
- $line.= "CREATE ".(preg_match('/UNIQUE/', $reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+ $line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
}
}
// To have postgresql case sensitive
- $count_like=0;
- $line=str_replace(' LIKE \'', ' ILIKE \'', $line, $count_like);
+ $count_like = 0;
+ $line = str_replace(' LIKE \'', ' ILIKE \'', $line, $count_like);
if (!empty($conf->global->PSQL_USE_UNACCENT) && $count_like > 0)
{
// @see https://docs.postgresql.fr/11/unaccent.html : 'unaccent()' function must be installed before
- $line=preg_replace('/\s+(\(+\s*)([a-zA-Z0-9\-\_\.]+) ILIKE /', ' \1unaccent(\2) ILIKE ', $line);
+ $line = preg_replace('/\s+(\(+\s*)([a-zA-Z0-9\-\_\.]+) ILIKE /', ' \1unaccent(\2) ILIKE ', $line);
}
- $line=str_replace(' LIKE BINARY \'', ' LIKE \'', $line);
+ $line = str_replace(' LIKE BINARY \'', ' LIKE \'', $line);
// Replace INSERT IGNORE into INSERT
- $line=preg_replace('/^INSERT IGNORE/', 'INSERT', $line);
+ $line = preg_replace('/^INSERT IGNORE/', 'INSERT', $line);
// Delete using criteria on other table must not declare twice the deleted table
// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
@@ -338,35 +338,35 @@ class DoliDBPgsql extends DoliDB
{
if ($reg[1] == $reg[2]) // If same table, we remove second one
{
- $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
+ $line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
}
}
// Remove () in the tables in FROM if 1 table
- $line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
+ $line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
//print $line."\n";
// Remove () in the tables in FROM if 2 table
- $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
+ $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
//print $line."\n";
// Remove () in the tables in FROM if 3 table
- $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
+ $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
//print $line."\n";
// Remove () in the tables in FROM if 4 table
- $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4', $line);
+ $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4', $line);
//print $line."\n";
// Remove () in the tables in FROM if 5 table
- $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4, \\5', $line);
+ $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4, \\5', $line);
//print $line."\n";
// Replace espacing \' by ''.
// By default we do not (should be already done by db->escape function if required
// except for sql insert in data file that are mysql escaped so we removed them to
// be compatible with standard_conforming_strings=on that considers \ as ordinary character).
- if ($unescapeslashquot) $line=preg_replace("/\\\'/", "''", $line);
+ if ($unescapeslashquot) $line = preg_replace("/\\\'/", "''", $line);
//print "type=".$type." newline=".$line."<br>\n";
}
@@ -417,20 +417,20 @@ class DoliDBPgsql extends DoliDB
$name = str_replace(array("\\", "'"), array("\\\\", "\\'"), $name);
$port = str_replace(array("\\", "'"), array("\\\\", "\\'"), $port);
- if (! $name) $name="postgres"; // When try to connect using admin user
+ if (!$name) $name = "postgres"; // When try to connect using admin user
// try first Unix domain socket (local)
- if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT'))
+ if ((!empty($host) && $host == "socket") && !defined('NOLOCALSOCKETPGCONNECT'))
{
- $con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'"; // $name may be empty
+ $con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'"; // $name may be empty
$this->db = @pg_connect($con_string);
}
// if local connection failed or not requested, use TCP/IP
- if (! $this->db)
+ if (!$this->db)
{
- if (! $host) $host = "localhost";
- if (! $port) $port = 5432;
+ if (!$host) $host = "localhost";
+ if (!$port) $port = 5432;
$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
$this->db = @pg_connect($con_string);
@@ -440,7 +440,7 @@ class DoliDBPgsql extends DoliDB
if ($this->db)
{
$this->database_name = $name;
- pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE); // Set verbosity to max
+ pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE); // Set verbosity to max
pg_query($this->db, "set datestyle = 'ISO, YMD';");
}
@@ -454,10 +454,10 @@ class DoliDBPgsql extends DoliDB
*/
public function getVersion()
{
- $resql=$this->query('SHOW server_version');
+ $resql = $this->query('SHOW server_version');
if ($resql)
{
- $liste=$this->fetch_array($resql);
+ $liste = $this->fetch_array($resql);
return $liste['server_version'];
}
return '';
@@ -484,7 +484,7 @@ class DoliDBPgsql extends DoliDB
if ($this->db)
{
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
- $this->connected=false;
+ $this->connected = false;
return pg_close($this->db);
}
return false;
@@ -505,21 +505,21 @@ class DoliDBPgsql extends DoliDB
$query = trim($query);
// Convert MySQL syntax to PostgresSQL syntax
- $query=$this->convertSQLFromMysql($query, $type, ($this->unescapeslashquot && $this->standard_conforming_strings));
+ $query = $this->convertSQLFromMysql($query, $type, ($this->unescapeslashquot && $this->standard_conforming_strings));
//print "After convertSQLFromMysql:\n".$query."<br>\n";
- if (! empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
+ if (!empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
{
// Fix bad formed requests. If request contains a date without quotes, we fix this but this should not occurs.
- $loop=true;
+ $loop = true;
while ($loop)
{
if (preg_match('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', $query))
{
- $query=preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', '\\1\'\\2\'', $query);
+ $query = preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', '\\1\'\\2\'', $query);
dol_syslog("Warning: Bad formed request converted into ".$query, LOG_WARNING);
}
- else $loop=false;
+ else $loop = false;
}
}
@@ -528,18 +528,18 @@ class DoliDBPgsql extends DoliDB
@pg_query($this->db, 'SAVEPOINT mysavepoint');
}
- if (! in_array($query, array('BEGIN','COMMIT','ROLLBACK')))
+ if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
{
- $SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
+ $SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
}
$ret = @pg_query($this->db, $query);
//print $query;
- if (! preg_match("/^COMMIT/i", $query) && ! preg_match("/^ROLLBACK/i", $query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+ if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
{
- if (! $ret)
+ if (!$ret)
{
if ($this->errno() != 'DB_ERROR_25P02') // Do not overwrite errors if this is a consecutive error
{
@@ -547,7 +547,7 @@ class DoliDBPgsql extends DoliDB
$this->lasterror = $this->error();
$this->lasterrno = $this->errno();
- if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+ if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
dol_syslog(get_class($this)."::query SQL Error usesavepoint = ".$usesavepoint, LOG_ERR);
}
@@ -557,7 +557,7 @@ class DoliDBPgsql extends DoliDB
@pg_query($this->db, 'ROLLBACK TO SAVEPOINT mysavepoint');
}
}
- $this->lastquery=$query;
+ $this->lastquery = $query;
$this->_results = $ret;
}
@@ -575,7 +575,7 @@ class DoliDBPgsql extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
return pg_fetch_object($resultset);
}
@@ -590,7 +590,7 @@ class DoliDBPgsql extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
return pg_fetch_array($resultset);
}
@@ -605,7 +605,7 @@ class DoliDBPgsql extends DoliDB
{
// phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
return pg_fetch_row($resultset);
}
@@ -621,7 +621,7 @@ class DoliDBPgsql extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
return pg_num_rows($resultset);
}
@@ -637,7 +637,7 @@ class DoliDBPgsql extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
// pgsql necessite un resultset pour cette fonction contrairement
// a mysql qui prend un link de base
return pg_affected_rows($resultset);
@@ -653,7 +653,7 @@ class DoliDBPgsql extends DoliDB
public function free($resultset = null)
{
// If resultset not provided, we take the last used by connexion
- if (! is_resource($resultset)) { $resultset=$this->_results; }
+ if (!is_resource($resultset)) { $resultset = $this->_results; }
// Si resultset en est un, on libere la memoire
if (is_resource($resultset)) pg_free_result($resultset);
}
@@ -670,7 +670,7 @@ class DoliDBPgsql extends DoliDB
{
global $conf;
if (empty($limit)) return "";
- if ($limit < 0) $limit=$conf->liste_limit;
+ if ($limit < 0) $limit = $conf->liste_limit;
if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
else return " LIMIT $limit ";
}
@@ -719,7 +719,7 @@ class DoliDBPgsql extends DoliDB
*/
public function errno()
{
- if (! $this->connected) {
+ if (!$this->connected) {
// Si il y a eu echec de connexion, $this->db n'est pas valide.
return 'DB_ERROR_FAILED_TO_CONNECT';
}
@@ -741,7 +741,7 @@ class DoliDBPgsql extends DoliDB
42701=> 'DB_ERROR_COLUMN_ALREADY_EXISTS',
'42710' => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
'23505' => 'DB_ERROR_RECORD_ALREADY_EXISTS',
- '42704' => 'DB_ERROR_NO_INDEX_TO_DROP', // May also be Type xxx does not exists
+ '42704' => 'DB_ERROR_NO_INDEX_TO_DROP', // May also be Type xxx does not exists
'42601' => 'DB_ERROR_SYNTAX',
'42P16' => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
@@ -755,18 +755,18 @@ class DoliDBPgsql extends DoliDB
'42P04' => 'DB_DATABASE_ALREADY_EXISTS'
);
- $errorlabel=pg_last_error($this->db);
- $errorcode='';
+ $errorlabel = pg_last_error($this->db);
+ $errorcode = '';
if (preg_match('/: *([0-9P]+):/', $errorlabel, $reg))
{
- $errorcode=$reg[1];
+ $errorcode = $reg[1];
if (isset($errorcode_map[$errorcode]))
{
return $errorcode_map[$errorcode];
}
}
- $errno=$errorcode?$errorcode:$errorlabel;
- return ($errno?'DB_ERROR_'.$errno:'0');
+ $errno = $errorcode ? $errorcode : $errorlabel;
+ return ($errno ? 'DB_ERROR_'.$errno : '0');
}
// '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => 'DB_ERROR_NOSUCHTABLE',
// '/table [\"\'].*[\"\'] does not exist/' => 'DB_ERROR_NOSUCHTABLE',
@@ -801,7 +801,7 @@ class DoliDBPgsql extends DoliDB
// phpcs:enable
//$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
$result = pg_query($this->db, "SELECT currval('".$tab."_".$fieldid."_seq')");
- if (! $result)
+ if (!$result)
{
print pg_last_error($this->db);
exit;
@@ -824,13 +824,13 @@ class DoliDBPgsql extends DoliDB
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
- $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+ $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
//Encryption key
- $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+ $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
$return = $fieldorvalue;
- return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
+ return ($withQuotes ? "'" : "").$this->escape($return).($withQuotes ? "'" : "");
}
@@ -845,10 +845,10 @@ class DoliDBPgsql extends DoliDB
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
- $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+ $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
//Encryption key
- $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+ $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
$return = $value;
return $return;
@@ -884,15 +884,15 @@ class DoliDBPgsql extends DoliDB
public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
{
// phpcs:enable
- if (empty($charset)) $charset=$this->forcecharset;
- if (empty($collation)) $collation=$this->forcecollate;
+ if (empty($charset)) $charset = $this->forcecharset;
+ if (empty($collation)) $collation = $this->forcecollate;
// Test charset match LC_TYPE (pgsql error otherwise)
//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
- $sql='CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
+ $sql = 'CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
dol_syslog($sql, LOG_DEBUG);
- $ret=$this->query($sql);
+ $ret = $this->query($sql);
return $ret;
}
@@ -907,14 +907,14 @@ class DoliDBPgsql extends DoliDB
public function DDLListTables($database, $table = '')
{
// phpcs:enable
- $listtables=array();
+ $listtables = array();
$like = '';
if ($table) $like = " AND table_name LIKE '".$table."'";
$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");
if ($result)
{
- while($row = $this->fetch_row($result))
+ while ($row = $this->fetch_row($result))
{
$listtables[] = $row[0];
}
@@ -933,29 +933,29 @@ class DoliDBPgsql extends DoliDB
public function DDLInfoTable($table)
{
// phpcs:enable
- $infotables=array();
+ $infotables = array();
- $sql="SELECT ";
- $sql.=" infcol.column_name as \"Column\",";
- $sql.=" CASE WHEN infcol.character_maximum_length IS NOT NULL THEN infcol.udt_name || '('||infcol.character_maximum_length||')'";
- $sql.=" ELSE infcol.udt_name";
- $sql.=" END as \"Type\",";
- $sql.=" infcol.collation_name as \"Collation\",";
- $sql.=" infcol.is_nullable as \"Null\",";
- $sql.=" '' as \"Key\",";
- $sql.=" infcol.column_default as \"Default\",";
- $sql.=" '' as \"Extra\",";
- $sql.=" '' as \"Privileges\"";
- $sql.=" FROM information_schema.columns infcol";
- $sql.=" WHERE table_schema='public' ";
- $sql.=" AND table_name='".$table."'";
- $sql.=" ORDER BY ordinal_position;";
+ $sql = "SELECT ";
+ $sql .= " infcol.column_name as \"Column\",";
+ $sql .= " CASE WHEN infcol.character_maximum_length IS NOT NULL THEN infcol.udt_name || '('||infcol.character_maximum_length||')'";
+ $sql .= " ELSE infcol.udt_name";
+ $sql .= " END as \"Type\",";
+ $sql .= " infcol.collation_name as \"Collation\",";
+ $sql .= " infcol.is_nullable as \"Null\",";
+ $sql .= " '' as \"Key\",";
+ $sql .= " infcol.column_default as \"Default\",";
+ $sql .= " '' as \"Extra\",";
+ $sql .= " '' as \"Privileges\"";
+ $sql .= " FROM information_schema.columns infcol";
+ $sql .= " WHERE table_schema='public' ";
+ $sql .= " AND table_name='".$table."'";
+ $sql .= " ORDER BY ordinal_position;";
dol_syslog($sql, LOG_DEBUG);
$result = $this->query($sql);
if ($result)
{
- while($row = $this->fetch_row($result))
+ while ($row = $this->fetch_row($result))
{
$infotables[] = $row;
}
@@ -985,61 +985,61 @@ class DoliDBPgsql extends DoliDB
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
$sql = "create table ".$table."(";
- $i=0;
- foreach($fields as $field_name => $field_desc)
+ $i = 0;
+ foreach ($fields as $field_name => $field_desc)
{
$sqlfields[$i] = $field_name." ";
- $sqlfields[$i] .= $field_desc['type'];
- if( preg_match("/^[^\s]/i", $field_desc['value']))
- $sqlfields[$i] .= "(".$field_desc['value'].")";
- elseif( preg_match("/^[^\s]/i", $field_desc['attribute']))
+ $sqlfields[$i] .= $field_desc['type'];
+ if (preg_match("/^[^\s]/i", $field_desc['value']))
+ $sqlfields[$i] .= "(".$field_desc['value'].")";
+ elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
$sqlfields[$i] .= " ".$field_desc['attribute'];
- elseif( preg_match("/^[^\s]/i", $field_desc['default']))
+ elseif (preg_match("/^[^\s]/i", $field_desc['default']))
{
- if(preg_match("/null/i", $field_desc['default']))
+ if (preg_match("/null/i", $field_desc['default']))
$sqlfields[$i] .= " default ".$field_desc['default'];
else
$sqlfields[$i] .= " default '".$field_desc['default']."'";
}
- elseif( preg_match("/^[^\s]/i", $field_desc['null']))
+ elseif (preg_match("/^[^\s]/i", $field_desc['null']))
$sqlfields[$i] .= " ".$field_desc['null'];
- elseif( preg_match("/^[^\s]/i", $field_desc['extra']))
+ elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
$sqlfields[$i] .= " ".$field_desc['extra'];
$i++;
}
- if($primary_key != "")
+ if ($primary_key != "")
$pk = "primary key(".$primary_key.")";
- if(is_array($unique_keys))
+ if (is_array($unique_keys))
{
$i = 0;
- foreach($unique_keys as $key => $value)
+ foreach ($unique_keys as $key => $value)
{
$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
$i++;
}
}
- if(is_array($keys))
+ if (is_array($keys))
{
$i = 0;
- foreach($keys as $key => $value)
+ foreach ($keys as $key => $value)
{
$sqlk[$i] = "KEY ".$key." (".$value.")";
$i++;
}
}
$sql .= implode(',', $sqlfields);
- if($primary_key != "")
+ if ($primary_key != "")
$sql .= ",".$pk;
- if(is_array($unique_keys))
+ if (is_array($unique_keys))
$sql .= ",".implode(',', $sqluq);
- if(is_array($keys))
+ if (is_array($keys))
$sql .= ",".implode(',', $sqlk);
- $sql .=") type=".$type;
+ $sql .= ") type=".$type;
dol_syslog($sql, LOG_DEBUG);
- if(! $this->query($sql))
+ if (!$this->query($sql))
return -1;
else
return 1;
@@ -1057,7 +1057,7 @@ class DoliDBPgsql extends DoliDB
// phpcs:enable
$sql = "DROP TABLE ".$table;
- if (! $this->query($sql))
+ if (!$this->query($sql))
return -1;
else
return 1;
@@ -1079,9 +1079,9 @@ class DoliDBPgsql extends DoliDB
// Note: using ' on user does not works with pgsql
$sql = "CREATE USER ".$this->escape($dolibarr_main_db_user)." with password '".$this->escape($dolibarr_main_db_pass)."'";
- dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
- $resql=$this->query($sql);
- if (! $resql)
+ dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+ $resql = $this->query($sql);
+ if (!$resql)
{
return -1;
}
@@ -1100,9 +1100,9 @@ class DoliDBPgsql extends DoliDB
public function DDLDescTable($table, $field = "")
{
// phpcs:enable
- $sql ="SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";
- $sql.=" AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
- if ($field) $sql.= " AND attname = '".$field."'";
+ $sql = "SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";
+ $sql .= " AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
+ if ($field) $sql .= " AND attname = '".$field."'";
dol_syslog($sql, LOG_DEBUG);
$this->_results = $this->query($sql);
@@ -1124,12 +1124,12 @@ class DoliDBPgsql extends DoliDB
// phpcs:enable
// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
- $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
+ $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
$sql .= $field_desc['type'];
if (preg_match("/^[^\s]/i", $field_desc['value']))
- if (! in_array($field_desc['type'], array('int','date','datetime')))
+ if (!in_array($field_desc['type'], array('int', 'date', 'datetime')))
{
- $sql.= "(".$field_desc['value'].")";
+ $sql .= "(".$field_desc['value'].")";
}
if (preg_match("/^[^\s]/i", $field_desc['attribute']))
$sql .= " ".$field_desc['attribute'];
@@ -1148,7 +1148,7 @@ class DoliDBPgsql extends DoliDB
$sql .= " ".$field_position;
dol_syslog($sql, LOG_DEBUG);
- if (! $this -> query($sql))
+ if (!$this -> query($sql))
return -1;
return 1;
}
@@ -1168,7 +1168,7 @@ class DoliDBPgsql extends DoliDB
$sql = "ALTER TABLE ".$table;
$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
- $sql.="(".$field_desc['value'].")";
+ $sql .= "(".$field_desc['value'].")";
}
if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
@@ -1176,24 +1176,24 @@ class DoliDBPgsql extends DoliDB
// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
{
- $sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+ $sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
$this->query($sqlbis);
}
elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
{
- $sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+ $sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
$this->query($sqlbis);
}
}
if ($field_desc['default'] != '')
{
- if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
- elseif ($field_desc['type'] != 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
+ if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
+ elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
}
dol_syslog($sql, LOG_DEBUG);
- if (! $this->query($sql))
+ if (!$this->query($sql))
return -1;
return 1;
}
@@ -1209,11 +1209,11 @@ class DoliDBPgsql extends DoliDB
public function DDLDropField($table, $field_name)
{
// phpcs:enable
- $sql= "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
+ $sql = "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
dol_syslog($sql, LOG_DEBUG);
- if (! $this->query($sql))
+ if (!$this->query($sql))
{
- $this->error=$this->lasterror();
+ $this->error = $this->lasterror();
return -1;
}
return 1;
@@ -1226,10 +1226,10 @@ class DoliDBPgsql extends DoliDB
*/
public function getDefaultCharacterSetDatabase()
{
- $resql=$this->query('SHOW SERVER_ENCODING');
+ $resql = $this->query('SHOW SERVER_ENCODING');
if ($resql)
{
- $liste=$this->fetch_array($resql);
+ $liste = $this->fetch_array($resql);
return $liste['server_encoding'];
}
else return '';
@@ -1242,7 +1242,7 @@ class DoliDBPgsql extends DoliDB
*/
public function getListOfCharacterSet()
{
- $resql=$this->query('SHOW SERVER_ENCODING');
+ $resql = $this->query('SHOW SERVER_ENCODING');
$liste = array();
if ($resql)
{
@@ -1267,10 +1267,10 @@ class DoliDBPgsql extends DoliDB
*/
public function getDefaultCollationDatabase()
{
- $resql=$this->query('SHOW LC_COLLATE');
+ $resql = $this->query('SHOW LC_COLLATE');
if ($resql)
{
- $liste=$this->fetch_array($resql);
+ $liste = $this->fetch_array($resql);
return $liste['lc_collate'];
}
else return '';
@@ -1283,12 +1283,12 @@ class DoliDBPgsql extends DoliDB
*/
public function getListOfCollation()
{
- $resql=$this->query('SHOW LC_COLLATE');
+ $resql = $this->query('SHOW LC_COLLATE');
$liste = array();
if ($resql)
{
$i = 0;
- while ($obj = $this->fetch_object($resql) )
+ while ($obj = $this->fetch_object($resql))
{
$liste[$i]['collation'] = $obj->lc_collate;
$i++;
@@ -1307,21 +1307,21 @@ class DoliDBPgsql extends DoliDB
*/
public function getPathOfDump()
{
- $fullpathofdump='/pathtopgdump/pg_dump';
+ $fullpathofdump = '/pathtopgdump/pg_dump';
if (file_exists('/usr/bin/pg_dump'))
{
- $fullpathofdump='/usr/bin/pg_dump';
+ $fullpathofdump = '/usr/bin/pg_dump';
}
else
{
// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
- $resql=$this->query('SHOW data_directory');
+ $resql = $this->query('SHOW data_directory');
if ($resql)
{
- $liste=$this->fetch_array($resql);
- $basedir=$liste['data_directory'];
- $fullpathofdump=preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
+ $liste = $this->fetch_array($resql);
+ $basedir = $liste['data_directory'];
+ $fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
}
}
@@ -1336,23 +1336,23 @@ class DoliDBPgsql extends DoliDB
public function getPathOfRestore()
{
//$tool='pg_restore';
- $tool='psql';
+ $tool = 'psql';
- $fullpathofdump='/pathtopgrestore/'.$tool;
+ $fullpathofdump = '/pathtopgrestore/'.$tool;
if (file_exists('/usr/bin/'.$tool))
{
- $fullpathofdump='/usr/bin/'.$tool;
+ $fullpathofdump = '/usr/bin/'.$tool;
}
else
{
// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
- $resql=$this->query('SHOW data_directory');
+ $resql = $this->query('SHOW data_directory');
if ($resql)
{
- $liste=$this->fetch_array($resql);
- $basedir=$liste['data_directory'];
- $fullpathofdump=preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
+ $liste = $this->fetch_array($resql);
+ $basedir = $liste['data_directory'];
+ $fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
}
}
@@ -1367,14 +1367,14 @@ class DoliDBPgsql extends DoliDB
*/
public function getServerParametersValues($filter = '')
{
- $result=array();
+ $result = array();
- $resql='select name,setting from pg_settings';
- if ($filter) $resql.=" WHERE name = '".$this->escape($filter)."'";
- $resql=$this->query($resql);
+ $resql = 'select name,setting from pg_settings';
+ if ($filter) $resql .= " WHERE name = '".$this->escape($filter)."'";
+ $resql = $this->query($resql);
if ($resql)
{
- while ($obj=$this->fetch_object($resql)) $result[$obj->name]=$obj->setting;
+ while ($obj = $this->fetch_object($resql)) $result[$obj->name] = $obj->setting;
}
return $result;
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 20a5f9728cb..ba8f8eff3e9 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -25,7 +25,7 @@
* \brief Class file to manage Dolibarr database access for a SQLite database
*/
-require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
/**
* Class to manage Dolibarr database access for a SQLite database
@@ -33,17 +33,17 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
class DoliDBSqlite3 extends DoliDB
{
//! Database type
- public $type='sqlite3';
+ public $type = 'sqlite3';
//! Database label
- const LABEL='Sqlite3';
+ const LABEL = 'Sqlite3';
//! Version min database
- const VERSIONMIN='3.0.0';
+ const VERSIONMIN = '3.0.0';
/** @var SQLite3Result Resultset of last query */
private $_results;
- const WEEK_MONDAY_FIRST=1;
+ const WEEK_MONDAY_FIRST = 1;
const WEEK_YEAR = 2;
- const WEEK_FIRST_WEEKDAY=4;
+ const WEEK_FIRST_WEEKDAY = 4;
/**
@@ -62,14 +62,14 @@ class DoliDBSqlite3 extends DoliDB
global $conf;
// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
- if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
- if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+ if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+ if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
- $this->database_user=$user;
- $this->database_host=$host;
- $this->database_port=$port;
+ $this->database_user = $user;
+ $this->database_host = $host;
+ $this->database_port = $port;
- $this->transaction_opened=0;
+ $this->transaction_opened = 0;
//print "Name DB: $host,$user,$pass,$name<br>";
@@ -149,84 +149,84 @@ class DoliDBSqlite3 extends DoliDB
{
if ($type == 'auto')
{
- if (preg_match('/ALTER TABLE/i', $line)) $type='dml';
- elseif (preg_match('/CREATE TABLE/i', $line)) $type='dml';
- elseif (preg_match('/DROP TABLE/i', $line)) $type='dml';
+ if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
+ elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
+ elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
}
if ($type == 'dml')
{
- $line=preg_replace('/\s/', ' ', $line); // Replace tabulation with space
+ $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
// we are inside create table statement so lets process datatypes
if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
- $line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
- $line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
- $line=preg_replace('/,$/', '', $line);
+ $line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
+ $line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
+ $line = preg_replace('/,$/', '', $line);
}
// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
- $newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 integer PRIMARY KEY AUTOINCREMENT', $line);
+ $newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 integer PRIMARY KEY AUTOINCREMENT', $line);
//$line = "-- ".$line." replaced by --\n".$newline;
- $line=$newline;
+ $line = $newline;
}
// tinyint type conversion
- $line=str_replace('tinyint', 'smallint', $line);
+ $line = str_replace('tinyint', 'smallint', $line);
// nuke unsigned
- $line=preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
+ $line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
// blob -> text
- $line=preg_replace('/\w*blob/i', 'text', $line);
+ $line = preg_replace('/\w*blob/i', 'text', $line);
// tinytext/mediumtext -> text
- $line=preg_replace('/tinytext/i', 'text', $line);
- $line=preg_replace('/mediumtext/i', 'text', $line);
+ $line = preg_replace('/tinytext/i', 'text', $line);
+ $line = preg_replace('/mediumtext/i', 'text', $line);
// change not null datetime field to null valid ones
// (to support remapping of "zero time" to null
- $line=preg_replace('/datetime not null/i', 'datetime', $line);
- $line=preg_replace('/datetime/i', 'timestamp', $line);
+ $line = preg_replace('/datetime not null/i', 'datetime', $line);
+ $line = preg_replace('/datetime/i', 'timestamp', $line);
// double -> numeric
- $line=preg_replace('/^double/i', 'numeric', $line);
- $line=preg_replace('/(\s*)double/i', '\\1numeric', $line);
+ $line = preg_replace('/^double/i', 'numeric', $line);
+ $line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
// float -> numeric
- $line=preg_replace('/^float/i', 'numeric', $line);
- $line=preg_replace('/(\s*)float/i', '\\1numeric', $line);
+ $line = preg_replace('/^float/i', 'numeric', $line);
+ $line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
// unique index(field1,field2)
if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
{
- $line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
+ $line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
}
// We remove end of requests "AFTER fieldxxx"
- $line=preg_replace('/AFTER [a-z0-9_]+/i', '', $line);
+ $line = preg_replace('/AFTER [a-z0-9_]+/i', '', $line);
// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
- $line=preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i', 'DROP INDEX', $line);
+ $line = preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i', 'DROP INDEX', $line);
// Translate order to rename fields
if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+ $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
}
// Translate order to modify field format
if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $newreg3=$reg[3];
- $newreg3=preg_replace('/ DEFAULT NULL/i', '', $newreg3);
- $newreg3=preg_replace('/ NOT NULL/i', '', $newreg3);
- $newreg3=preg_replace('/ NULL/i', '', $newreg3);
- $newreg3=preg_replace('/ DEFAULT 0/i', '', $newreg3);
- $newreg3=preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i', '', $newreg3);
- $line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+ $newreg3 = $reg[3];
+ $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+ $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+ $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+ $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+ $newreg3 = preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i', '', $newreg3);
+ $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
// TODO Add alter to set default value or null/not null if there is this in $reg[3]
}
@@ -235,7 +235,7 @@ class DoliDBSqlite3 extends DoliDB
if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $line.= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
+ $line .= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
}
// Translate order to drop foreign keys
@@ -243,18 +243,18 @@ class DoliDBSqlite3 extends DoliDB
if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
{
$line = "-- ".$line." replaced by --\n";
- $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+ $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
}
// alter table add [unique] [index] (field1, field2 ...)
// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
{
- $fieldlist=$reg[4];
- $idxname=$reg[3];
- $tablename=$reg[1];
+ $fieldlist = $reg[4];
+ $idxname = $reg[3];
+ $tablename = $reg[1];
$line = "-- ".$line." replaced by --\n";
- $line.= "CREATE ".(preg_match('/UNIQUE/', $reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+ $line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
}
if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $line, $reg)) {
// Pour l'instant les contraintes ne sont pas créées
@@ -273,20 +273,20 @@ class DoliDBSqlite3 extends DoliDB
{
if ($reg[1] == $reg[2]) // If same table, we remove second one
{
- $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
+ $line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
}
}
// Remove () in the tables in FROM if one table
- $line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
+ $line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
//print $line."\n";
// Remove () in the tables in FROM if two table
- $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
+ $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
//print $line."\n";
// Remove () in the tables in FROM if two table
- $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
+ $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
//print $line."\n";
//print "type=".$type." newline=".$line."<br>\n";
@@ -329,8 +329,8 @@ class DoliDBSqlite3 extends DoliDB
dol_syslog(get_class($this)."::connect name=".$name, LOG_DEBUG);
- $dir=$main_data_dir;
- if (empty($dir)) $dir=DOL_DATA_ROOT;
+ $dir = $main_data_dir;
+ if (empty($dir)) $dir = DOL_DATA_ROOT;
// With sqlite, port must be in connect parameters
//if (! $newport) $newport=3306;
$database_name = $dir.'/database_'.$name.'.sdb';
@@ -340,9 +340,9 @@ class DoliDBSqlite3 extends DoliDB
$this->db = new SQLite3($database_name);
//$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
- catch(Exception $e)
+ catch (Exception $e)
{
- $this->error= self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
+ $this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
return '';
}
@@ -358,7 +358,7 @@ class DoliDBSqlite3 extends DoliDB
*/
public function getVersion()
{
- $tmp=$this->db->version();
+ $tmp = $this->db->version();
return $tmp['versionString'];
}
@@ -384,9 +384,9 @@ class DoliDBSqlite3 extends DoliDB
if ($this->db)
{
if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
- $this->connected=false;
+ $this->connected = false;
$this->db->close();
- unset($this->db); // Clean this->db
+ unset($this->db); // Clean this->db
return true;
}
return false;
@@ -405,7 +405,7 @@ class DoliDBSqlite3 extends DoliDB
{
global $conf;
- $ret=null;
+ $ret = null;
$query = trim($query);
@@ -420,19 +420,19 @@ class DoliDBSqlite3 extends DoliDB
$foreignFields = $reg[5];
$foreignTable = $reg[4];
$localfields = $reg[3];
- $constraintname=trim($reg[2]);
- $tablename=trim($reg[1]);
+ $constraintname = trim($reg[2]);
+ $tablename = trim($reg[1]);
- $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
+ $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='".$tablename."'");
// 1- Renommer la table avec un nom temporaire
- $this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
+ $this->query('ALTER TABLE '.$tablename.' RENAME TO tmp_'.$tablename);
// 2- Recréer la table avec la contrainte ajoutée
// on bricole la requete pour ajouter la contrainte
$descTable = substr($descTable, 0, strlen($descTable) - 1);
- $descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
+ $descTable .= ", CONSTRAINT ".$constraintname." FOREIGN KEY (".$localfields.") REFERENCES ".$foreignTable."(".$foreignFields.")";
// fermeture de l'instruction
$descTable .= ')';
@@ -441,42 +441,42 @@ class DoliDBSqlite3 extends DoliDB
$this->query($descTable);
// 3- Transférer les données
- $this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
+ $this->query('INSERT INTO '.$tablename.' SELECT * FROM tmp_'.$tablename);
// 4- Supprimer la table temporaire
- $this->query('DROP TABLE tmp_' . $tablename);
+ $this->query('DROP TABLE tmp_'.$tablename);
// dummy statement
- $query="SELECT 0";
+ $query = "SELECT 0";
} else {
- $query=$this->convertSQLFromMysql($query, $type);
+ $query = $this->convertSQLFromMysql($query, $type);
}
//print "After convertSQLFromMysql:\n".$query."<br>\n";
- if (! in_array($query, array('BEGIN','COMMIT','ROLLBACK')))
+ if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
{
- $SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
+ $SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
}
- if (empty($query)) return false; // Return false = error if empty request
+ if (empty($query)) return false; // Return false = error if empty request
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
try {
//$ret = $this->db->exec($query);
- $ret = $this->db->query($query); // $ret is a Sqlite3Result
+ $ret = $this->db->query($query); // $ret is a Sqlite3Result
if ($ret) {
$ret->queryString = $query;
}
}
- catch(Exception $e)
+ catch (Exception $e)
{
- $this->error=$this->db->lastErrorMsg();
+ $this->error = $this->db->lastErrorMsg();
}
- if (! preg_match("/^COMMIT/i", $query) && ! preg_match("/^ROLLBACK/i", $query))
+ if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
{
// Si requete utilisateur, on la sauvegarde ainsi que son resultset
- if (! is_object($ret) || $this->error)
+ if (!is_object($ret) || $this->error)
{
$this->lastqueryerror = $query;
$this->lasterror = $this->error();
@@ -490,10 +490,10 @@ class DoliDBSqlite3 extends DoliDB
$errormsg .= ' ('.$this->lasterrno.')';
}
- if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+ if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
dol_syslog(get_class($this)."::query SQL Error message: ".$errormsg, LOG_ERR);
}
- $this->lastquery=$query;
+ $this->lastquery = $query;
$this->_results = $ret;
}
@@ -511,7 +511,7 @@ class DoliDBSqlite3 extends DoliDB
{
// phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
//return $resultset->fetch(PDO::FETCH_OBJ);
$ret = $resultset->fetchArray(SQLITE3_ASSOC);
if ($ret) {
@@ -532,7 +532,7 @@ class DoliDBSqlite3 extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
//return $resultset->fetch(PDO::FETCH_ASSOC);
$ret = $resultset->fetchArray(SQLITE3_ASSOC);
return $ret;
@@ -549,9 +549,9 @@ class DoliDBSqlite3 extends DoliDB
{
// phpcs:enable
// If resultset not provided, we take the last used by connexion
- if (! is_bool($resultset))
+ if (!is_bool($resultset))
{
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
return $resultset->fetchArray(SQLITE3_NUM);
}
else
@@ -575,9 +575,9 @@ class DoliDBSqlite3 extends DoliDB
// FIXME: SQLite3Result does not have a queryString member
// If resultset not provided, we take the last used by connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
if (preg_match("/^SELECT/i", $resultset->queryString)) {
- return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
+ return $this->db->querySingle("SELECT count(*) FROM (".$resultset->queryString.") q");
}
return 0;
}
@@ -596,7 +596,7 @@ class DoliDBSqlite3 extends DoliDB
// FIXME: SQLite3Result does not have a queryString member
// If resultset not provided, we take the last used by connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
if (preg_match("/^SELECT/i", $resultset->queryString)) {
return $this->num_rows($resultset);
}
@@ -615,7 +615,7 @@ class DoliDBSqlite3 extends DoliDB
public function free($resultset = null)
{
// If resultset not provided, we take the last used by connexion
- if (! is_object($resultset)) { $resultset=$this->_results; }
+ if (!is_object($resultset)) { $resultset = $this->_results; }
// Si resultset en est un, on libere la memoire
if ($resultset && is_object($resultset)) $resultset->finalize();
}
@@ -638,7 +638,7 @@ class DoliDBSqlite3 extends DoliDB
*/
public function errno()
{
- if (! $this->connected) {
+ if (!$this->connected) {
// Si il y a eu echec de connexion, $this->db n'est pas valide.
return 'DB_ERROR_FAILED_TO_CONNECT';
}
@@ -676,14 +676,14 @@ class DoliDBSqlite3 extends DoliDB
{
return $errorcode_map[$this->db->errorCode()];
}*/
- $errno=$this->db->lastErrorCode();
- if ($errno=='HY000' || $errno == 0)
+ $errno = $this->db->lastErrorCode();
+ if ($errno == 'HY000' || $errno == 0)
{
if (preg_match('/table.*already exists/i', $this->error)) return 'DB_ERROR_TABLE_ALREADY_EXISTS';
elseif (preg_match('/index.*already exists/i', $this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
elseif (preg_match('/syntax error/i', $this->error)) return 'DB_ERROR_SYNTAX';
}
- if ($errno=='23000')
+ if ($errno == '23000')
{
if (preg_match('/column.* not unique/i', $this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
elseif (preg_match('/PRIMARY KEY must be unique/i', $this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
@@ -692,7 +692,7 @@ class DoliDBSqlite3 extends DoliDB
// TODO Voir la liste des messages d'erreur
}
- return ($errno?'DB_ERROR_'.$errno:'0');
+ return ($errno ? 'DB_ERROR_'.$errno : '0');
}
}
@@ -703,7 +703,7 @@ class DoliDBSqlite3 extends DoliDB
*/
public function error()
{
- if (! $this->connected) {
+ if (!$this->connected) {
// Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
}
@@ -739,12 +739,12 @@ class DoliDBSqlite3 extends DoliDB
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
- $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+ $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
//Encryption key
- $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+ $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
- $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
+ $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
if ($cryptType && !empty($cryptKey))
{
@@ -772,10 +772,10 @@ class DoliDBSqlite3 extends DoliDB
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
- $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+ $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
//Encryption key
- $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+ $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
$return = $value;
@@ -823,20 +823,20 @@ class DoliDBSqlite3 extends DoliDB
public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
{
// phpcs:enable
- if (empty($charset)) $charset=$this->forcecharset;
- if (empty($collation)) $collation=$this->forcecollate;
+ if (empty($charset)) $charset = $this->forcecharset;
+ if (empty($collation)) $collation = $this->forcecollate;
// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
$sql = 'CREATE DATABASE '.$database;
- $sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
+ $sql .= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
dol_syslog($sql, LOG_DEBUG);
- $ret=$this->query($sql);
- if (! $ret)
+ $ret = $this->query($sql);
+ if (!$ret)
{
// We try again for compatibility with Mysql < 4.1.1
$sql = 'CREATE DATABASE '.$database;
- $ret=$this->query($sql);
+ $ret = $this->query($sql);
dol_syslog($sql, LOG_DEBUG);
}
return $ret;
@@ -853,16 +853,16 @@ class DoliDBSqlite3 extends DoliDB
public function DDLListTables($database, $table = '')
{
// phpcs:enable
- $listtables=array();
+ $listtables = array();
$like = '';
if ($table) $like = "LIKE '".$table."'";
- $sql="SHOW TABLES FROM ".$database." ".$like.";";
+ $sql = "SHOW TABLES FROM ".$database." ".$like.";";
//print $sql;
$result = $this->query($sql);
if ($result)
{
- while($row = $this->fetch_row($result))
+ while ($row = $this->fetch_row($result))
{
$listtables[] = $row[0];
}
@@ -881,15 +881,15 @@ class DoliDBSqlite3 extends DoliDB
public function DDLInfoTable($table)
{
// phpcs:enable
- $infotables=array();
+ $infotables = array();
- $sql="SHOW FULL COLUMNS FROM ".$table.";";
+ $sql = "SHOW FULL COLUMNS FROM ".$table.";";
dol_syslog($sql, LOG_DEBUG);
$result = $this->query($sql);
if ($result)
{
- while($row = $this->fetch_row($result))
+ while ($row = $this->fetch_row($result))
{
$infotables[] = $row;
}
@@ -918,61 +918,61 @@ class DoliDBSqlite3 extends DoliDB
// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
$sql = "create table ".$table."(";
- $i=0;
- foreach($fields as $field_name => $field_desc)
+ $i = 0;
+ foreach ($fields as $field_name => $field_desc)
{
$sqlfields[$i] = $field_name." ";
- $sqlfields[$i] .= $field_desc['type'];
- if( preg_match("/^[^\s]/i", $field_desc['value']))
+ $sqlfields[$i] .= $field_desc['type'];
+ if (preg_match("/^[^\s]/i", $field_desc['value']))
$sqlfields[$i] .= "(".$field_desc['value'].")";
- elseif( preg_match("/^[^\s]/i", $field_desc['attribute']))
+ elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
$sqlfields[$i] .= " ".$field_desc['attribute'];
- elseif( preg_match("/^[^\s]/i", $field_desc['default']))
+ elseif (preg_match("/^[^\s]/i", $field_desc['default']))
{
- if(preg_match("/null/i", $field_desc['default']))
+ if (preg_match("/null/i", $field_desc['default']))
$sqlfields[$i] .= " default ".$field_desc['default'];
else
$sqlfields[$i] .= " default '".$field_desc['default']."'";
}
- elseif( preg_match("/^[^\s]/i", $field_desc['null']))
+ elseif (preg_match("/^[^\s]/i", $field_desc['null']))
$sqlfields[$i] .= " ".$field_desc['null'];
- elseif( preg_match("/^[^\s]/i", $field_desc['extra']))
+ elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
$sqlfields[$i] .= " ".$field_desc['extra'];
$i++;
}
- if($primary_key != "")
+ if ($primary_key != "")
$pk = "primary key(".$primary_key.")";
- if(is_array($unique_keys))
+ if (is_array($unique_keys))
{
$i = 0;
- foreach($unique_keys as $key => $value)
+ foreach ($unique_keys as $key => $value)
{
$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
$i++;
}
}
- if(is_array($keys))
+ if (is_array($keys))
{
$i = 0;
- foreach($keys as $key => $value)
+ foreach ($keys as $key => $value)
{
$sqlk[$i] = "KEY ".$key." (".$value.")";
$i++;
}
}
$sql .= implode(',', $sqlfields);
- if($primary_key != "")
+ if ($primary_key != "")
$sql .= ",".$pk;
- if(is_array($unique_keys))
+ if (is_array($unique_keys))
$sql .= ",".implode(',', $sqluq);
- if(is_array($keys))
+ if (is_array($keys))
$sql .= ",".implode(',', $sqlk);
- $sql .=") type=".$type;
+ $sql .= ") type=".$type;
dol_syslog($sql, LOG_DEBUG);
- if(! $this -> query($sql))
+ if (!$this -> query($sql))
return -1;
return 1;
}
@@ -989,7 +989,7 @@ class DoliDBSqlite3 extends DoliDB
// phpcs:enable
$sql = "DROP TABLE ".$table;
- if (! $this->query($sql))
+ if (!$this->query($sql))
return -1;
else
return 1;
@@ -1006,7 +1006,7 @@ class DoliDBSqlite3 extends DoliDB
public function DDLDescTable($table, $field = "")
{
// phpcs:enable
- $sql="DESC ".$table." ".$field;
+ $sql = "DESC ".$table." ".$field;
dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
$this->_results = $this->query($sql);
@@ -1028,30 +1028,30 @@ class DoliDBSqlite3 extends DoliDB
// phpcs:enable
// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
- $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
- $sql.= $field_desc['type'];
- if(preg_match("/^[^\s]/i", $field_desc['value']))
- if (! in_array($field_desc['type'], array('date','datetime')))
+ $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
+ $sql .= $field_desc['type'];
+ if (preg_match("/^[^\s]/i", $field_desc['value']))
+ if (!in_array($field_desc['type'], array('date', 'datetime')))
{
- $sql.= "(".$field_desc['value'].")";
+ $sql .= "(".$field_desc['value'].")";
}
- if(preg_match("/^[^\s]/i", $field_desc['attribute']))
- $sql.= " ".$field_desc['attribute'];
- if(preg_match("/^[^\s]/i", $field_desc['null']))
- $sql.= " ".$field_desc['null'];
- if(preg_match("/^[^\s]/i", $field_desc['default']))
+ if (preg_match("/^[^\s]/i", $field_desc['attribute']))
+ $sql .= " ".$field_desc['attribute'];
+ if (preg_match("/^[^\s]/i", $field_desc['null']))
+ $sql .= " ".$field_desc['null'];
+ if (preg_match("/^[^\s]/i", $field_desc['default']))
{
- if(preg_match("/null/i", $field_desc['default']))
- $sql.= " default ".$field_desc['default'];
+ if (preg_match("/null/i", $field_desc['default']))
+ $sql .= " default ".$field_desc['default'];
else
- $sql.= " default '".$field_desc['default']."'";
+ $sql .= " default '".$field_desc['default']."'";
}
- if(preg_match("/^[^\s]/i", $field_desc['extra']))
- $sql.= " ".$field_desc['extra'];
- $sql.= " ".$field_position;
+ if (preg_match("/^[^\s]/i", $field_desc['extra']))
+ $sql .= " ".$field_desc['extra'];
+ $sql .= " ".$field_position;
dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
- if(! $this->query($sql))
+ if (!$this->query($sql))
{
return -1;
}
@@ -1073,11 +1073,11 @@ class DoliDBSqlite3 extends DoliDB
$sql = "ALTER TABLE ".$table;
$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
- $sql.="(".$field_desc['value'].")";
+ $sql .= "(".$field_desc['value'].")";
}
dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
- if (! $this->query($sql))
+ if (!$this->query($sql))
return -1;
return 1;
}
@@ -1093,11 +1093,11 @@ class DoliDBSqlite3 extends DoliDB
public function DDLDropField($table, $field_name)
{
// phpcs:enable
- $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+ $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
- if (! $this->query($sql))
+ if (!$this->query($sql))
{
- $this->error=$this->lasterror();
+ $this->error = $this->lasterror();
return -1;
}
return 1;
@@ -1118,34 +1118,34 @@ class DoliDBSqlite3 extends DoliDB
{
// phpcs:enable
$sql = "INSERT INTO user ";
- $sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
- $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
- $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+ $sql .= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+ $sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
+ $sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
- dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
- $resql=$this->query($sql);
- if (! $resql)
+ dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+ $resql = $this->query($sql);
+ if (!$resql)
{
return -1;
}
$sql = "INSERT INTO db ";
- $sql.= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
- $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
- $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+ $sql .= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+ $sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
+ $sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
- $resql=$this->query($sql);
- if (! $resql)
+ $resql = $this->query($sql);
+ if (!$resql)
{
return -1;
}
- $sql="FLUSH Privileges";
+ $sql = "FLUSH Privileges";
dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
- $resql=$this->query($sql);
- if (! $resql)
+ $resql = $this->query($sql);
+ if (!$resql)
{
return -1;
}
@@ -1170,7 +1170,7 @@ class DoliDBSqlite3 extends DoliDB
public function getListOfCharacterSet()
{
$liste = array();
- $i=0;
+ $i = 0;
$liste[$i]['charset'] = 'UTF-8';
$liste[$i]['description'] = 'UTF-8';
return $liste;
@@ -1194,7 +1194,7 @@ class DoliDBSqlite3 extends DoliDB
public function getListOfCollation()
{
$liste = array();
- $i=0;
+ $i = 0;
$liste[$i]['charset'] = 'UTF-8';
$liste[$i]['description'] = 'UTF-8';
return $liste;
@@ -1208,14 +1208,14 @@ class DoliDBSqlite3 extends DoliDB
public function getPathOfDump()
{
// FIXME: not for SQLite
- $fullpathofdump='/pathtomysqldump/mysqldump';
+ $fullpathofdump = '/pathtomysqldump/mysqldump';
- $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+ $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
if ($resql)
{
- $liste=$this->fetch_array($resql);
- $basedir=$liste['Value'];
- $fullpathofdump=$basedir.(preg_match('/\/$/', $basedir)?'':'/').'bin/mysqldump';
+ $liste = $this->fetch_array($resql);
+ $basedir = $liste['Value'];
+ $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
}
return $fullpathofdump;
}
@@ -1228,14 +1228,14 @@ class DoliDBSqlite3 extends DoliDB
public function getPathOfRestore()
{
// FIXME: not for SQLite
- $fullpathofimport='/pathtomysql/mysql';
+ $fullpathofimport = '/pathtomysql/mysql';
- $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+ $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
if ($resql)
{
- $liste=$this->fetch_array($resql);
- $basedir=$liste['Value'];
- $fullpathofimport=$basedir.(preg_match('/\/$/', $basedir)?'':'/').'bin/mysql';
+ $liste = $this->fetch_array($resql);
+ $basedir = $liste['Value'];
+ $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
}
return $fullpathofimport;
}
@@ -1248,16 +1248,16 @@ class DoliDBSqlite3 extends DoliDB
*/
public function getServerParametersValues($filter = '')
{
- $result=array();
+ $result = array();
static $pragmas;
- if (! isset($pragmas)) {
+ if (!isset($pragmas)) {
// Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
// indépendante de la base de données.
// cf. http://www.sqlite.org/pragma.html
$pragmas = array(
'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
- 'compile_options', 'data_version', /*'database_list',*/
+ 'compile_options', 'data_version', /*'database_list',*/
'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
@@ -1272,9 +1272,9 @@ class DoliDBSqlite3 extends DoliDB
}
// TODO prendre en compte le filtre
- foreach($pragmas as $var) {
+ foreach ($pragmas as $var) {
$sql = "PRAGMA $var";
- $resql=$this->query($sql);
+ $resql = $this->query($sql);
if ($resql)
{
$obj = $this->fetch_row($resql);
@@ -1297,7 +1297,7 @@ class DoliDBSqlite3 extends DoliDB
*/
public function getServerStatusValues($filter = '')
{
- $result=array();
+ $result = array();
/*
$sql='SHOW STATUS';
if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
@@ -1324,10 +1324,10 @@ class DoliDBSqlite3 extends DoliDB
{
if ($this->db)
{
- $newname=preg_replace('/_/', '', $name);
- $localname = __CLASS__ . '::' . 'db' . $newname;
+ $newname = preg_replace('/_/', '', $name);
+ $localname = __CLASS__.'::'.'db'.$newname;
$reflectClass = new ReflectionClass(__CLASS__);
- $reflectFunction = $reflectClass->getMethod('db' . $newname);
+ $reflectFunction = $reflectClass->getMethod('db'.$newname);
if ($arg_count < 0) {
$arg_count = $reflectFunction->getNumberOfParameters();
}
@@ -1352,7 +1352,7 @@ class DoliDBSqlite3 extends DoliDB
// phpcs:enable
$y = $year;
if ($y == 0 && $month == 0) return 0;
- $num = (365* $y + 31 * ($month - 1) + $day);
+ $num = (365 * $y + 31 * ($month - 1) + $day);
if ($month <= 2) {
$y--; }
else {
@@ -1387,7 +1387,7 @@ class DoliDBSqlite3 extends DoliDB
private static function calc_days_in_year($year)
{
// phpcs:enable
- return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
+ return (($year & 3) == 0 && ($year % 100 || ($year % 400 == 0 && $year)) ? 366 : 365);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1404,37 +1404,37 @@ class DoliDBSqlite3 extends DoliDB
private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
{
// phpcs:enable
- $daynr=self::calc_daynr($year, $month, $day);
- $first_daynr=self::calc_daynr($year, 1, 1);
- $monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
- $week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
- $first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
+ $daynr = self::calc_daynr($year, $month, $day);
+ $first_daynr = self::calc_daynr($year, 1, 1);
+ $monday_first = ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
+ $week_year = ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
+ $first_weekday = ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
- $weekday=self::calc_weekday($first_daynr, !$monday_first);
- $calc_year=$year;
+ $weekday = self::calc_weekday($first_daynr, !$monday_first);
+ $calc_year = $year;
- if ($month == 1 && $day <= 7-$weekday) {
+ if ($month == 1 && $day <= 7 - $weekday) {
if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
return 0;
- $week_year= 1;
+ $week_year = 1;
$calc_year--;
- $first_daynr-= ($days=self::calc_days_in_year($calc_year));
- $weekday= ($weekday + 53*7- $days) % 7;
+ $first_daynr -= ($days = self::calc_days_in_year($calc_year));
+ $weekday = ($weekday + 53 * 7 - $days) % 7;
}
if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
- $days= $daynr - ($first_daynr+ (7-$weekday));
+ $days = $daynr - ($first_daynr + (7 - $weekday));
} else {
- $days= $daynr - ($first_daynr - $weekday);
+ $days = $daynr - ($first_daynr - $weekday);
}
- if ($week_year && $days >= 52*7) {
- $weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
+ if ($week_year && $days >= 52 * 7) {
+ $weekday = ($weekday + self::calc_days_in_year($calc_year)) % 7;
if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0)) {
$calc_year++;
return 1;
}
}
- return floor($days/7+1);
+ return floor($days / 7 + 1);
}
}
diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php
index f4727d3eb3b..d1d5d434b5b 100644
--- a/htdocs/core/filemanagerdol/browser/default/browser.php
+++ b/htdocs/core/filemanagerdol/browser/default/browser.php
@@ -21,7 +21,7 @@
//define('NOTOKENRENEWAL',1); // Disables token renewal
//require '../../../../main.inc.php';
-require '../../connectors/php/config.php'; // This include the define('NOTOKENRENEWAL',1) and the require main.in.php
+require '../../connectors/php/config.php'; // This include the define('NOTOKENRENEWAL',1) and the require main.in.php
global $Config;
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
index 44632d1fe1a..0f50f33e988 100644
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php
@@ -36,7 +36,7 @@ function SetXmlHeaders()
// Date in the past
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
// always modified
- header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+ header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
// HTTP/1.1
header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
@@ -60,15 +60,15 @@ function CreateXmlHeader($command, $resourceType, $currentFolder)
SetXmlHeaders();
// Create the XML document header.
- echo '<?xml version="1.0" encoding="utf-8" ?>' ;
+ echo '<?xml version="1.0" encoding="utf-8" ?>';
// Create the main "Connector" node.
- echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ;
+ echo '<Connector command="'.$command.'" resourceType="'.$resourceType.'">';
// Add the current folder node.
- echo '<CurrentFolder path="' . ConvertToXmlAttribute($currentFolder) . '" url="' . ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)) . '" />' ;
+ echo '<CurrentFolder path="'.ConvertToXmlAttribute($currentFolder).'" url="'.ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)).'" />';
- $GLOBALS['HeaderSent'] = true ;
+ $GLOBALS['HeaderSent'] = true;
}
/**
@@ -78,7 +78,7 @@ function CreateXmlHeader($command, $resourceType, $currentFolder)
*/
function CreateXmlFooter()
{
- echo '</Connector>' ;
+ echo '</Connector>';
}
/**
@@ -90,10 +90,10 @@ function CreateXmlFooter()
*/
function SendError($number, $text)
{
- if ( $_GET['Command'] == 'FileUpload' )
+ if ($_GET['Command'] == 'FileUpload')
SendUploadResults($number, "", "", $text);
- if ( isset($GLOBALS['HeaderSent']) && $GLOBALS['HeaderSent'] )
+ if (isset($GLOBALS['HeaderSent']) && $GLOBALS['HeaderSent'])
{
SendErrorNode($number, $text);
CreateXmlFooter();
@@ -105,15 +105,15 @@ function SendError($number, $text)
dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
// Create the XML document header
- echo '<?xml version="1.0" encoding="utf-8" ?>' ;
+ echo '<?xml version="1.0" encoding="utf-8" ?>';
- echo '<Connector>' ;
+ echo '<Connector>';
SendErrorNode($number, $text);
- echo '</Connector>' ;
+ echo '</Connector>';
}
- exit ;
+ exit;
}
/**
@@ -126,7 +126,7 @@ function SendError($number, $text)
function SendErrorNode($number, $text)
{
if ($text)
- echo '<Error number="' . $number . '" text="' . htmlspecialchars($text) . '" />' ;
+ echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
else
- echo '<Error number="' . $number . '" />' ;
+ echo '<Error number="'.$number.'" />';
}
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 2f6dbf16943..dcc1650d4cd 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -35,29 +35,29 @@ function GetFolders($resourceType, $currentFolder)
$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFolders');
// Array that will hold the folders names.
- $aFolders = array();
+ $aFolders = array();
$oCurrentFolder = @opendir($sServerDir);
if ($oCurrentFolder !== false)
{
- while ( $sFile = readdir($oCurrentFolder) )
+ while ($sFile = readdir($oCurrentFolder))
{
- if ( $sFile != '.' && $sFile != '..' && is_dir($sServerDir . $sFile) )
- $aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
+ if ($sFile != '.' && $sFile != '..' && is_dir($sServerDir.$sFile))
+ $aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
}
closedir($oCurrentFolder);
}
// Open the "Folders" node.
- echo "<Folders>" ;
+ echo "<Folders>";
natcasesort($aFolders);
foreach ($aFolders as $sFolder)
- echo $sFolder ;
+ echo $sFolder;
// Close the "Folders" node.
- echo "</Folders>" ;
+ echo "</Folders>";
}
/**
@@ -73,33 +73,33 @@ function GetFoldersAndFiles($resourceType, $currentFolder)
$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFoldersAndFiles');
// Arrays that will hold the folders and files names.
- $aFolders = array();
- $aFiles = array();
+ $aFolders = array();
+ $aFiles = array();
$oCurrentFolder = @opendir($sServerDir);
if ($oCurrentFolder !== false)
{
- while ( $sFile = readdir($oCurrentFolder) )
+ while ($sFile = readdir($oCurrentFolder))
{
- if ( $sFile != '.' && $sFile != '..' )
+ if ($sFile != '.' && $sFile != '..')
{
- if ( is_dir($sServerDir . $sFile) )
- $aFolders[] = '<Folder name="' . ConvertToXmlAttribute($sFile) . '" />' ;
+ if (is_dir($sServerDir.$sFile))
+ $aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
else
{
- $iFileSize = @filesize($sServerDir . $sFile);
- if ( !$iFileSize ) {
- $iFileSize = 0 ;
+ $iFileSize = @filesize($sServerDir.$sFile);
+ if (!$iFileSize) {
+ $iFileSize = 0;
}
- if ( $iFileSize > 0 )
+ if ($iFileSize > 0)
{
$iFileSize = round($iFileSize / 1024);
- if ( $iFileSize < 1 )
- $iFileSize = 1 ;
+ if ($iFileSize < 1)
+ $iFileSize = 1;
}
- $aFiles[] = '<File name="' . ConvertToXmlAttribute($sFile) . '" size="' . $iFileSize . '" />' ;
+ $aFiles[] = '<File name="'.ConvertToXmlAttribute($sFile).'" size="'.$iFileSize.'" />';
}
}
}
@@ -108,21 +108,21 @@ function GetFoldersAndFiles($resourceType, $currentFolder)
// Send the folders
natcasesort($aFolders);
- echo '<Folders>' ;
+ echo '<Folders>';
foreach ($aFolders as $sFolder)
- echo $sFolder ;
+ echo $sFolder;
- echo '</Folders>' ;
+ echo '</Folders>';
// Send the files
natcasesort($aFiles);
- echo '<Files>' ;
+ echo '<Files>';
foreach ($aFiles as $sFiles)
- echo $sFiles ;
+ echo $sFiles;
- echo '</Files>' ;
+ echo '</Files>';
}
/**
@@ -137,50 +137,50 @@ function CreateFolder($resourceType, $currentFolder)
if (!isset($_GET)) {
global $_GET;
}
- $sErrorNumber = '0' ;
- $sErrorMsg = '' ;
+ $sErrorNumber = '0';
+ $sErrorMsg = '';
- if ( isset($_GET['NewFolderName']) )
+ if (isset($_GET['NewFolderName']))
{
- $sNewFolderName = $_GET['NewFolderName'] ;
+ $sNewFolderName = $_GET['NewFolderName'];
$sNewFolderName = SanitizeFolderName($sNewFolderName);
if (strpos($sNewFolderName, '..') !== false)
- $sErrorNumber = '102' ; // Invalid folder name.
+ $sErrorNumber = '102'; // Invalid folder name.
else
{
// Map the virtual path to the local server path of the current folder.
$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
- if ( is_writable($sServerDir) )
+ if (is_writable($sServerDir))
{
- $sServerDir .= $sNewFolderName ;
+ $sServerDir .= $sNewFolderName;
$sErrorMsg = CreateServerFolder($sServerDir);
- switch ( $sErrorMsg )
+ switch ($sErrorMsg)
{
case '':
- $sErrorNumber = '0' ;
+ $sErrorNumber = '0';
break;
case 'Invalid argument' :
case 'No such file or directory' :
- $sErrorNumber = '102' ; // Path too long.
- break ;
+ $sErrorNumber = '102'; // Path too long.
+ break;
default:
- $sErrorNumber = '110' ;
- break ;
+ $sErrorNumber = '110';
+ break;
}
}
else
- $sErrorNumber = '103' ;
+ $sErrorNumber = '103';
}
}
else
- $sErrorNumber = '102' ;
+ $sErrorNumber = '102';
// Create the "Error" node.
- echo '<Error number="' . $sErrorNumber . '" />' ;
+ echo '<Error number="'.$sErrorNumber.'" />';
}
// @CHANGE
@@ -199,14 +199,14 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
if (!isset($_FILES)) {
global $_FILES;
}
- $sErrorNumber = '0' ;
- $sFileName = '' ;
+ $sErrorNumber = '0';
+ $sFileName = '';
- if ( isset($_FILES['NewFile']) && !is_null($_FILES['NewFile']['tmp_name'])
+ if (isset($_FILES['NewFile']) && !is_null($_FILES['NewFile']['tmp_name'])
// This is for the QuickUpload tab box
or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
{
- global $Config ;
+ global $Config;
$oFile = isset($_FILES['NewFile']) ? $_FILES['NewFile'] : $_FILES['upload'];
@@ -214,62 +214,62 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
$sServerDir = ServerMapFolder($resourceType, $currentFolder, $sCommand);
// Get the uploaded file name.
- $sFileName = $oFile['name'] ;
+ $sFileName = $oFile['name'];
$sFileName = SanitizeFileName($sFileName);
- $sOriginalFileName = $sFileName ;
+ $sOriginalFileName = $sFileName;
// Get the extension.
$sExtension = substr($sFileName, (strrpos($sFileName, '.') + 1));
$sExtension = strtolower($sExtension);
- if ( isset($Config['SecureImageUploads']) )
+ if (isset($Config['SecureImageUploads']))
{
- if ( ( $isImageValid = IsImageValid($oFile['tmp_name'], $sExtension) ) === false )
+ if (($isImageValid = IsImageValid($oFile['tmp_name'], $sExtension)) === false)
{
- $sErrorNumber = '202' ;
+ $sErrorNumber = '202';
}
}
- if ( isset($Config['HtmlExtensions']) )
+ if (isset($Config['HtmlExtensions']))
{
if (!IsHtmlExtension($sExtension, $Config['HtmlExtensions']) &&
($detectHtml = DetectHtml($oFile['tmp_name'])) === true)
{
- $sErrorNumber = '202' ;
+ $sErrorNumber = '202';
}
}
// Check if it is an allowed extension.
- if ( !$sErrorNumber && IsAllowedExt($sExtension, $resourceType) )
+ if (!$sErrorNumber && IsAllowedExt($sExtension, $resourceType))
{
- $iCounter = 0 ;
+ $iCounter = 0;
- while ( true )
+ while (true)
{
- $sFilePath = $sServerDir . $sFileName ;
+ $sFilePath = $sServerDir.$sFileName;
- if ( is_file($sFilePath) )
+ if (is_file($sFilePath))
{
- $iCounter++ ;
- $sFileName = RemoveExtension($sOriginalFileName) . '(' . $iCounter . ').' . $sExtension ;
- $sErrorNumber = '201' ;
+ $iCounter++;
+ $sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
+ $sErrorNumber = '201';
}
else
{
move_uploaded_file($oFile['tmp_name'], $sFilePath);
- if ( is_file($sFilePath) )
+ if (is_file($sFilePath))
{
- if ( isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload'] )
+ if (isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload'])
{
- break ;
+ break;
}
$permissions = '0777';
- if ( isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload'] )
+ if (isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload'])
{
- $permissions = (string) $Config['ChmodOnUpload'] ;
+ $permissions = (string) $Config['ChmodOnUpload'];
}
$permissionsdec = octdec($permissions);
dol_syslog("commands.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
@@ -278,30 +278,30 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
umask($oldumask);
}
- break ;
+ break;
}
}
- if ( file_exists($sFilePath) )
+ if (file_exists($sFilePath))
{
//previous checks failed, try once again
- if ( isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false )
+ if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false)
{
@unlink($sFilePath);
- $sErrorNumber = '202' ;
+ $sErrorNumber = '202';
}
- elseif ( isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true )
+ elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
{
@unlink($sFilePath);
- $sErrorNumber = '202' ;
+ $sErrorNumber = '202';
}
}
}
else
- $sErrorNumber = '202' ;
+ $sErrorNumber = '202';
}
else
- $sErrorNumber = '202' ;
+ $sErrorNumber = '202';
$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
@@ -310,7 +310,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
// @CHANGE
//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
- if($CKEcallback == '')
+ if ($CKEcallback == '')
{
// this line already exists so wrap the if block around it
SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
@@ -321,7 +321,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
SendCKEditorResults(
$CKEcallback,
$sFileUrl,
- ($sErrorNumber != 0 ? 'Error '. $sErrorNumber. ' upload failed.' : 'Upload Successful')
+ ($sErrorNumber != 0 ? 'Error '.$sErrorNumber.' upload failed.' : 'Upload Successful')
);
}
diff --git a/htdocs/core/filemanagerdol/connectors/php/config.php b/htdocs/core/filemanagerdol/connectors/php/config.php
index d6d4ece66e4..fb282834f1a 100644
--- a/htdocs/core/filemanagerdol/connectors/php/config.php
+++ b/htdocs/core/filemanagerdol/connectors/php/config.php
@@ -22,7 +22,7 @@
* Configuration file for the File Manager Connector for PHP.
*/
-global $Config ;
+global $Config;
global $website;
define('NOTOKENRENEWAL', 1); // Disables token renewal
@@ -32,34 +32,34 @@ define('NOTOKENRENEWAL', 1); // Disables token renewal
// is a security hole if anybody can access without
// being an authenticated user.
require_once '../../../../main.inc.php';
-$uri=preg_replace('/^http(s?):\/\//i', '', $dolibarr_main_url_root);
-$pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine
-if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a ''
+$uri = preg_replace('/^http(s?):\/\//i', '', $dolibarr_main_url_root);
+$pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine
+if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a ''
define('DOL_URL_ROOT', $pos);
$entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null);
// SECURITY: You must explicitly enable this "connector". (Set it to "true").
// WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only
// authenticated users can access this file or use some kind of session checking.
-$Config['Enabled'] = true ;
+$Config['Enabled'] = true;
// Path to user files relative to the document root.
-$extEntity=(empty($entity) ? 1 : $entity); // For multicompany with external access
+$extEntity = (empty($entity) ? 1 : $entity); // For multicompany with external access
-$Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=medias'.(empty($website)?'':'_'.$website).'&entity='.$extEntity.'&file=' ;
-$Config['UserFilesAbsolutePathRelative'] = (empty($website) ? ((!empty($entity) ? '/' . $entity : '') . '/medias/') : ('/website/'.$website));
+$Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=medias'.(empty($website) ? '' : '_'.$website).'&entity='.$extEntity.'&file=';
+$Config['UserFilesAbsolutePathRelative'] = (empty($website) ? ((!empty($entity) ? '/'.$entity : '').'/medias/') : ('/website/'.$website));
// Fill the following value it you prefer to specify the absolute path for the
// user files directory. Useful if you are using a virtual directory, symbolic
// link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
// Attention: The above 'UserFilesPath' must point to the same directory.
-$Config['UserFilesAbsolutePath'] = $dolibarr_main_data_root . $Config['UserFilesAbsolutePathRelative'];
+$Config['UserFilesAbsolutePath'] = $dolibarr_main_data_root.$Config['UserFilesAbsolutePathRelative'];
// Due to security issues with Apache modules, it is recommended to leave the
// following setting enabled.
-$Config['ForceSingleExtension'] = true ;
+$Config['ForceSingleExtension'] = true;
// Perform additional checks for image files.
// If set to true, validate image size (using getimagesize).
@@ -81,15 +81,15 @@ $Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js");
// Set to 0 to disable this feature.
// Note: not needed on Windows-based servers.
$newmask = '0644';
-if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
$Config['ChmodOnUpload'] = $newmask;
// See comments above.
// Used when creating folders that does not exist.
$newmask = '0755';
-$dirmaskdec=octdec($newmask);
-if (! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-$dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
+$dirmaskdec = octdec($newmask);
+if (!empty($conf->global->MAIN_UMASK)) $dirmaskdec = octdec($conf->global->MAIN_UMASK);
+$dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
$newmask = decoct($dirmaskdec);
$Config['ChmodOnFolderCreate'] = $newmask;
@@ -148,28 +148,28 @@ $Config['ChmodOnFolderCreate'] = $newmask;
$Config['AllowedExtensions']['File'] = array('7z', 'aiff', 'asf', 'avi', 'bmp', 'csv', 'doc', 'fla', 'flv', 'gif', 'gz', 'gzip', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'ods', 'odt', 'pdf', 'png', 'ppt', 'pxd', 'qt', 'ram', 'rar', 'rm', 'rmi', 'rmvb', 'rtf', 'sdc', 'sitd', 'swf', 'sxc', 'sxw', 'tar', 'tgz', 'tif', 'tiff', 'txt', 'vsd', 'wav', 'wma', 'wmv', 'xls', 'xml', 'zip');
$Config['DeniedExtensions']['File'] = array();
-$Config['FileTypesPath']['File'] = $Config['UserFilesPath'] . 'file/' ;
-$Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;
-$Config['QuickUploadPath']['File'] = $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['File']= $Config['UserFilesAbsolutePath'] ;
+$Config['FileTypesPath']['File'] = $Config['UserFilesPath'].'file/';
+$Config['FileTypesAbsolutePath']['File'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/';
+$Config['QuickUploadPath']['File'] = $Config['UserFilesPath'];
+$Config['QuickUploadAbsolutePath']['File'] = $Config['UserFilesAbsolutePath'];
-$Config['AllowedExtensions']['Image'] = array('bmp','gif','jpeg','jpg','png');
+$Config['AllowedExtensions']['Image'] = array('bmp', 'gif', 'jpeg', 'jpg', 'png');
$Config['DeniedExtensions']['Image'] = array();
-$Config['FileTypesPath']['Image'] = $Config['UserFilesPath'] . 'image/' ;
-$Config['FileTypesAbsolutePath']['Image']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/' ;
-$Config['QuickUploadPath']['Image'] = $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ;
+$Config['FileTypesPath']['Image'] = $Config['UserFilesPath'].'image/';
+$Config['FileTypesAbsolutePath']['Image'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/';
+$Config['QuickUploadPath']['Image'] = $Config['UserFilesPath'];
+$Config['QuickUploadAbsolutePath']['Image'] = $Config['UserFilesAbsolutePath'];
-$Config['AllowedExtensions']['Flash'] = array('swf','flv');
+$Config['AllowedExtensions']['Flash'] = array('swf', 'flv');
$Config['DeniedExtensions']['Flash'] = array();
-$Config['FileTypesPath']['Flash'] = $Config['UserFilesPath'] . 'flash/' ;
-$Config['FileTypesAbsolutePath']['Flash']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/' ;
-$Config['QuickUploadPath']['Flash'] = $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Flash']= $Config['UserFilesAbsolutePath'] ;
+$Config['FileTypesPath']['Flash'] = $Config['UserFilesPath'].'flash/';
+$Config['FileTypesAbsolutePath']['Flash'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/';
+$Config['QuickUploadPath']['Flash'] = $Config['UserFilesPath'];
+$Config['QuickUploadAbsolutePath']['Flash'] = $Config['UserFilesAbsolutePath'];
-$Config['AllowedExtensions']['Media'] = array('aiff', 'asf', 'avi', 'bmp', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'png', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'swf', 'tif', 'tiff', 'wav', 'wma', 'wmv');
+$Config['AllowedExtensions']['Media'] = array('aiff', 'asf', 'avi', 'bmp', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'png', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'swf', 'tif', 'tiff', 'wav', 'wma', 'wmv');
$Config['DeniedExtensions']['Media'] = array();
-$Config['FileTypesPath']['Media'] = $Config['UserFilesPath'] . 'media/' ;
-$Config['FileTypesAbsolutePath']['Media']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/' ;
-$Config['QuickUploadPath']['Media'] = $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;
+$Config['FileTypesPath']['Media'] = $Config['UserFilesPath'].'media/';
+$Config['FileTypesAbsolutePath']['Media'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/';
+$Config['QuickUploadPath']['Media'] = $Config['UserFilesPath'];
+$Config['QuickUploadAbsolutePath']['Media'] = $Config['UserFilesAbsolutePath'];
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php
index 8942dff9e56..ce38e7c059a 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.php
@@ -30,7 +30,7 @@ require 'io.php';
require 'basexml.php';
require 'commands.php';
-if ( !$Config['Enabled'] )
+if (!$Config['Enabled'])
SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file');
DoResponse();
@@ -45,25 +45,25 @@ function DoResponse()
if (!isset($_GET)) {
global $_GET;
}
- if ( !isset($_GET['Command']) || !isset($_GET['Type']) || !isset($_GET['CurrentFolder']) )
+ if (!isset($_GET['Command']) || !isset($_GET['Type']) || !isset($_GET['CurrentFolder']))
return;
// Get the main request informaiton.
- $sCommand = $_GET['Command'] ;
- $sResourceType = $_GET['Type'] ;
- $sCurrentFolder = GetCurrentFolder();
+ $sCommand = $_GET['Command'];
+ $sResourceType = $_GET['Type'];
+ $sCurrentFolder = GetCurrentFolder();
// Check if it is an allowed command
- if (! IsAllowedCommand($sCommand))
+ if (!IsAllowedCommand($sCommand))
{
- SendError(1, 'The "' . $sCommand . '" command isn\'t allowed');
+ SendError(1, 'The "'.$sCommand.'" command isn\'t allowed');
}
// Check if it is an allowed type.
- if (! IsAllowedType($sResourceType))
+ if (!IsAllowedType($sResourceType))
SendError(1, 'Invalid type specified');
// File Upload doesn't have to Return XML, so it must be intercepted before anything.
- if ( $sCommand == 'FileUpload' )
+ if ($sCommand == 'FileUpload')
{
FileUpload($sResourceType, $sCurrentFolder, $sCommand);
return;
@@ -72,7 +72,7 @@ function DoResponse()
CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);
// Execute the required command.
- switch ( $sCommand )
+ switch ($sCommand)
{
case 'GetFolders' :
GetFolders($sResourceType, $sCurrentFolder);
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index b66f2abcd8b..68aa46ef9fb 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -31,7 +31,7 @@
*/
function CombinePaths($sBasePath, $sFolder)
{
- return RemoveFromEnd($sBasePath, '/') . '/' . RemoveFromStart($sFolder, '/');
+ return RemoveFromEnd($sBasePath, '/').'/'.RemoveFromStart($sFolder, '/');
}
/**
* GetResourceTypePath
@@ -42,12 +42,12 @@ function CombinePaths($sBasePath, $sFolder)
*/
function GetResourceTypePath($resourceType, $sCommand)
{
- global $Config ;
+ global $Config;
if ($sCommand == "QuickUpload")
- return $Config['QuickUploadPath'][$resourceType] ;
+ return $Config['QuickUploadPath'][$resourceType];
else
- return $Config['FileTypesPath'][$resourceType] ;
+ return $Config['FileTypesPath'][$resourceType];
}
/**
@@ -59,19 +59,19 @@ function GetResourceTypePath($resourceType, $sCommand)
*/
function GetResourceTypeDirectory($resourceType, $sCommand)
{
- global $Config ;
+ global $Config;
if ($sCommand == "QuickUpload")
{
- if ( strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0)
- return $Config['QuickUploadAbsolutePath'][$resourceType] ;
+ if (strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0)
+ return $Config['QuickUploadAbsolutePath'][$resourceType];
// Map the "UserFiles" path to a local directory.
return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
}
else
{
- if ( strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
- return $Config['FileTypesAbsolutePath'][$resourceType] ;
+ if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
+ return $Config['FileTypesAbsolutePath'][$resourceType];
// Map the "UserFiles" path to a local directory.
return Server_MapPath($Config['FileTypesPath'][$resourceType]);
@@ -116,7 +116,7 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand)
// Ensure that the directory exists.
$sErrorMsg = CreateServerFolder($sResourceTypePath);
- if ( $sErrorMsg != '' )
+ if ($sErrorMsg != '')
SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
// Return the resource type directory combined with the required path.
@@ -131,7 +131,7 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand)
*/
function GetParentFolder($folderPath)
{
- $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ;
+ $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
return preg_replace($sPattern, '', $folderPath);
}
@@ -144,50 +144,50 @@ function GetParentFolder($folderPath)
*/
function CreateServerFolder($folderPath, $lastFolder = null)
{
- global $Config ;
+ global $Config;
$sParent = GetParentFolder($folderPath);
// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
- while ( strpos($folderPath, '//') !== false )
+ while (strpos($folderPath, '//') !== false)
{
$folderPath = str_replace('//', '/', $folderPath);
}
// Check if the parent exists, or create it.
- if ( !empty($sParent) && !file_exists($sParent))
+ if (!empty($sParent) && !file_exists($sParent))
{
//prevents agains infinite loop when we can't create root folder
- if ( !is_null($lastFolder) && $lastFolder === $sParent) {
- return "Can't create $folderPath directory" ;
+ if (!is_null($lastFolder) && $lastFolder === $sParent) {
+ return "Can't create $folderPath directory";
}
$sErrorMsg = CreateServerFolder($sParent, $folderPath);
- if ( $sErrorMsg != '' )
- return $sErrorMsg ;
+ if ($sErrorMsg != '')
+ return $sErrorMsg;
}
- if ( !file_exists($folderPath))
+ if (!file_exists($folderPath))
{
// Turn off all error reporting.
error_reporting(0);
- $php_errormsg = '' ;
+ $php_errormsg = '';
// Enable error tracking to catch the error.
ini_set('track_errors', '1');
- if ( isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate'] )
+ if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate'])
{
mkdir($folderPath);
}
else
{
$permissions = '0777';
- if ( isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate'])
+ if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate'])
{
$permissions = (string) $Config['ChmodOnFolderCreate'];
}
$permissionsdec = octdec($permissions);
- $permissionsdec |= octdec('0111'); // Set x bit required for directories
+ $permissionsdec |= octdec('0111'); // Set x bit required for directories
dol_syslog("io.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
// To create the folder with 0777 permissions, we need to set umask to zero.
$oldumask = umask(0);
@@ -195,16 +195,16 @@ function CreateServerFolder($folderPath, $lastFolder = null)
umask($oldumask);
}
- $sErrorMsg = $php_errormsg ;
+ $sErrorMsg = $php_errormsg;
// Restore the configurations.
ini_restore('track_errors');
ini_restore('error_reporting');
- return $sErrorMsg ;
+ return $sErrorMsg;
}
else
- return '' ;
+ return '';
}
/**
@@ -221,7 +221,7 @@ function GetRootPath()
// #2124 ensure that no slash is at the end
$sRealPath = rtrim($sRealPath, "\\/");
- $sSelfPath = $_SERVER['PHP_SELF'] ;
+ $sSelfPath = $_SERVER['PHP_SELF'];
$sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
$sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
@@ -230,7 +230,7 @@ function GetRootPath()
// This can check only that this script isn't run from a virtual dir
// But it avoids the problems that arise if it isn't checked
- if ( $position === false || $position <> strlen($sRealPath) - strlen($sSelfPath) )
+ if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
return substr($sRealPath, 0, $position);
@@ -243,12 +243,12 @@ function Server_MapPath($path)
// This function is available only for Apache
if (function_exists('apache_lookup_uri')) {
$info = apache_lookup_uri($path);
- return $info->filename . $info->path_info ;
+ return $info->filename.$info->path_info;
}
// This isn't correct but for the moment there's no other solution
// If this script is under a virtual directory or symlink it will detect the problem and stop
- return GetRootPath() . $path ;
+ return GetRootPath().$path;
}
/**
@@ -260,18 +260,18 @@ function Server_MapPath($path)
*/
function IsAllowedExt($sExtension, $resourceType)
{
- global $Config ;
+ global $Config;
// Get the allowed and denied extensions arrays.
- $arAllowed = $Config['AllowedExtensions'][$resourceType] ;
- $arDenied = $Config['DeniedExtensions'][$resourceType] ;
+ $arAllowed = $Config['AllowedExtensions'][$resourceType];
+ $arDenied = $Config['DeniedExtensions'][$resourceType];
- if ( count($arAllowed) > 0 && !in_array($sExtension, $arAllowed))
- return false ;
+ if (count($arAllowed) > 0 && !in_array($sExtension, $arAllowed))
+ return false;
- if ( count($arDenied) > 0 && in_array($sExtension, $arDenied))
- return false ;
+ if (count($arDenied) > 0 && in_array($sExtension, $arDenied))
+ return false;
- return true ;
+ return true;
}
/**
@@ -282,11 +282,11 @@ function IsAllowedExt($sExtension, $resourceType)
*/
function IsAllowedType($resourceType)
{
- global $Config ;
- if ( !in_array($resourceType, $Config['ConfigAllowedTypes']))
- return false ;
+ global $Config;
+ if (!in_array($resourceType, $Config['ConfigAllowedTypes']))
+ return false;
- return true ;
+ return true;
}
/**
@@ -297,12 +297,12 @@ function IsAllowedType($resourceType)
*/
function IsAllowedCommand($sCommand)
{
- global $Config ;
+ global $Config;
- if (! in_array($sCommand, $Config['ConfigAllowedCommands']))
- return false ;
+ if (!in_array($sCommand, $Config['ConfigAllowedCommands']))
+ return false;
- return true ;
+ return true;
}
/**
@@ -315,27 +315,27 @@ function GetCurrentFolder()
if (!isset($_GET)) {
global $_GET;
}
- $sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', '', 1) : '/' ;
+ $sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', '', 1) : '/';
// Check the current folder syntax (must begin and start with a slash).
if (!preg_match('|/$|', $sCurrentFolder))
- $sCurrentFolder .= '/' ;
+ $sCurrentFolder .= '/';
if (strpos($sCurrentFolder, '/') !== 0)
- $sCurrentFolder = '/' . $sCurrentFolder ;
+ $sCurrentFolder = '/'.$sCurrentFolder;
// Ensure the folder path has no double-slashes
- while ( strpos($sCurrentFolder, '//') !== false ) {
+ while (strpos($sCurrentFolder, '//') !== false) {
$sCurrentFolder = str_replace('//', '/', $sCurrentFolder);
}
// Check for invalid folder paths (..)
- if ( strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
+ if (strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
SendError(102, '');
- if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
+ if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
SendError(102, '');
- return $sCurrentFolder ;
+ return $sCurrentFolder;
}
// Do a cleanup of the folder name to avoid possible problems
@@ -346,24 +346,24 @@ function SanitizeFolderName($sNewFolderName)
// Remove . \ / | : ? * " < >
$sNewFolderName = preg_replace('/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName);
- return $sNewFolderName ;
+ return $sNewFolderName;
}
// Do a cleanup of the file name to avoid possible problems
function SanitizeFileName($sNewFileName)
{
- global $Config ;
+ global $Config;
$sNewFileName = stripslashes($sNewFileName);
// Replace dots in the name with underscores (only one dot can be there... security issue).
- if ( $Config['ForceSingleExtension'] )
+ if ($Config['ForceSingleExtension'])
$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
// Remove \ / | : ? * " < >
$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);
- return $sNewFileName ;
+ return $sNewFileName;
}
// This is the function that sends the results of the uploading process.
@@ -381,10 +381,10 @@ EOF;
$fileName = "";
}
- $rpl = array( '\\' => '\\\\', '"' => '\\"' );
- echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr($fileUrl, $rpl) . '","' . strtr($fileName, $rpl) . '", "' . strtr($customMsg, $rpl) . '");' ;
- echo '</script>' ;
- exit ;
+ $rpl = array('\\' => '\\\\', '"' => '\\"');
+ echo 'window.parent.OnUploadCompleted('.$errorNumber.',"'.strtr($fileUrl, $rpl).'","'.strtr($fileName, $rpl).'", "'.strtr($customMsg, $rpl).'");';
+ echo '</script>';
+ exit;
}
@@ -403,9 +403,9 @@ function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
{
echo '<script type="text/javascript">';
- $rpl = array( '\\' => '\\\\', '"' => '\\"' );
+ $rpl = array('\\' => '\\\\', '"' => '\\"');
- echo 'window.parent.CKEDITOR.tools.callFunction("'. $callback. '","'. strtr($sFileUrl, $rpl). '", "'. strtr($customMsg, $rpl). '");' ;
+ echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
echo '</script>';
}
diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php
index 9364f3bd540..b1f97d10395 100644
--- a/htdocs/core/filemanagerdol/connectors/php/upload.php
+++ b/htdocs/core/filemanagerdol/connectors/php/upload.php
@@ -41,22 +41,22 @@ function SendError($number, $text)
// Check if this uploader has been enabled.
-if ( !$Config['Enabled'] )
+if (!$Config['Enabled'])
SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
-$sCommand = 'QuickUpload' ;
+$sCommand = 'QuickUpload';
// The file type (from the QueryString, by default 'File').
-$sType = isset($_GET['Type']) ? $_GET['Type'] : 'File' ;
+$sType = isset($_GET['Type']) ? $_GET['Type'] : 'File';
-$sCurrentFolder = "/" ;
+$sCurrentFolder = "/";
// Is enabled the upload?
-if (! IsAllowedCommand($sCommand))
- SendUploadResults('1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed');
+if (!IsAllowedCommand($sCommand))
+ SendUploadResults('1', '', '', 'The ""'.$sCommand.'"" command isn\'t allowed');
// Check if it is an allowed type.
-if (! IsAllowedType($sType))
+if (!IsAllowedType($sType))
SendUploadResults(1, '', '', 'Invalid type specified');
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index 9f80b96b2fd..3ea4baf8c87 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -31,7 +31,7 @@
*/
function RemoveFromStart($sourceString, $charToRemove)
{
- $sPattern = '|^' . $charToRemove . '+|' ;
+ $sPattern = '|^'.$charToRemove.'+|';
return preg_replace($sPattern, '', $sourceString);
}
@@ -44,7 +44,7 @@ function RemoveFromStart($sourceString, $charToRemove)
*/
function RemoveFromEnd($sourceString, $charToRemove)
{
- $sPattern = '|' . $charToRemove . '+$|' ;
+ $sPattern = '|'.$charToRemove.'+$|';
return preg_replace($sPattern, '', $sourceString);
}
@@ -67,7 +67,7 @@ function FindBadUtf8($string)
'|(.{1}))';
while (preg_match('/'.$regex.'/S', $string, $matches)) {
- if ( isset($matches[2])) {
+ if (isset($matches[2])) {
return true;
}
$string = substr($string, strlen($matches[0]));
@@ -84,9 +84,9 @@ function FindBadUtf8($string)
*/
function ConvertToXmlAttribute($value)
{
- if ( defined('PHP_OS') )
+ if (defined('PHP_OS'))
{
- $os = PHP_OS ;
+ $os = PHP_OS;
}
else
{
@@ -112,9 +112,9 @@ function ConvertToXmlAttribute($value)
*/
function IsHtmlExtension($ext, $formExtensions)
{
- if (!$formExtensions || !is_array($formExtensions) )
+ if (!$formExtensions || !is_array($formExtensions))
{
- return false ;
+ return false;
}
$lcaseHtmlExtensions = array();
foreach ($formExtensions as $key => $val)
@@ -137,9 +137,9 @@ function DetectHtml($filePath)
$fp = @fopen($filePath, 'rb');
//open_basedir restriction, see #1906
- if ( $fp === false || !flock($fp, LOCK_SH) )
+ if ($fp === false || !flock($fp, LOCK_SH))
{
- return -1 ;
+ return -1;
}
$chunk = fread($fp, 1024);
@@ -150,47 +150,47 @@ function DetectHtml($filePath)
if (!$chunk)
{
- return false ;
+ return false;
}
$chunk = trim($chunk);
- if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
+ if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk))
{
return true;
}
- $tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
+ $tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
- foreach($tags as $tag)
+ foreach ($tags as $tag)
{
- if( false !== strpos($chunk, $tag) )
+ if (false !== strpos($chunk, $tag))
{
- return true ;
+ return true;
}
}
//type = javascript
- if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
+ if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk))
{
- return true ;
+ return true;
}
//href = javascript
//src = javascript
//data = javascript
- if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+ if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
{
- return true ;
+ return true;
}
//url(javascript
- if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+ if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
{
- return true ;
+ return true;
}
- return false ;
+ return false;
}
/**
@@ -228,12 +228,12 @@ function IsImageValid($filePath, $extension)
'wbmp'
);
- if (!in_array($extension, $imageCheckExtensions) ) {
+ if (!in_array($extension, $imageCheckExtensions)) {
return true;
}
if (@getimagesize($filePath) === false) {
- return false ;
+ return false;
}
return true;
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index edebf8a31b4..5105fe2201b 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -27,40 +27,40 @@
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language
//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
//if (! defined('NOLOGIN')) define('NOLOGIN',1); // Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
-if (! defined('DISABLE_JQUERY_TABLEDND')) define('DISABLE_JQUERY_TABLEDND', 1);
-if (! defined('DISABLE_JQUERY_JNOTIFY')) define('DISABLE_JQUERY_JNOTIFY', 1);
-if (! defined('DISABLE_JQUERY_FLOT')) define('DISABLE_JQUERY_FLOT', 1);
-if (! defined('DISABLE_JQUERY_JEDITABLE')) define('DISABLE_JQUERY_JEDITABLE', 1);
-if (! defined('DISABLE_CKEDITOR')) define('DISABLE_CKEDITOR', 1);
-if (! defined('DISABLE_BROWSER_NOTIF')) define('DISABLE_BROWSER_NOTIF', 1);
-if (! defined('DISABLE_DATE_PICKER')) define('DISABLE_DATE_PICKER', 1);
-if (! defined('DISABLE_SELECT2')) define('DISABLE_SELECT2', 1);
+if (!defined('DISABLE_JQUERY_TABLEDND')) define('DISABLE_JQUERY_TABLEDND', 1);
+if (!defined('DISABLE_JQUERY_JNOTIFY')) define('DISABLE_JQUERY_JNOTIFY', 1);
+if (!defined('DISABLE_JQUERY_FLOT')) define('DISABLE_JQUERY_FLOT', 1);
+if (!defined('DISABLE_JQUERY_JEDITABLE')) define('DISABLE_JQUERY_JEDITABLE', 1);
+if (!defined('DISABLE_CKEDITOR')) define('DISABLE_CKEDITOR', 1);
+if (!defined('DISABLE_BROWSER_NOTIF')) define('DISABLE_BROWSER_NOTIF', 1);
+if (!defined('DISABLE_DATE_PICKER')) define('DISABLE_DATE_PICKER', 1);
+if (!defined('DISABLE_SELECT2')) define('DISABLE_SELECT2', 1);
require_once '../main.inc.php';
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
$langs->load("main");
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
/*
* View
*/
-$title=$langs->trans("Menu");
+$title = $langs->trans("Menu");
// URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
-$head='<!-- Menu -->'."\n";
-$arrayofjs=array();
-$arrayofcss=array();
+$head = '<!-- Menu -->'."\n";
+$arrayofjs = array();
+$arrayofcss = array();
top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
print '<body>'."\n";
@@ -176,34 +176,34 @@ $(document).ready(function(){
if (empty($user->socid)) // If internal user or not defined
{
- $conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+ $conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
}
else // If external user
{
- $conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+ $conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
}
// Load the menu manager (only if not already done)
-$file_menu=$conf->standard_menu;
-if (GETPOST('menu')) $file_menu=GETPOST('menu'); // example: menu=eldy_menu.php
-if (! class_exists('MenuManager'))
+$file_menu = $conf->standard_menu;
+if (GETPOST('menu')) $file_menu = GETPOST('menu'); // example: menu=eldy_menu.php
+if (!class_exists('MenuManager'))
{
- $menufound=0;
- $dirmenus=array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
- foreach($dirmenus as $dirmenu)
+ $menufound = 0;
+ $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
+ foreach ($dirmenus as $dirmenu)
{
- $menufound=dol_include_once($dirmenu."standard/".$file_menu);
+ $menufound = dol_include_once($dirmenu."standard/".$file_menu);
if ($menufound) break;
}
- if (! $menufound) // If failed to include, we try with standard
+ if (!$menufound) // If failed to include, we try with standard
{
dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
- $file_menu='eldy_menu.php';
+ $file_menu = 'eldy_menu.php';
include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
}
}
-$menumanager = new MenuManager($db, empty($user->socid)?0:1);
-$menumanager->loadMenu('all', 'all'); // Load this->tabMenu with sql menu entries
+$menumanager = new MenuManager($db, empty($user->socid) ? 0 : 1);
+$menumanager->loadMenu('all', 'all'); // Load this->tabMenu with sql menu entries
//var_dump($menumanager);exit;
$menumanager->showmenu('jmobile');
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index c40dd571190..40596596b97 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -21,13 +21,13 @@
* \brief File that include javascript functions (included if option use_javascript activated)
*/
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
-if (! defined('NOLOGIN')) define('NOLOGIN', 1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN')) define('NOLOGIN', 1);
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
session_cache_limiter('public');
@@ -62,7 +62,7 @@ if (empty($conf->dol_no_mouse_hover))
print '
jQuery(".classfortooltiponclicktext").dialog(
{ closeOnEscape: true, classes: { "ui-dialog": "highlight" },
- maxHeight: window.innerHeight-60, width: '.($conf->browser->layout == 'phone' ? max($_SESSION['dol_screenwidth']-20, 320) : 700).',
+ maxHeight: window.innerHeight-60, width: '.($conf->browser->layout == 'phone' ? max($_SESSION['dol_screenwidth'] - 20, 320) : 700).',
modal: true,
autoOpen: false }).css("z-index: 5000");
jQuery(".classfortooltiponclick").click(function () {
@@ -79,7 +79,7 @@ print "});\n";
// Wrapper to manage dropdown
-if (! defined('JS_JQUERY_DISABLE_DROPDOWN'))
+if (!defined('JS_JQUERY_DISABLE_DROPDOWN'))
{
print "\n/* JS CODE TO ENABLE dropdown (hamburger, linkto, ...) */\n";
print '
@@ -151,7 +151,7 @@ if (! defined('JS_JQUERY_DISABLE_DROPDOWN'))
// Wrapper to manage document_preview
if ($conf->browser->layout != 'phone')
{
- print "\n/* JS CODE TO ENABLE document_preview */\n"; // Function document_preview is into header
+ print "\n/* JS CODE TO ENABLE document_preview */\n"; // Function document_preview is into header
print '
jQuery(document).ready(function () {
jQuery(".documentpreview").click(function () {
diff --git a/htdocs/core/js/lib_gravatar.js.php b/htdocs/core/js/lib_gravatar.js.php
index 9e1a85b57c4..59a1e5fddb5 100644
--- a/htdocs/core/js/lib_gravatar.js.php
+++ b/htdocs/core/js/lib_gravatar.js.php
@@ -24,14 +24,14 @@
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1'); // Not disabled cause need to load personalized language
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1'); // Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
-if (! defined('NOLOGIN')) define('NOLOGIN', 1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN')) define('NOLOGIN', 1);
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
session_cache_limiter('public');
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index a35fee85d0a..1efa4c88771 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -24,13 +24,13 @@
* JQuery (providing object $) and JQuery-UI (providing $datepicker) libraries must be loaded before this file.
*/
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
-if (! defined('NOLOGIN')) define('NOLOGIN', 1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN')) define('NOLOGIN', 1);
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
session_cache_limiter('public');
@@ -45,7 +45,7 @@ else header('Cache-Control: no-cache');
// Define tradMonths javascript array (we define this in datepicker AND in parent page to avoid errors with IE8)
-$tradMonths=array(
+$tradMonths = array(
dol_escape_js($langs->transnoentitiesnoconv("Month01")),
dol_escape_js($langs->transnoentitiesnoconv("Month02")),
dol_escape_js($langs->transnoentitiesnoconv("Month03")),
@@ -60,7 +60,7 @@ dol_escape_js($langs->transnoentitiesnoconv("Month11")),
dol_escape_js($langs->transnoentitiesnoconv("Month12"))
);
-$tradMonthsShort=array(
+$tradMonthsShort = array(
$langs->trans("MonthShort01"),
$langs->trans("MonthShort02"),
$langs->trans("MonthShort03"),
@@ -75,7 +75,7 @@ $langs->trans("MonthShort11"),
$langs->trans("MonthShort12")
);
-$tradDays=array(
+$tradDays = array(
$langs->trans("Sunday"),
$langs->trans("Monday"),
$langs->trans("Tuesday"),
@@ -85,7 +85,7 @@ $langs->trans("Friday"),
$langs->trans("Saturday")
);
-$tradDaysShort=array(
+$tradDaysShort = array(
$langs->trans("ShortSunday"),
$langs->trans("ShortMonday"),
$langs->trans("ShortTuesday"),
@@ -95,7 +95,7 @@ $langs->trans("ShortFriday"),
$langs->trans("ShortSaturday")
);
-$tradDaysMin=array(
+$tradDaysMin = array(
$langs->trans("SundayMin"),
$langs->trans("MondayMin"),
$langs->trans("TuesdayMin"),
@@ -139,8 +139,8 @@ jQuery(function($){
dayNamesMin: tradDaysMin,
weekHeader: '<?php echo $langs->trans("Week"); ?>',
dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>', /* Note dd/mm/yy means year on 4 digit in jquery format */
- firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'); ?>,
- isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>,
+ firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'); ?>,
+ isRTL: <?php echo ($langs->trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>,
showMonthAfterYear: false, /* TODO add specific to country */
yearSuffix: '' /* TODO add specific to country */
};
@@ -1060,8 +1060,8 @@ function price2numjs(amount) {
if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
}
- if ($thousand == 'Space') $thousand=' ';
- print "var dec='" . dol_escape_js($dec) . "'; var thousand='" . dol_escape_js($thousand) . "';\n"; // Set var in javascript
+ if ($thousand == 'Space') $thousand = ' ';
+ print "var dec='".dol_escape_js($dec)."'; var thousand='".dol_escape_js($thousand)."';\n"; // Set var in javascript
?>
var main_max_dec_shown = <?php echo (int) str_replace('.', '', $conf->global->MAIN_MAX_DECIMALS_SHOWN); ?>;
@@ -1093,7 +1093,7 @@ function price2numjs(amount) {
<?php
-if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY')) {
+if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
?>
// Defined properties for JNotify
$(document).ready(function() {
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index e78161d167d..3e4f838fe33 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -29,15 +29,15 @@ if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
require_once '../../main.inc.php';
-if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/index.php'
+if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/index.php'
|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
{
global $langs, $conf;
top_httphead('text/javascript; charset=UTF-8');
- print 'var login = \'' . $_SESSION['dol_login'] . '\';' . "\n";
- print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
+ print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
+ print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
print 'var time_js_next_test = (Date.now() + time_auto_update);'."\n";
?>
@@ -74,7 +74,7 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
if (arr.length > 0) {
var audio = null;
<?php
- if (! empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
+ if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
}
?>
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index e47c06cfd91..158c755935f 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -21,13 +21,13 @@
* \brief File that include javascript functions for timepicker
*/
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
-if (! defined('NOLOGIN')) define('NOLOGIN', 1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN')) define('NOLOGIN', 1);
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
session_cache_limiter('public');
@@ -55,7 +55,7 @@ jQuery(function($){
timeFormat: 'HH:mm',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
- isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>
+ isRTL: <?php echo ($langs->trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>
};
$.timepicker.setDefaults($.timepicker.regional['<?php echo $langs->defaultlang ?>']);
});
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 0200fbc5b91..21682a4abe6 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -53,12 +53,12 @@ function accounting_prepare_head(AccountingAccount $object)
global $langs, $conf;
$h = 0;
- $head = array ();
+ $head = array();
- $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$object->id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
- $h ++;
+ $h++;
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
@@ -96,18 +96,18 @@ function length_accountg($account)
if ($account < 0 || is_empty($account)) return '';
- if (! is_empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+ if (!is_empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
- if (! is_empty($g)) {
+ if (!is_empty($g)) {
// Clean parameters
$i = strlen($account);
if ($i >= 1) {
- while ( $i < $g ) {
+ while ($i < $g) {
$account .= '0';
- $i ++;
+ $i++;
}
return $account;
@@ -131,18 +131,18 @@ function length_accounta($accounta)
if ($accounta < 0 || is_empty($accounta)) return '';
- if (! is_empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+ if (!is_empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
- if (! is_empty($a)) {
+ if (!is_empty($a)) {
// Clean parameters
$i = strlen($accounta);
if ($i >= 1) {
- while ( $i < $a ) {
+ while ($i < $a) {
$accounta .= '0';
- $i ++;
+ $i++;
}
return $accounta;
@@ -177,10 +177,10 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
print "\n\n<!-- start banner journal -->\n";
- if(! is_empty($varlink)) $varlink = '?'.$varlink;
+ if (!is_empty($varlink)) $varlink = '?'.$varlink;
- $head=array();
- $h=0;
+ $head = array();
+ $h = 0;
$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
$head[$h][1] = $langs->trans("Journalization");
$head[$h][2] = 'journal';
@@ -190,7 +190,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
dol_fiche_head($head, 'journal');
- foreach($moreparam as $key => $value)
+ foreach ($moreparam as $key => $value)
{
print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
}
@@ -209,7 +209,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
{
print '<tr>';
print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
- if (! $variante) print '<td colspan="3">';
+ if (!$variante) print '<td colspan="3">';
else print '<td>';
print $calcmode;
if ($variante) print '</td><td colspan="2">'.$variante;
@@ -220,7 +220,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
// Ligne de la periode d'analyse du rapport
print '<tr>';
print '<td>'.$langs->trans("ReportPeriod").'</td>';
- if (! $periodlink) print '<td colspan="3">';
+ if (!$periodlink) print '<td colspan="3">';
else print '<td>';
if ($period) print $period;
if ($periodlink) print '</td><td colspan="2">'.$periodlink;
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 9b3f52957c7..f2e8e94ab78 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -577,9 +577,9 @@ function modules_prepare_head()
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=common";
+ $head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=commonkanban";
$head[$h][1] = $langs->trans("AvailableModules");
- $head[$h][2] = 'common';
+ $head[$h][2] = 'commonkanban';
$h++;
$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=marketplace";
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index e5d7422cf8a..8dc2e418cc8 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -54,88 +54,94 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
$langs->load("companies");
- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
- $formactions=new FormActions($db);
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
// Filters
//print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
- print '<input type="hidden" name="token" value="' . newToken() . '">';
- print '<input type="hidden" name="year" value="' . $year . '">';
- print '<input type="hidden" name="month" value="' . $month . '">';
- print '<input type="hidden" name="day" value="' . $day . '">';
- print '<input type="hidden" name="action" value="' . $action . '">';
- print '<input type="hidden" name="search_showbirthday" value="' . $showbirthday . '">';
+ print '<input type="hidden" name="token" value="'.newToken().'">';
+ print '<input type="hidden" name="year" value="'.$year.'">';
+ print '<input type="hidden" name="month" value="'.$month.'">';
+ print '<input type="hidden" name="day" value="'.$day.'">';
+ print '<input type="hidden" name="action" value="'.$action.'">';
+ print '<input type="hidden" name="search_showbirthday" value="'.$showbirthday.'">';
print '<div class="fichecenter">';
if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';
- else print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
+ else print '<table class="nobordernopadding centpercent"><tr><td class="borderright">';
- print '<table class="nobordernopadding centpercent">';
+ print '<table class="nobordernopadding centpercent tableforfield">';
if ($canedit)
{
+ // Type
+ print '<tr>';
+ print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+ print $langs->trans("Type");
+ print '</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+ $multiselect = 0;
+ if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+ {
+ $multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
+ }
+ print '<span class="fas fa-square" style=" color: #ddd;"></span>';
+ print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect);
+ print '</td></tr>';
+
+ // Assigned to
print '<tr>';
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
print $langs->trans("ActionsToDoBy").' ';
print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
- print $form->select_dolusers($filtert, 'search_filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
- if (empty($conf->dol_optimize_smallscreen)) print ' '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' ';
- print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
+ print img_picto('', 'user');
+ print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+ if (empty($conf->dol_optimize_smallscreen)) print ' '.$langs->trans("or").' '.$langs->trans("ToUserOfGroup").' ';
+ print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit);
print '</td></tr>';
if ($conf->resource->enabled)
{
- include_once DOL_DOCUMENT_ROOT . '/resource/class/html.formresource.class.php';
- $formresource=new FormResource($db);
+ include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
+ $formresource = new FormResource($db);
// Resource
print '<tr>';
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
print $langs->trans("Resource");
- print ' </td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
- print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2);
+ print '</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
+ print img_picto('', 'object_resource');
+ print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2);
print '</td></tr>';
}
-
- // Type
- print '<tr>';
- print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
- print $langs->trans("Type");
- print ' </td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
- $multiselect=0;
- if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
- {
- $multiselect=(!empty($conf->global->AGENDA_USE_EVENT_TYPE));
- }
- print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1), 0, $multiselect);
- print '</td></tr>';
}
- if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+ if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
{
print '<tr>';
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
print $langs->trans("ThirdParty").' ';
print '</td><td class="nowrap" style="padding-bottom: 2px;">';
+ print img_picto('', 'company');
print $form->select_company($socid, 'search_socid', '', 'SelectThirdParty', 0, 0, null, 0);
print '</td></tr>';
}
- if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+ if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
{
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
- $formproject=new FormProjets($db);
+ $formproject = new FormProjets($db);
print '<tr>';
print '<td class="nowrap" style="padding-bottom: 2px;">';
print $langs->trans("Project").' ';
print '</td><td class="nowrap" style="padding-bottom: 2px;">';
- print $formproject->select_projects($socid?$socid:-1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
+ print img_picto('', 'project');
+ print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
print '</td></tr>';
}
- if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
+ if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"]))
{
// Status
print '<tr>';
@@ -188,7 +194,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '<table class="centpercent"><tr><td align="center">';
print '<div class="formleftzone">';
- print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="' . $langs->trans("Refresh") . '">';
+ print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="'.$langs->trans("Refresh").'">';
print '</div>';
print '</td></tr>';
print '</table>';
@@ -196,7 +202,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
if ($conf->browser->layout == 'phone') print '</div>';
else print '</td></tr></table>';
- print '</div>'; // Close fichecenter
+ print '</div>'; // Close fichecenter
print '<div style="clear:both"></div>';
//print '</form>';
@@ -213,26 +219,26 @@ function show_array_actions_to_do($max = 5)
{
global $langs, $conf, $user, $db, $bc, $socid;
- $now=dol_now();
+ $now = dol_now();
include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
- $sql.= " c.code, c.libelle as type_label,";
- $sql.= " s.nom as sname, s.rowid, s.client";
- $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
- $sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE a.entity = ".$conf->entity;
- $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
- if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socid) $sql.= " AND s.rowid = ".$socid;
- $sql.= " ORDER BY a.datep DESC, a.id DESC";
- $sql.= $db->plimit($max, 0);
+ $sql .= " c.code, c.libelle as type_label,";
+ $sql .= " s.nom as sname, s.rowid, s.client";
+ $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
+ $sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE a.entity = ".$conf->entity;
+ $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($socid) $sql .= " AND s.rowid = ".$socid;
+ $sql .= " ORDER BY a.datep DESC, a.id DESC";
+ $sql .= $db->plimit($max, 0);
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
@@ -246,8 +252,8 @@ function show_array_actions_to_do($max = 5)
$var = true;
$i = 0;
- $staticaction=new ActionComm($db);
- $customerstatic=new Client($db);
+ $staticaction = new ActionComm($db);
+ $customerstatic = new Client($db);
while ($i < $num)
{
@@ -256,9 +262,9 @@ function show_array_actions_to_do($max = 5)
print '<tr class="oddeven">';
- $staticaction->type_code=$obj->code;
- $staticaction->label=($obj->label?$obj->label:$obj->type_label);
- $staticaction->id=$obj->id;
+ $staticaction->type_code = $obj->code;
+ $staticaction->label = ($obj->label ? $obj->label : $obj->type_label);
+ $staticaction->id = $obj->id;
print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
// print '<td>'.dol_trunc($obj->label,22).'</td>';
@@ -266,23 +272,23 @@ function show_array_actions_to_do($max = 5)
print '<td>';
if ($obj->rowid > 0)
{
- $customerstatic->id=$obj->rowid;
- $customerstatic->name=$obj->sname;
- $customerstatic->client=$obj->client;
+ $customerstatic->id = $obj->rowid;
+ $customerstatic->name = $obj->sname;
+ $customerstatic->client = $obj->client;
print $customerstatic->getNomUrl(1, '', 16);
}
print '</td>';
- $datep=$db->jdate($obj->dp);
- $datep2=$db->jdate($obj->dp2);
+ $datep = $db->jdate($obj->dp);
+ $datep2 = $db->jdate($obj->dp2);
// Date
print '<td width="100" class="right">'.dol_print_date($datep, 'day').' ';
- $late=0;
- if ($obj->percent == 0 && $datep && $datep < time()) $late=1;
- if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) $late=1;
- if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late=1;
- if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) $late=1;
+ $late = 0;
+ if ($obj->percent == 0 && $datep && $datep < time()) $late = 1;
+ if ($obj->percent == 0 && !$datep && $datep2 && $datep2 < time()) $late = 1;
+ if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late = 1;
+ if ($obj->percent > 0 && $obj->percent < 100 && !$datep2 && $datep && $datep < time()) $late = 1;
if ($late) print img_warning($langs->trans("Late"));
print "</td>";
@@ -314,23 +320,23 @@ function show_array_last_actions_done($max = 5)
{
global $langs, $conf, $user, $db, $bc, $socid;
- $now=dol_now();
+ $now = dol_now();
$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";
- $sql.= " c.code, c.libelle,";
- $sql.= " s.rowid, s.nom as sname, s.client";
- $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
- $sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE a.entity = ".$conf->entity;
- $sql.= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
- if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($socid) $sql.= " AND s.rowid = ".$socid;
+ $sql .= " c.code, c.libelle,";
+ $sql .= " s.rowid, s.nom as sname, s.client";
+ $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
+ $sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE a.entity = ".$conf->entity;
+ $sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
+ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($socid) $sql .= " AND s.rowid = ".$socid;
$sql .= " ORDER BY a.datep2 DESC";
$sql .= $db->plimit($max, 0);
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
@@ -343,8 +349,8 @@ function show_array_last_actions_done($max = 5)
$var = true;
$i = 0;
- $staticaction=new ActionComm($db);
- $customerstatic=new Societe($db);
+ $staticaction = new ActionComm($db);
+ $customerstatic = new Societe($db);
while ($i < $num)
{
@@ -353,9 +359,9 @@ function show_array_last_actions_done($max = 5)
print '<tr class="oddeven">';
- $staticaction->type_code=$obj->code;
- $staticaction->libelle=$obj->label;
- $staticaction->id=$obj->id;
+ $staticaction->type_code = $obj->code;
+ $staticaction->libelle = $obj->label;
+ $staticaction->id = $obj->id;
print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
//print '<td>'.dol_trunc($obj->label,24).'</td>';
@@ -363,9 +369,9 @@ function show_array_last_actions_done($max = 5)
print '<td>';
if ($obj->rowid > 0)
{
- $customerstatic->id=$obj->rowid;
- $customerstatic->name=$obj->sname;
- $customerstatic->client=$obj->client;
+ $customerstatic->id = $obj->rowid;
+ $customerstatic->name = $obj->sname;
+ $customerstatic->client = $obj->client;
print $customerstatic->getNomUrl(1, '', 24);
}
print '</td>';
@@ -467,13 +473,13 @@ function actions_prepare_head($object)
if ($conf->resource->enabled)
{
include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
- $resource=new DolResource($db);
+ $resource = new DolResource($db);
$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
$listofresourcelinked = $resource->getElementResources($object->element, $object->id);
- $nbResources=(is_array($listofresourcelinked)?count($listofresourcelinked):0);
+ $nbResources = (is_array($listofresourcelinked) ?count($listofresourcelinked) : 0);
$head[$h][1] = $langs->trans("Resources");
- if ($nbResources > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbResources).'</span>';
+ if ($nbResources > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbResources).'</span>';
$head[$h][2] = 'resources';
$h++;
}
@@ -481,12 +487,12 @@ function actions_prepare_head($object)
// Attached files
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->agenda->dir_output . "/" . $object->id;
+ $upload_dir = $conf->agenda->dir_output."/".$object->id;
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
@@ -516,30 +522,30 @@ function calendars_prepare_head($param)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php'.($param?'?'.$param:'');
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php'.($param ? '?'.$param : '');
$head[$h][1] = $langs->trans("ViewList");
$head[$h][2] = 'cardlist';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param?'&'.$param:'');
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param ? '&'.$param : '');
$head[$h][1] = $langs->trans("ViewCal");
$head[$h][2] = 'cardmonth';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param?'&'.$param:'');
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param ? '&'.$param : '');
$head[$h][1] = $langs->trans("ViewWeek");
$head[$h][2] = 'cardweek';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param?'&'.$param:'');
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param ? '&'.$param : '');
$head[$h][1] = $langs->trans("ViewDay");
$head[$h][2] = 'cardday';
$h++;
//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
- if (! empty($conf->global->AGENDA_SHOW_PERTYPE))
+ if (!empty($conf->global->AGENDA_SHOW_PERTYPE))
{
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param?'?'.$param:'');
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
$head[$h][1] = $langs->trans("ViewPerType");
$head[$h][2] = 'cardpertype';
$h++;
@@ -547,7 +553,7 @@ function calendars_prepare_head($param)
$newparam = $param;
$newparam = preg_replace('/&?search_filtert=\d+/', '', $newparam);
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam?'?'.$newparam:'');
+ $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam ? '?'.$newparam : '');
$head[$h][1] = $langs->trans("ViewPerUser");
$head[$h][2] = 'cardperuser';
$h++;
diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php
index 5c6bac579f2..1b58784f6e8 100644
--- a/htdocs/core/lib/asset.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -35,7 +35,7 @@ function asset_admin_prepare_head()
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT . '/asset/admin/setup.php';
+ $head[$h][0] = DOL_URL_ROOT.'/asset/admin/setup.php';
$head[$h][1] = $langs->trans("Settings");
$head[$h][2] = 'settings';
$h++;
@@ -50,12 +50,12 @@ function asset_admin_prepare_head()
//); // to remove a tab
complete_head_from_modules($conf, $langs, null, $head, $h, 'assets_admin');
- $head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
+ $head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';
$h++;
- $head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_type_extrafields.php';
+ $head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_type_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
$head[$h][2] = 'attributes_type';
$h++;
@@ -80,7 +80,7 @@ function asset_prepare_head(Asset $object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT . '/asset/card.php';
+ $head[$h][0] = DOL_URL_ROOT.'/asset/card.php';
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
@@ -97,25 +97,25 @@ function asset_prepare_head(Asset $object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->assets->dir_output . '/' . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->assets->dir_output.'/'.dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
$head[$h][1] = $langs->trans("Notes");
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
- $head[$h][0] = DOL_URL_ROOT . '/asset/info.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/asset/info.php?id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
@@ -135,7 +135,7 @@ function asset_type_prepare_head(AssetType $object)
{
global $langs, $conf, $user;
- $h=0;
+ $h = 0;
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 1a7b33569ce..a4d7a077aab 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -27,18 +27,18 @@
/* ******************************************************************** */
/* COLORS */
/* ******************************************************************** */
-$bar_color=array(0,0,0);
-$bg_color=array(255,255,255);
-$text_color=array(0,0,0);
+$bar_color = array(0, 0, 0);
+$bg_color = array(255, 255, 255);
+$text_color = array(0, 0, 0);
/* ******************************************************************** */
/* FONT FILE */
/* ******************************************************************** */
-if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
+if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc = constant('DOL_DEFAULT_TTF_BOLD');
// Automatic-Detection of Font if running Windows
// @CHANGE LDR
-if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
+if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc = $_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
@@ -50,7 +50,7 @@ if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path t
* genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN
*/
-if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND');
+if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
@@ -69,16 +69,16 @@ function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png")
{
dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
- $bars=barcode_encode($code, $encoding);
- if (! $bars || ! empty($bars['error']))
+ $bars = barcode_encode($code, $encoding);
+ if (!$bars || !empty($bars['error']))
{
// Return error message instead of array
- if (empty($bars['error'])) $error='Bad Value '.$code.' for encoding '.$encoding;
- else $error=$bars['error'];
+ if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding;
+ else $error = $bars['error'];
dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
return $error;
}
- if (! $mode) $mode="png";
+ if (!$mode) $mode = "png";
//if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
//elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
//else
@@ -116,23 +116,23 @@ function barcode_encode($code, $encoding)
(preg_match("/^ean$/i", $encoding))
|| (($encoding) && (preg_match("/^isbn$/i", $encoding))
- && (( strlen($code)==9 || strlen($code)==10) ||
- (((preg_match("/^978/", $code) && strlen($code)==12) ||
- (strlen($code)==13)))))
+ && ((strlen($code) == 9 || strlen($code) == 10) ||
+ (((preg_match("/^978/", $code) && strlen($code) == 12) ||
+ (strlen($code) == 13)))))
- || (( !isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding) ))
+ || ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))
&& (preg_match("/^[0-9]{12,13}$/", $code)))
)
{
/* use built-in EAN-Encoder */
dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
- $bars=barcode_encode_ean($code, $encoding);
+ $bars = barcode_encode_ean($code, $encoding);
}
elseif (file_exists($genbarcode_loc)) // For example C39
{
/* use genbarcode */
dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
- $bars=barcode_encode_genbarcode($code, $encoding);
+ $bars = barcode_encode_genbarcode($code, $encoding);
}
else
{
@@ -160,14 +160,14 @@ function barcode_encode($code, $encoding)
*/
function barcode_gen_ean_sum($ean)
{
- $even=true; $esum=0; $osum=0;
- $ln=strlen($ean)-1;
- for ($i=$ln; $i>=0; $i--)
+ $even = true; $esum = 0; $osum = 0;
+ $ln = strlen($ean) - 1;
+ for ($i = $ln; $i >= 0; $i--)
{
- if ($even) $esum+=$ean[$i]; else $osum+=$ean[$i];
- $even=!$even;
+ if ($even) $esum += $ean[$i]; else $osum += $ean[$i];
+ $even = !$even;
}
- return (10-((3*$esum+$osum)%10))%10;
+ return (10 - ((3 * $esum + $osum) % 10)) % 10;
}
/**
@@ -179,48 +179,48 @@ function barcode_gen_ean_sum($ean)
*/
function barcode_encode_ean($ean, $encoding = "EAN-13")
{
- $digits=array(3211,2221,2122,1411,1132,1231,1114,1312,1213,3112);
- $mirror=array("000000","001011","001101","001110","010011","011001","011100","010101","010110","011010");
- $guards=array("9a1a","1a1a1","a1a");
+ $digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);
+ $mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");
+ $guards = array("9a1a", "1a1a1", "a1a");
- $ean=trim($ean);
+ $ean = trim($ean);
if (preg_match("/[^0-9]/i", $ean))
{
return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
}
- $encoding=strtoupper($encoding);
- if ($encoding=="ISBN")
+ $encoding = strtoupper($encoding);
+ if ($encoding == "ISBN")
{
- if (!preg_match("/^978/", $ean)) $ean="978".$ean;
+ if (!preg_match("/^978/", $ean)) $ean = "978".$ean;
}
- if (preg_match("/^978/", $ean)) $encoding="ISBN";
- if (strlen($ean)<12 || strlen($ean)>13)
+ if (preg_match("/^978/", $ean)) $encoding = "ISBN";
+ if (strlen($ean) < 12 || strlen($ean) > 13)
{
return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
}
- $ean=substr($ean, 0, 12);
- $eansum=barcode_gen_ean_sum($ean);
- $ean.=$eansum;
- $line=$guards[0];
- for ($i=1;$i<13;$i++)
+ $ean = substr($ean, 0, 12);
+ $eansum = barcode_gen_ean_sum($ean);
+ $ean .= $eansum;
+ $line = $guards[0];
+ for ($i = 1; $i < 13; $i++)
{
- $str=$digits[$ean[$i]];
- if ($i<7 && $mirror[$ean[0]][$i-1]==1) $line.=strrev($str); else $line.=$str;
- if ($i==6) $line.=$guards[1];
+ $str = $digits[$ean[$i]];
+ if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str;
+ if ($i == 6) $line .= $guards[1];
}
- $line.=$guards[2];
+ $line .= $guards[2];
/* create text */
- $pos=0;
- $text="";
- for ($a=0;$a<13;$a++)
+ $pos = 0;
+ $text = "";
+ for ($a = 0; $a < 13; $a++)
{
- if ($a>0) $text.=" ";
- $text.="$pos:12:{$ean[$a]}";
- if ($a==0) $pos+=12;
- elseif ($a==6) $pos+=12;
- else $pos+=7;
+ if ($a > 0) $text .= " ";
+ $text .= "$pos:12:{$ean[$a]}";
+ if ($a == 0) $pos += 12;
+ elseif ($a == 6) $pos += 12;
+ else $pos += 7;
}
return array(
@@ -243,25 +243,25 @@ function barcode_encode_genbarcode($code, $encoding)
global $genbarcode_loc;
// Clean parameters
- if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) $code=substr($code, 0, 12);
- if (!$encoding) $encoding="ANY";
- $encoding=preg_replace("/[\\\|]/", "_", $encoding);
- $code=preg_replace("/[\\\|]/", "_", $code);
+ if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12);
+ if (!$encoding) $encoding = "ANY";
+ $encoding = preg_replace("/[\\\|]/", "_", $encoding);
+ $code = preg_replace("/[\\\|]/", "_", $code);
- $command=escapeshellarg($genbarcode_loc);
+ $command = escapeshellarg($genbarcode_loc);
//$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
- $paramclear=" ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
+ $paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
- $fullcommandclear=$command." ".$paramclear." 2>&1";
+ $fullcommandclear = $command." ".$paramclear." 2>&1";
//print $fullcommandclear."<br>\n";exit;
dol_syslog("Run command ".$fullcommandclear);
- $fp=popen($fullcommandclear, "r");
+ $fp = popen($fullcommandclear, "r");
if ($fp)
{
- $bars=fgets($fp, 1024);
- $text=fgets($fp, 1024);
- $encoding=fgets($fp, 1024);
+ $bars = fgets($fp, 1024);
+ $text = fgets($fp, 1024);
+ $encoding = fgets($fp, 1024);
pclose($fp);
}
else
@@ -270,7 +270,7 @@ function barcode_encode_genbarcode($code, $encoding)
return false;
}
//var_dump($bars);
- $ret=array(
+ $ret = array(
"bars" => trim($bars),
"text" => trim($text),
"encoding" => trim($encoding),
@@ -279,7 +279,7 @@ function barcode_encode_genbarcode($code, $encoding)
//var_dump($ret);
if (preg_match('/permission denied/i', $ret['bars']))
{
- $ret['error']=$ret['bars']; $ret['bars']='';
+ $ret['error'] = $ret['bars']; $ret['bars'] = '';
return $ret;
}
if (!$ret['bars']) return false;
@@ -310,99 +310,99 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
//var_dump($font_loc);
/* set defaults */
- if ($scale<1) $scale=2;
- $total_y=(int) $total_y;
- if ($total_y<1) $total_y=(int) $scale * 60;
+ if ($scale < 1) $scale = 2;
+ $total_y = (int) $total_y;
+ if ($total_y < 1) $total_y = (int) $scale * 60;
if (!$space)
- $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
+ $space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
/* count total width */
- $xpos=0;
- $width=true;
- $ln=strlen($bars);
- for ($i=0; $i<$ln; $i++)
+ $xpos = 0;
+ $width = true;
+ $ln = strlen($bars);
+ for ($i = 0; $i < $ln; $i++)
{
- $val=strtolower($bars[$i]);
+ $val = strtolower($bars[$i]);
if ($width)
{
- $xpos+=$val*$scale;
- $width=false;
+ $xpos += $val * $scale;
+ $width = false;
continue;
}
if (preg_match("/[a-z]/", $val))
{
/* tall bar */
- $val=ord($val)-ord('a')+1;
+ $val = ord($val) - ord('a') + 1;
}
- $xpos+=$val*$scale;
- $width=true;
+ $xpos += $val * $scale;
+ $width = true;
}
/* allocate the image */
- $total_x=( $xpos )+$space['right']+$space['right'];
- $xpos=$space['left'];
- if (! function_exists("imagecreate"))
+ $total_x = ($xpos) + $space['right'] + $space['right'];
+ $xpos = $space['left'];
+ if (!function_exists("imagecreate"))
{
print "You don't have the gd2 extension enabled<br>\n";
return "";
}
- $im=imagecreate($total_x, $total_y);
+ $im = imagecreate($total_x, $total_y);
/* create two images */
- $col_bg=ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
- $col_bar=ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
- $col_text=ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
- $height=round($total_y-($scale*10));
- $height2=round($total_y-$space['bottom']);
+ $col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
+ $col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
+ $col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
+ $height = round($total_y - ($scale * 10));
+ $height2 = round($total_y - $space['bottom']);
/* paint the bars */
- $width=true;
- $ln=strlen($bars);
- for ($i=0; $i<$ln; $i++)
+ $width = true;
+ $ln = strlen($bars);
+ for ($i = 0; $i < $ln; $i++)
{
- $val=strtolower($bars[$i]);
+ $val = strtolower($bars[$i]);
if ($width)
{
- $xpos+=$val*$scale;
- $width=false;
+ $xpos += $val * $scale;
+ $width = false;
continue;
}
if (preg_match("/[a-z]/", $val))
{
/* tall bar */
- $val=ord($val)-ord('a')+1;
- $h=$height2;
- } else $h=$height;
- imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar);
- $xpos+=$val*$scale;
- $width=true;
+ $val = ord($val) - ord('a') + 1;
+ $h = $height2;
+ } else $h = $height;
+ imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);
+ $xpos += $val * $scale;
+ $width = true;
}
- $chars=explode(" ", $text);
+ $chars = explode(" ", $text);
reset($chars);
- while (list($n, $v)=each($chars))
+ while (list($n, $v) = each($chars))
{
if (trim($v))
{
- $inf=explode(":", $v);
- $fontsize=$scale*($inf[1]/1.8);
- $fontheight=$total_y-($fontsize/2.7)+2;
- imagettftext($im, $fontsize, 0, $space['left']+($scale*$inf[0])+2, $fontheight, $col_text, $font_loc, $inf[2]);
+ $inf = explode(":", $v);
+ $fontsize = $scale * ($inf[1] / 1.8);
+ $fontheight = $total_y - ($fontsize / 2.7) + 2;
+ imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);
}
}
/* output the image */
- $mode=strtolower($mode);
- if ($mode=='jpg' || $mode=='jpeg')
+ $mode = strtolower($mode);
+ if ($mode == 'jpg' || $mode == 'jpeg')
{
header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
imagejpeg($im);
}
- elseif ($mode=='gif')
+ elseif ($mode == 'gif')
{
header("Content-Type: image/gif; name=\"barcode.gif\"");
imagegif($im);
}
- elseif (! empty($filebarcode)) // To wxrite into afile onto disk
+ elseif (!empty($filebarcode)) // To wxrite into afile onto disk
{
imagepng($im, $filebarcode);
}
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index ca665637768..e0945f9a029 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -29,7 +29,7 @@
* @param string $type Type of category
* @return array Array of tabs to show
*/
-function categories_prepare_head($object, $type)
+function categories_prepare_head(Categorie $object, $type)
{
global $langs, $conf, $user;
@@ -49,7 +49,7 @@ function categories_prepare_head($object, $type)
$head[$h][2] = 'photos';
$h++;
- if (! empty($conf->global->MAIN_MULTILANGS))
+ if (!empty($conf->global->MAIN_MULTILANGS))
{
$head[$h][0] = DOL_URL_ROOT.'/categories/traduction.php?id='.$object->id.'&type='.$type;
$head[$h][1] = $langs->trans("Translation");
@@ -57,6 +57,11 @@ function categories_prepare_head($object, $type)
$h++;
}
+ $head[$h][0] = DOL_URL_ROOT.'/categories/info.php?id='.$object->id;
+ $head[$h][1] = $langs->trans("Info");
+ $head[$h][2] = 'info';
+ $h++;
+
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index eac9f404188..25061e60f9c 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -105,7 +105,7 @@ function societe_prepare_head(Societe $object)
}
}
$supplier_module_enabled = 0;
- if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $supplier_module_enabled=1;
+ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $supplier_module_enabled = 1;
if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire))
{
$head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;
@@ -1228,7 +1228,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
// Edit
if ($user->rights->societe->contact->creer)
{
- print '<a href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
+ print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
print img_edit();
print '</a>';
}
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 0082947d0c1..8edc81d7ee7 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -42,8 +42,8 @@ function contact_prepare_head(Contact $object)
$head[$tab][2] = 'card';
$tab++;
- if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
- && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+ if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))
+ && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
{
$langs->load("ldap");
@@ -59,7 +59,7 @@ function contact_prepare_head(Contact $object)
$tab++;
// Related items
- if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || ! empty($conf->fournisseur->enabled))
+ if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled))
{
$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
$head[$tab][1] = $langs->trans("Referers");
@@ -75,32 +75,32 @@ function contact_prepare_head(Contact $object)
// Notes
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
- $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
+ $nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
$head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
$head[$tab][1] = $langs->trans("Note");
- if($nbNote > 0) $head[$tab][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$tab][2] = 'note';
$tab++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->societe->dir_output . "/contact/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->societe->dir_output."/contact/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;
$head[$tab][1] = $langs->trans("Documents");
- if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$tab][2] = 'documents';
$tab++;
// Agenda / Events
$head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;
- $head[$tab][1].= $langs->trans("Events");
- if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+ $head[$tab][1] .= $langs->trans("Events");
+ if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
{
- $head[$tab][1].= '/';
- $head[$tab][1].= $langs->trans("Agenda");
+ $head[$tab][1] .= '/';
+ $head[$tab][1] .= $langs->trans("Agenda");
}
$head[$tab][2] = 'agenda';
$tab++;
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index ec91a2dcc70..b7d3c45bee3 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -45,7 +45,7 @@ function contract_prepare_head(Contrat $object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
$head[$h][1] = $langs->trans("ContactsAddresses");
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -59,32 +59,32 @@ function contract_prepare_head(Contrat $object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
$head[$h][1] = $langs->trans("Notes");
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id;
- $head[$h][1].= $langs->trans("Events");
- if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+ $head[$h][1] .= $langs->trans("Events");
+ if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
{
- $head[$h][1].= '/';
- $head[$h][1].= $langs->trans("Agenda");
+ $head[$h][1] .= '/';
+ $head[$h][1] .= $langs->trans("Agenda");
}
$head[$h][2] = 'agenda';
$h++;
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index e7043a1798a..cff2670061e 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -33,7 +33,7 @@
*/
function get_tz_array()
{
- $tzarray=array(
+ $tzarray = array(
-11=>"Pacific/Midway",
-10=>"Pacific/Fakaofo",
-9=>"America/Anchorage",
@@ -85,22 +85,22 @@ function getServerTimeZoneInt($refgmtdate = 'now')
if (method_exists('DateTimeZone', 'getOffset'))
{
// Method 1 (include daylight)
- $gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow, '%Y'); $monthref=dol_print_date($gmtnow, '%m'); $dayref=dol_print_date($gmtnow, '%d');
- if ($refgmtdate == 'now') $newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
- elseif ($refgmtdate == 'summer') $newrefgmtdate=$yearref.'-08-01';
- else $newrefgmtdate=$yearref.'-01-01';
- $newrefgmtdate.='T00:00:00+00:00';
+ $gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');
+ if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
+ elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';
+ else $newrefgmtdate = $yearref.'-01-01';
+ $newrefgmtdate .= 'T00:00:00+00:00';
$localtz = new DateTimeZone(getServerTimeZoneString());
$localdt = new DateTime($newrefgmtdate, $localtz);
- $tmp=-1*$localtz->getOffset($localdt);
+ $tmp = -1 * $localtz->getOffset($localdt);
//print $refgmtdate.'='.$tmp;
}
else
{
- $tmp=0;
+ $tmp = 0;
dol_print_error('', 'PHP version must be 5.3+');
}
- $tz=round(($tmp<0?1:-1)*abs($tmp/3600));
+ $tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));
return $tz;
}
@@ -118,23 +118,23 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
global $conf;
if ($duration_value == 0) return $time;
- if ($duration_unit == 'h') return $time + (3600*$duration_value);
- if ($duration_unit == 'w') return $time + (3600*24*7*$duration_value);
+ if ($duration_unit == 'h') return $time + (3600 * $duration_value);
+ if ($duration_unit == 'w') return $time + (3600 * 24 * 7 * $duration_value);
- $deltastring='P';
+ $deltastring = 'P';
- if ($duration_value > 0){ $deltastring.=abs($duration_value); $sub= false; }
- if ($duration_value < 0){ $deltastring.=abs($duration_value); $sub= true; }
- if ($duration_unit == 'd') { $deltastring.="D"; }
- if ($duration_unit == 'm') { $deltastring.="M"; }
- if ($duration_unit == 'y') { $deltastring.="Y"; }
+ if ($duration_value > 0) { $deltastring .= abs($duration_value); $sub = false; }
+ if ($duration_value < 0) { $deltastring .= abs($duration_value); $sub = true; }
+ if ($duration_unit == 'd') { $deltastring .= "D"; }
+ if ($duration_unit == 'm') { $deltastring .= "M"; }
+ if ($duration_unit == 'y') { $deltastring .= "Y"; }
$date = new DateTime();
- if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
+ if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
$date->setTimestamp($time);
$interval = new DateInterval($deltastring);
- if($sub) $date->sub($interval);
+ if ($sub) $date->sub($interval);
else $date->add($interval);
return $date->getTimestamp();
@@ -152,7 +152,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
*/
function convertTime2Seconds($iHours = 0, $iMinutes = 0, $iSeconds = 0)
{
- $iResult=($iHours*3600)+($iMinutes*60)+$iSeconds;
+ $iResult = ($iHours * 3600) + ($iMinutes * 60) + $iSeconds;
return $iResult;
}
@@ -182,26 +182,26 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
{
global $langs;
- if (empty($lengthOfDay)) $lengthOfDay = 86400; // 1 day = 24 hours
- if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
+ if (empty($lengthOfDay)) $lengthOfDay = 86400; // 1 day = 24 hours
+ if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec')
{
- if ((int) $iSecond === 0) return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
+ if ((int) $iSecond === 0) return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
- $sTime='';
- $sDay=0;
- $sWeek=0;
+ $sTime = '';
+ $sDay = 0;
+ $sWeek = 0;
if ($iSecond >= $lengthOfDay)
{
- for($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay )
+ for ($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay)
{
$sDay++;
- $iSecond-=$lengthOfDay;
+ $iSecond -= $lengthOfDay;
}
$dayTranslate = $langs->trans("Day");
- if ($iSecond >= ($lengthOfDay*2)) $dayTranslate = $langs->trans("Days");
+ if ($iSecond >= ($lengthOfDay * 2)) $dayTranslate = $langs->trans("Days");
}
if ($lengthOfWeek < 7)
@@ -210,70 +210,70 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
{
if ($sDay >= $lengthOfWeek)
{
- $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
+ $sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);
$sDay = $sDay % $lengthOfWeek;
$weekTranslate = $langs->trans("DurationWeek");
if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
- $sTime.=$sWeek.' '.$weekTranslate.' ';
+ $sTime .= $sWeek.' '.$weekTranslate.' ';
}
}
}
- if ($sDay>0)
+ if ($sDay > 0)
{
$dayTranslate = $langs->trans("Day");
if ($sDay > 1) $dayTranslate = $langs->trans("Days");
- $sTime.=$sDay.' '.$dayTranslate.' ';
+ $sTime .= $sDay.' '.$dayTranslate.' ';
}
if ($format == 'all')
{
if ($iSecond || empty($sDay))
{
- $sTime.= dol_print_date($iSecond, 'hourduration', true);
+ $sTime .= dol_print_date($iSecond, 'hourduration', true);
}
}
elseif ($format == 'allhourminsec')
{
- return sprintf("%02d", ($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
+ return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
}
elseif ($format == 'allhourmin')
{
- return sprintf("%02d", ($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60)));
+ return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
}
elseif ($format == 'allhour')
{
- return sprintf("%02d", ($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600)));
+ return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
}
}
elseif ($format == 'hour') // only hour part
{
- $sTime=dol_print_date($iSecond, '%H', true);
+ $sTime = dol_print_date($iSecond, '%H', true);
}
elseif ($format == 'fullhour')
{
if (!empty($iSecond)) {
- $iSecond=$iSecond/3600;
+ $iSecond = $iSecond / 3600;
}
else {
- $iSecond=0;
+ $iSecond = 0;
}
- $sTime=$iSecond;
+ $sTime = $iSecond;
}
elseif ($format == 'min') // only min part
{
- $sTime=dol_print_date($iSecond, '%M', true);
+ $sTime = dol_print_date($iSecond, '%M', true);
}
elseif ($format == 'sec') // only sec part
{
- $sTime=dol_print_date($iSecond, '%S', true);
+ $sTime = dol_print_date($iSecond, '%S', true);
}
elseif ($format == 'month') // only month part
{
- $sTime=dol_print_date($iSecond, '%m', true);
+ $sTime = dol_print_date($iSecond, '%m', true);
}
elseif ($format == 'year') // only year part
{
- $sTime=dol_print_date($iSecond, '%Y', true);
+ $sTime = dol_print_date($iSecond, '%Y', true);
}
return trim($sTime);
}
@@ -292,19 +292,19 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $excludefirstand = 0)
{
global $db;
- $sqldate="";
+ $sqldate = "";
if ($month_date > 0) {
if ($year_date > 0 && empty($day_date)) {
- $sqldate.= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));
- $sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";
- } elseif ($year_date > 0 && ! empty($day_date)) {
- $sqldate.= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
- $sqldate.= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
+ $sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));
+ $sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";
+ } elseif ($year_date > 0 && !empty($day_date)) {
+ $sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
+ $sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
} else
- $sqldate.= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";
- } elseif ($year_date > 0){
- $sqldate.= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
- $sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
+ $sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
+ } elseif ($year_date > 0) {
+ $sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
+ $sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
}
return $sqldate;
}
@@ -330,7 +330,7 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
*/
function dol_stringtotime($string, $gm = 1)
{
- $reg=array();
+ $reg = array();
// Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))
{
@@ -343,9 +343,9 @@ function dol_stringtotime($string, $gm = 1)
$shour = $reg[4];
$smin = $reg[5];
$ssec = $reg[6];
- if ($syear < 50) $syear+=1900;
- if ($syear >= 50 && $syear < 100) $syear+=2000;
- $string=sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
+ if ($syear < 50) $syear += 1900;
+ if ($syear >= 50 && $syear < 100) $syear += 2000;
+ $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
}
elseif (
preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg) // Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
@@ -359,12 +359,12 @@ function dol_stringtotime($string, $gm = 1)
$shour = $reg[4];
$smin = $reg[5];
$ssec = $reg[6];
- $string=sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
+ $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
}
- $string=preg_replace('/([^0-9])/i', '', $string);
- $tmp=$string.'000000';
- $date=dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm?1:0));
+ $string = preg_replace('/([^0-9])/i', '', $string);
+ $tmp = $string.'000000';
+ $date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));
return $date;
}
@@ -378,9 +378,9 @@ function dol_stringtotime($string, $gm = 1)
*/
function dol_get_prev_day($day, $month, $year)
{
- $time=dol_mktime(12, 0, 0, $month, $day, $year, 1, 0);
- $time-=24*60*60;
- $tmparray=dol_getdate($time, true);
+ $time = dol_mktime(12, 0, 0, $month, $day, $year, 1, 0);
+ $time -= 24 * 60 * 60;
+ $tmparray = dol_getdate($time, true);
return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
}
@@ -393,9 +393,9 @@ function dol_get_prev_day($day, $month, $year)
*/
function dol_get_next_day($day, $month, $year)
{
- $time=dol_mktime(12, 0, 0, $month, $day, $year, 1, 0);
- $time+=24*60*60;
- $tmparray=dol_getdate($time, true);
+ $time = dol_mktime(12, 0, 0, $month, $day, $year, 1, 0);
+ $time += 24 * 60 * 60;
+ $tmparray = dol_getdate($time, true);
return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
}
@@ -414,7 +414,7 @@ function dol_get_prev_month($month, $year)
}
else
{
- $prev_month = $month-1;
+ $prev_month = $month - 1;
$prev_year = $year;
}
return array('year' => $prev_year, 'month' => $prev_month);
@@ -453,9 +453,9 @@ function dol_get_prev_week($day, $week, $month, $year)
{
$tmparray = dol_get_first_day_week($day, $month, $year);
- $time=dol_mktime(12, 0, 0, $month, $tmparray['first_day'], $year, 1, 0);
- $time-=24*60*60*7;
- $tmparray=dol_getdate($time, true);
+ $time = dol_mktime(12, 0, 0, $month, $tmparray['first_day'], $year, 1, 0);
+ $time -= 24 * 60 * 60 * 7;
+ $tmparray = dol_getdate($time, true);
return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
}
@@ -471,9 +471,9 @@ function dol_get_next_week($day, $week, $month, $year)
{
$tmparray = dol_get_first_day_week($day, $month, $year);
- $time=dol_mktime(12, 0, 0, $tmparray['first_month'], $tmparray['first_day'], $tmparray['first_year'], 1, 0);
- $time+=24*60*60*7;
- $tmparray=dol_getdate($time, true);
+ $time = dol_mktime(12, 0, 0, $tmparray['first_month'], $tmparray['first_day'], $tmparray['first_year'], 1, 0);
+ $time += 24 * 60 * 60 * 7;
+ $tmparray = dol_getdate($time, true);
return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
}
@@ -515,7 +515,7 @@ function dol_get_last_day($year, $month = 12, $gm = false)
}
// On se deplace au debut du mois suivant, et on retire un jour
- $datelim=dol_mktime(23, 59, 59, $month, 1, $year, $gm);
+ $datelim = dol_mktime(23, 59, 59, $month, 1, $year, $gm);
$datelim -= (3600 * 24);
return $datelim;
@@ -537,57 +537,57 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
$date = dol_mktime(0, 0, 0, $month, $day, $year, $gm);
//Checking conf of start week
- $start_week = (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1);
+ $start_week = (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1);
- $tmparray = dol_getdate($date, true); // detail of current day
+ $tmparray = dol_getdate($date, true); // detail of current day
//Calculate days = offset from current day
$days = $start_week - $tmparray['wday'];
- if ($days>=1) $days=7-$days;
+ if ($days >= 1) $days = 7 - $days;
$days = abs($days);
- $seconds = $days*24*60*60;
+ $seconds = $days * 24 * 60 * 60;
//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
//Get first day of week
- $tmpdaytms = date($tmparray[0])-$seconds; // $tmparray[0] is day of parameters
+ $tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters
$tmpday = date("d", $tmpdaytms);
//Check first day of week is in same month than current day or not
- if ($tmpday>$day)
+ if ($tmpday > $day)
{
- $prev_month = $month-1;
- $prev_year = $year;
+ $prev_month = $month - 1;
+ $prev_year = $year;
- if ($prev_month==0)
+ if ($prev_month == 0)
{
$prev_month = 12;
- $prev_year = $year-1;
+ $prev_year = $year - 1;
}
}
else
{
$prev_month = $month;
- $prev_year = $year;
+ $prev_year = $year;
}
$tmpmonth = $prev_month;
$tmpyear = $prev_year;
//Get first day of next week
- $tmptime=dol_mktime(12, 0, 0, $month, $tmpday, $year, 1, 0);
- $tmptime-=24*60*60*7;
- $tmparray=dol_getdate($tmptime, true);
- $prev_day = $tmparray['mday'];
+ $tmptime = dol_mktime(12, 0, 0, $month, $tmpday, $year, 1, 0);
+ $tmptime -= 24 * 60 * 60 * 7;
+ $tmparray = dol_getdate($tmptime, true);
+ $prev_day = $tmparray['mday'];
//Check prev day of week is in same month than first day or not
if ($prev_day > $tmpday)
{
- $prev_month = $month-1;
- $prev_year = $year;
+ $prev_month = $month - 1;
+ $prev_year = $year;
- if ($prev_month==0)
+ if ($prev_month == 0)
{
$prev_month = 12;
- $prev_year = $year-1;
+ $prev_year = $year - 1;
}
}
@@ -626,11 +626,11 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
if ($includesunday < 0) $includesunday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
- $i=0;
- while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) )
+ $i = 0;
+ while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))
&& ($i < 50000)) // Loop end when equals (Test on i is a security loop to avoid infinite loop)
{
- $ferie=false;
+ $ferie = false;
$jour = date("d", $timestampStart);
$mois = date("m", $timestampStart);
@@ -638,19 +638,19 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
// Check into var $conf->global->HOLIDAY_MORE_DAYS MM-DD,YYYY-MM-DD, ...
// Do not use this anymore, use instead the dictionary of public holidays.
- if (! empty($conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS))
+ if (!empty($conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS))
{
- $arrayofdaystring=explode(',', $conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS);
- foreach($arrayofdaystring as $daystring)
+ $arrayofdaystring = explode(',', $conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS);
+ foreach ($arrayofdaystring as $daystring)
{
- $tmp=explode('-', $daystring);
+ $tmp = explode('-', $daystring);
if ($tmp[2])
{
- if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie=true;
+ if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie = true;
}
else
{
- if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie=true;
+ if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie = true;
}
}
}
@@ -659,26 +659,26 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
// Loop on public holiday defined into hrm_public_holiday
$sql = "SELECT code, entity, fk_country, dayrule, year, month, day, active";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday";
- $sql.= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday";
+ $sql .= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")";
$resql = $db->query($sql);
if ($resql)
{
$num_rows = $db->num_rows($resql);
- $i=0;
+ $i = 0;
while ($i < $num_rows)
{
$obj = $db->fetch_object($resql);
- if (! empty($obj->dayrule) && $obj->dayrule != 'date') // For example 'easter', '...'
+ if (!empty($obj->dayrule) && $obj->dayrule != 'date') // For example 'easter', '...'
{
$specialdayrule[$obj->dayrule] = $obj->dayrule;
}
else
{
$match = 1;
- if (! empty($obj->year) && $obj->year != $annee) $match = 0;
+ if (!empty($obj->year) && $obj->year != $annee) $match = 0;
if ($obj->month != $mois) $match = 0;
if ($obj->day != $jour) $match = 0;
@@ -701,7 +701,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
$date_paques = easter_date($annee);
$jour_paques = date("d", $date_paques);
$mois_paques = date("m", $date_paques);
- if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+ if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
// Easter (sunday)
}
@@ -719,7 +719,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
);
$jour_lundi_ascension = date("d", $date_lundi_paques);
$mois_lundi_ascension = date("m", $date_lundi_paques);
- if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie=true;
+ if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie = true;
// Easter (monday)
}
@@ -737,7 +737,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
);
$jour_ascension = date("d", $date_ascension);
$mois_ascension = date("m", $date_ascension);
- if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
+ if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
// Ascension (thursday)
}
@@ -755,7 +755,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
);
$jour_pentecote = date("d", $date_pentecote);
$mois_pentecote = date("m", $date_pentecote);
- if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+ if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
// "Pentecote" (sunday)
}
if (in_array('pentecotemonday', $specialdayrule))
@@ -772,7 +772,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
);
$jour_pentecote = date("d", $date_pentecote);
$mois_pentecote = date("m", $date_pentecote);
- if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+ if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
// "Pentecote" (monday)
}
@@ -785,12 +785,12 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
date("i", $date_paques),
date("s", $date_paques),
date("m", $date_paques),
- date("d", $date_paques) -2,
+ date("d", $date_paques) - 2,
date("Y", $date_paques)
);
$jour_viernes = date("d", $date_viernes);
$mois_viernes = date("m", $date_viernes);
- if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
+ if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
//Viernes Santo
}
@@ -808,7 +808,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
);
$jour_fronleichnam = date("d", $date_fronleichnam);
$mois_fronleichnam = date("m", $date_fronleichnam);
- if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
+ if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
// Fronleichnam
}
@@ -819,11 +819,11 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
$jour_semaine = jddayofweek($jour_julien, 0);
if ($includesaturday) //Saturday (6) and Sunday (0)
{
- if ($jour_semaine == 6) $ferie=true;
+ if ($jour_semaine == 6) $ferie = true;
}
if ($includesunday) //Saturday (6) and Sunday (0)
{
- if($jour_semaine == 0) $ferie=true;
+ if ($jour_semaine == 0) $ferie = true;
}
}
@@ -831,7 +831,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
if ($ferie) $nbFerie++;
// Increase number of days (on go up into loop)
- $timestampStart=dol_time_plus_duree($timestampStart, 1, 'd');
+ $timestampStart = dol_time_plus_duree($timestampStart, 1, 'd');
//var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart);
$i++;
@@ -862,7 +862,7 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
{
$bit = 1;
}
- $nbjours = (int) floor(($timestampEnd - $timestampStart)/(60*60*24)) + 1 - $bit;
+ $nbjours = (int) floor(($timestampEnd - $timestampStart) / (60 * 60 * 24)) + 1 - $bit;
}
//print ($timestampEnd - $timestampStart) - $lastday;
return $nbjours;
@@ -877,35 +877,34 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
* @param int $lastday We include last day, 0: no, 1:yes
* @param int $halfday Tag to define half day when holiday start and end
* @param string $country_code Country code (company country code if not defined)
- * @return int Number of days or hours
+ * @return int|string Number of days or hours or string if error
* @seealso num_between_day(), num_public_holiday()
*/
function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0, $halfday = 0, $country_code = '')
{
- global $langs,$mysoc;
+ global $langs, $mysoc;
- if (empty($country_code)) $country_code=$mysoc->country_code;
+ if (empty($country_code)) $country_code = $mysoc->country_code;
dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
// Check parameters
- if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
- if (! is_int($timestampEnd) && ! is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
+ if (!is_int($timestampStart) && !is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
+ if (!is_int($timestampEnd) && !is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
if ($timestampStart < $timestampEnd)
{
$numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
- $nbOpenDay = $numdays - $numholidays;
- $nbOpenDay.= " " . $langs->trans("Days");
- if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+ $nbOpenDay = ($numdays - $numholidays);
+ if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = ($nbOpenDay * 24);
return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
}
elseif ($timestampStart == $timestampEnd)
{
- $nbOpenDay=$lastday;
- if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+ $nbOpenDay = $lastday;
+ if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
}
else
@@ -926,7 +925,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
*/
function monthArray($outputlangs, $short = 0)
{
- $montharray = array (
+ $montharray = array(
1 => $outputlangs->trans("Month01"),
2 => $outputlangs->trans("Month02"),
3 => $outputlangs->trans("Month03"),
@@ -941,9 +940,9 @@ function monthArray($outputlangs, $short = 0)
12 => $outputlangs->trans("Month12")
);
- if (! empty($short))
+ if (!empty($short))
{
- $montharray = array (
+ $montharray = array(
1 => $outputlangs->trans("MonthShort01"),
2 => $outputlangs->trans("MonthShort02"),
3 => $outputlangs->trans("MonthShort03"),
@@ -973,7 +972,7 @@ function getWeekNumbersOfMonth($month, $year)
{
$nb_days = cal_days_in_month(CAL_GREGORIAN, $month, $year);
$TWeek = array();
- for($day = 1; $day < $nb_days; $day++) {
+ for ($day = 1; $day < $nb_days; $day++) {
$week_number = getWeekNumber($day, $month, $year);
$TWeek[$week_number] = $week_number;
}
@@ -990,8 +989,8 @@ function getWeekNumbersOfMonth($month, $year)
function getFirstDayOfEachWeek($TWeek, $year)
{
$TFirstDayOfWeek = array();
- foreach($TWeek as $weekNb) {
- if(in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') $year++;//Si on a la 1re semaine et la semaine 52 c'est qu'on change d'année
+ foreach ($TWeek as $weekNb) {
+ if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') $year++; //Si on a la 1re semaine et la semaine 52 c'est qu'on change d'année
$TFirstDayOfWeek[$weekNb] = date('d', strtotime($year.'W'.$weekNb));
}
return $TFirstDayOfWeek;
@@ -1007,7 +1006,7 @@ function getFirstDayOfEachWeek($TWeek, $year)
function getLastDayOfEachWeek($TWeek, $year)
{
$TLastDayOfWeek = array();
- foreach($TWeek as $weekNb) {
+ foreach ($TWeek as $weekNb) {
$TLastDayOfWeek[$weekNb] = date('d', strtotime($year.'W'.$weekNb.'+6 days'));
}
return $TLastDayOfWeek;
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 6840e81a646..38e847bb3c1 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -42,11 +42,11 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
{
global $db, $conf, $langs;
- $idprod=$line->fk_product;
- $label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:''));
- $desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:''));
- $ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:'')); // TODO Not yet saved for supplier invoices, only supplier orders
- $note=(! empty($line->note)?$line->note:'');
+ $idprod = $line->fk_product;
+ $label = (!empty($line->label) ? $line->label : (!empty($line->libelle) ? $line->libelle : ''));
+ $desc = (!empty($line->desc) ? $line->desc : (!empty($line->description) ? $line->description : ''));
+ $ref_supplier = (!empty($line->ref_supplier) ? $line->ref_supplier : (!empty($line->ref_fourn) ? $line->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders
+ $note = (!empty($line->note) ? $line->note : '');
if ($issupplierline) $prodser = new ProductFournisseur($db);
else $prodser = new Product($db);
@@ -55,57 +55,57 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
{
$prodser->fetch($idprod);
// If a predefined product and multilang and on other lang, we renamed label with label translated
- if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
+ if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
{
- if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
- if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
- if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+ if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
+ if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
+ if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
}
}
// Description short of product line
- $libelleproduitservice=$label;
+ $libelleproduitservice = $label;
// Description long of product line
if ($desc && ($desc != $label))
{
if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except)
{
- $discount=new DiscountAbsolute($db);
+ $discount = new DiscountAbsolute($db);
$discount->fetch($line->fk_remise_except);
- $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
- $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
+ $sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+ $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
}
elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
{
- $discount=new DiscountAbsolute($db);
+ $discount = new DiscountAbsolute($db);
$discount->fetch($line->fk_remise_except);
- $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
- $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
+ $sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+ $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
// Add date of deposit
- if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
+ if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
}
elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
{
- $discount=new DiscountAbsolute($db);
+ $discount = new DiscountAbsolute($db);
$discount->fetch($line->fk_remise_except);
- $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
+ $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
}
elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
{
- $discount=new DiscountAbsolute($db);
+ $discount = new DiscountAbsolute($db);
$discount->fetch($line->fk_remise_except);
- $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
+ $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
}
else
{
if ($idprod)
{
- if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+ if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
}
else
{
- $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+ $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
}
}
}
@@ -118,7 +118,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
{
$prefix_prodserv = "";
$ref_prodserv = "";
- if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this
+ if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this
{
if ($prodser->isService())
{
@@ -132,34 +132,34 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
if (empty($hideref))
{
- if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref
+ if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref
else $ref_prodserv = $prodser->ref; // Show local ref only
$ref_prodserv .= " - ";
}
- $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+ $libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
}
}
- if (! empty($line->date_start) || ! empty($line->date_end))
+ if (!empty($line->date_start) || !empty($line->date_end))
{
- $format='day';
+ $format = 'day';
// Show duration if exists
if ($line->date_start && $line->date_end)
{
- $period='('.$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($line->date_start, $format, false, $outputlangs), dol_print_date($line->date_end, $format, false, $outputlangs)).')';
+ $period = '('.$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($line->date_start, $format, false, $outputlangs), dol_print_date($line->date_end, $format, false, $outputlangs)).')';
}
- if ($line->date_start && ! $line->date_end)
+ if ($line->date_start && !$line->date_end)
{
- $period='('.$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($line->date_start, $format, false, $outputlangs)).')';
+ $period = '('.$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($line->date_start, $format, false, $outputlangs)).')';
}
- if (! $line->date_start && $line->date_end)
+ if (!$line->date_start && $line->date_end)
{
- $period='('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($line->date_end, $format, false, $outputlangs)).')';
+ $period = '('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($line->date_end, $format, false, $outputlangs)).')';
}
//print '>'.$outputlangs->charset_output.','.$period;
- $libelleproduitservice=dol_concatdesc($libelleproduitservice, $period);
+ $libelleproduitservice = dol_concatdesc($libelleproduitservice, $period);
//print $libelleproduitservice;
}
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index 16d7d3d8a97..b2280657481 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -33,10 +33,10 @@ function donation_admin_prepare_head()
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT . '/don/admin/donation.php';
+ $head[$h][0] = DOL_URL_ROOT.'/don/admin/donation.php';
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
- $h ++;
+ $h++;
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
@@ -44,7 +44,7 @@ function donation_admin_prepare_head()
// $this->tabs = array('entity:-tabname); to remove a tab
complete_head_from_modules($conf, $langs, null, $head, $h, 'donation_admin');
- $head[$h][0] = DOL_URL_ROOT . '/don/admin/donation_extrafields.php';
+ $head[$h][0] = DOL_URL_ROOT.'/don/admin/donation_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';
$h++;
@@ -67,10 +67,10 @@ function donation_prepare_head($object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT . '/don/card.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/don/card.php?id='.$object->id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
- $h ++;
+ $h++;
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
@@ -80,25 +80,25 @@ function donation_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->don->dir_output . '/' . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->don->dir_output.'/'.dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/don/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/don/note.php?id='.$object->id;
$head[$h][1] = $langs->trans("Notes");
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
- $head[$h][0] = DOL_URL_ROOT . '/don/info.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/don/info.php?id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index a49e501af78..4dbb418855a 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -36,15 +36,15 @@ function ecm_prepare_dasboard_head($object)
$h = 0;
$head = array();
- $helptext =$langs->trans("ECMAreaDesc").'<br>';
- $helptext.=$langs->trans("ECMAreaDesc2");
+ $helptext = $langs->trans("ECMAreaDesc").'<br>';
+ $helptext .= $langs->trans("ECMAreaDesc2");
$head[$h][0] = DOL_URL_ROOT.'/ecm/index.php';
$head[$h][1] = $langs->trans("ECMSectionsManual").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
$head[$h][2] = 'index';
$h++;
- if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
+ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
{
$head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php';
$head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index cb4e5cf8b29..839be4c4e3d 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -39,16 +39,16 @@ function emailing_prepare_head(Mailing $object)
$head[$h][2] = 'card';
$h++;
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
+ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
{
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
$head[$h][1] = $langs->trans("MailRecipients");
- if ($object->nbemail > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$object->nbemail.'</span>';
+ if ($object->nbemail > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$object->nbemail.'</span>';
$head[$h][2] = 'targets';
$h++;
}
- if ( empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
+ if (empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
{
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index 7c329940b2d..fc1ca494d36 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -35,7 +35,7 @@
function expedition_prepare_head(Expedition $object)
{
global $langs, $conf, $user;
- if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+ if (!empty($conf->expedition->enabled)) $langs->load("sendings");
$langs->load("orders");
$h = 0;
@@ -48,10 +48,10 @@ function expedition_prepare_head(Expedition $object)
$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
$head[$h][1] = $langs->trans("Shipment");
- $hselected=$h;
+ $hselected = $h;
$h++;
- if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+ if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
{
$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
$head[$h][1] = $langs->trans("Receivings");
@@ -83,7 +83,7 @@ function expedition_admin_prepare_head()
$h++;
- if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+ if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
{
$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
$head[$h][1] = $langs->trans("Shipment");
@@ -92,7 +92,7 @@ function expedition_admin_prepare_head()
}
- if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+ if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
{
$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
@@ -100,7 +100,7 @@ function expedition_admin_prepare_head()
$h++;
}
- if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+ if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
{
$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
@@ -108,7 +108,7 @@ function expedition_admin_prepare_head()
$h++;
}
- if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+ if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
{
$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
$head[$h][1] = $langs->trans("Receivings");
@@ -116,7 +116,7 @@ function expedition_admin_prepare_head()
$h++;
}
- if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+ if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
{
$head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
@@ -124,7 +124,7 @@ function expedition_admin_prepare_head()
$h++;
}
- if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+ if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
{
$head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index caef261b277..2767af2e792 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -34,7 +34,7 @@ function expensereport_prepare_head($object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/expensereport/card.php?id='.$object->id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
@@ -47,28 +47,28 @@ function expensereport_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
- $head[$h][0] = DOL_URL_ROOT . '/expensereport/info.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/expensereport/info.php?id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index d707063bbe8..8d0809f9768 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -51,7 +51,7 @@ function fichinter_prepare_head($object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
$head[$h][1] = $langs->trans('InterventionContact');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -68,7 +68,7 @@ function fichinter_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
$objectres = new Dolresource($db);
$linked_resources = $objectres->getElementResources('fichinter', $object->id);
- $nbResource = (is_array($linked_resources)?count($linked_resources):0);
+ $nbResource = (is_array($linked_resources) ?count($linked_resources) : 0);
// if (is_array($objectres->available_resources))
// {
// foreach ($objectres->available_resources as $modresources => $resources)
@@ -83,7 +83,7 @@ function fichinter_prepare_head($object)
$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
$head[$h][1] = $langs->trans("Resources");
- if ($nbResource > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbResource.'</span>';
+ if ($nbResource > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbResource.'</span>';
$head[$h][2] = 'resource';
$h++;
}
@@ -91,23 +91,23 @@ function fichinter_prepare_head($object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->ficheinter->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->ficheinter->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a39e48e3a60..9746c1047b8 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1598,13 +1598,18 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
$formmail->add_attached_files($destfull, $destfile, $TFile['type'][$i]);
}
- // Update table of files
+ // Update index table of files (llx_ecm_files)
if ($donotupdatesession == 1)
{
$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile), $TFile['name'][$i], 'uploaded', 0);
if ($result < 0)
{
- setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
+ if ($allowoverwrite) {
+ // Do not show error message. We can have an error due to DB_ERROR_RECORD_ALREADY_EXISTS
+ }
+ else {
+ setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
+ }
}
}
@@ -1760,7 +1765,6 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
return $result;
}
-
/**
* Delete files into database index using search criterias.
*
diff --git a/htdocs/core/lib/fiscalyear.lib.php b/htdocs/core/lib/fiscalyear.lib.php
index 14a23cc22c2..f54772c2339 100644
--- a/htdocs/core/lib/fiscalyear.lib.php
+++ b/htdocs/core/lib/fiscalyear.lib.php
@@ -34,7 +34,7 @@ function fiscalyear_prepare_head(Fiscalyear $object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_card.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?id='.$object->id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
@@ -45,7 +45,7 @@ function fiscalyear_prepare_head(Fiscalyear $object)
// $this->tabs = array('entity:-tabname); to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'fiscalyear');
- $head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_info.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_info.php?id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index 7135082fac9..c46cd150a51 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -38,22 +38,22 @@ if ($resql)
{
while ($row = $db->fetch_array($resql))
{
- $_Avery_Labels[$row['code']]['name']=$row['name'];
- $_Avery_Labels[$row['code']]['paper-size']=$row['paper_size'];
- $_Avery_Labels[$row['code']]['orientation']=$row['orientation'];
- $_Avery_Labels[$row['code']]['metric']=$row['metric'];
- $_Avery_Labels[$row['code']]['marginLeft']=$row['leftmargin'];
- $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
- $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
- $_Avery_Labels[$row['code']]['NX']=$row['nx'];
- $_Avery_Labels[$row['code']]['NY']=$row['ny'];
- $_Avery_Labels[$row['code']]['SpaceX']=$row['spacex'];
- $_Avery_Labels[$row['code']]['SpaceY']=$row['spacey'];
- $_Avery_Labels[$row['code']]['width']=$row['width'];
- $_Avery_Labels[$row['code']]['height']=$row['height'];
- $_Avery_Labels[$row['code']]['font-size']=$row['font_size'];
- $_Avery_Labels[$row['code']]['custom_x']=$row['custom_x'];
- $_Avery_Labels[$row['code']]['custom_y']=$row['custom_y'];
+ $_Avery_Labels[$row['code']]['name'] = $row['name'];
+ $_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];
+ $_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];
+ $_Avery_Labels[$row['code']]['metric'] = $row['metric'];
+ $_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];
+ $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+ $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+ $_Avery_Labels[$row['code']]['NX'] = $row['nx'];
+ $_Avery_Labels[$row['code']]['NY'] = $row['ny'];
+ $_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];
+ $_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];
+ $_Avery_Labels[$row['code']]['width'] = $row['width'];
+ $_Avery_Labels[$row['code']]['height'] = $row['height'];
+ $_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];
+ $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
+ $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
}
}
else
@@ -62,7 +62,7 @@ else
}
// We add characteristics to the name
-foreach($_Avery_Labels as $key => $val)
+foreach ($_Avery_Labels as $key => $val)
{
- $_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
+ $_Avery_Labels[$key]['name'] .= ' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
}
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 9336d9b221f..3b41f2620b4 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -48,7 +48,7 @@ function facturefourn_prepare_head($object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -62,11 +62,11 @@ function facturefourn_prepare_head($object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
@@ -75,10 +75,10 @@ function facturefourn_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$object->ref;
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
@@ -116,12 +116,12 @@ function ordersupplier_prepare_head($object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
- if (! empty($conf->stock->enabled) && (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
+ if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
{
$langs->load("stocks");
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
@@ -139,32 +139,32 @@ function ordersupplier_prepare_head($object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
$head[$h][1] = $langs->trans("Notes");
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->fournisseur->dir_output."/commande/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/info.php?id='.$object->id;
- $head[$h][1].= $langs->trans("Events");
- if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+ $head[$h][1] .= $langs->trans("Events");
+ if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
{
- $head[$h][1].= '/';
- $head[$h][1].= $langs->trans("Agenda");
+ $head[$h][1] .= '/';
+ $head[$h][1] .= $langs->trans("Agenda");
}
$head[$h][2] = 'info';
$h++;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5766703b7f8..d652a2ebd9b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1,19 +1,19 @@
<?php
-/* Copyright (C) 2000-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2000-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
- * Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
+ * Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
* Copyright (C) 2005-2019 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2010-2018 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2013-2017 Alexandre Spangaro <aspangaro@open-dsi.fr>
- * Copyright (C) 2014 Cédric GROSS <c.gross@kreiz-it.fr>
+ * Copyright (C) 2014 Cédric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
- * Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2019 Thibault Foucart <support@ptibogxiv.net>
*
* This program is free software; you can redistribute it and/or modify
@@ -1549,24 +1549,26 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
}
}
- if (!$phototoshow) // Show No photo link (picto of pbject)
+ if (!$phototoshow) // Show No photo link (picto of object)
{
$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
if ($object->element == 'action')
{
$width = 80;
$cssclass = 'photorefcenter';
- $nophoto = img_picto('', 'title_agenda', '', false, 1);
+ $nophoto = img_picto('No photo', 'title_agenda');
}
else
{
$width = 14; $cssclass = 'photorefcenter';
$picto = $object->picto;
if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
- $nophoto = img_picto('', 'object_'.$picto, '', false, 1);
+ $nophoto = img_picto('No photo', 'object_'.$picto);
}
$morehtmlleft .= '<!-- No photo to show -->';
- $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.$nophoto.'"></div></div>';
+ $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
+ $morehtmlleft .= $nophoto;
+ $morehtmlleft .= '</div></div>';
$morehtmlleft .= '</div>';
}
@@ -1660,7 +1662,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$morehtmlref .= '</div>';
}
}
- if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && ($conf->global->MAIN_SHOW_TECHNICAL_ID == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && ! empty($object->id))
+ if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && ($conf->global->MAIN_SHOW_TECHNICAL_ID == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id))
{
$morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';
$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;
@@ -2269,10 +2271,15 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
}
}
- $rep = '<div class="nospan" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';
+ //$rep = '<div class="nospan" style="margin-right: 10px">';
+ $rep = ($withpicto ?img_picto($langs->trans("EMail").' : '.$email, 'object_email.png').' ' : '').$newemail;
+ //$rep .= '</div>';
if ($hookmanager) {
$parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);
$reshook = $hookmanager->executeHooks('printEmail', $parameters, $email);
+ if ($reshook > 0) {
+ $rep = '';
+ }
$rep .= $hookmanager->resPrint;
}
@@ -2378,6 +2385,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
// Clean phone parameter
$phone = preg_replace("/[\s.-]/", "", trim($phone));
if (empty($phone)) { return ''; }
+ if ($conf->global->MAIN_PHONE_SEPAR) $separ = $conf->global->MAIN_PHONE_SEPAR;
if (empty($countrycode)) $countrycode = $mysoc->country_code;
// Short format for small screens
@@ -2679,8 +2687,9 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
{
if ($conf->browser->layout == 'phone' || (!empty($conf->clicktodial->enabled) && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) // If phone or option for, we use link of phone
{
+ $newphoneform = $newphone;
$newphone = '<a href="tel:'.$phone.'"';
- $newphone .= '>'.$phone.'</a>';
+ $newphone .= '>'.$newphoneform.'</a>';
}
elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') // If click to dial, we use click to dial url
{
@@ -3132,17 +3141,26 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
if (empty($srconly) && in_array($pictowithouttext, array(
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
- 'address', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h',
- 'filter', 'file-code', 'folder', 'folder-open', 'grip', 'grip_title', 'language', 'list', 'listlight', 'note',
- 'object_action', 'object_account', 'object_barcode', 'object_phoning', 'object_phoning_fax', 'object_email',
- 'object_bookmark', 'object_bug', 'object_generic', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
- 'object_cash-register', 'object_holiday', 'object_hrm', 'object_accounting', 'object_category', 'object_multicurrency',
- 'object_printer', 'object_resource', 'object_technic', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
- 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats',
- 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
+ 'accountancy', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building', 'cash-register', 'check', 'close_title', 'company', 'contact', 'cubes',
+ 'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
+ 'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot',
+ 'map-marker-alt', 'money-bill-alt', 'mrp', 'note', 'stock',
+ 'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
+ 'object_category', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
+ 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
+ 'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
+ 'object_holiday', 'object_hrm', 'object_intervention', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
+ 'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
+ 'object_supplier_invoice', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
+ 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
+ 'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
+ 'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email',
+ 'off', 'on',
+ 'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'resize', 'service', 'stats', 'trip',
+ 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench',
'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
- 'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'preview', 'project', 'hrm', 'members', 'ticket', 'generic',
+ 'home', 'companies', 'products', 'commercial', 'invoicing', 'preview', 'project', 'projectpub', 'hrm', 'members', 'ticket', 'generic',
'error', 'warning',
'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
)
@@ -3160,21 +3178,29 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$pictowithouttext = str_replace('object_', '', $pictowithouttext);
$arrayconvpictotofa = array(
- 'action'=>'calendar-alt', 'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt',
- 'account'=>'university', 'accounting'=>'chart-line', 'category'=>'tag',
- 'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt',
+ 'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',
+ 'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billd'=>'file-medical', 'bom'=>'cubes',
+ 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
+ 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
+ 'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
+ 'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
'email'=>'at',
- 'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt',
- 'generic'=>'file', 'holiday'=>'umbrella-beach', 'member'=>'users', 'trip'=>'wallet', 'group'=>'users',
+ 'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'info-circle',
+ 'generic'=>'file', 'holiday'=>'umbrella-beach', 'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
'sign-out'=>'sign-out-alt',
- 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar',
- 'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-branch',
+ 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
+ 'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
- 'multicurrency'=>'dollar-sign', 'other'=>'square', 'resource'=>'laptop-house',
+ 'intervention'=>'ambulance', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
- 'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'technic'=>'cogs',
- 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt',
- 'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'resize'=>'crop',
+ 'other'=>'square',
+ 'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+ 'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
+ 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+ 'resource'=>'laptop-house',
+ 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+ 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
+ 'title_agenda'=>'calendar-alt',
'uparrow'=>'mail-forward',
'jabber'=>'comment-o'
);
@@ -3218,28 +3244,42 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'grip_title', 'grip', 'listlight', 'note', 'on', 'off', 'playdisabled', 'printer', 'resize', 'sign-out', 'stats', 'switch_on', 'switch_off',
'uparrow', '1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'
);
- if (! isset($arrayconvpictotomarginleftonly[$pictowithouttext])) {
+ if (!isset($arrayconvpictotomarginleftonly[$pictowithouttext])) {
$marginleftonlyshort = 0;
}
// Add CSS
$arrayconvpictotomorcess = array(
- 'action'=>'bg-infoxbox-action', 'account'=>'bg-infoxbox-bank_account', 'multicurrency'=>'bg-infoxbox-bank_account',
- 'check'=>'font-status4', 'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent', 'member'=>'bg-infoxbox-adherent', 'user'=>'bg-infoxbox-adherent', 'users'=>'bg-infoxbox-adherent',
+ 'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'accountancy'=>'bg-infobox-bank_account',
+ 'bank_account'=>'bg-infobox-bank_account', 'bill'=>'bg-infobox-commande', 'billa'=>'bg-infobox-commande', 'billd'=>'bg-infobox-commande',
+ 'cash-register'=>'bg-infobox-bank_account', 'contract'=>'bg-infobox-contrat', 'check'=>'font-status4',
+ 'donation'=>'bg-infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'bg-infobox-action',
+ 'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
+ 'multicurrency'=>'bg-infobox-bank_account',
+ 'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'money-bill-alt'=>'bg-infobox-bank_account',
+ 'order'=>'bg-infobox-commande',
+ 'user'=>'bg-infobox-adherent', 'users'=>'bg-infobox-adherent',
'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
- 'holiday'=>'bg-infoxbox-holiday', 'resource'=>'bg-infoxbox-action', 'trip'=>'bg-infoxbox-expensereport',
+ 'holiday'=>'bg-infobox-holiday',
+ 'payment'=>'bg-infobox-bank_account', 'poll'=>'bg-infobox-adherent', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
+ 'resource'=>'bg-infobox-action', 'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
+ 'ticket'=>'bg-infobox-contrat', 'title_accountancy'=>'bg-infobox-bank_account', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action',
'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
);
- if (! empty($arrayconvpictotomorcess[$pictowithouttext])) {
+ if (!empty($arrayconvpictotomorcess[$pictowithouttext])) {
$morecss .= ($morecss ? ' ' : '').$arrayconvpictotomorcess[$pictowithouttext];
}
// Define $color
$arrayconvpictotocolor = array(
- 'category'=>'#666', 'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
+ 'address'=>'#37a', 'building'=>'#37a', 'bom'=>'#a69944',
+ 'companies'=>'#37a', 'company'=>'#37a', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',
+ 'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
+ 'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
+ 'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
'other'=>'#ddd',
- 'playdisabled'=>'#ccc', 'printer'=>'#444', 'resize'=>'#444',
- 'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'warning'=>''
+ 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
+ 'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'globe-americas'=>'#aaa'
);
if (isset($arrayconvpictotocolor[$pictowithouttext])) {
$facolor = $arrayconvpictotocolor[$pictowithouttext];
@@ -3324,11 +3364,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
* @param int $srconly Return only content of the src attribute of img.
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
* @return string Return img tag
- * @see #img_picto, #img_picto_common
+ * @see img_picto(), img_picto_common()
*/
function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)
{
- return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
+ if (strpos($picto, '^') === 0) return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);
+ else return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
}
/**
@@ -3340,7 +3381,7 @@ function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false,
* @param int $pictoisfullpath If 1, image path is a full path
* @param string $morecss More CSS
* @return string Return img tag
- * @see #img_object, #img_picto
+ * @see img_object(), img_picto()
*/
function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $morecss = '')
{
@@ -3367,7 +3408,7 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
* @param string $moreatt Add more attribute on img tag
* @param int $pictoisfullpath If 1, image path is a full path
* @return string Return img tag
- * @see #img_object, #img_picto
+ * @see img_object(), img_picto()
*/
function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)
{
@@ -3504,15 +3545,16 @@ function img_view($titlealt = 'default', $float = 0, $other = '')
*
* @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
* @param string $other Add more attributes on img
+ * @param string $morecss More CSS
* @return string Retourne tag img
*/
-function img_delete($titlealt = 'default', $other = 'class="pictodelete"')
+function img_delete($titlealt = 'default', $other = 'class="pictodelete"', $morecss = '')
{
global $langs;
if ($titlealt == 'default') $titlealt = $langs->trans('Delete');
- return img_picto($titlealt, 'delete.png', $other);
+ return img_picto($titlealt, 'delete.png', $other, false, 0, 0, '', $morecss);
}
/**
@@ -4238,7 +4280,7 @@ function load_fiche_titre($titre, $morehtmlright = '', $picto = 'generic', $pict
$return .= "\n";
$return .= '<table '.($id ? 'id="'.$id.'" ' : '').'class="centpercent notopnoleftnoright table-fiche-title'.($morecssontable ? ' '.$morecssontable : '').'">'; // maring bottom must be same than into print_barre_list
$return .= '<tr class="titre">';
- if ($picto) $return .= '<td class="nobordernopadding widthpictotitle opacityhigh valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';
+ if ($picto) $return .= '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';
$return .= '<td class="nobordernopadding valignmiddle col-title">';
$return .= '<div class="titre inline-block">'.$titre.'</div>';
$return .= '</td>';
@@ -4304,7 +4346,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
// Left
- if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle opacityhigh valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
+ if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
print '<td class="nobordernopadding valignmiddle col-title">';
print '<div class="titre inline-block">'.$titre;
if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';
@@ -4606,7 +4648,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
{
if ($currency_code == 'auto') $currency_code = $conf->currency;
- $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'HKD', 'MXN', 'PEN', 'CNY', 'CAD');
+ $listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD');
$listoflanguagesbefore = array('nl_NL');
if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
{
@@ -4626,9 +4668,9 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
/**
* Function that return a number with universal decimal format (decimal separator is '.') from an amount typed by a user.
* Function to use on each input amount before any numeric test or database insert. A better name for this function
- * should be text2num().
+ * should be roundtext2num().
*
- * @param float $amount Amount to convert/clean
+ * @param float $amount Amount to convert/clean or round
* @param string $rounding ''=No rounding
* 'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
* 'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)
@@ -5640,7 +5682,7 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1)
$allowed_tags_string = '<'.$allowed_tags_string.'>';
if ($cleanalsosomestyles) {
- $stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/', '', $stringtoclean); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
+ $stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/', '', $stringtoclean); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
}
$temp = strip_tags($stringtoclean, $allowed_tags_string);
diff --git a/htdocs/core/lib/functions_ch.lib.php b/htdocs/core/lib/functions_ch.lib.php
index 353c8d0a2ac..04e74837853 100644
--- a/htdocs/core/lib/functions_ch.lib.php
+++ b/htdocs/core/lib/functions_ch.lib.php
@@ -32,139 +32,139 @@
function dol_ch_controle_bvrb($bvrb)
{
// Init array for control
- $tableau[0][0]=0;
- $tableau[0][1]=9;
- $tableau[0][2]=4;
- $tableau[0][3]=6;
- $tableau[0][4]=8;
- $tableau[0][5]=2;
- $tableau[0][6]=7;
- $tableau[0][7]=1;
- $tableau[0][8]=3;
- $tableau[0][9]=5;
- $tableau[0][10]=0;
+ $tableau[0][0] = 0;
+ $tableau[0][1] = 9;
+ $tableau[0][2] = 4;
+ $tableau[0][3] = 6;
+ $tableau[0][4] = 8;
+ $tableau[0][5] = 2;
+ $tableau[0][6] = 7;
+ $tableau[0][7] = 1;
+ $tableau[0][8] = 3;
+ $tableau[0][9] = 5;
+ $tableau[0][10] = 0;
- $tableau[1][0]=9;
- $tableau[1][1]=4;
- $tableau[1][2]=6;
- $tableau[1][3]=8;
- $tableau[1][4]=2;
- $tableau[1][5]=7;
- $tableau[1][6]=1;
- $tableau[1][7]=3;
- $tableau[1][8]=5;
- $tableau[1][9]=0;
- $tableau[1][10]=9;
+ $tableau[1][0] = 9;
+ $tableau[1][1] = 4;
+ $tableau[1][2] = 6;
+ $tableau[1][3] = 8;
+ $tableau[1][4] = 2;
+ $tableau[1][5] = 7;
+ $tableau[1][6] = 1;
+ $tableau[1][7] = 3;
+ $tableau[1][8] = 5;
+ $tableau[1][9] = 0;
+ $tableau[1][10] = 9;
- $tableau[2][0]=4;
- $tableau[2][1]=6;
- $tableau[2][2]=8;
- $tableau[2][3]=2;
- $tableau[2][4]=7;
- $tableau[2][5]=1;
- $tableau[2][6]=3;
- $tableau[2][7]=5;
- $tableau[2][8]=0;
- $tableau[2][9]=9;
- $tableau[2][10]=8;
+ $tableau[2][0] = 4;
+ $tableau[2][1] = 6;
+ $tableau[2][2] = 8;
+ $tableau[2][3] = 2;
+ $tableau[2][4] = 7;
+ $tableau[2][5] = 1;
+ $tableau[2][6] = 3;
+ $tableau[2][7] = 5;
+ $tableau[2][8] = 0;
+ $tableau[2][9] = 9;
+ $tableau[2][10] = 8;
- $tableau[3][0]=6;
- $tableau[3][1]=8;
- $tableau[3][2]=2;
- $tableau[3][3]=7;
- $tableau[3][4]=1;
- $tableau[3][5]=3;
- $tableau[3][6]=5;
- $tableau[3][7]=0;
- $tableau[3][8]=9;
- $tableau[3][9]=4;
- $tableau[3][10]=7;
+ $tableau[3][0] = 6;
+ $tableau[3][1] = 8;
+ $tableau[3][2] = 2;
+ $tableau[3][3] = 7;
+ $tableau[3][4] = 1;
+ $tableau[3][5] = 3;
+ $tableau[3][6] = 5;
+ $tableau[3][7] = 0;
+ $tableau[3][8] = 9;
+ $tableau[3][9] = 4;
+ $tableau[3][10] = 7;
- $tableau[4][0]=8;
- $tableau[4][1]=2;
- $tableau[4][2]=7;
- $tableau[4][3]=1;
- $tableau[4][4]=3;
- $tableau[4][5]=5;
- $tableau[4][6]=0;
- $tableau[4][7]=9;
- $tableau[4][8]=4;
- $tableau[4][9]=6;
- $tableau[4][10]=6;
+ $tableau[4][0] = 8;
+ $tableau[4][1] = 2;
+ $tableau[4][2] = 7;
+ $tableau[4][3] = 1;
+ $tableau[4][4] = 3;
+ $tableau[4][5] = 5;
+ $tableau[4][6] = 0;
+ $tableau[4][7] = 9;
+ $tableau[4][8] = 4;
+ $tableau[4][9] = 6;
+ $tableau[4][10] = 6;
- $tableau[5][0]=2;
- $tableau[5][1]=7;
- $tableau[5][2]=1;
- $tableau[5][3]=3;
- $tableau[5][4]=5;
- $tableau[5][5]=0;
- $tableau[5][6]=9;
- $tableau[5][7]=4;
- $tableau[5][8]=6;
- $tableau[5][9]=8;
- $tableau[5][10]=5;
+ $tableau[5][0] = 2;
+ $tableau[5][1] = 7;
+ $tableau[5][2] = 1;
+ $tableau[5][3] = 3;
+ $tableau[5][4] = 5;
+ $tableau[5][5] = 0;
+ $tableau[5][6] = 9;
+ $tableau[5][7] = 4;
+ $tableau[5][8] = 6;
+ $tableau[5][9] = 8;
+ $tableau[5][10] = 5;
- $tableau[6][0]=7;
- $tableau[6][1]=1;
- $tableau[6][2]=3;
- $tableau[6][3]=5;
- $tableau[6][4]=0;
- $tableau[6][5]=9;
- $tableau[6][6]=4;
- $tableau[6][7]=6;
- $tableau[6][8]=8;
- $tableau[6][9]=2;
- $tableau[6][10]=4;
+ $tableau[6][0] = 7;
+ $tableau[6][1] = 1;
+ $tableau[6][2] = 3;
+ $tableau[6][3] = 5;
+ $tableau[6][4] = 0;
+ $tableau[6][5] = 9;
+ $tableau[6][6] = 4;
+ $tableau[6][7] = 6;
+ $tableau[6][8] = 8;
+ $tableau[6][9] = 2;
+ $tableau[6][10] = 4;
- $tableau[7][0]=1;
- $tableau[7][1]=3;
- $tableau[7][2]=5;
- $tableau[7][3]=0;
- $tableau[7][4]=9;
- $tableau[7][5]=4;
- $tableau[7][6]=6;
- $tableau[7][7]=8;
- $tableau[7][8]=2;
- $tableau[7][9]=7;
- $tableau[7][10]=3;
+ $tableau[7][0] = 1;
+ $tableau[7][1] = 3;
+ $tableau[7][2] = 5;
+ $tableau[7][3] = 0;
+ $tableau[7][4] = 9;
+ $tableau[7][5] = 4;
+ $tableau[7][6] = 6;
+ $tableau[7][7] = 8;
+ $tableau[7][8] = 2;
+ $tableau[7][9] = 7;
+ $tableau[7][10] = 3;
- $tableau[8][0]=3;
- $tableau[8][1]=5;
- $tableau[8][2]=0;
- $tableau[8][3]=9;
- $tableau[8][4]=4;
- $tableau[8][5]=6;
- $tableau[8][6]=8;
- $tableau[8][7]=2;
- $tableau[8][8]=7;
- $tableau[8][9]=1;
- $tableau[8][10]=2;
+ $tableau[8][0] = 3;
+ $tableau[8][1] = 5;
+ $tableau[8][2] = 0;
+ $tableau[8][3] = 9;
+ $tableau[8][4] = 4;
+ $tableau[8][5] = 6;
+ $tableau[8][6] = 8;
+ $tableau[8][7] = 2;
+ $tableau[8][8] = 7;
+ $tableau[8][9] = 1;
+ $tableau[8][10] = 2;
- $tableau[9][0]=5;
- $tableau[9][1]=0;
- $tableau[9][2]=9;
- $tableau[9][3]=4;
- $tableau[9][4]=6;
- $tableau[9][5]=8;
- $tableau[9][6]=2;
- $tableau[9][7]=7;
- $tableau[9][8]=1;
- $tableau[9][9]=3;
- $tableau[9][10]=1;
+ $tableau[9][0] = 5;
+ $tableau[9][1] = 0;
+ $tableau[9][2] = 9;
+ $tableau[9][3] = 4;
+ $tableau[9][4] = 6;
+ $tableau[9][5] = 8;
+ $tableau[9][6] = 2;
+ $tableau[9][7] = 7;
+ $tableau[9][8] = 1;
+ $tableau[9][9] = 3;
+ $tableau[9][10] = 1;
// Clean data
- $bv=str_replace(' ', '', $bvrb);
+ $bv = str_replace(' ', '', $bvrb);
// Make control
- $report=0;
- while (dol_strlen($bv)>1)
+ $report = 0;
+ while (dol_strlen($bv) > 1)
{
- $match=substr($bv, 0, 1);
- $report=$tableau[$report][$match];
- $bv=substr($bv, 1);
+ $match = substr($bv, 0, 1);
+ $report = $tableau[$report][$match];
+ $bv = substr($bv, 1);
}
- $controle=$tableau[$report][10];
+ $controle = $tableau[$report][10];
- return ($controle==$bv);
+ return ($controle == $bv);
}
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index ac5cfab832f..ae0eb86882e 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -35,11 +35,11 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
{
//declaring of global variables
global $conf;
- $USE_PROXY=empty($conf->global->MAIN_PROXY_USE)?0:$conf->global->MAIN_PROXY_USE;
- $PROXY_HOST=empty($conf->global->MAIN_PROXY_HOST)?0:$conf->global->MAIN_PROXY_HOST;
- $PROXY_PORT=empty($conf->global->MAIN_PROXY_PORT)?0:$conf->global->MAIN_PROXY_PORT;
- $PROXY_USER=empty($conf->global->MAIN_PROXY_USER)?0:$conf->global->MAIN_PROXY_USER;
- $PROXY_PASS=empty($conf->global->MAIN_PROXY_PASS)?0:$conf->global->MAIN_PROXY_PASS;
+ $USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;
+ $PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;
+ $PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;
+ $PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;
+ $PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;
dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
@@ -54,51 +54,51 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
curl_setopt($ch, CURLOPT_VERBOSE, 1);
curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
- @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false)); // We use @ here because this may return warning if safe mode is on or open_basedir is on
+ @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation ?true:false)); // We use @ here because this may return warning if safe mode is on or open_basedir is on
if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
- curl_setopt($ch, CURLINFO_HEADER_OUT, true); // To be able to retrieve request header and log it
+ curl_setopt($ch, CURLINFO_HEADER_OUT, true); // To be able to retrieve request header and log it
// By default use tls decied by PHP.
// You can force, if supported a version like TLSv1 or TLSv1.2
- if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+ if (!empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
//turning off the server and peer verification(TrustManager Concept).
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
- curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+ curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
//curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true); // PHP 5.5
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
if ($postorget == 'POST')
{
- curl_setopt($ch, CURLOPT_POST, 1); // POST
- curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
+ curl_setopt($ch, CURLOPT_POST, 1); // POST
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
}
elseif ($postorget == 'POSTALREADYFORMATED')
{
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is
- curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
}
elseif ($postorget == 'PUT')
{
- $array_param=null;
+ $array_param = null;
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
- if (! is_array($param)) parse_str($param, $array_param);
+ if (!is_array($param)) parse_str($param, $array_param);
else
{
dol_syslog("parameter param must be a string", LOG_WARNING);
- $array_param=$param;
+ $array_param = $param;
}
- curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
+ curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
}
elseif ($postorget == 'PUTALREADYFORMATED')
{
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
- curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
}
elseif ($postorget == 'HEAD')
{
@@ -107,40 +107,40 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
}
elseif ($postorget == 'DELETE')
{
- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
}
else
{
- curl_setopt($ch, CURLOPT_POST, 0); // GET
+ curl_setopt($ch, CURLOPT_POST, 0); // GET
}
//if USE_PROXY constant set at begin of this method.
if ($USE_PROXY)
{
- dol_syslog("getURLContent set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
+ dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
//curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
- curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
- if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+ curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
+ if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
}
//getting response from server
$response = curl_exec($ch);
- $request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
+ $request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
dol_syslog("getURLContent request=".$request);
//dol_syslog("getURLContent response =".response); // This may contains binary data, so we dont output it
- dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
+ dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
- $rep=array();
+ $rep = array();
if (curl_errno($ch))
{
// Ad keys to $rep
- $rep['content']=$response;
+ $rep['content'] = $response;
// moving to display page to display curl errors
- $rep['curl_error_no']=curl_errno($ch);
- $rep['curl_error_msg']=curl_error($ch);
+ $rep['curl_error_no'] = curl_errno($ch);
+ $rep['curl_error_msg'] = curl_error($ch);
dol_syslog("getURLContent response array is ".join(',', $rep));
}
@@ -155,9 +155,9 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
dol_syslog("getURLContent http_code=".$rep['http_code']);
// Add more keys to $rep
- $rep['content']=$response;
- $rep['curl_error_no']='';
- $rep['curl_error_msg']='';
+ $rep['content'] = $response;
+ $rep['curl_error_no'] = '';
+ $rep['curl_error_msg'] = '';
//closing the curl
curl_close($ch);
@@ -177,19 +177,19 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
*/
function getDomainFromURL($url, $mode = 0)
{
- $tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
- $tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain
+ $tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
+ $tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain
if ($mode == 2)
{
- $tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
+ $tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
}
else
{
- $tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
+ $tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
}
if (empty($mode))
{
- $tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)
+ $tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)
}
return $tmpdomain;
@@ -205,12 +205,12 @@ function getDomainFromURL($url, $mode = 0)
*/
function getRootURLFromURL($url)
{
- $prefix='';
+ $prefix = '';
$tmpurl = $url;
$reg = null;
if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];
- $tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl); // Remove http(s)://
- $tmpurl = preg_replace('/\/.*$/i', '', $tmpurl); // Remove part after domain
+ $tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl); // Remove http(s)://
+ $tmpurl = preg_replace('/\/.*$/i', '', $tmpurl); // Remove part after domain
return $prefix.$tmpurl;
}
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index f1b18df11b2..987895c27d8 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -44,10 +44,10 @@ function holiday_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
$upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
index b61fba236e2..83eafa2548f 100644
--- a/htdocs/core/lib/hrm.lib.php
+++ b/htdocs/core/lib/hrm.lib.php
@@ -36,7 +36,7 @@ function establishment_prepare_head($object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/card.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/card.php?id='.$object->id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
@@ -47,7 +47,7 @@ function establishment_prepare_head($object)
// $this->tabs = array('entity:-tabname); to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'establishment');
- $head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 1e6ebfa6d85..4f65ca3a2bf 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -23,8 +23,8 @@
*/
// Define size of logo small and mini
-$maxwidthsmall = 270; $maxheightsmall = 150;
-$maxwidthmini = 128; $maxheightmini = 72;
+$maxwidthsmall = 350; $maxheightsmall = 200; // Near 16/9eme
+$maxwidthmini = 128; $maxheightmini = 72; // 16/9eme
$quality = 80;
@@ -328,7 +328,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
$infoImg = getimagesize($fileSource); // Get image infos
$orientation = $exif['Orientation'];
- if($orientation != 1){
+ if ($orientation != 1) {
$img = imagecreatefromjpeg($fileSource);
$deg = 0;
switch ($orientation) {
@@ -413,42 +413,42 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
- global $conf,$langs;
+ global $conf, $langs;
dol_syslog("vignette file=".$file." extName=".$extName." maxWidth=".$maxWidth." maxHeight=".$maxHeight." quality=".$quality." outdir=".$outdir." targetformat=".$targetformat);
// Clean parameters
- $file=trim($file);
+ $file = trim($file);
// Check parameters
- if (! $file)
+ if (!$file)
{
// Si le fichier n'a pas ete indique
return 'ErrorBadParameters';
}
- elseif (! file_exists($file))
+ elseif (!file_exists($file))
{
// Si le fichier passe en parametre n'existe pas
dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
return $langs->trans("ErrorFileNotFound", $file);
}
- elseif(image_format_supported($file) < 0)
+ elseif (image_format_supported($file) < 0)
{
dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
return 'ErrorBadImageFormat';
}
- elseif(!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
+ elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);
return 'Error: Wrong value for parameter maxWidth';
}
- elseif(!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
+ elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);
return 'Error: Wrong value for parameter maxHeight';
}
- $filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
+ $filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
$imgWidth = $infoImg[0]; // Largeur de l'image
@@ -462,8 +462,8 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
}
}
- if ($maxWidth == -1) $maxWidth=$infoImg[0]; // If size is -1, we keep unchanged
- if ($maxHeight == -1) $maxHeight=$infoImg[1]; // If size is -1, we keep unchanged
+ if ($maxWidth == -1) $maxWidth = $infoImg[0]; // If size is -1, we keep unchanged
+ if ($maxHeight == -1) $maxHeight = $infoImg[1]; // If size is -1, we keep unchanged
// Si l'image est plus petite que la largeur et la hauteur max, on ne cree pas de vignette
if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight)
@@ -531,7 +531,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
break;
}
- if (! is_resource($img))
+ if (!is_resource($img))
{
dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
return 0;
@@ -539,7 +539,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
$exifAngle = false;
if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) {
- switch($ort)
+ switch ($ort)
{
case 3: // 180 rotate left
$exifAngle = 180;
@@ -563,7 +563,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
{
$rotated = false;
- if($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case
+ if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case
{
imagealphablending($img, false);
imagesavealpha($img, true);
diff --git a/htdocs/core/lib/import.lib.php b/htdocs/core/lib/import.lib.php
index 32f9d0d87d2..8fa6a995331 100644
--- a/htdocs/core/lib/import.lib.php
+++ b/htdocs/core/lib/import.lib.php
@@ -36,12 +36,12 @@ function import_prepare_head($param, $maxstep = 0)
{
global $langs;
- if (empty($maxstep)) $maxstep=6;
+ if (empty($maxstep)) $maxstep = 6;
- $h=0;
+ $h = 0;
$head = array();
- $i=1;
- while($i <= $maxstep)
+ $i = 1;
+ while ($i <= $maxstep)
{
$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
$head[$h][1] = $langs->trans("Step")." ".$i;
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 15de60eb791..703d50c97f8 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -50,28 +50,28 @@ function facture_prepare_head($object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
//if ($fac->mode_reglement_code == 'PRE')
- if (! empty($conf->prelevement->enabled))
+ if (!empty($conf->prelevement->enabled))
{
- $nbStandingOrders=0;
+ $nbStandingOrders = 0;
$sql = "SELECT COUNT(pfd.rowid) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql .= " WHERE pfd.fk_facture = ".$object->id;
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
- $obj=$db->fetch_object($resql);
+ $obj = $db->fetch_object($resql);
if ($obj) $nbStandingOrders = $obj->nb;
}
else dol_print_error($db);
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
$head[$h][1] = $langs->trans('StandingOrders');
- if ($nbStandingOrders > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
+ if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
$head[$h][2] = 'standingorders';
$h++;
}
@@ -85,23 +85,23 @@ function facture_prepare_head($object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->facture->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index 6e79021e17b..d5ca3431845 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -50,83 +50,83 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate = 0, $filesuffix = '', $paymentbankid = '', $thirdpartiesid = '', $fileprefix = 'mergedpdf')
{
$sql = "SELECT DISTINCT f.rowid, f.ref";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
- $sqlwhere='';
- $sqlorder='';
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+ $sqlwhere = '';
+ $sqlorder = '';
if (in_array('all', $filter))
{
$sqlorder = " ORDER BY f.ref ASC";
}
if (in_array('date', $filter))
{
- if (empty($sqlwhere)) $sqlwhere=' WHERE ';
- else $sqlwhere.=" AND";
- $sqlwhere.= " f.fk_statut > 0";
- $sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'";
- $sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'";
+ if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+ else $sqlwhere .= " AND";
+ $sqlwhere .= " f.fk_statut > 0";
+ $sqlwhere .= " AND f.datef >= '".$db->idate($dateafterdate)."'";
+ $sqlwhere .= " AND f.datef <= '".$db->idate($datebeforedate)."'";
$sqlorder = " ORDER BY f.datef ASC";
}
if (in_array('nopayment', $filter))
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
- if (empty($sqlwhere)) $sqlwhere=' WHERE ';
- else $sqlwhere.=" AND";
- $sqlwhere.= " f.fk_statut > 0";
- $sqlwhere.= " AND pf.fk_paiement IS NULL";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+ if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+ else $sqlwhere .= " AND";
+ $sqlwhere .= " f.fk_statut > 0";
+ $sqlwhere .= " AND pf.fk_paiement IS NULL";
}
if (in_array('payments', $filter) || in_array('bank', $filter))
{
- $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
- if (in_array('bank', $filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b";
- if (empty($sqlwhere)) $sqlwhere=' WHERE ';
- else $sqlwhere.=" AND";
- $sqlwhere.= " f.fk_statut > 0";
- $sqlwhere.= " AND f.rowid = pf.fk_facture";
- $sqlwhere.= " AND pf.fk_paiement = p.rowid";
+ $sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+ if (in_array('bank', $filter)) $sql .= ", ".MAIN_DB_PREFIX."bank as b";
+ if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+ else $sqlwhere .= " AND";
+ $sqlwhere .= " f.fk_statut > 0";
+ $sqlwhere .= " AND f.rowid = pf.fk_facture";
+ $sqlwhere .= " AND pf.fk_paiement = p.rowid";
if (in_array('payments', $filter))
{
- $sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
- $sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
+ $sqlwhere .= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
+ $sqlwhere .= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
}
if (in_array('bank', $filter))
{
- $sqlwhere.= " AND p.fk_bank = b.rowid";
- $sqlwhere.= " AND b.fk_account = ".$paymentbankid;
+ $sqlwhere .= " AND p.fk_bank = b.rowid";
+ $sqlwhere .= " AND b.fk_account = ".$paymentbankid;
}
$sqlorder = " ORDER BY p.datep ASC";
}
if (in_array('nodeposit', $filter))
{
- if (empty($sqlwhere)) $sqlwhere=' WHERE ';
- else $sqlwhere.=" AND";
- $sqlwhere.=' type <> 3';
+ if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+ else $sqlwhere .= " AND";
+ $sqlwhere .= ' type <> 3';
}
if (in_array('noreplacement', $filter))
{
- if (empty($sqlwhere)) $sqlwhere=' WHERE ';
- else $sqlwhere.=" AND";
- $sqlwhere.=' type <> 1';
+ if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+ else $sqlwhere .= " AND";
+ $sqlwhere .= ' type <> 1';
}
if (in_array('nocreditnote', $filter))
{
- if (empty($sqlwhere)) $sqlwhere=' WHERE ';
- else $sqlwhere.=" AND";
- $sqlwhere.=' type <> 2';
+ if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+ else $sqlwhere .= " AND";
+ $sqlwhere .= ' type <> 2';
}
if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid))
{
- if (empty($sqlwhere)) $sqlwhere=' WHERE ';
- else $sqlwhere.=" AND";
- $sqlwhere.=' f.fk_soc NOT IN ('.join(',', $thirdpartiesid).')';
+ if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+ else $sqlwhere .= " AND";
+ $sqlwhere .= ' f.fk_soc NOT IN ('.join(',', $thirdpartiesid).')';
}
if (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid))
{
- if (empty($sqlwhere)) $sqlwhere=' WHERE ';
- else $sqlwhere.=" AND";
- $sqlwhere.=' f.fk_soc IN ('.join(',', $thirdpartiesid).')';
+ if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+ else $sqlwhere .= " AND";
+ $sqlwhere .= ' f.fk_soc IN ('.join(',', $thirdpartiesid).')';
}
- if ($sqlwhere) $sql.=$sqlwhere;
- if ($sqlorder) $sql.=$sqlorder;
+ if ($sqlwhere) $sql .= $sqlwhere;
+ if ($sqlorder) $sql .= $sqlorder;
//print $sql; exit;
dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
@@ -138,10 +138,10 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
$error = 0;
$result = 0;
- $files = array() ; // liste les fichiers
+ $files = array(); // liste les fichiers
dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
- if ( $resql=$db->query($sql) )
+ if ($resql = $db->query($sql))
{
$num = $db->num_rows($resql);
$cpt = 0;
@@ -159,11 +159,11 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
$obj = $db->fetch_object($resql);
$fac = new Facture($db);
- $result=$fac->fetch($obj->rowid);
+ $result = $fac->fetch($obj->rowid);
if ($result > 0)
{
$outputlangs = $langs;
- if (! empty($newlangid))
+ if (!empty($newlangid))
{
if ($outputlangs->defaultlang != $newlangid)
{
@@ -171,11 +171,11 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
$outputlangs->setDefaultLang($newlangid);
}
}
- $filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
- if ($regenerate || ! dol_is_file($filename))
+ $filename = $conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
+ if ($regenerate || !dol_is_file($filename))
{
if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
- $result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
+ $result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);
}
else {
if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
@@ -188,8 +188,8 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
if ($result <= 0)
{
$error++;
- if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n";
- else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR);
+ if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid)."\n";
+ else dol_syslog("Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid), LOG_ERR);
}
$cpt++;
@@ -197,10 +197,10 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
// Define format of output PDF
- $formatarray=pdf_getFormat($langs);
+ $formatarray = pdf_getFormat($langs);
$page_largeur = $formatarray['width'];
$page_hauteur = $formatarray['height'];
- $format = array($page_largeur,$page_hauteur);
+ $format = array($page_largeur, $page_hauteur);
if ($usestdout) print "Using output PDF format ".join('x', $format)."\n";
else dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);
@@ -210,7 +210,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
//---------------------------------------------------------
// Create empty PDF
- $pdf=pdf_getInstance($format);
+ $pdf = pdf_getInstance($format);
if (class_exists('TCPDF'))
{
$pdf->setPrintHeader(false);
@@ -222,7 +222,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
//$pdf->SetCompression(false);
// Add all others
- foreach($files as $file)
+ foreach ($files as $file)
{
if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
else dol_syslog("Merge PDF file for invoice ".$file);
@@ -242,21 +242,21 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
dol_mkdir($diroutputpdf);
// Save merged file
- $filename=$fileprefix;
- if (empty($filename)) $filename='mergedpdf';
- if (! empty($filesuffix)) $filename.='_'.$filesuffix;
- $file=$diroutputpdf.'/'.$filename.'.pdf';
+ $filename = $fileprefix;
+ if (empty($filename)) $filename = 'mergedpdf';
+ if (!empty($filesuffix)) $filename .= '_'.$filesuffix;
+ $file = $diroutputpdf.'/'.$filename.'.pdf';
- if (! $error && $pagecount)
+ if (!$error && $pagecount)
{
$pdf->Output($file, 'F');
- if (! empty($conf->global->MAIN_UMASK))
+ if (!empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));
}
if ($usestdout)
{
- if (! $error) print "Merged PDF has been built in ".$file."\n";
+ if (!$error) print "Merged PDF has been built in ".$file."\n";
else print "Can't build PDF ".$file."\n";
}
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 77b856e2d8e..44ad9cc6ff1 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -23,7 +23,7 @@
* \ingroup core
*/
-if (! function_exists('json_encode'))
+if (!function_exists('json_encode'))
{
/**
* Implement json_encode for PHP that does not have module enabled.
@@ -49,14 +49,14 @@ function dol_json_encode($elements)
{
dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
- $num=0;
+ $num = 0;
if (is_object($elements)) // Count number of properties for an object
{
- foreach($elements as $key => $value) $num++;
+ foreach ($elements as $key => $value) $num++;
}
else
{
- $num=count($elements);
+ $num = count($elements);
}
//var_dump($num);
@@ -64,16 +64,16 @@ function dol_json_encode($elements)
if (is_numeric(key($elements)) && key($elements) == 0)
{
// indexed (list)
- $keysofelements=array_keys($elements); // Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
+ $keysofelements = array_keys($elements); // Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
$output = '[';
for ($i = 0, $last = ($num - 1); $i < $num; $i++)
{
- if (! isset($elements[$keysofelements[$i]])) continue;
- if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output.= json_encode($elements[$keysofelements[$i]]);
+ if (!isset($elements[$keysofelements[$i]])) continue;
+ if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output .= json_encode($elements[$keysofelements[$i]]);
else $output .= _val($elements[$keysofelements[$i]]);
- if ($i !== $last) $output.= ',';
+ if ($i !== $last) $output .= ',';
}
- $output.= ']';
+ $output .= ']';
}
else
{
@@ -81,18 +81,18 @@ function dol_json_encode($elements)
$output = '{';
$last = $num - 1;
$i = 0;
- $tmpelements=array();
- if (is_array($elements)) $tmpelements=$elements;
- if (is_object($elements)) $tmpelements=get_object_vars($elements);
- foreach($tmpelements as $key => $value)
+ $tmpelements = array();
+ if (is_array($elements)) $tmpelements = $elements;
+ if (is_object($elements)) $tmpelements = get_object_vars($elements);
+ foreach ($tmpelements as $key => $value)
{
$output .= '"'.$key.'":';
- if (is_array($value)) $output.= json_encode($value);
+ if (is_array($value)) $output .= json_encode($value);
else $output .= _val($value);
- if ($i !== $last) $output.= ',';
+ if ($i !== $last) $output .= ',';
++$i;
}
- $output.= '}';
+ $output .= '}';
}
// return
@@ -204,7 +204,7 @@ function _val($val)
else return 'null';
}
-if (! function_exists('json_decode'))
+if (!function_exists('json_decode'))
{
/**
* Implement json_decode for PHP that does not support it
@@ -234,34 +234,34 @@ function dol_json_decode($json, $assoc = false)
$comment = false;
- $out='';
- $strLength = strlen($json); // Must stay strlen and not dol_strlen because we want technical length, not visible length
- for ($i=0; $i<$strLength; $i++)
+ $out = '';
+ $strLength = strlen($json); // Must stay strlen and not dol_strlen because we want technical length, not visible length
+ for ($i = 0; $i < $strLength; $i++)
{
- if (! $comment)
+ if (!$comment)
{
- if (($json[$i] == '{') || ($json[$i] == '[')) $out.= 'array(';
- elseif (($json[$i] == '}') || ($json[$i] == ']')) $out.= ')';
- elseif ($json[$i] == ':') $out.= ' => ';
- else $out.=$json[$i];
+ if (($json[$i] == '{') || ($json[$i] == '[')) $out .= 'array(';
+ elseif (($json[$i] == '}') || ($json[$i] == ']')) $out .= ')';
+ elseif ($json[$i] == ':') $out .= ' => ';
+ else $out .= $json[$i];
}
- else $out.= $json[$i];
- if ($json[$i] == '"' && $json[($i-1)]!="\\") $comment = !$comment;
+ else $out .= $json[$i];
+ if ($json[$i] == '"' && $json[($i - 1)] != "\\") $comment = !$comment;
}
- $out=_unval($out);
+ $out = _unval($out);
// Return an array
if ($out != '') eval('$array = '.$out.';');
- else $array=array();
+ else $array = array();
// Return an object
- if (! $assoc)
+ if (!$assoc)
{
- if (! empty($array))
+ if (!empty($array))
{
$object = false;
- if (count($array)>0) {
+ if (count($array) > 0) {
$object = (object) array();
}
foreach ($array as $key => $value)
@@ -290,9 +290,9 @@ function _unval($val)
while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
{
// single, escaped unicode character
- $utf16 = chr(hexdec($reg[1])) . chr(hexdec($reg[2]));
+ $utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));
$utf8 = utf162utf8($utf16);
- $val=preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);
+ $val = preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);
}
return $val;
}
@@ -316,7 +316,7 @@ function utf162utf8($utf16)
$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
- switch(true) {
+ switch (true) {
case ((0x7F & $bytes) == $bytes):
// this case should never be reached, because we are in ASCII range
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -357,7 +357,7 @@ function utf82utf16($utf8)
return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
}
- switch(strlen($utf8)) {
+ switch (strlen($utf8)) {
case 1:
// this case should never be reached, because we are in ASCII range
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -366,12 +366,12 @@ function utf82utf16($utf8)
case 2:
// return a UTF-16 character from a 2-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
+ return chr(0x07 & (ord($utf8[0]) >> 2)).chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
case 3:
// return a UTF-16 character from a 3-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
+ return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))).chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
}
// ignoring UTF-32 for now, sorry
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index e751dfd68c8..a3c352a0405 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -54,21 +54,21 @@ function loan_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->loan->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
$head[$tab][1] = $langs->trans("Documents");
- if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$tab][2] = 'documents';
$tab++;
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
- $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
+ $nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
$head[$tab][1] = $langs->trans("Notes");
- if($nbNote > 0) $head[$tab][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$tab][2] = 'note';
$tab++;
}
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 1f643dd8a48..d6993845488 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -42,8 +42,8 @@ function member_prepare_head(Adherent $object)
$head[$h][2] = 'general';
$h++;
- if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
- && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+ if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))
+ && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
{
$langs->load("ldap");
@@ -53,13 +53,13 @@ function member_prepare_head(Adherent $object)
$h++;
}
- if (! empty($user->rights->adherent->cotisation->lire))
+ if (!empty($user->rights->adherent->cotisation->lire))
{
- $nbSubscription = is_array($object->subscriptions)?count($object->subscriptions):0;
+ $nbSubscription = is_array($object->subscriptions) ?count($object->subscriptions) : 0;
$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
$head[$h][1] = $langs->trans("Subscriptions");
$head[$h][2] = 'subscription';
- if ($nbSubscription > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbSubscription.'</span>';
+ if ($nbSubscription > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbSubscription.'</span>';
$h++;
}
@@ -70,13 +70,13 @@ function member_prepare_head(Adherent $object)
complete_head_from_modules($conf, $langs, $object, $head, $h, 'member');
$nbNote = 0;
- if(!empty($object->note)) $nbNote++;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
$head[$h][1] = $langs->trans("Note");
$head[$h][2] = 'note';
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$h++;
// Attachments
@@ -84,22 +84,22 @@ function member_prepare_head(Adherent $object)
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
$upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member');
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'document';
$h++;
// Show agenda tab
- if (! empty($conf->agenda->enabled))
+ if (!empty($conf->agenda->enabled))
{
$head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
$head[$h][1] = $langs->trans("Events");
- if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+ if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
{
- $head[$h][1].= '/';
- $head[$h][1].= $langs->trans("Agenda");
+ $head[$h][1] .= '/';
+ $head[$h][1] .= $langs->trans("Agenda");
}
$head[$h][2] = 'agenda';
$h++;
@@ -120,7 +120,7 @@ function member_type_prepare_head(AdherentType $object)
{
global $langs, $conf, $user;
- $h=0;
+ $h = 0;
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/adherents/type.php?rowid='.$object->id;
@@ -129,7 +129,7 @@ function member_type_prepare_head(AdherentType $object)
$h++;
// Multilangs
- if (! empty($conf->global->MAIN_MULTILANGS))
+ if (!empty($conf->global->MAIN_MULTILANGS))
{
$head[$h][0] = DOL_URL_ROOT."/adherents/type_translation.php?rowid=".$object->id;
$head[$h][1] = $langs->trans("Translation");
@@ -137,8 +137,8 @@ function member_type_prepare_head(AdherentType $object)
$h++;
}
- if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
- && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+ if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+ && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
{
$langs->load("ldap");
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 22e660b2e22..ba1ed6bb8a0 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -21,14 +21,14 @@
* \brief Set of function for memory/cache management
*/
-global $shmkeys,$shmoffset;
+global $shmkeys, $shmoffset;
-$shmkeys=array('main'=>1,'admin'=>2,'dict'=>3,'companies'=>4,'suppliers'=>5,'products'=>6,
- 'commercial'=>7,'compta'=>8,'projects'=>9,'cashdesk'=>10,'agenda'=>11,'bills'=>12,
- 'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
- 'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
- 'donations'=>25,'contracts'=>26);
-$shmoffset=1000; // Max number of entries found into a language file. If too low, some entries will be overwritten.
+$shmkeys = array('main'=>1, 'admin'=>2, 'dict'=>3, 'companies'=>4, 'suppliers'=>5, 'products'=>6,
+ 'commercial'=>7, 'compta'=>8, 'projects'=>9, 'cashdesk'=>10, 'agenda'=>11, 'bills'=>12,
+ 'propal'=>13, 'boxes'=>14, 'banks'=>15, 'other'=>16, 'errors'=>17, 'members'=>18, 'ecm'=>19,
+ 'orders'=>20, 'users'=>21, 'help'=>22, 'stocks'=>23, 'interventions'=>24,
+ 'donations'=>25, 'contracts'=>26);
+$shmoffset = 1000; // Max number of entries found into a language file. If too low, some entries will be overwritten.
@@ -95,7 +95,7 @@ function dol_setcache($memoryid, $data)
// Using shmop
elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
{
- $result=dol_setshmop($memoryid, $data);
+ $result = dol_setshmop($memoryid, $data);
}
return $result;
@@ -167,7 +167,7 @@ function dol_getcache($memoryid)
// Using shmop
elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
{
- $data=dol_getshmop($memoryid);
+ $data = dol_getshmop($memoryid);
return $data;
}
@@ -184,9 +184,9 @@ function dol_getcache($memoryid)
*/
function dol_getshmopaddress($memoryid)
{
- global $shmkeys,$shmoffset;
+ global $shmkeys, $shmoffset;
if (empty($shmkeys[$memoryid])) return 0;
- return $shmkeys[$memoryid]+$shmoffset;
+ return $shmkeys[$memoryid] + $shmoffset;
}
/**
@@ -196,13 +196,13 @@ function dol_getshmopaddress($memoryid)
*/
function dol_listshmop()
{
- global $shmkeys,$shmoffset;
+ global $shmkeys, $shmoffset;
- $resarray=array();
- foreach($shmkeys as $key => $val)
+ $resarray = array();
+ foreach ($shmkeys as $key => $val)
{
- $result=dol_getshmop($key);
- if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+ $result = dol_getshmop($key);
+ if (!is_numeric($result) || $result > 0) $resarray[$key] = $result;
}
return $resarray;
}
@@ -216,25 +216,25 @@ function dol_listshmop()
*/
function dol_setshmop($memoryid, $data)
{
- global $shmkeys,$shmoffset;
+ global $shmkeys, $shmoffset;
//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
- if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
- $shmkey=dol_getshmopaddress($memoryid);
- $newdata=serialize($data);
- $size=strlen($newdata);
+ if (empty($shmkeys[$memoryid]) || !function_exists("shmop_write")) return 0;
+ $shmkey = dol_getshmopaddress($memoryid);
+ $newdata = serialize($data);
+ $size = strlen($newdata);
//print 'dol_setshmop memoryid='.$memoryid." shmkey=".$shmkey." newdata=".$size."bytes<br>\n";
- $handle=shmop_open($shmkey, 'c', 0644, 6+$size);
+ $handle = shmop_open($shmkey, 'c', 0644, 6 + $size);
if ($handle)
{
- $shm_bytes_written1=shmop_write($handle, str_pad($size, 6), 0);
- $shm_bytes_written2=shmop_write($handle, $newdata, 6);
- if (($shm_bytes_written1 + $shm_bytes_written2) != (6+dol_strlen($newdata)))
+ $shm_bytes_written1 = shmop_write($handle, str_pad($size, 6), 0);
+ $shm_bytes_written2 = shmop_write($handle, $newdata, 6);
+ if (($shm_bytes_written1 + $shm_bytes_written2) != (6 + dol_strlen($newdata)))
{
print "Couldn't write the entire length of data\n";
}
shmop_close($handle);
- return ($shm_bytes_written1+$shm_bytes_written2);
+ return ($shm_bytes_written1 + $shm_bytes_written2);
}
else
{
@@ -251,16 +251,16 @@ function dol_setshmop($memoryid, $data)
*/
function dol_getshmop($memoryid)
{
- global $shmkeys,$shmoffset;
+ global $shmkeys, $shmoffset;
- if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
- $shmkey=dol_getshmopaddress($memoryid);
+ if (empty($shmkeys[$memoryid]) || !function_exists("shmop_open")) return 0;
+ $shmkey = dol_getshmopaddress($memoryid);
//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
- $handle=@shmop_open($shmkey, 'a', 0, 0);
+ $handle = @shmop_open($shmkey, 'a', 0, 0);
if ($handle)
{
- $size=trim(shmop_read($handle, 0, 6));
- if ($size) $data=unserialize(shmop_read($handle, 6, $size));
+ $size = trim(shmop_read($handle, 0, 6));
+ if ($size) $data = unserialize(shmop_read($handle, 6, $size));
else return -1;
shmop_close($handle);
}
diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
index f17d79c6207..85142e0e631 100644
--- a/htdocs/core/lib/multicurrency.lib.php
+++ b/htdocs/core/lib/multicurrency.lib.php
@@ -55,10 +55,10 @@ function multicurrencyLimitPrepareHead($aCurrencies)
{
global $langs;
- $i=0;
+ $i = 0;
$head = array();
- foreach($aCurrencies as $currency)
+ foreach ($aCurrencies as $currency)
{
$head[$i][0] = $_SERVER['PHP_SELF'].'?currencycode='.$currency;
$head[$i][1] = $langs->trans("Currency".$currency).' ('.$langs->getCurrencySymbol($currency).')';
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index eb1a5495a95..34e1d99bd80 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -24,20 +24,20 @@
// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
-$supportedoauth2array=array(
+$supportedoauth2array = array(
'OAUTH_GOOGLE_NAME'=>'google',
);
if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
{
- $supportedoauth2array['OAUTH_STRIPE_TEST_NAME']='stripetest';
- $supportedoauth2array['OAUTH_STRIPE_LIVE_NAME']='stripelive';
+ $supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = 'stripetest';
+ $supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = 'stripelive';
}
-$supportedoauth2array['OAUTH_GITHUB_NAME']='github';
+$supportedoauth2array['OAUTH_GITHUB_NAME'] = 'github';
// API access parameters OAUTH
-$list = array (
+$list = array(
array(
'OAUTH_AMAZON_NAME',
'OAUTH_AMAZON_ID',
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 54d850d99b6..3d2847e926b 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -53,7 +53,7 @@ function commande_prepare_head(Commande $object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -61,16 +61,16 @@ function commande_prepare_head(Commande $object)
if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
{
- $nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
+ $nbShipments = $object->getNbOfShipments(); $nbReceiption = 0;
$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
- $text='';
- if ($conf->expedition_bon->enabled) $text.=$langs->trans("Shipments");
- if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
- if ($conf->livraison_bon->enabled) $text.=$langs->trans("Receivings");
- if ($nbShipments > 0 || $nbReceiption > 0) $text.= '<span class="badge marginleftonlyshort">'.($nbShipments?$nbShipments:0);
- if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.='/';
- if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.= ($nbReceiption?$nbReceiption:0);
- if ($nbShipments > 0 || $nbReceiption > 0) $text.= '</span>';
+ $text = '';
+ if ($conf->expedition_bon->enabled) $text .= $langs->trans("Shipments");
+ if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text .= '/';
+ if ($conf->livraison_bon->enabled) $text .= $langs->trans("Receivings");
+ if ($nbShipments > 0 || $nbReceiption > 0) $text .= '<span class="badge marginleftonlyshort">'.($nbShipments ? $nbShipments : 0);
+ if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= '/';
+ if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ($nbReceiption ? $nbReceiption : 0);
+ if ($nbShipments > 0 || $nbReceiption > 0) $text .= '</span>';
$head[$h][1] = $text;
$head[$h][2] = 'shipping';
$h++;
@@ -85,23 +85,23 @@ function commande_prepare_head(Commande $object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/commande/note.php?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->commande->multidir_output[$object->entity] . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->commande->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 280e77dcc9c..7dfd025609c 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -33,7 +33,7 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
{
if (is_array($replaceimagepath))
{
- foreach($replaceimagepath as $key => $val)
+ foreach ($replaceimagepath as $key => $val)
{
$keytoreplace = ']('.$key;
$valafter = ']('.$val;
@@ -67,7 +67,7 @@ function dolMd2Asciidoc($content, $parser = 'dolibarr', $replaceimagepath = null
{
if (is_array($replaceimagepath))
{
- foreach($replaceimagepath as $key => $val)
+ foreach ($replaceimagepath as $key => $val)
{
$keytoreplace = ']('.$key;
$valafter = ']('.$val;
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index e7a9bd51034..80aed36f674 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -99,22 +99,22 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
{
global $conf, $langs;
- $validpaymentmethod=array();
+ $validpaymentmethod = array();
- if ((empty($paymentmethod) || $paymentmethod == 'paypal') && ! empty($conf->paypal->enabled))
+ if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled))
{
$langs->load("paypal");
- $validpaymentmethod['paypal']='valid';
+ $validpaymentmethod['paypal'] = 'valid';
}
- if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->paybox->enabled))
+ if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled))
{
$langs->load("paybox");
- $validpaymentmethod['paybox']='valid';
+ $validpaymentmethod['paybox'] = 'valid';
}
- if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled))
+ if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled))
{
$langs->load("stripe");
- $validpaymentmethod['stripe']='valid';
+ $validpaymentmethod['stripe'] = 'valid';
}
// TODO Add trigger
@@ -173,107 +173,107 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
if ($type == 'free')
{
- $out=$urltouse.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
{
- if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
- else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+ if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+ else $out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
}
//if ($mode) $out.='&noidempotency=1';
}
elseif ($type == 'order')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.='order_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'</font>':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= 'order_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '</font>' : '');
+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
{
- if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+ if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
else
{
- $out.='&securekey='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
- if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
- $out.=($mode?'</font>':'');
+ $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+ if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+ $out .= ($mode ? '</font>' : '');
}
}
}
elseif ($type == 'invoice')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.='invoice_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'</font>':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= 'invoice_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '</font>' : '');
+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
{
- if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+ if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
else
{
- $out.='&securekey='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
- if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
- $out.=($mode?'</font>':'');
+ $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+ if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+ $out .= ($mode ? '</font>' : '');
}
}
}
elseif ($type == 'contractline')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.='contractline_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'</font>':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= 'contractline_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '</font>' : '');
+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
{
- if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+ if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
else
{
- $out.='&securekey='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
- if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
- $out.=($mode?'</font>':'');
+ $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+ if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+ $out .= ($mode ? '</font>' : '');
}
}
}
elseif ($type == 'member' || $type == 'membersubscription')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.='member_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'</font>':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= 'member_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '</font>' : '');
+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
{
- if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+ if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
else
{
- $out.='&securekey='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
- if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
- $out.=($mode?'</font>':'');
+ $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+ if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+ $out .= ($mode ? '</font>' : '');
}
}
}
if ($type == 'donation')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.='donation_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'</font>':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= 'donation_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '</font>' : '');
+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
{
- if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+ if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
else
{
- $out.='&securekey='.($mode?'<font color="#666666">':'');
- if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
- if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
- $out.=($mode?'</font>':'');
+ $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+ if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
+ if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+ $out .= ($mode ? '</font>' : '');
}
}
}
// For multicompany
- if (! empty($out) && ! empty($conf->multicompany->enabled)) $out.="&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+ if (!empty($out) && !empty($conf->multicompany->enabled)) $out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
return $out;
}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e097c6d7120..d31baf70b69 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -914,7 +914,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&entity=1&file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
// become
// <img alt="" src="'.DOL_DATA_ROOT.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
- $newfreetext = preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
+ $newfreetext = preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.'file:/'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
$line .= $outputlangs->convToOutputCharset($newfreetext);
}
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index 035f0adb754..eca43aef3f6 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -78,8 +78,8 @@ function prelevement_prepare_head(BonPrelevement $object)
function prelevement_check_config()
{
global $conf;
- if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
- if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
- if(empty($conf->global->PRELEVEMENT_USER)) return -1;
+ if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
+ if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
+ if (empty($conf->global->PRELEVEMENT_USER)) return -1;
return 0;
}
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 9b9f000cf17..428d976ab6d 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -487,10 +487,10 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
// Ref of task
- if (count($arrayfields)>0 && !empty($arrayfields['t.ref']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.ref']['checked'])) {
print '<td class="nowraponall">';
if ($showlineingray) {
- print '<i>' . img_object('', 'projecttask') . ' ' . $lines[$i]->ref . '</i>';
+ print '<i>'.img_object('', 'projecttask').' '.$lines[$i]->ref.'</i>';
} else {
print $taskstatic->getNomUrl(1, 'withproject');
}
@@ -498,7 +498,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
// Title of task
- if (count($arrayfields)>0 && !empty($arrayfields['t.label']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) {
print "<td>";
if ($showlineingray)
print '<i>';
@@ -516,21 +516,21 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print "</td>\n";
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.description']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.description']['checked'])) {
print "<td>";
print $lines[$i]->description;
print "</td>\n";
}
// Date start
- if (count($arrayfields)>0 && !empty($arrayfields['t.dateo']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) {
print '<td class="center">';
print dol_print_date($lines[$i]->date_start, 'dayhour');
print '</td>';
}
// Date end
- if (count($arrayfields)>0 && !empty($arrayfields['t.datee']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {
print '<td class="center">';
print dol_print_date($lines[$i]->date_end, 'dayhour');
if ($taskstatic->hasDelay())
@@ -544,7 +544,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
// Planned Workload (in working hours)
- if (count($arrayfields)>0 && !empty($arrayfields['t.planned_workload']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.planned_workload']['checked'])) {
print '<td class="right">';
$fullhour = convertSecondToTime($lines[$i]->planned_workload, $plannedworkloadoutputformat);
$workingdelay = convertSecondToTime($lines[$i]->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
@@ -558,11 +558,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
// Time spent
- if (count($arrayfields)>0 && !empty($arrayfields['t.duration_effective']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.duration_effective']['checked'])) {
print '<td class="right">';
if ($showlineingray)
print '<i>';
- else print '<a href="' . DOL_URL_ROOT . '/projet/tasks/time.php?id=' . $lines[$i]->id . ($showproject ? '' : '&withproject=1') . '">';
+ else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject ? '' : '&withproject=1').'">';
if ($lines[$i]->duration)
print convertSecondToTime($lines[$i]->duration, $timespentoutputformat);
else print '--:--';
@@ -573,18 +573,18 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
// Progress calculated (Note: ->duration is time spent)
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
print '<td class="right">';
if ($lines[$i]->planned_workload || $lines[$i]->duration) {
if ($lines[$i]->planned_workload)
- print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2) . ' %';
- else print '<span class="opacitymedium">' . $langs->trans('WorkloadNotDefined') . '</span>';
+ print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';
+ else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
}
print '</td>';
}
// Progress declared
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress']['checked'])) {
print '<td class="right">';
if ($lines[$i]->progress != '') {
print getTaskProgressBadge($taskstatic);
@@ -593,7 +593,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
// resume
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress_summary']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_summary']['checked'])) {
print '<td class="right">';
if ($lines[$i]->progress != '' && $lines[$i]->duration) {
print getTaskProgressView($taskstatic, false, false);
@@ -604,25 +604,25 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if ($showbilltime)
{
// Time not billed
- if (count($arrayfields)>0 && !empty($arrayfields['t.tobill']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.tobill']['checked'])) {
print '<td class="right">';
if ($lines[$i]->usage_bill_time) {
print convertSecondToTime($lines[$i]->tobill, 'allhourmin');
$total_projectlinesa_tobill += $lines[$i]->tobill;
} else {
- print '<span class="opacitymedium">' . $langs->trans("NA") . '</span>';
+ print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
}
print '</td>';
}
// Time billed
- if (count($arrayfields)>0 && !empty($arrayfields['t.billed']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.billed']['checked'])) {
print '<td class="right">';
if ($lines[$i]->usage_bill_time) {
print convertSecondToTime($lines[$i]->billed, 'allhourmin');
$total_projectlinesa_billed += $lines[$i]->billed;
} else {
- print '<span class="opacitymedium">' . $langs->trans("NA") . '</span>';
+ print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
}
print '</td>';
}
@@ -650,12 +650,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
// Extra fields
- $extrafieldsobjectkey=$taskstatic->table_element;
- $obj=$lines[$i];
+ $extrafieldsobjectkey = $taskstatic->table_element;
+ $obj = $lines[$i];
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$lines[$i]);
- $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+ $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$lines[$i]);
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Tick to drag and drop
@@ -693,18 +693,18 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print '<tr class="liste_total nodrag nodrop">';
print '<td class="liste_total">'.$langs->trans("Total").'</td>';
if ($showproject) print '<td></td><td></td>';
- if (count($arrayfields)>0 && !empty($arrayfields['t.label']['checked'])) print '<td></td>';
- if (count($arrayfields)>0 && !empty($arrayfields['t.dateo']['checked'])) print '<td></td>';
- if (count($arrayfields)>0 && !empty($arrayfields['t.datee']['checked'])) print '<td></td>';
- if (count($arrayfields)>0 && !empty($arrayfields['t.planned_workload']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) print '<td></td>';
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) print '<td></td>';
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) print '<td></td>';
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.planned_workload']['checked'])) {
print '<td class="nowrap liste_total right">';
print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
print '</td>';
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.duration_effective']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.duration_effective']['checked'])) {
print '<td class="nowrap liste_total right">';
if ($projectidfortotallink > 0)
- print '<a href="' . DOL_URL_ROOT . '/projet/tasks/time.php?projectid=' . $projectidfortotallink . ($showproject ? '' : '&withproject=1') . '">';
+ print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject ? '' : '&withproject=1').'">';
print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
if ($projectidfortotallink > 0)
print '</a>';
@@ -734,27 +734,27 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
print '<td class="nowrap liste_total right">';
if ($total_projectlinesa_planned)
- print $totalCalculatedProgress . ' %';
+ print $totalCalculatedProgress.' %';
print '</td>';
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress']['checked'])) {
print '<td class="nowrap liste_total right">';
if ($total_projectlinesa_planned)
- print '<span class="' . $badgeClass . '" >' . $totalAverageDeclaredProgress . ' %</span>';
+ print '<span class="'.$badgeClass.'" >'.$totalAverageDeclaredProgress.' %</span>';
print '</td>';
}
// resume
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress_summary']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_summary']['checked'])) {
print '<td class="right">';
if ($total_projectlinesa_planned) {
print '</span>';
- print ' <div class="progress sm" title="' . $totalAverageDeclaredProgress . '%" >';
- print ' <div class="progress-bar ' . $progressBarClass . '" style="width: ' . $totalAverageDeclaredProgress . '%"></div>';
+ print ' <div class="progress sm" title="'.$totalAverageDeclaredProgress.'%" >';
+ print ' <div class="progress-bar '.$progressBarClass.'" style="width: '.$totalAverageDeclaredProgress.'%"></div>';
print ' </div>';
print '</div>';
}
@@ -763,12 +763,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if ($showbilltime)
{
- if (count($arrayfields)>0 && !empty($arrayfields['t.tobill']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.tobill']['checked'])) {
print '<td class="nowrap liste_total right">';
print convertSecondToTime($total_projectlinesa_tobill, 'allhourmin');
print '</td>';
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.billed']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.billed']['checked'])) {
print '<td class="nowrap liste_total right">';
print convertSecondToTime($total_projectlinesa_billed, 'allhourmin');
print '</td>';
@@ -2073,7 +2073,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
$listofstatus = array_keys($listofoppstatus);
- if (is_array($listofstatus) && ! empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {
+ if (is_array($listofstatus) && !empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {
// Define $themeColorId and array $statusOppList for each $listofstatus
$themeColorId = 0;
$statusOppList = array();
@@ -2216,7 +2216,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
if ($userAccess >= 0)
{
$projectstatic->ref = $objp->ref;
- $projectstatic->statut = $objp->status; // deprecated
+ $projectstatic->statut = $objp->status; // deprecated
$projectstatic->status = $objp->status;
$projectstatic->title = $objp->title;
$projectstatic->datee = $db->jdate($objp->datee);
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 9e12e9d4229..fcdf4bbb79d 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -42,14 +42,14 @@ function propal_prepare_head($object)
$head[$h][2] = 'comm';
$h++;
- if ((empty($conf->commande->enabled) && ((! empty($conf->expedition->enabled) && ! empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
- || (! empty($conf->expedition->enabled) && ! empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
+ if ((empty($conf->commande->enabled) && ((!empty($conf->expedition->enabled) && !empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
+ || (!empty($conf->expedition->enabled) && !empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
{
$langs->load("sendings");
$text = '';
$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
- if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
- if ($conf->livraison_bon->enabled) $text.='/'.$langs->trans("Receivings");
+ if ($conf->expedition_bon->enabled) $text = $langs->trans("Shipment");
+ if ($conf->livraison_bon->enabled) $text .= '/'.$langs->trans("Receivings");
$head[$h][1] = $text;
$head[$h][2] = 'shipping';
$h++;
@@ -60,7 +60,7 @@ function propal_prepare_head($object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -74,23 +74,23 @@ function propal_prepare_head($object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'document';
$h++;
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index 33591b3beea..3cf9a535eaa 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -60,7 +60,7 @@ function reception_prepare_head(Reception $object)
$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id;
$head[$h][1] = $langs->trans("ContactsAddresses");
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -70,7 +70,7 @@ function reception_prepare_head(Reception $object)
if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT."/reception/note.php?id=".$object->id;
$head[$h][1] = $langs->trans("Notes");
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
@@ -103,7 +103,7 @@ function reception_admin_prepare_head()
$h++;
- if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+ if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
{
$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
@@ -111,7 +111,7 @@ function reception_admin_prepare_head()
$h++;
}
- if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+ if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
{
$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 979583e8b4d..5a8d5d2530e 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -44,11 +44,11 @@ function report_header($reportname, $notused, $period, $periodlink, $description
print "\n\n<!-- start banner of report -->\n";
- if(! empty($varlink)) $varlink = '?'.$varlink;
+ if (!empty($varlink)) $varlink = '?'.$varlink;
$head = array();
- $h=0;
+ $h = 0;
$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
$head[$h][1] = $langs->trans("Report");
$head[$h][2] = 'report';
@@ -58,7 +58,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
dol_fiche_head($head, 'report');
- foreach($moreparam as $key => $value)
+ foreach ($moreparam as $key => $value)
{
print '<input type="hidden" name="'.$key.'" value="'.$value.'">'."\n";
}
diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index 7bd2454dbe6..e6a0998ba6f 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -45,7 +45,7 @@ function resource_prepare_head($object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -59,30 +59,30 @@ function resource_prepare_head($object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $upload_dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->resource->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
$head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
- if($nbFiles > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';
+ if ($nbFiles > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';
$head[$h][2] = 'documents';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id;
$head[$h][1] = $langs->trans("Events");
- if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+ if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
{
- $head[$h][1].= '/';
- $head[$h][1].= $langs->trans("Agenda");
+ $head[$h][1] .= '/';
+ $head[$h][1] .= $langs->trans("Agenda");
}
$head[$h][2] = 'agenda';
$h++;
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index 01b3cafd60d..0e2328bc7e7 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -46,12 +46,12 @@ function salaries_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->salaries->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->salaries->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge ">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge ">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index b9a606b98b4..04d16084365 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -221,7 +221,7 @@ if (!function_exists('dol_loginfunction'))
// Show logo (search in order: small company logo, large company logo, theme logo, common logo)
$width = 0;
- $urllogo=DOL_URL_ROOT.'/theme/common/login_logo.png';
+ $urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
{
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 7f8de19e2e5..34dd845cdfa 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -37,7 +37,7 @@ function shipping_prepare_head($object)
global $db, $langs, $conf, $user;
// Load translation files required by the page
- $langs->loadLangs(array("sendings","deliveries"));
+ $langs->loadLangs(array("sendings", "deliveries"));
$h = 0;
$head = array();
@@ -74,19 +74,19 @@ function shipping_prepare_head($object)
$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
$head[$h][1] = $langs->trans("ContactsAddresses");
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
@@ -95,7 +95,7 @@ function shipping_prepare_head($object)
if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->id;
$head[$h][1] = $langs->trans("Notes");
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
@@ -122,7 +122,7 @@ function delivery_prepare_head($object)
global $langs, $db, $conf, $user;
// Load translation files required by the page
- $langs->loadLangs(array("sendings","deliveries"));
+ $langs->loadLangs(array("sendings", "deliveries"));
$h = 0;
$head = array();
@@ -165,12 +165,12 @@ function delivery_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($tmpobject->ref);
+ $upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($tmpobject->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $tmpobject->element, $tmpobject->id);
+ $nbLinks = Link::count($db, $tmpobject->element, $tmpobject->id);
$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$tmpobject->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
@@ -179,7 +179,7 @@ function delivery_prepare_head($object)
if (!empty($tmpobject->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$tmpobject->id;
$head[$h][1] = $langs->trans("Notes");
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
@@ -206,29 +206,29 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
global $db, $conf, $langs;
global $form;
- $product_static=new Product($db);
- $expedition=new Expedition($db);
- $warehousestatic=new Entrepot($db);
+ $product_static = new Product($db);
+ $expedition = new Expedition($db);
+ $warehousestatic = new Entrepot($db);
$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end,";
- $sql.= " ed.rowid as edrowid, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot as warehouse_id,";
- $sql.= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition,";
+ $sql .= " ed.rowid as edrowid, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot as warehouse_id,";
+ $sql .= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition,";
//if ($conf->livraison_bon->enabled) $sql .= " l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received,";
- $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch,';
- $sql.= ' p.description as product_desc';
- $sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
- $sql.= ", ".MAIN_DB_PREFIX."expedition as e";
- $sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+ $sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch,';
+ $sql .= ' p.description as product_desc';
+ $sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+ $sql .= ", ".MAIN_DB_PREFIX."expedition as e";
+ $sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid AND obj.rowid = ld.fk_origin_line";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
//TODO Add link to expeditiondet_batch
- $sql.= " WHERE e.entity IN (".getEntity('expedition').")";
- $sql.= " AND obj.fk_".$origin." = ".$origin_id;
- $sql.= " AND obj.rowid = ed.fk_origin_line";
- $sql.= " AND ed.fk_expedition = e.rowid";
- if ($filter) $sql.= $filter;
+ $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+ $sql .= " AND obj.fk_".$origin." = ".$origin_id;
+ $sql .= " AND obj.rowid = ed.fk_origin_line";
+ $sql .= " AND ed.fk_expedition = e.rowid";
+ if ($filter) $sql .= $filter;
- $sql.= " ORDER BY obj.fk_product";
+ $sql .= " ORDER BY obj.fk_product";
dol_syslog("show_list_sending_receive", LOG_DEBUG);
$resql = $db->query($sql);
@@ -250,7 +250,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
print '<td class="center">'.$langs->trans("DateCreation").'</td>';
print '<td class="center">'.$langs->trans("DateDeliveryPlanned").'</td>';
print '<td class="center">'.$langs->trans("QtyPreparedOrShipped").'</td>';
- if (! empty($conf->stock->enabled))
+ if (!empty($conf->stock->enabled))
{
print '<td>'.$langs->trans("Warehouse").'</td>';
}
@@ -260,7 +260,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
print '<td>';
print '</td>';
}*/
- if (! empty($conf->livraison_bon->enabled))
+ if (!empty($conf->livraison_bon->enabled))
{
print '<td>'.$langs->trans("DeliveryOrder").'</td>';
//print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
@@ -283,52 +283,52 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
if ($objp->fk_product > 0)
{
// Define output language
- if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+ if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
{
$object = new $origin($db);
$object->fetch($origin_id);
$object->fetch_thirdparty();
$prod = new Product($db);
- $prod->id=$objp->fk_product;
+ $prod->id = $objp->fk_product;
$prod->getMultiLangs();
$outputlangs = $langs;
- $newlang='';
- if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
- if (! empty($newlang))
+ $newlang = '';
+ if (empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+ if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
+ if (!empty($newlang))
{
$outputlangs = new Translate("", $conf);
$outputlangs->setDefaultLang($newlang);
}
- $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+ $label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
}
else
{
- $label = (! empty($objp->label)?$objp->label:$objp->product_label);
+ $label = (!empty($objp->label) ? $objp->label : $objp->product_label);
}
print '<td>';
// Show product and description
- $product_static->type=$objp->fk_product_type;
- $product_static->id=$objp->fk_product;
- $product_static->ref=$objp->ref;
- $product_static->status_batch=$objp->product_tobatch;
- $text=$product_static->getNomUrl(1);
- $text.= ' - '.$label;
- $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
+ $product_static->type = $objp->fk_product_type;
+ $product_static->id = $objp->fk_product;
+ $product_static->ref = $objp->ref;
+ $product_static->status_batch = $objp->product_tobatch;
+ $text = $product_static->getNomUrl(1);
+ $text .= ' - '.$label;
+ $description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($objp->description));
print $form->textwithtooltip($text, $description, 3, '', '', $i);
// Show range
print_date_range($objp->date_start, $objp->date_end);
// Add description in form
- if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+ if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
{
- print (! empty($objp->description) && $objp->description!=$objp->product)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+ print (!empty($objp->description) && $objp->description != $objp->product) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
}
print '</td>';
@@ -336,11 +336,11 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
else
{
print "<td>";
- if ($objp->fk_product_type==1) $text = img_object($langs->trans('Service'), 'service');
+ if ($objp->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
else $text = img_object($langs->trans('Product'), 'product');
- if (! empty($objp->label)) {
- $text.= ' <strong>'.$objp->label.'</strong>';
+ if (!empty($objp->label)) {
+ $text .= ' <strong>'.$objp->label.'</strong>';
print $form->textwithtooltip($text, $objp->description, 3, '', '', $i);
} else {
print $text.' '.nl2br($objp->description);
@@ -363,7 +363,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
print '<td class="center">'.$objp->qty_shipped.'</td>';
// Warehouse
- if (! empty($conf->stock->enabled))
+ if (!empty($conf->stock->enabled))
{
print '<td>';
if ($objp->warehouse_id > 0)
@@ -407,17 +407,17 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
}*/
// Informations on receipt
- if (! empty($conf->livraison_bon->enabled))
+ if (!empty($conf->livraison_bon->enabled))
{
include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
- $expedition->id=$objp->sendingid;
+ $expedition->id = $objp->sendingid;
$expedition->fetchObjectLinked($expedition->id, $expedition->element);
//var_dump($expedition->linkedObjects);
- $receiving='';
- if (count($expedition->linkedObjects['delivery']) > 0) $receiving=reset($expedition->linkedObjects['delivery']); // Take first link
+ $receiving = '';
+ if (count($expedition->linkedObjects['delivery']) > 0) $receiving = reset($expedition->linkedObjects['delivery']); // Take first link
- if (! empty($receiving))
+ if (!empty($receiving))
{
// $expedition->fk_origin_line = id of det line of order
// $receiving->fk_origin_line = id of det line of order
diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index 6549b362c11..ddc85616ba6 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -34,7 +34,7 @@ function supplier_proposal_prepare_head($object)
global $db, $langs, $conf, $user;
// Load translation files required by the page
- $langs->loadLangs(array("supplier_proposal","compta"));
+ $langs->loadLangs(array("supplier_proposal", "compta"));
$h = 0;
$head = array();
@@ -49,7 +49,7 @@ function supplier_proposal_prepare_head($object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/contact.php?id='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -63,23 +63,23 @@ function supplier_proposal_prepare_head($object)
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
- if(!empty($object->note_private)) $nbNote++;
- if(!empty($object->note_public)) $nbNote++;
+ if (!empty($object->note_private)) $nbNote++;
+ if (!empty($object->note_public)) $nbNote++;
$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
- if ($nbNote > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+ if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
$head[$h][2] = 'note';
$h++;
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->supplier_proposal->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->supplier_proposal->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'document';
$h++;
diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index 6cf8189f3c8..8a883ceef91 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -47,7 +47,7 @@ function takepos_prepare_head()
for ($i = 1; $i <= $numterminals; $i++)
{
$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/terminal.php?terminal='.$i;
- $head[$h][1] = $langs->trans("Terminal"). " ".$i;
+ $head[$h][1] = $langs->trans("Terminal")." ".$i;
$head[$h][2] = 'terminal'.$i;
$h++;
}
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index ade6a7f49cf..cdf9fe29b1c 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -54,12 +54,12 @@ function tax_prepare_head(ChargeSociales $object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->tax->dir_output."/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
- if (($nbFiles+$nbLinks) > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$h][2] = 'documents';
$h++;
@@ -93,131 +93,131 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
global $conf;
// If we use date_start and date_end, we must not use $y, $m, $q
- if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
+ if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
{
dol_print_error('', 'Bad value of input parameter for tax_by_rate');
}
- $list=array();
+ $list = array();
if ($direction == 'sell')
{
- $invoicetable='facture';
- $invoicedettable='facturedet';
- $fk_facture='fk_facture';
- $fk_facture2='fk_facture';
- $fk_payment='fk_paiement';
- $total_tva='total_tva';
- $paymenttable='paiement';
- $paymentfacturetable='paiement_facture';
- $invoicefieldref='ref';
+ $invoicetable = 'facture';
+ $invoicedettable = 'facturedet';
+ $fk_facture = 'fk_facture';
+ $fk_facture2 = 'fk_facture';
+ $fk_payment = 'fk_paiement';
+ $total_tva = 'total_tva';
+ $paymenttable = 'paiement';
+ $paymentfacturetable = 'paiement_facture';
+ $invoicefieldref = 'ref';
}
elseif ($direction == 'buy')
{
- $invoicetable='facture_fourn';
- $invoicedettable='facture_fourn_det';
- $fk_facture='fk_facture_fourn';
- $fk_facture2='fk_facturefourn';
- $fk_payment='fk_paiementfourn';
- $total_tva='tva';
- $paymenttable='paiementfourn';
- $paymentfacturetable='paiementfourn_facturefourn';
- $invoicefieldref='ref';
+ $invoicetable = 'facture_fourn';
+ $invoicedettable = 'facture_fourn_det';
+ $fk_facture = 'fk_facture_fourn';
+ $fk_facture2 = 'fk_facturefourn';
+ $fk_payment = 'fk_paiementfourn';
+ $total_tva = 'tva';
+ $paymenttable = 'paiementfourn';
+ $paymentfacturetable = 'paiementfourn_facturefourn';
+ $invoicefieldref = 'ref';
}
if (strpos($type, 'localtax') === 0) {
- $f_rate = $type . '_tx';
+ $f_rate = $type.'_tx';
} else {
$f_rate = 'tva_tx';
}
- $total_localtax1='total_localtax1';
- $total_localtax2='total_localtax2';
+ $total_localtax1 = 'total_localtax1';
+ $total_localtax2 = 'total_localtax2';
// CAS DES BIENS/PRODUITS
// Define sql request
- $sql='';
+ $sql = '';
if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
{
// Count on delivery date (use invoice date as delivery is unknown)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " 0 as payment_id, 0 as payment_amount";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity IN (".getEntity($invoicetable).")";
- $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
+ $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql .= " d.date_start as date_start, d.date_end as date_end,";
+ $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql .= " 0 as payment_id, 0 as payment_amount";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+ $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.rowid = d.".$fk_facture;
+ $sql .= " AND s.rowid = f.fk_soc";
if ($y && $m)
{
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 0"; // Limit to products
- $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
- $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+ if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = 0"; // Limit to products
+ $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+ $sql .= " ORDER BY d.rowid, d.".$fk_facture;
}
else
{
// Count on payments date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
- $sql.= " pa.datep as datep";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
- $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity IN (".getEntity($invoicetable).")";
- $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
- $sql.= " AND pf.".$fk_facture2." = f.rowid";
- $sql.= " AND pa.rowid = pf.".$fk_payment;
+ $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql .= " d.date_start as date_start, d.date_end as date_end,";
+ $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+ $sql .= " pa.datep as datep";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+ $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+ $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.rowid = d.".$fk_facture;
+ $sql .= " AND s.rowid = f.fk_soc";
+ $sql .= " AND pf.".$fk_facture2." = f.rowid";
+ $sql .= " AND pa.rowid = pf.".$fk_payment;
if ($y && $m)
{
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 0"; // Limit to products
- $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
- $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+ if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = 0"; // Limit to products
+ $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+ $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
}
- if (! $sql) return -1;
+ if (!$sql) return -1;
if ($sql == 'TODO') return -2;
if ($sql != 'TODO')
{
@@ -227,17 +227,17 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
if ($resql)
{
$company_id = -1;
- $oldrowid='';
- while($assoc = $db->fetch_array($resql))
+ $oldrowid = '';
+ while ($assoc = $db->fetch_array($resql))
{
- if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0;
- if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0;
- if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0;
- if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0;
+ if (!isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht'] = 0;
+ if (!isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat'] = 0;
+ if (!isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1'] = 0;
+ if (!isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2'] = 0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
- $oldrowid=$assoc['rowid'];
+ $oldrowid = $assoc['rowid'];
$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
$list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1'];
@@ -262,7 +262,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
- $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+ $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
@@ -285,90 +285,90 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
// CAS DES SERVICES
// Define sql request
- $sql='';
+ $sql = '';
if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
{
// Count on invoice date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " 0 as payment_id, 0 as payment_amount";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity IN (".getEntity($invoicetable).")";
- $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
+ $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql .= " d.date_start as date_start, d.date_end as date_end,";
+ $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql .= " 0 as payment_id, 0 as payment_amount";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+ $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.rowid = d.".$fk_facture;
+ $sql .= " AND s.rowid = f.fk_soc";
if ($y && $m)
{
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 1"; // Limit to services
- $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
- $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+ if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = 1"; // Limit to services
+ $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+ $sql .= " ORDER BY d.rowid, d.".$fk_facture;
}
else
{
// Count on payments date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
- $sql.= " pa.datep as datep";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
- $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity IN (".getEntity($invoicetable).")";
- $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
- $sql.= " AND pf.".$fk_facture2." = f.rowid";
- $sql.= " AND pa.rowid = pf.".$fk_payment;
+ $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql .= " d.date_start as date_start, d.date_end as date_end,";
+ $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+ $sql .= " pa.datep as datep";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+ $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+ $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.rowid = d.".$fk_facture;
+ $sql .= " AND s.rowid = f.fk_soc";
+ $sql .= " AND pf.".$fk_facture2." = f.rowid";
+ $sql .= " AND pa.rowid = pf.".$fk_payment;
if ($y && $m)
{
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 1"; // Limit to services
- $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
- $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+ if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = 1"; // Limit to services
+ $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+ $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
}
- if (! $sql)
+ if (!$sql)
{
dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
- return -1; // -1 = Not accountancy module enabled
+ return -1; // -1 = Not accountancy module enabled
}
if ($sql == 'TODO') return -2; // -2 = Feature not yet available
if ($sql != 'TODO')
@@ -378,17 +378,17 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
if ($resql)
{
$company_id = -1;
- $oldrowid='';
- while($assoc = $db->fetch_array($resql))
+ $oldrowid = '';
+ while ($assoc = $db->fetch_array($resql))
{
- if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0;
- if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0;
- if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0;
- if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0;
+ if (!isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht'] = 0;
+ if (!isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat'] = 0;
+ if (!isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1'] = 0;
+ if (!isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2'] = 0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
- $oldrowid=$assoc['rowid'];
+ $oldrowid = $assoc['rowid'];
$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
$list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1'];
@@ -438,40 +438,40 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
if ($direction == 'buy') // buy only for expense reports
{
// Define sql request
- $sql='';
+ $sql = '';
// Count on payments date
$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
- $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
- $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
- $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
- $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
- $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
- $sql.= " WHERE e.entity = " . $conf->entity;
- $sql.= " AND e.fk_statut in (6)";
+ $sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+ $sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+ $sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+ $sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+ $sql .= " WHERE e.entity = ".$conf->entity;
+ $sql .= " AND e.fk_statut in (6)";
if ($y && $m)
{
- $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = -1";
- $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
- $sql.= " ORDER BY e.rowid";
+ if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = -1";
+ $sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+ $sql .= " ORDER BY e.rowid";
- if (! $sql)
+ if (!$sql)
{
dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
- return -1; // -1 = Not accountancy module enabled
+ return -1; // -1 = Not accountancy module enabled
}
if ($sql == 'TODO') return -2; // -2 = Feature not yet available
if ($sql != 'TODO')
@@ -481,18 +481,18 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
if ($resql)
{
$company_id = -1;
- $oldrowid='';
- while($assoc = $db->fetch_array($resql))
+ $oldrowid = '';
+ while ($assoc = $db->fetch_array($resql))
{
- if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0;
- if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0;
- if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0;
- if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0;
+ if (!isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht'] = 0;
+ if (!isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat'] = 0;
+ if (!isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1'] = 0;
+ if (!isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2'] = 0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
- $oldrowid=$assoc['rowid'];
- $list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
+ $oldrowid = $assoc['rowid'];
+ $list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
$list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1'];
$list[$assoc['company_id']]['localtax2'] += $assoc['total_localtax2'];
@@ -561,132 +561,132 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
global $conf;
// If we use date_start and date_end, we must not use $y, $m, $q
- if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
+ if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
{
dol_print_error('', 'Bad value of input parameter for tax_by_rate');
}
- $list=array();
+ $list = array();
if ($direction == 'sell')
{
- $invoicetable='facture';
- $invoicedettable='facturedet';
- $fk_facture='fk_facture';
- $fk_facture2='fk_facture';
- $fk_payment='fk_paiement';
- $total_tva='total_tva';
- $paymenttable='paiement';
- $paymentfacturetable='paiement_facture';
- $invoicefieldref='ref';
+ $invoicetable = 'facture';
+ $invoicedettable = 'facturedet';
+ $fk_facture = 'fk_facture';
+ $fk_facture2 = 'fk_facture';
+ $fk_payment = 'fk_paiement';
+ $total_tva = 'total_tva';
+ $paymenttable = 'paiement';
+ $paymentfacturetable = 'paiement_facture';
+ $invoicefieldref = 'ref';
}
else
{
- $invoicetable='facture_fourn';
- $invoicedettable='facture_fourn_det';
- $fk_facture='fk_facture_fourn';
- $fk_facture2='fk_facturefourn';
- $fk_payment='fk_paiementfourn';
- $total_tva='tva';
- $paymenttable='paiementfourn';
- $paymentfacturetable='paiementfourn_facturefourn';
- $invoicefieldref='ref';
+ $invoicetable = 'facture_fourn';
+ $invoicedettable = 'facture_fourn_det';
+ $fk_facture = 'fk_facture_fourn';
+ $fk_facture2 = 'fk_facturefourn';
+ $fk_payment = 'fk_paiementfourn';
+ $total_tva = 'tva';
+ $paymenttable = 'paiementfourn';
+ $paymentfacturetable = 'paiementfourn_facturefourn';
+ $invoicefieldref = 'ref';
}
- if ( strpos($type, 'localtax') === 0 ) {
- $f_rate = $type . '_tx';
+ if (strpos($type, 'localtax') === 0) {
+ $f_rate = $type.'_tx';
} else {
$f_rate = 'tva_tx';
}
- $total_localtax1='total_localtax1';
- $total_localtax2='total_localtax2';
+ $total_localtax1 = 'total_localtax1';
+ $total_localtax2 = 'total_localtax2';
// CAS DES BIENS/PRODUITS
// Define sql request
- $sql='';
+ $sql = '';
if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
{
// Count on delivery date (use invoice date as delivery is unknown)
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " 0 as payment_id, 0 as payment_amount";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity IN (".getEntity($invoicetable).")";
- $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
+ $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql .= " d.date_start as date_start, d.date_end as date_end,";
+ $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql .= " 0 as payment_id, 0 as payment_amount";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+ $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.rowid = d.".$fk_facture;
+ $sql .= " AND s.rowid = f.fk_soc";
if ($y && $m)
{
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 0"; // Limit to products
- $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
- $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+ if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = 0"; // Limit to products
+ $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+ $sql .= " ORDER BY d.rowid, d.".$fk_facture;
}
else
{
// Count on payments date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
- $sql.= " pa.datep as datep";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
- $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity IN (".getEntity($invoicetable).")";
- $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
- $sql.= " AND pf.".$fk_facture2." = f.rowid";
- $sql.= " AND pa.rowid = pf.".$fk_payment;
+ $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql .= " d.date_start as date_start, d.date_end as date_end,";
+ $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+ $sql .= " pa.datep as datep";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+ $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+ $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.rowid = d.".$fk_facture;
+ $sql .= " AND s.rowid = f.fk_soc";
+ $sql .= " AND pf.".$fk_facture2." = f.rowid";
+ $sql .= " AND pa.rowid = pf.".$fk_payment;
if ($y && $m)
{
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 0"; // Limit to products
- $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
- $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+ if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = 0"; // Limit to products
+ $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+ $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
}
- if (! $sql) return -1;
+ if (!$sql) return -1;
if ($sql == 'TODO') return -2;
if ($sql != 'TODO')
{
@@ -696,18 +696,18 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
if ($resql)
{
$rate = -1;
- $oldrowid='';
- while($assoc = $db->fetch_array($resql))
+ $oldrowid = '';
+ while ($assoc = $db->fetch_array($resql))
{
// Code to avoid warnings when array entry not defined
- if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0;
- if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0;
- if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
- if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
+ if (!isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht'] = 0;
+ if (!isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat'] = 0;
+ if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
+ if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
- $oldrowid=$assoc['rowid'];
+ $oldrowid = $assoc['rowid'];
$list[$assoc['rate']]['totalht'] += $assoc['total_ht'];
$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
@@ -754,90 +754,90 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
// CAS DES SERVICES
// Define sql request
- $sql='';
+ $sql = '';
if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
{
// Count on invoice date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " 0 as payment_id, 0 as payment_amount";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity IN (".getEntity($invoicetable).")";
- $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
+ $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql .= " d.date_start as date_start, d.date_end as date_end,";
+ $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql .= " 0 as payment_id, 0 as payment_amount";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+ $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.rowid = d.".$fk_facture;
+ $sql .= " AND s.rowid = f.fk_soc";
if ($y && $m)
{
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 1"; // Limit to services
- $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
- $sql.= " ORDER BY d.rowid, d.".$fk_facture;
+ if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = 1"; // Limit to services
+ $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+ $sql .= " ORDER BY d.rowid, d.".$fk_facture;
}
else
{
// Count on payments date
$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
- $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
- $sql.= " d.date_start as date_start, d.date_end as date_end,";
- $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
- $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
- $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
- $sql.= " pa.datep as datep";
- $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
- $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
- $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
- $sql.= " ".MAIN_DB_PREFIX."societe as s,";
- $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
- $sql.= " WHERE f.entity IN (".getEntity($invoicetable).")";
- $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.rowid = d.".$fk_facture;
- $sql.= " AND s.rowid = f.fk_soc";
- $sql.= " AND pf.".$fk_facture2." = f.rowid";
- $sql.= " AND pa.rowid = pf.".$fk_payment;
+ $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+ $sql .= " d.date_start as date_start, d.date_end as date_end,";
+ $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+ $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+ $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+ $sql .= " pa.datep as datep";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+ $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+ $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
+ $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+ $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+ $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.rowid = d.".$fk_facture;
+ $sql .= " AND s.rowid = f.fk_soc";
+ $sql .= " AND pf.".$fk_facture2." = f.rowid";
+ $sql .= " AND pa.rowid = pf.".$fk_payment;
if ($y && $m)
{
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = 1"; // Limit to services
- $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
- $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+ if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = 1"; // Limit to services
+ $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+ $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
}
- if (! $sql)
+ if (!$sql)
{
dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
- return -1; // -1 = Not accountancy module enabled
+ return -1; // -1 = Not accountancy module enabled
}
if ($sql == 'TODO') return -2; // -2 = Feature not yet available
if ($sql != 'TODO')
@@ -847,18 +847,18 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
if ($resql)
{
$rate = -1;
- $oldrowid='';
- while($assoc = $db->fetch_array($resql))
+ $oldrowid = '';
+ while ($assoc = $db->fetch_array($resql))
{
// Code to avoid warnings when array entry not defined
- if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0;
- if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0;
- if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
- if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
+ if (!isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht'] = 0;
+ if (!isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat'] = 0;
+ if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
+ if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
- $oldrowid=$assoc['rowid'];
+ $oldrowid = $assoc['rowid'];
$list[$assoc['rate']]['totalht'] += $assoc['total_ht'];
$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
@@ -907,40 +907,40 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
if ($direction == 'buy') // buy only for expense reports
{
// Define sql request
- $sql='';
+ $sql = '';
// Count on payments date
$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
- $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
- $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
- $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
- $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
- $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
- $sql.= " WHERE e.entity = " . $conf->entity;
- $sql.= " AND e.fk_statut in (6)";
+ $sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+ $sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+ $sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+ $sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+ $sql .= " WHERE e.entity = ".$conf->entity;
+ $sql .= " AND e.fk_statut in (6)";
if ($y && $m)
{
- $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
- $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+ $sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+ $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
}
elseif ($y)
{
- $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
- $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+ $sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+ $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
- if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
- if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
- $sql.= " AND (d.product_type = -1";
- $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
- if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
- $sql.= " ORDER BY e.rowid";
+ if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+ if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= " AND (d.product_type = -1";
+ $sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
+ if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+ $sql .= " ORDER BY e.rowid";
- if (! $sql)
+ if (!$sql)
{
dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
- return -1; // -1 = Not accountancy module enabled
+ return -1; // -1 = Not accountancy module enabled
}
if ($sql == 'TODO') return -2; // -2 = Feature not yet available
if ($sql != 'TODO')
@@ -950,20 +950,20 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
if ($resql)
{
$rate = -1;
- $oldrowid='';
- while($assoc = $db->fetch_array($resql))
+ $oldrowid = '';
+ while ($assoc = $db->fetch_array($resql))
{
// Code to avoid warnings when array entry not defined
- if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0;
- if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0;
- if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
- if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
+ if (!isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht'] = 0;
+ if (!isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat'] = 0;
+ if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
+ if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{
- $oldrowid=$assoc['rowid'];
+ $oldrowid = $assoc['rowid'];
$list[$assoc['rate']]['totalht'] += $assoc['total_ht'];
- $list[$assoc['rate']]['vat'] += $assoc['total_vat'];
+ $list[$assoc['rate']]['vat'] += $assoc['total_vat'];
$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
}
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index fe7fb4ba5a7..e12531b3846 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -87,7 +87,7 @@ function ticket_prepare_head($object)
$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
$head[$h][1] = $langs->trans('ContactsAddresses');
- if ($nbContact > 0) $head[$h][1].= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+ if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
$head[$h][2] = 'contact';
$h++;
}
@@ -95,13 +95,13 @@ function ticket_prepare_head($object)
complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket');
// Attached files
- include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
- $upload_dir = $conf->ticket->dir_output . "/" . $object->ref;
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ $upload_dir = $conf->ticket->dir_output."/".$object->ref;
$nbFiles = count(dol_dir_list($upload_dir, 'files'));
- $head[$h][0] = dol_buildpath('/ticket/document.php', 1) . '?id=' . $object->id;
+ $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
if ($nbFiles > 0) {
- $head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbFiles . '</span>';
+ $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';
}
$head[$h][2] = 'tabTicketDocument';
@@ -218,39 +218,39 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
// Define urllogo
$width = 0;
- if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || ! empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
+ if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
// Print logo
- if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO))
+ if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO))
{
- $urllogo = DOL_URL_ROOT . '/theme/common/login_logo.png';
+ $urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
- if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small)) {
- $urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file=' . urlencode('logos/thumbs/'.$mysoc->logo_small);
+ if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+ $urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
$width = 150;
- } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
- $urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file=' . urlencode('logos/'.$mysoc->logo);
+ } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+ $urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$mysoc->logo);
$width = 150;
- } elseif (is_readable(DOL_DOCUMENT_ROOT . '/theme/dolibarr_logo.png')) {
- $urllogo = DOL_URL_ROOT . '/theme/dolibarr_logo.png';
+ } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) {
+ $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
}
}
}
print '<div class="center">';
// Output html code for logo
- if ($urllogo || ! empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC))
+ if ($urllogo || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC))
{
print '<div class="backgreypublicpayment">';
print '<div class="logopublicpayment">';
if ($urllogo) {
- print '<a href="' . ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '">';
+ print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)).'">';
print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
if ($width) print ' width="'.$width.'"';
print '>';
print '</a>';
}
- if (! empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
- print '<div class="clearboth"></div><strong>' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
+ if (!empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
+ print '<div class="clearboth"></div><strong>'.($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")).'</strong>';
}
print '</div>';
if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
@@ -721,64 +721,64 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
if ($user->rights->agenda->allactions->create ||
(($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create))
{
- $out.='<a class="timeline-btn" href="' . DOL_MAIN_URL_ROOT. '/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
+ $out .= '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
}
- $out.='</span>';
+ $out .= '</span>';
// Date
- $out.='<span class="time"><i class="fa fa-clock-o"></i> ';
- $out.=dol_print_date($histo[$key]['datestart'], 'dayhour');
+ $out .= '<span class="time"><i class="fa fa-clock-o"></i> ';
+ $out .= dol_print_date($histo[$key]['datestart'], 'dayhour');
if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])
{
- $tmpa=dol_getdate($histo[$key]['datestart'], true);
- $tmpb=dol_getdate($histo[$key]['dateend'], true);
- if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out.='-'.dol_print_date($histo[$key]['dateend'], 'hour');
- else $out.='-'.dol_print_date($histo[$key]['dateend'], 'dayhour');
+ $tmpa = dol_getdate($histo[$key]['datestart'], true);
+ $tmpb = dol_getdate($histo[$key]['dateend'], true);
+ if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour');
+ else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour');
}
- $late=0;
- if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late=1;
- if ($histo[$key]['percent'] == 0 && ! $histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late=1;
- if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late=1;
- if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && ! $histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late=1;
- if ($late) $out.=img_warning($langs->trans("Late")).' ';
- $out.="</span>\n";
+ $late = 0;
+ if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+ if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+ if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;
+ if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+ if ($late) $out .= img_warning($langs->trans("Late")).' ';
+ $out .= "</span>\n";
// Ref
- $out.='<h3 class="timeline-header">';
+ $out .= '<h3 class="timeline-header">';
// Author of event
- $out.='<span class="messaging-author">';
+ $out .= '<span class="messaging-author">';
if ($histo[$key]['userid'] > 0)
{
- if(!isset($userGetNomUrlCache[$histo[$key]['userid']])){ // is in cache ?
+ if (!isset($userGetNomUrlCache[$histo[$key]['userid']])) { // is in cache ?
$userstatic->fetch($histo[$key]['userid']);
$userGetNomUrlCache[$histo[$key]['userid']] = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
}
- $out.= $userGetNomUrlCache[$histo[$key]['userid']];
+ $out .= $userGetNomUrlCache[$histo[$key]['userid']];
}
- $out.='</span>';
+ $out .= '</span>';
// Title
$out .= ' <span class="messaging-title">';
- if($actionstatic->code == 'TICKET_MSG') {
+ if ($actionstatic->code == 'TICKET_MSG') {
$out .= $langs->trans('TicketNewMessage');
}
- elseif($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+ elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
$out .= $langs->trans('TicketNewMessage').' <em>('.$langs->trans('Private').')</em>';
- }else{
+ } else {
if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {
- $transcode = $langs->trans("Action" . $histo[$key]['acode']);
- $libelle = ($transcode != "Action" . $histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);
+ $transcode = $langs->trans("Action".$histo[$key]['acode']);
+ $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);
$libelle = $histo[$key]['note'];
$actionstatic->id = $histo[$key]['id'];
$out .= dol_trunc($libelle, 120);
}
if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {
- $out .= '<a href="' . DOL_URL_ROOT . '/comm/mailing/card.php?id=' . $histo[$key]['id'] . '">' . img_object($langs->trans("ShowEMailing"), "email") . ' ';
- $transcode = $langs->trans("Action" . $histo[$key]['acode']);
- $libelle = ($transcode != "Action" . $histo[$key]['acode'] ? $transcode : 'Send mass mailing');
+ $out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';
+ $transcode = $langs->trans("Action".$histo[$key]['acode']);
+ $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');
$out .= dol_trunc($libelle, 120);
}
}
@@ -835,25 +835,25 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
if ($result > 0) {
$footer .= $contact->getNomUrl(1);
if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
- if (! empty($contact->phone_pro))
- $footer .= '(' . dol_print_phone($contact->phone_pro) . ')';
+ if (!empty($contact->phone_pro))
+ $footer .= '('.dol_print_phone($contact->phone_pro).')';
}
}
}
- $documents = getTicketActionCommEcmList($actionstatic) ;
- if(!empty($documents))
+ $documents = getTicketActionCommEcmList($actionstatic);
+ if (!empty($documents))
{
- $footer.= '<div class="timeline-documents-container">';
+ $footer .= '<div class="timeline-documents-container">';
foreach ($documents as $doc)
{
- $footer.= '<span id="document_'.$doc->id.'" class="timeline-documents" ';
- $footer.= ' data-id="'.$doc->id.'" ';
- $footer.= ' data-path="'.$doc->filepath.'"';
- $footer.= ' data-filename="'.dol_escape_htmltag($doc->filename).'" ';
- $footer.= '>';
+ $footer .= '<span id="document_'.$doc->id.'" class="timeline-documents" ';
+ $footer .= ' data-id="'.$doc->id.'" ';
+ $footer .= ' data-path="'.$doc->filepath.'"';
+ $footer .= ' data-filename="'.dol_escape_htmltag($doc->filename).'" ';
+ $footer .= '>';
- $filePath = DOL_DATA_ROOT . '/'. $doc->filepath . '/'. $doc->filename;
+ $filePath = DOL_DATA_ROOT.'/'.$doc->filepath.'/'.$doc->filename;
$mime = dol_mimetype($filePath);
$file = $actionstatic->id.'/'.$doc->filename;
$thumb = $actionstatic->id.'/thumbs/'.substr($doc->filename, 0, strrpos($doc->filename, '.')).'_mini'.substr($doc->filename, strrpos($doc->filename, '.'));
@@ -862,17 +862,17 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
$mimeAttr = ' mime="'.$mime.'" ';
$class = '';
- if(in_array($mime, array('image/png', 'image/jpeg', 'application/pdf'))){
- $class.= ' documentpreview';
+ if (in_array($mime, array('image/png', 'image/jpeg', 'application/pdf'))) {
+ $class .= ' documentpreview';
}
- $footer.= '<a href="'.$doclink.'" class="btn-link '.$class.'" target="_blank" '.$mimeAttr.' >';
- $footer.= img_mime($filePath).' '.$doc->filename;
- $footer.= '</a>';
+ $footer .= '<a href="'.$doclink.'" class="btn-link '.$class.'" target="_blank" '.$mimeAttr.' >';
+ $footer .= img_mime($filePath).' '.$doc->filename;
+ $footer .= '</a>';
- $footer.= '</span>';
+ $footer .= '</span>';
}
- $footer.= '</div>';
+ $footer .= '</div>';
}
@@ -881,19 +881,19 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
- if(!empty($footer)){
- $out.='<div class="timeline-footer">'.$footer.'</div>';
+ if (!empty($footer)) {
+ $out .= '<div class="timeline-footer">'.$footer.'</div>';
}
- $out.='</div>'."\n"; // end timeline-item
+ $out .= '</div>'."\n"; // end timeline-item
- $out.='</li>';
- $out.='<!-- END timeline item -->';
+ $out .= '</li>';
+ $out .= '<!-- END timeline item -->';
$i++;
}
- $out.="</ul>\n";
+ $out .= "</ul>\n";
}
@@ -915,12 +915,12 @@ function getTicketActionCommEcmList($object)
$documents = array();
$sql = 'SELECT ecm.rowid as id, ecm.src_object_type, ecm.src_object_id, ecm.filepath, ecm.filename';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'ecm_files ecm';
- $sql.= ' WHERE ecm.filepath = \'agenda/'.$object->id.'\'';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'ecm_files ecm';
+ $sql .= ' WHERE ecm.filepath = \'agenda/'.$object->id.'\'';
//$sql.= ' ecm.src_object_type = \''.$object->element.'\' AND ecm.src_object_id = '.$object->id; // Actually upload file doesn't add type
- $sql.= ' ORDER BY ecm.position ASC';
+ $sql .= ' ORDER BY ecm.position ASC';
- $resql= $db->query($sql);
+ $resql = $db->query($sql);
if ($resql) {
if ($db->num_rows($resql)) {
while ($obj = $db->fetch_object($resql)) {
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index cb4088c6bf2..0dcb6e8242d 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -35,19 +35,19 @@
*/
function tree_showpad(&$fulltree, $key, $silent = 0)
{
- $pos=1;
+ $pos = 1;
// Loop on each pos, because we will output an img for each pos
while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
{
// Process for column $pos
- $atleastoneofthislevelafter=0;
- $nbofdirinsub=0;
- $nbofdocinsub=0;
- $found=0;
+ $atleastoneofthislevelafter = 0;
+ $nbofdirinsub = 0;
+ $nbofdocinsub = 0;
+ $found = 0;
//print 'x'.$key;
- foreach($fulltree as $key2 => $val2)
+ foreach ($fulltree as $key2 => $val2)
{
//print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
if ($found == 1) // We are after the entry to show
@@ -55,11 +55,11 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
if ($fulltree[$key2]['level'] > $pos)
{
$nbofdirinsub++;
- if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+ if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub += $fulltree[$key2]['cachenbofdoc'];
}
if ($fulltree[$key2]['level'] == $pos)
{
- $atleastoneofthislevelafter=1;
+ $atleastoneofthislevelafter = 1;
}
if ($fulltree[$key2]['level'] <= $pos)
{
@@ -68,12 +68,12 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
}
if ($key2 == $key) // We found ourself, so now every lower level will be counted
{
- $found=1;
+ $found = 1;
}
}
//print $atleastoneofthislevelafter;
- if (! $silent)
+ if (!$silent)
{
if ($atleastoneofthislevelafter)
{
@@ -89,7 +89,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
$pos++;
}
- return array($atleastoneofthislevelafter,$nbofdirinsub,$nbofdocinsub);
+ return array($atleastoneofthislevelafter, $nbofdirinsub, $nbofdocinsub);
}
@@ -117,7 +117,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
{
global $tree_recur_alreadyadded, $menu_handler_to_search;
- if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded=array();
+ if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();
if ($rang == 0)
{
@@ -141,30 +141,30 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
if ($rang > 50)
{
- return; // Protect against infinite loop. Max 50 depth
+ return; // Protect against infinite loop. Max 50 depth
}
//ballayage du tableau
- $sizeoftab=count($tab);
- $ulprinted=0;
- for ($x=0; $x < $sizeoftab; $x++)
+ $sizeoftab = count($tab);
+ $ulprinted = 0;
+ for ($x = 0; $x < $sizeoftab; $x++)
{
//var_dump($tab[$x]);exit;
// If an element has $pere for parent
if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
{
//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
- if (empty($ulprinted) && ! empty($pere['rowid']))
+ if (empty($ulprinted) && !empty($pere['rowid']))
{
- if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+ if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
{
dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
continue;
}
- print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
+ print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
}
- print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+ print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
if ($showfk)
{
print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -180,26 +180,26 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
print $tab[$x]['entry'];
}
//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
- $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+ $tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
// And now we search all its sons of lower level
- tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+ tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
print '</li>';
}
- elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+ elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
{
//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
- if (empty($ulprinted) && ! empty($pere['rowid']))
+ if (empty($ulprinted) && !empty($pere['rowid']))
{
- if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+ if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
{
dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
//print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
continue;
}
- print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
+ print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
}
- print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+ print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
if ($showfk)
{
print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -216,14 +216,14 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
print $tab[$x]['entry'];
}
//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
- $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+ $tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
// And now we search all its sons of lower level
//print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
- tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+ tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
print '</li>';
}
}
- if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
+ if (!empty($ulprinted) && !empty($pere['rowid'])) { print '</ul>'."\n"; }
if ($rang == 0) print '</ul>';
}
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index cb54b263a00..ec8c6a6858f 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -34,7 +34,7 @@ function trip_prepare_head(Deplacement $object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/card.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$object->id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
@@ -50,7 +50,7 @@ function trip_prepare_head(Deplacement $object)
$head[$h][2] = 'documents';
$h++;
- $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/info.php?id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 2b510373299..5b7c923001b 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -331,7 +331,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
if ($foruserprofile) $colspan = 4;
$thumbsbyrow = 6;
- print '<table class="noborder centpercent">';
+ print '<table class="noborder centpercent'.($edit ? ' editmode' : '').' tableforfield">';
// Title
if ($foruserprofile)
@@ -582,11 +582,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));
+ $default = (empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
- print '<td colspan="'.($colspan-1).'">';
+ print '<td colspan="'.($colspan - 1).'">';
if ($edit)
{
print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
@@ -630,11 +630,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colorbackvmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackvmenu1)));
+ $default = (empty($colorbackvmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackvmenu1)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
- print '<td colspan="'.($colspan-1).'">';
+ print '<td colspan="'.($colspan - 1).'">';
if ($edit)
{
print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
@@ -658,7 +658,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colortexttitlenotab) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlenotab)));
+ $default = (empty($colortexttitlenotab) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlenotab)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("TextTitleColor").'</td>';
@@ -685,7 +685,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colorbacktitle1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacktitle1)));
+ $default = (empty($colorbacktitle1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacktitle1)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
@@ -698,7 +698,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
{
print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
}
- print ' <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) '; // $colorbacktitle1 in CSS
+ print ' <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) '; // $colorbacktitle1 in CSS
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</span>';
print '</td>';
@@ -712,7 +712,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colortexttitle) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitle)));
+ $default = (empty($colortexttitle) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitle)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
@@ -739,11 +739,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colorbacklineimpair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklineimpair1)));
+ $default = (empty($colorbacklineimpair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklineimpair1)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
- print '<td colspan="'.($colspan-1).'">';
+ print '<td colspan="'.($colspan - 1).'">';
if ($edit)
{
print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
@@ -767,11 +767,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colorbacklinepair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepair1)));
+ $default = (empty($colorbacklinepair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepair1)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
- print '<td colspan="'.($colspan-1).'">';
+ print '<td colspan="'.($colspan - 1).'">';
if ($edit)
{
print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
@@ -815,7 +815,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colortextlink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortextlink)));
+ $default = (empty($colortextlink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortextlink)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("LinkColor").'</td>';
@@ -857,22 +857,22 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
*/
}
else {
- $default=(empty($colorbacklinepairhover) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairhover)));
+ $default = (empty($colorbacklinepairhover) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairhover)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
- print '<td colspan="'.($colspan-1).'">';
+ print '<td colspan="'.($colspan - 1).'">';
//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
//print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
if ($edit)
{
- if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color=colorArrayToHex(colorStringToArray($colorbacklinepairhover));
+ if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
}
else
{
- if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color=colorArrayToHex(colorStringToArray($colorbacklinepairhover));
+ if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
if ($color)
{
@@ -903,7 +903,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
else
{
- $default=(empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
+ $default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
print '<tr class="oddeven">';
print '<td>'.$langs->trans("HighlightLinesChecked").'</td>';
diff --git a/htdocs/core/lib/vat.lib.php b/htdocs/core/lib/vat.lib.php
index 1649e686ec2..0bc3bb66e90 100644
--- a/htdocs/core/lib/vat.lib.php
+++ b/htdocs/core/lib/vat.lib.php
@@ -49,12 +49,12 @@ function vat_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->tax->dir_output . "/vat/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->tax->dir_output."/vat/".dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
- $nbLinks=Link::count($db, $object->element, $object->id);
+ $nbLinks = Link::count($db, $object->element, $object->id);
$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
$head[$tab][1] = $langs->trans("Documents");
- if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= '<span class="badge marginleftonlyshort">'.($nbFiles+$nbLinks).'</span>';
+ if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
$head[$tab][2] = 'documents';
$tab++;
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 0822109d45e..76e910bdecd 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -220,6 +220,8 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
global $db, $langs, $conf, $user;
global $dolibarr_main_url_root, $dolibarr_main_data_root;
+ $nbrep = 0;
+
dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR') ? '1' : '')." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER') ? '1' : '').')');
// Define $urlwithroot
@@ -300,7 +302,6 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&entity=1&file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
// become
// <img alt="" src="'.$urlwithroot.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
- $nbrep = 0;
if (!$symlinktomediaexists)
{
// <img src="image.png... => <img src="medias/image.png...
@@ -349,7 +350,11 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
}
}
- $content = preg_replace('/ contenteditable="true"/', ' contenteditable="false"', $content, -1, $nbrep);
+ $content = str_replace(' contenteditable="true"', ' contenteditable="false"', $content);
+
+ if (!empty($conf->global->WEBSITE_ADD_CSS_TO_BODY)) {
+ $content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite '.$conf->global->WEBSITE_ADD_CSS_TO_BODY, $content);
+ }
dol_syslog("dolWebsiteOutput end");
@@ -562,7 +567,7 @@ function getStructuredData($type, $data = array())
}
elseif ($type == 'blogpost')
{
- if (! empty($websitepage->author_alias))
+ if (!empty($websitepage->author_alias))
{
//include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
//$tmpuser = new User($db);
@@ -665,24 +670,24 @@ function getSocialNetworkSharingLinks()
$hashtags = trim(join(' #', array_map('trim', explode(',', $websitepage->keywords))));
$out = '<!-- section for social network sharing of page -->'."\n";
- $out.= '<div class="dol-social-share">'."\n";
+ $out .= '<div class="dol-social-share">'."\n";
// Twitter
- $out.= '<div class="dol-social-share-tw">'."\n";
- $out.= '<a href="https://twitter.com/share" class="twitter-share-button" data-url="'.$fullurl.'" data-text="'.dol_escape_htmltag($websitepage->description).'" data-lang="'.$websitepage->lang.'" data-size="small" data-related="" data-hashtags="'.preg_replace('/^#/', '', $hashtags).'" data-count="horizontal">Tweet</a>';
- $out.= '<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?\'http\':\'https\';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+\'://platform.twitter.com/widgets.js\';fjs.parentNode.insertBefore(js,fjs);}}(document, \'script\', \'twitter-wjs\');</script>';
- $out.= '</div>'."\n";
+ $out .= '<div class="dol-social-share-tw">'."\n";
+ $out .= '<a href="https://twitter.com/share" class="twitter-share-button" data-url="'.$fullurl.'" data-text="'.dol_escape_htmltag($websitepage->description).'" data-lang="'.$websitepage->lang.'" data-size="small" data-related="" data-hashtags="'.preg_replace('/^#/', '', $hashtags).'" data-count="horizontal">Tweet</a>';
+ $out .= '<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?\'http\':\'https\';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+\'://platform.twitter.com/widgets.js\';fjs.parentNode.insertBefore(js,fjs);}}(document, \'script\', \'twitter-wjs\');</script>';
+ $out .= '</div>'."\n";
// Reddit
- $out.= '<div class="dol-social-share-reddit">'."\n";
- $out.= '<a href="https://www.reddit.com/submit" target="_blank" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';
- $out.= '<img src="https://www.reddit.com/static/spreddit7.gif" alt="Submit to reddit" border="0" /> </a>';
- $out.= '</div>'."\n";
+ $out .= '<div class="dol-social-share-reddit">'."\n";
+ $out .= '<a href="https://www.reddit.com/submit" target="_blank" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';
+ $out .= '<img src="https://www.reddit.com/static/spreddit7.gif" alt="Submit to reddit" border="0" /> </a>';
+ $out .= '</div>'."\n";
// Facebook
- $out.= '<div class="dol-social-share-fbl">'."\n";
- $out.= '<div id="fb-root"></div>'."\n";
- $out.= '<script>(function(d, s, id) {
+ $out .= '<div class="dol-social-share-fbl">'."\n";
+ $out .= '<div id="fb-root"></div>'."\n";
+ $out .= '<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
@@ -697,10 +702,10 @@ function getSocialNetworkSharingLinks()
colorscheme="light"
share="1"
action="like" ></fb:like>'."\n";
- $out.= '</div>'."\n";
+ $out .= '</div>'."\n";
- $out.= "\n</div>\n";
- $out.= '<!-- section end for social network sharing of page -->'."\n";
+ $out .= "\n</div>\n";
+ $out .= '<!-- section end for social network sharing of page -->'."\n";
return $out;
}
@@ -742,7 +747,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
else
{
$tmparrayoftype = explode(',', $type);
- foreach($tmparrayoftype as $tmptype) {
+ foreach ($tmparrayoftype as $tmptype) {
if (!in_array($tmptype, array('', 'page', 'blogpost'))) {
$error++;
$arrayresult['code'] = 'KO';
@@ -762,8 +767,8 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
if ($type) {
$tmparrayoftype = explode(',', $type);
$typestring = '';
- foreach($tmparrayoftype as $tmptype) {
- $typestring .= ($typestring ? ", ": "")."'".trim($tmptype)."'";
+ foreach ($tmparrayoftype as $tmptype) {
+ $typestring .= ($typestring ? ", " : "")."'".trim($tmptype)."'";
}
$sql .= " AND type_container IN (".$typestring.")";
}
@@ -793,7 +798,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
{
$tmpwebsitepage = new WebsitePage($db);
$tmpwebsitepage->fetch($obj->rowid);
- if ($tmpwebsitepage->id > 0) $arrayresult['list'][] = $tmpwebsitepage;
+ if ($tmpwebsitepage->id > 0) $arrayresult['list'][$obj->rowid] = $tmpwebsitepage;
$found++;
}
$i++;
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index ff0fdcae67e..b2b5ef06abf 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -72,6 +72,9 @@ function dolSavePageAlias($filealias, $object, $objectpage)
$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
$aliascontent .= '?>'."\n";
$result = file_put_contents($filealias, $aliascontent);
+ if ($result === false) {
+ dol_syslog("Failed to write file ".$filealias, LOG_WARNING);
+ }
if (!empty($conf->global->MAIN_UMASK)) {
@chmod($filealias, octdec($conf->global->MAIN_UMASK));
}
@@ -89,6 +92,9 @@ function dolSavePageAlias($filealias, $object, $objectpage)
$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
$aliascontent .= '?>'."\n";
$result = file_put_contents($filealias, $aliascontent);
+ if ($result === false) {
+ dol_syslog("Failed to write file ".$filealias, LOG_WARNING);
+ }
if (!empty($conf->global->MAIN_UMASK)) {
@chmod($filealias, octdec($conf->global->MAIN_UMASK));
}
@@ -435,11 +441,13 @@ function showWebsiteTemplates(Website $website)
$colspan = 2;
- $thumbsbyrow = 6;
+ print '<!-- For to import website template -->'."\n";
print '<table class="noborder centpercent">';
// Title
- print '<tr class="liste_titre"><th class="titlefield"></th>';
+ print '<tr class="liste_titre"><th class="titlefield">';
+ print $form->textwithpicto($langs->trans("Templates"), $langs->trans("ThemeDir").' : '.join(", ", $dirthemes));
+ print '</th>';
print '<th class="right">';
$url = 'https://www.dolistore.com/43-web-site-templates';
print '<a href="'.$url.'" target="_blank">';
@@ -447,73 +455,68 @@ function showWebsiteTemplates(Website $website)
print '</a>';
print '</th></tr>';
- print '<tr>';
- print '<td>'.$langs->trans("ThemeDir").'</td>';
- print '<td>';
- foreach ($dirthemes as $dirtheme)
- {
- echo '"'.$dirtheme.'" ';
- }
- print '</td>';
- print '</tr>';
-
print '<tr><td colspan="'.$colspan.'">';
print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
- $i = 0;
- foreach ($dirthemes as $dir)
- {
- //print $dirroot.$dir;exit;
- $dirtheme = DOL_DATA_ROOT.$dir; // This include loop on $conf->file->dol_document_root
- if (is_dir($dirtheme))
+ if (count($dirthemes)) {
+ $i = 0;
+ foreach ($dirthemes as $dir)
{
- $handle = opendir($dirtheme);
- if (is_resource($handle))
+ //print $dirroot.$dir;exit;
+ $dirtheme = DOL_DATA_ROOT.$dir; // This include loop on $conf->file->dol_document_root
+ if (is_dir($dirtheme))
{
- while (($subdir = readdir($handle)) !== false)
+ $handle = opendir($dirtheme);
+ if (is_resource($handle))
{
- if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
- && substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir))
+ while (($subdir = readdir($handle)) !== false)
{
- $subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
+ if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
+ && substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir))
+ {
+ $subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
- // Disable not stable themes (dir ends with _exp or _dev)
- if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
- if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+ // Disable not stable themes (dir ends with _exp or _dev)
+ if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
+ if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
- print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
+ print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
- $file = $dirtheme."/".$subdirwithoutzip.".jpg";
- $url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
+ $file = $dirtheme."/".$subdirwithoutzip.".jpg";
+ $url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
- if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+ if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
- $originalfile = basename($file);
- $entity = $conf->entity;
- $modulepart = 'doctemplateswebsite';
- $cache = '';
- $title = $file;
+ $originalfile = basename($file);
+ $entity = $conf->entity;
+ $modulepart = 'doctemplateswebsite';
+ $cache = '';
+ $title = $file;
- $ret = '';
- $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
- if (!empty($urladvanced)) $ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
- else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
- print $ret;
- print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
- print '</a>';
+ $ret = '';
+ $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
+ if (!empty($urladvanced)) $ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
+ else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+ print $ret;
+ print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+ print '</a>';
- print '<br>';
- print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
- print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&website='.$website->ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").'</a>';
- print '</div>';
+ print '<br>';
+ print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
+ print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&website='.$website->ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").'</a>';
+ print '</div>';
- $i++;
+ $i++;
+ }
}
}
}
}
}
+ else {
+ print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
+ }
print '</div></td></tr></table>';
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index 178a57c8e23..912f0f16cea 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -34,61 +34,61 @@
*/
function check_authentication($authentication, &$error, &$errorcode, &$errorlabel)
{
- global $db,$conf,$langs;
- global $dolibarr_main_authentication,$dolibarr_auto_user;
+ global $db, $conf, $langs;
+ global $dolibarr_main_authentication, $dolibarr_auto_user;
- $fuser=new User($db);
+ $fuser = new User($db);
- if (! $error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
+ if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
{
$error++;
- $errorcode='BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel='Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
+ $errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
}
- if (! $error && ! empty($authentication['entity']) && ! is_numeric($authentication['entity']))
+ if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))
{
$error++;
- $errorcode='BAD_PARAMETERS'; $errorlabel="The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
+ $errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
}
- if (! $error)
+ if (!$error)
{
- $result=$fuser->fetch('', $authentication['login'], '', 0);
+ $result = $fuser->fetch('', $authentication['login'], '', 0);
if ($result < 0)
{
$error++;
- $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user';
+ $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
}
elseif ($result == 0)
{
$error++;
- $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
+ $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
}
- if (! $error && $fuser->statut == 0)
+ if (!$error && $fuser->statut == 0)
{
$error++;
- $errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled';
+ $errorcode = 'ERROR_USER_DISABLED'; $errorlabel = 'This user has been locked or disabled';
}
// Validation of login
- if (! $error)
+ if (!$error)
{
- $fuser->getrights(); // Load permission of user
+ $fuser->getrights(); // Load permission of user
// Authentication mode
- if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+ if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
// Authentication mode: forceuser
- if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+ if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
// Set authmode
- $authmode=explode(',', $dolibarr_main_authentication);
+ $authmode = explode(',', $dolibarr_main_authentication);
include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');
if (empty($login))
{
$error++;
- $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
+ $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
}
}
}
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index ef81ecda5bf..4a85c595223 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -34,83 +34,83 @@
*/
function build_calfile($format, $title, $desc, $events_array, $outputfile)
{
- global $conf, $langs;
+ global $conf, $langs;
- dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
+ dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
- if (empty($outputfile))
- {
- // -1 = error
- return -1;
- }
+ if (empty($outputfile))
+ {
+ // -1 = error
+ return -1;
+ }
- // Note: A cal file is an UTF8 encoded file
- $calfileh = fopen($outputfile, "w");
+ // Note: A cal file is an UTF8 encoded file
+ $calfileh = fopen($outputfile, "w");
- if ($calfileh)
- {
- include_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+ if ($calfileh)
+ {
+ include_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
- $now = dol_now();
- $encoding = "";
+ $now = dol_now();
+ $encoding = "";
- if ($format === "vcal")
- {
- $encoding = "ENCODING=QUOTED-PRINTABLE:";
- }
+ if ($format === "vcal")
+ {
+ $encoding = "ENCODING=QUOTED-PRINTABLE:";
+ }
- // Print header
- fwrite($calfileh, "BEGIN:VCALENDAR\n");
+ // Print header
+ fwrite($calfileh, "BEGIN:VCALENDAR\n");
- // version is always "2.0"
- fwrite($calfileh, "VERSION:2.0\n");
+ // version is always "2.0"
+ fwrite($calfileh, "VERSION:2.0\n");
- fwrite($calfileh, "METHOD:PUBLISH\n");
- fwrite($calfileh, "PRODID:-//DOLIBARR ".DOL_VERSION."\n");
- fwrite($calfileh, "CALSCALE:GREGORIAN\n");
- fwrite($calfileh, "X-WR-CALNAME:".$encoding.format_cal($format, $title)."\n");
- fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
- //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
+ fwrite($calfileh, "METHOD:PUBLISH\n");
+ fwrite($calfileh, "PRODID:-//DOLIBARR ".DOL_VERSION."\n");
+ fwrite($calfileh, "CALSCALE:GREGORIAN\n");
+ fwrite($calfileh, "X-WR-CALNAME:".$encoding.format_cal($format, $title)."\n");
+ fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
+ //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
- if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE) && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60)
- {
- $hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "hour");
- $mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "min");
- $ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "sec");
+ if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE) && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60)
+ {
+ $hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "hour");
+ $mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "min");
+ $ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "sec");
- fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
- }
+ fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
+ }
- foreach ($events_array as $key => $event)
- {
- // See http://fr.wikipedia.org/wiki/ICalendar for format
- // See http://www.ietf.org/rfc/rfc2445.txt for RFC
+ foreach ($events_array as $key => $event)
+ {
+ // See http://fr.wikipedia.org/wiki/ICalendar for format
+ // See http://www.ietf.org/rfc/rfc2445.txt for RFC
- // TODO: avoid use extra event array, use objects direct thahtwas created before
+ // TODO: avoid use extra event array, use objects direct thahtwas created before
- $uid = $event["uid"];
- $type = $event["type"];
- $startdate = $event["startdate"];
- $duration = $event["duration"];
- $enddate = $event["enddate"];
- $summary = $event["summary"];
- $category = $event["category"];
- $priority = $event["priority"];
- $fulldayevent = $event["fulldayevent"];
- $location = $event["location"];
- $email = $event["email"];
- $url = $event["url"];
- $transparency = $event["transparency"];
- $description = dol_string_nohtmltag(preg_replace("/<br[\s\/]?>/i", "\n", $event["desc"]), 0);
- $created = $event["created"];
- $modified = $event["modified"];
- $assignedUsers = $event["assignedUsers"];
+ $uid = $event["uid"];
+ $type = $event["type"];
+ $startdate = $event["startdate"];
+ $duration = $event["duration"];
+ $enddate = $event["enddate"];
+ $summary = $event["summary"];
+ $category = $event["category"];
+ $priority = $event["priority"];
+ $fulldayevent = $event["fulldayevent"];
+ $location = $event["location"];
+ $email = $event["email"];
+ $url = $event["url"];
+ $transparency = $event["transparency"];
+ $description = dol_string_nohtmltag(preg_replace("/<br[\s\/]?>/i", "\n", $event["desc"]), 0);
+ $created = $event["created"];
+ $modified = $event["modified"];
+ $assignedUsers = $event["assignedUsers"];
- // Format
- $summary = format_cal($format, $summary);
- $description = format_cal($format, $description);
- $category = format_cal($format, $category);
- $location = format_cal($format, $location);
+ // Format
+ $summary = format_cal($format, $summary);
+ $description = format_cal($format, $description);
+ $category = format_cal($format, $category);
+ $location = format_cal($format, $location);
// Output the vCard/iCal VEVENT object
/*
@@ -147,180 +147,180 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
END:VEVENT
*/
- if ($type === "event")
- {
- fwrite($calfileh, "BEGIN:VEVENT\n");
- fwrite($calfileh, "UID:".$uid."\n");
+ if ($type === "event")
+ {
+ fwrite($calfileh, "BEGIN:VEVENT\n");
+ fwrite($calfileh, "UID:".$uid."\n");
- if (! empty($email))
- {
- fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
- fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
- }
+ if (!empty($email))
+ {
+ fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+ fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
+ }
- if (! empty($url))
- {
- fwrite($calfileh, "URL:".$url."\n");
- }
+ if (!empty($url))
+ {
+ fwrite($calfileh, "URL:".$url."\n");
+ }
- if (is_array($assignedUsers))
- {
- foreach($assignedUsers as $assignedUser)
- {
- if($assignedUser->email === $email)
- {
- continue;
- }
+ if (is_array($assignedUsers))
+ {
+ foreach ($assignedUsers as $assignedUser)
+ {
+ if ($assignedUser->email === $email)
+ {
+ continue;
+ }
- fwrite($calfileh, "ATTENDEE;RSVP=TRUE:mailto:".$assignedUser->email."\n");
- }
- }
+ fwrite($calfileh, "ATTENDEE;RSVP=TRUE:mailto:".$assignedUser->email."\n");
+ }
+ }
- if ($created)
- {
- fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
- }
+ if ($created)
+ {
+ fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
+ }
- if ($modified)
- {
- fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
- }
+ if ($modified)
+ {
+ fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
+ }
- fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
- fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
+ fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
+ fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
- if (! empty($location))
- {
- fwrite($calfileh, "LOCATION:".$encoding.$location."\n");
- }
+ if (!empty($location))
+ {
+ fwrite($calfileh, "LOCATION:".$encoding.$location."\n");
+ }
- if ($fulldayevent)
- {
- fwrite($calfileh, "X-FUNAMBOL-ALLDAY:1\n");
- }
+ if ($fulldayevent)
+ {
+ fwrite($calfileh, "X-FUNAMBOL-ALLDAY:1\n");
+ }
- // see https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/0f262da6-c5fd-459e-9f18-145eba86b5d2
- if ($fulldayevent)
- {
- fwrite($calfileh, "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE\n");
- }
+ // see https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/0f262da6-c5fd-459e-9f18-145eba86b5d2
+ if ($fulldayevent)
+ {
+ fwrite($calfileh, "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE\n");
+ }
- // Date must be GMT dates
- // Current date
- fwrite($calfileh, "DTSTAMP:".dol_print_date($now, "dayhourxcard", true)."\n");
+ // Date must be GMT dates
+ // Current date
+ fwrite($calfileh, "DTSTAMP:".dol_print_date($now, "dayhourxcard", true)."\n");
- // Start date
- $prefix = "";
- $startdatef = dol_print_date($startdate, "dayhourxcard", true);
+ // Start date
+ $prefix = "";
+ $startdatef = dol_print_date($startdate, "dayhourxcard", true);
- if ($fulldayevent)
- {
- // Local time
- $prefix = ";VALUE=DATE";
- $startdatef = dol_print_date($startdate, "dayxcard", false);
- }
+ if ($fulldayevent)
+ {
+ // Local time
+ $prefix = ";VALUE=DATE";
+ $startdatef = dol_print_date($startdate, "dayxcard", false);
+ }
- fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
+ fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
- // End date
- if ($fulldayevent)
- {
- if (empty($enddate))
- {
- $enddate = dol_time_plus_duree($startdate, 1, "d");
- }
- }
- else
- {
- if (empty($enddate))
- {
- $enddate = $startdate+$duration;
- }
- }
+ // End date
+ if ($fulldayevent)
+ {
+ if (empty($enddate))
+ {
+ $enddate = dol_time_plus_duree($startdate, 1, "d");
+ }
+ }
+ else
+ {
+ if (empty($enddate))
+ {
+ $enddate = $startdate + $duration;
+ }
+ }
- $prefix = "";
- $enddatef = dol_print_date($enddate, "dayhourxcard", true);
+ $prefix = "";
+ $enddatef = dol_print_date($enddate, "dayhourxcard", true);
- if ($fulldayevent)
- {
- $prefix = ";VALUE=DATE";
- $enddatef = dol_print_date($enddate+1, "dayxcard", false);
+ if ($fulldayevent)
+ {
+ $prefix = ";VALUE=DATE";
+ $enddatef = dol_print_date($enddate + 1, "dayxcard", false);
- // Local time
- //$enddatef .= dol_print_date($enddate+1,"dayhourxcard",false);
- }
+ // Local time
+ //$enddatef .= dol_print_date($enddate+1,"dayhourxcard",false);
+ }
- fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
- fwrite($calfileh, "STATUS:CONFIRMED"."\n");
+ fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
+ fwrite($calfileh, "STATUS:CONFIRMED"."\n");
- if (! empty($transparency))
- {
- fwrite($calfileh, "TRANSP:".$transparency."\n");
- }
+ if (!empty($transparency))
+ {
+ fwrite($calfileh, "TRANSP:".$transparency."\n");
+ }
- if (! empty($category))
- {
- fwrite($calfileh, "CATEGORIES:".$encoding.$category."\n");
- }
+ if (!empty($category))
+ {
+ fwrite($calfileh, "CATEGORIES:".$encoding.$category."\n");
+ }
- fwrite($calfileh, "END:VEVENT\n");
- }
+ fwrite($calfileh, "END:VEVENT\n");
+ }
- // Output the vCard/iCal VJOURNAL object
- if ($type === "journal")
- {
- fwrite($calfileh, "BEGIN:VJOURNAL\n");
- fwrite($calfileh, "UID:".$uid."\n");
+ // Output the vCard/iCal VJOURNAL object
+ if ($type === "journal")
+ {
+ fwrite($calfileh, "BEGIN:VJOURNAL\n");
+ fwrite($calfileh, "UID:".$uid."\n");
- if (! empty($email))
- {
- fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
- fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
- }
+ if (!empty($email))
+ {
+ fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+ fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
+ }
- if (! empty($url))
- {
- fwrite($calfileh, "URL:".$url."\n");
- }
+ if (!empty($url))
+ {
+ fwrite($calfileh, "URL:".$url."\n");
+ }
- if ($created)
- {
- fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
- }
+ if ($created)
+ {
+ fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
+ }
- if ($modified)
- {
- fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
- }
+ if ($modified)
+ {
+ fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
+ }
- fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
- fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
- fwrite($calfileh, "STATUS:CONFIRMED"."\n");
- fwrite($calfileh, "CATEGORIES:".$category."\n");
- fwrite($calfileh, "LOCATION:".$location."\n");
- fwrite($calfileh, "TRANSP:OPAQUE\n");
- fwrite($calfileh, "CLASS:CONFIDENTIAL\n");
- fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, "dayhourxcard", true)."\n");
+ fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
+ fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
+ fwrite($calfileh, "STATUS:CONFIRMED"."\n");
+ fwrite($calfileh, "CATEGORIES:".$category."\n");
+ fwrite($calfileh, "LOCATION:".$location."\n");
+ fwrite($calfileh, "TRANSP:OPAQUE\n");
+ fwrite($calfileh, "CLASS:CONFIDENTIAL\n");
+ fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, "dayhourxcard", true)."\n");
- fwrite($calfileh, "END:VJOURNAL\n");
- }
- }
+ fwrite($calfileh, "END:VJOURNAL\n");
+ }
+ }
- // Footer
- fwrite($calfileh, "END:VCALENDAR");
+ // Footer
+ fwrite($calfileh, "END:VCALENDAR");
- fclose($calfileh);
+ fclose($calfileh);
- if (! empty($conf->global->MAIN_UMASK))
- {
- @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
- }
- }
- else
- {
- dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
- return -2;
- }
+ if (!empty($conf->global->MAIN_UMASK))
+ {
+ @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+ }
+ }
+ else
+ {
+ dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
+ return -2;
+ }
}
/**
@@ -333,38 +333,38 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
* @param array $events_array Array of events ("uid","startdate","summary","url","desc","author","category") or Array of WebsitePage
* @param string $outputfile Output file
* @param string $filter (optional) Filter
- * @param string $url Url
+ * @param string $url Url (If empty, forge URL for agenda RSS export)
* @return int < 0 if ko, Nb of events in file if ok
*/
function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = '', $url = '')
{
- global $user, $conf, $langs;
- global $dolibarr_main_url_root;
+ global $user, $conf, $langs;
+ global $dolibarr_main_url_root;
- dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
+ dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
- if (empty($outputfile))
- {
- // -1 = error
- return -1;
- }
+ if (empty($outputfile))
+ {
+ // -1 = error
+ return -1;
+ }
- $fichier = fopen($outputfile, "w");
+ $fichier = fopen($outputfile, "w");
- if ($fichier)
- {
- $date = date("r");
+ if ($fichier)
+ {
+ $date = date("r");
- // Print header
- fwrite($fichier, '<?xml version="1.0" encoding="'.$langs->charset_output.'"?>');
- fwrite($fichier, "\n");
+ // Print header
+ fwrite($fichier, '<?xml version="1.0" encoding="'.$langs->charset_output.'"?>');
+ fwrite($fichier, "\n");
- fwrite($fichier, '<rss version="2.0">');
- fwrite($fichier, "\n");
+ fwrite($fichier, '<rss version="2.0">');
+ fwrite($fichier, "\n");
- fwrite($fichier, "<channel>\n<title>".$title." \n");
+ fwrite($fichier, "\n".$title." \n");
- /*
+ /*
fwrite($fichier, "fr "."\n".
"Dolibarr "."\n".
@@ -372,90 +372,91 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
"Dolibarr "."\n");
*/
- if (empty($url)) {
- // Define $urlwithroot
- $urlwithouturlroot = preg_replace("/".preg_quote(DOL_URL_ROOT, "/")."$/i", "", trim($dolibarr_main_url_root));
- $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
- //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
+ if (empty($url)) {
+ // Define $urlwithroot
+ $urlwithouturlroot = preg_replace("/".preg_quote(DOL_URL_ROOT, "/")."$/i", "", trim($dolibarr_main_url_root));
+ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+ //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
- $url = $urlwithroot."/public/agenda/agendaexport.php?format=rss&exportkey=".urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
- }
+ $url = $urlwithroot."/public/agenda/agendaexport.php?format=rss&exportkey=".urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
+ }
- fwrite($fichier, "/i", "\n", $event["desc"]), 0);
+ $description = dol_string_nohtmltag(preg_replace("//i", "\n", $event["desc"]), 0);
- fwrite($fichier, "- \n");
- fwrite($fichier, "
<![CDATA[".$summary."]]> \n");
- fwrite($fichier, "\n");
+ fwrite($fichier, "<![CDATA[".$summary."]]> \n");
+ fwrite($fichier, "".date("r", $startdate)." \n");
- fwrite($fichier, " \n");
- }
- }
+ fwrite($fichier, "]]>\n");
+ fwrite($fichier, "".date("r", $startdate)." \n");
+ fwrite($fichier, " ");
- fwrite($fichier, "\n");
- fwrite($fichier, "");
+ fwrite($fichier, "");
+ fwrite($fichier, "\n");
+ fwrite($fichier, "");
- fclose($fichier);
+ fclose($fichier);
- if (! empty($conf->global->MAIN_UMASK))
- {
- @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
- }
- }
+ if (!empty($conf->global->MAIN_UMASK))
+ {
+ @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+ }
+ }
}
/**
@@ -467,27 +468,27 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
*/
function format_cal($format, $string)
{
- global $conf;
+ global $conf;
- $newstring = $string;
+ $newstring = $string;
- if ($format === "vcal")
- {
- $newstring = quotedPrintEncode($newstring);
- }
+ if ($format === "vcal")
+ {
+ $newstring = quotedPrintEncode($newstring);
+ }
- if ($format === "ical")
- {
- // Replace new lines chars by "\n"
- $newstring = preg_replace("/"."\r\n"."/i", "\\n", $newstring);
- $newstring = preg_replace("/"."\n\r"."/i", "\\n", $newstring);
- $newstring = preg_replace("/"."\n"."/i", "\\n", $newstring);
+ if ($format === "ical")
+ {
+ // Replace new lines chars by "\n"
+ $newstring = preg_replace("/"."\r\n"."/i", "\\n", $newstring);
+ $newstring = preg_replace("/"."\n\r"."/i", "\\n", $newstring);
+ $newstring = preg_replace("/"."\n"."/i", "\\n", $newstring);
- // Must not exceed 75 char. Cut with "\r\n"+Space
- $newstring = calEncode($newstring);
- }
+ // Must not exceed 75 char. Cut with "\r\n"+Space
+ $newstring = calEncode($newstring);
+ }
- return $newstring;
+ return $newstring;
}
/**
@@ -499,56 +500,56 @@ function format_cal($format, $string)
*/
function calEncode($line)
{
- $out = "";
- $newpara = "";
+ $out = "";
+ $newpara = "";
- // If mb_ functions exists, it"s better to use them
- if (function_exists("mb_strlen"))
- {
- $strlength = mb_strlen($line, "UTF-8");
+ // If mb_ functions exists, it"s better to use them
+ if (function_exists("mb_strlen"))
+ {
+ $strlength = mb_strlen($line, "UTF-8");
- for ($j = 0; $j < $strlength; $j++)
- {
- // Take char at position $j
- $char = mb_substr($line, $j, 1, "UTF-8");
+ for ($j = 0; $j < $strlength; $j++)
+ {
+ // Take char at position $j
+ $char = mb_substr($line, $j, 1, "UTF-8");
- if ((mb_strlen($newpara, "UTF-8") + mb_strlen($char, "UTF-8")) >= 75)
- {
- // CRLF + Space for cal
- $out .= $newpara . "\r\n ";
+ if ((mb_strlen($newpara, "UTF-8") + mb_strlen($char, "UTF-8")) >= 75)
+ {
+ // CRLF + Space for cal
+ $out .= $newpara."\r\n ";
- $newpara = "";
- }
+ $newpara = "";
+ }
- $newpara .= $char;
- }
+ $newpara .= $char;
+ }
- $out .= $newpara;
- }
- else
- {
- $strlength = dol_strlen($line);
+ $out .= $newpara;
+ }
+ else
+ {
+ $strlength = dol_strlen($line);
- for ($j = 0; $j < $strlength; $j++)
- {
- // Take char at position $j
- $char = substr($line, $j, 1);
+ for ($j = 0; $j < $strlength; $j++)
+ {
+ // Take char at position $j
+ $char = substr($line, $j, 1);
- if ((dol_strlen($newpara) + dol_strlen($char)) >= 75)
- {
- // CRLF + Space for cal
- $out .= $newpara . "\r\n ";
+ if ((dol_strlen($newpara) + dol_strlen($char)) >= 75)
+ {
+ // CRLF + Space for cal
+ $out .= $newpara."\r\n ";
- $newpara = "";
- }
+ $newpara = "";
+ }
- $newpara .= $char;
- }
+ $newpara .= $char;
+ }
- $out .= $newpara;
- }
+ $out .= $newpara;
+ }
- return trim($out);
+ return trim($out);
}
@@ -561,45 +562,45 @@ function calEncode($line)
*/
function quotedPrintEncode($str, $forcal = 0)
{
- $lines = preg_split("/\r\n/", $str);
- $out = "";
+ $lines = preg_split("/\r\n/", $str);
+ $out = "";
- foreach ($lines as $line)
- {
- $newpara = "";
+ foreach ($lines as $line)
+ {
+ $newpara = "";
- // Do not use dol_strlen here, we need number of bytes
- $strlength = strlen($line);
+ // Do not use dol_strlen here, we need number of bytes
+ $strlength = strlen($line);
- for ($j = 0; $j < $strlength; $j++)
- {
- $char = substr($line, $j, 1);
- $ascii = ord($char);
+ for ($j = 0; $j < $strlength; $j++)
+ {
+ $char = substr($line, $j, 1);
+ $ascii = ord($char);
- if ( $ascii < 32 || $ascii === 61 || $ascii > 126 )
- {
- $char = "=" . strtoupper(sprintf("%02X", $ascii));
- }
+ if ($ascii < 32 || $ascii === 61 || $ascii > 126)
+ {
+ $char = "=".strtoupper(sprintf("%02X", $ascii));
+ }
- // Do not use dol_strlen here, we need number of bytes
- if ((strlen($newpara) + strlen($char)) >= 76 )
- {
- // New line with carray-return (CR) and line-feed (LF)
- $out .= $newpara . "=" . "\r\n";
+ // Do not use dol_strlen here, we need number of bytes
+ if ((strlen($newpara) + strlen($char)) >= 76)
+ {
+ // New line with carray-return (CR) and line-feed (LF)
+ $out .= $newpara."="."\r\n";
- // extra space for cal
- if ($forcal)
- $out .= " ";
+ // extra space for cal
+ if ($forcal)
+ $out .= " ";
- $newpara = "";
- }
+ $newpara = "";
+ }
- $newpara .= $char;
- }
+ $newpara .= $char;
+ }
- $out .= $newpara;
- }
- return trim($out);
+ $out .= $newpara;
+ }
+ return trim($out);
}
/**
@@ -610,5 +611,5 @@ function quotedPrintEncode($str, $forcal = 0)
*/
function quotedPrintDecode($str)
{
- return trim(quoted_printable_decode(preg_replace("/=\r?\n/", "", $str)));
+ return trim(quoted_printable_decode(preg_replace("/=\r?\n/", "", $str)));
}
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 861c31a0e37..ea3fa2f3a19 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -35,15 +35,15 @@
*/
function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotest = 1)
{
- global $db,$conf,$langs;
+ global $db, $conf, $langs;
// Force master entity in transversal mode
- $entity=$entitytotest;
- if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+ $entity = $entitytotest;
+ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
- $login='';
+ $login = '';
- if (! empty($usertotest))
+ if (!empty($usertotest))
{
dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
@@ -53,51 +53,51 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
$usernamecol2 = 'email';
$entitycol = 'entity';
- $sql ='SELECT rowid, login, entity, pass, pass_crypted';
- $sql.=' FROM '.$table;
- $sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
- if (preg_match('/@/', $usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
- $sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
- $sql.=' AND statut = 1';
+ $sql = 'SELECT rowid, login, entity, pass, pass_crypted';
+ $sql .= ' FROM '.$table;
+ $sql .= ' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
+ if (preg_match('/@/', $usertotest)) $sql .= ' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+ $sql .= ') AND '.$entitycol." IN (0,".($entity ? $entity : 1).")";
+ $sql .= ' AND statut = 1';
// Required to first found the user into entity, then the superadmin.
// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
- $sql.=' ORDER BY entity DESC';
+ $sql .= ' ORDER BY entity DESC';
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
- $obj=$db->fetch_object($resql);
+ $obj = $db->fetch_object($resql);
if ($obj)
{
- $passclear=$obj->pass;
- $passcrypted=$obj->pass_crypted;
- $passtyped=$passwordtotest;
+ $passclear = $obj->pass;
+ $passcrypted = $obj->pass_crypted;
+ $passtyped = $passwordtotest;
- $passok=false;
+ $passok = false;
// Check crypted password
- $cryptType='';
- if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+ $cryptType = '';
+ if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType = $conf->global->DATABASE_PWD_ENCRYPTED;
// By default, we used MD5
- if (! in_array($cryptType, array('md5'))) $cryptType='md5';
+ if (!in_array($cryptType, array('md5'))) $cryptType = 'md5';
// Check crypted password according to crypt algorithm
if ($cryptType == 'md5')
{
if (dol_verifyHash($passtyped, $passcrypted))
{
- $passok=true;
+ $passok = true;
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
}
}
// For compatibility with old versions
- if (! $passok)
+ if (!$passok)
{
- if ((! $passcrypted || $passtyped)
+ if ((!$passcrypted || $passtyped)
&& ($passclear && ($passtyped == $passclear)))
{
- $passok=true;
+ $passok = true;
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
}
}
@@ -105,31 +105,31 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
// Password ok ?
if ($passok)
{
- $login=$obj->login;
+ $login = $obj->login;
}
else
{
- sleep(2); // Anti brut force protection
+ sleep(2); // Anti brut force protection
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
// Load translation files required by the page
$langs->loadLangs(array('main', 'errors'));
- $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+ $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
}
// We must check entity
- if ($passok && ! empty($conf->multicompany->enabled)) // We must check entity
+ if ($passok && !empty($conf->multicompany->enabled)) // We must check entity
{
global $mc;
- if (! isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
+ if (!isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
else
{
$ret = $mc->checkRight($obj->rowid, $entitytotest);
if ($ret < 0)
{
- dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'", LOG_NOTICE);
+ dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO entity '".$entitytotest."' not allowed for user '".$obj->rowid."'", LOG_NOTICE);
$login = ''; // force authentication failure
}
}
@@ -143,14 +143,14 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
// Load translation files required by the page
$langs->loadLangs(array('main', 'errors'));
- $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+ $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
}
}
else
{
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO db error for '".$usertotest."' error=".$db->lasterror(), LOG_ERR);
sleep(1);
- $_SESSION["dol_loginmesg"]=$db->lasterror();
+ $_SESSION["dol_loginmesg"] = $db->lasterror();
}
}
diff --git a/htdocs/core/login/functions_empty.php b/htdocs/core/login/functions_empty.php
index 3a28c6c2f94..c23f401f8f3 100644
--- a/htdocs/core/login/functions_empty.php
+++ b/htdocs/core/login/functions_empty.php
@@ -37,8 +37,8 @@ function check_user_password_empty($usertotest, $passwordtotest, $entitytotest)
dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);
- $login='';
- $_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");
+ $login = '';
+ $_SESSION["dol_loginmesg"] = $langs->trans("FailedToLogin");
return $login;
}
diff --git a/htdocs/core/login/functions_forceuser.php b/htdocs/core/login/functions_forceuser.php
index 702c6fa80b3..91040f98f8c 100644
--- a/htdocs/core/login/functions_forceuser.php
+++ b/htdocs/core/login/functions_forceuser.php
@@ -39,10 +39,10 @@ function check_user_password_forceuser($usertotest, $passwordtotest, $entitytote
dol_syslog("functions_forceuser::check_user_password_forceuser");
- $login=$dolibarr_auto_user;
- if (empty($login)) $login='auto';
+ $login = $dolibarr_auto_user;
+ if (empty($login)) $login = 'auto';
- if ($_SESSION["dol_loginmesg"]) $login='';
+ if ($_SESSION["dol_loginmesg"]) $login = '';
dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);
return $login;
diff --git a/htdocs/core/login/functions_http.php b/htdocs/core/login/functions_http.php
index 9a65200856f..45167fc21c9 100644
--- a/htdocs/core/login/functions_http.php
+++ b/htdocs/core/login/functions_http.php
@@ -33,12 +33,12 @@
*/
function check_user_password_http($usertotest, $passwordtotest, $entitytotest)
{
- dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"])?'':$_SERVER["REMOTE_USER"]));
+ dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));
- $login='';
- if (! empty($_SERVER["REMOTE_USER"]))
+ $login = '';
+ if (!empty($_SERVER["REMOTE_USER"]))
{
- $login=$_SERVER["REMOTE_USER"];
+ $login = $_SERVER["REMOTE_USER"];
}
return $login;
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 81bbfdf5b84..3a8b274c109 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -34,23 +34,23 @@
*/
function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
{
- global $db,$conf,$langs;
+ global $db, $conf, $langs;
global $_POST;
- global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;
- global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;
- global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;
- global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;
+ global $dolibarr_main_auth_ldap_host, $dolibarr_main_auth_ldap_port;
+ global $dolibarr_main_auth_ldap_version, $dolibarr_main_auth_ldap_servertype;
+ global $dolibarr_main_auth_ldap_login_attribute, $dolibarr_main_auth_ldap_dn;
+ global $dolibarr_main_auth_ldap_admin_login, $dolibarr_main_auth_ldap_admin_pass;
global $dolibarr_main_auth_ldap_filter;
global $dolibarr_main_auth_ldap_debug;
// Force master entity in transversal mode
- $entity=$entitytotest;
- if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+ $entity = $entitytotest;
+ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
- $login='';
- $resultFetchUser='';
+ $login = '';
+ $resultFetchUser = '';
- if (! function_exists("ldap_connect"))
+ if (!function_exists("ldap_connect"))
{
dol_syslog("functions_ldap::check_user_password_ldap Authentication KO failed to connect to LDAP. LDAP functions are disabled on this PHP", LOG_ERR);
sleep(1);
@@ -58,7 +58,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
// Load translation files required by the page
$langs->loadLangs(array('main', 'other'));
- $_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
+ $_SESSION["dol_loginmesg"] = $langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
return;
}
@@ -67,27 +67,27 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
- $ldaphost=$dolibarr_main_auth_ldap_host;
- $ldapport=$dolibarr_main_auth_ldap_port;
- $ldapversion=$dolibarr_main_auth_ldap_version;
- $ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
+ $ldaphost = $dolibarr_main_auth_ldap_host;
+ $ldapport = $dolibarr_main_auth_ldap_port;
+ $ldapversion = $dolibarr_main_auth_ldap_version;
+ $ldapservertype = (empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
- $ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;
- $ldapdn=$dolibarr_main_auth_ldap_dn;
- $ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;
- $ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
- $ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
+ $ldapuserattr = $dolibarr_main_auth_ldap_login_attribute;
+ $ldapdn = $dolibarr_main_auth_ldap_dn;
+ $ldapadminlogin = $dolibarr_main_auth_ldap_admin_login;
+ $ldapadminpass = $dolibarr_main_auth_ldap_admin_pass;
+ $ldapdebug = (empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug == "false" ? false : true);
if ($ldapdebug) print "DEBUG: Logging LDAP steps';
+ print ' ';
print '';
print $text;
print ' ';
@@ -284,12 +284,12 @@ function print_end_menu_array_auguria()
*/
function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)
{
- global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
+ global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc;
$newmenu = $menu;
- $mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
- $leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
+ $mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]);
+ $leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]));
global $usemenuhider;
$usemenuhider = 0;
@@ -318,18 +318,18 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
// We update newmenu with entries found into database
$menuArbo = new Menubase($db, 'auguria');
- $newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->socid?1:0), 'auguria', $tabMenu);
+ $newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->socid ? 1 : 0), 'auguria', $tabMenu);
// We update newmenu for special dynamic menus
if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank') // Entry for each bank account
{
- include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
+ include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
$sql = "SELECT rowid, label, courant, rappro, courant";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
- $sql.= " WHERE entity = ".$conf->entity;
- $sql.= " AND clos = 0";
- $sql.= " ORDER BY label";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
+ $sql .= " WHERE entity = ".$conf->entity;
+ $sql .= " AND clos = 0";
+ $sql .= " ORDER BY label";
$resql = $db->query($sql);
if ($resql)
@@ -354,16 +354,16 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
$db->free($resql);
}
- if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') // Entry in accountancy journal for each bank account
+ if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') // Entry in accountancy journal for each bank account
{
$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy');
// Multi journal
$sql = "SELECT rowid, code, label, nature";
- $sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
- $sql.= " WHERE entity = ".$conf->entity;
- $sql.= " AND active = 1";
- $sql.= " ORDER BY label DESC";
+ $sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+ $sql .= " WHERE entity = ".$conf->entity;
+ $sql .= " AND active = 1";
+ $sql .= " ORDER BY label DESC";
$resql = $db->query($sql);
if ($resql)
@@ -377,27 +377,27 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
{
$objp = $db->fetch_object($resql);
- $nature='';
+ $nature = '';
// Must match array $sourceList defined into journals_list.php
- if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";
- if ($objp->nature == 3 && ! empty($conf->fournisseur->enabled)) $nature="purchases";
- if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
- if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
- if ($objp->nature == 1) $nature="various";
- if ($objp->nature == 8) $nature="inventory";
- if ($objp->nature == 9) $nature="hasnew";
+ if ($objp->nature == 2 && !empty($conf->facture->enabled)) $nature = "sells";
+ if ($objp->nature == 3 && !empty($conf->fournisseur->enabled)) $nature = "purchases";
+ if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
+ if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) $nature = "expensereports";
+ if ($objp->nature == 1) $nature = "various";
+ if ($objp->nature == 8) $nature = "inventory";
+ if ($objp->nature == 9) $nature = "hasnew";
// To enable when page exists
if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
{
- if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature='';
+ if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature = '';
}
if ($nature)
{
$langs->load('accountancy');
- $journallabel=$langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
+ $journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
}
$i++;
@@ -443,7 +443,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
*/
}
- if (! empty($conf->ftp->enabled) && $mainmenu == 'ftp') // Entry for FTP
+ if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') // Entry for FTP
{
$MAXFTP = 20;
$i = 1;
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index adee27687dd..0b08dce9beb 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -33,9 +33,9 @@ class MenuManager
*/
public $db;
- public $type_user; // Put 0 for internal users, 1 for external users
- public $atarget=""; // To store default target to use onto links
- public $name="auguria";
+ public $type_user; // Put 0 for internal users, 1 for external users
+ public $atarget = ""; // To store default target to use onto links
+ public $name = "auguria";
public $menu_array;
public $menu_array_after;
@@ -51,8 +51,8 @@ class MenuManager
*/
public function __construct($db, $type_user)
{
- $this->type_user=$type_user;
- $this->db=$db;
+ $this->type_user = $type_user;
+ $this->db = $db;
}
@@ -68,50 +68,50 @@ class MenuManager
global $conf, $user, $langs;
// On sauve en session le menu principal choisi
- if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
- if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"];
+ if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"] = $_GET["mainmenu"];
+ if (isset($_GET["idmenu"])) $_SESSION["idmenu"] = $_GET["idmenu"];
// Read mainmenu and leftmenu that define which menu to show
if (isset($_GET["mainmenu"]))
{
// On sauve en session le menu principal choisi
- $mainmenu=$_GET["mainmenu"];
- $_SESSION["mainmenu"]=$mainmenu;
- $_SESSION["leftmenuopened"]="";
+ $mainmenu = $_GET["mainmenu"];
+ $_SESSION["mainmenu"] = $mainmenu;
+ $_SESSION["leftmenuopened"] = "";
}
else
{
// On va le chercher en session si non defini par le lien
- $mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
+ $mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
}
- if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
+ if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
if (isset($_GET["leftmenu"]))
{
// On sauve en session le menu principal choisi
- $leftmenu=$_GET["leftmenu"];
- $_SESSION["leftmenu"]=$leftmenu;
+ $leftmenu = $_GET["leftmenu"];
+ $_SESSION["leftmenu"] = $leftmenu;
- if ($_SESSION["leftmenuopened"]==$leftmenu) // To collapse
+ if ($_SESSION["leftmenuopened"] == $leftmenu) // To collapse
{
//$leftmenu="";
- $_SESSION["leftmenuopened"]="";
+ $_SESSION["leftmenuopened"] = "";
}
else
{
- $_SESSION["leftmenuopened"]=$leftmenu;
+ $_SESSION["leftmenuopened"] = $leftmenu;
}
} else {
// On va le chercher en session si non defini par le lien
- $leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
+ $leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
}
- if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+ if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
- $tabMenu=array();
+ $tabMenu = array();
$menuArbo = new Menubase($this->db, 'auguria');
$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
- $this->tabMenu=$tabMenu;
+ $this->tabMenu = $tabMenu;
//var_dump($tabMenu);
//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
@@ -134,12 +134,12 @@ class MenuManager
if ($this->type_user == 1)
{
- $conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
- $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
+ $conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+ $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
}
require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
- $this->menu=new Menu();
+ $this->menu = new Menu();
if (empty($conf->global->MAIN_MENU_INVERT))
{
@@ -148,7 +148,7 @@ class MenuManager
}
else
{
- $conf->global->MAIN_SHOW_LOGO=0;
+ $conf->global->MAIN_SHOW_LOGO = 0;
if ($mode == 'top') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
}
@@ -167,18 +167,18 @@ class MenuManager
//var_dump($this->menu->liste);exit;
$lastlevel = array();
print ''."\n";
- foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+ foreach ($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{
print '
'."\n";
- if (! $nonext || ($nonext == '2'))
+ if (!$nonext || ($nonext == '2'))
{
print '';
if ($nonext == '2')
{
- print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"])?$_SERVER["REQUEST_URI"].'&ignoreerrors=1':'').'
';
if ($withpleasewait) print ''.$langs->trans("NextStepMightLastALongTime").'
'.$langs->trans("PleaseBePatient").'