';
// Adds a line numbering column
-if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
- print '| '.($i+1).' | ';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+ print ''.($i + 1).' | ';
$coldisplay++;
}
@@ -82,8 +82,8 @@ if ($line->fk_product > 0) {
if (is_object($hookmanager))
{
$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
- $parameters=array('line'=>$line,'fk_parent_line'=>$fk_parent_line,'var'=>$var,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer);
- $reshook=$hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
+ $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
+ $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
}
print '';
@@ -104,7 +104,7 @@ if (($line->info_bits & 2) != 2) {
// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
// must also not be output for most entities (proposal, intervention, ...)
//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
- print '';
+ print '';
}
print '';
@@ -117,20 +117,20 @@ if ($conf->global->PRODUCT_USE_UNITS)
}
$coldisplay++;
-print 'qty_frozen?' checked="checked"':'')).'>';
+print ' | qty_frozen ? ' checked="checked"' : '')).'>';
print ' | ';
$coldisplay++;
-print 'disable_stock_change?' checked="checked"':'')).'">';
+print ' | disable_stock_change ? ' checked="checked"' : '')).'">';
print ' | ';
$coldisplay++;
print '';
print ' | ';
-$coldisplay+=$colspan;
+$coldisplay += $colspan;
print '';
-$coldisplay+=$colspan;
+$coldisplay += $colspan;
print '';
print '
';
print '';
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index ce440dbaab6..b6197342136 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -34,7 +34,7 @@
*/
// Protection to avoid direct call of template
-if (empty($object) || ! is_object($object))
+if (empty($object) || !is_object($object))
{
print "Error, template page can't be called as URL";
exit;
@@ -46,7 +46,7 @@ print "\n";
print '';
// Adds a line numbering column
-if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '| | ';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print ' | ';
// Description
print ''.$langs->trans('Description').' | ';
@@ -71,7 +71,7 @@ print ''.$form->textwithpicto($langs->trans(
// Cost
print ' | '.$langs->trans('CostPrice').' | ';
-print ' | '; // No width to allow autodim
+print ' | '; // No width to allow autodim
print ' | ';
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 1419136a2e8..667c66848ae 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -95,7 +95,7 @@ echo $line->qty_frozen ? yn($line->qty_frozen) : '';
print '';
print '';
$coldisplay++;
-echo $line->disable_stock_change ? yn($line->disable_stock_change) : ''; // Yes, it is a quantity, not a price, but we just want the formating role of function price
+echo $line->disable_stock_change ? yn($line->disable_stock_change) : ''; // Yes, it is a quantity, not a price, but we just want the formating role of function price
print ' | ';
print '';
@@ -108,10 +108,10 @@ $coldisplay++;
echo price($line->total_cost);
print ' | ';
-if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines' ) {
+if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
print '';
$coldisplay++;
- if (($line->info_bits & 2) == 2 || ! empty($disableedit)) {
+ if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
} else {
print 'id.'#line_'.$line->id.'">'.img_edit().'';
}
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index b2c7d227b38..bc0c0c37fc2 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -31,16 +31,16 @@ $langs->load("admin");
if (!$user->admin)
accessforbidden();
-$action=GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
if ($action == 'setvalue')
{
$showmenu = GETPOST('BOOKMARKS_SHOW_IN_MENU', 'alpha');
$res = dolibarr_set_const($db, "BOOKMARKS_SHOW_IN_MENU", $showmenu, 'chaine', 0, '', $conf->entity);
- if (! $res > 0) $error++;
+ if (!$res > 0) $error++;
- if (! $error)
+ if (!$error)
{
$db->commit();
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -59,7 +59,7 @@ if ($action == 'setvalue')
llxHeader();
-$linkback=''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans("BookmarkSetup"), $linkback, 'title_setup');
print $langs->trans("BookmarkDesc")."
\n";
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 699065520da..46e9ca315a5 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -60,7 +60,7 @@ function printDropdownBookmarksList()
}
$searchForm = ''."\n";
- $searchForm .= '';
// Generate the return string
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$html = $searchForm;
- $html.='
+ $html .= '
';
print ' | ';
- print '';
+ print ' | ';
print ' ';
print ' | ';
print ' ';
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 28607ecca26..d728ac2a71b 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -44,10 +44,10 @@ function valeur($sql)
$valeur = 0;
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
- $obj=$db->fetch_object($resql);
+ $obj = $db->fetch_object($resql);
$valeur = $obj->amount;
$db->free($resql);
}
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index a4c57a60fdd..042117808d5 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -31,15 +31,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->loadLangs(array('banks', 'categories'));
// Security check
-if ($user->socid) $socid=$user->socid;
-$result=restrictedArea($user, 'banque');
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'banque');
/*
* View
*/
-$companystatic=new Societe($db);
+$companystatic = new Societe($db);
llxHeader();
@@ -55,14 +55,14 @@ print ''.$langs->trans("Average").' | ';
print "\n";
$sql = "SELECT sum(d.amount) as somme, count(*) as nombre, c.label, c.rowid ";
-$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ as c";
-$sql.= ", ".MAIN_DB_PREFIX."bank_class as l";
-$sql.= ", ".MAIN_DB_PREFIX."bank as d";
-$sql.= " WHERE c.entity = ".$conf->entity;
-$sql.= " AND c.rowid = l.fk_categ";
-$sql.= " AND d.rowid = l.lineid";
-$sql.= " GROUP BY c.label, c.rowid";
-$sql.= " ORDER BY c.label";
+$sql .= " FROM ".MAIN_DB_PREFIX."bank_categ as c";
+$sql .= ", ".MAIN_DB_PREFIX."bank_class as l";
+$sql .= ", ".MAIN_DB_PREFIX."bank as d";
+$sql .= " WHERE c.entity = ".$conf->entity;
+$sql .= " AND c.rowid = l.fk_categ";
+$sql .= " AND d.rowid = l.lineid";
+$sql .= " GROUP BY c.label, c.rowid";
+$sql .= " ORDER BY c.label";
$result = $db->query($sql);
if ($result)
@@ -88,7 +88,7 @@ if ($result)
print '| '.$langs->trans("Total").' | ';
print ''.price($total).' | ';
- print ''.price($totalnb?price2num($total / $totalnb, 'MT'):0).' | ';
+ print ''.price($totalnb ?price2num($total / $totalnb, 'MT') : 0).' | ';
}
else
{
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 60d7c4f2463..cba83d8f015 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1188,34 +1188,34 @@ class Account extends CommonObject
// phpcs:enable
global $conf, $langs;
- if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+ if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
$sql = "SELECT b.rowid, b.datev as datefin";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
- $sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.rappro=0";
- $sql.= " AND b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
- $sql.= " AND clos = 0";
- if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b,";
+ $sql .= " ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.rappro=0";
+ $sql .= " AND b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
+ $sql .= " AND clos = 0";
+ if ($filteraccountid) $sql .= " AND ba.rowid = ".$filteraccountid;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$langs->load("banks");
- $now=dol_now();
+ $now = dol_now();
require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
$response = new WorkboardResponse();
- $response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
- $response->label=$langs->trans("TransactionsToConciliate");
+ $response->warning_delay = $conf->bank->rappro->warning_delay / 60 / 60 / 24;
+ $response->label = $langs->trans("TransactionsToConciliate");
$response->labelShort = $langs->trans("TransactionsToConciliateShort");
- $response->url=DOL_URL_ROOT.'/compta/bank/list.php?leftmenu=bank&mainmenu=bank';
- $response->img=img_object('', "payment");
+ $response->url = DOL_URL_ROOT.'/compta/bank/list.php?leftmenu=bank&mainmenu=bank';
+ $response->img = img_object('', "payment");
- while ($obj=$this->db->fetch_object($resql))
+ while ($obj = $this->db->fetch_object($resql))
{
$response->nbtodo++;
if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->rappro->warning_delay)) {
@@ -1244,30 +1244,30 @@ class Account extends CommonObject
// phpcs:enable
global $user;
- if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+ if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
$sql = "SELECT count(b.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
- $sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
- $sql.= " AND clos = 0";
- if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b,";
+ $sql .= " ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
+ $sql .= " AND clos = 0";
+ if ($filteraccountid) $sql .= " AND ba.rowid = ".$filteraccountid;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- while ($obj=$this->db->fetch_object($resql))
+ while ($obj = $this->db->fetch_object($resql))
{
- $this->nb["banklines"]=$obj->nb;
+ $this->nb["banklines"] = $obj->nb;
}
$this->db->free($resql);
}
else
{
dol_print_error($this->db);
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 1272cfcad85..2fb97ff949c 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -66,32 +66,32 @@ class BankAccounts extends DolibarrApi
{
$list = array();
- if (! DolibarrApiAccess::$user->rights->banque->lire) {
+ if (!DolibarrApiAccess::$user->rights->banque->lire) {
throw new RestException(401);
}
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank_account as t";
- $sql.= ' WHERE t.entity IN ('.getEntity('bank_account').')';
+ $sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
// Add sql filters
if ($sqlfilters)
{
- if (! DolibarrApi::_checkFilters($sqlfilters))
+ if (!DolibarrApi::_checkFilters($sqlfilters))
{
throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
}
- $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
- $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+ $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
- $sql.= $this->db->order($sortfield, $sortorder);
- if ($limit) {
+ $sql .= $this->db->order($sortfield, $sortorder);
+ if ($limit) {
if ($page < 0)
{
$page = 0;
}
$offset = $limit * $page;
- $sql.= $this->db->plimit($limit + 1, $offset);
+ $sql .= $this->db->plimit($limit + 1, $offset);
}
dol_syslog("API Rest request");
@@ -108,7 +108,7 @@ class BankAccounts extends DolibarrApi
}
}
} else {
- throw new RestException(503, 'Error when retrieving list of accounts: ' . $this->db->lasterror());
+ throw new RestException(503, 'Error when retrieving list of accounts: '.$this->db->lasterror());
}
return $list;
@@ -124,13 +124,13 @@ class BankAccounts extends DolibarrApi
*/
public function get($id)
{
- if (! DolibarrApiAccess::$user->rights->banque->lire) {
+ if (!DolibarrApiAccess::$user->rights->banque->lire) {
throw new RestException(401);
}
$account = new Account($this->db);
$result = $account->fetch($id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'account not found');
}
@@ -145,7 +145,7 @@ class BankAccounts extends DolibarrApi
*/
public function post($request_data = null)
{
- if (! DolibarrApiAccess::$user->rights->banque->configurer) {
+ if (!DolibarrApiAccess::$user->rights->banque->configurer) {
throw new RestException(401);
}
// Check mandatory fields
@@ -190,7 +190,7 @@ class BankAccounts extends DolibarrApi
*/
public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0)
{
- if (! DolibarrApiAccess::$user->rights->banque->configurer) {
+ if (!DolibarrApiAccess::$user->rights->banque->configurer) {
throw new RestException(401);
}
@@ -235,14 +235,14 @@ class BankAccounts extends DolibarrApi
$user = DolibarrApiAccess::$user;
// By default, electronic transfert from bank to bank
- $typefrom='PRE';
- $typeto='VIR';
+ $typefrom = 'PRE';
+ $typeto = 'VIR';
if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
{
// This is transfer of change
- $typefrom='LIQ';
- $typeto='LIQ';
+ $typefrom = 'LIQ';
+ $typeto = 'LIQ';
}
/**
@@ -250,7 +250,7 @@ class BankAccounts extends DolibarrApi
*/
if (!$error) {
- $bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1*price2num($amount), '', '', $user);
+ $bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1 * price2num($amount), '', '', $user);
}
if (!($bank_line_id_from > 0)) {
$error++;
@@ -312,13 +312,13 @@ class BankAccounts extends DolibarrApi
*/
public function put($id, $request_data = null)
{
- if (! DolibarrApiAccess::$user->rights->banque->configurer) {
+ if (!DolibarrApiAccess::$user->rights->banque->configurer) {
throw new RestException(401);
}
$account = new Account($this->db);
$result = $account->fetch($id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'account not found');
}
@@ -345,12 +345,12 @@ class BankAccounts extends DolibarrApi
*/
public function delete($id)
{
- if (! DolibarrApiAccess::$user->rights->banque->configurer) {
+ if (!DolibarrApiAccess::$user->rights->banque->configurer) {
throw new RestException(401);
}
$account = new Account($this->db);
$result = $account->fetch($id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'account not found');
}
@@ -378,7 +378,7 @@ class BankAccounts extends DolibarrApi
{
$account = array();
foreach (BankAccounts::$FIELDS as $field) {
- if (! isset($data[$field]))
+ if (!isset($data[$field]))
throw new RestException(400, "$field field missing");
$account[$field] = $data[$field];
}
@@ -417,13 +417,13 @@ class BankAccounts extends DolibarrApi
{
$list = array();
- if (! DolibarrApiAccess::$user->rights->banque->lire) {
+ if (!DolibarrApiAccess::$user->rights->banque->lire) {
throw new RestException(401);
}
$account = new Account($this->db);
$result = $account->fetch($id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'account not found');
}
@@ -433,12 +433,12 @@ class BankAccounts extends DolibarrApi
// Add sql filters
if ($sqlfilters)
{
- if (! DolibarrApi::_checkFilters($sqlfilters))
+ if (!DolibarrApi::_checkFilters($sqlfilters))
{
throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
}
- $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
- $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+ $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
$sql .= " ORDER BY rowid";
@@ -455,7 +455,7 @@ class BankAccounts extends DolibarrApi
}
}
} else {
- throw new RestException(503, 'Error when retrieving list of account lines: ' . $accountLine->error);
+ throw new RestException(503, 'Error when retrieving list of account lines: '.$accountLine->error);
}
return $list;
@@ -479,13 +479,13 @@ class BankAccounts extends DolibarrApi
*/
public function addLine($id, $date, $type, $label, $amount, $category = 0, $cheque_number = '', $cheque_writer = '', $cheque_bank = '')
{
- if (! DolibarrApiAccess::$user->rights->banque->modifier) {
+ if (!DolibarrApiAccess::$user->rights->banque->modifier) {
throw new RestException(401);
}
$account = new Account($this->db);
$result = $account->fetch($id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'account not found');
}
@@ -500,7 +500,7 @@ class BankAccounts extends DolibarrApi
$cheque_writer, $cheque_bank
);
if ($result < 0) {
- throw new RestException(503, 'Error when adding line to account: ' . $account->error);
+ throw new RestException(503, 'Error when adding line to account: '.$account->error);
}
return $result;
}
@@ -520,25 +520,25 @@ class BankAccounts extends DolibarrApi
*/
public function addLink($id, $line_id, $url_id, $url, $label, $type)
{
- if (! DolibarrApiAccess::$user->rights->banque->modifier) {
+ if (!DolibarrApiAccess::$user->rights->banque->modifier) {
throw new RestException(401);
}
$account = new Account($this->db);
$result = $account->fetch($id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'account not found');
}
$accountLine = new AccountLine($this->db);
$result = $accountLine->fetch($line_id);
- if (! $result) {
+ if (!$result) {
throw new RestException(404, 'account line not found');
}
$result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
if ($result < 0) {
- throw new RestException(503, 'Error when adding link to account line: ' . $account->error);
+ throw new RestException(503, 'Error when adding link to account line: '.$account->error);
}
return $result;
}
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 92e16211ce0..c7e86e51cfb 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -33,7 +33,7 @@ class BankCateg // extends CommonObject
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
- public $picto='generic';
+ public $picto = 'generic';
/**
* @var int ID
@@ -211,10 +211,10 @@ class BankCateg // extends CommonObject
$this->db->begin();
// Delete link between tag and bank account
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
- $sql.= " WHERE fk_categorie = ".$this->id;
+ $sql .= " WHERE fk_categorie = ".$this->id;
$resql = $this->db->query($sql);
if (!$resql)
@@ -225,10 +225,10 @@ class BankCateg // extends CommonObject
}
// Delete link between tag and bank lines
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
- $sql.= " WHERE fk_categ = ".$this->id;
+ $sql .= " WHERE fk_categ = ".$this->id;
$resql = $this->db->query($sql);
if (!$resql)
@@ -239,7 +239,7 @@ class BankCateg // extends CommonObject
}
// Delete bank categ
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
$sql .= " WHERE rowid=".$this->id;
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 58e01ec2f28..6af394ad4b4 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -23,7 +23,7 @@
*/
// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
/**
@@ -34,12 +34,12 @@ class PaymentVarious extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='variouspayment';
+ public $element = 'variouspayment';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='payment_various';
+ public $table_element = 'payment_various';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -118,12 +118,12 @@ class PaymentVarious 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->fk_bank = (int) $this->fk_bank;
$this->fk_user_author = (int) $this->fk_user_author;
$this->fk_user_modif = (int) $this->fk_user_modif;
@@ -132,40 +132,40 @@ class PaymentVarious extends CommonObject
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."payment_various SET";
- if ($this->tms) $sql.= " tms='".$this->db->idate($this->tms)."',";
- $sql.= " datep='".$this->db->idate($this->datep)."',";
- $sql.= " datev='".$this->db->idate($this->datev)."',";
- $sql.= " sens=".(int) $this->sens.",";
- $sql.= " amount=".price2num($this->amount).",";
- $sql.= " fk_typepayment=".(int) $this->fk_typepayment.",";
- $sql.= " num_payment='".$this->db->escape($this->num_payment)."',";
- $sql.= " label='".$this->db->escape($this->label)."',";
- $sql.= " note='".$this->db->escape($this->note)."',";
- $sql.= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
- $sql.= " subledger_account='".$this->db->escape($this->subledger_account)."',";
- $sql.= " fk_projet='".$this->db->escape($this->fk_project)."',";
- $sql.= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank:"null").",";
- $sql.= " fk_user_author=".(int) $this->fk_user_author.",";
- $sql.= " fk_user_modif=".(int) $this->fk_user_modif;
- $sql.= " WHERE rowid=".$this->id;
+ if ($this->tms) $sql .= " tms='".$this->db->idate($this->tms)."',";
+ $sql .= " datep='".$this->db->idate($this->datep)."',";
+ $sql .= " datev='".$this->db->idate($this->datev)."',";
+ $sql .= " sens=".(int) $this->sens.",";
+ $sql .= " amount=".price2num($this->amount).",";
+ $sql .= " fk_typepayment=".(int) $this->fk_typepayment.",";
+ $sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
+ $sql .= " label='".$this->db->escape($this->label)."',";
+ $sql .= " note='".$this->db->escape($this->note)."',";
+ $sql .= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
+ $sql .= " subledger_account='".$this->db->escape($this->subledger_account)."',";
+ $sql .= " fk_projet='".$this->db->escape($this->fk_project)."',";
+ $sql .= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank : "null").",";
+ $sql .= " fk_user_author=".(int) $this->fk_user_author.",";
+ $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();
return -1;
}
- if (! $notrigger)
+ if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('PAYMENT_VARIOUS_MODIFY', $user);
+ $result = $this->call_trigger('PAYMENT_VARIOUS_MODIFY', $user);
if ($result < 0) $error++;
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 1;
@@ -189,31 +189,31 @@ class PaymentVarious extends CommonObject
{
global $langs;
$sql = "SELECT";
- $sql.= " v.rowid,";
- $sql.= " v.tms,";
- $sql.= " v.datep,";
- $sql.= " v.datev,";
- $sql.= " v.sens,";
- $sql.= " v.amount,";
- $sql.= " v.fk_typepayment,";
- $sql.= " v.num_payment,";
- $sql.= " v.label,";
- $sql.= " v.note,";
- $sql.= " v.accountancy_code,";
- $sql.= " v.subledger_account,";
- $sql.= " v.fk_projet as fk_project,";
- $sql.= " v.fk_bank,";
- $sql.= " v.fk_user_author,";
- $sql.= " v.fk_user_modif,";
- $sql.= " b.fk_account,";
- $sql.= " b.fk_type,";
- $sql.= " b.rappro";
- $sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
- $sql.= " WHERE v.rowid = ".$id;
+ $sql .= " v.rowid,";
+ $sql .= " v.tms,";
+ $sql .= " v.datep,";
+ $sql .= " v.datev,";
+ $sql .= " v.sens,";
+ $sql .= " v.amount,";
+ $sql .= " v.fk_typepayment,";
+ $sql .= " v.num_payment,";
+ $sql .= " v.label,";
+ $sql .= " v.note,";
+ $sql .= " v.accountancy_code,";
+ $sql .= " v.subledger_account,";
+ $sql .= " v.fk_projet as fk_project,";
+ $sql .= " v.fk_bank,";
+ $sql .= " v.fk_user_author,";
+ $sql .= " v.fk_user_modif,";
+ $sql .= " b.fk_account,";
+ $sql .= " b.fk_type,";
+ $sql .= " b.rappro";
+ $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
+ $sql .= " WHERE v.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))
@@ -247,7 +247,7 @@ class PaymentVarious extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
}
@@ -263,22 +263,22 @@ class PaymentVarious extends CommonObject
{
global $conf, $langs;
- $error=0;
+ $error = 0;
// Call trigger
- $result=$this->call_trigger('PAYMENT_VARIOUS_DELETE', $user);
+ $result = $this->call_trigger('PAYMENT_VARIOUS_DELETE', $user);
if ($result < 0) return -1;
// End call triggers
$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_various";
- $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;
}
@@ -295,20 +295,20 @@ class PaymentVarious extends CommonObject
*/
public function initAsSpecimen()
{
- $this->id=0;
+ $this->id = 0;
- $this->tms='';
- $this->datep='';
- $this->datev='';
- $this->sens='';
- $this->amount='';
- $this->label='';
- $this->accountancy_code='';
- $this->subledger_account='';
- $this->note='';
- $this->fk_bank='';
- $this->fk_user_author='';
- $this->fk_user_modif='';
+ $this->tms = '';
+ $this->datep = '';
+ $this->datev = '';
+ $this->sens = '';
+ $this->amount = '';
+ $this->label = '';
+ $this->accountancy_code = '';
+ $this->subledger_account = '';
+ $this->note = '';
+ $this->fk_bank = '';
+ $this->fk_user_author = '';
+ $this->fk_user_modif = '';
}
/**
@@ -319,38 +319,38 @@ class PaymentVarious extends CommonObject
*/
public function create($user)
{
- global $conf,$langs;
+ global $conf, $langs;
- $error=0;
- $now=dol_now();
+ $error = 0;
+ $now = dol_now();
// Clean parameters
- $this->amount=price2num(trim($this->amount));
- $this->label=trim($this->label);
- $this->note=trim($this->note);
+ $this->amount = price2num(trim($this->amount));
+ $this->label = trim($this->label);
+ $this->note = trim($this->note);
$this->fk_bank = (int) $this->fk_bank;
$this->fk_user_author = (int) $this->fk_user_author;
$this->fk_user_modif = (int) $this->fk_user_modif;
// Check parameters
- if (! $this->label)
+ 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->amount == '')
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
return -5;
}
- 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 -6;
}
- if (! empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+ if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
return -7;
}
@@ -358,39 +358,39 @@ class PaymentVarious extends CommonObject
// Insert into llx_payment_various
$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_various (";
- $sql.= " datep";
- $sql.= ", datev";
- $sql.= ", sens";
- $sql.= ", amount";
- $sql.= ", fk_typepayment";
- $sql.= ", num_payment";
- if ($this->note) $sql.= ", note";
- $sql.= ", label";
- $sql.= ", accountancy_code";
- $sql.= ", subledger_account";
- $sql.= ", fk_projet";
- $sql.= ", fk_user_author";
- $sql.= ", datec";
- $sql.= ", fk_bank";
- $sql.= ", entity";
- $sql.= ")";
- $sql.= " VALUES (";
- $sql.= "'".$this->db->idate($this->datep)."'";
- $sql.= ", '".$this->db->idate($this->datev)."'";
- $sql.= ", '".$this->db->escape($this->sens)."'";
- $sql.= ", ".price2num($this->amount);
- $sql.= ", '".$this->db->escape($this->type_payment)."'";
- $sql.= ", '".$this->db->escape($this->num_payment)."'";
- if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";
- $sql.= ", '".$this->db->escape($this->label)."'";
- $sql.= ", '".$this->db->escape($this->accountancy_code)."'";
- $sql.= ", '".$this->db->escape($this->subledger_account)."'";
- $sql.= ", ".($this->fk_project > 0? $this->fk_project : 0);
- $sql.= ", ".$user->id;
- $sql.= ", '".$this->db->idate($now)."'";
- $sql.= ", NULL";
- $sql.= ", ".$conf->entity;
- $sql.= ")";
+ $sql .= " datep";
+ $sql .= ", datev";
+ $sql .= ", sens";
+ $sql .= ", amount";
+ $sql .= ", fk_typepayment";
+ $sql .= ", num_payment";
+ if ($this->note) $sql .= ", note";
+ $sql .= ", label";
+ $sql .= ", accountancy_code";
+ $sql .= ", subledger_account";
+ $sql .= ", fk_projet";
+ $sql .= ", fk_user_author";
+ $sql .= ", datec";
+ $sql .= ", fk_bank";
+ $sql .= ", entity";
+ $sql .= ")";
+ $sql .= " VALUES (";
+ $sql .= "'".$this->db->idate($this->datep)."'";
+ $sql .= ", '".$this->db->idate($this->datev)."'";
+ $sql .= ", '".$this->db->escape($this->sens)."'";
+ $sql .= ", ".price2num($this->amount);
+ $sql .= ", '".$this->db->escape($this->type_payment)."'";
+ $sql .= ", '".$this->db->escape($this->num_payment)."'";
+ if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+ $sql .= ", '".$this->db->escape($this->label)."'";
+ $sql .= ", '".$this->db->escape($this->accountancy_code)."'";
+ $sql .= ", '".$this->db->escape($this->subledger_account)."'";
+ $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
+ $sql .= ", ".$user->id;
+ $sql .= ", '".$this->db->idate($now)."'";
+ $sql .= ", NULL";
+ $sql .= ", ".$conf->entity;
+ $sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
$result = $this->db->query($sql);
@@ -401,19 +401,19 @@ class PaymentVarious extends CommonObject
if ($this->id > 0)
{
- if (! empty($conf->banque->enabled) && ! empty($this->amount))
+ if (!empty($conf->banque->enabled) && !empty($this->amount))
{
// Insert into 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);
// Insert payment into llx_bank
// Add link 'payment_various' in bank_url between payment and bank transaction
- $sign=1;
- if ($this->sens == '0') $sign=-1;
+ $sign = 1;
+ if ($this->sens == '0') $sign = -1;
$bank_line_id = $acc->addline(
$this->datep,
@@ -433,38 +433,38 @@ class PaymentVarious extends CommonObject
}
else
{
- $this->error=$acc->error;
+ $this->error = $acc->error;
$error++;
}
- if (! $error)
+ if (!$error)
{
// Add link 'payment_various' in bank_url between payment and bank transaction
- $url=DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id=';
+ $url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id=';
- $result=$acc->add_url_line($bank_line_id, $this->id, $url, "(VariousPayment)", "payment_various");
+ $result = $acc->add_url_line($bank_line_id, $this->id, $url, "(VariousPayment)", "payment_various");
if ($result <= 0)
{
- $this->error=$acc->error;
+ $this->error = $acc->error;
$error++;
}
}
if ($result <= 0)
{
- $this->error=$acc->error;
+ $this->error = $acc->error;
$error++;
}
}
// Call trigger
- $result=$this->call_trigger('PAYMENT_VARIOUS_CREATE', $user);
+ $result = $this->call_trigger('PAYMENT_VARIOUS_CREATE', $user);
if ($result < 0) $error++;
// End call triggers
}
else $error++;
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $this->id;
@@ -477,7 +477,7 @@ class PaymentVarious extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
$this->db->rollback();
return -1;
}
@@ -494,7 +494,7 @@ class PaymentVarious extends CommonObject
{
// phpcs:enable
$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_various SET fk_bank = '.$id_bank;
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql .= ' WHERE rowid = '.$this->id;
$result = $this->db->query($sql);
if ($result)
{
@@ -542,27 +542,27 @@ class PaymentVarious extends CommonObject
}
elseif ($mode == 2)
{
- if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
- elseif ($status==1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
- elseif ($status==2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
+ if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
+ elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
+ elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
}
elseif ($mode == 3)
{
- if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
- elseif ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
- elseif ($status==2 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+ if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+ elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+ elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
}
elseif ($mode == 4)
{
- if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
- elseif ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
- elseif ($status==2 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
+ if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+ elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+ elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
}
elseif ($mode == 5)
{
- if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
- elseif ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
- elseif ($status==2 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+ if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+ elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+ elseif ($status == 2 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
}
}
@@ -581,34 +581,34 @@ class PaymentVarious extends CommonObject
global $db, $conf, $langs, $hookmanager;
global $langs;
- if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+ if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
- $result='';
+ $result = '';
- $label=''.$langs->trans("ShowVariousPayment").'';
- $label.= '
';
- $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
+ $label = ''.$langs->trans("ShowVariousPayment").'';
+ $label .= '
';
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
$url = DOL_URL_ROOT.'/compta/bank/various_payment/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("ShowMyObject");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowMyObject");
+ $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 : '').'"';
/*
$hookmanager->initHooks(array('myobjectdao'));
@@ -617,22 +617,22 @@ class PaymentVarious extends CommonObject
if ($reshook > 0) $linkclose = $hookmanager->resPrint;
*/
}
- 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;
//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
global $action;
$hookmanager->initHooks(array('variouspayment'));
- $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
- $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) $result = $hookmanager->resPrint;
else $result .= $hookmanager->resPrint;
@@ -648,8 +648,8 @@ class PaymentVarious extends CommonObject
public function info($id)
{
$sql = 'SELECT v.rowid, v.datec, v.fk_user_author';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_various as v';
- $sql.= ' WHERE v.rowid = '.$id;
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_various as v';
+ $sql .= ' WHERE v.rowid = '.$id;
dol_syslog(get_class($this).'::info', LOG_DEBUG);
$result = $this->db->query($sql);
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 022e1ceea5a..9fd2207f3ec 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -67,7 +67,7 @@ if (!$sortfield)
$sortfield = "name";
$object = new Account($db);
-if ($id > 0 || ! empty($ref)) $object->fetch($id, $ref);
+if ($id > 0 || !empty($ref)) $object->fetch($id, $ref);
$result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
@@ -97,7 +97,7 @@ $form = new Form($db);
if ($id > 0 || !empty($ref)) {
if ($object->fetch($id, $ref)) {
- $upload_dir = $conf->bank->dir_output . '/' . $object->ref;
+ $upload_dir = $conf->bank->dir_output.'/'.$object->ref;
// Onglets
$head = bank_prepare_head($object);
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index ccf677fa2b8..347353be84f 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -257,7 +257,7 @@ else
$show1 = $px1->show();
$px1 = null;
- $graph_datas =null;
+ $graph_datas = null;
$datas = null;
$datamin = null;
$dataall = null;
@@ -395,7 +395,7 @@ else
$show2 = $px2->show();
$px2 = null;
- $graph_datas =null;
+ $graph_datas = null;
$datas = null;
$datamin = null;
$dataall = null;
@@ -509,7 +509,7 @@ else
$show3 = $px3->show();
$px3 = null;
- $graph_datas =null;
+ $graph_datas = null;
$datas = null;
$datamin = null;
$dataall = null;
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 0ed5b4ff003..abab3b4ff9c 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -43,7 +43,7 @@ $object->fetch($id);
$object->info($id);
-$h=0;
+$h = 0;
$head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
$head[$h][1] = $langs->trans("Card");
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index d98a37594b0..515759547a6 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -35,27 +35,27 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
// Load translation files required by the page
$langs->loadLangs(array('banks', 'categories', 'compta', 'bills', 'other'));
-if (! empty($conf->adherent->enabled)) $langs->load("members");
-if (! empty($conf->don->enabled)) $langs->load("donations");
-if (! empty($conf->loan->enabled)) $langs->load("loan");
-if (! empty($conf->salaries->enabled)) $langs->load("salaries");
+if (!empty($conf->adherent->enabled)) $langs->load("members");
+if (!empty($conf->don->enabled)) $langs->load("donations");
+if (!empty($conf->loan->enabled)) $langs->load("loan");
+if (!empty($conf->salaries->enabled)) $langs->load("salaries");
$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
$ref = GETPOST('ref', 'alpha');
-$action=GETPOST('action', 'alpha');
-$confirm=GETPOST('confirm', 'alpha');
-$rowid=GETPOST("rowid", 'int');
-$orig_account=GETPOST("orig_account");
-$backtopage=GETPOST('backtopage', 'alpha');
-$cancel=GETPOST('cancel', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$rowid = GETPOST("rowid", 'int');
+$orig_account = GETPOST("orig_account");
+$backtopage = GETPOST('backtopage', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
// Security check
-$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref :''));
-$fieldtype = (! empty($ref) ? 'ref' :'rowid');
-if ($user->socid) $socid=$user->socid;
-$result=restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '', $fieldtype);
-if (! $user->rights->banque->lire && ! $user->rights->banque->consolidate) accessforbidden();
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '', $fieldtype);
+if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) accessforbidden();
/*
@@ -92,10 +92,10 @@ if ($user->rights->banque->consolidate && $action == 'donext')
if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->banque->modifier)
{
- $cat1=GETPOST("cat1", 'int');
+ $cat1 = GETPOST("cat1", 'int');
if (!empty($rowid) && !empty($cat1)) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid." AND fk_categ = ".$cat1;
- if (! $db->query($sql))
+ if (!$db->query($sql))
{
dol_print_error($db);
}
@@ -108,7 +108,7 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
if ($user->rights->banque->modifier && $action == "update")
{
- $error=0;
+ $error = 0;
$acline = new AccountLine($db);
$acline->fetch($rowid);
@@ -117,7 +117,7 @@ if ($user->rights->banque->modifier && $action == "update")
$acsource->fetch($id);
$actarget = new Account($db);
- if (GETPOST('accountid', 'int') > 0 && ! $acline->rappro && ! $acline->getVentilExportCompta()) // We ask to change bank account
+ if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta()) // We ask to change bank account
{
$actarget->fetch(GETPOST('accountid', 'int'));
}
@@ -132,52 +132,52 @@ if ($user->rights->banque->modifier && $action == "update")
$error++;
}
- if (! $error)
+ if (!$error)
{
$db->begin();
$amount = price2num($_POST['amount']);
$dateop = dol_mktime(12, 0, 0, $_POST["dateomonth"], $_POST["dateoday"], $_POST["dateoyear"]);
- $dateval= dol_mktime(12, 0, 0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
+ $dateval = dol_mktime(12, 0, 0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
- $sql.= " SET ";
+ $sql .= " SET ";
// Always opened
- if (isset($_POST['value'])) $sql.=" fk_type='".$db->escape($_POST['value'])."',";
- if (isset($_POST['num_chq'])) $sql.=" num_chq='".$db->escape($_POST["num_chq"])."',";
- if (isset($_POST['banque'])) $sql.=" banque='".$db->escape($_POST["banque"])."',";
- if (isset($_POST['emetteur'])) $sql.=" emetteur='".$db->escape($_POST["emetteur"])."',";
+ if (isset($_POST['value'])) $sql .= " fk_type='".$db->escape($_POST['value'])."',";
+ if (isset($_POST['num_chq'])) $sql .= " num_chq='".$db->escape($_POST["num_chq"])."',";
+ if (isset($_POST['banque'])) $sql .= " banque='".$db->escape($_POST["banque"])."',";
+ if (isset($_POST['emetteur'])) $sql .= " emetteur='".$db->escape($_POST["emetteur"])."',";
// Blocked when conciliated
- if (! $acline->rappro)
+ if (!$acline->rappro)
{
- if (isset($_POST['label'])) $sql.=" label='".$db->escape($_POST["label"])."',";
- if (isset($_POST['amount'])) $sql.=" amount='".$amount."',";
- if (isset($_POST['dateomonth'])) $sql.=" dateo = '".$db->idate($dateop)."',";
- if (isset($_POST['datevmonth'])) $sql.=" datev = '".$db->idate($dateval)."',";
+ if (isset($_POST['label'])) $sql .= " label='".$db->escape($_POST["label"])."',";
+ if (isset($_POST['amount'])) $sql .= " amount='".$amount."',";
+ if (isset($_POST['dateomonth'])) $sql .= " dateo = '".$db->idate($dateop)."',";
+ if (isset($_POST['datevmonth'])) $sql .= " datev = '".$db->idate($dateval)."',";
}
- $sql.= " fk_account = ".$actarget->id;
- $sql.= " WHERE rowid = ".$acline->id;
+ $sql .= " fk_account = ".$actarget->id;
+ $sql .= " WHERE rowid = ".$acline->id;
$result = $db->query($sql);
- if (! $result)
+ if (!$result)
{
$error++;
}
- if (! $error)
+ if (!$error)
{
- $arrayofcategs=GETPOST('custcats', 'array');
+ $arrayofcategs = GETPOST('custcats', 'array');
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid;
- if (! $db->query($sql))
+ if (!$db->query($sql))
{
$error++;
dol_print_error($db);
}
if (count($arrayofcategs))
{
- foreach($arrayofcategs as $val)
+ foreach ($arrayofcategs as $val)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$rowid.", ".$val.")";
- if (! $db->query($sql))
+ if (!$db->query($sql))
{
$error++;
dol_print_error($db);
@@ -187,7 +187,7 @@ if ($user->rights->banque->modifier && $action == "update")
}
}
- if (! $error)
+ if (!$error)
{
setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
$db->commit();
@@ -203,8 +203,8 @@ if ($user->rights->banque->modifier && $action == "update")
// Reconcile
if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action == 'setreconcile'))
{
- $num_rel=trim($_POST["num_rel"]);
- $rappro=$_POST['reconciled']?1:0;
+ $num_rel = trim($_POST["num_rel"]);
+ $rappro = $_POST['reconciled'] ? 1 : 0;
// Check parameters
if ($rappro && empty($num_rel))
@@ -213,15 +213,15 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
$error++;
}
- if (! $error)
+ if (!$error)
{
$db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
- $sql.= " SET num_releve=".($num_rel?"'".$num_rel."'":"null");
- if (empty($num_rel)) $sql.= ", rappro = 0";
- else $sql.=", rappro = ".$rappro;
- $sql.= " WHERE rowid = ".$rowid;
+ $sql .= " SET num_releve=".($num_rel ? "'".$num_rel."'" : "null");
+ if (empty($num_rel)) $sql .= ", rappro = 0";
+ else $sql .= ", rappro = ".$rappro;
+ $sql .= " WHERE rowid = ".$rowid;
dol_syslog("line.php", LOG_DEBUG);
$result = $db->query($sql);
@@ -267,11 +267,11 @@ $tabs = array(
$sql = "SELECT b.rowid,b.dateo as do,b.datev as dv, b.amount, b.label, b.rappro,";
-$sql.= " b.num_releve, b.fk_user_author, b.num_chq, b.fk_type, b.fk_account, b.fk_bordereau as receiptid,";
-$sql.= " b.emetteur,b.banque";
-$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-$sql.= " WHERE rowid=".$rowid;
-$sql.= " ORDER BY dateo ASC";
+$sql .= " b.num_releve, b.fk_user_author, b.num_chq, b.fk_type, b.fk_account, b.fk_bordereau as receiptid,";
+$sql .= " b.emetteur,b.banque";
+$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+$sql .= " WHERE rowid=".$rowid;
+$sql .= " ORDER BY dateo ASC";
$result = $db->query($sql);
if ($result)
{
@@ -282,14 +282,14 @@ if ($result)
$total = $total + $objp->amount;
- $acct=new Account($db);
+ $acct = new Account($db);
$acct->fetch($objp->fk_account);
$account = $acct->id;
$bankline = new AccountLine($db);
$bankline->fetch($rowid, $ref);
- $links=$acct->get_url($rowid);
+ $links = $acct->get_url($rowid);
$bankline->load_previous_next_ref('', 'rowid');
// Confirmations
@@ -321,7 +321,7 @@ if ($result)
// Bank account
print '| '.$langs->trans("Account").' | ';
print '';
- if (! $objp->rappro && ! $bankline->getVentilExportCompta())
+ if (!$objp->rappro && !$bankline->getVentilExportCompta())
{
$form->select_comptes($acct->id, 'accountid', 0, '', 0);
}
@@ -337,12 +337,12 @@ if ($result)
{
print ' | | '.$langs->trans("Links").' | ';
print '';
- foreach($links as $key=>$val)
+ foreach ($links as $key=>$val)
{
if ($key) print '
';
- if ($links[$key]['type']=='payment') {
+ if ($links[$key]['type'] == 'payment') {
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
- $paymenttmp=new Paiement($db);
+ $paymenttmp = new Paiement($db);
$paymenttmp->fetch($links[$key]['url_id']);
$paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
/*print '';
@@ -351,9 +351,9 @@ if ($result)
print '';*/
print $paymenttmp->getNomUrl(1);
}
- elseif ($links[$key]['type']=='payment_supplier') {
+ elseif ($links[$key]['type'] == 'payment_supplier') {
require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
- $paymenttmp=new PaiementFourn($db);
+ $paymenttmp = new PaiementFourn($db);
$paymenttmp->fetch($links[$key]['url_id']);
$paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
/*print '';
@@ -362,72 +362,72 @@ if ($result)
print '';*/
print $paymenttmp->getNomUrl(1);
}
- elseif ($links[$key]['type']=='company') {
- $societe=new Societe($db);
+ elseif ($links[$key]['type'] == 'company') {
+ $societe = new Societe($db);
$societe->fetch($links[$key]['url_id']);
print $societe->getNomUrl(1);
}
- elseif ($links[$key]['type']=='sc') {
+ elseif ($links[$key]['type'] == 'sc') {
print '';
print img_object($langs->trans('ShowSocialContribution'), 'bill').' ';
- print $langs->trans("SocialContribution").($links[$key]['label']?' - '.$links[$key]['label']:'');
+ print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
print '';
}
- elseif ($links[$key]['type']=='payment_sc') {
+ elseif ($links[$key]['type'] == 'payment_sc') {
print '';
print img_object($langs->trans('ShowPayment'), 'payment').' ';
print $langs->trans("SocialContributionPayment");
print '';
}
- elseif ($links[$key]['type']=='payment_vat') {
+ elseif ($links[$key]['type'] == 'payment_vat') {
print '';
print img_object($langs->trans('ShowVAT'), 'payment').' ';
print $langs->trans("VATPayment");
print '';
}
- elseif ($links[$key]['type']=='payment_salary') {
+ elseif ($links[$key]['type'] == 'payment_salary') {
print '';
print img_object($langs->trans('ShowPaymentSalary'), 'payment').' ';
print $langs->trans("SalaryPayment");
print '';
}
- elseif ($links[$key]['type']=='payment_loan') {
+ elseif ($links[$key]['type'] == 'payment_loan') {
print '';
print img_object($langs->trans('ShowLoanPayment'), 'payment').' ';
print $langs->trans("PaymentLoan");
print '';
}
- elseif ($links[$key]['type']=='loan') {
+ elseif ($links[$key]['type'] == 'loan') {
print '';
print img_object($langs->trans('ShowLoan'), 'bill').' ';
print $langs->trans("Loan");
print '';
}
- elseif ($links[$key]['type']=='member') {
+ elseif ($links[$key]['type'] == 'member') {
print '';
print img_object($langs->trans('ShowMember'), 'user').' ';
print $links[$key]['label'];
print '';
}
- elseif ($links[$key]['type']=='payment_donation') {
+ elseif ($links[$key]['type'] == 'payment_donation') {
print '';
print img_object($langs->trans('ShowDonation'), 'payment').' ';
print $langs->trans("DonationPayment");
print '';
}
- elseif ($links[$key]['type']=='banktransfert') {
+ elseif ($links[$key]['type'] == 'banktransfert') {
print '';
print img_object($langs->trans('ShowTransaction'), 'payment').' ';
print $langs->trans("TransactionOnTheOtherAccount");
print '';
}
- elseif ($links[$key]['type']=='user') {
+ elseif ($links[$key]['type'] == 'user') {
print '';
print img_object($langs->trans('ShowUser'), 'user').' ';
print $langs->trans("User");
print '';
}
- elseif ($links[$key]['type']=='payment_various') {
+ elseif ($links[$key]['type'] == 'payment_various') {
print '';
print img_object($langs->trans('ShowVariousPayment'), 'payment').' ';
print $langs->trans("VariousPayment");
@@ -458,7 +458,7 @@ if ($result)
if ($objp->receiptid)
{
include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
- $receipt=new RemiseCheque($db);
+ $receipt = new RemiseCheque($db);
$receipt->fetch($objp->receiptid);
print ' '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
}
@@ -508,13 +508,13 @@ if ($result)
{
print ' | ';
print $form->selectDate($db->jdate($objp->do), 'dateo', '', '', '', 'update', 1, 0, $objp->rappro);
- if (! $objp->rappro)
+ if (!$objp->rappro)
{
print ' ';
print '';
- print img_edit_remove() . " ";
+ print img_edit_remove()." ";
print '';
- print img_edit_add() ."";
+ print img_edit_add()."";
}
print ' | ';
}
@@ -532,13 +532,13 @@ if ($result)
{
print '';
print $form->selectDate($db->jdate($objp->dv), 'datev', '', '', '', 'update', 1, 0, $objp->rappro);
- if (! $objp->rappro)
+ if (!$objp->rappro)
{
print ' ';
print '';
- print img_edit_remove() . " ";
+ print img_edit_remove()." ";
print '';
- print img_edit_add() ."";
+ print img_edit_add()."";
}
print ' | ';
}
@@ -555,7 +555,7 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
print '';
- print 'rappro?' disabled':'').' value="';
+ print 'rappro ? ' disabled' : '').' value="';
if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
{
// Label generique car entre parentheses. On l'affiche en le traduisant
@@ -589,7 +589,7 @@ if ($result)
if ($user->rights->banque->modifier)
{
print ' | ';
- print 'rappro?' disabled':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
+ print 'rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
print ' | ';
}
else
@@ -601,12 +601,12 @@ if ($result)
print " ";
// Categories
- if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
+ if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
{
$langs->load('categories');
// Bank line
- print '| ' . $form->editfieldkey('RubriquesTransactions', 'custcats', '', $object, 0) . ' | ';
+ print ' | | '.$form->editfieldkey('RubriquesTransactions', 'custcats', '', $object, 0).' | ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, null, null, null, null, "90%");
print " | ";
@@ -647,12 +647,12 @@ if ($result)
print '';
if ($objp->rappro)
{
- print $langs->trans("AccountStatement").' rappro?' disabled':'').'>';
+ print $langs->trans("AccountStatement").' rappro ? ' disabled' : '').'>';
print '';
}
else
{
- print $langs->trans("AccountStatement").' rappro?' disabled':'').'>';
+ print $langs->trans("AccountStatement").' rappro ? ' disabled' : '').'>';
}
if ($objp->num_releve) print ' ('.$langs->trans("AccountStatement").' '.$objp->num_releve.')';
print ' | ';
@@ -667,7 +667,7 @@ if ($result)
if ($user->rights->banque->consolidate)
{
print '';
- print 'rappro?' checked="checked"':'')).'">';
+ print 'rappro ? ' checked="checked"' : '')).'">';
print ' | ';
}
else
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 82cdd4e826a..c737af4a89e 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -205,9 +205,9 @@ $paymentvatstatic = new TVA($db);
$bankstatic = new Account($db);
$banklinestatic = new AccountLine($db);
$remisestatic = new RemiseCheque($db);
-$paymentdonationstatic=new PaymentDonation($db);
-$paymentloanstatic=new PaymentLoan($db);
-$paymentvariousstatic=new PaymentVarious($db);
+$paymentdonationstatic = new PaymentDonation($db);
+$paymentloanstatic = new PaymentLoan($db);
+$paymentvariousstatic = new PaymentVarious($db);
// Must be before button action
$param = '';
@@ -518,28 +518,28 @@ else
print '';
$newline = 0;
}
- elseif ($links[$key]['type']=='payment_donation')
+ elseif ($links[$key]['type'] == 'payment_donation')
{
- $paymentdonationstatic->id=$links[$key]['url_id'];
- $paymentdonationstatic->ref=$langs->trans("Payment");
+ $paymentdonationstatic->id = $links[$key]['url_id'];
+ $paymentdonationstatic->ref = $langs->trans("Payment");
print ' '.$paymentdonationstatic->getNomUrl(1);
$newline = 0;
}
- elseif ($links[$key]['type']=='payment_loan')
+ elseif ($links[$key]['type'] == 'payment_loan')
{
- $paymentloanstatic->id=$links[$key]['url_id'];
- $paymentloanstatic->ref=$langs->trans("Payment");
+ $paymentloanstatic->id = $links[$key]['url_id'];
+ $paymentloanstatic->ref = $langs->trans("Payment");
print ' '.$paymentloanstatic->getNomUrl(1);
$newline = 0;
}
- elseif ($links[$key]['type']=='payment_various')
+ elseif ($links[$key]['type'] == 'payment_various')
{
- $paymentvariousstatic->id=$links[$key]['url_id'];
- $paymentvariousstatic->ref=$langs->trans("Payment");
+ $paymentvariousstatic->id = $links[$key]['url_id'];
+ $paymentvariousstatic->ref = $langs->trans("Payment");
print ' '.$paymentvariousstatic->getNomUrl(1);
$newline = 0;
}
- elseif ($links[$key]['type']=='banktransfert') {
+ elseif ($links[$key]['type'] == 'banktransfert') {
// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
if ($objp->amount > 0)
{
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 611d2fc42b0..cb6073f1109 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
// Load translation files required by the page
$langs->loadLangs(array("banks", "categories", "multicurrency"));
-if (! $user->rights->banque->transfer)
+if (!$user->rights->banque->transfer)
accessforbidden();
$action = GETPOST('action', 'alpha');
@@ -51,46 +51,46 @@ if ($action == 'add')
$dateo = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
$label = GETPOST('label', 'alpha');
- $amount= GETPOST('amount', 'alpha');
- $amountto= GETPOST('amountto', 'alpha');
+ $amount = GETPOST('amount', 'alpha');
+ $amountto = GETPOST('amountto', 'alpha');
- if (! $label)
+ if (!$label)
{
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Description")), null, 'errors');
}
- if (! $amount)
+ if (!$amount)
{
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
}
- if (! GETPOST('account_from', 'int'))
+ if (!GETPOST('account_from', 'int'))
{
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TransferFrom")), null, 'errors');
}
- if (! GETPOST('account_to', 'int'))
+ if (!GETPOST('account_to', 'int'))
{
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TransferTo")), null, 'errors');
}
- if (! $error)
+ if (!$error)
{
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
- $accountfrom=new Account($db);
+ $accountfrom = new Account($db);
$accountfrom->fetch(GETPOST('account_from', 'int'));
- $accountto=new Account($db);
+ $accountto = new Account($db);
$accountto->fetch(GETPOST('account_to', 'int'));
if ($accountto->currency_code == $accountfrom->currency_code)
{
- $amountto=$amount;
+ $amountto = $amount;
}
else
{
- if (! $amountto)
+ if (!$amountto)
{
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AmountTo")), null, 'errors');
@@ -101,31 +101,31 @@ if ($action == 'add')
{
$db->begin();
- $bank_line_id_from=0;
- $bank_line_id_to=0;
- $result=0;
+ $bank_line_id_from = 0;
+ $bank_line_id_to = 0;
+ $result = 0;
// By default, electronic transfert from bank to bank
- $typefrom='PRE';
- $typeto='VIR';
+ $typefrom = 'PRE';
+ $typeto = 'VIR';
if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
{
// This is transfer of change
- $typefrom='LIQ';
- $typeto='LIQ';
+ $typefrom = 'LIQ';
+ $typeto = 'LIQ';
}
- if (! $error) $bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, -1*price2num($amount), '', '', $user);
- if (! ($bank_line_id_from > 0)) $error++;
- if (! $error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amountto), '', '', $user);
- if (! ($bank_line_id_to > 0)) $error++;
+ if (!$error) $bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, -1 * price2num($amount), '', '', $user);
+ if (!($bank_line_id_from > 0)) $error++;
+ if (!$error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amountto), '', '', $user);
+ if (!($bank_line_id_to > 0)) $error++;
- if (! $error) $result=$accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
- if (! ($result > 0)) $error++;
- if (! $error) $result=$accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
- if (! ($result > 0)) $error++;
+ if (!$error) $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
+ if (!($result > 0)) $error++;
+ if (!$error) $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
+ if (!($result > 0)) $error++;
- if (! $error)
+ if (!$error)
{
$mesgs = $langs->trans("TransferFromToDone", ''.$accountfrom->label."", ''.$accountto->label."", $amount, $langs->transnoentities("Currency".$conf->currency));
setEventMessages($mesgs, null, 'mesgs');
@@ -214,17 +214,17 @@ print ' ';
-$form=new Form($db);
+$form = new Form($db);
-$account_from='';
-$account_to='';
-$label='';
-$amount='';
+$account_from = '';
+$account_to = '';
+$label = '';
+$amount = '';
if ($error)
{
- $account_from = GETPOST('account_from', 'int');
- $account_to = GETPOST('account_to', 'int');
+ $account_from = GETPOST('account_from', 'int');
+ $account_to = GETPOST('account_to', 'int');
$label = GETPOST('label', 'alpha');
$amount = GETPOST('amount', 'alpha');
}
@@ -246,17 +246,17 @@ print ''.$langs->trans("TransferFrom").' | '.$langs->trans("TransferTo
print ' | '.$langs->trans("AmountToOthercurrency").' | ';
print '';
-$var=false;
+$var = false;
print '| ';
-$form->select_comptes($account_from, 'account_from', 0, '', 1, '', empty($conf->multicurrency->enabled)?0:1);
+$form->select_comptes($account_from, 'account_from', 0, '', 1, '', empty($conf->multicurrency->enabled) ? 0 : 1);
print " | ";
print "\n";
-$form->select_comptes($account_to, 'account_to', 0, '', 1, '', empty($conf->multicurrency->enabled)?0:1);
+$form->select_comptes($account_to, 'account_to', 0, '', 1, '', empty($conf->multicurrency->enabled) ? 0 : 1);
print " | \n";
print "";
-print $form->selectDate((! empty($dateo)?$dateo:''), '', '', '', '', 'add');
+print $form->selectDate((!empty($dateo) ? $dateo : ''), '', '', '', '', 'add');
print " | \n";
print ' | ';
print ' | ';
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 6573207a117..ccd6b24c6b9 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -40,37 +40,37 @@ if (!empty($conf->projet->enabled))
$langs->loadLangs(array("compta", "banks", "bills", "users", "accountancy", "categories"));
// Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
$action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'aZ09');
-$backtopage = GETPOST('backtopage', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
-$accountid = GETPOST("accountid") > 0 ? GETPOST("accountid", "int") : 0;
-$label = GETPOST("label", "alpha");
-$sens = GETPOST("sens", "int");
-$amount = price2num(GETPOST("amount", "alpha"));
-$paymenttype = GETPOST("paymenttype", "int");
-$accountancy_code = GETPOST("accountancy_code", "alpha");
-$subledger_account = GETPOST("subledger_account", "alpha");
-$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+$accountid = GETPOST("accountid") > 0 ? GETPOST("accountid", "int") : 0;
+$label = GETPOST("label", "alpha");
+$sens = GETPOST("sens", "int");
+$amount = price2num(GETPOST("amount", "alpha"));
+$paymenttype = GETPOST("paymenttype", "int");
+$accountancy_code = GETPOST("accountancy_code", "alpha");
+$subledger_account = GETPOST("subledger_account", "alpha");
+$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
// Security check
$socid = GETPOST("socid", "int");
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'banque', '', '', '');
$object = new PaymentVarious($db);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('variouscard','globalcard'));
+$hookmanager->initHooks(array('variouscard', 'globalcard'));
/**
* Actions
*/
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook))
@@ -429,44 +429,44 @@ if ($id)
{
$alreadyaccounted = $object->getVentilExportCompta();
- $head=various_payment_prepare_head($object);
+ $head = various_payment_prepare_head($object);
dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
- $morehtmlref='';
+ $morehtmlref = ' ';
// 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->banque->modifier)
{
if ($action != 'classify') {
- $morehtmlref.=' ' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref .= ' '.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
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.=$proj->getNomUrl(1);
+ $morehtmlref .= $proj->getNomUrl(1);
} else {
- $morehtmlref.='';
+ $morehtmlref .= '';
}
}
}
- $morehtmlref.=' ';
- $linkback = ' '.$langs->trans("BackToList").'';
+ $morehtmlref .= ' ';
+$morehtmlref = ' ';
// 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->banque->modifier && 0)
{
if ($action != 'classify') {
- $morehtmlref.=' ' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref .= ' '.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
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.=$proj->getNomUrl(1);
+ $morehtmlref .= $proj->getNomUrl(1);
} else {
- $morehtmlref.='';
+ $morehtmlref .= '';
}
}
}
-$morehtmlref.=' ';
-$linkback = ' '.$langs->trans("BackToList").'';
+$morehtmlref .= ' '.print_r($items,true).' ';
- $nbitems=count($items);
- for($line = 0; $line < $max && $line < $nbitems; $line++)
+ $nbitems = count($items);
+ for ($line = 0; $line < $max && $line < $nbitems; $line++)
{
$item = $items[$line];
// Feed common fields
- $href = $item['link'];
+ $href = $item['link'];
$title = urldecode($item['title']);
- $date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed
+ $date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed
if ($rssparser->getFormat() == 'rss') // If RSS
{
- if (! $date && isset($item['pubdate'])) $date=$item['pubdate'];
- if (! $date && isset($item['dc']['date'])) $date=$item['dc']['date'];
+ if (!$date && isset($item['pubdate'])) $date = $item['pubdate'];
+ if (!$date && isset($item['dc']['date'])) $date = $item['dc']['date'];
//$item['dc']['language']
//$item['dc']['publisher']
}
if ($rssparser->getFormat() == 'atom') // If Atom
{
- if (! $date && isset($item['issued'])) $date=$item['issued'];
- if (! $date && isset($item['modified'])) $date=$item['modified'];
+ if (!$date && isset($item['issued'])) $date = $item['issued'];
+ if (!$date && isset($item['modified'])) $date = $item['modified'];
//$item['issued']
//$item['modified']
//$item['atom_content']
}
- if (is_numeric($date)) $date=dol_print_date($date, "dayhour");
+ if (is_numeric($date)) $date = dol_print_date($date, "dayhour");
$isutf8 = utf8_check($title);
- if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $title=utf8_encode($title);
- elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title=utf8_decode($title);
+ if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $title = utf8_encode($title);
+ elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title = utf8_decode($title);
- $title=preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
- $title=preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
- $this->info_box_contents["$href"]="$title";
+ $title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
+ $title = preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
+ $this->info_box_contents["$href"] = "$title";
$tooltip = $title;
- $description = ! empty($item['description'])?$item['description']:'';
+ $description = !empty($item['description']) ? $item['description'] : '';
$isutf8 = utf8_check($description);
- if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $description=utf8_encode($description);
- elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description=utf8_decode($description);
- $description=preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
- $description=preg_replace("/^\s+/", "", $description);
- $description=str_replace("\r\n", "", $description);
- $tooltip.= '
'.$description;
+ if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $description = utf8_encode($description);
+ elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description = utf8_decode($description);
+ $description = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
+ $description = preg_replace("/^\s+/", "", $description);
+ $description = str_replace("\r\n", "", $description);
+ $tooltip .= '
'.$description;
$this->info_box_contents[$line][0] = array(
'td' => 'class="left" width="16"',
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 65724f5fa4b..ebaff31268d 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -30,9 +30,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_factures extends ModeleBoxes
{
- public $boxcode="lastcustomerbills";
- public $boximg="object_bill";
- public $boxlabel="BoxLastCustomerBills";
+ public $boxcode = "lastcustomerbills";
+ public $boximg = "object_bill";
+ public $boxlabel = "BoxLastCustomerBills";
public $depends = array("facture");
/**
@@ -58,7 +58,7 @@ class box_factures extends ModeleBoxes
$this->db = $db;
- $this->hidden = ! ($user->rights->facture->lire);
+ $this->hidden = !($user->rights->facture->lire);
}
/**
@@ -71,7 +71,7 @@ class box_factures extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -81,7 +81,7 @@ class box_factures extends ModeleBoxes
$langs->load("bills");
- $text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills", $max);
+ $text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerBills", $max);
$this->info_box_head = array(
'text' => $text,
'limit'=> dol_strlen($text)
@@ -89,29 +89,29 @@ class box_factures extends ModeleBoxes
if ($user->rights->facture->lire) {
$sql = "SELECT f.rowid as facid";
- $sql.= ", f.ref, f.type, f.total as total_ht";
- $sql.= ", f.tva as total_tva";
- $sql.= ", f.total_ttc";
- $sql.= ", f.datef as df";
- $sql.= ", f.paye, f.fk_statut, f.datec, f.tms";
- $sql.= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
- $sql.= ", f.date_lim_reglement as datelimite";
- $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= ")";
- $sql.= " WHERE f.fk_soc = s.rowid";
- $sql.= " AND f.entity IN (".getEntity('invoice').")";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
- else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= ", f.ref, f.type, f.total as total_ht";
+ $sql .= ", f.tva as total_tva";
+ $sql .= ", f.total_ttc";
+ $sql .= ", f.datef as df";
+ $sql .= ", f.paye, f.fk_statut, f.datec, f.tms";
+ $sql .= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
+ $sql .= ", f.date_lim_reglement as datelimite";
+ $sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= ")";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity IN (".getEntity('invoice').")";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+ if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+ else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
{
$num = $this->db->num_rows($result);
- $now=dol_now();
+ $now = dol_now();
$line = 0;
$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
@@ -179,7 +179,7 @@ class box_factures extends ModeleBoxes
$line++;
}
- if ($num==0)
+ if ($num == 0)
$this->info_box_contents[$line][0] = array(
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedInvoices"),
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 9eb836fe1e2..30f3cd503c2 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -31,10 +31,10 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_factures_fourn extends ModeleBoxes
{
- public $boxcode="lastsupplierbills";
- public $boximg="object_bill";
- public $boxlabel="BoxLastSupplierBills";
- public $depends = array("facture","fournisseur");
+ public $boxcode = "lastsupplierbills";
+ public $boximg = "object_bill";
+ public $boxlabel = "BoxLastSupplierBills";
+ public $depends = array("facture", "fournisseur");
/**
* @var DoliDB Database handler.
@@ -59,7 +59,7 @@ class box_factures_fourn extends ModeleBoxes
$this->db = $db;
- $this->hidden = ! ($user->rights->fournisseur->facture->lire);
+ $this->hidden = !($user->rights->fournisseur->facture->lire);
}
/**
@@ -72,7 +72,7 @@ class box_factures_fourn extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
@@ -81,32 +81,32 @@ class box_factures_fourn extends ModeleBoxes
$thirdpartytmp = new Fournisseur($this->db);
$this->info_box_head = array(
- 'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills", $max)
+ 'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierBills", $max)
);
if ($user->rights->fournisseur->facture->lire)
{
$sql = "SELECT s.nom as name, s.rowid as socid,";
- $sql.= " s.code_fournisseur, s.email,";
- $sql.= " s.logo,";
- $sql.= " f.rowid as facid, f.ref, f.ref_supplier,";
- $sql.= " f.total_ht,";
- $sql.= " f.total_tva,";
- $sql.= " f.total_ttc,";
- $sql.= " f.paye, f.fk_statut,";
- $sql.= ' f.datef as df,';
- $sql.= ' f.datec as datec,';
- $sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type';
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE f.fk_soc = s.rowid";
- $sql.= " AND f.entity = ".$conf->entity;
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
- else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= " s.code_fournisseur, s.email,";
+ $sql .= " s.logo,";
+ $sql .= " f.rowid as facid, f.ref, f.ref_supplier,";
+ $sql .= " f.total_ht,";
+ $sql .= " f.total_tva,";
+ $sql .= " f.total_ttc,";
+ $sql .= " f.paye, f.fk_statut,";
+ $sql .= ' f.datef as df,';
+ $sql .= ' f.datec as datec,';
+ $sql .= ' f.date_lim_reglement as datelimite, f.tms, f.type';
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity = ".$conf->entity;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+ if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+ else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
@@ -114,13 +114,13 @@ class box_factures_fourn extends ModeleBoxes
$num = $this->db->num_rows($result);
$line = 0;
- $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
+ $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
while ($line < $num) {
$objp = $this->db->fetch_object($result);
- $datelimite=$this->db->jdate($objp->datelimite);
- $date=$this->db->jdate($objp->df);
- $datem=$this->db->jdate($objp->tms);
+ $datelimite = $this->db->jdate($objp->datelimite);
+ $date = $this->db->jdate($objp->df);
+ $datem = $this->db->jdate($objp->tms);
$facturestatic->id = $objp->facid;
$facturestatic->ref = $objp->ref;
@@ -141,7 +141,7 @@ class box_factures_fourn extends ModeleBoxes
$late = '';
if ($facturestatic->hasDelay()) {
- $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+ $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
}
$this->info_box_contents[$line][] = array(
@@ -154,7 +154,7 @@ class box_factures_fourn extends ModeleBoxes
$this->info_box_contents[$line][] = array(
'td' => 'class="tdoverflowmax150"',
'text' => $objp->ref_supplier,
- 'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'
'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
+ 'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'
'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
);
@@ -176,7 +176,7 @@ class box_factures_fourn extends ModeleBoxes
$fac = new FactureFournisseur($this->db);
$fac->fetch($objp->facid);
- $alreadypaid=$fac->getSommePaiement();
+ $alreadypaid = $fac->getSommePaiement();
$this->info_box_contents[$line][] = array(
'td' => 'class="right" width="18"',
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
@@ -185,7 +185,7 @@ class box_factures_fourn extends ModeleBoxes
$line++;
}
- if ($num==0)
+ if ($num == 0)
$this->info_box_contents[$line][0] = array(
'td' => 'class="center"',
'text'=>$langs->trans("NoModifiedSupplierBills"),
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index b1b108931b1..c2b5e7c705e 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -33,7 +33,7 @@ class box_factures_fourn_imp extends ModeleBoxes
public $boxcode = "oldestunpaidsupplierbills";
public $boximg = "object_bill";
public $boxlabel = "BoxOldestUnpaidSupplierBills";
- public $depends = array("facture","fournisseur");
+ public $depends = array("facture", "fournisseur");
/**
* @var DoliDB Database handler.
@@ -58,7 +58,7 @@ class box_factures_fourn_imp extends ModeleBoxes
$this->db = $db;
- $this->hidden = ! ($user->rights->fournisseur->facture->lire);
+ $this->hidden = !($user->rights->fournisseur->facture->lire);
}
/**
@@ -71,35 +71,35 @@ class box_factures_fourn_imp extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
- $facturestatic=new FactureFournisseur($this->db);
+ $facturestatic = new FactureFournisseur($this->db);
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
- $thirdpartytmp=new Fournisseur($this->db);
+ $thirdpartytmp = new Fournisseur($this->db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidSupplierBills", $max));
if ($user->rights->fournisseur->facture->lire)
{
$sql = "SELECT s.nom as name, s.rowid as socid,";
- $sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,";
- $sql.= " f.datef as df,";
- $sql.= " f.total_ht as total_ht,";
- $sql.= " f.tva as total_tva,";
- $sql.= " f.total_ttc,";
- $sql.= " f.paye, f.fk_statut, f.type";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= ",".MAIN_DB_PREFIX."facture_fourn as f";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE f.fk_soc = s.rowid";
- $sql.= " AND f.entity = ".$conf->entity;
- $sql.= " AND f.paye=0";
- $sql.= " AND fk_statut = 1";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- $sql.= " ORDER BY datelimite DESC, f.ref_supplier DESC ";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,";
+ $sql .= " f.datef as df,";
+ $sql .= " f.total_ht as total_ht,";
+ $sql .= " f.tva as total_tva,";
+ $sql .= " f.total_ttc,";
+ $sql .= " f.paye, f.fk_statut, f.type";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.entity = ".$conf->entity;
+ $sql .= " AND f.paye=0";
+ $sql .= " AND fk_statut = 1";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+ $sql .= " ORDER BY datelimite DESC, f.ref_supplier DESC ";
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
@@ -114,9 +114,9 @@ class box_factures_fourn_imp extends ModeleBoxes
while ($line < $num)
{
$objp = $this->db->fetch_object($result);
- $datelimite=$this->db->jdate($objp->datelimite);
- $date=$this->db->jdate($objp->df);
- $datem=$this->db->jdate($objp->tms);
+ $datelimite = $this->db->jdate($objp->datelimite);
+ $date = $this->db->jdate($objp->df);
+ $datem = $this->db->jdate($objp->tms);
$facturestatic->id = $objp->facid;
$facturestatic->ref = $objp->ref;
$facturestatic->total_ht = $objp->total_ht;
@@ -130,12 +130,12 @@ class box_factures_fourn_imp extends ModeleBoxes
$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
$thirdpartytmp->logo = $objp->logo;
- $late='';
+ $late = '';
if ($facturestatic->hasDelay()) {
- $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+ $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
}
- $tooltip = $langs->trans('SupplierInvoice') . ': ' . ($objp->ref?$objp->ref:$objp->facid) . '
' . $langs->trans('RefSupplier') . ': ' . $objp->ref_supplier;
+ $tooltip = $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'
'.$langs->trans('RefSupplier').': '.$objp->ref_supplier;
$this->info_box_contents[$line][] = array(
'td' => 'class="nowraponall"',
@@ -162,7 +162,7 @@ class box_factures_fourn_imp extends ModeleBoxes
$fac = new FactureFournisseur($this->db);
$fac->fetch($objp->facid);
- $alreadypaid=$fac->getSommePaiement();
+ $alreadypaid = $fac->getSommePaiement();
$this->info_box_contents[$line][] = array(
'td' => 'class="right" width="18"',
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
@@ -171,7 +171,7 @@ class box_factures_fourn_imp extends ModeleBoxes
$line++;
}
- if ($num==0)
+ if ($num == 0)
$this->info_box_contents[$line][0] = array(
'td' => 'class="center"',
'text'=>$langs->trans("NoUnpaidSupplierBills"),
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index a81b0cf3b86..e289c83d541 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -31,10 +31,10 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_ficheinter extends ModeleBoxes
{
- public $boxcode="ficheinter";
- public $boximg="object_intervention";
- public $boxlabel="BoxFicheInter";
- public $depends = array("ficheinter"); // conf->contrat->enabled
+ public $boxcode = "ficheinter";
+ public $boximg = "object_intervention";
+ public $boxlabel = "BoxFicheInter";
+ public $depends = array("ficheinter"); // conf->contrat->enabled
/**
* @var DoliDB Database handler.
@@ -59,7 +59,7 @@ class box_ficheinter extends ModeleBoxes
$this->db = $db;
- $this->hidden = ! ($user->rights->ficheinter->lire);
+ $this->hidden = !($user->rights->ficheinter->lire);
}
/**
@@ -72,37 +72,37 @@ class box_ficheinter extends ModeleBoxes
{
global $user, $langs, $conf;
- $this->max=$max;
+ $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
- $ficheinterstatic=new Fichinter($this->db);
+ $ficheinterstatic = new Fichinter($this->db);
$companystatic = new Societe($this->db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter", $max));
- if (! empty($user->rights->ficheinter->lire))
+ if (!empty($user->rights->ficheinter->lire))
{
$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
- $sql.= " f.datec,";
- $sql.= " f.date_valid as datev,";
- $sql.= " f.tms as datem,";
- $sql.= " s.nom as name, s.rowid as socid, s.client, s.email as semail";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
- $sql.= " WHERE f.fk_soc = s.rowid ";
- $sql.= " AND f.entity = ".$conf->entity;
- if (! $user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- $sql.= " ORDER BY f.tms DESC";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= " f.datec,";
+ $sql .= " f.date_valid as datev,";
+ $sql .= " f.tms as datem,";
+ $sql .= " s.nom as name, s.rowid as socid, s.client, s.email as semail";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
+ $sql .= " WHERE f.fk_soc = s.rowid ";
+ $sql .= " AND f.entity = ".$conf->entity;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+ $sql .= " ORDER BY f.tms DESC";
+ $sql .= $this->db->plimit($max, 0);
dol_syslog(get_class($this).'::loadBox', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
- $now=dol_now();
+ $now = dol_now();
$i = 0;
@@ -111,9 +111,9 @@ class box_ficheinter extends ModeleBoxes
$objp = $this->db->fetch_object($resql);
$datec = $this->db->jdate($objp->datec);
- $ficheinterstatic->statut=$objp->fk_statut;
- $ficheinterstatic->id=$objp->rowid;
- $ficheinterstatic->ref=$objp->ref;
+ $ficheinterstatic->statut = $objp->fk_statut;
+ $ficheinterstatic->id = $objp->rowid;
+ $ficheinterstatic->ref = $objp->ref;
$companystatic->id = $objp->socid;
$companystatic->name = $objp->name;
@@ -145,7 +145,7 @@ class box_ficheinter extends ModeleBoxes
$i++;
}
- if ($num==0) $this->info_box_contents[$i][] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedInterventions"));
+ if ($num == 0) $this->info_box_contents[$i][] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedInterventions"));
$this->db->free($resql);
}
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 242f26e5d60..2b2d8418e47 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -32,9 +32,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_members extends ModeleBoxes
{
- public $boxcode="lastmembers";
- public $boximg="object_user";
- public $boxlabel="BoxLastMembers";
+ public $boxcode = "lastmembers";
+ public $boximg = "object_user";
+ public $boxlabel = "BoxLastMembers";
public $depends = array("adherent");
/**
@@ -62,10 +62,10 @@ class box_members extends ModeleBoxes
$this->db = $db;
// disable module for such cases
- $listofmodulesforexternal=explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
- if (! in_array('adherent', $listofmodulesforexternal) && ! empty($user->socid)) $this->enabled=0; // disabled for external users
+ $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+ if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) $this->enabled = 0; // disabled for external users
- $this->hidden = ! ($user->rights->adherent->lire);
+ $this->hidden = !($user->rights->adherent->lire);
}
/**
@@ -79,23 +79,23 @@ class box_members extends ModeleBoxes
global $user, $langs, $conf;
$langs->load("boxes");
- $this->max=$max;
+ $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
- $memberstatic=new Adherent($this->db);
+ $memberstatic = new Adherent($this->db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers", $max));
if ($user->rights->adherent->lire)
{
$sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
- $sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
- $sql.= " t.subscription";
- $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
- $sql.= " WHERE a.entity IN (".getEntity('member').")";
- $sql.= " AND a.fk_adherent_type = t.rowid";
- $sql.= " ORDER BY a.tms DESC";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
+ $sql .= " t.subscription";
+ $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
+ $sql .= " WHERE a.entity IN (".getEntity('member').")";
+ $sql .= " AND a.fk_adherent_type = t.rowid";
+ $sql .= " ORDER BY a.tms DESC";
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
@@ -106,21 +106,21 @@ class box_members extends ModeleBoxes
while ($line < $num)
{
$objp = $this->db->fetch_object($result);
- $datec=$this->db->jdate($objp->datec);
- $datem=$this->db->jdate($objp->tms);
+ $datec = $this->db->jdate($objp->datec);
+ $datem = $this->db->jdate($objp->tms);
- $memberstatic->lastname=$objp->lastname;
- $memberstatic->firstname=$objp->firstname;
+ $memberstatic->lastname = $objp->lastname;
+ $memberstatic->firstname = $objp->firstname;
$memberstatic->id = $objp->rowid;
$memberstatic->ref = $objp->rowid;
$memberstatic->company = $objp->company;
- if (! empty($objp->fk_soc)) {
+ if (!empty($objp->fk_soc)) {
$memberstatic->socid = $objp->fk_soc;
$memberstatic->fetch_thirdparty();
- $memberstatic->name=$memberstatic->thirdparty->name;
+ $memberstatic->name = $memberstatic->thirdparty->name;
} else {
- $memberstatic->name=$objp->company;
+ $memberstatic->name = $objp->company;
}
$this->info_box_contents[$line][] = array(
@@ -148,7 +148,7 @@ class box_members extends ModeleBoxes
$line++;
}
- if ($num==0)
+ if ($num == 0)
$this->info_box_contents[$line][0] = array(
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedCustomers"),
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index 949f63776f6..9b863aa2d5a 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -32,9 +32,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_mos extends ModeleBoxes
{
- public $boxcode="lastmos";
- public $boximg="object_mrp";
- public $boxlabel="BoxTitleLatestModifiedMos";
+ public $boxcode = "lastmos";
+ public $boximg = "object_mrp";
+ public $boxlabel = "BoxTitleLatestModifiedMos";
public $depends = array("mrp");
/**
@@ -60,7 +60,7 @@ class box_mos extends ModeleBoxes
$this->db = $db;
- $this->hidden = ! ($user->rights->bom->read);
+ $this->hidden = !($user->rights->bom->read);
}
/**
@@ -87,18 +87,18 @@ class box_mos extends ModeleBoxes
if ($user->rights->mrp->read)
{
$sql = "SELECT p.ref as product_ref";
- $sql.= ", c.rowid";
- $sql.= ", c.date_creation";
- $sql.= ", c.tms";
- $sql.= ", c.ref";
- $sql.= ", c.status";
+ $sql .= ", c.rowid";
+ $sql .= ", c.date_creation";
+ $sql .= ", c.tms";
+ $sql .= ", c.ref";
+ $sql .= ", c.status";
//$sql.= ", c.fk_user_valid";
- $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
- $sql.= ", ".MAIN_DB_PREFIX."mrp_mo as c";
- $sql.= " WHERE c.fk_product = p.rowid";
- $sql.= " AND c.entity = ".$conf->entity;
- $sql.= " ORDER BY c.tms DESC, c.ref DESC";
- $sql.= " ".$this->db->plimit($max, 0);
+ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+ $sql .= ", ".MAIN_DB_PREFIX."mrp_mo as c";
+ $sql .= " WHERE c.fk_product = p.rowid";
+ $sql .= " AND c.entity = ".$conf->entity;
+ $sql .= " ORDER BY c.tms DESC, c.ref DESC";
+ $sql .= " ".$this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result) {
@@ -108,7 +108,7 @@ class box_mos extends ModeleBoxes
while ($line < $num) {
$objp = $this->db->fetch_object($result);
- $datem=$this->db->jdate($objp->tms);
+ $datem = $this->db->jdate($objp->tms);
$mostatic->id = $objp->rowid;
$mostatic->ref = $objp->ref;
$mostatic->id = $objp->socid;
@@ -127,11 +127,11 @@ class box_mos extends ModeleBoxes
'asis' => 1,
);
- if (! empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
+ if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
$this->info_box_contents[$line][] = array(
'td' => 'class="right"',
- 'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
+ 'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
'asis' => 1,
);
}
@@ -149,7 +149,7 @@ class box_mos extends ModeleBoxes
$line++;
}
- if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedOrders"));
+ if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedOrders"));
$this->db->free($result);
} else {
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 5cccd24ad6a..374e9ab1bae 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -33,9 +33,9 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
*/
class box_produits extends ModeleBoxes
{
- public $boxcode="lastproducts";
- public $boximg="object_product";
- public $boxlabel="BoxLastProducts";
+ public $boxcode = "lastproducts";
+ public $boximg = "object_product";
+ public $boxlabel = "BoxLastProducts";
public $depends = array("produit");
/**
@@ -59,11 +59,11 @@ class box_produits extends ModeleBoxes
{
global $conf, $user;
- $this->db=$db;
+ $this->db = $db;
- $listofmodulesforexternal=explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
- $tmpentry=array('enabled'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'perms'=>(! empty($user->rights->produit->lire) || ! empty($user->rights->service->lire)), 'module'=>'product|service');
- $showmode=isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+ $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+ $tmpentry = array('enabled'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'perms'=>(!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)), 'module'=>'product|service');
+ $showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
$this->hidden = ($showmode != 1);
}
@@ -77,29 +77,29 @@ class box_produits extends ModeleBoxes
{
global $user, $langs, $conf, $hookmanager;
- $this->max=$max;
+ $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
- $productstatic=new Product($this->db);
+ $productstatic = new Product($this->db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts", $max));
if ($user->rights->produit->lire || $user->rights->service->lire)
{
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
- $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
- $sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
- if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
- if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+ $sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
+ if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
+ if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
// Add where from hooks
if (is_object($hookmanager))
{
- $parameters=array('boxproductlist'=>1);
- $reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
- $sql.=$hookmanager->resPrint;
+ $parameters = array('boxproductlist'=>1);
+ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+ $sql .= $hookmanager->resPrint;
}
- $sql.= $this->db->order('p.datec', 'DESC');
- $sql.= $this->db->plimit($max, 0);
+ $sql .= $this->db->order('p.datec', 'DESC');
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
@@ -109,16 +109,16 @@ class box_produits extends ModeleBoxes
while ($line < $num)
{
$objp = $this->db->fetch_object($result);
- $datem=$this->db->jdate($objp->tms);
+ $datem = $this->db->jdate($objp->tms);
// Multilangs
- if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+ if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
{
$sqld = "SELECT label";
- $sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
- $sqld.= " WHERE fk_product=".$objp->rowid;
- $sqld.= " AND lang='". $langs->getDefaultLang() ."'";
- $sqld.= " LIMIT 1";
+ $sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
+ $sqld .= " WHERE fk_product=".$objp->rowid;
+ $sqld .= " AND lang='".$langs->getDefaultLang()."'";
+ $sqld .= " LIMIT 1";
$resultd = $this->db->query($sqld);
if ($resultd)
@@ -147,8 +147,8 @@ class box_produits extends ModeleBoxes
$price = '';
$price_base_type = '';
if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
- $price_base_type=$langs->trans($objp->price_base_type);
- $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
+ $price_base_type = $langs->trans($objp->price_base_type);
+ $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
}
else //Parse the dynamic price
{
@@ -158,14 +158,14 @@ class box_produits extends ModeleBoxes
if ($price_result >= 0) {
if ($objp->price_base_type == 'HT')
{
- $price_base_type=$langs->trans("HT");
+ $price_base_type = $langs->trans("HT");
}
else
{
$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
- $price_base_type=$langs->trans("TTC");
+ $price_base_type = $langs->trans("TTC");
}
- $price=price($price_result);
+ $price = price($price_result);
}
}
$this->info_box_contents[$line][] = array(
@@ -197,7 +197,7 @@ class box_produits extends ModeleBoxes
$line++;
}
- if ($num==0)
+ if ($num == 0)
$this->info_box_contents[$line][0] = array(
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedProducts"),
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 3c674cd32c0..f4a433c013d 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -35,9 +35,9 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
*/
class box_produits_alerte_stock extends ModeleBoxes
{
- public $boxcode="productsalertstock";
- public $boximg="object_product";
- public $boxlabel="BoxProductsAlertStock";
+ public $boxcode = "productsalertstock";
+ public $boximg = "object_product";
+ public $boxlabel = "BoxProductsAlertStock";
public $depends = array("produit");
/**
@@ -59,13 +59,13 @@ class box_produits_alerte_stock extends ModeleBoxes
*/
public function __construct($db, $param = '')
{
- global $conf,$user;
+ global $conf, $user;
$this->db = $db;
- $listofmodulesforexternal=explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
- $tmpentry=array('enabled'=>((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ! empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
- $showmode=isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+ $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+ $tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
+ $showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
$this->hidden = ($showmode != 1);
}
@@ -79,34 +79,34 @@ class box_produits_alerte_stock extends ModeleBoxes
{
global $user, $langs, $conf, $hookmanager;
- $this->max=$max;
+ $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
- $productstatic=new Product($this->db);
+ $productstatic = new Product($this->db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock", $max));
if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
{
$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity,";
- $sql.= " SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") as total_stock";
- $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
- $sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
- $sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
- if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
- if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+ $sql .= " SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") as total_stock";
+ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
+ $sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
+ $sql .= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
+ if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
+ if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
// Add where from hooks
if (is_object($hookmanager))
{
- $parameters=array('boxproductalertstocklist'=>1);
- $reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
- $sql.=$hookmanager->resPrint;
+ $parameters = array('boxproductalertstocklist'=>1);
+ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+ $sql .= $hookmanager->resPrint;
}
- $sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
- $sql.= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
- $sql.= $this->db->order('p.seuil_stock_alerte', 'DESC');
- $sql.= $this->db->plimit($max, 0);
+ $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
+ $sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
+ $sql .= $this->db->order('p.seuil_stock_alerte', 'DESC');
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
@@ -116,18 +116,18 @@ class box_produits_alerte_stock extends ModeleBoxes
$line = 0;
while ($line < $num) {
$objp = $this->db->fetch_object($result);
- $datem=$this->db->jdate($objp->tms);
+ $datem = $this->db->jdate($objp->tms);
$price = '';
$price_base_type = '';
// Multilangs
- if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+ if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
{
$sqld = "SELECT label";
- $sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
- $sqld.= " WHERE fk_product=".$objp->rowid;
- $sqld.= " AND lang='". $langs->getDefaultLang() ."'";
- $sqld.= " LIMIT 1";
+ $sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
+ $sqld .= " WHERE fk_product=".$objp->rowid;
+ $sqld .= " AND lang='".$langs->getDefaultLang()."'";
+ $sqld .= " LIMIT 1";
$resultd = $this->db->query($sqld);
if ($resultd)
@@ -156,8 +156,8 @@ class box_produits_alerte_stock extends ModeleBoxes
if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
{
- $price_base_type=$langs->trans($objp->price_base_type);
- $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
+ $price_base_type = $langs->trans($objp->price_base_type);
+ $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
}
else //Parse the dynamic price
{
@@ -167,14 +167,14 @@ class box_produits_alerte_stock extends ModeleBoxes
if ($price_result >= 0) {
if ($objp->price_base_type == 'HT')
{
- $price_base_type=$langs->trans("HT");
+ $price_base_type = $langs->trans("HT");
}
else
{
$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
- $price_base_type=$langs->trans("TTC");
+ $price_base_type = $langs->trans("TTC");
}
- $price=price($price_result);
+ $price = price($price_result);
}
}
@@ -190,7 +190,7 @@ class box_produits_alerte_stock extends ModeleBoxes
$this->info_box_contents[$line][] = array(
'td' => 'class="center"',
- 'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
+ 'text' => $objp->total_stock.' / '.$objp->seuil_stock_alerte,
'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
);
@@ -208,7 +208,7 @@ class box_produits_alerte_stock extends ModeleBoxes
$line++;
}
- if ($num==0)
+ if ($num == 0)
$this->info_box_contents[$line][0] = array(
'td' => 'class="center"',
'text'=>$langs->trans("NoTooLowStockProducts"),
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 9fffc92963f..c99f07ff311 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -31,8 +31,8 @@ include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
*/
class box_project extends ModeleBoxes
{
- public $boxcode="project";
- public $boximg="object_projectpub";
+ public $boxcode = "project";
+ public $boximg = "object_projectpub";
public $boxlabel;
//var $depends = array("projet");
@@ -62,7 +62,7 @@ class box_project extends ModeleBoxes
$this->db = $db;
$this->boxlabel = "OpenedProjects";
- $this->hidden = ! ($user->rights->projet->lire);
+ $this->hidden = !($user->rights->projet->lire);
}
/**
@@ -75,11 +75,11 @@ class box_project extends ModeleBoxes
{
global $conf, $user, $langs;
- $this->max=$max;
+ $this->max = $max;
$totalMnt = 0;
$totalnb = 0;
- $totalnbTask=0;
+ $totalnbTask = 0;
$textHead = $langs->trans("OpenedProjects");
$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
@@ -89,20 +89,20 @@ class box_project extends ModeleBoxes
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$projectstatic = new Project($this->db);
- $socid=0;
+ $socid = 0;
//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
// Get list of project id allowed to user (in a string list separated by coma)
- $projectsListId='';
- if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+ $projectsListId = '';
+ if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.public";
- $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
- $sql.= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
- $sql.= " AND p.fk_statut = 1"; // Only open projects
- if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+ $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+ $sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
+ $sql .= " AND p.fk_statut = 1"; // Only open projects
+ if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
- $sql.= " ORDER BY p.datec DESC";
+ $sql .= " ORDER BY p.datec DESC";
//$sql.= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
@@ -130,10 +130,10 @@ class box_project extends ModeleBoxes
'text' => $objp->title,
);
- $sql ="SELECT count(*) as nb, sum(progress) as totprogress";
- $sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
- $sql.= " WHERE p.entity IN (".getEntity('project').')';
- $sql.=" AND p.rowid = ".$objp->rowid;
+ $sql = "SELECT count(*) as nb, sum(progress) as totprogress";
+ $sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
+ $sql .= " WHERE p.entity IN (".getEntity('project').')';
+ $sql .= " AND p.rowid = ".$objp->rowid;
$resultTask = $this->db->query($sql);
if ($resultTask) {
$objTask = $this->db->fetch_object($resultTask);
@@ -141,10 +141,10 @@ class box_project extends ModeleBoxes
'td' => 'class="right"',
'text' => $objTask->nb." ".$langs->trans("Tasks"),
);
- if ($objTask->nb > 0)
+ if ($objTask->nb > 0)
$this->info_box_contents[$i][] = array(
'td' => 'class="right"',
- 'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
+ 'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
);
else
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A ");
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 9d6a10b6225..54ed1c76051 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -34,9 +34,9 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
*/
class box_prospect extends ModeleBoxes
{
- public $boxcode="lastprospects";
- public $boximg="object_company";
- public $boxlabel="BoxLastProspects";
+ public $boxcode = "lastprospects";
+ public $boximg = "object_company";
+ public $boxlabel = "BoxLastProspects";
public $depends = array("societe");
/**
@@ -63,9 +63,9 @@ class box_prospect extends ModeleBoxes
$this->db = $db;
// disable box for such cases
- if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled=0; // disabled by this option
+ if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled = 0; // disabled by this option
- $this->hidden = ! ($user->rights->societe->lire && empty($user->socid));
+ $this->hidden = !($user->rights->societe->lire && empty($user->socid));
}
/**
@@ -78,29 +78,29 @@ class box_prospect extends ModeleBoxes
{
global $user, $langs, $conf;
- $this->max=$max;
+ $this->max = $max;
- $thirdpartystatic=new Client($this->db);
+ $thirdpartystatic = new Client($this->db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects", $max));
if ($user->rights->societe->lire)
{
$sql = "SELECT s.nom as name, s.rowid as socid";
- $sql.= ", s.code_client";
- $sql.= ", s.client, s.email";
- $sql.= ", s.code_fournisseur";
- $sql.= ", s.fournisseur";
- $sql.= ", s.logo";
- $sql.= ", s.fk_stcomm, s.datec, s.tms, s.status";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE s.client IN (2, 3)";
- $sql.= " AND s.entity IN (".getEntity('societe').")";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- $sql.= " ORDER BY s.tms DESC";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= ", s.code_client";
+ $sql .= ", s.client, s.email";
+ $sql .= ", s.code_fournisseur";
+ $sql .= ", s.fournisseur";
+ $sql .= ", s.logo";
+ $sql .= ", s.fk_stcomm, s.datec, s.tms, s.status";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE s.client IN (2, 3)";
+ $sql .= " AND s.entity IN (".getEntity('societe').")";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+ $sql .= " ORDER BY s.tms DESC";
+ $sql .= $this->db->plimit($max, 0);
dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
$resql = $this->db->query($sql);
@@ -112,8 +112,8 @@ class box_prospect extends ModeleBoxes
while ($line < $num)
{
$objp = $this->db->fetch_object($resql);
- $datec=$this->db->jdate($objp->datec);
- $datem=$this->db->jdate($objp->tms);
+ $datec = $this->db->jdate($objp->datec);
+ $datem = $this->db->jdate($objp->tms);
$thirdpartystatic->id = $objp->socid;
$thirdpartystatic->name = $objp->name;
$thirdpartystatic->email = $objp->email;
@@ -147,7 +147,7 @@ class box_prospect extends ModeleBoxes
$line++;
}
- if ($num==0) {
+ if ($num == 0) {
$this->info_box_contents[$line][0] = array(
'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedProspects"),
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 5b40fc61436..f8e6dd22452 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -32,10 +32,10 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_services_contracts extends ModeleBoxes
{
- public $boxcode="lastproductsincontract";
- public $boximg="object_product";
- public $boxlabel="BoxLastProductsInContract";
- public $depends = array("service","contrat");
+ public $boxcode = "lastproductsincontract";
+ public $boximg = "object_product";
+ public $boxlabel = "BoxLastProductsInContract";
+ public $depends = array("service", "contrat");
/**
* @var DoliDB Database handler.
@@ -60,7 +60,7 @@ class box_services_contracts extends ModeleBoxes
$this->db = $db;
- $this->hidden = ! ($user->rights->service->lire && $user->rights->contrat->lire);
+ $this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
}
/**
@@ -73,7 +73,7 @@ class box_services_contracts extends ModeleBoxes
{
global $user, $langs, $conf;
- $this->max=$max;
+ $this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
@@ -83,52 +83,52 @@ class box_services_contracts extends ModeleBoxes
if ($user->rights->service->lire && $user->rights->contrat->lire)
{
- $contractstatic=new Contrat($this->db);
- $contractlinestatic=new ContratLigne($this->db);
+ $contractstatic = new Contrat($this->db);
+ $contractlinestatic = new ContratLigne($this->db);
$thirdpartytmp = new Societe($this->db);
$productstatic = new Product($this->db);
$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
- $sql.= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
- $sql.= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type,";
- $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity, p.tobuy, p.tosell";
- $sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
- $sql.= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
- $sql.= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- $sql.= ")";
- $sql.= " WHERE c.entity = ".$conf->entity;
- if($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- $sql.= $this->db->order("c.tms", "DESC");
- $sql.= $this->db->plimit($max, 0);
+ $sql .= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
+ $sql .= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type,";
+ $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity, p.tobuy, p.tosell";
+ $sql .= " FROM (".MAIN_DB_PREFIX."societe as s";
+ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
+ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ $sql .= ")";
+ $sql .= " WHERE c.entity = ".$conf->entity;
+ if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+ $sql .= $this->db->order("c.tms", "DESC");
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
{
$num = $this->db->num_rows($result);
- $now=dol_now();
+ $now = dol_now();
$i = 0;
while ($i < $num)
{
$objp = $this->db->fetch_object($result);
- $datem=$this->db->jdate($objp->datem);
+ $datem = $this->db->jdate($objp->datem);
- $contractlinestatic->id=$objp->cdid;
- $contractlinestatic->fk_contrat=$objp->rowid;
- $contractlinestatic->label=$objp->label;
- $contractlinestatic->description=$objp->description;
- $contractlinestatic->type=$objp->type;
- $contractlinestatic->product_id=$objp->product_id;
- $contractlinestatic->product_ref=$objp->product_ref;
+ $contractlinestatic->id = $objp->cdid;
+ $contractlinestatic->fk_contrat = $objp->rowid;
+ $contractlinestatic->label = $objp->label;
+ $contractlinestatic->description = $objp->description;
+ $contractlinestatic->type = $objp->type;
+ $contractlinestatic->product_id = $objp->product_id;
+ $contractlinestatic->product_ref = $objp->product_ref;
- $contractstatic->statut=$objp->contract_status;
- $contractstatic->id=$objp->rowid;
- $contractstatic->ref=$objp->ref;
- $contractstatic->ref_customer=$objp->ref_customer;
- $contractstatic->ref_supplier=$objp->ref_supplier;
+ $contractstatic->statut = $objp->contract_status;
+ $contractstatic->id = $objp->rowid;
+ $contractstatic->ref = $objp->ref;
+ $contractstatic->ref_customer = $objp->ref_customer;
+ $contractstatic->ref_supplier = $objp->ref_supplier;
$thirdpartytmp->name = $objp->name;
$thirdpartytmp->id = $objp->socid;
@@ -141,13 +141,13 @@ class box_services_contracts extends ModeleBoxes
$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
// Multilangs
- if (! empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
+ if (!empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
{
$sqld = "SELECT label";
- $sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
- $sqld.= " WHERE fk_product=".$objp->product_id;
- $sqld.= " AND lang='". $langs->getDefaultLang() ."'";
- $sqld.= " LIMIT 1";
+ $sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
+ $sqld .= " WHERE fk_product=".$objp->product_id;
+ $sqld .= " AND lang='".$langs->getDefaultLang()."'";
+ $sqld .= " LIMIT 1";
$resultd = $this->db->query($sqld);
if ($resultd)
@@ -160,11 +160,11 @@ class box_services_contracts extends ModeleBoxes
// Label
if ($objp->product_id > 0)
{
- $productstatic->id=$objp->product_id;
- $productstatic->type=$objp->ptype;
- $productstatic->ref=$objp->product_ref;
- $productstatic->entity=$objp->pentity;
- $productstatic->label=$objp->plabel;
+ $productstatic->id = $objp->product_id;
+ $productstatic->type = $objp->ptype;
+ $productstatic->ref = $objp->product_ref;
+ $productstatic->entity = $objp->pentity;
+ $productstatic->label = $objp->plabel;
$productstatic->status = $objp->tosell;
$productstatic->status_buy = $objp->tobuy;
@@ -179,13 +179,13 @@ class box_services_contracts extends ModeleBoxes
$description = $objp->description;
// Add description in form
- if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+ if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
{
//$text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'
'.dol_htmlentitiesbr($objp->description):'';
- $description = ''; // Already added into main visible desc
+ $description = ''; // Already added into main visible desc
}
- $s = $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+ $s = $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
}
else
{
@@ -223,7 +223,7 @@ class box_services_contracts extends ModeleBoxes
$i++;
}
- if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'class="center"','text'=>$langs->trans("NoContractedProducts"));
+ if ($num == 0) $this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoContractedProducts"));
$this->db->free($result);
}
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 881e17f73ec..c019062313c 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -33,7 +33,7 @@ class box_supplier_orders extends ModeleBoxes
public $boxcode = "latestsupplierorders";
public $boximg = "object_order";
- public $boxlabel="BoxLatestSupplierOrders";
+ public $boxlabel = "BoxLatestSupplierOrders";
public $depends = array("fournisseur");
/**
@@ -58,7 +58,7 @@ class box_supplier_orders extends ModeleBoxes
$this->db = $db;
- $this->hidden = ! ($user->rights->fournisseur->commande->lire);
+ $this->hidden = !($user->rights->fournisseur->commande->lire);
}
/**
@@ -75,32 +75,32 @@ class box_supplier_orders extends ModeleBoxes
$this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
- $supplierorderstatic=new CommandeFournisseur($this->db);
+ $supplierorderstatic = new CommandeFournisseur($this->db);
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
$thirdpartytmp = new Fournisseur($this->db);
- $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierOrders", $max));
+ $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
if ($user->rights->fournisseur->commande->lire)
{
$sql = "SELECT s.nom as name, s.rowid as socid,";
- $sql.= " s.code_client, s.code_fournisseur,";
- $sql.= " s.logo, s.email,";
- $sql.= " c.rowid, c.ref, c.tms, c.date_commande,";
- $sql.= " c.total_ht,";
- $sql.= " c.tva as total_tva,";
- $sql.= " c.total_ttc,";
- $sql.= " c.fk_statut";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE c.fk_soc = s.rowid";
- $sql.= " AND c.entity = ".$conf->entity;
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
- else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= " s.code_client, s.code_fournisseur,";
+ $sql .= " s.logo, s.email,";
+ $sql .= " c.rowid, c.ref, c.tms, c.date_commande,";
+ $sql .= " c.total_ht,";
+ $sql .= " c.tva as total_tva,";
+ $sql .= " c.total_ttc,";
+ $sql .= " c.fk_statut";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE c.fk_soc = s.rowid";
+ $sql .= " AND c.entity = ".$conf->entity;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+ if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+ else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
@@ -110,8 +110,8 @@ class box_supplier_orders extends ModeleBoxes
$line = 0;
while ($line < $num) {
$objp = $this->db->fetch_object($result);
- $date=$this->db->jdate($objp->date_commande);
- $datem=$this->db->jdate($objp->tms);
+ $date = $this->db->jdate($objp->date_commande);
+ $datem = $this->db->jdate($objp->tms);
$supplierorderstatic->id = $objp->rowid;
$supplierorderstatic->ref = $objp->ref;
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 416dc7f2f2a..f70f5bef450 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -33,7 +33,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
public $boxcode = "supplierordersawaitingreception";
public $boximg = "object_order";
- public $boxlabel="BoxLatestSupplierOrdersAwaitingReception";
+ public $boxlabel = "BoxLatestSupplierOrdersAwaitingReception";
public $depends = array("fournisseur");
/**
@@ -58,7 +58,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
$this->db = $db;
- $this->hidden = ! ($user->rights->fournisseur->commande->lire);
+ $this->hidden = !($user->rights->fournisseur->commande->lire);
}
/**
@@ -75,7 +75,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
$this->max = $max;
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
- $supplierorderstatic=new CommandeFournisseur($this->db);
+ $supplierorderstatic = new CommandeFournisseur($this->db);
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
$thirdpartytmp = new Fournisseur($this->db);
@@ -84,25 +84,25 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
if ($user->rights->fournisseur->commande->lire)
{
$sql = "SELECT s.nom as name, s.rowid as socid,";
- $sql.= " s.code_client, s.code_fournisseur, s.email,";
- $sql.= " s.logo,";
- $sql.= " c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison, ";
- $sql.= " c.total_ht,";
- $sql.= " c.tva as total_tva,";
- $sql.= " c.total_ttc,";
- $sql.= " c.fk_statut";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE c.fk_soc = s.rowid";
- $sql.= " AND c.entity = ".$conf->entity;
+ $sql .= " s.code_client, s.code_fournisseur, s.email,";
+ $sql .= " s.logo,";
+ $sql .= " c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison, ";
+ $sql .= " c.total_ht,";
+ $sql .= " c.tva as total_tva,";
+ $sql .= " c.total_ttc,";
+ $sql .= " c.fk_statut";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= " WHERE c.fk_soc = s.rowid";
+ $sql .= " AND c.entity = ".$conf->entity;
- $sql.= " AND c.fk_statut = ".CommandeFournisseur::STATUS_ORDERSENT;
- if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
- else $sql.= " ORDER BY c.date_livraison ASC, c.fk_statut ASC ";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= " AND c.fk_statut = ".CommandeFournisseur::STATUS_ORDERSENT;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+ if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+ else $sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC ";
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result)
@@ -112,9 +112,9 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
$line = 0;
while ($line < $num) {
$objp = $this->db->fetch_object($result);
- $date=$this->db->jdate($objp->date_commande);
- $date_livraison=$this->db->jdate($objp->date_livraison);
- $datem=$this->db->jdate($objp->tms);
+ $date = $this->db->jdate($objp->date_commande);
+ $date_livraison = $this->db->jdate($objp->date_livraison);
+ $datem = $this->db->jdate($objp->tms);
$supplierorderstatic->date_livraison = $date_livraison;
$supplierorderstatic->statut = $objp->fk_statut;
@@ -153,7 +153,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
$this->info_box_contents[$line][] = array(
'td' => 'class="right"',
- 'text' => $delayIcon.' '. dol_print_date($date_livraison, 'day').'',
+ 'text' => $delayIcon.' '.dol_print_date($date_livraison, 'day').'',
'asis' => 1
);
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index f8888c71a4b..f9a974ae1c5 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -127,7 +127,7 @@ class box_task extends ModeleBoxes
$boxcontent .= '';
$boxcontent .= ''."\n";
$boxcontent .= ''."\n";
- if (! empty($conf->use_javascript_ajax)) {
+ if (!empty($conf->use_javascript_ajax)) {
$boxcontent .= '' ;
- exit ;
+ $rpl = array('\\' => '\\\\', '"' => '\\"');
+ echo 'window.parent.OnUploadCompleted('.$errorNumber.',"'.strtr($fileUrl, $rpl).'","'.strtr($fileName, $rpl).'", "'.strtr($customMsg, $rpl).'");';
+ echo '';
+ exit;
}
@@ -403,9 +403,9 @@ function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
{
echo '';
}
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("/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=''."\n";
-$arrayofjs=array();
-$arrayofcss=array();
+$head = ''."\n";
+$arrayofjs = array();
+$arrayofcss = array();
top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
print ''."\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: 'trans("Week"); ?>',
dateFormat: 'trans("FormatDateShortJQuery"); ?>', /* Note dd/mm/yy means year on 4 digit in jquery format */
- firstDay: global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'); ?>,
- isRTL: trans("DIRECTION")=='rtl'?'true':'false'); ?>,
+ firstDay: global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'); ?>,
+ isRTL: 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 = global->MAIN_MAX_DECIMALS_SHOWN); ?>;
@@ -1093,7 +1093,7 @@ function price2numjs(amount) {
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;
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: trans("DIRECTION")=='rtl'?'true':'false'); ?>
+ isRTL: trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>
};
$.timepicker.setDefaults($.timepicker.regional['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\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 '';
}
@@ -209,7 +209,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
{
print ' ';
print '| '.$langs->trans("CalculationMode").' | ';
- if (! $variante) print '';
+ if (!$variante) print ' | ';
else print ' | ';
print $calcmode;
if ($variante) print ' | '.$variante;
@@ -220,7 +220,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
// Ligne de la periode d'analyse du rapport
print ' | ';
print '| '.$langs->trans("ReportPeriod").' | ';
- if (! $periodlink) print '';
+ if (!$periodlink) print ' | ';
else print ' | ';
if ($period) print $period;
if ($periodlink) print ' | '.$periodlink;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index e5d7422cf8a..f2833c98e62 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -54,17 +54,17 @@ 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 ' | ';
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 '';
@@ -103,16 +103,16 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '| ';
print $langs->trans("Type");
print ' | ';
- $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 = 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));
+ $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 $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect);
print ' | ';
}
- if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+ if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
{
print '';
print '| ';
@@ -122,20 +122,20 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print ' | ';
}
- 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 '';
print '| ';
print $langs->trans("Project").' ';
print ' | ';
- print $formproject->select_projects($socid?$socid:-1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
+ print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
print ' | ';
}
- if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
+ if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"]))
{
// Status
print '';
@@ -188,7 +188,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '';
@@ -196,7 +196,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
if ($conf->browser->layout == 'phone') print '';
else print ' ';
- print ''; // Close fichecenter
+ print ''; // Close fichecenter
print '';
//print '';
@@ -213,26 +213,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 +246,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 +256,9 @@ function show_array_actions_to_do($max = 5)
print '';
- $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 '| '.$staticaction->getNomUrl(1, 34).' | ';
// print ''.dol_trunc($obj->label,22).' | ';
@@ -266,23 +266,23 @@ function show_array_actions_to_do($max = 5)
print '';
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 ' | ';
- $datep=$db->jdate($obj->dp);
- $datep2=$db->jdate($obj->dp2);
+ $datep = $db->jdate($obj->dp);
+ $datep2 = $db->jdate($obj->dp2);
// Date
print ''.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 " | ";
@@ -314,23 +314,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 +343,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 +353,9 @@ function show_array_last_actions_done($max = 5)
print ' ';
- $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 '| '.$staticaction->getNomUrl(1, 34).' | ';
//print ''.dol_trunc($obj->label,24).' | ';
@@ -363,9 +363,9 @@ function show_array_last_actions_done($max = 5)
print '';
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 ' | ';
@@ -467,13 +467,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].= ''.($nbResources).'';
+ if ($nbResources > 0) $head[$h][1] .= ''.($nbResources).'';
$head[$h][2] = 'resources';
$h++;
}
@@ -481,12 +481,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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$head[$h][2] = 'documents';
$h++;
@@ -516,30 +516,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 +547,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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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."
\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
\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..37ff7acad44 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -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");
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index eac9f404188..16d29af4a35 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;
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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$tab][1] .= ''.$nbNote.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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..0dd8aeb1a32 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.", '%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))."'";
}
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.'
';
//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;
@@ -882,15 +882,15 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
*/
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)
@@ -898,14 +898,14 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
$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 .= " ".$langs->trans("Days");
+ if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay * 24.$langs->trans("HourShort");
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.$langs->trans("HourShort");
return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
}
else
@@ -926,7 +926,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 +941,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 +973,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 +990,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 +1007,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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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").'
';
- $helptext.=$langs->trans("ECMAreaDesc2");
+ $helptext = $langs->trans("ECMAreaDesc").'
';
+ $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].= ''.$object->nbemail.'';
+ if ($object->nbemail > 0) $head[$h][1] .= ''.$object->nbemail.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.$nbResource.'';
+ if ($nbResource > 0) $head[$h][1] .= ''.$nbResource.'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$head[$h][2] = 'documents';
$h++;
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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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 34034abb280..2dc159170a7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1660,7 +1660,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$morehtmlref .= '';
}
}
- 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 .= '';
$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;
@@ -3222,7 +3222,7 @@ 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;
}
@@ -3238,7 +3238,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'title_agenda'=>'bg-infoxbox-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];
}
@@ -5649,7 +5649,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].= ' '.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' '.($nbFiles + $nbLinks).'';
$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..a8469d6bb8b 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -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].= ' '.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ' '.$nbContact.'';
$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].= ' '.$nbStandingOrders.'';
+ if ($nbStandingOrders > 0) $head[$h][1] .= ' '.$nbStandingOrders.'';
$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].= ' '.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ' '.$nbNote.'';
$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].= ' '.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' '.($nbFiles + $nbLinks).'';
$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].= ' '.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= ' '.($nbFiles + $nbLinks).'';
$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].= ' '.$nbNote.'';
+ if ($nbNote > 0) $head[$tab][1] .= ' '.$nbNote.'';
$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].= ' '.$nbSubscription.'';
+ if ($nbSubscription > 0) $head[$h][1] .= ' '.$nbSubscription.'';
$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].= ' '.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ' '.$nbNote.'';
$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].= ' '.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' '.($nbFiles + $nbLinks).'';
$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." \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 \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." \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].= ' '.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ' '.$nbContact.'';
$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.= ' '.($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.= '';
+ $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 .= ' '.($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 .= '';
$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].= ' '.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ' '.$nbNote.'';
$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].= ' '.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' '.($nbFiles + $nbLinks).'';
$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?' ':'').$amount.($mode?'':'').'&tag='.($mode?' ':'').$freetag.($mode?'':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? ' ' : '').$amount.($mode ? '' : '').'&tag='.($mode ? ' ' : '').$freetag.($mode ? '' : '');
+ 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?' ':'');
- if ($mode == 1) $out.='order_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? ' ' : '');
+ if ($mode == 1) $out .= 'order_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '' : '');
+ 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?' ':'');
- 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?'':'');
+ $out .= '&securekey='.($mode ? ' ' : '');
+ 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 ? '' : '');
}
}
}
elseif ($type == 'invoice')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode?' ':'');
- if ($mode == 1) $out.='invoice_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? ' ' : '');
+ if ($mode == 1) $out .= 'invoice_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '' : '');
+ 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?' ':'');
- 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?'':'');
+ $out .= '&securekey='.($mode ? ' ' : '');
+ 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 ? '' : '');
}
}
}
elseif ($type == 'contractline')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode?' ':'');
- if ($mode == 1) $out.='contractline_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? ' ' : '');
+ if ($mode == 1) $out .= 'contractline_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '' : '');
+ 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?' ':'');
- 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?'':'');
+ $out .= '&securekey='.($mode ? ' ' : '');
+ 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 ? '' : '');
}
}
}
elseif ($type == 'member' || $type == 'membersubscription')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?' ':'');
- if ($mode == 1) $out.='member_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? ' ' : '');
+ if ($mode == 1) $out .= 'member_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '' : '');
+ 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?' ':'');
- 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?'':'');
+ $out .= '&securekey='.($mode ? ' ' : '');
+ 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 ? '' : '');
}
}
}
if ($type == 'donation')
{
- $out=$urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode?' ':'');
- if ($mode == 1) $out.='donation_ref';
- if ($mode == 0) $out.=urlencode($ref);
- $out.=($mode?'':'');
- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ $out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? ' ' : '');
+ if ($mode == 1) $out .= 'donation_ref';
+ if ($mode == 0) $out .= urlencode($ref);
+ $out .= ($mode ? '' : '');
+ 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?' ':'');
- 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?'':'');
+ $out .= '&securekey='.($mode ? ' ' : '');
+ 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 ? '' : '');
}
}
}
// 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/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 ' ';
if ($showlineingray) {
- print '' . img_object('', 'projecttask') . ' ' . $lines[$i]->ref . '';
+ print ''.img_object('', 'projecttask').' '.$lines[$i]->ref.'';
} 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 " | ";
if ($showlineingray)
print '';
@@ -516,21 +516,21 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print " | \n";
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.description']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.description']['checked'])) {
print " ";
print $lines[$i]->description;
print " | \n";
}
// Date start
- if (count($arrayfields)>0 && !empty($arrayfields['t.dateo']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) {
print ' ';
print dol_print_date($lines[$i]->date_start, 'dayhour');
print ' | ';
}
// Date end
- if (count($arrayfields)>0 && !empty($arrayfields['t.datee']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {
print ' ';
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 ' | ';
$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 ' | ';
if ($showlineingray)
print '';
- else print '';
+ else print '';
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 ' | ';
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 '' . $langs->trans('WorkloadNotDefined') . '';
+ print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';
+ else print ''.$langs->trans('WorkloadNotDefined').'';
}
print ' | ';
}
// Progress declared
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress']['checked'])) {
print ' ';
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 ' | ';
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 ' | ';
if ($lines[$i]->usage_bill_time) {
print convertSecondToTime($lines[$i]->tobill, 'allhourmin');
$total_projectlinesa_tobill += $lines[$i]->tobill;
} else {
- print '' . $langs->trans("NA") . '';
+ print ''.$langs->trans("NA").'';
}
print ' | ';
}
// Time billed
- if (count($arrayfields)>0 && !empty($arrayfields['t.billed']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.billed']['checked'])) {
print ' ';
if ($lines[$i]->usage_bill_time) {
print convertSecondToTime($lines[$i]->billed, 'allhourmin');
$total_projectlinesa_billed += $lines[$i]->billed;
} else {
- print '' . $langs->trans("NA") . '';
+ print ''.$langs->trans("NA").'';
}
print ' | ';
}
@@ -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 ' ';
print '| '.$langs->trans("Total").' | ';
if ($showproject) print ' | | ';
- if (count($arrayfields)>0 && !empty($arrayfields['t.label']['checked'])) print ' | ';
- if (count($arrayfields)>0 && !empty($arrayfields['t.dateo']['checked'])) print ' | ';
- if (count($arrayfields)>0 && !empty($arrayfields['t.datee']['checked'])) print ' | ';
- if (count($arrayfields)>0 && !empty($arrayfields['t.planned_workload']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) print ' | ';
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) print ' | ';
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) print ' | ';
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.planned_workload']['checked'])) {
print '';
print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
print ' | ';
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.duration_effective']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.duration_effective']['checked'])) {
print '';
if ($projectidfortotallink > 0)
- print '';
+ print '';
print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
if ($projectidfortotallink > 0)
print '';
@@ -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 ' | ';
if ($total_projectlinesa_planned)
- print $totalCalculatedProgress . ' %';
+ print $totalCalculatedProgress.' %';
print ' | ';
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress']['checked'])) {
print '';
if ($total_projectlinesa_planned)
- print '' . $totalAverageDeclaredProgress . ' %';
+ print ''.$totalAverageDeclaredProgress.' %';
print ' | ';
}
// resume
- if (count($arrayfields)>0 && !empty($arrayfields['t.progress_summary']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_summary']['checked'])) {
print '';
if ($total_projectlinesa_planned) {
print '';
- print ' ';
- print ' ';
+ print ' ';
print ' | ';
print convertSecondToTime($total_projectlinesa_tobill, 'allhourmin');
print ' | ';
}
- if (count($arrayfields)>0 && !empty($arrayfields['t.billed']['checked'])) {
+ if (count($arrayfields) > 0 && !empty($arrayfields['t.billed']['checked'])) {
print '';
print convertSecondToTime($total_projectlinesa_billed, 'allhourmin');
print ' | ';
@@ -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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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\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 ''."\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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.$nbFiles.'';
+ if ($nbFiles > 0) $head[$h][1] .= ''.$nbFiles.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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 ''.$langs->trans("DateCreation").' | ';
print ''.$langs->trans("DateDeliveryPlanned").' | ';
print ''.$langs->trans("QtyPreparedOrShipped").' | ';
- if (! empty($conf->stock->enabled))
+ if (!empty($conf->stock->enabled))
{
print ''.$langs->trans("Warehouse").' | ';
}
@@ -260,7 +260,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
print '';
print ' | ';
}*/
- if (! empty($conf->livraison_bon->enabled))
+ if (!empty($conf->livraison_bon->enabled))
{
print ''.$langs->trans("DeliveryOrder").' | ';
//print ''.$langs->trans("QtyReceived").' | ';
@@ -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 '';
// 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)?'
'.dol_htmlentitiesbr($objp->description):'';
+ print (!empty($objp->description) && $objp->description != $objp->product) ? '
'.dol_htmlentitiesbr($objp->description) : '';
}
print ' | ';
@@ -336,11 +336,11 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
else
{
print "";
- 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.= ' '.$objp->label.'';
+ if (!empty($objp->label)) {
+ $text .= ' '.$objp->label.'';
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 ' | '.$objp->qty_shipped.' | ';
// Warehouse
- if (! empty($conf->stock->enabled))
+ if (!empty($conf->stock->enabled))
{
print '';
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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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].= ''.$nbNote.'';
+ if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).'';
$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].= ''.$nbContact.'';
+ if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.'';
$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] .= '' . $nbFiles . '';
+ $head[$h][1] .= ''.$nbFiles.'';
}
$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 '';
// Output html code for logo
- if ($urllogo || ! empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC))
+ if ($urllogo || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC))
{
print ' ';
print ' ';
if ($urllogo) {
- print ' ';
+ print '';
print ' ';
print '';
}
- if (! empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
- print ' ' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '';
+ if (!empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
+ print ' '.($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")).'';
}
print ' ';
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.=' ';
+ $out .= ' ';
}
- $out.='';
+ $out .= '';
// Date
- $out.=' ';
- $out.=dol_print_date($histo[$key]['datestart'], 'dayhour');
+ $out .= ' ';
+ $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.="\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 .= "\n";
// Ref
- $out.=' '."\n"; // end timeline-item
+ $out .= '
\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 ''; $ulprinted++;
+ print ''; $ulprinted++;
}
- print "\n".'';
+ print "\n".'';
if ($showfk)
{
print '';
@@ -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'].'
'."\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 '';
}
- 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']."
\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 ''; $ulprinted++;
+ print ''; $ulprinted++;
}
- print "\n".'';
+ print "\n".'';
if ($showfk)
{
print '';
@@ -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'].'
'."\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']."
\n";
- tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+ tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
print '';
}
}
- if (! empty($ulprinted) && ! empty($pere['rowid'])) { print ''."\n"; }
+ if (!empty($ulprinted) && !empty($pere['rowid'])) { print ''."\n"; }
if ($rang == 0) print '';
}
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..bc20612c747 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -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 ' | ';
print '| '.$langs->trans("TopMenuBackgroundColor").' | ';
- print '';
+ print ' | ';
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 ' | ';
print '| '.$langs->trans("LeftMenuBackgroundColor").' | ';
- print '';
+ print ' | ';
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 ' | ';
print '| '.$langs->trans("TextTitleColor").' | ';
@@ -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 ' ';
print '| '.$langs->trans("BackgroundTableTitleColor").' | ';
@@ -698,7 +698,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
{
print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
}
- print ' ('.$langs->trans("Default").': '.$default.') '; // $colorbacktitle1 in CSS
+ print ' ('.$langs->trans("Default").': '.$default.') '; // $colorbacktitle1 in CSS
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '';
print '';
@@ -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 '';
print '| '.$langs->trans("BackgroundTableTitleTextColor").' | ';
@@ -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 ' ';
print '| '.$langs->trans("BackgroundTableLineOddColor").' | ';
- print '';
+ print ' | ';
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 ' | ';
print '| '.$langs->trans("BackgroundTableLineEvenColor").' | ';
- print '';
+ print ' | ';
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 ' | ';
print '| '.$langs->trans("LinkColor").' | ';
@@ -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 ' ';
print '| '.$langs->trans("HighlightLinesColor").' | ';
- print '';
+ print ' | ';
//print '';
//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 ' | ';
print '| '.$langs->trans("HighlightLinesChecked").' | ';
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].= ''.($nbFiles+$nbLinks).'';
+ if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= ''.($nbFiles + $nbLinks).'';
$head[$tab][2] = 'documents';
$tab++;
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 0822109d45e..af8840b33ae 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -562,7 +562,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 +665,24 @@ function getSocialNetworkSharingLinks()
$hashtags = trim(join(' #', array_map('trim', explode(',', $websitepage->keywords))));
$out = ''."\n";
- $out.= ''."\n";
+ $out .= ' '."\n";
// Twitter
- $out.= ' '."\n";
- $out.= '';
- $out.= '';
- $out.= ' '."\n";
+ $out .= ' '."\n";
+ $out .= '';
+ $out .= '';
+ $out .= ' '."\n";
// Reddit
- $out.= ' '."\n";
+ $out .= ' '."\n";
// Facebook
- $out.= ' '."\n";
- $out.= ' '."\n";
- $out.= '
- global->MAIN_LOGIN_BACKGROUND)?' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));"':'' ?>>
+ global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));"' : '' ?>>
';
$disable_delete = 0;
$sql = 'SELECT d.rowid as did, d.paid, d.amount as d_amount, pd.amount';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'payment_donation as pd,'.MAIN_DB_PREFIX.'don as d';
-$sql.= ' WHERE pd.fk_donation = d.rowid';
-$sql.= ' AND d.entity = '.$conf->entity;
-$sql.= ' AND pd.rowid = '.$id;
+$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_donation as pd,'.MAIN_DB_PREFIX.'don as d';
+$sql .= ' WHERE pd.fk_donation = d.rowid';
+$sql .= ' AND d.entity = '.$conf->entity;
+$sql .= ' AND pd.rowid = '.$id;
dol_syslog("don/payment/card.php", LOG_DEBUG);
-$resql=$db->query($sql);
+$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
@@ -286,7 +286,7 @@ if (empty($action))
{
if ($user->rights->don->supprimer)
{
- if (! $disable_delete)
+ if (!$disable_delete)
{
print ''.$langs->trans('Delete').'';
}
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 182f7697601..46b0d93d564 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -29,11 +29,11 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
require_once DOL_DOCUMENT_ROOT.'/don/class/donstats.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
-$userid=GETPOST('userid', 'int');
-$socid=GETPOST('socid', 'int');
+$userid = GETPOST('userid', 'int');
+$socid = GETPOST('socid', 'int');
// Security check
if ($user->socid > 0)
{
@@ -41,21 +41,21 @@ if ($user->socid > 0)
$socid = $user->socid;
}
-$nowyear=strftime("%Y", dol_now());
-$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+$nowyear = strftime("%Y", dol_now());
+$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
//$startyear=$year-2;
-$startyear=$year-1;
-$endyear=$year;
+$startyear = $year - 1;
+$endyear = $year;
// Load translation files required by the page
-$langs->loadLangs(array("companies","other","sendings"));
+$langs->loadLangs(array("companies", "other", "sendings"));
/*
* View
*/
-$form=new Form($db);
+$form = new Form($db);
llxHeader();
@@ -64,7 +64,7 @@ print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
dol_mkdir($dir);
-$stats = new DonationStats($db, $socid, '', ($userid>0?$userid:0));
+$stats = new DonationStats($db, $socid, '', ($userid > 0 ? $userid : 0));
// Build graphic number of object
$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
@@ -83,13 +83,13 @@ else
$px1 = new DolGraph();
$mesg = $px1->isGraphKo();
-if (! $mesg)
+if (!$mesg)
{
$px1->SetData($data);
- $i=$startyear;$legend=array();
+ $i = $startyear; $legend = array();
while ($i <= $endyear)
{
- $legend[]=$i;
+ $legend[] = $i;
$i++;
}
$px1->SetLegend($legend);
@@ -100,7 +100,7 @@ if (! $mesg)
$px1->SetYLabel($langs->trans("NbOfSendings"));
$px1->SetShading(3);
$px1->SetHorizTickIncrement(1);
- $px1->mode='depth';
+ $px1->mode = 'depth';
$px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
$px1->draw($filenamenb, $fileurlnb);
@@ -188,22 +188,22 @@ if (! $mesg)
// Show array
$data = $stats->getAllByYear();
-$arrayyears=array();
-foreach($data as $val) {
- if (! empty($val['year'])) {
- $arrayyears[$val['year']]=$val['year'];
+$arrayyears = array();
+foreach ($data as $val) {
+ if (!empty($val['year'])) {
+ $arrayyears[$val['year']] = $val['year'];
}
}
-if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
-$h=0;
+$h = 0;
$head = array();
-$head[$h][0] = DOL_URL_ROOT . '/don/stats/index.php';
+$head[$h][0] = DOL_URL_ROOT.'/don/stats/index.php';
$head[$h][1] = $langs->trans("ByMonthYear");
$head[$h][2] = 'byyear';
$h++;
-$type='donation_stats';
+$type = 'donation_stats';
complete_head_from_modules($conf, $langs, null, $head, $h, $type);
@@ -231,8 +231,8 @@ print ' | ';
// Year
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 ' | ';
@@ -251,11 +251,11 @@ print ''.$langs->trans("NbOfSendings").' | ';
print ''.$langs->trans("AmountAverage").' | ';*/
print '';
-$oldyear=0;
+$oldyear = 0;
foreach ($data as $val)
{
$year = $val['year'];
- while (! empty($year) && $oldyear > $year+1)
+ while (!empty($year) && $oldyear > $year + 1)
{ // If we have empty year
$oldyear--;
print '';
@@ -273,7 +273,7 @@ foreach ($data as $val)
/*print '| '.price(price2num($val['total'],'MT'),1).' | ';
print ''.price(price2num($val['avg'],'MT'),1).' | ';*/
print ' ';
- $oldyear=$year;
+ $oldyear = $year;
}
print '
';
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index 94a676f964d..18c410ba4d0 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -29,13 +29,13 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("donations");
-$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 '| '.$langs->trans("Donation").' | ';
print ''.$objectlink->getNomUrl(1).' | ';
@@ -52,7 +52,7 @@ print ' ';
if (count($linkedObjectBlock) > 1)
{
?>
-
+
| trans("Total"); ?> |
|
|
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 754f68a9930..9f4820cd723 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -20,15 +20,15 @@
* \brief File to build ecm database
*/
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
$element = GETPOST('element', 'alpha');
/*
@@ -40,13 +40,13 @@ top_httphead();
//print ''."\n";
// Load original field value
-if (isset($action) && ! empty($action))
+if (isset($action) && !empty($action))
{
- $error=0;
+ $error = 0;
- if ($action == 'build' && ! empty($element))
+ if ($action == 'build' && !empty($element))
{
- require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmdirectory.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
$ecmdirstatic = new EcmDirectory($db);
$ecmdirtmp = new EcmDirectory($db);
@@ -54,57 +54,57 @@ if (isset($action) && ! empty($action))
// This part of code is same than into file index.php for action refreshmanual TODO Remove duplicate
clearstatcache();
- $diroutputslash=str_replace('\\', '/', $conf->$element->dir_output);
- $diroutputslash.='/';
+ $diroutputslash = str_replace('\\', '/', $conf->$element->dir_output);
+ $diroutputslash .= '/';
// Scan directory tree on disk
- $disktree=dol_dir_list($conf->$element->dir_output, 'directories', 1, '', array('^temp$'), '', '', 0);
+ $disktree = dol_dir_list($conf->$element->dir_output, 'directories', 1, '', array('^temp$'), '', '', 0);
// Scan directory tree in database
- $sqltree=$ecmdirstatic->get_full_arbo(0);
+ $sqltree = $ecmdirstatic->get_full_arbo(0);
- $adirwascreated=0;
+ $adirwascreated = 0;
// Now we compare both trees to complete missing trees into database
//var_dump($disktree);
//var_dump($sqltree);
- foreach($disktree as $dirdesc) // Loop on tree onto disk
+ foreach ($disktree as $dirdesc) // Loop on tree onto disk
{
set_time_limit(0); // To force restarts the timeout counter from zero
- $dirisindatabase=0;
- foreach($sqltree as $dirsqldesc)
+ $dirisindatabase = 0;
+ foreach ($sqltree as $dirsqldesc)
{
if ($conf->$element->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
{
- $dirisindatabase=1;
+ $dirisindatabase = 1;
break;
}
}
- if (! $dirisindatabase)
+ if (!$dirisindatabase)
{
- $txt="Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
+ $txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
dol_syslog($txt);
// We must first find the fk_parent of directory to create $dirdesc['fullname']
- $fk_parent=-1;
- $relativepathmissing=str_replace($diroutputslash, '', $dirdesc['fullname']);
- $relativepathtosearchparent=$relativepathmissing;
+ $fk_parent = -1;
+ $relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
+ $relativepathtosearchparent = $relativepathmissing;
//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
if (preg_match('/\//', $relativepathtosearchparent))
//while (preg_match('/\//',$relativepathtosearchparent))
{
- $relativepathtosearchparent=preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
- $txt="Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
+ $relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
+ $txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
dol_syslog($txt);
//print $txt." -> ";
- $parentdirisindatabase=0;
- foreach($sqltree as $dirsqldesc)
+ $parentdirisindatabase = 0;
+ foreach ($sqltree as $dirsqldesc)
{
if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
{
- $parentdirisindatabase=$dirsqldesc['id'];
+ $parentdirisindatabase = $dirsqldesc['id'];
break;
}
}
@@ -112,7 +112,7 @@ if (isset($action) && ! empty($action))
{
dol_syslog("Yes with id ".$parentdirisindatabase);
//print "Yes with id ".$parentdirisindatabase."
\n";
- $fk_parent=$parentdirisindatabase;
+ $fk_parent = $parentdirisindatabase;
//break; // We found parent, we can stop the while loop
}
else
@@ -124,7 +124,7 @@ if (isset($action) && ! empty($action))
else
{
dol_syslog("Parent is root");
- $fk_parent=0; // Parent is root
+ $fk_parent = 0; // Parent is root
}
if ($fk_parent >= 0)
@@ -134,20 +134,20 @@ if (isset($action) && ! empty($action))
$ecmdirtmp->description = '';
$ecmdirtmp->fk_parent = $fk_parent;
- $txt="We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
+ $txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
dol_syslog($txt);
//print $txt."
\n";
$id = $ecmdirtmp->create($user);
if ($id > 0)
{
- $newdirsql=array('id'=>$id,
+ $newdirsql = array('id'=>$id,
'id_mere'=>$ecmdirtmp->fk_parent,
'label'=>$ecmdirtmp->label,
'description'=>$ecmdirtmp->description,
'fullrelativename'=>$relativepathmissing);
- $sqltree[]=$newdirsql; // We complete fulltree for following loops
+ $sqltree[] = $newdirsql; // We complete fulltree for following loops
//var_dump($sqltree);
- $adirwascreated=1;
+ $adirwascreated = 1;
}
else
{
@@ -155,7 +155,7 @@ if (isset($action) && ! empty($action))
}
}
else {
- $txt="Parent of ".$dirdesc['fullname']." not found";
+ $txt = "Parent of ".$dirdesc['fullname']." not found";
dol_syslog($txt);
//print $txt."
\n";
}
@@ -163,19 +163,19 @@ if (isset($action) && ! empty($action))
}
// Loop now on each sql tree to check if dir exists
- foreach($sqltree as $dirdesc) // Loop on each sqltree to check dir is on disk
+ foreach ($sqltree as $dirdesc) // Loop on each sqltree to check dir is on disk
{
- $dirtotest=$conf->$element->dir_output.'/'.$dirdesc['fullrelativename'];
- if (! dol_is_dir($dirtotest))
+ $dirtotest = $conf->$element->dir_output.'/'.$dirdesc['fullrelativename'];
+ if (!dol_is_dir($dirtotest))
{
- $mesg.=$dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."
\n";
- $ecmdirtmp->id=$dirdesc['id'];
+ $mesg .= $dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."
\n";
+ $ecmdirtmp->id = $dirdesc['id'];
$ecmdirtmp->delete($user, 'databaseonly');
//exit;
}
}
- $sql="UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
+ $sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
dol_syslog("sql = ".$sql);
$db->query($sql);
}
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index c8c67f82b9c..3bddd70bfaa 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -30,7 +30,7 @@ class EcmDirectory // extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='ecm_directories';
+ public $element = 'ecm_directories';
/**
* @var string Name of table without prefix where object is stored
@@ -62,7 +62,7 @@ class EcmDirectory // extends CommonObject
*/
public $description;
- public $cachenbofdoc=-1; // By default cache initialized with value 'not calculated'
+ public $cachenbofdoc = -1; // By default cache initialized with value 'not calculated'
public $date_c;
public $date_m;
@@ -81,11 +81,11 @@ class EcmDirectory // extends CommonObject
*/
public $ref;
- public $cats=array();
- public $motherof=array();
+ public $cats = array();
+ public $motherof = array();
- public $forbiddenchars = array('<','>',':','/','\\','?','*','|','"');
- public $forbiddencharsdir = array('<','>',':','?','*','|','"');
+ public $forbiddenchars = array('<', '>', ':', '/', '\\', '?', '*', '|', '"');
+ public $forbiddencharsdir = array('<', '>', ':', '?', '*', '|', '"');
public $full_arbo_loaded;
@@ -122,46 +122,46 @@ class EcmDirectory // extends CommonObject
{
global $conf, $langs;
- $error=0;
- $now=dol_now();
+ $error = 0;
+ $now = dol_now();
// Clean parameters
- $this->label=dol_sanitizeFileName(trim($this->label));
- $this->fk_parent=trim($this->fk_parent);
- $this->description=trim($this->description);
- $this->date_c=$now;
- $this->fk_user_c=$user->id;
- if ($this->fk_parent <= 0) $this->fk_parent=0;
+ $this->label = dol_sanitizeFileName(trim($this->label));
+ $this->fk_parent = trim($this->fk_parent);
+ $this->description = trim($this->description);
+ $this->date_c = $now;
+ $this->fk_user_c = $user->id;
+ if ($this->fk_parent <= 0) $this->fk_parent = 0;
// Check if same directory does not exists with this name
- $relativepath=$this->label;
+ $relativepath = $this->label;
if ($this->fk_parent)
{
$parent = new EcmDirectory($this->db);
$parent->fetch($this->fk_parent);
- $relativepath=$parent->getRelativePath().$relativepath;
+ $relativepath = $parent->getRelativePath().$relativepath;
}
- $relativepath=preg_replace('/([\/])+/i', '/', $relativepath); // Avoid duplicate / or \
+ $relativepath = preg_replace('/([\/])+/i', '/', $relativepath); // Avoid duplicate / or \
//print $relativepath.'
';
$cat = new EcmDirectory($this->db);
$cate_arbo = $cat->get_full_arbo(1);
- $pathfound=0;
+ $pathfound = 0;
foreach ($cate_arbo as $key => $categ)
{
- $path=str_replace($this->forbiddencharsdir, '_', $categ['fullrelativename']);
+ $path = str_replace($this->forbiddencharsdir, '_', $categ['fullrelativename']);
//print $relativepath.' - '.$path.'
';
if ($path == $relativepath)
{
- $pathfound=1;
+ $pathfound = 1;
break;
}
}
if ($pathfound)
{
- $this->error="ErrorDirAlreadyExists";
+ $this->error = "ErrorDirAlreadyExists";
dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
return -1;
}
@@ -171,39 +171,39 @@ class EcmDirectory // extends CommonObject
// Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."ecm_directories(";
- $sql.= "label,";
- $sql.= "entity,";
- $sql.= "fk_parent,";
- $sql.= "description,";
- $sql.= "cachenbofdoc,";
- $sql.= "date_c,";
- $sql.= "fk_user_c";
- $sql.= ") VALUES (";
- $sql.= " '".$this->db->escape($this->label)."',";
- $sql.= " '".$this->db->escape($conf->entity)."',";
- $sql.= " '".$this->db->escape($this->fk_parent)."',";
- $sql.= " '".$this->db->escape($this->description)."',";
- $sql.= " ".$this->cachenbofdoc.",";
- $sql.= " '".$this->db->idate($this->date_c)."',";
- $sql.= " '".$this->db->escape($this->fk_user_c)."'";
- $sql.= ")";
+ $sql .= "label,";
+ $sql .= "entity,";
+ $sql .= "fk_parent,";
+ $sql .= "description,";
+ $sql .= "cachenbofdoc,";
+ $sql .= "date_c,";
+ $sql .= "fk_user_c";
+ $sql .= ") VALUES (";
+ $sql .= " '".$this->db->escape($this->label)."',";
+ $sql .= " '".$this->db->escape($conf->entity)."',";
+ $sql .= " '".$this->db->escape($this->fk_parent)."',";
+ $sql .= " '".$this->db->escape($this->description)."',";
+ $sql .= " ".$this->cachenbofdoc.",";
+ $sql .= " '".$this->db->idate($this->date_c)."',";
+ $sql .= " '".$this->db->escape($this->fk_user_c)."'";
+ $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."ecm_directories");
- $dir=$conf->ecm->dir_output.'/'.$this->getRelativePath();
- $result=dol_mkdir($dir);
- if ($result < 0) { $error++; $this->error="ErrorFailedToCreateDir"; }
+ $dir = $conf->ecm->dir_output.'/'.$this->getRelativePath();
+ $result = dol_mkdir($dir);
+ if ($result < 0) { $error++; $this->error = "ErrorFailedToCreateDir"; }
// Call trigger
- $result=$this->call_trigger('MYECMDIR_CREATE', $user);
+ $result = $this->call_trigger('MYECMDIR_CREATE', $user);
if ($result < 0) { $error++; }
// End call triggers
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $this->id;
@@ -216,7 +216,7 @@ class EcmDirectory // extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
$this->db->rollback();
return -1;
}
@@ -234,12 +234,12 @@ class EcmDirectory // extends CommonObject
{
global $conf, $langs;
- $error=0;
+ $error = 0;
// Clean parameters
- $this->label=trim($this->label);
- $this->fk_parent=trim($this->fk_parent);
- $this->description=trim($this->description);
+ $this->label = trim($this->label);
+ $this->fk_parent = trim($this->fk_parent);
+ $this->description = trim($this->description);
// Check parameters
// Put here code to add control on parameters values
@@ -248,28 +248,28 @@ class EcmDirectory // extends CommonObject
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
- $sql.= " label='".$this->db->escape($this->label)."',";
- $sql.= " fk_parent='".$this->db->escape($this->fk_parent)."',";
- $sql.= " description='".$this->db->escape($this->description)."'";
- $sql.= " WHERE rowid=".$this->id;
+ $sql .= " label='".$this->db->escape($this->label)."',";
+ $sql .= " fk_parent='".$this->db->escape($this->fk_parent)."',";
+ $sql .= " description='".$this->db->escape($this->description)."'";
+ $sql .= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql)
+ if (!$resql)
{
$error++;
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('MYECMDIR_MODIFY', $user);
+ $result = $this->call_trigger('MYECMDIR_MODIFY', $user);
if ($result < 0) { $error++; }
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 1;
@@ -292,15 +292,15 @@ class EcmDirectory // extends CommonObject
{
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
- if (preg_match('/[0-9]+/', $value)) $sql.= " cachenbofdoc = ".(int) $value;
- else $sql.= " cachenbofdoc = cachenbofdoc ".$value." 1";
- $sql.= " WHERE rowid = ".$this->id;
+ if (preg_match('/[0-9]+/', $value)) $sql .= " cachenbofdoc = ".(int) $value;
+ else $sql .= " cachenbofdoc = cachenbofdoc ".$value." 1";
+ $sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::changeNbOfFiles", 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;
}
else
@@ -323,20 +323,20 @@ class EcmDirectory // extends CommonObject
public function fetch($id)
{
$sql = "SELECT";
- $sql.= " t.rowid,";
- $sql.= " t.label,";
- $sql.= " t.fk_parent,";
- $sql.= " t.description,";
- $sql.= " t.cachenbofdoc,";
- $sql.= " t.fk_user_c,";
- $sql.= " t.fk_user_m,";
- $sql.= " t.date_c as date_c,";
- $sql.= " t.date_m as date_m";
- $sql.= " FROM ".MAIN_DB_PREFIX."ecm_directories as t";
- $sql.= " WHERE t.rowid = ".$id;
+ $sql .= " t.rowid,";
+ $sql .= " t.label,";
+ $sql .= " t.fk_parent,";
+ $sql .= " t.description,";
+ $sql .= " t.cachenbofdoc,";
+ $sql .= " t.fk_user_c,";
+ $sql .= " t.fk_user_m,";
+ $sql .= " t.date_c as date_c,";
+ $sql .= " t.date_m as date_m";
+ $sql .= " FROM ".MAIN_DB_PREFIX."ecm_directories 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)
{
$obj = $this->db->fetch_object($resql);
@@ -357,11 +357,11 @@ class EcmDirectory // extends CommonObject
$this->db->free($resql);
- return $obj?1:0;
+ return $obj ? 1 : 0;
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
}
@@ -380,29 +380,29 @@ class EcmDirectory // extends CommonObject
global $conf, $langs;
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $error=0;
+ $error = 0;
- if ($mode != 'databaseonly') $relativepath=$this->getRelativePath(1); // Ex: dir1/dir2/dir3
+ if ($mode != 'databaseonly') $relativepath = $this->getRelativePath(1); // Ex: dir1/dir2/dir3
- dol_syslog(get_class($this)."::delete remove directory id=".$this->id." mode=".$mode.(($mode == 'databaseonly')?'':' relativepath='.$relativepath));
+ dol_syslog(get_class($this)."::delete remove directory id=".$this->id." mode=".$mode.(($mode == 'databaseonly') ? '' : ' relativepath='.$relativepath));
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_directories";
- $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->db->rollback();
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -2;
}
else
{
// Call trigger
- $result=$this->call_trigger('MYECMDIR_DELETE', $user);
+ $result = $this->call_trigger('MYECMDIR_DELETE', $user);
if ($result < 0)
{
$this->db->rollback();
@@ -413,30 +413,30 @@ class EcmDirectory // extends CommonObject
if ($mode != 'databaseonly')
{
- $file = $conf->ecm->dir_output . "/" . $relativepath;
+ $file = $conf->ecm->dir_output."/".$relativepath;
if ($deletedirrecursive)
{
- $result=@dol_delete_dir_recursive($file, 0, 0);
+ $result = @dol_delete_dir_recursive($file, 0, 0);
}
else
{
- $result=@dol_delete_dir($file, 0);
+ $result = @dol_delete_dir($file, 0);
}
}
- if ($result || ! @is_dir(dol_osencode($file)))
+ if ($result || !@is_dir(dol_osencode($file)))
{
$this->db->commit();
}
else
{
- $this->error='ErrorFailToDeleteDir';
+ $this->error = 'ErrorFailToDeleteDir';
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
$this->db->rollback();
$error++;
}
- if (! $error) return 1;
+ if (!$error) return 1;
else return -1;
}
@@ -450,11 +450,11 @@ class EcmDirectory // extends CommonObject
*/
public function initAsSpecimen()
{
- $this->id=0;
+ $this->id = 0;
- $this->label='MyDirectory';
- $this->fk_parent='0';
- $this->description='This is a directory';
+ $this->label = 'MyDirectory';
+ $this->fk_parent = '0';
+ $this->description = 'This is a directory';
}
@@ -472,24 +472,24 @@ class EcmDirectory // extends CommonObject
{
global $langs;
- $result='';
+ $result = '';
//$newref=str_replace('_',' ',$this->ref);
- $newref=$this->ref;
- $label=$langs->trans("ShowECMSection").': '.$newref;
- $linkclose='"'.($more?' '.$more:'').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+ $newref = $this->ref;
+ $label = $langs->trans("ShowECMSection").': '.$newref;
+ $linkclose = '"'.($more ? ' '.$more : '').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
$linkstart = 'picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
- if ($withpicto != 2) $result.= ($max?dol_trunc($newref, $max, 'middle'):$newref);
+ if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ if ($withpicto != 2) $result .= ($max ?dol_trunc($newref, $max, 'middle') : $newref);
$result .= $linkend;
return $result;
@@ -505,17 +505,17 @@ class EcmDirectory // extends CommonObject
{
$this->get_full_arbo($force);
- $ret='';
- $idtosearch=$this->id;
- $i=0;
+ $ret = '';
+ $idtosearch = $this->id;
+ $i = 0;
do {
// Get index cursor in this->cats for id_mere
- $cursorindex=-1;
+ $cursorindex = -1;
foreach ($this->cats as $key => $val)
{
if ($this->cats[$key]['id'] == $idtosearch)
{
- $cursorindex=$key;
+ $cursorindex = $key;
break;
}
}
@@ -524,13 +524,13 @@ class EcmDirectory // extends CommonObject
if ($cursorindex >= 0)
{
// Path is label sanitized (no space and no special char) and concatenated
- $ret=dol_sanitizeFileName($this->cats[$cursorindex]['label']).'/'.$ret;
+ $ret = dol_sanitizeFileName($this->cats[$cursorindex]['label']).'/'.$ret;
- $idtosearch=$this->cats[$cursorindex]['id_mere'];
+ $idtosearch = $this->cats[$cursorindex]['id_mere'];
$i++;
}
}
- while ($cursorindex >= 0 && ! empty($idtosearch) && $i < 100); // i avoid infinite loop
+ while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop
return $ret;
}
@@ -546,22 +546,22 @@ class EcmDirectory // extends CommonObject
// phpcs:enable
global $conf;
- $this->motherof=array();
+ $this->motherof = array();
// Load array[child]=parent
$sql = "SELECT fk_parent as id_parent, rowid as id_son";
- $sql.= " FROM ".MAIN_DB_PREFIX."ecm_directories";
- $sql.= " WHERE fk_parent != 0";
- $sql.= " AND entity = ".$conf->entity;
+ $sql .= " FROM ".MAIN_DB_PREFIX."ecm_directories";
+ $sql .= " WHERE fk_parent != 0";
+ $sql .= " AND entity = ".$conf->entity;
dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
// This assignment in condition is not a bug. It allows walking the results.
- while ($obj=$this->db->fetch_object($resql))
+ while ($obj = $this->db->fetch_object($resql))
{
- $this->motherof[$obj->id_son]=$obj->id_parent;
+ $this->motherof[$obj->id_son] = $obj->id_parent;
}
return 1;
}
@@ -625,7 +625,7 @@ class EcmDirectory // extends CommonObject
// phpcs:enable
global $conf;
- if (empty($force) && ! empty($this->full_arbo_loaded))
+ if (empty($force) && !empty($this->full_arbo_loaded))
{
return $this->cats;
}
@@ -635,29 +635,29 @@ class EcmDirectory // extends CommonObject
// Charge tableau des categories
$sql = "SELECT c.rowid as rowid, c.label as label,";
- $sql.= " c.description as description, c.cachenbofdoc,";
- $sql.= " c.fk_user_c,";
- $sql.= " c.date_c,";
- $sql.= " u.login as login_c,";
- $sql.= " ca.rowid as rowid_fille";
- $sql.= " FROM ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."ecm_directories as c";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."ecm_directories as ca";
- $sql.= " ON c.rowid = ca.fk_parent";
- $sql.= " WHERE c.fk_user_c = u.rowid";
- $sql.= " AND c.entity = ".$conf->entity;
- $sql.= " ORDER BY c.label, c.rowid";
+ $sql .= " c.description as description, c.cachenbofdoc,";
+ $sql .= " c.fk_user_c,";
+ $sql .= " c.date_c,";
+ $sql .= " u.login as login_c,";
+ $sql .= " ca.rowid as rowid_fille";
+ $sql .= " FROM ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."ecm_directories as c";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ecm_directories as ca";
+ $sql .= " ON c.rowid = ca.fk_parent";
+ $sql .= " WHERE c.fk_user_c = u.rowid";
+ $sql .= " AND c.entity = ".$conf->entity;
+ $sql .= " ORDER BY c.label, c.rowid";
dol_syslog(get_class($this)."::get_full_arbo", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
$this->cats = array();
- $i=0;
+ $i = 0;
// This assignment in condition is not a bug. It allows walking the results.
while ($obj = $this->db->fetch_object($resql))
{
$this->cats[$obj->rowid]['id'] = $obj->rowid;
- $this->cats[$obj->rowid]['id_mere'] = (isset($this->motherof[$obj->rowid])?$this->motherof[$obj->rowid]:'');
+ $this->cats[$obj->rowid]['id_mere'] = (isset($this->motherof[$obj->rowid]) ? $this->motherof[$obj->rowid] : '');
$this->cats[$obj->rowid]['label'] = $obj->label;
$this->cats[$obj->rowid]['description'] = $obj->description;
$this->cats[$obj->rowid]['cachenbofdoc'] = $obj->cachenbofdoc;
@@ -665,18 +665,18 @@ class EcmDirectory // extends CommonObject
$this->cats[$obj->rowid]['fk_user_c'] = $obj->fk_user_c;
$this->cats[$obj->rowid]['login_c'] = $obj->login_c;
- if (! empty($obj->rowid_fille))
+ if (!empty($obj->rowid_fille))
{
if (isset($this->cats[$obj->rowid]['id_children']) && is_array($this->cats[$obj->rowid]['id_children']))
{
- $newelempos=count($this->cats[$obj->rowid]['id_children']);
+ $newelempos = count($this->cats[$obj->rowid]['id_children']);
//print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements
";
- $this->cats[$obj->rowid]['id_children'][$newelempos]=$obj->rowid_fille;
+ $this->cats[$obj->rowid]['id_children'][$newelempos] = $obj->rowid_fille;
}
else
{
//print "this->cats[".$obj->rowid."]['id_children'] n'est pas encore un tableau
";
- $this->cats[$obj->rowid]['id_children']=array($obj->rowid_fille);
+ $this->cats[$obj->rowid]['id_children'] = array($obj->rowid_fille);
}
}
$i++;
@@ -689,14 +689,14 @@ class EcmDirectory // extends CommonObject
}
// We add properties fullxxx to all elements
- foreach($this->cats as $key => $val)
+ foreach ($this->cats as $key => $val)
{
if (isset($motherof[$key])) continue;
$this->build_path_from_id_categ($key, 0);
}
- $this->cats=dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);
- $this->full_arbo_loaded=1;
+ $this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);
+ $this->full_arbo_loaded = 1;
return $this->cats;
}
@@ -714,30 +714,30 @@ class EcmDirectory // extends CommonObject
{
// phpcs:enable
// Define fullpath
- if (! empty($this->cats[$id_categ]['id_mere']))
+ if (!empty($this->cats[$id_categ]['id_mere']))
{
- $this->cats[$id_categ]['fullpath'] =$this->cats[$this->cats[$id_categ]['id_mere']]['fullpath'];
- $this->cats[$id_categ]['fullpath'].='_'.$id_categ;
- $this->cats[$id_categ]['fullrelativename'] =$this->cats[$this->cats[$id_categ]['id_mere']]['fullrelativename'];
- $this->cats[$id_categ]['fullrelativename'].='/'.$this->cats[$id_categ]['label'];
- $this->cats[$id_categ]['fulllabel'] =$this->cats[$this->cats[$id_categ]['id_mere']]['fulllabel'];
- $this->cats[$id_categ]['fulllabel'].=' >> '.$this->cats[$id_categ]['label'];
+ $this->cats[$id_categ]['fullpath'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullpath'];
+ $this->cats[$id_categ]['fullpath'] .= '_'.$id_categ;
+ $this->cats[$id_categ]['fullrelativename'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullrelativename'];
+ $this->cats[$id_categ]['fullrelativename'] .= '/'.$this->cats[$id_categ]['label'];
+ $this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fulllabel'];
+ $this->cats[$id_categ]['fulllabel'] .= ' >> '.$this->cats[$id_categ]['label'];
}
else
{
- $this->cats[$id_categ]['fullpath']='_'.$id_categ;
- $this->cats[$id_categ]['fullrelativename']=$this->cats[$id_categ]['label'];
- $this->cats[$id_categ]['fulllabel']=$this->cats[$id_categ]['label'];
+ $this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
+ $this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
+ $this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
}
// We count number of _ to have level (we use strlen that is faster than dol_strlen)
- $this->cats[$id_categ]['level']=strlen(preg_replace('/([^_])/i', '', $this->cats[$id_categ]['fullpath']));
+ $this->cats[$id_categ]['level'] = strlen(preg_replace('/([^_])/i', '', $this->cats[$id_categ]['fullpath']));
// Traite ces enfants
$protection++;
- if ($protection > 20) return; // On ne traite pas plus de 20 niveaux
+ if ($protection > 20) return; // On ne traite pas plus de 20 niveaux
if (isset($this->cats[$id_categ]['id_children']) && is_array($this->cats[$id_categ]['id_children']))
{
- foreach($this->cats[$id_categ]['id_children'] as $key => $val)
+ foreach ($this->cats[$id_categ]['id_children'] as $key => $val)
{
$this->build_path_from_id_categ($val, $protection);
}
@@ -755,34 +755,34 @@ class EcmDirectory // extends CommonObject
global $conf;
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $dir=$conf->ecm->dir_output.'/'.$this->getRelativePath();
- $filelist=dol_dir_list($dir, 'files', 0, '', '(\.meta|_preview.*\.png)$');
+ $dir = $conf->ecm->dir_output.'/'.$this->getRelativePath();
+ $filelist = dol_dir_list($dir, 'files', 0, '', '(\.meta|_preview.*\.png)$');
// Test if filelist is in database
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
- $sql.= " cachenbofdoc = '".count($filelist)."'";
+ $sql .= " cachenbofdoc = '".count($filelist)."'";
if (empty($all)) // By default
{
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " WHERE rowid = ".$this->id;
}
else
{
- $sql.= " WHERE entity = ".$conf->entity;
+ $sql .= " WHERE entity = ".$conf->entity;
}
dol_syslog(get_class($this)."::refreshcachenboffile", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
- $this->cachenbofdoc=count($filelist);
+ $this->cachenbofdoc = count($filelist);
return $this->cachenbofdoc;
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
}
@@ -803,19 +803,19 @@ class EcmDirectory // extends CommonObject
public function call_trigger($triggerName, $user)
{
// phpcs:enable
- global $langs,$conf;
+ global $langs, $conf;
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers($triggerName, $this, $user, $langs, $conf);
+ include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+ $interface = new Interfaces($this->db);
+ $result = $interface->run_triggers($triggerName, $this, $user, $langs, $conf);
if ($result < 0) {
if (!empty($this->errors))
{
- $this->errors=array_merge($this->errors, $interface->errors);
+ $this->errors = array_merge($this->errors, $interface->errors);
}
else
{
- $this->errors=$interface->errors;
+ $this->errors = $interface->errors;
}
}
return $result;
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 01f6228ad83..0c7c4c4cebb 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -27,7 +27,7 @@
*/
// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
/**
* Class to manage ECM files
@@ -60,7 +60,7 @@ class EcmFiles extends CommonObject
*/
public $label;
- public $share; // hash for file sharing, empty by default (example: getRandomPassword(true))
+ public $share; // hash for file sharing, empty by default (example: getRandomPassword(true))
/**
* @var int Entity
@@ -79,7 +79,7 @@ class EcmFiles extends CommonObject
public $keywords;
public $cover;
public $position;
- public $gen_or_uploaded; // can be 'generated', 'uploaded', 'unknown'
+ public $gen_or_uploaded; // can be 'generated', 'uploaded', 'unknown'
public $extraparams;
public $date_c = '';
public $date_m = '';
@@ -142,7 +142,7 @@ class EcmFiles extends CommonObject
}
if (isset($this->filepath)) {
$this->filepath = trim($this->filepath);
- $this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath); // Remove last /
+ $this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath); // Remove last /
}
if (isset($this->fullpath_orig)) {
$this->fullpath_orig = trim($this->fullpath_orig);
@@ -179,20 +179,20 @@ class EcmFiles extends CommonObject
// If ref not defined
$ref = '';
- if (! empty($this->ref))
+ if (!empty($this->ref))
{
- $ref=$this->ref;
+ $ref = $this->ref;
}
else {
include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
$ref = dol_hash($this->filepath.'/'.$this->filename, 3);
}
- $maxposition=0;
+ $maxposition = 0;
if (empty($this->position)) // Get max used
{
- $sql = "SELECT MAX(position) as maxposition FROM " . MAIN_DB_PREFIX . $this->table_element;
- $sql.= " WHERE filepath ='".$this->db->escape($this->filepath)."'";
+ $sql = "SELECT MAX(position) as maxposition FROM ".MAIN_DB_PREFIX.$this->table_element;
+ $sql .= " WHERE filepath ='".$this->db->escape($this->filepath)."'";
$resql = $this->db->query($sql);
if ($resql)
@@ -202,14 +202,14 @@ class EcmFiles extends CommonObject
}
else
{
- $this->errors[] = 'Error ' . $this->db->lasterror();
+ $this->errors[] = 'Error '.$this->db->lasterror();
return --$error;
}
- $maxposition=$maxposition+1;
+ $maxposition = $maxposition + 1;
}
else
{
- $maxposition=$this->position;
+ $maxposition = $this->position;
}
// Check parameters
@@ -218,75 +218,75 @@ class EcmFiles extends CommonObject
$this->errors[] = 'Bad property filename or filepath';
return --$error;
}
- if (! isset($this->entity))
+ if (!isset($this->entity))
{
$this->entity = $conf->entity;
}
// Put here code to add control on parameters values
// Insert request
- $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
- $sql.= 'ref,';
- $sql.= 'label,';
- $sql.= 'share,';
- $sql.= 'entity,';
- $sql.= 'filename,';
- $sql.= 'filepath,';
- $sql.= 'fullpath_orig,';
- $sql.= 'description,';
- $sql.= 'keywords,';
- $sql.= 'cover,';
- $sql.= 'position,';
- $sql.= 'gen_or_uploaded,';
- $sql.= 'extraparams,';
- $sql.= 'date_c,';
- $sql.= 'date_m,';
- $sql.= 'fk_user_c,';
- $sql.= 'fk_user_m,';
- $sql.= 'acl,';
- $sql.= 'src_object_type,';
- $sql.= 'src_object_id';
+ $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
+ $sql .= 'ref,';
+ $sql .= 'label,';
+ $sql .= 'share,';
+ $sql .= 'entity,';
+ $sql .= 'filename,';
+ $sql .= 'filepath,';
+ $sql .= 'fullpath_orig,';
+ $sql .= 'description,';
+ $sql .= 'keywords,';
+ $sql .= 'cover,';
+ $sql .= 'position,';
+ $sql .= 'gen_or_uploaded,';
+ $sql .= 'extraparams,';
+ $sql .= 'date_c,';
+ $sql .= 'date_m,';
+ $sql .= 'fk_user_c,';
+ $sql .= 'fk_user_m,';
+ $sql .= 'acl,';
+ $sql .= 'src_object_type,';
+ $sql .= 'src_object_id';
$sql .= ') VALUES (';
$sql .= " '".$ref."', ";
- $sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
- $sql .= ' '.(! isset($this->share)?'NULL':"'".$this->db->escape($this->share)."'").',';
+ $sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
+ $sql .= ' '.(!isset($this->share) ? 'NULL' : "'".$this->db->escape($this->share)."'").',';
$sql .= ' '.$this->entity.',';
- $sql .= ' '.(! isset($this->filename)?'NULL':"'".$this->db->escape($this->filename)."'").',';
- $sql .= ' '.(! isset($this->filepath)?'NULL':"'".$this->db->escape($this->filepath)."'").',';
- $sql .= ' '.(! isset($this->fullpath_orig)?'NULL':"'".$this->db->escape($this->fullpath_orig)."'").',';
- $sql .= ' '.(! isset($this->description)?'NULL':"'".$this->db->escape($this->description)."'").',';
- $sql .= ' '.(! isset($this->keywords)?'NULL':"'".$this->db->escape($this->keywords)."'").',';
- $sql .= ' '.(! isset($this->cover)?'NULL':"'".$this->db->escape($this->cover)."'").',';
+ $sql .= ' '.(!isset($this->filename) ? 'NULL' : "'".$this->db->escape($this->filename)."'").',';
+ $sql .= ' '.(!isset($this->filepath) ? 'NULL' : "'".$this->db->escape($this->filepath)."'").',';
+ $sql .= ' '.(!isset($this->fullpath_orig) ? 'NULL' : "'".$this->db->escape($this->fullpath_orig)."'").',';
+ $sql .= ' '.(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").',';
+ $sql .= ' '.(!isset($this->keywords) ? 'NULL' : "'".$this->db->escape($this->keywords)."'").',';
+ $sql .= ' '.(!isset($this->cover) ? 'NULL' : "'".$this->db->escape($this->cover)."'").',';
$sql .= ' '.$maxposition.',';
- $sql .= ' '.(! isset($this->gen_or_uploaded)?'NULL':"'".$this->db->escape($this->gen_or_uploaded)."'").',';
- $sql .= ' '.(! isset($this->extraparams)?'NULL':"'".$this->db->escape($this->extraparams)."'").',';
+ $sql .= ' '.(!isset($this->gen_or_uploaded) ? 'NULL' : "'".$this->db->escape($this->gen_or_uploaded)."'").',';
+ $sql .= ' '.(!isset($this->extraparams) ? 'NULL' : "'".$this->db->escape($this->extraparams)."'").',';
$sql .= ' '."'".$this->db->idate($this->date_c)."'".',';
- $sql .= ' '.(! isset($this->date_m) || dol_strlen($this->date_m)==0?'NULL':"'".$this->db->idate($this->date_m)."'").',';
- $sql .= ' '.(! isset($this->fk_user_c)?$user->id:$this->fk_user_c).',';
- $sql .= ' '.(! isset($this->fk_user_m)?'NULL':$this->fk_user_m).',';
- $sql .= ' '.(! isset($this->acl)?'NULL':"'".$this->db->escape($this->acl)."'").',';
- $sql .= ' '.(! isset($this->src_object_type)?'NULL':"'".$this->db->escape($this->src_object_type)."'").',';
- $sql .= ' '.(! isset($this->src_object_id)?'NULL':$this->src_object_id);
+ $sql .= ' '.(!isset($this->date_m) || dol_strlen($this->date_m) == 0 ? 'NULL' : "'".$this->db->idate($this->date_m)."'").',';
+ $sql .= ' '.(!isset($this->fk_user_c) ? $user->id : $this->fk_user_c).',';
+ $sql .= ' '.(!isset($this->fk_user_m) ? 'NULL' : $this->fk_user_m).',';
+ $sql .= ' '.(!isset($this->acl) ? 'NULL' : "'".$this->db->escape($this->acl)."'").',';
+ $sql .= ' '.(!isset($this->src_object_type) ? 'NULL' : "'".$this->db->escape($this->src_object_type)."'").',';
+ $sql .= ' '.(!isset($this->src_object_id) ? 'NULL' : $this->src_object_id);
$sql .= ')';
$this->db->begin();
$resql = $this->db->query($sql);
if (!$resql) {
- $error ++;
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+ $error++;
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.implode(',', $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);
$this->position = $maxposition;
// Triggers
- if (! $notrigger)
+ if (!$notrigger)
{
// Call triggers
- $result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
+ $result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -296,7 +296,7 @@ class EcmFiles extends CommonObject
if ($error) {
$this->db->rollback();
- return - 1 * $error;
+ return -1 * $error;
} else {
$this->db->commit();
@@ -344,25 +344,25 @@ class EcmFiles extends CommonObject
$sql .= " t.acl,";
$sql .= " t.src_object_type,";
$sql .= " t.src_object_id";
- $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
- $sql.= ' WHERE 1 = 1';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+ $sql .= ' WHERE 1 = 1';
/* Fetching this table depends on filepath+filename, it must not depends on entity
if (! empty($conf->multicompany->enabled)) {
$sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
}*/
if ($relativepath) {
- $sql .= " AND t.filepath = '" . $this->db->escape(dirname($relativepath)) . "' AND t.filename = '".$this->db->escape(basename($relativepath))."'";
- $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
+ $sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."' AND t.filename = '".$this->db->escape(basename($relativepath))."'";
+ $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
}
- elseif (! empty($ref)) { // hash of file path
+ elseif (!empty($ref)) { // hash of file path
$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
- $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
+ $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
}
- elseif (! empty($hashoffile)) { // hash of content
+ elseif (!empty($hashoffile)) { // hash of content
$sql .= " AND t.label = '".$this->db->escape($hashoffile)."'";
- $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
+ $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
}
- elseif (! empty($hashforshare)) {
+ elseif (!empty($hashforshare)) {
$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
//$sql .= " AND t.entity = ".$conf->entity; // hashforshare already unique
}
@@ -373,10 +373,10 @@ class EcmFiles extends CommonObject
$sql .= " AND t.entity = ".$conf->entity;
}
else {
- $sql .= ' AND t.rowid = '.$this->db->escape($id); // rowid already unique
+ $sql .= ' AND t.rowid = '.$this->db->escape($id); // rowid already unique
}
- $this->db->plimit(1); // When we search on src or on hash of content (hashforfile) to solve hash conflict when several files has same content, we take first one only
+ $this->db->plimit(1); // When we search on src or on hash of content (hashforfile) to solve hash conflict when several files has same content, we take first one only
$this->db->order('t.rowid', 'ASC');
$resql = $this->db->query($sql);
@@ -422,8 +422,8 @@ class EcmFiles extends CommonObject
return 0;
}
} else {
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
return -1;
}
@@ -466,28 +466,28 @@ class EcmFiles extends CommonObject
$sql .= " t.acl,";
$sql .= " t.src_object_type,";
$sql .= " t.src_object_id";
- $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
// Manage filter
$sqlwhere = array();
if (count($filter) > 0) {
foreach ($filter as $key => $value) {
- $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+ $sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
}
}
- $sql.= ' WHERE 1 = 1';
+ $sql .= ' WHERE 1 = 1';
/* Fetching this table depends on filepath+filename, it must not depends on entity
if (! empty($conf->multicompany->enabled)) {
$sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
}*/
if (count($sqlwhere) > 0) {
- $sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
+ $sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
}
if (!empty($sortfield)) {
$sql .= $this->db->order($sortfield, $sortorder);
}
if (!empty($limit)) {
- $sql .= ' ' . $this->db->plimit($limit, $offset);
+ $sql .= ' '.$this->db->plimit($limit, $offset);
}
$this->lines = array();
@@ -526,10 +526,10 @@ class EcmFiles extends CommonObject
return $num;
} else {
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
- return - 1;
+ return -1;
}
}
@@ -601,42 +601,42 @@ class EcmFiles extends CommonObject
// Put here code to add a control on parameters values
// Update request
- $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
$sql .= " ref = '".dol_hash($this->filepath.'/'.$this->filename, 3)."',";
- $sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
- $sql .= ' share = '.(! empty($this->share)?"'".$this->db->escape($this->share)."'":"null").',';
- $sql .= ' entity = '.(isset($this->entity)?$this->entity:$conf->entity).',';
- $sql .= ' filename = '.(isset($this->filename)?"'".$this->db->escape($this->filename)."'":"null").',';
- $sql .= ' filepath = '.(isset($this->filepath)?"'".$this->db->escape($this->filepath)."'":"null").',';
- $sql .= ' fullpath_orig = '.(isset($this->fullpath_orig)?"'".$this->db->escape($this->fullpath_orig)."'":"null").',';
- $sql .= ' description = '.(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").',';
- $sql .= ' keywords = '.(isset($this->keywords)?"'".$this->db->escape($this->keywords)."'":"null").',';
- $sql .= ' cover = '.(isset($this->cover)?"'".$this->db->escape($this->cover)."'":"null").',';
- $sql .= ' position = '.(isset($this->position)?$this->db->escape($this->position):"0").',';
- $sql .= ' gen_or_uploaded = '.(isset($this->gen_or_uploaded)?"'".$this->db->escape($this->gen_or_uploaded)."'":"null").',';
- $sql .= ' extraparams = '.(isset($this->extraparams)?"'".$this->db->escape($this->extraparams)."'":"null").',';
- $sql .= ' date_c = '.(! isset($this->date_c) || dol_strlen($this->date_c) != 0 ? "'".$this->db->idate($this->date_c)."'" : 'null').',';
+ $sql .= ' label = '.(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
+ $sql .= ' share = '.(!empty($this->share) ? "'".$this->db->escape($this->share)."'" : "null").',';
+ $sql .= ' entity = '.(isset($this->entity) ? $this->entity : $conf->entity).',';
+ $sql .= ' filename = '.(isset($this->filename) ? "'".$this->db->escape($this->filename)."'" : "null").',';
+ $sql .= ' filepath = '.(isset($this->filepath) ? "'".$this->db->escape($this->filepath)."'" : "null").',';
+ $sql .= ' fullpath_orig = '.(isset($this->fullpath_orig) ? "'".$this->db->escape($this->fullpath_orig)."'" : "null").',';
+ $sql .= ' description = '.(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").',';
+ $sql .= ' keywords = '.(isset($this->keywords) ? "'".$this->db->escape($this->keywords)."'" : "null").',';
+ $sql .= ' cover = '.(isset($this->cover) ? "'".$this->db->escape($this->cover)."'" : "null").',';
+ $sql .= ' position = '.(isset($this->position) ? $this->db->escape($this->position) : "0").',';
+ $sql .= ' gen_or_uploaded = '.(isset($this->gen_or_uploaded) ? "'".$this->db->escape($this->gen_or_uploaded)."'" : "null").',';
+ $sql .= ' extraparams = '.(isset($this->extraparams) ? "'".$this->db->escape($this->extraparams)."'" : "null").',';
+ $sql .= ' date_c = '.(!isset($this->date_c) || dol_strlen($this->date_c) != 0 ? "'".$this->db->idate($this->date_c)."'" : 'null').',';
//$sql .= ' date_m = '.(! isset($this->date_m) || dol_strlen($this->date_m) != 0 ? "'".$this->db->idate($this->date_m)."'" : 'null').','; // Field automatically updated
- $sql .= ' fk_user_m = '.($this->fk_user_m > 0?$this->fk_user_m:$user->id).',';
- $sql .= ' acl = '.(isset($this->acl)?"'".$this->db->escape($this->acl)."'":"null").',';
- $sql .= ' src_object_id = '.($this->src_object_id > 0?$this->src_object_id:"null").',';
- $sql .= ' src_object_type = '.(isset($this->src_object_type)?"'".$this->db->escape($this->src_object_type)."'":"null");
- $sql .= ' WHERE rowid=' . $this->id;
+ $sql .= ' fk_user_m = '.($this->fk_user_m > 0 ? $this->fk_user_m : $user->id).',';
+ $sql .= ' acl = '.(isset($this->acl) ? "'".$this->db->escape($this->acl)."'" : "null").',';
+ $sql .= ' src_object_id = '.($this->src_object_id > 0 ? $this->src_object_id : "null").',';
+ $sql .= ' src_object_type = '.(isset($this->src_object_type) ? "'".$this->db->escape($this->src_object_type)."'" : "null");
+ $sql .= ' WHERE rowid='.$this->id;
$this->db->begin();
$resql = $this->db->query($sql);
if (!$resql) {
- $error ++;
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+ $error++;
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
}
// Triggers
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call triggers
- $result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
+ $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
// End call triggers
}
@@ -645,7 +645,7 @@ class EcmFiles extends CommonObject
if ($error) {
$this->db->rollback();
- return - 1 * $error;
+ return -1 * $error;
} else {
$this->db->commit();
@@ -670,10 +670,10 @@ class EcmFiles extends CommonObject
$this->db->begin();
// Triggers
- if (! $notrigger)
+ if (!$notrigger)
{
// Call triggers
- $result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
+ $result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
// End call triggers
}
@@ -681,14 +681,14 @@ class EcmFiles extends CommonObject
// If you need to delete child tables to, you can insert them here
if (!$error) {
- $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
- $sql .= ' WHERE rowid=' . $this->id;
+ $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' WHERE rowid='.$this->id;
$resql = $this->db->query($sql);
if (!$resql) {
- $error ++;
- $this->errors[] = 'Error ' . $this->db->lasterror();
- dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+ $error++;
+ $this->errors[] = 'Error '.$this->db->lasterror();
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
}
}
@@ -696,7 +696,7 @@ class EcmFiles extends CommonObject
if ($error) {
$this->db->rollback();
- return - 1 * $error;
+ return -1 * $error;
} else {
$this->db->commit();
@@ -734,9 +734,9 @@ class EcmFiles extends CommonObject
// Other options
if ($result < 0) {
- $error ++;
+ $error++;
$this->errors = $object->errors;
- dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
}
unset($object->context['createfromclone']);
@@ -749,7 +749,7 @@ class EcmFiles extends CommonObject
} else {
$this->db->rollback();
- return - 1;
+ return -1;
}
}
@@ -769,40 +769,40 @@ class EcmFiles extends CommonObject
global $dolibarr_main_authentication, $dolibarr_main_demo;
global $menumanager;
- if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+ if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
$companylink = '';
- $label = '' . $langs->trans("MyModule") . '';
- $label.= '
';
- $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
+ $label = ''.$langs->trans("MyModule").'';
+ $label .= '
';
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
$url = DOL_URL_ROOT.'/ecm/'.$this->table_name.'_card.php?id='.$this->id;
- $linkclose='';
+ $linkclose = '';
if (empty($notooltip))
{
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
- $label=$langs->trans("ShowProject");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowProject");
+ $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 = '';
if ($withpicto)
{
- $result.=($linkstart.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
- if ($withpicto != 2) $result.=' ';
+ $result .= ($linkstart.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
+ if ($withpicto != 2) $result .= ' ';
}
- $result.= $linkstart . $this->ref . $linkend;
+ $result .= $linkstart.$this->ref.$linkend;
return $result;
}
@@ -841,7 +841,7 @@ class EcmFiles extends CommonObject
*/
public function initAsSpecimen()
{
- global $conf,$user;
+ global $conf, $user;
$this->id = 0;
@@ -891,7 +891,7 @@ class EcmfilesLine
public $keywords;
public $cover;
public $position;
- public $gen_or_uploaded; // can be 'generated', 'uploaded', 'unknown'
+ public $gen_or_uploaded; // can be 'generated', 'uploaded', 'unknown'
public $extraparams;
public $date_c = '';
public $date_m = '';
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 92cee2570bc..de9f289eb79 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -35,7 +35,7 @@ class FormEcm
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
@@ -62,9 +62,9 @@ class FormEcm
global $conf, $langs;
$langs->load("ecm");
- if ($select_name=='') $select_name="catParent";
+ if ($select_name == '') $select_name = "catParent";
- $cate_arbo=null;
+ $cate_arbo = null;
if ($module == 'ecm')
{
$cat = new EcmDirectory($this->db);
@@ -74,17 +74,17 @@ class FormEcm
{
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$path = $conf->medias->multidir_output[$conf->entity];
- $cate_arbo = dol_dir_list($path, 'directories', 1, '', array('(\.meta|_preview.*\.png)$','^\.'), 'relativename', SORT_ASC);
+ $cate_arbo = dol_dir_list($path, 'directories', 1, '', array('(\.meta|_preview.*\.png)$', '^\.'), 'relativename', SORT_ASC);
}
$output = '';
- $output.=ajax_combobox($select_name);
- $output.= "\n";
+ $output .= '';
+ $output .= ajax_combobox($select_name);
+ $output .= "\n";
return $output;
}
}
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 979d4cf2709..0c9190b9a4c 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php';
require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("ecm","companies","other","users","orders","propal","bills","contracts","categories"));
+$langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts", "categories"));
// Get parameters
$socid = GETPOST('socid', 'int');
@@ -41,7 +41,7 @@ $confirm = GETPOST('confirm', 'alpha');
$module = GETPOST('module', 'alpha');
$website = GETPOST('website', 'alpha');
$pageid = GETPOST('pageid', 'int');
-if (empty($module)) $module='ecm';
+if (empty($module)) $module = 'ecm';
// Security check
if ($user->socid > 0)
@@ -50,8 +50,8 @@ if ($user->socid > 0)
$socid = $user->socid;
}
-$section=$urlsection=GETPOST('section', 'alpha');
-if (empty($urlsection)) $urlsection='misc';
+$section = $urlsection = GETPOST('section', 'alpha');
+if (empty($urlsection)) $urlsection = 'misc';
if ($module == 'ecm')
{
@@ -69,14 +69,14 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="label";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "label";
$ecmdir = new EcmDirectory($db);
-if (! empty($section))
+if (!empty($section))
{
- $result=$ecmdir->fetch($section);
- if (! $result > 0)
+ $result = $ecmdir->fetch($section);
+ if (!$result > 0)
{
dol_print_error($db, $ecmdir->error);
exit;
@@ -97,7 +97,7 @@ if ($module == 'medias')
$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
}
-if (! $permtoadd) accessforbidden();
+if (!$permtoadd) accessforbidden();
@@ -110,14 +110,14 @@ if ($action == 'add' && $permtoadd)
{
if ($cancel)
{
- if (! empty($backtopage))
+ if (!empty($backtopage))
{
header("Location: ".$backtopage);
exit;
}
else
{
- header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager'.($module?'&module='.$module:''));
+ header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager'.($module ? '&module='.$module : ''));
exit;
}
}
@@ -125,10 +125,10 @@ if ($action == 'add' && $permtoadd)
$ref = trim(GETPOST("ref", 'alpha'));
$label = trim(GETPOST("label", 'alpha'));
$desc = trim(GETPOST("desc", 'alpha'));
- $catParent = GETPOST("catParent", 'alpha'); // Can be an int (with ECM) or a string (with generic filemanager)
- if ($catParent == '-1') $catParent=0;
+ $catParent = GETPOST("catParent", 'alpha'); // Can be an int (with ECM) or a string (with generic filemanager)
+ if ($catParent == '-1') $catParent = 0;
- $error=0;
+ $error = 0;
if (empty($label))
{
@@ -137,7 +137,7 @@ if ($action == 'add' && $permtoadd)
$error++;
}
- if (! $error)
+ if (!$error)
{
if ($module == 'ecm')
{
@@ -168,9 +168,9 @@ if ($action == 'add' && $permtoadd)
dol_print_error('', 'Bad value for module. Not supported.');
}
- if (! $error)
+ if (!$error)
{
- $fullpathofdir = $dirfornewdir.'/'.($catParent? $catParent.'/' : '').$label;
+ $fullpathofdir = $dirfornewdir.'/'.($catParent ? $catParent.'/' : '').$label;
$result = dol_mkdir($fullpathofdir, DOL_DATA_ROOT);
if ($result < 0)
{
@@ -185,9 +185,9 @@ if ($action == 'add' && $permtoadd)
}
}
- if (! $error)
+ if (!$error)
{
- if (! empty($backtopage))
+ if (!empty($backtopage))
{
header("Location: ".$backtopage);
exit;
@@ -203,7 +203,7 @@ if ($action == 'add' && $permtoadd)
// Deleting file
elseif ($action == 'confirm_deletesection' && $confirm == 'yes')
{
- $result=$ecmdir->delete($user);
+ $result = $ecmdir->delete($user);
setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
}
@@ -216,8 +216,8 @@ elseif ($action == 'confirm_deletesection' && $confirm == 'yes')
llxHeader('', $langs->trans("ECMNewSection"));
-$form=new Form($db);
-$formecm=new FormEcm($db);
+$form = new Form($db);
+$formecm = new FormEcm($db);
if ($action == 'create')
{
@@ -232,7 +232,7 @@ if ($action == 'create')
if ($website) print '';
if ($pageid) print '';
- $title=$langs->trans("ECMNewSection");
+ $title = $langs->trans("ECMNewSection");
print load_fiche_titre($title);
dol_fiche_head();
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 3793be8a784..42c6b140f3c 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -39,7 +39,7 @@ $confirm = GETPOST('confirm', 'alpha');
$module = GETPOST('module', 'alpha');
$website = GETPOST('website', 'alpha');
$pageid = GETPOST('pageid', 'int');
-if (empty($module)) $module='ecm';
+if (empty($module)) $module = 'ecm';
// Get parameters
$sortfield = GETPOST("sortfield", 'alpha');
@@ -49,11 +49,11 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
-$section=GETPOST("section", 'alpha')?GETPOST("section", 'alpha'):GETPOST("relativedir", 'alpha');
-if (! $section)
+$section = GETPOST("section", 'alpha') ?GETPOST("section", 'alpha') : GETPOST("relativedir", 'alpha');
+if (!$section)
{
dol_print_error('', "ErrorSectionParamNotDefined");
exit;
@@ -64,14 +64,14 @@ $ecmdir = new EcmDirectory($db);
if ($module == 'ecm')
{
- $result=$ecmdir->fetch($section);
- if (! $result > 0)
+ $result = $ecmdir->fetch($section);
+ if (!$result > 0)
{
dol_print_error($db, $ecmdir->error);
exit;
}
- $relativepath=$ecmdir->getRelativePath();
+ $relativepath = $ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
}
else // For example $module == 'medias'
@@ -101,14 +101,14 @@ if ($module == 'medias')
*/
// Upload file
-if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
+if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
{
if (dol_mkdir($upload_dir) >= 0)
{
- $resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']), 0, 0, $_FILES['userfile']['error']);
+ $resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir."/".dol_unescapefile($_FILES['userfile']['name']), 0, 0, $_FILES['userfile']['error']);
if (is_numeric($resupload) && $resupload > 0)
{
- $result=$ecmdir->changeNbOfFiles('+');
+ $result = $ecmdir->changeNbOfFiles('+');
}
else
{
@@ -138,12 +138,12 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
if ($action == 'confirm_deletefile' && $confirm == 'yes')
{
$langs->load("other");
- $file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
- $ret=dol_delete_file($file);
+ $file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+ $ret = dol_delete_file($file);
if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
- $result=$ecmdir->changeNbOfFiles('-');
+ $result = $ecmdir->changeNbOfFiles('-');
}
// Remove dir
@@ -160,7 +160,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
if ($module == 'ecm')
{
// Fetch was already done
- $result=$ecmdir->delete($user, 'all', $deletedirrecursive);
+ $result = $ecmdir->delete($user, 'all', $deletedirrecursive);
if ($result <= 0)
{
$langs->load('errors');
@@ -193,20 +193,20 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
}
// Update dirname or description
-if ($action == 'update' && ! GETPOST('cancel', 'alpha'))
+if ($action == 'update' && !GETPOST('cancel', 'alpha'))
{
- $error=0;
+ $error = 0;
if ($module == 'ecm')
{
- $oldlabel=$ecmdir->label;
- $olddir=$ecmdir->getRelativePath(0);
- $olddir=$conf->ecm->dir_output.'/'.$olddir;
+ $oldlabel = $ecmdir->label;
+ $olddir = $ecmdir->getRelativePath(0);
+ $olddir = $conf->ecm->dir_output.'/'.$olddir;
}
else
{
- $olddir=GETPOST('section', 'alpha');
- $olddir=$conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
+ $olddir = GETPOST('section', 'alpha');
+ $olddir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
}
if ($module == 'ecm')
@@ -216,17 +216,17 @@ if ($action == 'update' && ! GETPOST('cancel', 'alpha'))
// Fetch was already done
$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
$ecmdir->description = GETPOST("description");
- $result=$ecmdir->update($user);
+ $result = $ecmdir->update($user);
if ($result > 0)
{
// Try to rename file if changed
- if ($oldlabel != $ecmdir->label && file_exists($olddir))
+ if ($oldlabel != $ecmdir->label && file_exists($olddir))
{
- $newdir=$ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory
- $newdir=$conf->ecm->dir_output.'/'.$newdir;
+ $newdir = $ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory
+ $newdir = $conf->ecm->dir_output.'/'.$newdir;
//print $olddir.'-'.$newdir;
- $result=@rename($olddir, $newdir);
- if (! $result)
+ $result = @rename($olddir, $newdir);
+ if (!$result)
{
$langs->load('errors');
setEventMessages($langs->trans('ErrorFailToRenameDir', $olddir, $newdir), null, 'errors');
@@ -234,12 +234,12 @@ if ($action == 'update' && ! GETPOST('cancel', 'alpha'))
}
}
- if (! $error)
+ if (!$error)
{
$db->commit();
// Set new value after renaming
- $relativepath=$ecmdir->getRelativePath();
+ $relativepath = $ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
}
else
@@ -257,18 +257,18 @@ if ($action == 'update' && ! GETPOST('cancel', 'alpha'))
{
$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
- $result=@rename($olddir, $newdir);
- if (! $result)
+ $result = @rename($olddir, $newdir);
+ if (!$result)
{
$langs->load('errors');
setEventMessages($langs->trans('ErrorFailToRenameDir', $olddir, $newdir), null, 'errors');
$error++;
}
- if (! $error)
+ if (!$error)
{
// Set new value after renaming
- $relativepath=GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
+ $relativepath = GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
$section = $relativepath;
}
@@ -281,9 +281,9 @@ if ($action == 'update' && ! GETPOST('cancel', 'alpha'))
* View
********************************************************************/
-$form=new Form($db);
+$form = new Form($db);
-$object=new EcmDirectory($db); // Need to create a new one instance
+$object = new EcmDirectory($db); // Need to create a new one instance
if ($module == 'ecm')
{
@@ -293,12 +293,12 @@ if ($module == 'ecm')
llxHeader();
// Built the file List
-$filearrayall=dol_dir_list($upload_dir, "all", 0, '', '', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
-$filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
-$totalsize=0;
-foreach($filearray as $key => $file)
+$filearrayall = dol_dir_list($upload_dir, "all", 0, '', '', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$totalsize = 0;
+foreach ($filearray as $key => $file)
{
- $totalsize+=$file['size'];
+ $totalsize += $file['size'];
}
@@ -316,33 +316,33 @@ if ($action == 'edit')
}
-$morehtml='';
+$morehtml = '';
$morehtmlref = '/'.$module.'/'.$relativepath;
if ($module == 'ecm')
{
- $s='';
+ $s = '';
$result = 1;
- $i=0;
- $tmpecmdir=new EcmDirectory($db); // Need to create a new one
+ $i = 0;
+ $tmpecmdir = new EcmDirectory($db); // Need to create a new one
$tmpecmdir->fetch($ecmdir->id);
while ($tmpecmdir && $result > 0)
{
- $tmpecmdir->ref=$tmpecmdir->label;
+ $tmpecmdir->ref = $tmpecmdir->label;
if ($i == 0 && $action == 'edit')
{
- $s='';
+ $s = '';
}
- else $s=$tmpecmdir->getNomUrl(1).$s;
+ else $s = $tmpecmdir->getNomUrl(1).$s;
if ($tmpecmdir->fk_parent)
{
- $s=' -> '.$s;
- $result=$tmpecmdir->fetch($tmpecmdir->fk_parent);
+ $s = ' -> '.$s;
+ $result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
}
else
{
- $tmpecmdir=0;
+ $tmpecmdir = 0;
}
$i++;
}
@@ -351,25 +351,25 @@ if ($module == 'ecm')
}
if ($module == 'medias')
{
- $s='medias -> ';
+ $s = 'medias -> ';
$result = 1;
- $subdirs=explode('/', $section);
- $i=0;
- foreach($subdirs as $subdir)
+ $subdirs = explode('/', $section);
+ $i = 0;
+ foreach ($subdirs as $subdir)
{
if ($i == (count($subdirs) - 1))
{
if ($action == 'edit')
{
- $s.='';
- $s.='';
- $s.='';
+ $s .= '';
+ $s .= '';
+ $s .= '';
}
- else $s.=$subdir;
+ else $s .= $subdir;
}
if ($i < (count($subdirs) - 1))
{
- $s.=$subdir.' -> ';
+ $s .= $subdir.' -> ';
}
$i++;
}
@@ -401,7 +401,7 @@ if ($module == 'ecm')
print ' ';
print '| '.$langs->trans("ECMCreationUser").' | ';
- $userecm=new User($db);
+ $userecm = new User($db);
$userecm->fetch($ecmdir->fk_user_c);
print $userecm->getNomUrl(1);
print ' | ';
@@ -428,7 +428,7 @@ else
}
print ' | ';
print ' | '.$langs->trans("ECMNbOfDocs").' | ';
-$nbofiles=count($filearray);
+$nbofiles = count($filearray);
print $nbofiles;
if ($ecmdir->id > 0)
{
@@ -470,12 +470,12 @@ if ($action != 'edit' && $action != 'delete')
if ($permtoadd)
{
- print ''.$langs->trans('Edit').'';
+ print ''.$langs->trans('Edit').'';
}
if ($permtoadd)
{
- print ''.$langs->trans('ECMAddSection').'';
+ print ''.$langs->trans('ECMAddSection').'';
}
else
{
@@ -486,7 +486,7 @@ if ($action != 'edit' && $action != 'delete')
//{
if ($permtoadd)
{
- print ''.$langs->trans('Delete').'';
+ print ''.$langs->trans('Delete').'';
}
else
{
@@ -512,18 +512,18 @@ if ($action == 'delete')
// Confirm remove file
if ($action == 'delete_dir')
{
- $relativepathwithoutslash=preg_replace('/[\/]$/', '', $relativepath);
+ $relativepathwithoutslash = preg_replace('/[\/]$/', '', $relativepath);
//Form to close proposal (signed or not)
if (count($filearrayall) > 0)
{
$langs->load("other");
$formquestion = array(
- array('type' => 'checkbox', 'name' => 'deletedirrecursive', 'label' => $langs->trans("ContentOfDirectoryIsNotEmpty").'
'.$langs->trans("DeleteAlsoContentRecursively"),'value' => '0') // Field to complete private note (not replace)
+ array('type' => 'checkbox', 'name' => 'deletedirrecursive', 'label' => $langs->trans("ContentOfDirectoryIsNotEmpty").'
'.$langs->trans("DeleteAlsoContentRecursively"), 'value' => '0') // Field to complete private note (not replace)
);
}
- print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST('section', 'alpha').($module?'&module='.$module:'').($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $relativepathwithoutslash), 'confirm_deletedir', $formquestion, 1, 1);
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST('section', 'alpha').($module ? '&module='.$module : '').($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $relativepathwithoutslash), 'confirm_deletedir', $formquestion, 1, 1);
}
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index e88417c526a..9e51da09899 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -32,18 +32,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("ecm","companies","other","users","orders","propal","bills","contracts"));
+$langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'ecm', 0);
// Get parameters
-$socid=GETPOST('socid', 'int');
-$action=GETPOST('action', 'aZ09');
-$section=GETPOST('section', 'int')?GETPOST('section', 'int'):GETPOST('section_id', 'int');
-if (! $section) $section=0;
-$section_dir=GETPOST('section_dir', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+$section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('section_id', 'int');
+if (!$section) $section = 0;
+$section_dir = GETPOST('section_dir', 'alpha');
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
@@ -52,25 +52,25 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="fullname";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "fullname";
$ecmdir = new EcmDirectory($db);
if ($section)
{
- $result=$ecmdir->fetch($section);
- if (! $result > 0)
+ $result = $ecmdir->fetch($section);
+ if (!$result > 0)
{
dol_print_error($db, $ecmdir->error);
exit;
}
}
-$form=new Form($db);
+$form = new Form($db);
$ecmdirstatic = new EcmDirectory($db);
$userstatic = new User($db);
-$error=0;
+$error = 0;
/*
@@ -82,23 +82,23 @@ $error=0;
//include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
// Upload file (code similar but different than actions_linkedfiles.inc.php)
-if (GETPOST("sendit", 'none') && ! empty($conf->global->MAIN_UPLOAD_DOC))
+if (GETPOST("sendit", 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
{
// Define relativepath and upload_dir
- $relativepath='';
- if ($ecmdir->id) $relativepath=$ecmdir->getRelativePath();
- else $relativepath=$section_dir;
+ $relativepath = '';
+ if ($ecmdir->id) $relativepath = $ecmdir->getRelativePath();
+ else $relativepath = $section_dir;
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
- if (is_array($_FILES['userfile']['tmp_name'])) $userfiles=$_FILES['userfile']['tmp_name'];
- else $userfiles=array($_FILES['userfile']['tmp_name']);
+ if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
+ else $userfiles = array($_FILES['userfile']['tmp_name']);
- foreach($userfiles as $key => $userfile)
+ foreach ($userfiles as $key => $userfile)
{
if (empty($_FILES['userfile']['tmp_name'][$key]))
{
$error++;
- if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2){
+ if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
}
else {
@@ -107,13 +107,13 @@ if (GETPOST("sendit", 'none') && ! empty($conf->global->MAIN_UPLOAD_DOC))
}
}
- if (! $error)
+ if (!$error)
{
$generatethumbs = 0;
$res = dol_add_file_process($upload_dir, 0, 1, 'userfile', '', null, '', $generatethumbs);
if ($res > 0)
{
- $result=$ecmdir->changeNbOfFiles('+');
+ $result = $ecmdir->changeNbOfFiles('+');
}
}
}
@@ -126,14 +126,14 @@ if ($action == 'confirm_deletefile')
// GETPOST('urlfile','alpha') is full relative URL from ecm root dir. Contains path of all sections.
//var_dump(GETPOST('urlfile'));exit;
- $upload_dir = $conf->ecm->dir_output.($relativepath?'/'.$relativepath:'');
- $file = $upload_dir . "/" . GETPOST('urlfile', 'alpha');
+ $upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
+ $file = $upload_dir."/".GETPOST('urlfile', 'alpha');
- $ret=dol_delete_file($file); // This include also the delete from file index in database.
+ $ret = dol_delete_file($file); // This include also the delete from file index in database.
if ($ret)
{
setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile', 'alpha')), null, 'mesgs');
- $result=$ecmdir->changeNbOfFiles('-');
+ $result = $ecmdir->changeNbOfFiles('-');
}
else
{
@@ -142,7 +142,7 @@ if ($action == 'confirm_deletefile')
clearstatcache();
}
- $action='file_manager';
+ $action = 'file_manager';
}
// Add directory
@@ -170,7 +170,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
// Remove directory
if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
{
- $result=$ecmdir->delete($user);
+ $result = $ecmdir->delete($user);
setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
clearstatcache();
@@ -186,56 +186,56 @@ if ($action == 'refreshmanual')
// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
clearstatcache();
- $diroutputslash=str_replace('\\', '/', $conf->ecm->dir_output);
- $diroutputslash.='/';
+ $diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
+ $diroutputslash .= '/';
// Scan directory tree on disk
- $disktree=dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
+ $disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
// Scan directory tree in database
- $sqltree=$ecmdirstatic->get_full_arbo(0);
+ $sqltree = $ecmdirstatic->get_full_arbo(0);
- $adirwascreated=0;
+ $adirwascreated = 0;
// Now we compare both trees to complete missing trees into database
//var_dump($disktree);
//var_dump($sqltree);
- foreach($disktree as $dirdesc) // Loop on tree onto disk
+ foreach ($disktree as $dirdesc) // Loop on tree onto disk
{
- $dirisindatabase=0;
- foreach($sqltree as $dirsqldesc)
+ $dirisindatabase = 0;
+ foreach ($sqltree as $dirsqldesc)
{
if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
{
- $dirisindatabase=1;
+ $dirisindatabase = 1;
break;
}
}
- if (! $dirisindatabase)
+ if (!$dirisindatabase)
{
- $txt="Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
+ $txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
dol_syslog($txt);
//print $txt."
\n";
// We must first find the fk_parent of directory to create $dirdesc['fullname']
- $fk_parent=-1;
- $relativepathmissing=str_replace($diroutputslash, '', $dirdesc['fullname']);
- $relativepathtosearchparent=$relativepathmissing;
+ $fk_parent = -1;
+ $relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
+ $relativepathtosearchparent = $relativepathmissing;
//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
if (preg_match('/\//', $relativepathtosearchparent))
//while (preg_match('/\//',$relativepathtosearchparent))
{
- $relativepathtosearchparent=preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
- $txt="Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
+ $relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
+ $txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
dol_syslog($txt);
//print $txt." -> ";
- $parentdirisindatabase=0;
- foreach($sqltree as $dirsqldesc)
+ $parentdirisindatabase = 0;
+ foreach ($sqltree as $dirsqldesc)
{
if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
{
- $parentdirisindatabase=$dirsqldesc['id'];
+ $parentdirisindatabase = $dirsqldesc['id'];
break;
}
}
@@ -243,7 +243,7 @@ if ($action == 'refreshmanual')
{
dol_syslog("Yes with id ".$parentdirisindatabase);
//print "Yes with id ".$parentdirisindatabase."
\n";
- $fk_parent=$parentdirisindatabase;
+ $fk_parent = $parentdirisindatabase;
//break; // We found parent, we can stop the while loop
}
else
@@ -255,7 +255,7 @@ if ($action == 'refreshmanual')
else
{
dol_syslog("Parent is root");
- $fk_parent=0; // Parent is root
+ $fk_parent = 0; // Parent is root
}
if ($fk_parent >= 0)
@@ -265,20 +265,20 @@ if ($action == 'refreshmanual')
$ecmdirtmp->description = '';
$ecmdirtmp->fk_parent = $fk_parent;
- $txt="We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
+ $txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
dol_syslog($txt);
//print $ecmdirtmp->cachenbofdoc."
\n";exit;
$id = $ecmdirtmp->create($user);
if ($id > 0)
{
- $newdirsql=array('id'=>$id,
+ $newdirsql = array('id'=>$id,
'id_mere'=>$ecmdirtmp->fk_parent,
'label'=>$ecmdirtmp->label,
'description'=>$ecmdirtmp->description,
'fullrelativename'=>$relativepathmissing);
- $sqltree[]=$newdirsql; // We complete fulltree for following loops
+ $sqltree[] = $newdirsql; // We complete fulltree for following loops
//var_dump($sqltree);
- $adirwascreated=1;
+ $adirwascreated = 1;
}
else
{
@@ -286,7 +286,7 @@ if ($action == 'refreshmanual')
}
}
else {
- $txt="Parent of ".$dirdesc['fullname']." not found";
+ $txt = "Parent of ".$dirdesc['fullname']." not found";
dol_syslog($txt);
//print $txt."
\n";
}
@@ -294,24 +294,24 @@ if ($action == 'refreshmanual')
}
// Loop now on each sql tree to check if dir exists
- foreach($sqltree as $dirdesc) // Loop on each sqltree to check dir is on disk
+ foreach ($sqltree as $dirdesc) // Loop on each sqltree to check dir is on disk
{
- $dirtotest=$conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
- if (! dol_is_dir($dirtotest))
+ $dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
+ if (!dol_is_dir($dirtotest))
{
- $ecmdirtmp->id=$dirdesc['id'];
+ $ecmdirtmp->id = $dirdesc['id'];
$ecmdirtmp->delete($user, 'databaseonly');
//exit;
}
}
- $sql="UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
+ $sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
dol_syslog("sql = ".$sql);
$db->query($sql);
// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
// it to be sure that fulltree array is not used without reloading it.
- if ($adirwascreated) $sqltree=null;
+ if ($adirwascreated) $sqltree = null;
}
@@ -322,18 +322,18 @@ if ($action == 'refreshmanual')
// Define height of file area (depends on $_SESSION["dol_screenheight"])
//print $_SESSION["dol_screenheight"];
-$maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 466)?($_SESSION["dol_screenheight"]-136):660; // Also into index_auto.php file
+$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 466) ? ($_SESSION["dol_screenheight"] - 136) : 660; // Also into index_auto.php file
-$moreheadcss='';
-$moreheadjs='';
+$moreheadcss = '';
+$moreheadjs = '';
//$morejs=array();
-$morejs=array('includes/jquery/plugins/blockUI/jquery.blockUI.js','core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs[]="includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+$morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
-$moreheadjs.=''."\n";
+$moreheadjs .= ''."\n";
llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $morejs, '', 0, 0);
@@ -342,7 +342,7 @@ dol_fiche_head($head, 'index', $langs->trans("ECMArea").' - '.$langs->trans("ECM
// Add filemanager component
-$module='ecm';
+$module = 'ecm';
include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php';
// End of page
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index be3cc7a372c..6c245e3ad1c 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -31,21 +31,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("ecm","companies","other","users","orders","propal","bills","contracts"));
+$langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'ecm', 0);
// Get parameters
-$socid=GETPOST('socid', 'int');
-$action=GETPOST('action', 'aZ09');
-$section=GETPOST('section', 'int')?GETPOST('section', 'int'):GETPOST('section_id', 'int');
-$module=GETPOST('module', 'alpha');
-if (! $section) $section=0;
-$section_dir=GETPOST('section_dir', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+$section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('section_id', 'int');
+$module = GETPOST('module', 'alpha');
+if (!$section) $section = 0;
+$section_dir = GETPOST('section_dir', 'alpha');
-$search_doc_ref=GETPOST('search_doc_ref', 'alpha');
+$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
@@ -54,26 +54,26 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="fullname";
-if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield="level1name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "fullname";
+if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield = "level1name";
$ecmdir = new EcmDirectory($db);
if ($section)
{
- $result=$ecmdir->fetch($section);
- if (! $result > 0)
+ $result = $ecmdir->fetch($section);
+ if (!$result > 0)
{
dol_print_error($db, $ecmdir->error);
exit;
}
}
-$form=new Form($db);
+$form = new Form($db);
$ecmdirstatic = new EcmDirectory($db);
$userstatic = new User($db);
-$error=0;
+$error = 0;
/*
@@ -83,7 +83,7 @@ $error=0;
// Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
{
- $search_doc_ref='';
+ $search_doc_ref = '';
}
@@ -119,33 +119,33 @@ if ($action == 'confirm_deletefile')
$langs->load("other");
if ($section)
{
- $result=$ecmdir->fetch($section);
- if (! ($result > 0))
+ $result = $ecmdir->fetch($section);
+ if (!($result > 0))
{
dol_print_error($db, $ecmdir->error);
exit;
}
- $relativepath=$ecmdir->getRelativePath();
+ $relativepath = $ecmdir->getRelativePath();
}
- else $relativepath='';
- $upload_dir = $conf->ecm->dir_output.($relativepath?'/'.$relativepath:'');
- $file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
+ else $relativepath = '';
+ $upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
+ $file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
- $ret=dol_delete_file($file);
+ $ret = dol_delete_file($file);
if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
- $result=$ecmdir->changeNbOfFiles('-');
+ $result = $ecmdir->changeNbOfFiles('-');
clearstatcache();
}
- $action='file_manager';
+ $action = 'file_manager';
}
// Remove directory
if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
{
- $result=$ecmdir->delete($user);
+ $result = $ecmdir->delete($user);
setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
clearstatcache();
@@ -161,56 +161,56 @@ if ($action == 'refreshmanual')
// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
clearstatcache();
- $diroutputslash=str_replace('\\', '/', $conf->ecm->dir_output);
- $diroutputslash.='/';
+ $diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
+ $diroutputslash .= '/';
// Scan directory tree on disk
- $disktree=dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
+ $disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
// Scan directory tree in database
- $sqltree=$ecmdirstatic->get_full_arbo(0);
+ $sqltree = $ecmdirstatic->get_full_arbo(0);
- $adirwascreated=0;
+ $adirwascreated = 0;
// Now we compare both trees to complete missing trees into database
//var_dump($disktree);
//var_dump($sqltree);
- foreach($disktree as $dirdesc) // Loop on tree onto disk
+ foreach ($disktree as $dirdesc) // Loop on tree onto disk
{
- $dirisindatabase=0;
- foreach($sqltree as $dirsqldesc)
+ $dirisindatabase = 0;
+ foreach ($sqltree as $dirsqldesc)
{
if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
{
- $dirisindatabase=1;
+ $dirisindatabase = 1;
break;
}
}
- if (! $dirisindatabase)
+ if (!$dirisindatabase)
{
- $txt="Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
+ $txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
dol_syslog($txt);
//print $txt."
\n";
// We must first find the fk_parent of directory to create $dirdesc['fullname']
- $fk_parent=-1;
- $relativepathmissing=str_replace($diroutputslash, '', $dirdesc['fullname']);
- $relativepathtosearchparent=$relativepathmissing;
+ $fk_parent = -1;
+ $relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
+ $relativepathtosearchparent = $relativepathmissing;
//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
if (preg_match('/\//', $relativepathtosearchparent))
//while (preg_match('/\//',$relativepathtosearchparent))
{
- $relativepathtosearchparent=preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
- $txt="Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
+ $relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
+ $txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
dol_syslog($txt);
//print $txt." -> ";
- $parentdirisindatabase=0;
- foreach($sqltree as $dirsqldesc)
+ $parentdirisindatabase = 0;
+ foreach ($sqltree as $dirsqldesc)
{
if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
{
- $parentdirisindatabase=$dirsqldesc['id'];
+ $parentdirisindatabase = $dirsqldesc['id'];
break;
}
}
@@ -218,7 +218,7 @@ if ($action == 'refreshmanual')
{
dol_syslog("Yes with id ".$parentdirisindatabase);
//print "Yes with id ".$parentdirisindatabase."
\n";
- $fk_parent=$parentdirisindatabase;
+ $fk_parent = $parentdirisindatabase;
//break; // We found parent, we can stop the while loop
}
else
@@ -230,7 +230,7 @@ if ($action == 'refreshmanual')
else
{
dol_syslog("Parent is root");
- $fk_parent=0; // Parent is root
+ $fk_parent = 0; // Parent is root
}
if ($fk_parent >= 0)
@@ -240,20 +240,20 @@ if ($action == 'refreshmanual')
$ecmdirtmp->description = '';
$ecmdirtmp->fk_parent = $fk_parent;
- $txt="We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
+ $txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
dol_syslog($txt);
//print $ecmdirtmp->cachenbofdoc."
\n";exit;
$id = $ecmdirtmp->create($user);
if ($id > 0)
{
- $newdirsql=array('id'=>$id,
+ $newdirsql = array('id'=>$id,
'id_mere'=>$ecmdirtmp->fk_parent,
'label'=>$ecmdirtmp->label,
'description'=>$ecmdirtmp->description,
'fullrelativename'=>$relativepathmissing);
- $sqltree[]=$newdirsql; // We complete fulltree for following loops
+ $sqltree[] = $newdirsql; // We complete fulltree for following loops
//var_dump($sqltree);
- $adirwascreated=1;
+ $adirwascreated = 1;
}
else
{
@@ -261,7 +261,7 @@ if ($action == 'refreshmanual')
}
}
else {
- $txt="Parent of ".$dirdesc['fullname']." not found";
+ $txt = "Parent of ".$dirdesc['fullname']." not found";
dol_syslog($txt);
//print $txt."
\n";
}
@@ -269,24 +269,24 @@ if ($action == 'refreshmanual')
}
// Loop now on each sql tree to check if dir exists
- foreach($sqltree as $dirdesc) // Loop on each sqltree to check dir is on disk
+ foreach ($sqltree as $dirdesc) // Loop on each sqltree to check dir is on disk
{
- $dirtotest=$conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
- if (! dol_is_dir($dirtotest))
+ $dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
+ if (!dol_is_dir($dirtotest))
{
- $ecmdirtmp->id=$dirdesc['id'];
+ $ecmdirtmp->id = $dirdesc['id'];
$ecmdirtmp->delete($user, 'databaseonly');
//exit;
}
}
- $sql="UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
+ $sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
dol_syslog("sql = ".$sql);
$db->query($sql);
// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
// it to be sure that fulltree array is not used without reloading it.
- if ($adirwascreated) $sqltree=null;
+ if ($adirwascreated) $sqltree = null;
}
@@ -297,43 +297,43 @@ if ($action == 'refreshmanual')
// Define height of file area (depends on $_SESSION["dol_screenheight"])
//print $_SESSION["dol_screenheight"];
-$maxheightwin=(isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 466)?($_SESSION["dol_screenheight"]-136):660; // Also into index.php file
+$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 466) ? ($_SESSION["dol_screenheight"] - 136) : 660; // Also into index.php file
-$moreheadcss='';
-$moreheadjs='';
+$moreheadcss = '';
+$moreheadjs = '';
//$morejs=array();
-$morejs=array('includes/jquery/plugins/blockUI/jquery.blockUI.js','core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs[]="includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+$morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
-$moreheadjs.=''."\n";
+$moreheadjs .= ''."\n";
llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $morejs, '', 0, 0);
// Add sections to manage
-$rowspan=0;
-$sectionauto=array();
-if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
+$rowspan = 0;
+$sectionauto = array();
+if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
{
- if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { $langs->load("products"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'product', 'test'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
- if (! empty($conf->societe->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
- if (! empty($conf->propal->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsByProposals")); }
- if (! empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'contract','test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsByContracts")); }
- if (! empty($conf->commande->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
- if (! empty($conf->facture->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
- if (! empty($conf->supplier_proposal->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBySupplierProposals")); }
- if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
- if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
- if (! empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
- if (! empty($conf->projet->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
- if (! empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsByInterventions")); }
- if (! empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsByExpenseReports")); }
- if (! empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsByHolidays")); }
- if (! empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsByBankAccount")); }
- $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsByUsers"));
+ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
+ if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
+ if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsByProposals")); }
+ if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsByContracts")); }
+ if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
+ if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
+ if (!empty($conf->supplier_proposal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBySupplierProposals")); }
+ if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
+ if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
+ if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
+ if (!empty($conf->projet->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
+ if (!empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsByInterventions")); }
+ if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsByExpenseReports")); }
+ if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsByHolidays")); }
+ if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsByBankAccount")); }
+ $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsByUsers"));
}
$head = ecm_prepare_dasboard_head('');
@@ -358,7 +358,7 @@ if ($action == 'delete' && empty($conf->use_javascript_ajax))
print ' | ';
- $showonrightsize='';
+ $showonrightsize = '';
// Auto section
if (count($sectionauto))
{
- $htmltooltip=$langs->trans("ECMAreaDesc2");
+ $htmltooltip = $langs->trans("ECMAreaDesc2");
- $sectionauto=dol_sort_array($sectionauto, 'label', 'ASC', true, false);
+ $sectionauto = dol_sort_array($sectionauto, 'label', 'ASC', true, false);
print ' ';
print '';
print '';
- $nbofentries=0;
- $oldvallevel=0;
+ $nbofentries = 0;
+ $oldvallevel = 0;
foreach ($sectionauto as $key => $val)
{
- if (empty($val['test'])) continue; // If condition to show is ok
+ if (empty($val['test'])) continue; // If condition to show is ok
- $var=false;
+ $var = false;
print '- ';
- if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
+ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
{
print '';
print $val['label'];
@@ -427,10 +427,10 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
print '
';
// Info
- $htmltooltip=''.$langs->trans("ECMSection").': '.$val['label'].'
';
- $htmltooltip=''.$langs->trans("Type").': '.$langs->trans("ECMSectionAuto").'
';
- $htmltooltip.=''.$langs->trans("ECMCreationUser").': '.$langs->trans("ECMTypeAuto").'
';
- $htmltooltip.=''.$langs->trans("Description").': '.$val['desc'];
+ $htmltooltip = ''.$langs->trans("ECMSection").': '.$val['label'].'
';
+ $htmltooltip = ''.$langs->trans("Type").': '.$langs->trans("ECMSectionAuto").'
';
+ $htmltooltip .= ''.$langs->trans("ECMCreationUser").': '.$langs->trans("ECMTypeAuto").'
';
+ $htmltooltip .= ''.$langs->trans("Description").': '.$val['desc'];
print $form->textwithpicto('', $htmltooltip, 1, 'info');
print ' ';
print ' ';
@@ -455,8 +455,8 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
// Start right panel
-$mode='noajax';
-$url=DOL_URL_ROOT.'/ecm/index_auto.php';
+$mode = 'noajax';
+$url = DOL_URL_ROOT.'/ecm/index_auto.php';
include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
@@ -470,7 +470,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
}
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index c5c799d82c3..1b90ae77411 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -30,10 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("ecm","companies","other","users","orders","propal","bills","contracts"));
+$langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'ecm', '');
// Load permissions
@@ -42,13 +42,13 @@ $user->getrights('ecm');
// Get parameters
$socid = GETPOST('socid', 'int');
$action = GETPOST('action', 'alpha');
-$section=GETPOST('section');
-if (! $section) $section=0;
+$section = GETPOST('section');
+if (!$section) $section = 0;
$module = GETPOST('module', 'alpha');
$website = GETPOST('website', 'alpha');
$pageid = GETPOST('pageid', 'int');
-if (empty($module)) $module='ecm';
+if (empty($module)) $module = 'ecm';
$upload_dir = $conf->ecm->dir_output.'/'.$section;
@@ -59,14 +59,14 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="label";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "label";
$ecmdir = new EcmDirectory($db);
-if (! empty($section))
+if (!empty($section))
{
- $result=$ecmdir->fetch($section);
- if (! $result > 0)
+ $result = $ecmdir->fetch($section);
+ if (!$result > 0)
{
dol_print_error($db, $ecmdir->error);
exit;
@@ -92,22 +92,22 @@ if (! empty($section))
llxHeader();
-$form=new Form($db);
+$form = new Form($db);
$ecmdirstatic = new EcmDirectory($db);
$userstatic = new User($db);
// Ajout rubriques automatiques
-$rowspan=0;
-$sectionauto=array();
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'product', 'test'=>$conf->product->enabled, 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
-if (! empty($conf->societe->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
-if (! empty($conf->propal->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsByProposals")); }
-if (! empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'contract','test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsByContracts")); }
-if (! empty($conf->commande->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled,'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
-if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
-if (! empty($conf->facture->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
-if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
+$rowspan = 0;
+$sectionauto = array();
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>$conf->product->enabled, 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
+if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
+if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsByProposals")); }
+if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsByContracts")); }
+if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
+if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
+if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
+if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
//***********************
@@ -152,13 +152,13 @@ print '";
//print $langs->trans("ECMSectionAutoDesc");
@@ -182,13 +182,13 @@ print "";
print ' | ';
// Right area
-$relativepath=$ecmdir->getRelativePath();
+$relativepath = $ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-$filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
+$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-$formfile=new FormFile($db);
-$param='§ion='.$section;
-$textifempty=($section?$langs->trans("NoFileFound"):$langs->trans("ECMSelectASection"));
+$formfile = new FormFile($db);
+$param = '§ion='.$section;
+$textifempty = ($section ? $langs->trans("NoFileFound") : $langs->trans("ECMSelectASection"));
$formfile->list_of_documents($filearray, '', 'ecm', $param, 1, $relativepath, $user->rights->ecm->upload, 1, $textifempty);
// print '';
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index 3f8b889aaff..4dd9cd63cb2 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -19,7 +19,7 @@
*/
// Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
{
print "Error, template enablefiletreeajax.tpl.php can't be called as URL";
exit;
@@ -33,10 +33,10 @@ if (empty($conf) || ! is_object($conf))
'."\n";
@@ -409,7 +409,7 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
}
print ''."\n";
- print ' '."\n";
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':'').'
';
+ print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"]) ? $_SERVER["REQUEST_URI"].'&ignoreerrors=1' : '').'
';
}
- print '"';
+ print '"';
if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
print '> ';
if ($withpleasewait) print ' '.$langs->trans("NextStepMightLastALongTime").' '.$langs->trans("PleaseBePatient").' ';
@@ -466,7 +466,7 @@ function pFooter($nonext = 0, $setuplang = '', $jscheckfunction = '', $withpleas
print "\n";
print "';
$resql = $db->query($sql);
}
- foreach($listoftables as $table)
+ foreach ($listoftables as $table)
{
// do not convert llx_const if mysql encrypt/decrypt is used
if ($conf->db->dolibarr_main_db_encryption != 0 && preg_match('/\_const$/', $table)) continue;
print ' | ';
print $table;
- $sql='ALTER TABLE '.$table.' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci';
+ $sql = 'ALTER TABLE '.$table.' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci';
print '';
if ($force_utf8_on_tables == 'confirmed')
{
$resql = $db->query($sql);
- print ' - Done ('.($resql?'OK':'KO').')';
+ print ' - Done ('.($resql ? 'OK' : 'KO').')';
}
else print ' - Disabled';
print ' | ';
@@ -1387,7 +1387,7 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha'))
// Enable foreign key checking
if ($force_utf8_on_tables == 'confirmed')
{
- $sql='SET FOREIGN_KEY_CHECKS=1';
+ $sql = 'SET FOREIGN_KEY_CHECKS=1';
print '';
$resql = $db->query($sql);
}
@@ -1429,7 +1429,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
echo ' | Repair llx_commande_fournisseur_dispatch.fk_commandefourndet |
|---|
';
echo ' | Repair in progress. This may take a while. | ';
- $sql_dispatch = 'SELECT * FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch WHERE COALESCE(fk_commandefourndet, 0) = 0';
+ $sql_dispatch = 'SELECT * FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE COALESCE(fk_commandefourndet, 0) = 0';
$db->begin();
$resql_dispatch = $db->query($sql_dispatch);
$n_processed_rows = 0;
@@ -1440,9 +1440,9 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
exit;
}
while ($obj_dispatch = $db->fetch_object($resql_dispatch)) {
- $sql_line = 'SELECT line.rowid, line.qty FROM ' . MAIN_DB_PREFIX . 'commande_fournisseurdet AS line'
- . ' WHERE line.fk_commande = ' . $obj_dispatch->fk_commande
- . ' AND line.fk_product = ' . $obj_dispatch->fk_product;
+ $sql_line = 'SELECT line.rowid, line.qty FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet AS line'
+ . ' WHERE line.fk_commande = '.$obj_dispatch->fk_commande
+ . ' AND line.fk_product = '.$obj_dispatch->fk_product;
$resql_line = $db->query($sql_line);
// s’il y a plusieurs lignes avec le même produit sur cette commande fournisseur,
@@ -1452,7 +1452,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
$remaining_qty = $obj_dispatch->qty;
$first_iteration = true;
if (!$resql_line) {
- echo ' | Unable to find a matching supplier order line for dispatch #' . $obj_dispatch->rowid . ' | ';
+ echo ' | Unable to find a matching supplier order line for dispatch #'.$obj_dispatch->rowid.' | ';
$errors[] = $sql_line;
$n_processed_rows++;
continue;
@@ -1465,9 +1465,9 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
}
$qty_for_line = min($remaining_qty, $obj_line->qty);
if ($first_iteration) {
- $sql_attach = 'UPDATE ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch'
- . ' SET fk_commandefourndet = ' . $obj_line->rowid . ', qty = ' . $qty_for_line
- . ' WHERE rowid = ' . $obj_dispatch->rowid;
+ $sql_attach = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch'
+ . ' SET fk_commandefourndet = '.$obj_line->rowid.', qty = '.$qty_for_line
+ . ' WHERE rowid = '.$obj_dispatch->rowid;
$first_iteration = false;
} else {
$sql_attach_values = array(
@@ -1477,19 +1477,19 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
$qty_for_line,
$obj_dispatch->fk_entrepot,
$obj_dispatch->fk_user,
- $obj_dispatch->datec ? '"' . $db->escape($obj_dispatch->datec) . '"' : 'NULL',
- $obj_dispatch->comment ? '"' . $db->escape($obj_dispatch->comment) . '"' : 'NULL',
+ $obj_dispatch->datec ? '"'.$db->escape($obj_dispatch->datec).'"' : 'NULL',
+ $obj_dispatch->comment ? '"'.$db->escape($obj_dispatch->comment).'"' : 'NULL',
$obj_dispatch->status ?: 'NULL',
- $obj_dispatch->tms ? '"' . $db->escape($obj_dispatch->tms) . '"': 'NULL',
+ $obj_dispatch->tms ? '"'.$db->escape($obj_dispatch->tms).'"' : 'NULL',
$obj_dispatch->batch ?: 'NULL',
- $obj_dispatch->eatby ? '"' . $db->escape($obj_dispatch->eatby) . '"': 'NULL',
- $obj_dispatch->sellby ? '"' . $db->escape($obj_dispatch->sellby) . '"': 'NULL'
+ $obj_dispatch->eatby ? '"'.$db->escape($obj_dispatch->eatby).'"' : 'NULL',
+ $obj_dispatch->sellby ? '"'.$db->escape($obj_dispatch->sellby).'"' : 'NULL'
);
$sql_attach_values = join(', ', $sql_attach_values);
- $sql_attach = 'INSERT INTO ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch'
+ $sql_attach = 'INSERT INTO '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch'
. ' (fk_commande, fk_product, fk_commandefourndet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)'
- . ' VALUES (' . $sql_attach_values . ')';
+ . ' VALUES ('.$sql_attach_values.')';
}
if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed')
@@ -1498,7 +1498,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
}
else
{
- $resql_attach = true; // Force success in test mode
+ $resql_attach = true; // Force success in test mode
}
if ($resql_attach) {
@@ -1513,17 +1513,17 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
// report progress every 256th row
if (!($n_processed_rows & 0xff)) {
- echo ' | Processed ' . $n_processed_rows . ' rows with ' . count($errors) . ' errors…' . " | \n";
+ echo ' | Processed '.$n_processed_rows.' rows with '.count($errors).' errors…'." | \n";
flush();
ob_flush();
}
}
} else {
- echo ' | Unable to find any dispatch without an fk_commandefourndet.' . " | \n";
- echo $sql_dispatch . "\n";
+ echo ' | Unable to find any dispatch without an fk_commandefourndet.'." | \n";
+ echo $sql_dispatch."\n";
}
- echo ' | Fixed ' . $n_processed_rows . ' rows with ' . count($errors) . ' errors…' . " | \n";
- echo ' | DONE.' . " | \n";
+ echo ' | Fixed '.$n_processed_rows.' rows with '.count($errors).' errors…'." | \n";
+ echo ' | DONE.'." | \n";
if (count($errors)) {
$db->rollback();
@@ -1534,7 +1534,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
$db->close();
echo ' SQL queries with errors: | ';
- echo ' | ' . join(' | | ', $errors) . ' | ';
+ echo ' | '.join(' | | ', $errors).' | ';
}
print '';
@@ -1548,7 +1548,7 @@ if (empty($actiondone))
if ($oneoptionset)
{
- print ' ';
+ print '';
}
@@ -1565,4 +1565,4 @@ pFooter(1, $setuplang);
if ($db->connected) $db->close();
// Return code if ran from command line
-if (! $ok && isset($argv[1])) exit(1);
+if (!$ok && isset($argv[1])) exit(1);
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 62d984bf1f3..9d81bca42ce 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -26,37 +26,37 @@
* \brief Build conf file on disk
*/
-define('DONOTLOADCONF', 1); // To avoid loading conf by file inc.php
+define('DONOTLOADCONF', 1); // To avoid loading conf by file inc.php
include 'inc.php';
global $langs;
-$action=GETPOST('action', 'aZ09')?GETPOST('action', 'aZ09'):(empty($argv[1])?'':$argv[1]);
-$setuplang=GETPOST('selectlang', 'aZ09', 3)?GETPOST('selectlang', 'aZ09', 3):(empty($argv[2])?'auto':$argv[2]);
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
+$setuplang = GETPOST('selectlang', 'aZ09', 3) ?GETPOST('selectlang', 'aZ09', 3) : (empty($argv[2]) ? 'auto' : $argv[2]);
$langs->setDefaultLang($setuplang);
$langs->loadLangs(array("admin", "install", "errors"));
// Dolibarr pages directory
-$main_dir = GETPOST('main_dir')?GETPOST('main_dir'):(empty($argv[3])?'':$argv[3]);
+$main_dir = GETPOST('main_dir') ?GETPOST('main_dir') : (empty($argv[3]) ? '' : $argv[3]);
// Directory for generated documents (invoices, orders, ecm, etc...)
-$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : (empty($argv[4])? ($main_dir . '/documents') :$argv[4]);
+$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : (empty($argv[4]) ? ($main_dir.'/documents') : $argv[4]);
// Dolibarr root URL
-$main_url = GETPOST('main_url')?GETPOST('main_url'):(empty($argv[5])?'':$argv[5]);
+$main_url = GETPOST('main_url') ?GETPOST('main_url') : (empty($argv[5]) ? '' : $argv[5]);
// Database login information
-$userroot=GETPOST('db_user_root', 'alpha')?GETPOST('db_user_root', 'alpha'):(empty($argv[6])?'':$argv[6]);
-$passroot=GETPOST('db_pass_root', 'none')?GETPOST('db_pass_root', 'none'):(empty($argv[7])?'':$argv[7]);
+$userroot = GETPOST('db_user_root', 'alpha') ?GETPOST('db_user_root', 'alpha') : (empty($argv[6]) ? '' : $argv[6]);
+$passroot = GETPOST('db_pass_root', 'none') ?GETPOST('db_pass_root', 'none') : (empty($argv[7]) ? '' : $argv[7]);
// Database server
-$db_type=GETPOST('db_type', 'aZ09')?GETPOST('db_type', 'aZ09'):(empty($argv[8])?'':$argv[8]);
-$db_host=GETPOST('db_host', 'alpha')?GETPOST('db_host', 'alpha'):(empty($argv[9])?'':$argv[9]);
-$db_name=GETPOST('db_name', 'aZ09')?GETPOST('db_name', 'aZ09'):(empty($argv[10])?'':$argv[10]);
-$db_user=GETPOST('db_user', 'alpha')?GETPOST('db_user', 'alpha'):(empty($argv[11])?'':$argv[11]);
-$db_pass=GETPOST('db_pass', 'none')?GETPOST('db_pass', 'none'):(empty($argv[12])?'':$argv[12]);
-$db_port=GETPOST('db_port', 'int')?GETPOST('db_port', 'int'):(empty($argv[13])?'':$argv[13]);
-$db_prefix=GETPOST('db_prefix', 'aZ09')?GETPOST('db_prefix', 'aZ09'):(empty($argv[14])?'':$argv[14]);
-$db_create_database = GETPOST('db_create_database', 'none')?GETPOST('db_create_database', 'none'):(empty($argv[15])?'':$argv[15]);
-$db_create_user = GETPOST('db_create_user', 'none')?GETPOST('db_create_user', 'none'):(empty($argv[16])?'':$argv[16]);
+$db_type = GETPOST('db_type', 'aZ09') ?GETPOST('db_type', 'aZ09') : (empty($argv[8]) ? '' : $argv[8]);
+$db_host = GETPOST('db_host', 'alpha') ?GETPOST('db_host', 'alpha') : (empty($argv[9]) ? '' : $argv[9]);
+$db_name = GETPOST('db_name', 'aZ09') ?GETPOST('db_name', 'aZ09') : (empty($argv[10]) ? '' : $argv[10]);
+$db_user = GETPOST('db_user', 'alpha') ?GETPOST('db_user', 'alpha') : (empty($argv[11]) ? '' : $argv[11]);
+$db_pass = GETPOST('db_pass', 'none') ?GETPOST('db_pass', 'none') : (empty($argv[12]) ? '' : $argv[12]);
+$db_port = GETPOST('db_port', 'int') ?GETPOST('db_port', 'int') : (empty($argv[13]) ? '' : $argv[13]);
+$db_prefix = GETPOST('db_prefix', 'aZ09') ?GETPOST('db_prefix', 'aZ09') : (empty($argv[14]) ? '' : $argv[14]);
+$db_create_database = GETPOST('db_create_database', 'none') ?GETPOST('db_create_database', 'none') : (empty($argv[15]) ? '' : $argv[15]);
+$db_create_user = GETPOST('db_create_user', 'none') ?GETPOST('db_create_user', 'none') : (empty($argv[16]) ? '' : $argv[16]);
// Force https
$main_force_https = ((GETPOST("main_force_https", 'alpha') && (GETPOST("main_force_https", 'alpha') == "on" || GETPOST("main_force_https", 'alpha') == 1)) ? '1' : '0');
// Use alternative directory
@@ -64,16 +64,16 @@ $main_use_alt_dir = ((GETPOST("main_use_alt_dir", 'alpha') == '' || (GETPOST("ma
// Alternative root directory name
$main_alt_dir_name = ((GETPOST("main_alt_dir_name", 'alpha') && GETPOST("main_alt_dir_name", 'alpha') != '') ? GETPOST("main_alt_dir_name", 'alpha') : 'custom');
-session_start(); // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
+session_start(); // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
// Save a flag to tell to restore input value if we go back
-$_SESSION['dol_save_pass']=$db_pass;
+$_SESSION['dol_save_pass'] = $db_pass;
//$_SESSION['dol_save_passroot']=$passroot;
// Now we load forced values from install.forced.php file.
-$useforcedwizard=false;
-$forcedfile="./install.forced.php";
-if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
+$useforcedwizard = false;
+$forcedfile = "./install.forced.php";
+if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) {
$useforcedwizard = true;
include_once $forcedfile;
@@ -142,7 +142,7 @@ dolibarr_install_syslog("--- step1: entering step1.php page");
pHeader($langs->trans("ConfigurationFile"), "step2");
// Test if we can run a first install process
-if (! is_writable($conffile))
+if (!is_writable($conffile))
{
print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
pFooter(1, $setuplang, 'jscheckparam');
@@ -157,9 +157,9 @@ if (empty($db_type))
print ''.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseType")).' ';
$error++;
} else {
- $is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3' );
+ $is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3');
}
-if (empty($db_host) && ! $is_sqlite)
+if (empty($db_host) && !$is_sqlite)
{
print ''.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Server")).' ';
$error++;
@@ -169,17 +169,17 @@ if (empty($db_name))
print ''.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseName")).' ';
$error++;
}
-if (empty($db_user) && ! $is_sqlite)
+if (empty($db_user) && !$is_sqlite)
{
print ''.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Login")).' ';
$error++;
}
-if (! empty($db_port) && ! is_numeric($db_port))
+if (!empty($db_port) && !is_numeric($db_port))
{
print ''.$langs->trans("ErrorBadValueForParameter", $db_port, $langs->transnoentities("Port")).' ';
$error++;
}
-if (! empty($db_prefix) && ! preg_match('/^[a-z0-9]+_$/i', $db_prefix))
+if (!empty($db_prefix) && !preg_match('/^[a-z0-9]+_$/i', $db_prefix))
{
print ''.$langs->trans("ErrorBadValueForParameter", $db_prefix, $langs->transnoentities("DatabasePrefix")).' ';
$error++;
@@ -187,20 +187,20 @@ if (! empty($db_prefix) && ! preg_match('/^[a-z0-9]+_$/i', $db_prefix))
// Remove last / into dans main_dir
-if (substr($main_dir, dol_strlen($main_dir) -1) == "/")
+if (substr($main_dir, dol_strlen($main_dir) - 1) == "/")
{
- $main_dir = substr($main_dir, 0, dol_strlen($main_dir)-1);
+ $main_dir = substr($main_dir, 0, dol_strlen($main_dir) - 1);
}
// Remove last / into dans main_url
-if (! empty($main_url) && substr($main_url, dol_strlen($main_url) -1) == "/")
+if (!empty($main_url) && substr($main_url, dol_strlen($main_url) - 1) == "/")
{
- $main_url = substr($main_url, 0, dol_strlen($main_url)-1);
+ $main_url = substr($main_url, 0, dol_strlen($main_url) - 1);
}
// Test database connection
-if (! $error) {
- $result=@include_once $main_dir."/core/db/".$db_type.'.class.php';
+if (!$error) {
+ $result = @include_once $main_dir."/core/db/".$db_type.'.class.php';
if ($result)
{
// If we require database or user creation we need to connect as root, so we need root login credentials
@@ -221,39 +221,39 @@ if (! $error) {
// If we need root access
if (!$error && (!empty($db_create_database) || !empty($db_create_user))) {
- $databasefortest=$db_name;
+ $databasefortest = $db_name;
if (!empty($db_create_database)) {
if ($db_type == 'mysql' || $db_type == 'mysqli')
{
- $databasefortest='mysql';
+ $databasefortest = 'mysql';
}
elseif ($db_type == 'pgsql')
{
- $databasefortest='postgres';
+ $databasefortest = 'postgres';
}
else
{
- $databasefortest='master';
+ $databasefortest = 'master';
}
}
//print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
- $db=getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
+ $db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
- dol_syslog("databasefortest=" . $databasefortest . " connected=" . $db->connected . " database_selected=" . $db->database_selected, LOG_DEBUG);
+ dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
//print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
if (empty($db_create_database) && $db->connected && !$db->database_selected) {
print ''.$langs->trans("ErrorConnectedButDatabaseNotFound", $db_name).' ';
print '
';
- if (! $db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'
';
+ if (!$db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'
';
print $langs->trans("ErrorGoBackAndCorrectParameters");
$error++;
- } elseif ($db->error && ! (! empty($db_create_database) && $db->connected)) {
+ } elseif ($db->error && !(!empty($db_create_database) && $db->connected)) {
// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
if ($db->error == "No such file or directory") print ''.$langs->trans("ErrorToConnectToMysqlCheckInstance").' ';
else print ''.$db->error.' ';
- if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'
';
+ if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'
';
//print '';
print $langs->trans("ErrorGoBackAndCorrectParameters");
//print '';
@@ -262,12 +262,12 @@ if (! $error) {
}
// If we need simple access
if (!$error && (empty($db_create_database) && empty($db_create_user))) {
- $db=getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
+ $db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
if ($db->error)
{
print ' '.$db->error.' ';
- if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").' ';
+ if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").' ';
//print ' ';
print $langs->trans("ErrorGoBackAndCorrectParameters");
//print '';
@@ -289,15 +289,15 @@ if (! $error) {
else
{
if (isset($db)) print $db->lasterror();
- if (isset($db) && ! $db->connected) print ' '.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").' ';
+ if (isset($db) && !$db->connected) print ' '.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").' ';
print $langs->trans("ErrorGoBackAndCorrectParameters");
$error++;
}
-if (! $error && $db->connected)
+if (!$error && $db->connected)
{
- if (! empty($db_create_database)) {
- $result=$db->select_db($db_name);
+ if (!empty($db_create_database)) {
+ $result = $db->select_db($db_name);
if ($result)
{
print ' '.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).' ';
@@ -309,19 +309,19 @@ if (! $error && $db->connected)
}
// Define $defaultCharacterSet and $defaultDBSortingCollation
-if (! $error && $db->connected)
+if (!$error && $db->connected)
{
if (!empty($db_create_database)) // If we create database, we force default value
{
// Default values come from the database handler
- $defaultCharacterSet=$db->forcecharset;
- $defaultDBSortingCollation=$db->forcecollate;
+ $defaultCharacterSet = $db->forcecharset;
+ $defaultDBSortingCollation = $db->forcecollate;
}
else // If already created, we take current value
{
- $defaultCharacterSet=$db->getDefaultCharacterSetDatabase();
- $defaultDBSortingCollation=$db->getDefaultCollationDatabase();
+ $defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
+ $defaultDBSortingCollation = $db->getDefaultCollationDatabase();
}
// Force to avoid utf8mb4 because index on field char 255 reach limit of 767 char for indexes (example with mysql 5.6.34 = mariadb 10.0.29)
@@ -334,22 +334,22 @@ if (! $error && $db->connected)
print ' ';
print ' ';
- $db_character_set=$defaultCharacterSet;
- $db_collation=$defaultDBSortingCollation;
- dolibarr_install_syslog("step1: db_character_set=" . $db_character_set . " db_collation=" . $db_collation);
+ $db_character_set = $defaultCharacterSet;
+ $db_collation = $defaultDBSortingCollation;
+ dolibarr_install_syslog("step1: db_character_set=".$db_character_set." db_collation=".$db_collation);
}
// Create config file
-if (! $error && $db->connected && $action == "set")
+if (!$error && $db->connected && $action == "set")
{
umask(0);
if (is_array($_POST))
{
- foreach($_POST as $key => $value)
+ foreach ($_POST as $key => $value)
{
- if (! preg_match('/^db_pass/i', $key)) {
- dolibarr_install_syslog("step1: choice for " . $key . " = " . $value);
+ if (!preg_match('/^db_pass/i', $key)) {
+ dolibarr_install_syslog("step1: choice for ".$key." = ".$value);
}
}
}
@@ -359,11 +359,11 @@ if (! $error && $db->connected && $action == "set")
print ' ';
// Check parameter main_dir
- if (! $error)
+ if (!$error)
{
- if (! is_dir($main_dir))
+ if (!is_dir($main_dir))
{
- dolibarr_install_syslog("step1: directory '" . $main_dir . "' is unavailable or can't be accessed");
+ dolibarr_install_syslog("step1: directory '".$main_dir."' is unavailable or can't be accessed");
print "";
print $langs->trans("ErrorDirDoesNotExists", $main_dir).'
';
@@ -376,22 +376,22 @@ if (! $error && $db->connected && $action == "set")
}
}
- if (! $error)
+ if (!$error)
{
- dolibarr_install_syslog("step1: directory '" . $main_dir . "' exists");
+ dolibarr_install_syslog("step1: directory '".$main_dir."' exists");
}
// Create subdirectory main_data_dir
- if (! $error)
+ if (!$error)
{
// Create directory for documents
- if (! is_dir($main_data_dir))
+ if (!is_dir($main_data_dir))
{
dol_mkdir($main_data_dir);
}
- if (! is_dir($main_data_dir))
+ if (!is_dir($main_data_dir))
{
print " | | ".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
@@ -404,11 +404,11 @@ if (! $error && $db->connected && $action == "set")
else
{
// Create .htaccess file in document directory
- $pathhtaccess=$main_data_dir.'/.htaccess';
- if (! file_exists($pathhtaccess))
+ $pathhtaccess = $main_data_dir.'/.htaccess';
+ if (!file_exists($pathhtaccess))
{
- dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '" . $main_data_dir . "'");
- $handlehtaccess=@fopen($pathhtaccess, 'w');
+ dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '".$main_data_dir."'");
+ $handlehtaccess = @fopen($pathhtaccess, 'w');
if ($handlehtaccess)
{
fwrite($handlehtaccess, 'Order allow,deny'."\n");
@@ -420,7 +420,7 @@ if (! $error && $db->connected && $action == "set")
}
// Documents are stored above the web pages root to prevent being downloaded without authentification
- $dir=array();
+ $dir = array();
$dir[] = $main_data_dir."/mycompany";
$dir[] = $main_data_dir."/medias";
$dir[] = $main_data_dir."/users";
@@ -431,12 +431,12 @@ if (! $error && $db->connected && $action == "set")
$dir[] = $main_data_dir."/doctemplates";
// Loop on each directory of dir [] to create them if they do not exist
- $num=count($dir);
+ $num = count($dir);
for ($i = 0; $i < $num; $i++)
{
if (is_dir($dir[$i]))
{
- dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists");
+ dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
}
else
{
@@ -451,7 +451,7 @@ if (! $error && $db->connected && $action == "set")
}
else
{
- dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created");
+ dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
}
}
}
@@ -459,8 +459,8 @@ if (! $error && $db->connected && $action == "set")
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Copy directory medias
- $srcroot=$main_dir.'/install/medias';
- $destroot=$main_data_dir.'/medias';
+ $srcroot = $main_dir.'/install/medias';
+ $destroot = $main_data_dir.'/medias';
dolCopyDir($srcroot, $destroot, 0, 0);
if ($error)
@@ -475,9 +475,9 @@ if (! $error && $db->connected && $action == "set")
else
{
//ODT templates
- $srcroot=$main_dir.'/install/doctemplates';
- $destroot=$main_data_dir.'/doctemplates';
- $docs=array(
+ $srcroot = $main_dir.'/install/doctemplates';
+ $destroot = $main_data_dir.'/doctemplates';
+ $docs = array(
'contracts' => 'contract',
'invoices' => 'invoice',
'orders' => 'order',
@@ -491,14 +491,14 @@ if (! $error && $db->connected && $action == "set")
'usergroups' => 'usergroups',
'users' => 'user',
);
- foreach($docs as $cursordir => $cursorfile)
+ foreach ($docs as $cursordir => $cursorfile)
{
- $src=$srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
- $dirodt=$destroot.'/'.$cursordir;
- $dest=$dirodt.'/template_'.$cursorfile.'.odt';
+ $src = $srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
+ $dirodt = $destroot.'/'.$cursordir;
+ $dest = $dirodt.'/template_'.$cursorfile.'.odt';
dol_mkdir($dirodt);
- $result=dol_copy($src, $dest, 0, 0);
+ $result = dol_copy($src, $dest, 0, 0);
if ($result < 0)
{
print ' |
'.$langs->trans('ErrorFailToCopyFile', $src, $dest).' | ';
@@ -509,10 +509,10 @@ if (! $error && $db->connected && $action == "set")
}
// Table prefix
- $main_db_prefix = (! empty($db_prefix) ? $db_prefix : 'llx_');
+ $main_db_prefix = (!empty($db_prefix) ? $db_prefix : 'llx_');
// Write conf file on disk
- if (! $error)
+ if (!$error)
{
// Save old conf file on disk
if (file_exists("$conffile"))
@@ -523,11 +523,11 @@ if (! $error && $db->connected && $action == "set")
@dol_copy($conffile, $conffile.'.old', '0400');
}
- $error+=write_conf_file($conffile);
+ $error += write_conf_file($conffile);
}
// Create database and admin user database
- if (! $error)
+ if (!$error)
{
// We reload configuration file
conf($dolibarr_main_document_root);
@@ -539,26 +539,26 @@ if (! $error && $db->connected && $action == "set")
// Create database user if requested
if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) {
- dolibarr_install_syslog("step1: create database user: " . $dolibarr_main_db_user);
+ dolibarr_install_syslog("step1: create database user: ".$dolibarr_main_db_user);
//print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
- $databasefortest=$conf->db->name;
+ $databasefortest = $conf->db->name;
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
{
- $databasefortest='mysql';
+ $databasefortest = 'mysql';
}
elseif ($conf->db->type == 'pgsql')
{
- $databasefortest='postgres';
+ $databasefortest = 'postgres';
}
elseif ($conf->db->type == 'mssql')
{
- $databasefortest='master';
+ $databasefortest = 'master';
}
// Check database connection
- $db=getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port);
+ $db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port);
if ($db->error)
{
@@ -643,13 +643,13 @@ if (! $error && $db->connected && $action == "set")
// If database creation was asked, we create it
if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) {
- dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user);
- $newdb=getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', $conf->db->port);
+ dolibarr_install_syslog("step1: create database: ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user);
+ $newdb = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', $conf->db->port);
//print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
if ($newdb->connected)
{
- $result=$newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
+ $result = $newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
if ($result)
{
@@ -660,9 +660,9 @@ if (! $error && $db->connected && $action == "set")
print ' | ';
$newdb->select_db($dolibarr_main_db_name);
- $check1=$newdb->getDefaultCharacterSetDatabase();
- $check2=$newdb->getDefaultCollationDatabase();
- dolibarr_install_syslog('step1: new database is using charset=' . $check1 . ' collation=' . $check2);
+ $check1 = $newdb->getDefaultCharacterSetDatabase();
+ $check2 = $newdb->getDefaultCollationDatabase();
+ dolibarr_install_syslog('step1: new database is using charset='.$check1.' collation='.$check2);
// If values differs, we save conf file again
//if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
@@ -678,7 +678,7 @@ if (! $error && $db->connected && $action == "set")
print '
';
print '';
- dolibarr_install_syslog('step1: failed to create database ' . $dolibarr_main_db_name . ' ' . $newdb->lasterrno() . ' ' . $newdb->lasterror(), LOG_ERR);
+ dolibarr_install_syslog('step1: failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
$error++;
}
$newdb->close();
@@ -705,16 +705,16 @@ if (! $error && $db->connected && $action == "set")
// We test access with dolibarr database user (not admin)
- if (! $error)
+ if (!$error)
{
- dolibarr_install_syslog("step1: connection type=" . $conf->db->type . " on host=" . $conf->db->host . " port=" . $conf->db->port . " user=" . $conf->db->user . " name=" . $conf->db->name);
+ dolibarr_install_syslog("step1: connection type=".$conf->db->type." on host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name);
//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
- $db=getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+ $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
if ($db->connected)
{
- dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " ok");
+ dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." ok");
print "| ";
print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
@@ -725,7 +725,7 @@ if (! $error && $db->connected && $action == "set")
// server access ok, basic access ok
if ($db->database_selected)
{
- dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " ok");
+ dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." ok");
print " | | ";
print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name;
@@ -737,7 +737,7 @@ if (! $error && $db->connected && $action == "set")
}
else
{
- dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " failed", LOG_ERR);
+ dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);
print " | | ";
print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name;
@@ -757,7 +757,7 @@ if (! $error && $db->connected && $action == "set")
}
else
{
- dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " failed", LOG_ERR);
+ dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);
print " | | ";
print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
@@ -798,13 +798,13 @@ function jsinfo()
| ";
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 7a4a3a92595..5b794b781bd 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -36,31 +36,31 @@ $ok = 0;
// Cette page peut etre longue. On augmente le delai autorise.
// Ne fonctionne que si on est pas en safe_mode.
-$err=error_reporting();
-error_reporting(0); // Disable all errors
+$err = error_reporting();
+error_reporting(0); // Disable all errors
//error_reporting(E_ALL);
-@set_time_limit(900); // Need 900 on some OS like Windows 7/64
+@set_time_limit(900); // Need 900 on some OS like Windows 7/64
error_reporting($err);
-$action=GETPOST('action', 'aZ09')?GETPOST('action', 'aZ09'):(empty($argv[1])?'':$argv[1]);
-$setuplang=GETPOST('selectlang', 'aZ09', 3)?GETPOST('selectlang', 'aZ09', 3):(empty($argv[2])?'auto':$argv[2]);
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
+$setuplang = GETPOST('selectlang', 'aZ09', 3) ?GETPOST('selectlang', 'aZ09', 3) : (empty($argv[2]) ? 'auto' : $argv[2]);
$langs->setDefaultLang($setuplang);
$langs->loadLangs(array("admin", "install"));
-$choix=0;
-if ($dolibarr_main_db_type == "mysqli") $choix=1;
-if ($dolibarr_main_db_type == "pgsql") $choix=2;
-if ($dolibarr_main_db_type == "mssql") $choix=3;
-if ($dolibarr_main_db_type == "sqlite") $choix=4;
-if ($dolibarr_main_db_type == "sqlite3") $choix=5;
+$choix = 0;
+if ($dolibarr_main_db_type == "mysqli") $choix = 1;
+if ($dolibarr_main_db_type == "pgsql") $choix = 2;
+if ($dolibarr_main_db_type == "mssql") $choix = 3;
+if ($dolibarr_main_db_type == "sqlite") $choix = 4;
+if ($dolibarr_main_db_type == "sqlite3") $choix = 5;
//if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into step2.php page');
// Now we load forced values from install.forced.php file.
-$useforcedwizard=false;
-$forcedfile="./install.forced.php";
-if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
+$useforcedwizard = false;
+$forcedfile = "./install.forced.php";
+if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) {
$useforcedwizard = true;
include_once $forcedfile;
@@ -78,7 +78,7 @@ dolibarr_install_syslog("- step2: entering step2.php page");
pHeader($langs->trans("CreateDatabaseObjects"), "step4");
// Test if we can run a first install process
-if (! is_writable($conffile))
+if (!is_writable($conffile))
{
print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
pFooter(1, $setuplang, 'jscheckparam');
@@ -90,15 +90,15 @@ if ($action == "set")
print ' '.$langs->trans("Database").'
';
print '';
- $error=0;
+ $error = 0;
- $db=getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+ $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
if ($db->connected)
{
print "| ";
print $langs->trans("ServerConnection")." : ".$conf->db->host.' | | ';
- $ok = 1 ;
+ $ok = 1;
}
else
{
@@ -107,15 +107,15 @@ if ($action == "set")
if ($ok)
{
- if($db->database_selected)
+ if ($db->database_selected)
{
- dolibarr_install_syslog("step2: successful connection to database: " . $conf->db->name);
+ dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
}
else
{
- dolibarr_install_syslog("step2: failed connection to database :" . $conf->db->name, LOG_ERR);
+ dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
print "| Failed to select database ".$conf->db->name.' |  | ';
- $ok = 0 ;
+ $ok = 0;
}
}
@@ -123,8 +123,8 @@ if ($action == "set")
// Affiche version
if ($ok)
{
- $version=$db->getVersion();
- $versionarray=$db->getVersionArray();
+ $version = $db->getVersion();
+ $versionarray = $db->getVersionArray();
print '| '.$langs->trans("DatabaseVersion").' | ';
print ''.$version.' | ';
//print ''.join('.',$versionarray).' | ';
@@ -134,18 +134,18 @@ if ($action == "set")
//print ''.join('.',$versionarray).' | ';
}
- $requestnb=0;
+ $requestnb = 0;
// To disable some code, so you can call step2 with url like
// http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
- $createtables=isset($_GET['createtables'])?GETPOST('createtables'):1;
- $createkeys=isset($_GET['createkeys'])?GETPOST('createkeys'):1;
- $createfunctions=isset($_GET['createfunctions'])?GETPOST('createfunction'):1;
- $createdata=isset($_GET['createdata'])?GETPOST('createdata'):1;
+ $createtables = isset($_GET['createtables']) ?GETPOST('createtables') : 1;
+ $createkeys = isset($_GET['createkeys']) ?GETPOST('createkeys') : 1;
+ $createfunctions = isset($_GET['createfunctions']) ?GETPOST('createfunction') : 1;
+ $createdata = isset($_GET['createdata']) ?GETPOST('createdata') : 1;
// To say sql requests are escaped for mysql so we need to unescape them
- $db->unescapeslashquot=true;
+ $db->unescapeslashquot = true;
/**************************************************************************************
@@ -160,18 +160,18 @@ if ($action == "set")
$dir = "mysql/tables/";
$ok = 0;
- $handle=opendir($dir);
- dolibarr_install_syslog("step2: open tables directory " . $dir . " handle=" . $handle);
+ $handle = opendir($dir);
+ dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".$handle);
$tablefound = 0;
- $tabledata=array();
+ $tabledata = array();
if (is_resource($handle))
{
- while (($file = readdir($handle))!==false)
+ while (($file = readdir($handle)) !== false)
{
- if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && ! preg_match('/\.key\.sql$/i', $file))
+ if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && !preg_match('/\.key\.sql$/i', $file))
{
$tablefound++;
- $tabledata[]=$file;
+ $tabledata[] = $file;
}
}
closedir($handle);
@@ -179,7 +179,7 @@ if ($action == "set")
// Sort list of sql files on alphabetical order (load order is important)
sort($tabledata);
- foreach($tabledata as $file)
+ foreach ($tabledata as $file)
{
$name = substr($file, 0, dol_strlen($file) - 4);
$buffer = '';
@@ -191,36 +191,36 @@ if ($action == "set")
$buf = fgets($fp, 4096);
if (substr($buf, 0, 2) <> '--')
{
- $buf=preg_replace('/--(.+)*/', '', $buf);
+ $buf = preg_replace('/--(.+)*/', '', $buf);
$buffer .= $buf;
}
}
fclose($fp);
- $buffer=trim($buffer);
+ $buffer = trim($buffer);
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli') // For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb
{
- $buffer=preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
+ $buffer = preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
}
else
{
// Keyword ENGINE is MySQL-specific, so scrub it for
// other database types (mssql, pgsql)
- $buffer=preg_replace('/type=innodb/i', '', $buffer);
- $buffer=preg_replace('/ENGINE=innodb/i', '', $buffer);
+ $buffer = preg_replace('/type=innodb/i', '', $buffer);
+ $buffer = preg_replace('/ENGINE=innodb/i', '', $buffer);
}
// Replace the prefix tables
if ($dolibarr_main_db_prefix != 'llx_')
{
- $buffer=preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+ $buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
}
//print "| Creation de la table $name/td>";
$requestnb++;
- dolibarr_install_syslog("step2: request: " . $buffer);
- $resql=$db->query($buffer, 0, 'dml');
+ dolibarr_install_syslog("step2: request: ".$buffer);
+ $resql = $db->query($buffer, 0, 'dml');
if ($resql)
{
// print " | OK requete ==== $buffer | ";
@@ -249,7 +249,7 @@ if ($action == "set")
print "";
print ''.$langs->trans("Error").' Failed to open file '.$dir.$file.' | ';
$error++;
- dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
+ dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
}
}
@@ -265,7 +265,7 @@ if ($action == "set")
else
{
print '| '.$langs->trans("ErrorFailedToFindSomeFiles", $dir).' | | ';
- dolibarr_install_syslog("step2: failed to find files to create database in directory " . $dir, LOG_ERR);
+ dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
}
}
@@ -282,18 +282,18 @@ if ($action == "set")
$dir = "mysql/tables/";
$okkeys = 0;
- $handle=opendir($dir);
- dolibarr_install_syslog("step2: open keys directory " . $dir . " handle=" . $handle);
+ $handle = opendir($dir);
+ dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".$handle);
$tablefound = 0;
- $tabledata=array();
+ $tabledata = array();
if (is_resource($handle))
{
- while (($file = readdir($handle))!==false)
+ while (($file = readdir($handle)) !== false)
{
if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && preg_match('/\.key\.sql$/i', $file))
{
$tablefound++;
- $tabledata[]=$file;
+ $tabledata[] = $file;
}
}
closedir($handle);
@@ -301,7 +301,7 @@ if ($action == "set")
// Sort list of sql files on alphabetical order (load order is important)
sort($tabledata);
- foreach($tabledata as $file)
+ foreach ($tabledata as $file)
{
$name = substr($file, 0, dol_strlen($file) - 4);
//print "| Creation de la table $name | ";
@@ -316,54 +316,54 @@ if ($action == "set")
// Special case of lines allowed for some version only
if ($choix == 1 && preg_match('/^--\sV([0-9\.]+)/i', $buf, $reg))
{
- $versioncommande=explode('.', $reg[1]);
+ $versioncommande = explode('.', $reg[1]);
//print var_dump($versioncommande);
//print var_dump($versionarray);
if (count($versioncommande) && count($versionarray)
&& versioncompare($versioncommande, $versionarray) <= 0)
{
// Version qualified, delete SQL comments
- $buf=preg_replace('/^--\sV([0-9\.]+)/i', '', $buf);
+ $buf = preg_replace('/^--\sV([0-9\.]+)/i', '', $buf);
//print "Ligne $i qualifiee par version: ".$buf.'
';
}
}
if ($choix == 2 && preg_match('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', $buf, $reg))
{
- $versioncommande=explode('.', $reg[1]);
+ $versioncommande = explode('.', $reg[1]);
//print var_dump($versioncommande);
//print var_dump($versionarray);
if (count($versioncommande) && count($versionarray)
&& versioncompare($versioncommande, $versionarray) <= 0)
{
// Version qualified, delete SQL comments
- $buf=preg_replace('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', '', $buf);
+ $buf = preg_replace('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', '', $buf);
//print "Ligne $i qualifiee par version: ".$buf.'
';
}
}
// Ajout ligne si non commentaire
- if (! preg_match('/^--/i', $buf)) $buffer .= $buf;
+ if (!preg_match('/^--/i', $buf)) $buffer .= $buf;
}
fclose($fp);
// Si plusieurs requetes, on boucle sur chaque
- $listesql=explode(';', $buffer);
+ $listesql = explode(';', $buffer);
foreach ($listesql as $req)
{
- $buffer=trim($req);
+ $buffer = trim($req);
if ($buffer)
{
// Replace the prefix tables
if ($dolibarr_main_db_prefix != 'llx_')
{
- $buffer=preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+ $buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
}
//print " | Creation des cles et index de la table $name: '$buffer' | ";
$requestnb++;
- dolibarr_install_syslog("step2: request: " . $buffer);
- $resql=$db->query($buffer, 0, 'dml');
+ dolibarr_install_syslog("step2: request: ".$buffer);
+ $resql = $db->query($buffer, 0, 'dml');
if ($resql)
{
//print "OK requete ==== $buffer | ";
@@ -398,7 +398,7 @@ if ($action == "set")
print "";
print ''.$langs->trans("Error")." Failed to open file ".$dir.$file." | ";
$error++;
- dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
+ dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
}
}
@@ -419,20 +419,20 @@ if ($action == "set")
if ($ok && $createfunctions)
{
// For this file, we use a directory according to database type
- if ($choix==1) $dir = "mysql/functions/";
- elseif ($choix==2) $dir = "pgsql/functions/";
- elseif ($choix==3) $dir = "mssql/functions/";
- elseif ($choix==4) { $dir = "sqlite3/functions/"; }
+ if ($choix == 1) $dir = "mysql/functions/";
+ elseif ($choix == 2) $dir = "pgsql/functions/";
+ elseif ($choix == 3) $dir = "mssql/functions/";
+ elseif ($choix == 4) { $dir = "sqlite3/functions/"; }
// Creation donnees
$file = "functions.sql";
if (file_exists($dir.$file))
{
$fp = fopen($dir.$file, "r");
- dolibarr_install_syslog("step2: open function file " . $dir . $file . " handle=" . $fp);
+ dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".$fp);
if ($fp)
{
- $buffer='';
+ $buffer = '';
while (!feof($fp))
{
$buf = fgets($fp, 4096);
@@ -446,20 +446,20 @@ if ($action == "set")
//$buffer=preg_replace('/;\';/',";'§",$buffer);
// If several requests, we loop on each of them
- $listesql=explode('§', $buffer);
+ $listesql = explode('§', $buffer);
foreach ($listesql as $buffer)
{
- $buffer=trim($buffer);
+ $buffer = trim($buffer);
if ($buffer)
{
// Replace the prefix in table names
if ($dolibarr_main_db_prefix != 'llx_')
{
- $buffer=preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+ $buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
}
- dolibarr_install_syslog("step2: request: " . $buffer);
+ dolibarr_install_syslog("step2: request: ".$buffer);
print "\n";
- $resql=$db->query($buffer, 0, 'dml');
+ $resql = $db->query($buffer, 0, 'dml');
if ($resql)
{
$ok = 1;
@@ -494,7 +494,7 @@ if ($action == "set")
else
{
print ' | ';
- $ok = 1 ;
+ $ok = 1;
}
}
}
@@ -511,23 +511,23 @@ if ($action == "set")
$dir = "mysql/data/";
// Insert data
- $handle=opendir($dir);
- dolibarr_install_syslog("step2: open directory data " . $dir . " handle=" . $handle);
+ $handle = opendir($dir);
+ dolibarr_install_syslog("step2: open directory data ".$dir." handle=".$handle);
$tablefound = 0;
- $tabledata=array();
+ $tabledata = array();
if (is_resource($handle))
{
- while (($file = readdir($handle))!==false)
+ while (($file = readdir($handle)) !== false)
{
if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file))
{
- if (preg_match('/^llx_accounting_account_/', $file)) continue; // We discard data file of chart of account. Will be loaded when a chart is selected.
+ if (preg_match('/^llx_accounting_account_/', $file)) continue; // We discard data file of chart of account. Will be loaded when a chart is selected.
//print 'x'.$file.'-'.$createdata.'
';
if (is_numeric($createdata) || preg_match('/'.preg_quote($createdata).'/i', $file))
{
$tablefound++;
- $tabledata[]=$file;
+ $tabledata[] = $file;
}
}
}
@@ -536,17 +536,17 @@ if ($action == "set")
// Sort list of data files on alphabetical order (load order is important)
sort($tabledata);
- foreach($tabledata as $file)
+ foreach ($tabledata as $file)
{
$name = substr($file, 0, dol_strlen($file) - 4);
$fp = fopen($dir.$file, "r");
- dolibarr_install_syslog("step2: open data file " . $dir . $file . " handle=" . $fp);
+ dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".$fp);
if ($fp)
{
- $arrayofrequests=array();
- $linefound=0;
- $linegroup=0;
- $sizeofgroup=1; // Grouping request to have 1 query for several requests does not works with mysql, so we use 1.
+ $arrayofrequests = array();
+ $linefound = 0;
+ $linegroup = 0;
+ $sizeofgroup = 1; // Grouping request to have 1 query for several requests does not works with mysql, so we use 1.
// Load all requests
while (!feof($fp))
@@ -561,30 +561,30 @@ if ($action == "set")
{
$linegroup++;
}
- if (empty($arrayofrequests[$linegroup])) $arrayofrequests[$linegroup]=$buffer;
- else $arrayofrequests[$linegroup].=" ".$buffer;
+ if (empty($arrayofrequests[$linegroup])) $arrayofrequests[$linegroup] = $buffer;
+ else $arrayofrequests[$linegroup] .= " ".$buffer;
$linefound++;
}
}
fclose($fp);
- dolibarr_install_syslog("step2: found " . $linefound . " records, defined " . count($arrayofrequests) . " group(s).");
+ dolibarr_install_syslog("step2: found ".$linefound." records, defined ".count($arrayofrequests)." group(s).");
- $okallfile=1;
+ $okallfile = 1;
$db->begin();
// We loop on each requests of file
- foreach($arrayofrequests as $buffer)
+ foreach ($arrayofrequests as $buffer)
{
// Replace the prefix tables
if ($dolibarr_main_db_prefix != 'llx_')
{
- $buffer=preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+ $buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
}
//dolibarr_install_syslog("step2: request: " . $buffer);
- $resql=$db->query($buffer, 1);
+ $resql = $db->query($buffer, 1);
if ($resql)
{
//$db->free($resql); // Not required as request we launch here does not return memory needs.
@@ -617,7 +617,7 @@ if ($action == "set")
else
{
print ' | ';
- $ok = 1; // Data loading are not blocking errors
+ $ok = 1; // Data loading are not blocking errors
}
}
print ' ';
@@ -628,8 +628,8 @@ else
}
-$ret=0;
-if (!$ok && isset($argv[1])) $ret=1;
+$ret = 0;
+if (!$ok && isset($argv[1])) $ret = 1;
dolibarr_install_syslog("Exit ".$ret);
dolibarr_install_syslog("- step2: end");
@@ -653,7 +653,7 @@ $out .= '';
print $out;
-pFooter($ok?0:1, $setuplang);
+pFooter($ok ? 0 : 1, $setuplang);
if (isset($db) && is_object($db)) $db->close();
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index b8feb89d246..b780f9d3b0f 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -32,15 +32,15 @@ require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
global $langs;
-$setuplang=GETPOST('selectlang', 'aZ09', 3)?GETPOST('selectlang', 'aZ09', 3):(empty($argv[1])?'auto':$argv[1]);
+$setuplang = GETPOST('selectlang', 'aZ09', 3) ?GETPOST('selectlang', 'aZ09', 3) : (empty($argv[1]) ? 'auto' : $argv[1]);
$langs->setDefaultLang($setuplang);
$langs->loadLangs(array("admin", "install"));
// Now we load forced value from install.forced.php file.
-$useforcedwizard=false;
-$forcedfile="./install.forced.php";
-if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
+$useforcedwizard = false;
+$forcedfile = "./install.forced.php";
+if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) {
$useforcedwizard = true;
include_once $forcedfile;
@@ -48,7 +48,7 @@ if (@file_exists($forcedfile)) {
dolibarr_install_syslog("- step4: entering step4.php page");
-$error=0;
+$error = 0;
$ok = 0;
@@ -60,7 +60,7 @@ $ok = 0;
pHeader($langs->trans("AdminAccountCreation"), "step5");
// Test if we can run a first install process
-if (! is_writable($conffile))
+if (!is_writable($conffile))
{
print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
pFooter(1, $setuplang, 'jscheckparam');
@@ -75,12 +75,12 @@ print $langs->trans("LastStepDesc").'
';
print '';
@@ -240,20 +240,20 @@ if ($action == 'create')
print ' | | '.$langs->trans("Date").' | ';
$datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
- $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0;
+ $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (empty($_POST["remonth"]) ?-1 : $datepaye) : 0;
print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
print " | ";
print ' ';
print '| '.$langs->trans("PaymentMode").' | ';
- $form->select_types_paiements(isset($_POST["paymenttype"])?$_POST["paymenttype"]:$loan->paymenttype, "paymenttype");
+ $form->select_types_paiements(isset($_POST["paymenttype"]) ? $_POST["paymenttype"] : $loan->paymenttype, "paymenttype");
print " | \n";
print ' ';
print '';
print '| '.$langs->trans('AccountToDebit').' | ';
print '';
- $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$loan->accountid, "accountid", 0, '', 1); // Show opend bank account list
+ $form->select_comptes(isset($_POST["accountid"]) ? $_POST["accountid"] : $loan->accountid, "accountid", 0, '', 1); // Show opend bank account list
print ' | ';
// Number
@@ -305,7 +305,7 @@ if ($action == 'create')
print '';
if ($sumpaid < $loan->capital)
{
- print $langs->trans("LoanCapital") .': ';
+ print $langs->trans("LoanCapital").': ';
}
else
{
@@ -314,7 +314,7 @@ if ($action == 'create')
print '
';
if ($sumpaid < $loan->capital)
{
- print $langs->trans("Insurance") .': ';
+ print $langs->trans("Insurance").': ';
}
else
{
@@ -323,7 +323,7 @@ if ($action == 'create')
print '
';
if ($sumpaid < $loan->capital)
{
- print $langs->trans("Interest") .': ';
+ print $langs->trans("Interest").': ';
}
else
{
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index d8b5c7ed36e..41a221a7e72 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -47,7 +47,7 @@ class MailmanSpip
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* @var string[] Array of error strings
@@ -156,8 +156,8 @@ class MailmanSpip
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_FAILONERROR, true);
@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
- 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_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
@@ -197,8 +197,8 @@ class MailmanSpip
if ($mydb)
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
- $mdpass=dol_hash($object->pass);
- $htpass=crypt($object->pass, makesalt());
+ $mdpass = dol_hash($object->pass);
+ $htpass = crypt($object->pass, makesalt());
$query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".dolGetFirstLastname($object->firstname, $object->lastname)."\",\"".$object->email."\",\"".$object->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")";
$result = $mydb->query($query);
@@ -324,42 +324,42 @@ class MailmanSpip
public function add_to_mailman($object, $listes = '')
{
// phpcs:enable
- global $conf,$langs,$user;
+ global $conf, $langs, $user;
dol_syslog(get_class($this)."::add_to_mailman");
- $this->mladded_ok=array();
- $this->mladded_ko=array();
+ $this->mladded_ok = array();
+ $this->mladded_ko = array();
- if (! function_exists("curl_init"))
+ if (!function_exists("curl_init"))
{
$langs->load("errors");
- $this->error=$langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
+ $this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
return -1;
}
if ($conf->adherent->enabled) // Synchro for members
{
- if (! empty($conf->global->ADHERENT_MAILMAN_URL))
+ if (!empty($conf->global->ADHERENT_MAILMAN_URL))
{
- if ($listes == '' && ! empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists=explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
- else $lists=explode(',', $listes);
+ if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
+ else $lists = explode(',', $listes);
- $categstatic=new Categorie($this->db);
+ $categstatic = new Categorie($this->db);
foreach ($lists as $list)
{
// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
- $tmp=explode(':', $list);
- if (! empty($tmp[2]))
+ $tmp = explode(':', $list);
+ if (!empty($tmp[2]))
{
- $list=$tmp[2];
+ $list = $tmp[2];
if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1]) // Filter on member type label
{
dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
continue;
}
- if ($object->element == 'member' && $tmp[0] == 'CATEG' && ! in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label'))) // Filter on member category
+ if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label'))) // Filter on member category
{
dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
continue;
@@ -371,16 +371,16 @@ class MailmanSpip
if ($result === false)
{
- $this->mladded_ko[$list]=$object->email;
+ $this->mladded_ko[$list] = $object->email;
return -2;
}
- else $this->mladded_ok[$list]=$object->email;
+ else $this->mladded_ok[$list] = $object->email;
}
return count($lists);
}
else
{
- $this->error="ADHERENT_MAILMAN_URL not defined";
+ $this->error = "ADHERENT_MAILMAN_URL not defined";
return -1;
}
}
@@ -398,42 +398,42 @@ class MailmanSpip
public function del_to_mailman($object, $listes = '')
{
// phpcs:enable
- global $conf,$langs,$user;
+ global $conf, $langs, $user;
dol_syslog(get_class($this)."::del_to_mailman");
- $this->mlremoved_ok=array();
- $this->mlremoved_ko=array();
+ $this->mlremoved_ok = array();
+ $this->mlremoved_ko = array();
- if (! function_exists("curl_init"))
+ if (!function_exists("curl_init"))
{
$langs->load("errors");
- $this->error=$langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
+ $this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
return -1;
}
if ($conf->adherent->enabled) // Synchro for members
{
- if (! empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL))
+ if (!empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL))
{
- if ($listes=='' && ! empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists=explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
- else $lists=explode(',', $listes);
+ if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
+ else $lists = explode(',', $listes);
- $categstatic=new Categorie($this->db);
+ $categstatic = new Categorie($this->db);
foreach ($lists as $list)
{
// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
- $tmp=explode(':', $list);
- if (! empty($tmp[2]))
+ $tmp = explode(':', $list);
+ if (!empty($tmp[2]))
{
- $list=$tmp[2];
+ $list = $tmp[2];
if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1]) // Filter on member type label
{
dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
continue;
}
- if ($object->element == 'member' && $tmp[0] == 'CATEG' && ! in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label'))) // Filter on member category
+ if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label'))) // Filter on member category
{
dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
continue;
@@ -445,16 +445,16 @@ class MailmanSpip
if ($result === false)
{
- $this->mlremoved_ko[$list]=$object->email;
+ $this->mlremoved_ko[$list] = $object->email;
return -2;
}
- else $this->mlremoved_ok[$list]=$object->email;
+ else $this->mlremoved_ok[$list] = $object->email;
}
return count($lists);
}
else
{
- $this->error="ADHERENT_MAILMAN_UNSUB_URL not defined";
+ $this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
return -1;
}
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f17579e9d78..965d49de2f7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -232,7 +232,7 @@ require_once 'master.inc.php';
register_shutdown_function('dol_shutdown');
// Load debugbar
-if (!empty($conf->debugbar->enabled) && ! GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile']))
+if (!empty($conf->debugbar->enabled) && !GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile']))
{
global $debugbar;
include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
@@ -283,7 +283,7 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
// Start redirect
if ($newurl)
{
- header_remove(); // Clean header already set to be sure to remove any header like "Set-Cookie: DOLSESSID_..." from non HTTPS answers
+ header_remove(); // Clean header already set to be sure to remove any header like "Set-Cookie: DOLSESSID_..." from non HTTPS answers
dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
header("Location: ".$newurl);
exit;
@@ -1706,7 +1706,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
// Logout link
$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
- $toprightmenu .= ''; // end div class="login_block_other"
+ $toprightmenu .= ''; // end div class="login_block_other"
// Add login user link
@@ -2591,14 +2591,14 @@ if (!function_exists("llxFooter"))
|| $forceping)
{
// No ping done if we are into an alpha version
- if (strpos('alpha', DOL_VERSION) > 0 && ! $forceping) {
+ if (strpos('alpha', DOL_VERSION) > 0 && !$forceping) {
print "\n\n";
}
elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping) // Cookie is set when we uncheck the checkbox in the installation wizard.
{
// MAIN_LAST_PING_KO_DATE
// Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent
- if (! empty($conf->global->MAIN_LAST_PING_KO_DATE) && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && ! $forceping) {
+ if (!empty($conf->global->MAIN_LAST_PING_KO_DATE) && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && !$forceping) {
print "\n\n";
} else {
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -2609,7 +2609,7 @@ if (!function_exists("llxFooter"))
// Try to guess the distrib used
$distrib = 'standard';
if ($_SERVER["SERVER_ADMIN"] == 'doliwamp@localhost') $distrib = 'doliwamp';
- if (! empty($dolibarr_distrib)) $distrib = $dolibarr_distrib;
+ if (!empty($dolibarr_distrib)) $distrib = $dolibarr_distrib;
?>
@@ -48,8 +48,8 @@ if (empty($usedolheader))
}
else
{
- $arraycss=array();
- $arrayjs=array();
+ $arraycss = array();
+ $arrayjs = array();
/*
$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
@@ -153,71 +153,71 @@ $(document).ready(function() {
initAsSpecimen();
-$sortfield='aaa';
-$sortorder='ASC';
-$tasksarray=array(1,2,3); // To force having several lines
-$tagidfortablednd='tablelines3';
-if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+$sortfield = 'aaa';
+$sortorder = 'ASC';
+$tasksarray = array(1, 2, 3); // To force having several lines
+$tagidfortablednd = 'tablelines3';
+if (!empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
-$nav='';
-$nav.='';
+$nav = '';
+$nav .= '';
-$limit=10;
+$limit = 10;
print_barre_liste('Title of my list', 12, $_SERVER["PHP_SELF"], '', '', '', 'Text in middle', 20, 500, '', 0, $nav, '', $limit);
-$moreforfilter.='';
-$moreforfilter.=$langs->trans('This is a select list for a filter A'). ': ';
-$cate_arbo = array('field1'=>'value1a into the select list A','field2'=>'value2a');
-$moreforfilter.=$form->selectarray('search_aaa', $cate_arbo, '', 1); // List without js combo
-$moreforfilter.=' ';
+$moreforfilter .= '';
+$moreforfilter .= $langs->trans('This is a select list for a filter A').': ';
+$cate_arbo = array('field1'=>'value1a into the select list A', 'field2'=>'value2a');
+$moreforfilter .= $form->selectarray('search_aaa', $cate_arbo, '', 1); // List without js combo
+$moreforfilter .= ' ';
-$moreforfilter.='';
-$moreforfilter.=$langs->trans('This is a select list for a filter B'). ': ';
-$cate_arbo = array('field1'=>'value1b into the select list B','field2'=>'value2b');
-$moreforfilter.=$form->selectarray('search_bbb', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
-$moreforfilter.=' ';
+$moreforfilter .= '';
+$moreforfilter .= $langs->trans('This is a select list for a filter B').': ';
+$cate_arbo = array('field1'=>'value1b into the select list B', 'field2'=>'value2b');
+$moreforfilter .= $form->selectarray('search_bbb', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
+$moreforfilter .= ' ';
-$moreforfilter.='';
-$moreforfilter.=$langs->trans('This is a select list for a filter C'). ': ';
-$cate_arbo = array('field1'=>'value1c into the select list C','field2'=>'value2c');
-$moreforfilter.=$form->selectarray('search_ccc', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
-$moreforfilter.=' ';
+$moreforfilter .= '';
+$moreforfilter .= $langs->trans('This is a select list for a filter C').': ';
+$cate_arbo = array('field1'=>'value1c into the select list C', 'field2'=>'value2c');
+$moreforfilter .= $form->selectarray('search_ccc', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
+$moreforfilter .= ' ';
-$moreforfilter.='';
-$moreforfilter.=$langs->trans('This is a select list for a filter D'). ': ';
-$cate_arbo = array('field1'=>'value1d into the select list D','field2'=>'value2d');
-$moreforfilter.=$form->selectarray('search_ddd', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
-$moreforfilter.=' ';
+$moreforfilter .= '';
+$moreforfilter .= $langs->trans('This is a select list for a filter D').': ';
+$cate_arbo = array('field1'=>'value1d into the select list D', 'field2'=>'value2d');
+$moreforfilter .= $form->selectarray('search_ddd', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
+$moreforfilter .= ' ';
-if (! empty($moreforfilter))
+if (!empty($moreforfilter))
{
print '';
print $moreforfilter;
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print ' ';
}
?>
-" id="tablelines3">
+" id="tablelines3">
trans('title1'), 0, $_SERVER["PHP_SELF"], 'aaa', '', '', 'align="left"', $sortfield, $sortorder); ?>
@@ -245,7 +245,7 @@ if (! empty($moreforfilter))
$(document).ready(function(){
$('#idtableexample2').dataTable( {
use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+ $tasksarray = array(1, 2, 3); // To force having several lines
+ $tagidfortablednd = 'tablelines';
+ if (!empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
?>
@@ -340,7 +340,7 @@ $(document).ready(function(){
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index b2f55e1b748..0a43cfda708 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -1,6 +1,6 @@
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print ' '; // You can use div-table-responsive-no-min if you dont need reserved height for your table
// Test1: form->selectDate using tzuser date
print "Test 1a: We must have here current date and hour for user (must match hour on browser). Note: Check your are logged so user TZ and DST are known.";
-$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
-$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
+$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;
+$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60;
print " (dol_tz=".$offsettz." dol_dst=".$dol_dst.")
\n";
print $form->selectDate(dol_now(), 'test1a', 1, 1, 0);
@@ -56,23 +56,23 @@ print '
'."\n";
// Test4a: a select
print "Test 4a: a select
\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
-$selected=3;
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
+$selected = 3;
print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
print '
';
print "Test 4b: a select
\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
-$selected=3;
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3');
+$selected = 3;
print $form->selectarray('testselectb', $array, $selected, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
print '
'."\n";
print "Test 4c: Select array with addjscombo not forced
\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3');
print $form->selectarray('selectarray', $array, $selected, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 0);
print '
'."\n";
print "Test 4d: a select with ajax refresh and with onchange call of url
\n";
-$selected=-1;
+$selected = -1;
print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth100', 1);
print '
'."\n";
@@ -91,8 +91,8 @@ print '
'."\n";
// Test5c: a multiselect
print "Test 5c: a multiselect
\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
-$arrayselected=array(1,3);
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3');
+$arrayselected = array(1, 3);
print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, 'minwidth100');
print ' ';
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/public/test/test_sessionlock.php
index ef886d0e789..b10d1e892ec 100644
--- a/htdocs/public/test/test_sessionlock.php
+++ b/htdocs/public/test/test_sessionlock.php
@@ -1,22 +1,22 @@
trans('YourTicketSuccessfullySaved'), null, 'mesgs');
// Make a redirect to avoid to have ticket submitted twice if we make back
- setEventMessages($langs->trans('MesgInfosPublicTicketCreatedWithTrackId', ' '.$object->track_id.'', ' ' . $object->ref . ''), null, 'warnings');
+ setEventMessages($langs->trans('MesgInfosPublicTicketCreatedWithTrackId', ' '.$object->track_id.'', ' '.$object->ref.''), null, 'warnings');
setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
header("Location: index.php");
exit;
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index bbe831c1a84..37fdf9be219 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -24,13 +24,13 @@
if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1');
if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
-if (!defined("NOLOGIN")) define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
// For MultiCompany module.
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
if (is_numeric($entity)) define("DOLENTITY", $entity);
require '../../main.inc.php';
@@ -68,11 +68,11 @@ $arrayofcss = array('/ticket/css/styles.css.php');
llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
print ' ';
-print ' ' . ($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")) . ' ';
+print ' '.($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")).' ';
print ' ';
print ' ';
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 3b37a164fc8..95f2efa492a 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -30,12 +30,12 @@
* \brief Wrapper to output pages when website is powered by Dolibarr instead of a native web server
*/
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (! defined('NOLOGIN')) define("NOLOGIN", 1);
-if (! defined('NOCSRFCHECK')) define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOLOGIN')) define("NOLOGIN", 1);
+if (!defined('NOCSRFCHECK')) define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
/**
* Header empty
@@ -58,13 +58,13 @@ require '../../master.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-$error=0;
-$websitekey=GETPOST('website', 'alpha');
-$pageid=GETPOST('page', 'alpha')?GETPOST('page', 'alpha'):GETPOST('pageid', 'alpha');
-$pageref=GETPOST('pageref', 'alphanohtml')?GETPOST('pageref', 'alphanohtml'):'';
+$error = 0;
+$websitekey = GETPOST('website', 'alpha');
+$pageid = GETPOST('page', 'alpha') ?GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
+$pageref = GETPOST('pageref', 'alphanohtml') ?GETPOST('pageref', 'alphanohtml') : '';
$accessallowed = 1;
-$type='';
+$type = '';
if (empty($pageid))
@@ -72,7 +72,7 @@ if (empty($pageid))
require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
- $object=new Website($db);
+ $object = new Website($db);
$object->fetch(0, $websitekey);
if (empty($object->id))
@@ -87,19 +87,19 @@ if (empty($pageid))
}
}
- $objectpage=new WebsitePage($db);
+ $objectpage = new WebsitePage($db);
if ($pageref)
{
- $result=$objectpage->fetch(0, $object->id, $pageref);
+ $result = $objectpage->fetch(0, $object->id, $pageref);
if ($result > 0)
{
$pageid = $objectpage->id;
}
- elseif($result == 0)
+ elseif ($result == 0)
{
// Page not found from ref=pageurl, we try using alternative alias
- $result=$objectpage->fetch(0, $object->id, null, $pageref);
+ $result = $objectpage->fetch(0, $object->id, null, $pageref);
if ($result > 0)
{
$pageid = $objectpage->id;
@@ -110,7 +110,7 @@ if (empty($pageid))
{
if ($object->fk_default_home > 0)
{
- $result=$objectpage->fetch($object->fk_default_home);
+ $result = $objectpage->fetch($object->fk_default_home);
if ($result > 0)
{
$pageid = $objectpage->id;
@@ -119,11 +119,11 @@ if (empty($pageid))
if (empty($pageid))
{
- $array=$objectpage->fetchAll($object->id); // TODO Can filter on container of type pages only ?
+ $array = $objectpage->fetchAll($object->id); // TODO Can filter on container of type pages only ?
if (is_array($array) && count($array) > 0)
{
- $firstrep=reset($array);
- $pageid=$firstrep->id;
+ $firstrep = reset($array);
+ $pageid = $firstrep->id;
}
}
}
@@ -135,14 +135,14 @@ if (empty($pageid))
$langs->load("website");
- if (! GETPOSTISSET('pageref')) print $langs->trans("PreviewOfSiteNotYetAvailable", $websitekey);
+ if (!GETPOSTISSET('pageref')) print $langs->trans("PreviewOfSiteNotYetAvailable", $websitekey);
include DOL_DOCUMENT_ROOT.'/public/error-404.php';
exit;
}
-$appli=constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+$appli = constant('DOL_APPLICATION_TITLE');
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
@@ -163,19 +163,19 @@ if ($pageid == 'css') // No more used ?
//if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
//else
header('Cache-Control: no-cache');
- $original_file=$dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
+ $original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
}
else
{
- $original_file=$dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
+ $original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
}
// Find the subdirectory name as the reference
-$refname=basename(dirname($original_file)."/");
+$refname = basename(dirname($original_file)."/");
// Security:
// Limite acces si droits non corrects
-if (! $accessallowed)
+if (!$accessallowed)
{
accessforbidden();
}
@@ -186,7 +186,7 @@ if (! $accessallowed)
if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file))
{
dol_syslog("Refused to deliver file ".$original_file);
- $file=basename($original_file); // Do no show plain path of original_file in shown error message
+ $file = basename($original_file); // Do no show plain path of original_file in shown error message
dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file));
exit;
}
@@ -197,10 +197,10 @@ $filename = basename($original_file);
// Output file on browser
dol_syslog("index.php include $original_file $filename content-type=$type");
-$original_file_osencoded=dol_osencode($original_file); // New file name encoded in OS encoding charset
+$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
// This test if file exists should be useless. We keep it to find bug more easily
-if (! file_exists($original_file_osencoded))
+if (!file_exists($original_file_osencoded))
{
// Return header 404
header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found", true, 404);
@@ -216,6 +216,6 @@ if (! file_exists($original_file_osencoded))
// Output page content
define('USEDOLIBARRSERVER', 1);
print ''."\n";
-include_once $original_file_osencoded; // Note: The pageXXX.tpl.php showed here contains a formatage with dolWebsiteOutput() at end of page.
+include_once $original_file_osencoded; // Note: The pageXXX.tpl.php showed here contains a formatage with dolWebsiteOutput() at end of page.
if (is_object($db)) $db->close();
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index e8e4e9a8378..ce416bdd7b6 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -21,12 +21,12 @@
* \brief Page to output style page. Called with
*/
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (! defined('NOLOGIN')) define("NOLOGIN", 1);
-if (! defined('NOCSRFCHECK')) define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOLOGIN')) define("NOLOGIN", 1);
+if (!defined('NOCSRFCHECK')) define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
/**
* Header empty
@@ -49,21 +49,21 @@ require '../../master.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-$error=0;
-$website=GETPOST('website', 'alpha');
-$websiteid=GETPOST('websiteid', 'int');
-$pageid=GETPOST('page', 'alpha')?GETPOST('page', 'alpha'):GETPOST('pageid', 'alpha');
+$error = 0;
+$website = GETPOST('website', 'alpha');
+$websiteid = GETPOST('websiteid', 'int');
+$pageid = GETPOST('page', 'alpha') ?GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
$accessallowed = 1;
-$type='';
+$type = '';
/*
* View
*/
-$appli=constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+$appli = constant('DOL_APPLICATION_TITLE');
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
//print 'Directory with '.$appli.' websites. ';
@@ -72,18 +72,18 @@ if (empty($pageid))
require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
- $object=new Website($db);
+ $object = new Website($db);
if ($websiteid)
{
$object->fetch($websiteid);
- $website=$object->ref;
+ $website = $object->ref;
}
else
{
$object->fetch(0, $website);
}
- $objectpage=new WebsitePage($db);
+ $objectpage = new WebsitePage($db);
/* Not required for CSS file
$array=$objectpage->fetchAll($object->id);
@@ -106,14 +106,14 @@ if (empty($pageid))
// Security: Delete string ../ into $original_file
global $dolibarr_main_data_root;
-$original_file=$dolibarr_main_data_root.'/website/'.$website.'/styles.css.php';
+$original_file = $dolibarr_main_data_root.'/website/'.$website.'/styles.css.php';
// Find the subdirectory name as the reference
-$refname=basename(dirname($original_file)."/");
+$refname = basename(dirname($original_file)."/");
// Security:
// Limite acces si droits non corrects
-if (! $accessallowed)
+if (!$accessallowed)
{
accessforbidden();
}
@@ -124,7 +124,7 @@ if (! $accessallowed)
if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file))
{
dol_syslog("Refused to deliver file ".$original_file);
- $file=basename($original_file); // Do no show plain path of original_file in shown error message
+ $file = basename($original_file); // Do no show plain path of original_file in shown error message
dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file));
exit;
}
@@ -135,10 +135,10 @@ $filename = basename($original_file);
// Output file on browser
dol_syslog("styles.css.php include $original_file $filename content-type=$type");
-$original_file_osencoded=dol_osencode($original_file); // New file name encoded in OS encoding charset
+$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
// This test if file exists should be useless. We keep it to find bug more easily
-if (! file_exists($original_file_osencoded))
+if (!file_exists($original_file_osencoded))
{
$langs->load("website");
print $langs->trans("RequestedPageHasNoContentYet", $pageid);
diff --git a/htdocs/reception/class/receptionstats.class.php b/htdocs/reception/class/receptionstats.class.php
index 476e32898d9..d55bfeee8eb 100644
--- a/htdocs/reception/class/receptionstats.class.php
+++ b/htdocs/reception/class/receptionstats.class.php
@@ -24,9 +24,9 @@
* \brief File of class fo tmanage reception statistics
*/
-include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
-include_once DOL_DOCUMENT_ROOT . '/reception/class/reception.class.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
/**
@@ -62,20 +62,20 @@ class ReceptionStats extends Stats
$this->userid = $userid;
$this->cachefilesuffix = $mode;
- $object=new Reception($this->db);
+ $object = new Reception($this->db);
$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
- $this->field='weight'; // Warning, unit of weight is NOT USED AND MUST BE
- $this->where.= " c.fk_statut > 0"; // Not draft and not cancelled
+ $this->field = 'weight'; // Warning, unit of weight is NOT USED AND MUST BE
+ $this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
- $this->where.= " AND c.entity = ".$conf->entity;
- if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+ $this->where .= " AND c.entity = ".$conf->entity;
+ if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
if ($this->socid)
{
- $this->where.=" AND c.fk_soc = ".$this->socid;
+ $this->where .= " AND c.fk_soc = ".$this->socid;
}
- if ($this->userid > 0) $this->where.=' AND c.fk_user_author = '.$this->userid;
+ if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
}
/**
@@ -89,16 +89,16 @@ class ReceptionStats extends Stats
global $user;
$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
- $sql.= " FROM ".$this->from;
+ $sql .= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
}
- $sql.= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
- $sql.= " AND ".$this->where;
- $sql.= " GROUP BY dm";
- $sql.= $this->db->order('dm', 'DESC');
+ $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+ $sql .= " AND ".$this->where;
+ $sql .= " GROUP BY dm";
+ $sql .= $this->db->order('dm', 'DESC');
- $res=$this->_getNbByMonth($year, $sql);
+ $res = $this->_getNbByMonth($year, $sql);
return $res;
}
@@ -113,11 +113,11 @@ class ReceptionStats extends Stats
global $user;
$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
- $sql.= " FROM ".$this->from;
+ $sql .= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE ".$this->where;
- $sql.= " GROUP BY dm";
- $sql.= $this->db->order('dm', 'DESC');
+ $sql .= " WHERE ".$this->where;
+ $sql .= " GROUP BY dm";
+ $sql .= $this->db->order('dm', 'DESC');
return $this->_getNbByYear($sql);
}
@@ -132,11 +132,11 @@ class ReceptionStats extends Stats
global $user;
$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
- $sql.= " FROM ".$this->from;
+ $sql .= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE ".$this->where;
- $sql.= " GROUP BY year";
- $sql.= $this->db->order('year', 'DESC');
+ $sql .= " WHERE ".$this->where;
+ $sql .= " GROUP BY year";
+ $sql .= $this->db->order('year', 'DESC');
return $this->_getAllByYear($sql);
}
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index c4e4710fde7..7dd0bec2b38 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -39,16 +39,16 @@ $langs->load("orders");
$langs->load("receptions");
$langs->load("companies");
-$id=GETPOST('id', 'int');
-$ref=GETPOST('ref', 'alpha');
-$action=GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'reception', $id, '');
$object = new Reception($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
{
$object->fetch($id, $ref);
$object->fetch_thirdparty();
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index b10c2ffe295..c615017ad37 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -40,11 +40,11 @@ $langs->loadLangs(array("orders", "receptions"));
* View
*/
-$orderstatic=new CommandeFournisseur($db);
-$companystatic=new Societe($db);
-$reception=new Reception($db);
+$orderstatic = new CommandeFournisseur($db);
+$companystatic = new Societe($db);
+$reception = new Reception($db);
-$helpurl='EN:Module_Receptions|FR:Module_Receptions|ES:Módulo_Receptiones';
+$helpurl = 'EN:Module_Receptions|FR:Module_Receptions|ES:Módulo_Receptiones';
llxHeader('', $langs->trans("Reception"), $helpurl);
print load_fiche_titre($langs->trans("ReceptionsArea"));
@@ -53,7 +53,7 @@ print load_fiche_titre($langs->trans("ReceptionsArea"));
print ' ';
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
print ' ';
-$oldyear=0;
+$oldyear = 0;
foreach ($data as $val)
{
$year = $val['year'];
- while (! empty($year) && $oldyear > $year+1)
+ while (!empty($year) && $oldyear > $year + 1)
{ // If we have empty year
$oldyear--;
@@ -279,7 +279,7 @@ foreach ($data as $val)
/*print ''.price(price2num($val['total'],'MT'),1).' | ';
print ''.price(price2num($val['avg'],'MT'),1).' | ';*/
print '';
- $oldyear=$year;
+ $oldyear = $year;
}
print ' ';
diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php
index 3dd2dd39300..d2cf628e605 100644
--- a/htdocs/reception/stats/month.php
+++ b/htdocs/reception/stats/month.php
@@ -34,8 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
llxHeader();
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
$mesg = '';
@@ -51,7 +51,7 @@ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstats&file=reception
$px = new DolGraph();
$mesg = $px->isGraphKo();
-if (! $mesg)
+if (!$mesg)
{
$px->SetData($data);
$px->SetMaxValue($px->GetCeilMaxValue());
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 0de915f8c0a..7d902888cd0 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/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;
@@ -41,17 +41,17 @@ $langs->load("receptions");
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
-$total=0; $ilink=0;
+$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';
?>
| trans("Reception"); ?>
- global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) print '
+ global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) print '
|
getNomUrl(1); ?> |
|
@@ -78,7 +78,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
if (count($linkedObjectBlock) > 1)
{
?>
-
+
| trans("Total"); ?> |
|
|
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 8e45cd9c015..1035d17d5f9 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -38,24 +38,24 @@ require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
$langs->load("companies");
// Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'aZ09');
$backtopage = GETPOST('backtopage', 'alpha');
if (GETPOST('actioncode', 'array'))
{
- $actioncode=GETPOST('actioncode', 'array', 3);
- if (! count($actioncode)) $actioncode='0';
+ $actioncode = GETPOST('actioncode', 'array', 3);
+ if (!count($actioncode)) $actioncode = '0';
}
else
{
- $actioncode=GETPOST("actioncode", "alpha", 3)?GETPOST("actioncode", "alpha", 3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+ $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
}
-$search_agenda_label=GETPOST('search_agenda_label');
+$search_agenda_label = GETPOST('search_agenda_label');
-$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');
@@ -63,8 +63,8 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortfield) $sortfield='a.datep,a.id';
-if (! $sortorder) $sortorder='DESC,DESC';
+if (!$sortfield) $sortfield = 'a.datep,a.id';
+if (!$sortorder) $sortorder = 'DESC,DESC';
$object = new DolResource($db);
$object->fetch($id, $ref);
@@ -75,7 +75,7 @@ $extrafields = new ExtraFields($db);
$hookmanager->initHooks(array('agendaresource'));
// Security check
-if( ! $user->rights->resource->read)
+if (!$user->rights->resource->read)
{
accessforbidden();
}
@@ -85,14 +85,14 @@ if( ! $user->rights->resource->read)
* Actions
*/
-$parameters=array('id'=>$id);
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook))
{
// Cancel
- if (GETPOST('cancel', 'alpha') && ! empty($backtopage))
+ if (GETPOST('cancel', 'alpha') && !empty($backtopage))
{
header("Location: ".$backtopage);
exit;
@@ -101,8 +101,8 @@ if (empty($reshook))
// Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
{
- $actioncode='';
- $search_agenda_label='';
+ $actioncode = '';
+ $search_agenda_label = '';
}
}
@@ -123,25 +123,25 @@ if ($object->id > 0)
$langs->load("companies");
$picto = 'resource';
- $title=$langs->trans("Agenda");
- if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/productnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref." - ".$title;
+ $title = $langs->trans("Agenda");
+ if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/productnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref." - ".$title;
llxHeader('', $title);
- if (! empty($conf->notification->enabled)) $langs->load("mails");
+ if (!empty($conf->notification->enabled)) $langs->load("mails");
$type = $langs->trans('ResourceSingular');
$head = resource_prepare_head($object);
- $titre=$langs->trans("ResourceSingular");
+ $titre = $langs->trans("ResourceSingular");
dol_fiche_head($head, 'agenda', $titre, -1, $picto);
$linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
- $morehtmlref.=' ';
+ $morehtmlref = '';
+ $morehtmlref .= ' ';
$shownav = 1;
- if ($user->socid && ! in_array('resource', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+ if ($user->socid && !in_array('resource', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -152,17 +152,17 @@ if ($object->id > 0)
dol_fiche_end();
- 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)))
{
- $param='&id='.$object->id.'&socid='.$socid;
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+ $param = '&id='.$object->id.'&socid='.$socid;
+ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
print_barre_liste($langs->trans("ActionsOnResource"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
// List of all actions
- $filters=array();
- $filters['search_agenda_label']=$search_agenda_label;
+ $filters = array();
+ $filters['search_agenda_label'] = $search_agenda_label;
// TODO Replace this with same code than into list.php
show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index f57b810394a..cbc94c2e843 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -39,7 +39,7 @@ $ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'alpha');
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'resource', $id, 'resource');
$object = new DolResource($db);
@@ -79,7 +79,7 @@ if ($action == 'addcontact' && $user->rights->resource->write)
// Toggle the status of a contact
elseif ($action == 'swapstatut' && $user->rights->resource->write)
{
- $result=$object->swapContactStatus(GETPOST('ligne', 'int'));
+ $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
}
// Erase a contact
@@ -104,14 +104,14 @@ elseif ($action == 'deletecontact' && $user->rights->resource->write)
$form = new Form($db);
$formcompany = new FormCompany($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
llxHeader('', $langs->trans("Resource"));
// Mode vue et edition
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
{
$soc = new Societe($db);
$soc->fetch($object->socid);
@@ -121,11 +121,11 @@ if ($id > 0 || ! empty($ref))
dol_fiche_head($head, 'contact', $langs->trans("ResourceSingular"), -1, 'resource');
- $linkback = '' . $langs->trans("BackToList") . '';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
- $morehtmlref.=' ';
+ $morehtmlref = '';
+ $morehtmlref .= ' ';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -141,7 +141,7 @@ if ($id > 0 || ! empty($ref))
// Resource type
print ' ';
- print '| ' . $langs->trans("ResourceType") . ' | ';
+ print ''.$langs->trans("ResourceType").' | ';
print '';
print $object->type_label;
print ' | ';
@@ -154,10 +154,10 @@ if ($id > 0 || ! empty($ref))
print '
';
- if (! empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER)) $hideaddcontactforuser=1;
- if (! empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)) $hideaddcontactforthirdparty=1;
+ if (!empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER)) $hideaddcontactforuser = 1;
+ if (!empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)) $hideaddcontactforthirdparty = 1;
- $permission=1;
+ $permission = 1;
// Contacts lines
include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
}
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 174b1503dbe..5f053be4321 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -44,7 +44,7 @@ $action = GETPOST('action', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'resource', $id, 'resource');
@@ -56,22 +56,22 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
$object = new DolResource($db);
$object->fetch($id, $ref);
$upload_dir = $conf->resource->dir_output.'/'.dol_sanitizeFileName($object->ref);
-$modulepart='resource';
+$modulepart = 'resource';
/*
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
/*
@@ -86,25 +86,25 @@ if ($object->id > 0)
{
$object->fetch_thirdparty();
- $head=resource_prepare_head($object);
+ $head = resource_prepare_head($object);
dol_fiche_head($head, 'documents', $langs->trans("ResourceSingular"), -1, 'resource');
// Build file list
- $filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
- $totalsize=0;
- foreach($filearray as $key => $file)
+ $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+ $totalsize = 0;
+ foreach ($filearray as $key => $file)
{
- $totalsize+=$file['size'];
+ $totalsize += $file['size'];
}
- $linkback = '' . $langs->trans("BackToList") . '';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
- $morehtmlref.=' ';
+ $morehtmlref = '';
+ $morehtmlref .= ' ';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -117,7 +117,7 @@ if ($object->id > 0)
// Resource type
print ' ';
- print '| ' . $langs->trans("ResourceType") . ' | ';
+ print ''.$langs->trans("ResourceType").' | ';
print '';
print $object->type_label;
print ' | ';
@@ -134,7 +134,7 @@ if ($object->id > 0)
$modulepart = 'dolresource';
$permission = $user->rights->resource->write;
- include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
}
else
{
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 54cc8963b75..07c43251d3d 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -58,11 +58,11 @@ $search_type = GETPOST("search_type", 'alpha');
$filter = array();
if ($search_ref != '') {
- $param.='&search_ref='.urlencode($search_ref);
+ $param .= '&search_ref='.urlencode($search_ref);
$filter['t.ref'] = $search_ref;
}
if ($search_type != '') {
- $param.='&search_type='.urlencode($search_type);
+ $param .= '&search_type='.urlencode($search_type);
$filter['ty.label'] = $search_type;
}
@@ -83,7 +83,7 @@ foreach ($search_array_options as $key => $val)
$filter['ef.'.$tmpkey] = natural_search('ef.'.$tmpkey, $crit, $mode_search);
}
}
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
$hookmanager->initHooks(array('resourcelist'));
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 322088ef317..1162909114e 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -34,23 +34,23 @@ $langs->loadLangs(array('companies', 'interventions'));
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
-$action=GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'resource', $id, 'resource');
$object = new DolResource($db);
$object->fetch($id, $ref);
-$permissionnote=$user->rights->resource->write; // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->resource->write; // 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
/*
@@ -61,16 +61,16 @@ llxHeader();
$form = new Form($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
{
$head = resource_prepare_head($object);
dol_fiche_head($head, 'note', $langs->trans('ResourceSingular'), -1, 'resource');
- $linkback = '' . $langs->trans("BackToList") . '';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
- $morehtmlref.=' ';
+ $morehtmlref = '';
+ $morehtmlref .= ' ';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -83,7 +83,7 @@ if ($id > 0 || ! empty($ref))
// Resource type
print ' ';
- print '| ' . $langs->trans("ResourceType") . ' | ';
+ print ''.$langs->trans("ResourceType").' | ';
print '';
print $object->type_label;
print ' | ';
@@ -93,8 +93,8 @@ if ($id > 0 || ! empty($ref))
print '';
- $permission=$user->rights->resource->write;
- $cssclass='titlefield';
+ $permission = $user->rights->resource->write;
+ $cssclass = 'titlefield';
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
dol_fiche_end();
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index 6ab5f5d13b0..29e3c325ee0 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -27,7 +27,7 @@ require '../../main.inc.php';
// Class
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
// Load translation files required by the page
$langs->loadLangs(array('admin', 'salaries'));
@@ -39,7 +39,7 @@ if (!$user->admin)
$action = GETPOST('action', 'alpha');
// Other parameters SALARIES_*
-$list = array (
+$list = array(
'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
);
@@ -59,7 +59,7 @@ if ($action == 'update')
}
}
- if (! $error)
+ if (!$error)
{
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
@@ -76,9 +76,9 @@ if ($action == 'update')
llxHeader('', $langs->trans('SalariesSetup'));
$form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
-$linkback=''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans('SalariesSetup'), $linkback, 'title_setup');
$head = salaries_admin_prepare_head();
@@ -111,7 +111,7 @@ foreach ($list as $key)
// Value
print '';
- if (! empty($conf->accounting->enabled))
+ if (!empty($conf->accounting->enabled))
{
print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
}
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
index 2ea9ba62919..48f574557ec 100644
--- a/htdocs/salaries/admin/salaries_extrafields.php
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -28,19 +28,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("admin","salaries"));
+$langs->loadLangs(array("admin", "salaries"));
$extrafields = new ExtraFields($db);
$form = new Form($db);
// List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='payment_salary'; //Must be the $table_element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'payment_salary'; //Must be the $table_element of the class that manage extrafield
if (!$user->admin) accessforbidden();
@@ -59,11 +59,11 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject = $langs->transnoentitiesnoconv("Salaries");
-$help_url='';
+$help_url = '';
llxHeader('', $langs->trans("SalariesSetup"), $help_url);
-$linkback=''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans("SalariesSetup"), $linkback, 'title_setup');
@@ -104,7 +104,7 @@ if ($action == 'create')
/* Edition of an optional field */
/* */
/* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
{
print '
';
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 39f7fee3397..ac1c08f2948 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -26,20 +26,20 @@
*/
require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/salaries/class/paymentsalary.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/salaries.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-if (! empty($conf->projet->enabled))
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+if (!empty($conf->projet->enabled))
{
- require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
- require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
// Load translation files required by the page
-$langs->loadLangs(array("compta","banks","bills","users","salaries","hrm"));
-if (! empty($conf->projet->enabled)) $langs->load("projects");
+$langs->loadLangs(array("compta", "banks", "bills", "users", "salaries", "hrm"));
+if (!empty($conf->projet->enabled)) $langs->load("projects");
$id = GETPOST("id", 'int');
$action = GETPOST('action', 'aZ09');
@@ -54,7 +54,7 @@ $dateep = dol_mktime(12, 0, 0, GETPOST("dateepmonth", 'int'), GETPOST("dateepday
// Security check
$socid = GETPOST("socid", "int");
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'salaries', '', '', '');
$object = new PaymentSalary($db);
@@ -381,52 +381,52 @@ if ($action == 'create')
if ($id)
{
- $head=salaries_prepare_head($object);
+ $head = salaries_prepare_head($object);
dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'payment');
- $linkback = ''.$langs->trans("BackToList").'';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
+ $morehtmlref = ' ';
// Employee
- $userstatic=new User($db);
+ $userstatic = new User($db);
$userstatic->fetch($object->fk_user);
- $morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
+ $morehtmlref .= $langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
// Project
- if (! empty($conf->projet->enabled))
+ if (!empty($conf->projet->enabled))
{
- $morehtmlref.=' '.$langs->trans('Project') . ' ';
+ $morehtmlref .= ' '.$langs->trans('Project').' ';
if ($user->rights->salaries->write)
{
if ($action != 'classify') {
- $morehtmlref.=' ' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref .= ' '.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
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 .= '
';
- $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
+ $label = ''.$langs->trans("ShowSalaryPayment").'';
+ $label .= '
';
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
$url = DOL_URL_ROOT.'/salaries/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("ShowMyObject");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowMyObject");
+ $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 : '').'"';
/*
$hookmanager->initHooks(array('myobjectdao'));
@@ -623,22 +623,22 @@ class PaymentSalary extends CommonObject
if ($reshook > 0) $linkclose = $hookmanager->resPrint;
*/
}
- 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;
//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
- global $action,$hookmanager;
+ global $action, $hookmanager;
$hookmanager->initHooks(array('salarypayment'));
- $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
- $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) $result = $hookmanager->resPrint;
else $result .= $hookmanager->resPrint;
@@ -654,8 +654,8 @@ class PaymentSalary extends CommonObject
public function info($id)
{
$sql = 'SELECT ps.rowid, ps.datec, ps.fk_user_author';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps';
- $sql.= ' WHERE ps.rowid = '.$id;
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps';
+ $sql .= ' WHERE ps.rowid = '.$id;
dol_syslog(get_class($this).'::info', LOG_DEBUG);
$result = $this->db->query($sql);
@@ -705,7 +705,7 @@ class PaymentSalary 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
$langs->load('compta');
/*if ($mode == 0)
diff --git a/htdocs/salaries/class/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index 37e950b1bbe..3601e14bcdc 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -21,8 +21,8 @@
* \ingroup salaries
* \brief Fichier de la classe de gestion des stats des salaires
*/
-include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
-include_once DOL_DOCUMENT_ROOT . '/salaries/class/paymentsalary.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
/**
* Classe permettant la gestion des stats des salaires
@@ -57,16 +57,16 @@ class SalariesStats extends Stats
$this->socid = $socid;
$this->userid = $userid;
- $object=new PaymentSalary($this->db);
+ $object = new PaymentSalary($this->db);
$this->from = MAIN_DB_PREFIX.$object->table_element;
- $this->field='amount';
+ $this->field = 'amount';
- $this->where.= " entity = ".$conf->entity;
+ $this->where .= " entity = ".$conf->entity;
if ($this->socid) {
- $this->where.=" AND fk_soc = ".$this->socid;
+ $this->where .= " AND fk_soc = ".$this->socid;
}
- if (is_array($this->userid) && count($this->userid) > 0) $this->where.=' AND fk_user IN ('.join(',', $this->userid).')';
- elseif ($this->userid > 0) $this->where.=' AND fk_user = '.$this->userid;
+ if (is_array($this->userid) && count($this->userid) > 0) $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
+ elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
}
@@ -78,9 +78,9 @@ class SalariesStats extends Stats
public function getNbByYear()
{
$sql = "SELECT YEAR(datep) as dm, count(*)";
- $sql.= " FROM ".$this->from;
- $sql.= " GROUP BY dm DESC";
- $sql.= " WHERE ".$this->where;
+ $sql .= " FROM ".$this->from;
+ $sql .= " GROUP BY dm DESC";
+ $sql .= " WHERE ".$this->where;
return $this->_getNbByYear($sql);
}
@@ -96,13 +96,13 @@ class SalariesStats extends Stats
public function getNbByMonth($year, $format = 0)
{
$sql = "SELECT MONTH(datep) as dm, count(*)";
- $sql.= " FROM ".$this->from;
- $sql.= " WHERE YEAR(datep) = ".$year;
- $sql.= " AND ".$this->where;
- $sql.= " GROUP BY dm";
- $sql.= $this->db->order('dm', 'DESC');
+ $sql .= " FROM ".$this->from;
+ $sql .= " WHERE YEAR(datep) = ".$year;
+ $sql .= " AND ".$this->where;
+ $sql .= " GROUP BY dm";
+ $sql .= $this->db->order('dm', 'DESC');
- $res=$this->_getNbByMonth($year, $sql, $format);
+ $res = $this->_getNbByMonth($year, $sql, $format);
//var_dump($res);print '
';
return $res;
}
@@ -118,13 +118,13 @@ class SalariesStats extends Stats
public function getAmountByMonth($year, $format = 0)
{
$sql = "SELECT date_format(datep,'%m') as dm, sum(".$this->field.")";
- $sql.= " FROM ".$this->from;
- $sql.= " WHERE date_format(datep,'%Y') = '".$year."'";
- $sql.= " AND ".$this->where;
- $sql.= " GROUP BY dm";
- $sql.= $this->db->order('dm', 'DESC');
+ $sql .= " FROM ".$this->from;
+ $sql .= " WHERE date_format(datep,'%Y') = '".$year."'";
+ $sql .= " AND ".$this->where;
+ $sql .= " GROUP BY dm";
+ $sql .= $this->db->order('dm', 'DESC');
- $res=$this->_getAmountByMonth($year, $sql, $format);
+ $res = $this->_getAmountByMonth($year, $sql, $format);
//var_dump($res);print '
';
return $res;
@@ -139,11 +139,11 @@ class SalariesStats extends Stats
public function getAverageByMonth($year)
{
$sql = "SELECT date_format(datep,'%m') as dm, avg(".$this->field.")";
- $sql.= " FROM ".$this->from;
- $sql.= " WHERE date_format(datep,'%Y') = '".$year."'";
- $sql.= " AND ".$this->where;
- $sql.= " GROUP BY dm";
- $sql.= $this->db->order('dm', 'DESC');
+ $sql .= " FROM ".$this->from;
+ $sql .= " WHERE date_format(datep,'%Y') = '".$year."'";
+ $sql .= " AND ".$this->where;
+ $sql .= " GROUP BY dm";
+ $sql .= $this->db->order('dm', 'DESC');
return $this->_getAverageByMonth($year, $sql);
}
@@ -156,10 +156,10 @@ class SalariesStats extends Stats
public function getAllByYear()
{
$sql = "SELECT date_format(datep,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
- $sql.= " FROM ".$this->from;
- $sql.= " WHERE ".$this->where;
- $sql.= " GROUP BY year";
- $sql.= $this->db->order('year', 'DESC');
+ $sql .= " FROM ".$this->from;
+ $sql .= " WHERE ".$this->where;
+ $sql .= " GROUP BY year";
+ $sql .= $this->db->order('year', 'DESC');
return $this->_getAllByYear($sql);
}
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 57cc3c7b8a1..c8de93c0786 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("compta","bills","users","salaries","hrm"));
+$langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm"));
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
@@ -45,7 +45,7 @@ $confirm = GETPOST('confirm', 'alpha');
// Security check
$socid = GETPOST("socid", "int");
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'salaries', '', '', '');
@@ -57,22 +57,22 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
$object = new PaymentSalary($db);
$object->fetch($id, $ref);
$upload_dir = $conf->salaries->dir_output.'/'.dol_sanitizeFileName($object->id);
-$modulepart='salaries';
+$modulepart = 'salaries';
/*
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
/*
@@ -87,27 +87,27 @@ if ($object->id)
{
$object->fetch_thirdparty();
- $head=salaries_prepare_head($object);
+ $head = salaries_prepare_head($object);
dol_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'payment');
// Build file list
- $filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
- $totalsize=0;
- foreach($filearray as $key => $file)
+ $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+ $totalsize = 0;
+ foreach ($filearray as $key => $file)
{
- $totalsize+=$file['size'];
+ $totalsize += $file['size'];
}
- $linkback = ''.$langs->trans("BackToList").'';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
+ $morehtmlref = ' ';
- $userstatic=new User($db);
+ $userstatic = new User($db);
$userstatic->fetch($object->fk_user);
- $morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
- $morehtmlref.=' ';
+ $morehtmlref .= $langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
+ $morehtmlref .= ' ';
+$morehtmlref = ' ';
-$userstatic=new User($db);
+$userstatic = new User($db);
$userstatic->fetch($object->fk_user);
-$morehtmlref.=$langs->trans('Employee') . ' : ' . $userstatic->getNomUrl(1);
-$morehtmlref.=' ';
+$morehtmlref .= $langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
+$morehtmlref .= ' | ';
// Year
print '| '.$langs->trans("Year").' | ';
-if (! in_array($year, $arrayyears)) $arrayyears[$year]=$year;
+if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
arsort($arrayyears);
print $form->selectarray('year', $arrayyears, $year, 0);
print ' | ';
@@ -221,11 +221,11 @@ print ''.$langs->trans("AmountTotal").' | ';
print ''.$langs->trans("AmountAverage").' | ';
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--;
@@ -244,7 +244,7 @@ foreach ($data as $val)
print ''.price(price2num($val['total'], 'MT'), 1).' | ';
print ''.price(price2num($val['avg'], 'MT'), 1).' | ';
print '';
- $oldyear=$year;
+ $oldyear = $year;
}
print ' ';
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 86f40ee7a6c..2e657805b96 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -34,13 +34,13 @@ $extrafields = new ExtraFields($db);
$form = new Form($db);
// List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='socpeople'; //Must be the $element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'socpeople'; //Must be the $element of the class that manage extrafield
if (!$user->admin) accessforbidden();
@@ -57,13 +57,13 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View
*/
-$textobject=$langs->transnoentitiesnoconv("ContactsAddresses");
+$textobject = $langs->transnoentitiesnoconv("ContactsAddresses");
-$help_url='EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers';
+$help_url = 'EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers';
llxHeader('', $langs->trans("CompanySetup"), $help_url);
-$linkback=''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans("CompanySetup"), $linkback, 'title_setup');
@@ -104,7 +104,7 @@ if ($action == 'create')
/* Edition of an optional field */
/* */
/* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
{
print "
";
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 11a56314b02..f0812485211 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -34,13 +34,13 @@ $extrafields = new ExtraFields($db);
$form = new Form($db);
// List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='societe'; //Must be the $element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'societe'; //Must be the $element of the class that manage extrafield
if (!$user->admin) accessforbidden();
@@ -57,13 +57,13 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View
*/
-$textobject=$langs->transnoentitiesnoconv("ThirdParty");
+$textobject = $langs->transnoentitiesnoconv("ThirdParty");
-$help_url='EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers';
+$help_url = 'EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers';
llxHeader('', $langs->trans("CompanySetup"), $help_url);
-$linkback=''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans("CompanySetup"), $linkback, 'title_setup');
@@ -104,7 +104,7 @@ if ($action == 'create')
/* Edition d'un champ optionnel */
/* */
/* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
{
print '
';
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 1ba29e5e190..dba483c52eb 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -36,21 +36,21 @@ $langs->loadLangs(array("companies", "bills", "propal", "orders"));
if (GETPOST('actioncode', 'array'))
{
- $actioncode=GETPOST('actioncode', 'array', 3);
- if (! count($actioncode)) $actioncode='0';
+ $actioncode = GETPOST('actioncode', 'array', 3);
+ if (!count($actioncode)) $actioncode = '0';
}
else
{
- $actioncode=GETPOST("actioncode", "alpha", 3)?GETPOST("actioncode", "alpha", 3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+ $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
}
-$search_agenda_label=GETPOST('search_agenda_label');
+$search_agenda_label = GETPOST('search_agenda_label');
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'societe', $socid, '&societe');
-$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');
@@ -106,18 +106,18 @@ if ($socid > 0)
$object = new Societe($db);
$result = $object->fetch($socid);
- $title=$langs->trans("Agenda");
- if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+ $title = $langs->trans("Agenda");
+ if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
llxHeader('', $title);
- if (! empty($conf->notification->enabled)) $langs->load("mails");
+ if (!empty($conf->notification->enabled)) $langs->load("mails");
$head = societe_prepare_head($object);
dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
$linkback = ''.$langs->trans("BackToList").'';
- dol_banner_tab($object, 'socid', $linkback, ($user->socid?0:1), 'rowid', 'nom');
+ dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
print '';
@@ -154,29 +154,29 @@ if ($socid > 0)
//print ' ';
- $newcardbutton='';
- if (! empty($conf->agenda->enabled))
+ $newcardbutton = '';
+ if (!empty($conf->agenda->enabled))
{
- if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
+ if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
{
- $newcardbutton.= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
+ $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
}
}
- 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)))
{
print '
';
- $param='&socid='.$socid;
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ $param = '&socid='.$socid;
+ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
//print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
// List of all actions
- $filters=array();
- $filters['search_agenda_label']=$search_agenda_label;
+ $filters = array();
+ $filters['search_agenda_label'] = $search_agenda_label;
// TODO Replace this with same code than into list.php
show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 44e05813314..4fe737ca31c 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -22,21 +22,21 @@
* \brief File to return Ajax response on thirdparty list request
*/
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-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); // Disables token renewal
+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');
require '../../main.inc.php';
-$htmlname=GETPOST('htmlname', 'alpha');
-$filter=GETPOST('filter', 'alpha');
-$outjson=(GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
-$action=GETPOST('action', 'alpha');
-$id=GETPOST('id', 'int');
-$showtype=GETPOST('showtype', 'int');
+$htmlname = GETPOST('htmlname', 'alpha');
+$filter = GETPOST('filter', 'alpha');
+$outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
+$action = GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');
+$showtype = GETPOST('showtype', 'int');
/*
@@ -48,14 +48,14 @@ $showtype=GETPOST('showtype', 'int');
dol_syslog(join(',', $_GET));
//print_r($_GET);
-if (! empty($action) && $action == 'fetch' && ! empty($id))
+if (!empty($action) && $action == 'fetch' && !empty($id))
{
- require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
- $outjson=array();
+ $outjson = array();
$object = new Societe($db);
- $ret=$object->fetch($id);
+ $ret = $object->fetch($id);
if ($ret > 0)
{
$outref = $object->ref;
@@ -80,15 +80,15 @@ else
$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
sort($match);
- $id = (! empty($match[0]) ? $match[0] : '');
+ $id = (!empty($match[0]) ? $match[0] : '');
// When used from jQuery, the search term is added as GET param "term".
- $searchkey=(($id && GETPOST($id, 'alpha'))?GETPOST($id, 'alpha'):(($htmlname && GETPOST($htmlname, 'alpha'))?GETPOST($htmlname, 'alpha'):''));
+ $searchkey = (($id && GETPOST($id, 'alpha')) ?GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ?GETPOST($htmlname, 'alpha') : ''));
- if (! $searchkey) return;
+ if (!$searchkey) return;
- if (! is_object($form)) $form = new Form($db);
- $arrayresult=$form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson);
+ if (!is_object($form)) $form = new Form($db);
+ $arrayresult = $form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson);
$db->close();
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index f7bc9d4e40c..dcf0b1a4483 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -23,12 +23,12 @@
* \brief File to return Ajax response on third parties request
*/
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-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); // Disables token renewal
+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');
require '../main.inc.php';
@@ -55,43 +55,43 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
$return_arr = array();
// Define filter on text typed
- $socid = $_GET['newcompany']?$_GET['newcompany']:'';
- if (! $socid) $socid = $_GET['socid']?$_GET['socid']:'';
- if (! $socid) $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
+ $socid = $_GET['newcompany'] ? $_GET['newcompany'] : '';
+ if (!$socid) $socid = $_GET['socid'] ? $_GET['socid'] : '';
+ if (!$socid) $socid = $_GET['id_fourn'] ? $_GET['id_fourn'] : '';
$sql = "SELECT rowid, nom";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= " WHERE s.entity IN (".getEntity('societe').")";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= " WHERE s.entity IN (".getEntity('societe').")";
if ($socid)
{
- $sql.=" AND (";
+ $sql .= " AND (";
// Add criteria on name/code
- if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) // Can use index
+ if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) // Can use index
{
- $sql.="nom LIKE '" . $db->escape($socid) . "%'";
- $sql.=" OR code_client LIKE '" . $db->escape($socid) . "%'";
- $sql.=" OR code_fournisseur LIKE '" . $db->escape($socid) . "%'";
+ $sql .= "nom LIKE '".$db->escape($socid)."%'";
+ $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
+ $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
}
else
{
- $sql.="nom LIKE '%" . $db->escape($socid) . "%'";
- $sql.=" OR code_client LIKE '%" . $db->escape($socid) . "%'";
- $sql.=" OR code_fournisseur LIKE '%" . $db->escape($socid) . "%'";
+ $sql .= "nom LIKE '%".$db->escape($socid)."%'";
+ $sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
+ $sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
}
- if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
- $sql.=")";
+ if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql .= " OR rowid = '".$db->escape($socid)."'";
+ $sql .= ")";
}
//if (GETPOST("filter")) $sql.= " AND (".GETPOST("filter", "alpha").")"; // Add other filters
- $sql.= " ORDER BY nom ASC";
+ $sql .= " ORDER BY nom ASC";
//dol_syslog("ajaxcompanies", LOG_DEBUG);
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
while ($row = $db->fetch_array($resql))
{
- $label=$row['nom'];
- if ($socid) $label=preg_replace('/('.preg_quote($socid, '/').')/i', '$1', $label, 1);
+ $label = $row['nom'];
+ if ($socid) $label = preg_replace('/('.preg_quote($socid, '/').')/i', '$1', $label, 1);
$row_array['label'] = $label;
$row_array['value'] = $row['nom'];
$row_array['key'] = $row['rowid'];
@@ -103,10 +103,10 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
}
else
{
- echo json_encode(array('nom'=>'Error','label'=>'Error','key'=>'Error','value'=>'Error'));
+ echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
}
}
else
{
- echo json_encode(array('nom'=>'ErrorBadParameter','label'=>'ErrorBadParameter','key'=>'ErrorBadParameter','value'=>'ErrorBadParameter'));
+ echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
}
diff --git a/htdocs/societe/ajaxcountries.php b/htdocs/societe/ajaxcountries.php
index 21ee895629f..dfc4ffd9015 100644
--- a/htdocs/societe/ajaxcountries.php
+++ b/htdocs/societe/ajaxcountries.php
@@ -22,16 +22,16 @@
* \brief File to return Ajax response on country request
*/
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-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); // Disables token renewal
+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');
require '../main.inc.php';
-$country=GETPOST('country', 'alpha');
+$country = GETPOST('country', 'alpha');
/*
@@ -50,25 +50,25 @@ print '
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index ebd90fe7c46..9f236c8015e 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -41,11 +41,11 @@ class ActionsCardIndividual extends ActionsCardCommon
*/
public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
{
- $this->db = $db;
- $this->dirmodule = $dirmodule;
- $this->targetmodule = $targetmodule;
- $this->canvas = $canvas;
- $this->card = $card;
+ $this->db = $db;
+ $this->dirmodule = $dirmodule;
+ $this->targetmodule = $targetmodule;
+ $this->canvas = $canvas;
+ $this->card = $card;
}
@@ -59,11 +59,11 @@ class ActionsCardIndividual extends ActionsCardCommon
{
global $langs;
- $out='';
+ $out = '';
- if ($action == 'view') $out.= $langs->trans("Individual");
- if ($action == 'edit') $out.= $langs->trans("EditCompany");
- if ($action == 'create') $out.= $langs->trans("NewCompany");
+ if ($action == 'view') $out .= $langs->trans("Individual");
+ if ($action == 'edit') $out .= $langs->trans("EditCompany");
+ if ($action == 'create') $out .= $langs->trans("NewCompany");
return $out;
}
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index f77233816e0..649d1bf8aca 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -17,7 +17,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;
@@ -58,7 +58,7 @@ if (empty($conf) || ! is_object($conf))
|
| trans('LastName'); ?> |
|
- global->SOCIETE_USEPREFIX)) { ?>
+ global->SOCIETE_USEPREFIX)) { ?>
trans('Prefix'); ?> |
|
@@ -114,7 +114,7 @@ if (empty($conf) || ! is_object($conf))
barcode->enabled)) { ?>
+if (!empty($conf->barcode->enabled)) { ?>
| trans('Gencod'); ?> |
|
@@ -151,13 +151,13 @@ if (! empty($conf->barcode->enabled)) { ?>
- | trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?> |
+ trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?> |
|
trans('Web'); ?> |
|
-global->MAIN_MULTILANGS)) { ?>
+global->MAIN_MULTILANGS)) { ?>
| trans("DefaultLang"); ?> |
control->tpl['select_lang']; ?> |
@@ -169,7 +169,7 @@ if (! empty($conf->barcode->enabled)) { ?>
control->tpl['yn_assujtva']; ?> |
-control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
rights->societe->client->voir) { ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 60a6e18c07b..1571709868e 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -17,7 +17,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;
@@ -50,7 +50,7 @@ if (empty($conf) || ! is_object($conf))
|
-global->SOCIETE_USEPREFIX)) { ?>
+global->SOCIETE_USEPREFIX)) { ?>
| trans("Prefix"); ?> |
@@ -118,7 +118,7 @@ if ($this->control->tpl['fournisseur']) {
}
?>
-barcode->enabled)) { ?>
+barcode->enabled)) { ?>
|
| trans('Gencod'); ?> |
|
@@ -155,13 +155,13 @@ if ($this->control->tpl['fournisseur']) {
- | trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?> |
+ trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?> |
|
trans('Web'); ?> |
|
-global->MAIN_MULTILANGS)) { ?>
+global->MAIN_MULTILANGS)) { ?>
| trans("DefaultLang"); ?> |
control->tpl['select_lang']; ?> |
@@ -173,7 +173,7 @@ if ($this->control->tpl['fournisseur']) {
control->tpl['yn_assujtva']; ?> |
-control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index b1e5d052adc..14c8822dc9e 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -16,7 +16,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;
@@ -42,7 +42,7 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
control->tpl['showrefnav']; ?> |
-global->SOCIETE_USEPREFIX)) { ?>
+global->SOCIETE_USEPREFIX)) { ?>
| trans('Prefix'); ?> |
control->tpl['prefix_comm']; ?> |
@@ -71,7 +71,7 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
-barcode->enabled)) { ?>
+barcode->enabled)) { ?>
| trans('Gencod'); ?> |
control->tpl['barcode']; ?> |
@@ -119,14 +119,14 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
control->tpl['tva_assuj']; ?> |
-control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
| trans("Type"); ?> |
control->tpl['typent']; ?> |
-global->MAIN_MULTILANGS)) { ?>
+global->MAIN_MULTILANGS)) { ?>
| trans("DefaultLang"); ?> |
control->tpl['default_lang']; ?> |
@@ -166,10 +166,10 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
- control->tpl['sales_representatives']; ?> |
+ control->tpl['sales_representatives']; ?> |
-adherent->enabled)) { ?>
+adherent->enabled)) { ?>
| trans("LinkedToDolibarrMember"); ?> |
control->tpl['linked_member']; ?> |
@@ -188,7 +188,7 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
rights->societe->supprimer) { ?>
use_javascript_ajax) { ?>
trans('Delete'); ?>
-
+
">trans('Delete'); ?>
@@ -202,10 +202,10 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
/*
* Documents generes
*/
-$filedir=$conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
-$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
-$genallowed=$user->rights->societe->lire;
-$delallowed=$user->rights->societe->creer;
+$filedir = $conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
+$urlsource = $_SERVER["PHP_SELF"]."?socid=".$socid;
+$genallowed = $user->rights->societe->lire;
+$delallowed = $user->rights->societe->creer;
print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $objcanvas->control->object->default_lang);
?>
@@ -219,12 +219,12 @@ print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallo
\n";
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 54068f26265..20ada9bfbaf 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -931,7 +931,7 @@ else
* Creation
*/
$private = GETPOST("private", "int");
- if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! GETPOSTISSET('private')) $private = 1;
+ if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !GETPOSTISSET('private')) $private = 1;
if (empty($private)) $private = 0;
// Load object modCodeTiers
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 1d5fa1a1f2a..8d004fa4c79 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -28,15 +28,15 @@ require_once NUSOAP_PATH.'/nusoap.php';
$langs->load("companies");
//http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl
-$WS_DOL_URL='http://ec.europa.eu/taxation_customs/vies/services/checkVatService';
+$WS_DOL_URL = 'http://ec.europa.eu/taxation_customs/vies/services/checkVatService';
//$WS_DOL_URL_WSDL=$WS_DOL_URL.'?wsdl';
-$WS_DOL_URL_WSDL='http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl';
-$WS_METHOD ='checkVat';
+$WS_DOL_URL_WSDL = 'http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl';
+$WS_METHOD = 'checkVat';
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
@@ -46,7 +46,7 @@ print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"), '', 'title_se
$vatNumber = GETPOST("vatNumber", 'alpha');
-if (! $vatNumber)
+if (!$vatNumber)
{
print '
';
print ''.$langs->transnoentities("ErrorFieldRequired", $langs->trans("VATIntraShort")).'
';
@@ -55,8 +55,8 @@ else
{
$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
$vatNumber = str_replace(array(' ', '.'), '', $vatNumber);
- $countryCode=substr($vatNumber, 0, 2);
- $vatNumber=substr($vatNumber, 2);
+ $countryCode = substr($vatNumber, 0, 2);
+ $vatNumber = substr($vatNumber, 2);
print ''.$langs->trans("Country").': '.$countryCode.'
';
print ''.$langs->trans("VATIntraShort").': '.$vatNumber.'
';
@@ -69,7 +69,7 @@ else
// Set the WebService URL
dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL);
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
- $params=getSoapParams();
+ $params = getSoapParams();
//ini_set('default_socket_timeout', $params['response_timeout']);
//$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
$soapclient = new nusoap_client($WS_DOL_URL_WSDL, true, $params['proxy_host'], $params['proxy_port'], $params['proxy_login'], $params['proxy_password'], $params['connection_timeout'], $params['response_timeout']);
@@ -95,33 +95,33 @@ else
//print $soapclient->request.'
';
//print $soapclient->response.'
';
- $messagetoshow='';
+ $messagetoshow = '';
print ''.$langs->trans("Response").':
';
// Service indisponible
- if (! is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i', $result['faultstring']))
+ if (!is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i', $result['faultstring']))
{
print ''.$langs->trans("ErrorServiceUnavailableTryLater").'
';
- $messagetoshow=$soapclient->response;
+ $messagetoshow = $soapclient->response;
}
elseif (preg_match('/TIMEOUT/i', $result['faultstring']))
{
print ''.$langs->trans("ErrorServiceUnavailableTryLater").'
';
- $messagetoshow=$soapclient->response;
+ $messagetoshow = $soapclient->response;
}
elseif (preg_match('/SERVER_BUSY/i', $result['faultstring']))
{
print ''.$langs->trans("ErrorServiceUnavailableTryLater").'
';
- $messagetoshow=$soapclient->response;
+ $messagetoshow = $soapclient->response;
}
elseif ($result['faultstring'])
{
print ''.$langs->trans("Error").'
';
- $messagetoshow=$result['faultstring'];
+ $messagetoshow = $result['faultstring'];
}
// Syntaxe ko
elseif (preg_match('/INVALID_INPUT/i', $result['faultstring'])
- || ($result['requestDate'] && ! $result['valid']))
+ || ($result['requestDate'] && !$result['valid']))
{
if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'
';
print $langs->trans("VATIntraSyntaxIsValid").': '.$langs->trans("No").' (Might be a non europeen VAT)
';
@@ -140,7 +140,7 @@ else
}
else
{
- if (! empty($result['valid']) && ($result['valid']==1 || $result['valid']=='true'))
+ if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true'))
{
print ''.$langs->trans("Yes").'';
print '
';
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 5f031137c1f..d9214a538a2 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1687,7 +1687,7 @@ class Thirdparties extends DolibarrApi
unset($object->particulier);
unset($object->prefix_comm);
- unset($object->commercial_id); // This property is used in create/update only. It does not exists in read mode because there is several sales representatives.
+ unset($object->commercial_id); // This property is used in create/update only. It does not exists in read mode because there is several sales representatives.
unset($object->total_ht);
unset($object->total_tva);
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index c345d195935..06c56b027cd 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -29,9 +29,9 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
*/
class Client extends Societe
{
- public $next_prev_filter="te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
+ public $next_prev_filter = "te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
- public $cacheprospectstatus=array();
+ public $cacheprospectstatus = array();
/**
@@ -58,28 +58,28 @@ class Client extends Societe
// phpcs:enable
global $user;
- $this->nb=array("customers" => 0,"prospects" => 0);
+ $this->nb = array("customers" => 0, "prospects" => 0);
$clause = "WHERE";
$sql = "SELECT count(s.rowid) as nb, s.client";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$user->socid)
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
- $sql.= " WHERE sc.fk_user = " .$user->id;
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+ $sql .= " WHERE sc.fk_user = ".$user->id;
$clause = "AND";
}
- $sql.= " ".$clause." s.client IN (1,2,3)";
- $sql.= ' AND s.entity IN ('.getEntity($this->element).')';
- $sql.= " GROUP BY s.client";
+ $sql .= " ".$clause." s.client IN (1,2,3)";
+ $sql .= ' AND s.entity IN ('.getEntity($this->element).')';
+ $sql .= " GROUP BY s.client";
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- while ($obj=$this->db->fetch_object($resql))
+ while ($obj = $this->db->fetch_object($resql))
{
- if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"]+=$obj->nb;
- if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"]+=$obj->nb;
+ if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"] += $obj->nb;
+ if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"] += $obj->nb;
}
$this->db->free($resql);
return 1;
@@ -87,7 +87,7 @@ class Client extends Societe
else
{
dol_print_error($this->db);
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -102,14 +102,14 @@ class Client extends Societe
{
global $langs;
- $sql="SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
- if ($active >= 0) $sql.=" WHERE active = ".$active;
- $resql=$this->db->query($sql);
- $num=$this->db->num_rows($resql);
- $i=0;
+ $sql = "SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
+ if ($active >= 0) $sql .= " WHERE active = ".$active;
+ $resql = $this->db->query($sql);
+ $num = $this->db->num_rows($resql);
+ $i = 0;
while ($i < $num) {
- $obj=$this->db->fetch_object($resql);
- $this->cacheprospectstatus[$obj->id]=array('id'=>$obj->id, 'code'=>$obj->code, 'label'=> ($langs->trans("ST_".strtoupper($obj->code))=="ST_".strtoupper($obj->code))?$obj->label:$langs->trans("ST_".strtoupper($obj->code)));
+ $obj = $this->db->fetch_object($resql);
+ $this->cacheprospectstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=> ($langs->trans("ST_".strtoupper($obj->code)) == "ST_".strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_".strtoupper($obj->code)));
$i++;
}
return 1;
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 5cfe6fa3709..7211802721e 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -142,45 +142,45 @@ class CompanyBankAccount extends Account
global $conf;
$error = 0;
- if (! $this->id) return -1;
+ if (!$this->id) return -1;
if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
- $sql.= " bank = '" .$this->db->escape($this->bank)."'";
- $sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
- $sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
- $sql.= ",number='".$this->db->escape($this->number)."'";
- $sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
- $sql.= ",bic='".$this->db->escape($this->bic)."'";
- $sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
- $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
- $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
- $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
- $sql.= ",default_rib = ".$this->default_rib;
+ $sql .= " bank = '".$this->db->escape($this->bank)."'";
+ $sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
+ $sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+ $sql .= ",number='".$this->db->escape($this->number)."'";
+ $sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+ $sql .= ",bic='".$this->db->escape($this->bic)."'";
+ $sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
+ $sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+ $sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
+ $sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
+ $sql .= ",default_rib = ".$this->default_rib;
if ($conf->prelevement->enabled)
{
- $sql.= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
- $sql.= ",rum = '".$this->db->escape($this->rum)."'";
- $sql.= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
+ $sql .= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
+ $sql .= ",rum = '".$this->db->escape($this->rum)."'";
+ $sql .= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
}
if (trim($this->label) != '')
- $sql.= ",label = '".$this->db->escape($this->label)."'";
+ $sql .= ",label = '".$this->db->escape($this->label)."'";
else
- $sql.= ",label = NULL";
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= ",label = NULL";
+ $sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql);
if ($result)
{
- if (! $notrigger)
+ if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('COMPANY_RIB_MODIFY', $user);
+ $result = $this->call_trigger('COMPANY_RIB_MODIFY', $user);
if ($result < 0) $error++;
// End call triggers
- if(! $error )
+ if (!$error)
{
return 1;
}
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 6cd09ce49c4..5ba268f6687 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -23,7 +23,7 @@
*/
// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
@@ -84,7 +84,7 @@ class CompanyPaymentMode extends CommonObject
/**
* @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'=>'Rowid', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15),
'label' =>array('type'=>'varchar(30)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-2, 'position'=>30),
@@ -232,8 +232,8 @@ class CompanyPaymentMode extends CommonObject
$this->db = $db;
- if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
- if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
+ if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
+ if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
}
/**
@@ -245,7 +245,7 @@ class CompanyPaymentMode extends CommonObject
*/
public function create(User $user, $notrigger = false)
{
- $idpayment = $this->createCommon($user, $notrigger);
+ $idpayment = $this->createCommon($user, $notrigger);
return $idpayment;
}
@@ -313,8 +313,8 @@ class CompanyPaymentMode extends CommonObject
*/
public function fetch($id, $ref = null, $socid = 0, $type = '', $morewhere = '')
{
- if ($socid) $morewhere.= " AND fk_soc = ".$this->db->escape($socid)." AND default_rib = 1";
- if ($type) $morewhere.= " AND type = '".$this->db->escape($type)."'";
+ if ($socid) $morewhere .= " AND fk_soc = ".$this->db->escape($socid)." AND default_rib = 1";
+ if ($type) $morewhere .= " AND type = '".$this->db->escape($type)."'";
$result = $this->fetchCommon($id, $ref, $morewhere);
//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
@@ -375,45 +375,45 @@ class CompanyPaymentMode extends CommonObject
global $dolibarr_main_authentication, $dolibarr_main_demo;
global $menumanager;
- if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+ if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
$companylink = '';
- $label = '' . $langs->trans("CompanyPaymentMode") . '';
- $label.= '
';
- $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
+ $label = ''.$langs->trans("CompanyPaymentMode").'';
+ $label .= '
';
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
$url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?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("ShowCompanyPaymentMode");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowCompanyPaymentMode");
+ $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;
//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -430,7 +430,7 @@ class CompanyPaymentMode extends CommonObject
public function setAsDefault($id = 0, $alltypes = 0)
{
$sql1 = "SELECT rowid as id, fk_soc, type FROM ".MAIN_DB_PREFIX."societe_rib";
- $sql1.= " WHERE rowid = ".($id?$id:$this->id);
+ $sql1 .= " WHERE rowid = ".($id ? $id : $this->id);
dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
$result1 = $this->db->query($sql1);
@@ -450,14 +450,14 @@ class CompanyPaymentMode extends CommonObject
$this->db->begin();
$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0, tms = tms";
- $sql2.= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
- if ($type) $sql2.= " AND type = '".$this->db->escape($type)."'";
+ $sql2 .= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
+ if ($type) $sql2 .= " AND type = '".$this->db->escape($type)."'";
dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
$result2 = $this->db->query($sql2);
$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
- $sql3.= " WHERE rowid = ".$obj->id;
- if ($type) $sql3.= " AND type = '".$this->db->escape($type)."'";
+ $sql3 .= " WHERE rowid = ".$obj->id;
+ if ($type) $sql3 .= " AND type = '".$this->db->escape($type)."'";
dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
$result3 = $this->db->query($sql3);
@@ -528,10 +528,10 @@ class CompanyPaymentMode extends CommonObject
public function info($id)
{
$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
- $sql.= ' fk_user_creat, fk_user_modif';
- $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
- $sql.= ' WHERE t.rowid = '.$id;
- $result=$this->db->query($sql);
+ $sql .= ' fk_user_creat, fk_user_modif';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+ $sql .= ' WHERE t.rowid = '.$id;
+ $result = $this->db->query($sql);
if ($result)
{
if ($this->db->num_rows($result))
@@ -542,7 +542,7 @@ class CompanyPaymentMode extends CommonObject
{
$cuser = new User($this->db);
$cuser->fetch($obj->fk_user_author);
- $this->user_creation = $cuser;
+ $this->user_creation = $cuser;
}
if ($obj->fk_user_valid)
@@ -556,7 +556,7 @@ class CompanyPaymentMode extends CommonObject
{
$cluser = new User($this->db);
$cluser->fetch($obj->fk_user_cloture);
- $this->user_cloture = $cluser;
+ $this->user_cloture = $cluser;
}
$this->date_creation = $this->db->jdate($obj->datec);
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 3664d8fd848..ad7383d81af 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -33,13 +33,13 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'societe', $socid, '&societe');
$object = new Societe($db);
if ($socid > 0) $object->fetch($socid);
// Sort & Order fields
-$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');
@@ -47,26 +47,26 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='dateprint';
+if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) $sortfield = 'dateprint';
// Search fields
-$sref=GETPOST("sref");
-$sprod_fulldescr=GETPOST("sprod_fulldescr");
-$month = GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
+$sref = GETPOST("sref");
+$sprod_fulldescr = GETPOST("sprod_fulldescr");
+$month = GETPOST('month', 'int');
+$year = GETPOST('year', 'int');
// Clean up on purge search criteria ?
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
{
- $sref='';
- $sprod_fulldescr='';
- $year='';
- $month='';
+ $sref = '';
+ $sprod_fulldescr = '';
+ $year = '';
+ $month = '';
}
// Customer or supplier selected in drop box
$thirdTypeSelect = GETPOST("third_select_id");
-$type_element = GETPOST('type_element')?GETPOST('type_element'):'';
+$type_element = GETPOST('type_element') ?GETPOST('type_element') : '';
// Load translation files required by the page
$langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
@@ -79,8 +79,8 @@ $hookmanager->initHooks(array('consumptionthirdparty'));
* Actions
*/
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -91,11 +91,11 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
$form = new Form($db);
$formother = new FormOther($db);
-$productstatic=new Product($db);
+$productstatic = new Product($db);
$title = $langs->trans("Referers", $object->name);
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('', $title, $help_url);
if (empty($socid))
@@ -109,14 +109,14 @@ dol_fiche_head($head, 'consumption', $langs->trans("ThirdParty"), -1, 'company')
$linkback = ''.$langs->trans("BackToList").'';
-dol_banner_tab($object, 'socid', $linkback, ($user->socid?0:1), 'rowid', 'nom');
+dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
print '';
print ' ';
print ' ';
-if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
+if (!empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{
print '| '.$langs->trans('Prefix').' | '.$object->prefix_comm.' | ';
}
@@ -131,19 +131,19 @@ if ($object->client)
if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')';
print '';
$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if (!$resql) dol_print_error($db);
$obj = $db->fetch_object($resql);
$nbFactsClient = $obj->nb;
- $thirdTypeArray['customer']=$langs->trans("customer");
- if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
- if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
- if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
- if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+ $thirdTypeArray['customer'] = $langs->trans("customer");
+ if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
+ if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
+ if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
+ if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
}
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions');
+if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
if ($object->fournisseur)
{
@@ -153,15 +153,15 @@ if ($object->fournisseur)
if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')';
print '';
$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".$socid;
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if (!$resql) dol_print_error($db);
$obj = $db->fetch_object($resql);
$nbCmdsFourn = $obj->nb;
- $thirdTypeArray['supplier']=$langs->trans("supplier");
- if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
- if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
- if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
+ $thirdTypeArray['supplier'] = $langs->trans("supplier");
+ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
+ if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
+ if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal'] = $langs->transnoentitiesnoconv('SupplierProposals');
}
print ' ';
@@ -174,7 +174,7 @@ print ' ';
print ' ';
@@ -405,16 +405,16 @@ if ($sql_select)
$i = 0;
while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
{
- $documentstatic->id=$objp->doc_id;
- $documentstatic->ref=$objp->doc_number;
- $documentstatic->type=$objp->doc_type;
- $documentstatic->fk_statut=$objp->status;
- $documentstatic->fk_status=$objp->status;
- $documentstatic->statut=$objp->status;
- $documentstatic->status=$objp->status;
- $documentstatic->paye=$objp->paid;
+ $documentstatic->id = $objp->doc_id;
+ $documentstatic->ref = $objp->doc_number;
+ $documentstatic->type = $objp->doc_type;
+ $documentstatic->fk_statut = $objp->status;
+ $documentstatic->fk_status = $objp->status;
+ $documentstatic->statut = $objp->status;
+ $documentstatic->status = $objp->status;
+ $documentstatic->paye = $objp->paid;
- if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
+ if (is_object($documentstaticline)) $documentstaticline->statut = $objp->status;
print '';
print '| ';
@@ -437,58 +437,58 @@ if ($sql_select)
print ' | ';
// Define text, description and type
- $text=''; $description=''; $type=0;
+ $text = ''; $description = ''; $type = 0;
// Code to show product duplicated from commonobject->printObjectLine
if ($objp->fk_product > 0)
{
$product_static = new Product($db);
- $product_static->type=$objp->fk_product_type;
- $product_static->id=$objp->fk_product;
- $product_static->ref=$objp->ref;
- $product_static->entity=$objp->pentity;
- $text=$product_static->getNomUrl(1);
+ $product_static->type = $objp->fk_product_type;
+ $product_static->id = $objp->fk_product;
+ $product_static->ref = $objp->ref;
+ $product_static->entity = $objp->pentity;
+ $text = $product_static->getNomUrl(1);
}
// Product
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))
{
$prod = new Product($db);
$prod->fetch($objp->fk_product);
$outputlangs = $langs;
- $newlang='';
- if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang=GETPOST('lang_id', 'aZ09');
- if (empty($newlang)) $newlang=$object->default_lang;
- if (! empty($newlang))
+ $newlang = '';
+ if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+ if (empty($newlang)) $newlang = $object->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 = $objp->product_label;
}
- $text.= ' - '.(! empty($objp->label)?$objp->label:$label);
- $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
+ $text .= ' - '.(!empty($objp->label) ? $objp->label : $label);
+ $description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($objp->description));
}
if (($objp->info_bits & 2) == 2) { ?>
trans("ShowReduc"), 'reduc').' ';
- if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
- elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
- elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+ if ($objp->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");
+ elseif ($objp->description == '(EXCESS RECEIVED)') $txt = $langs->trans("ExcessReceived");
+ elseif ($objp->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid");
//else $txt=$langs->trans("Discount");
print $txt;
?>
@@ -498,33 +498,33 @@ if ($sql_select)
{
if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
{
- $discount=new DiscountAbsolute($db);
+ $discount = new DiscountAbsolute($db);
$discount->fetch($objp->fk_remise_except);
- echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
+ echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
}
if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
{
- $discount=new DiscountAbsolute($db);
+ $discount = new DiscountAbsolute($db);
$discount->fetch($objp->fk_remise_except);
- echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
+ echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
}
elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
{
- $discount=new DiscountAbsolute($db);
+ $discount = new DiscountAbsolute($db);
$discount->fetch($objp->fk_remise_except);
- echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
+ echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
}
elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
{
- $discount=new DiscountAbsolute($db);
+ $discount = new DiscountAbsolute($db);
$discount->fetch($objp->fk_remise_except);
- echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
+ echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
// Add date of deposit
- if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
+ if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
}
else
{
- echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
+ echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
}
}
}
@@ -537,18 +537,18 @@ if ($sql_select)
echo get_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_label)?'
'.dol_htmlentitiesbr($objp->description):'';
+ print (!empty($objp->description) && $objp->description != $objp->product_label) ? '
'.dol_htmlentitiesbr($objp->description) : '';
}
} else {
- if (! empty($objp->label) || ! empty($objp->description))
+ if (!empty($objp->label) || !empty($objp->description))
{
- if ($type==1) $text = img_object($langs->trans('Service'), 'service');
+ if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
else $text = img_object($langs->trans('Product'), 'product');
- if (! empty($objp->label)) {
- $text.= ' '.$objp->label.'';
+ if (!empty($objp->label)) {
+ $text .= ' '.$objp->label.'';
echo $form->textwithtooltip($text, dol_htmlentitiesbr($objp->description), 3, '', '', $i, 0, '');
} else {
echo $text.' '.dol_htmlentitiesbr($objp->description);
@@ -581,25 +581,25 @@ if ($sql_select)
print ' | ';
//print ''.$prodreftxt.' | ';
- if ($type_element == 'invoice' && $objp->doc_type == Facture::TYPE_CREDIT_NOTE) $objp->prod_qty=-($objp->prod_qty);
+ if ($type_element == 'invoice' && $objp->doc_type == Facture::TYPE_CREDIT_NOTE) $objp->prod_qty = -($objp->prod_qty);
print ''.$objp->prod_qty.' | ';
- $total_qty+=$objp->prod_qty;
+ $total_qty += $objp->prod_qty;
print ''.price($objp->total_ht).' | ';
- $total_ht+=$objp->total_ht;
+ $total_ht += $objp->total_ht;
- print ''.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).' | ';
+ print ''.price($objp->total_ht / (empty($objp->prod_qty) ? 1 : $objp->prod_qty)).' | ';
print " \n";
$i++;
}
print '';
- print '| ' . $langs->trans('Total') . ' | ';
+ print ''.$langs->trans('Total').' | ';
print ' | ';
- print '' . $total_qty . ' | ';
- print '' . price($total_ht) . ' | ';
- print '' . price($total_ht/(empty($total_qty)?1:$total_qty)) . ' | ';
+ print ''.$total_qty.' | ';
+ print ''.price($total_ht).' | ';
+ print ''.price($total_ht / (empty($total_qty) ? 1 : $total_qty)).' | ';
print "";
print '';
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 992892e96db..f22fb1ec5b6 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -56,23 +56,23 @@ $offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! empty($conf->global->MAIN_DOC_SORT_FIELD)) { $sortfield=$conf->global->MAIN_DOC_SORT_FIELD; }
-if (! empty($conf->global->MAIN_DOC_SORT_ORDER)) { $sortorder=$conf->global->MAIN_DOC_SORT_ORDER; }
+if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) { $sortfield = $conf->global->MAIN_DOC_SORT_FIELD; }
+if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) { $sortorder = $conf->global->MAIN_DOC_SORT_ORDER; }
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position_name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "position_name";
$object = new Societe($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
{
$result = $object->fetch($id, $ref);
- $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
- $courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id, 0, 0, 0, $object, 'thirdparty');
+ $upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
+ $courrier_dir = $conf->societe->multidir_output[$object->entity]."/courrier/".get_exdir($object->id, 0, 0, 0, $object, 'thirdparty');
}
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartydocument','globalcard'));
+$hookmanager->initHooks(array('thirdpartydocument', 'globalcard'));
@@ -99,25 +99,25 @@ if ($object->id)
/*
* Show tabs
*/
- if (! empty($conf->notification->enabled)) $langs->load("mails");
+ if (!empty($conf->notification->enabled)) $langs->load("mails");
$head = societe_prepare_head($object);
- $form=new Form($db);
+ $form = new Form($db);
dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
// Build file list
- $filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
- $totalsize=0;
- foreach($filearray as $key => $file)
+ $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+ $totalsize = 0;
+ foreach ($filearray as $key => $file)
{
- $totalsize+=$file['size'];
+ $totalsize += $file['size'];
}
$linkback = ''.$langs->trans("BackToList").'';
- dol_banner_tab($object, 'socid', $linkback, ($user->socid?0:1), 'rowid', 'nom');
+ dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
print '';
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 5b89c086c1f..fdd7c24f280 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -38,7 +38,7 @@ $hookmanager->initHooks(array('thirdpartiesindex'));
$langs->load("companies");
$socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
// Security check
$result = restrictedArea($user, 'societe', 0, '', '', '', '');
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index ca29efbfad8..a1ca78fe67a 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -102,7 +102,7 @@ $search_parent_name = GETPOST('search_parent_name', 'alpha');
$type = GETPOST('type', 'alpha');
$optioncss = GETPOST('optioncss', 'alpha');
$mode = GETPOST("mode", 'alpha');
-$place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is string id of table for Bar or Restaurant
+$place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is string id of table for Bar or Restaurant
$diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 0f2bc4d8002..2e3e3ec4532 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -34,24 +34,24 @@ $action = GETPOST('action', 'aZ09');
$langs->load("companies");
// Security check
-$id = GETPOST('id')?GETPOST('id', 'int'):GETPOST('socid', 'int');
-if ($user->socid) $id=$user->socid;
+$id = GETPOST('id') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+if ($user->socid) $id = $user->socid;
$result = restrictedArea($user, 'societe', $id, '&societe');
$object = new Societe($db);
if ($id > 0) $object->fetch($id);
-$permissionnote=$user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartynote','globalcard'));
+$hookmanager->initHooks(array('thirdpartynote', 'globalcard'));
/*
* 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
/*
@@ -60,9 +60,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
$form = new Form($db);
-$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notes");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notes");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+$title = $langs->trans("ThirdParty").' - '.$langs->trans("Notes");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notes");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('', $title, $help_url);
if ($object->id > 0)
@@ -70,7 +70,7 @@ if ($object->id > 0)
/*
* Affichage onglets
*/
- if (! empty($conf->notification->enabled)) $langs->load("mails");
+ if (!empty($conf->notification->enabled)) $langs->load("mails");
$head = societe_prepare_head($object);
@@ -78,9 +78,9 @@ if ($object->id > 0)
$linkback = ' '.$langs->trans("BackToList").'';
- dol_banner_tab($object, 'socid', $linkback, ($user->socid?0:1), 'rowid', 'nom');
+ dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
- $cssclass='titlefield';
+ $cssclass = 'titlefield';
//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
@@ -89,7 +89,7 @@ if ($object->id > 0)
print ' ';
print ' ';
- if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
+ if (!empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{
print '| '.$langs->trans('Prefix').' | '.$object->prefix_comm.' | ';
}
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index f04459335d5..49cecff76d0 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -34,31 +34,31 @@ $langs->loadLangs(array("companies", "mails", "admin", "other"));
$socid = GETPOST("socid", 'int');
$action = GETPOST('action', 'aZ09');
-$contactid = GETPOST('contactid'); // May be an int or 'thirdparty'
+$contactid = GETPOST('contactid'); // May be an int or 'thirdparty'
$actionid = GETPOST('actionid');
-$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'societe', '', '');
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
-$sortfield=GETPOST("sortfield", 'alpha');
-$sortorder=GETPOST("sortorder", 'alpha');
+$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');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="n.daten";
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "n.daten";
if (empty($page) || $page == -1) { $page = 0; }
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-$now=dol_now();
+$now = dol_now();
$object = new Societe($db);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartynotification','globalcard'));
+$hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
@@ -66,13 +66,13 @@ $hookmanager->initHooks(array('thirdpartynotification','globalcard'));
* Actions
*/
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook))
{
- $error=0;
+ $error = 0;
// Add a notification
if ($action == 'add')
@@ -88,7 +88,7 @@ if (empty($reshook))
$error++;
}
- if (! $error)
+ if (!$error)
{
$db->begin();
@@ -99,7 +99,7 @@ if (empty($reshook))
$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
$sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
- if (! $db->query($sql))
+ if (!$db->query($sql))
{
$error++;
dol_print_error($db);
@@ -110,7 +110,7 @@ if (empty($reshook))
dol_print_error($db);
}
- if (! $error)
+ if (!$error)
{
$db->commit();
}
@@ -138,11 +138,11 @@ if (empty($reshook))
$form = new Form($db);
$object = new Societe($db);
-$result=$object->fetch($socid);
+$result = $object->fetch($socid);
-$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+$title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notification");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('', $title, $help_url);
@@ -156,7 +156,7 @@ if ($result > 0)
$linkback = ''.$langs->trans("BackToList").'';
- dol_banner_tab($object, 'socid', $linkback, ($user->socid?0:1), 'rowid', 'nom');
+ dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
print '';
@@ -164,7 +164,7 @@ if ($result > 0)
print ' ';
// Prefix
- if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
+ if (!empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{
print '| '.$langs->trans('Prefix').' | '.$object->prefix_comm.' | ';
}
@@ -178,7 +178,7 @@ if ($result > 0)
print '';
}
- if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+ if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
{
print '| ';
print $langs->trans('SupplierCode').' | ';
@@ -225,7 +225,7 @@ if ($result > 0)
print '';
print '';
- $param="&socid=".$socid;
+ $param = "&socid=".$socid;
// Line with titles
print '';
@@ -236,20 +236,20 @@ if ($result > 0)
print_liste_field_titre('');
print "\n";
- $var=false;
- $listofemails=$object->thirdparty_and_contact_email_array();
+ $var = false;
+ $listofemails = $object->thirdparty_and_contact_email_array();
if (count($listofemails) > 0)
{
- $actions=array();
+ $actions = array();
// Load array of available notifications
- $notificationtrigger=new InterfaceNotification($db);
- $listofmanagedeventfornotification=$notificationtrigger->getListOfManagedEvents();
+ $notificationtrigger = new InterfaceNotification($db);
+ $listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
- foreach($listofmanagedeventfornotification as $managedeventfornotification)
+ foreach ($listofmanagedeventfornotification as $managedeventfornotification)
{
- $label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
- $actions[$managedeventfornotification['rowid']]=$label;
+ $label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
+ $actions[$managedeventfornotification['rowid']] = $label;
}
print '| ';
print $form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
@@ -258,7 +258,7 @@ if ($result > 0)
print $form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
print ' | ';
print '';
- $type=array('email'=>$langs->trans("EMail"));
+ $type = array('email'=>$langs->trans("EMail"));
print $form->selectarray("typeid", $type);
print ' | ';
print ' | ';
@@ -280,16 +280,16 @@ if ($result > 0)
// List of notifications enabled for contacts
$sql = "SELECT n.rowid, n.type,";
- $sql.= " a.code, a.label,";
- $sql.= " c.rowid as contactid, c.lastname, c.firstname, c.email";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
- $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
- $sql.= " ".MAIN_DB_PREFIX."socpeople c";
- $sql.= " WHERE a.rowid = n.fk_action";
- $sql.= " AND c.rowid = n.fk_contact";
- $sql.= " AND c.fk_soc = ".$object->id;
+ $sql .= " a.code, a.label,";
+ $sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+ $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+ $sql .= " ".MAIN_DB_PREFIX."socpeople c";
+ $sql .= " WHERE a.rowid = n.fk_action";
+ $sql .= " AND c.rowid = n.fk_contact";
+ $sql .= " AND c.fk_soc = ".$object->id;
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
@@ -318,15 +318,15 @@ if ($result > 0)
{
$i = 0;
- $contactstatic=new Contact($db);
+ $contactstatic = new Contact($db);
while ($i < $num)
{
$obj = $db->fetch_object($resql);
- $contactstatic->id=$obj->contactid;
- $contactstatic->lastname=$obj->lastname;
- $contactstatic->firstname=$obj->firstname;
+ $contactstatic->id = $obj->contactid;
+ $contactstatic->lastname = $obj->lastname;
+ $contactstatic->firstname = $obj->firstname;
print ' | '.$contactstatic->getNomUrl(1);
if ($obj->type == 'email')
{
@@ -342,7 +342,7 @@ if ($result > 0)
}
print ' | ';
print '';
- $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+ $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
print $label;
print ' | ';
print '';
@@ -415,14 +415,14 @@ if ($result > 0)
// List
$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
- $sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
- $sql.= " a.code, a.label";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
- $sql.= " ".MAIN_DB_PREFIX."notify as n ";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
- $sql.= " WHERE a.rowid = n.fk_action";
- $sql.= " AND n.fk_soc = ".$object->id;
- $sql.= $db->order($sortfield, $sortorder);
+ $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+ $sql .= " a.code, a.label";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+ $sql .= " ".MAIN_DB_PREFIX."notify as n ";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+ $sql .= " WHERE a.rowid = n.fk_action";
+ $sql .= " AND n.fk_soc = ".$object->id;
+ $sql .= $db->order($sortfield, $sortorder);
// Count total nb of records
$nbtotalofrecords = '';
@@ -437,9 +437,9 @@ if ($result > 0)
}
}
- $sql.= $db->plimit($limit+1, $offset);
+ $sql .= $db->plimit($limit + 1, $offset);
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
@@ -449,9 +449,9 @@ if ($result > 0)
dol_print_error($db);
}
- $param='&socid='.$object->id;
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ $param = '&socid='.$object->id;
+ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
print ' | \n";
- $i=0;
+ $i = 0;
while ($i < $num && $i < $conf->liste_limit)
{
$objp = $db->fetch_object($resql);
- $datefin=$db->jdate($objp->datefin);
- $memberstatic->id=$objp->rowid;
- $memberstatic->ref=$objp->rowid;
- $memberstatic->lastname=$objp->lastname;
- $memberstatic->firstname=$objp->firstname;
- $memberstatic->statut=$objp->statut;
- $memberstatic->datefin=$db->jdate($objp->datefin);
+ $datefin = $db->jdate($objp->datefin);
+ $memberstatic->id = $objp->rowid;
+ $memberstatic->ref = $objp->rowid;
+ $memberstatic->lastname = $objp->lastname;
+ $memberstatic->firstname = $objp->firstname;
+ $memberstatic->statut = $objp->statut;
+ $memberstatic->datefin = $db->jdate($objp->datefin);
- $companyname=$objp->company;
+ $companyname = $objp->company;
print '';
@@ -290,18 +290,18 @@ if ($id > 0 || ! empty($ref))
// Lastname
print "| rowid\">";
- print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
- print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
- print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+ print ((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+ print (((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
+ print (!empty($companyname) ? dol_trunc($companyname, 32) : '');
print " | \n";
// Login
print "".$objp->login." | \n";
// Type
- $membertypestatic->id=$objp->type_id;
- $membertypestatic->libelle=$objp->type;
- $membertypestatic->label=$objp->type;
+ $membertypestatic->id = $objp->type_id;
+ $membertypestatic->libelle = $objp->type;
+ $membertypestatic->label = $objp->type;
print '';
print $membertypestatic->getNomUrl(1, 32);
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 9a17ac1e202..11b2d033b69 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -16,7 +16,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;
@@ -28,23 +28,23 @@ print $langs->trans('SalesRepresentatives');
print ' | ';
print '';
-$listsalesrepresentatives=$object->getSalesRepresentatives($user);
-$nbofsalesrepresentative=count($listsalesrepresentatives);
+$listsalesrepresentatives = $object->getSalesRepresentatives($user);
+$nbofsalesrepresentative = count($listsalesrepresentatives);
if ($nbofsalesrepresentative > 0)
{
- $userstatic=new User($db);
- foreach($listsalesrepresentatives as $val)
+ $userstatic = new User($db);
+ foreach ($listsalesrepresentatives as $val)
{
- $userstatic->id=$val['id'];
- $userstatic->login=$val['login'];
- $userstatic->lastname=$val['lastname'];
- $userstatic->firstname=$val['firstname'];
- $userstatic->statut=$val['statut'];
- $userstatic->photo=$val['photo'];
- $userstatic->email=$val['email'];
- $userstatic->phone=$val['phone'];
- $userstatic->job=$val['job'];
- $userstatic->entity=$val['entity'];
+ $userstatic->id = $val['id'];
+ $userstatic->login = $val['login'];
+ $userstatic->lastname = $val['lastname'];
+ $userstatic->firstname = $val['firstname'];
+ $userstatic->statut = $val['statut'];
+ $userstatic->photo = $val['photo'];
+ $userstatic->email = $val['email'];
+ $userstatic->phone = $val['phone'];
+ $userstatic->job = $val['job'];
+ $userstatic->entity = $val['entity'];
print $userstatic->getNomUrl(-1);
print ' ';
}
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 9d698c7c5f8..a8bca51dda3 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -165,7 +165,7 @@ print '';
dol_fiche_head($head, 'stripeaccount', '', -1);
-$stripearrayofwebhookevents=array('account.updated', 'payout.created', 'payout.paid', 'charge.pending', 'charge.refunded', 'charge.succeeded', 'charge.failed', 'payment_intent.succeeded', 'payment_intent.payment_failed', 'payment_method.attached', 'payment_method.updated', 'payment_method.card_automatically_updated', 'payment_method.detached', 'source.chargeable', 'customer.deleted');
+$stripearrayofwebhookevents = array('account.updated', 'payout.created', 'payout.paid', 'charge.pending', 'charge.refunded', 'charge.succeeded', 'charge.failed', 'payment_intent.succeeded', 'payment_intent.payment_failed', 'payment_method.attached', 'payment_method.updated', 'payment_method.card_automatically_updated', 'payment_method.detached', 'source.chargeable', 'customer.deleted');
print ''.$langs->trans("StripeDesc")."
\n";
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 8f753e3b7b5..f765a2a3ec1 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -97,7 +97,7 @@ if (!$rowid)
$param = '';
//if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
- $param.='&starting_after_'.($page+1).'='.$list->data[($limit-1)]->id;
+ $param .= '&starting_after_'.($page + 1).'='.$list->data[($limit - 1)]->id;
//$param.='&ending_before_'.($page+1).'='.$list->data[($limit-1)]->id;
$moreforfilter = '';
@@ -138,26 +138,26 @@ if (!$rowid)
break;
}
- if ($charge->refunded=='1') {
+ if ($charge->refunded == '1') {
$status = img_picto($langs->trans("refunded"), 'statut6');
- } elseif ($charge->paid=='1') {
+ } elseif ($charge->paid == '1') {
$status = img_picto($langs->trans((string) $charge->status), 'statut4');
} else {
$label = $langs->trans("Message").": ".$charge->failure_message."
";
- $label.= $langs->trans("Network").": ".$charge->outcome->network_status."
";
- $label.= $langs->trans("Status").": ".$langs->trans((string) $charge->outcome->seller_message);
+ $label .= $langs->trans("Network").": ".$charge->outcome->network_status."
";
+ $label .= $langs->trans("Status").": ".$langs->trans((string) $charge->outcome->seller_message);
$status = $form->textwithpicto(img_picto($langs->trans((string) $charge->status), 'statut8'), $label, -1);
}
- if ($charge->payment_method_details->type=='card') {
+ if ($charge->payment_method_details->type == 'card') {
$type = $langs->trans("card");
- } elseif ($charge->source->type=='card'){
+ } elseif ($charge->source->type == 'card') {
$type = $langs->trans("card");
- } elseif ($charge->payment_method_details->type=='three_d_secure'){
+ } elseif ($charge->payment_method_details->type == 'three_d_secure') {
$type = $langs->trans("card3DS");
- } elseif ($charge->payment_method_details->type=='sepa_debit'){
+ } elseif ($charge->payment_method_details->type == 'sepa_debit') {
$type = $langs->trans("sepadebit");
- } elseif ($charge->payment_method_details->type=='ideal'){
+ } elseif ($charge->payment_method_details->type == 'ideal') {
$type = $langs->trans("iDEAL");
}
@@ -240,7 +240,7 @@ if (!$rowid)
// Origin
print " | ";
- if ($charge->metadata->dol_type=="order" || $charge->metadata->dol_type=="commande") {
+ if ($charge->metadata->dol_type == "order" || $charge->metadata->dol_type == "commande") {
$object = new Commande($db);
$object->fetch($charge->metadata->dol_id);
if ($object->id > 0) {
@@ -248,7 +248,7 @@ if (!$rowid)
} else {
print $FULLTAG;
}
- } elseif ($charge->metadata->dol_type=="invoice" || $charge->metadata->dol_type=="facture") {
+ } elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
$object = new Facture($db);
$object->fetch($charge->metadata->dol_id);
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 28bcf9f3347..a72e5291f58 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -417,7 +417,7 @@ class Stripe extends CommonObject
"currency" => $currency_code,
"payment_method_types" => array("card"),
"description" => $description,
- "statement_descriptor_suffix" => dol_trunc($tag, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+ "statement_descriptor_suffix" => dol_trunc($tag, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
//"save_payment_method" => true,
"setup_future_usage" => "on_session",
"metadata" => $metadata
@@ -764,7 +764,7 @@ class Stripe extends CommonObject
{
dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
$card = $cu->sources->create($dataforcard);
- if (! $card)
+ if (!$card)
{
$this->error = 'Creation of card on Stripe has failed';
}
@@ -788,7 +788,7 @@ class Stripe extends CommonObject
{
dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
$card = $cu->sources->create($dataforcard, array("stripe_account" => $stripeacc));
- if (! $card)
+ if (!$card)
{
$this->error = 'Creation of card on Stripe has failed';
}
@@ -960,7 +960,7 @@ class Stripe extends CommonObject
$charge = \Stripe\Charge::create(array(
"amount" => "$stripeamount",
"currency" => "$currency",
- "statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+ "statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
"description" => "Stripe payment: ".$description,
"capture" => $capture,
"metadata" => $metadata,
@@ -970,7 +970,7 @@ class Stripe extends CommonObject
$paymentarray = array(
"amount" => "$stripeamount",
"currency" => "$currency",
- "statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+ "statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
"description" => "Stripe payment: ".$description,
"capture" => $capture,
"metadata" => $metadata,
@@ -1000,7 +1000,7 @@ class Stripe extends CommonObject
$paymentarray = array(
"amount" => "$stripeamount",
"currency" => "$currency",
- "statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+ "statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
"description" => "Stripe payment: ".$description,
"capture" => $capture,
"metadata" => $metadata,
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 90533464b7f..10316ec2ece 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -26,17 +26,17 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
// Load translation files required by the page
$langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
// Security check
$socid = GETPOST("socid", "int");
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
//$result = restrictedArea($user, 'salaries', '', '', '');
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$rowid = GETPOST("rowid", 'alpha');
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 978b8ed3d62..59858a69262 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -26,17 +26,17 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
// Load translation files required by the page
$langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
// Security check
$socid = GETPOST("socid", "int");
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
//$result = restrictedArea($user, 'salaries', '', '', '');
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$rowid = GETPOST("rowid", 'alpha');
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 85d01930a7d..132820e8e09 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -29,13 +29,13 @@ $extrafields = new ExtraFields($db);
$form = new Form($db);
// List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='supplier_proposal'; //Must be the $table_element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'supplier_proposal'; //Must be the $table_element of the class that manage extrafield
if (!$user->admin) accessforbidden();
@@ -52,13 +52,13 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View
*/
-$textobject=$langs->transnoentitiesnoconv("CommRequests");
+$textobject = $langs->transnoentitiesnoconv("CommRequests");
llxHeader('', $langs->trans("SupplierProposalSetup"));
-$linkback=''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans("SupplierProposalSetup"), $linkback, 'title_setup');
@@ -99,7 +99,7 @@ if ($action == 'create')
/* Edition of an optional field */
/* */
/* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
{
print "
";
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 683025ffe86..73ba689f47a 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -36,14 +36,14 @@ $extrafields = new ExtraFields($db);
$form = new Form($db);
// List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
-$elementtype='supplier_proposaldet'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'supplier_proposaldet'; //Must be the $table_element of the class that manage extrafield
if (!$user->admin) accessforbidden();
@@ -60,11 +60,11 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View
*/
-$textobject=$langs->transnoentitiesnoconv("CommRequests");
+$textobject = $langs->transnoentitiesnoconv("CommRequests");
llxHeader('', $langs->trans("SupplierProposalSetup"));
-$linkback=''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans("SupplierProposalSetup"), $linkback, 'title_setup');
$head = supplier_proposal_admin_prepare_head();
@@ -104,7 +104,7 @@ if ($action == 'create')
/* Edition d'un champ optionnel */
/* */
/* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
{
print "
";
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index df044e66f68..5910f77a819 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -759,8 +759,8 @@ if (empty($reshook))
$pu_ttc,
$info_bits,
$type,
- -1, // rang
- 0, // special_code
+ -1, // rang
+ 0, // special_code
GETPOST('fk_parent_line'),
$fournprice,
$buyingprice,
@@ -768,8 +768,8 @@ if (empty($reshook))
$array_options,
$ref_supplier,
$fk_unit,
- '', // origin
- 0, // origin_id
+ '', // origin
+ 0, // origin_id
$pu_ht_devise);
}
@@ -1830,25 +1830,25 @@ if ($action == 'create')
if ($action == 'statut')
{
// Form to set proposal accepted/refused
- $form_close = '';
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index 5f49ebbc427..3fbe3afa021 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -64,16 +64,16 @@ class Supplierproposals extends DolibarrApi
*/
public function get($id)
{
- if(! DolibarrApiAccess::$user->rights->supplier_proposal->lire) {
+ if (!DolibarrApiAccess::$user->rights->supplier_proposal->lire) {
throw new RestException(401);
}
$result = $this->supplier_proposal->fetch($id);
- if( ! $result ) {
+ if (!$result) {
throw new RestException(404, 'Supplier Proposal not found');
}
- if( ! DolibarrApi::_checkAccessToResource('supplier_proposal', $this->propal->id)) {
+ if (!DolibarrApi::_checkAccessToResource('supplier_proposal', $this->propal->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -105,18 +105,18 @@ class Supplierproposals extends DolibarrApi
// If the internal user must only see his customers, force searching by him
$search_sale = 0;
- if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+ if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
$sql = "SELECT t.rowid";
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
- $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as t";
+ $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as t";
- if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
- $sql.= ' WHERE t.entity IN ('.getEntity('propal').')';
- if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
- if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
- if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+ $sql .= ' WHERE t.entity IN ('.getEntity('propal').')';
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+ if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+ if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
// Insert sale filter
if ($search_sale > 0)
{
@@ -125,23 +125,23 @@ class Supplierproposals extends DolibarrApi
// Add sql filters
if ($sqlfilters)
{
- if (! DolibarrApi::_checkFilters($sqlfilters))
+ if (!DolibarrApi::_checkFilters($sqlfilters))
{
throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
}
- $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
- $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+ $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
- $sql.= $db->order($sortfield, $sortorder);
- if ($limit) {
+ $sql .= $db->order($sortfield, $sortorder);
+ if ($limit) {
if ($page < 0)
{
$page = 0;
}
$offset = $limit * $page;
- $sql.= $db->plimit($limit + 1, $offset);
+ $sql .= $db->plimit($limit + 1, $offset);
}
$result = $db->query($sql);
@@ -150,12 +150,12 @@ class Supplierproposals extends DolibarrApi
{
$num = $db->num_rows($result);
$min = min($num, ($limit <= 0 ? $num : $limit));
- $i=0;
+ $i = 0;
while ($i < $min)
{
$obj = $db->fetch_object($result);
$propal_static = new SupplierProposal($db);
- if($propal_static->fetch($obj->rowid)) {
+ if ($propal_static->fetch($obj->rowid)) {
$obj_ret[] = $this->_cleanObjectDatas($propal_static);
}
$i++;
@@ -164,7 +164,7 @@ class Supplierproposals extends DolibarrApi
else {
throw new RestException(503, 'Error when retrieving supplier proposal list : '.$db->lasterror());
}
- if( ! count($obj_ret)) {
+ if (!count($obj_ret)) {
throw new RestException(404, 'No supplier proposal found');
}
return $obj_ret;
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index adbe97456fa..2f7d4b39cf3 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -596,8 +596,8 @@ class SupplierProposal extends CommonObject
//var_dump($this->line->fk_fournprice);exit;
// Multicurrency
- $this->line->fk_multicurrency = $this->fk_multicurrency;
- $this->line->multicurrency_code = $this->multicurrency_code;
+ $this->line->fk_multicurrency = $this->fk_multicurrency;
+ $this->line->multicurrency_code = $this->multicurrency_code;
$this->line->multicurrency_subprice = $pu_ht_devise;
$this->line->multicurrency_total_ht = $multicurrency_total_ht;
$this->line->multicurrency_total_tva = $multicurrency_total_tva;
@@ -724,7 +724,7 @@ class SupplierProposal extends CommonObject
$multicurrency_total_ht = $tabprice[16];
$multicurrency_total_tva = $tabprice[17];
$multicurrency_total_ttc = $tabprice[18];
- $pu_ht_devise = $tabprice[19];
+ $pu_ht_devise = $tabprice[19];
//Fetch current line from the database and then clone the object and set it in $oldline property
$line = new SupplierProposalLine($this->db);
@@ -1817,14 +1817,14 @@ class SupplierProposal extends CommonObject
$multicurrency_tx = 1;
$fk_multicurrency = 0;
- if(empty($this->thirdparty)) $this->fetch_thirdparty();
+ if (empty($this->thirdparty)) $this->fetch_thirdparty();
$ref_fourn = $product->ref_fourn;
- if(empty($ref_fourn)) $ref_fourn = $product->ref_supplier;
- if(!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code);
+ if (empty($ref_fourn)) $ref_fourn = $product->ref_supplier;
+ if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code);
$productsupplier->id = $product->fk_product;
- $productsupplier->update_buyprice($product->qty, $product->subprice, $user, 'HT', $this->thirdparty, '', $ref_fourn, $product->tva_tx, 0, 0, 0, $product->info_bits, '', '', array(), '', $product->multicurrency_subprice, 'HT', $multicurrency_tx, $product->multicurrency_code, '', '', '');
+ $productsupplier->update_buyprice($product->qty, $product->subprice, $user, 'HT', $this->thirdparty, '', $ref_fourn, $product->tva_tx, 0, 0, 0, $product->info_bits, '', '', array(), '', $product->multicurrency_subprice, 'HT', $multicurrency_tx, $product->multicurrency_code, '', '', '');
}
return 1;
@@ -1886,7 +1886,7 @@ class SupplierProposal extends CommonObject
include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
$multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
$multicurrency->fetch(0, $product->multicurrency_code);
- if(! empty($multicurrency->id)) {
+ if (!empty($multicurrency->id)) {
$values[] = $multicurrency->id;
$values[] = "'".$product->multicurrency_code."'";
$values[] = $product->multicurrency_subprice;
@@ -1894,14 +1894,14 @@ class SupplierProposal extends CommonObject
$values[] = $multicurrency->rate->rate;
}
else {
- for($i = 0; $i < 5; $i++) $values[] = 'NULL';
+ for ($i = 0; $i < 5; $i++) $values[] = 'NULL';
}
}
}
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
$sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user';
- if(!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) $sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
+ if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) $sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
$sql .= ') VALUES ('.implode(',', $values).')';
$resql = $this->db->query($sql);
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 13a277542b4..43c9b91f563 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -32,14 +32,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("propal","facture","orders","sendings","companies"));
+$langs->loadLangs(array("propal", "facture", "orders", "sendings", "companies"));
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
// Security check
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal', '');
$object = new SupplierProposal($db);
@@ -143,49 +143,49 @@ if ($id > 0 || !empty($ref))
// Supplier order card
- $linkback = ''.$langs->trans("BackToList").'';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
+ $morehtmlref = ' ';
// Ref supplier
- $morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $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 ($permissiontoedit)
{
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 .= ' ';
+ $morehtmlref = ' ';
// Ref supplier
//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, '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->supplier_proposal->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 .= ' ';
+$morehtmlref = ' ';
// Ref supplier
//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, '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->supplier_proposal->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 .= ' ';
+ $morehtmlref = ' ';
// Ref supplier
//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, '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->supplier_proposal->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 .= ' |
| trans("SupplierProposal"); ?> |
@@ -60,7 +60,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
if (count($linkedObjectBlock) > 1)
{
?>
-
+
| trans("Total"); ?> |
|
|
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 941bf6bb0d3..c12526bbe85 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -25,7 +25,7 @@
*/
// Define DOL_DOCUMENT_ROOT
-if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..');
+if (!defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..');
require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
@@ -35,22 +35,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Avoid warnings with strict mode E_STRICT
$conf = new stdClass(); // instantiate $conf explicitely
$conf->global = new stdClass();
-$conf->file = new stdClass();
-$conf->db = new stdClass();
+$conf->file = new stdClass();
+$conf->db = new stdClass();
$conf->syslog = new stdClass();
// Force $_REQUEST["logtohtml"]
-$_REQUEST["logtohtml"]=1;
+$_REQUEST["logtohtml"] = 1;
// Correction PHP_SELF (ex pour apache via caudium) car PHP_SELF doit valoir URL relative
// et non path absolu.
if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])
{
- $_SERVER["PHP_SELF"]=$_SERVER["DOCUMENT_URI"];
+ $_SERVER["PHP_SELF"] = $_SERVER["DOCUMENT_URI"];
}
-$includeconferror='';
+$includeconferror = '';
// Define vars
$conffiletoshowshort = "conf.php";
@@ -58,7 +58,7 @@ $conffiletoshowshort = "conf.php";
$conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems
-if (! file_exists($conffile))
+if (!file_exists($conffile))
{
$conffile = "/etc/dolibarr/conf.php";
$conffiletoshow = "/etc/dolibarr/conf.php";
@@ -154,8 +154,8 @@ $langs = new Translate('..', $conf);
if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
else $langs->setDefaultLang('auto');
-$bc[false]=' class="bg1"';
-$bc[true]=' class="bg2"';
+$bc[false] = ' class="bg1"';
+$bc[true] = ' class="bg2"';
/**
@@ -175,10 +175,10 @@ function conf($dolibarr_main_document_root)
global $dolibarr_main_db_pass;
global $character_set_client;
- $return=include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
- if (! $return) return -1;
+ $return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
+ if (!$return) return -1;
- $conf=new Conf();
+ $conf = new Conf();
$conf->db->type = trim($dolibarr_main_db_type);
$conf->db->host = trim($dolibarr_main_db_host);
$conf->db->port = trim($dolibarr_main_db_port);
@@ -186,7 +186,7 @@ function conf($dolibarr_main_document_root)
$conf->db->user = trim($dolibarr_main_db_user);
$conf->db->pass = trim($dolibarr_main_db_pass);
- if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='utf8_unicode_ci';
+ if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation = 'utf8_unicode_ci';
return 1;
}
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index e4bbfdfa6a2..e6632d2b0e0 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -28,11 +28,11 @@
// This is a standalone feature with no information from Dolibarr to show
// and no database access to do.
include_once '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 ''
-if (! defined('DOL_URL_ROOT'))
- define('DOL_URL_ROOT', $pos); // URL racine relative
+$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 ''
+if (!defined('DOL_URL_ROOT'))
+ define('DOL_URL_ROOT', $pos); // URL racine relative
$langs->loadLangs(array("other", $langs->load("help")));
@@ -47,17 +47,17 @@ print $langs->trans("HelpCenterDesc2")."
\n";
print '
';
-$homeurl=DOL_URL_ROOT.'/';
-if (GETPOST('dol_hide_toptmenu')) $homeurl.=(strpos($homeurl, '?')===false?'?':'&').'dol_hide_toptmenu=1';
-if (GETPOST('dol_hide_leftmenu')) $homeurl.=(strpos($homeurl, '?')===false?'?':'&').'dol_hide_leftmenu=1';
-if (GETPOST('dol_no_mouse_hover')) $homeurl.=(strpos($homeurl, '?')===false?'?':'&').'dol_no_mouse_hover=1';
-if (GETPOST('dol_use_jmobile')) $homeurl.=(strpos($homeurl, '?')===false?'?':'&').'dol_use_jmobile=1';
+$homeurl = DOL_URL_ROOT.'/';
+if (GETPOST('dol_hide_toptmenu')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_toptmenu=1';
+if (GETPOST('dol_hide_leftmenu')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_leftmenu=1';
+if (GETPOST('dol_no_mouse_hover')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_no_mouse_hover=1';
+if (GETPOST('dol_use_jmobile')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_use_jmobile=1';
print $langs->trans("ToGoBackToDolibarr", $homeurl);
print '
';
-$style1='color: #333344; font-size: 16px; font-weight: bold';
-$style2='color: #5D4455; font-weight: bold;';
+$style1 = 'color: #333344; font-size: 16px; font-weight: bold';
+$style2 = 'color: #5D4455; font-weight: bold;';
print "\n";
print '';
@@ -84,17 +84,17 @@ print ' ';
print '';
print '';
-$urlwiki='https://wiki.dolibarr.org';
-if (preg_match('/fr/i', $langs->defaultlang)) $urlwiki='https://wiki.dolibarr.org/index.php/Accueil';
-if (preg_match('/es/i', $langs->defaultlang)) $urlwiki='https://wiki.dolibarr.org/index.php/Portada';
+$urlwiki = 'https://wiki.dolibarr.org';
+if (preg_match('/fr/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Accueil';
+if (preg_match('/es/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Portada';
print '
'.$langs->trans("ForDocumentationSeeWiki", $urlwiki, $urlwiki);
print '
';
-$urlforum='https://www.dolibarr.org/forum/';
-$urlforumlocal='https://www.dolibarr.org/forum/';
-if (preg_match('/fr/i', $langs->defaultlang)) $urlforumlocal='https://www.dolibarr.fr/forum/';
-if (preg_match('/es/i', $langs->defaultlang)) $urlforumlocal='https://www.dolibarr.es/foro/';
-if (preg_match('/it/i', $langs->defaultlang)) $urlforumlocal='http://www.dolibarr.it/forum/';
-if (preg_match('/gr/i', $langs->defaultlang)) $urlforumlocal='https://www.dolibarr.gr/forum/';
+$urlforum = 'https://www.dolibarr.org/forum/';
+$urlforumlocal = 'https://www.dolibarr.org/forum/';
+if (preg_match('/fr/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.fr/forum/';
+if (preg_match('/es/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.es/foro/';
+if (preg_match('/it/i', $langs->defaultlang)) $urlforumlocal = 'http://www.dolibarr.it/forum/';
+if (preg_match('/gr/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.gr/forum/';
print '
'.$langs->trans("ForAnswersSeeForum", $urlforumlocal, $urlforumlocal).'
';
if ($urlforumlocal != $urlforum) print ''.$urlforum.'';
print ' | ';
@@ -121,7 +121,7 @@ print ' | ';
print ' | ';
print ' ';
-$urlwiki='https://partners.dolibarr.org';
+$urlwiki = 'https://partners.dolibarr.org';
print '';
print '';
print '| ';
@@ -155,7 +155,7 @@ print ' | ';
print ' | ';
print ' ';
-$urlwiki='https://partners.dolibarr.org';
+$urlwiki = 'https://partners.dolibarr.org';
print '';
print '';
print '';
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index 94a4ee8a85e..566f18ac1a4 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -26,7 +26,7 @@
* \brief Home page of category area
*/
-require '../../main.inc.php'; // Load $user and permissions
+require '../../main.inc.php'; // Load $user and permissions
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -34,32 +34,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
$langs->loadLangs(array("main"), "categories", "takepos", "printing");
-if (! $user->rights->categorie->lire) accessforbidden();
+if (!$user->rights->categorie->lire) accessforbidden();
-$id=GETPOST('id', 'int');
-$type=(GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
-$catname=GETPOST('catname', 'alpha');
-$action=GETPOST('action', 'alpha');
-$printer1=GETPOST('printer1', 'alpha');
-$printer2=GETPOST('printer2', 'alpha');
+$id = GETPOST('id', 'int');
+$type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
+$catname = GETPOST('catname', 'alpha');
+$action = GETPOST('action', 'alpha');
+$printer1 = GETPOST('printer1', 'alpha');
+$printer2 = GETPOST('printer2', 'alpha');
-if (is_numeric($type)) $type=Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
/*
* Actions
*/
-if ($action=="SavePrinter1"){
- $printedcategories=";";
- if (is_array($printer1)) foreach ($printer1 as $cat){
- $printedcategories=$printedcategories.$cat.";";
+if ($action == "SavePrinter1") {
+ $printedcategories = ";";
+ if (is_array($printer1)) foreach ($printer1 as $cat) {
+ $printedcategories = $printedcategories.$cat.";";
}
dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_1", $printedcategories, 'chaine', 0, '', $conf->entity);
}
-if ($action=="SavePrinter2"){
- $printedcategories=";";
- if (is_array($printer2)) foreach ($printer2 as $cat){
- $printedcategories=$printedcategories.$cat.";";
+if ($action == "SavePrinter2") {
+ $printedcategories = ";";
+ if (is_array($printer2)) foreach ($printer2 as $cat) {
+ $printedcategories = $printedcategories.$cat.";";
}
dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories, 'chaine', 0, '', $conf->entity);
}
@@ -72,18 +72,18 @@ if ($action=="SavePrinter2"){
$categstatic = new Categorie($db);
$form = new Form($db);
-if ($type == Categorie::TYPE_PRODUCT) { $title=$langs->trans("ProductsCategoriesArea"); $typetext='product'; }
-elseif ($type == Categorie::TYPE_SUPPLIER) { $title=$langs->trans("SuppliersCategoriesArea"); $typetext='supplier'; }
-elseif ($type == Categorie::TYPE_CUSTOMER) { $title=$langs->trans("CustomersCategoriesArea"); $typetext='customer'; }
-elseif ($type == Categorie::TYPE_MEMBER) { $title=$langs->trans("MembersCategoriesArea"); $typetext='member'; }
-elseif ($type == Categorie::TYPE_CONTACT) { $title=$langs->trans("ContactsCategoriesArea"); $typetext='contact'; }
-elseif ($type == Categorie::TYPE_ACCOUNT) { $title=$langs->trans("AccountsCategoriesArea"); $typetext='bank_account'; }
-elseif ($type == Categorie::TYPE_PROJECT) { $title=$langs->trans("ProjectsCategoriesArea"); $typetext='project'; }
-elseif ($type == Categorie::TYPE_USER) { $title=$langs->trans("UsersCategoriesArea"); $typetext='user'; }
-else { $title=$langs->trans("CategoriesArea"); $typetext='unknown'; }
+if ($type == Categorie::TYPE_PRODUCT) { $title = $langs->trans("ProductsCategoriesArea"); $typetext = 'product'; }
+elseif ($type == Categorie::TYPE_SUPPLIER) { $title = $langs->trans("SuppliersCategoriesArea"); $typetext = 'supplier'; }
+elseif ($type == Categorie::TYPE_CUSTOMER) { $title = $langs->trans("CustomersCategoriesArea"); $typetext = 'customer'; }
+elseif ($type == Categorie::TYPE_MEMBER) { $title = $langs->trans("MembersCategoriesArea"); $typetext = 'member'; }
+elseif ($type == Categorie::TYPE_CONTACT) { $title = $langs->trans("ContactsCategoriesArea"); $typetext = 'contact'; }
+elseif ($type == Categorie::TYPE_ACCOUNT) { $title = $langs->trans("AccountsCategoriesArea"); $typetext = 'bank_account'; }
+elseif ($type == Categorie::TYPE_PROJECT) { $title = $langs->trans("ProjectsCategoriesArea"); $typetext = 'project'; }
+elseif ($type == Categorie::TYPE_USER) { $title = $langs->trans("UsersCategoriesArea"); $typetext = 'user'; }
+else { $title = $langs->trans("CategoriesArea"); $typetext = 'unknown'; }
-$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
-$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
+$arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
+$arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
llxHeader('', $title, '', '', 0, 0, $arrayofjs, $arrayofcss);
@@ -109,19 +109,19 @@ print '';
$cate_arbo = $categstatic->get_full_arbo($typetext);
// Define fulltree array
-$fulltree=$cate_arbo;
+$fulltree = $cate_arbo;
// Define data (format for treeview)
-$data=array();
-$data[] = array('rowid'=>0,'fk_menu'=>-1,'title'=>"racine",'mainmenu'=>'','leftmenu'=>'','fk_mainmenu'=>'','fk_leftmenu'=>'');
-foreach($fulltree as $key => $val)
+$data = array();
+$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+foreach ($fulltree as $key => $val)
{
- $categstatic->id=$val['id'];
- $categstatic->ref=$val['label'];
- $categstatic->color=$val['color'];
- $categstatic->type=$type;
- $li=$categstatic->getNomUrl(1, '', 60);
- $desc=dol_htmlcleanlastbr($val['description']);
+ $categstatic->id = $val['id'];
+ $categstatic->ref = $val['label'];
+ $categstatic->color = $val['color'];
+ $categstatic->type = $type;
+ $li = $categstatic->getNomUrl(1, '', 60);
+ $desc = dol_htmlcleanlastbr($val['description']);
$data[] = array(
'rowid'=>$val['rowid'],
@@ -135,15 +135,15 @@ foreach($fulltree as $key => $val)
print ' ';
print '| '.$langs->trans("Printer").' 1 | | ';
print ' | ';
-$nbofentries=(count($data) - 1);
+$nbofentries = (count($data) - 1);
print '
';
print '';
print '| '.$langs->trans("Printer").' 2 | | ';
print ' | ';
-$nbofentries=(count($data) - 1);
+$nbofentries = (count($data) - 1);
print ' | | |