diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php index a68a4bda5a6..f724bd9e50c 100644 --- a/htdocs/admin/salaries.php +++ b/htdocs/admin/salaries.php @@ -129,4 +129,4 @@ print ''; // End of page llxFooter(); -$db->close();; +$db->close(); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 937160f7bb6..be8bddedfa4 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -11,7 +11,7 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2016-2018 Ferran Marcet - * Copyright (C) 2017 Charlene Benke + * Copyright (C) 2017-2018 Charlene Benke * Copyright (C) 2018 Nicolas ZABOURI * * This program is free software; you can redistribute it and/or modify @@ -175,9 +175,6 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab } } -$object = new Propal($db); // To be passed as parameter of executeHooks that need - - /* * Actions */ diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php index e49f42bb14f..9f5d13f98a3 100644 --- a/htdocs/compta/localtax/quadri_detail.php +++ b/htdocs/compta/localtax/quadri_detail.php @@ -589,7 +589,7 @@ else // Localtax print ''; - $temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;; + $temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice; print price(price2num($temp_vat,'MT'),1); //print price($fields['vat']); print ''; diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 76ab712bffd..2e48802a554 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -63,7 +63,7 @@ $hookmanager->initHooks(array('salarycard','globalcard')); if ($cancel) { - header("Location: index.php"); + header("Location: list.php"); exit; } @@ -139,7 +139,7 @@ if ($action == 'add' && empty($cancel)) if ($ret > 0) { $db->commit(); - header("Location: index.php"); + header("Location: list.php"); exit; } else diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php index 6b6d4b7a176..bae5001b256 100644 --- a/htdocs/core/actions_extrafields.inc.php +++ b/htdocs/core/actions_extrafields.inc.php @@ -29,7 +29,7 @@ $mesg=array(); $extrasize=GETPOST('size','int'); $type=GETPOST('type','alpha'); -$param=GETPOST('param','alpha');; +$param=GETPOST('param','alpha'); if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8'; if ($type=='date') $extrasize=''; diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 1ab3dc0180c..76aa73e960e 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -796,7 +796,7 @@ class doc_generic_project_odt extends ModelePDFProjects if (!empty($row['thm'])) { $row['amountht']=($row['task_duration'] / 3600) * $row['thm']; $defaultvat = get_default_tva($mysoc, $mysoc); - $row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');; + $row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT'); } else { $row['amountht']=0; $row['amountttc']=0; diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php index 222538a8554..3ea7e184e35 100644 --- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php @@ -150,7 +150,7 @@ class pdf_stdmovement extends ModelePDFMovement // Define position of columns $this->wref = 15; $this->posxidref = $this->marge_gauche; - $this->posxdatemouv = $this->marge_gauche+8;; + $this->posxdatemouv = $this->marge_gauche+8; $this->posxdesc=37; $this->posxlabel=50; $this->posxtva=80; diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php index 1d42a15134c..620795870a0 100644 --- a/htdocs/emailcollector/class/emailcollectoraction.class.php +++ b/htdocs/emailcollector/class/emailcollectoraction.class.php @@ -83,7 +83,7 @@ class EmailCollectorAction extends CommonObject */ public $fields=array( 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",), - 'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollecotr.rowid'), + 'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'), 'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1), 'actionparam' => array('type'=>'varchar(255)', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1), 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,), diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 7c05eda422e..32643b77811 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -315,7 +315,6 @@ class Fichinter extends CommonObject */ function update($user, $notrigger=0) { - global $conf; if (! is_numeric($this->duration)) { $this->duration = 0; } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index b6ff1d36551..4f40b0cae36 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -904,7 +904,7 @@ if (empty($reshook)) // FIXME Missing special_code into addline and updateline methods $object->special_code = $lines[$i]->special_code; - + // FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example. $result = $object->addline( $desc, @@ -2717,7 +2717,7 @@ else $paymentstatic->id=$objp->rowid; $paymentstatic->datepaye=$db->jdate($objp->dp); - $paymentstatic->ref=($objp->ref ? $objp->ref : $objp->rowid);; + $paymentstatic->ref=($objp->ref ? $objp->ref : $objp->rowid); $paymentstatic->num_paiement=$objp->num_paiement; $paymentstatic->payment_code=$objp->payment_code; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 7f3f3d99ebf..852bf2a4e8d 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -868,7 +868,7 @@ if (! $variants) { print ''; if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price * $obj->reel, 'MT'), 1) . ''; else print $langs->trans("Variable"); - print '';; + print ''; $total += $obj->reel; if (price2num($object->pmp)) $totalwithpmp += $obj->reel; $totalvalue = $totalvalue + ($object->pmp * $obj->reel); diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index e291bf84f67..23a0152c19c 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -544,7 +544,7 @@ print ''.$langs->trans("Note").''; print ''; print "\n"; -$colspan = 6+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);; +$colspan = 6+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2); if ($conf->use_javascript_ajax) { diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index 5811e89aacc..6495811ab9d 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -642,7 +642,7 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref)); // End of page llxFooter(); - $db->close();; + $db->close(); exit; } diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index 1222689358f..0c125ae3b4c 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -57,7 +57,7 @@ else $vatNumber = preg_replace('/\^\w/', '', $vatNumber); $countryCode=substr($vatNumber,0,2); $vatNumber=substr($vatNumber,2); - + print ''.$langs->trans("Country").': '.$countryCode.'
'; print ''.$langs->trans("VATIntraShort").': '.$vatNumber.'
'; print '
'; @@ -176,4 +176,4 @@ if ($messagetoshow) // End of page llxFooter(); -$db->close();; +$db->close(); diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php index 3ecb02a6300..69dc4e33307 100644 --- a/htdocs/stripe/class/actions_stripe.class.php +++ b/htdocs/stripe/class/actions_stripe.class.php @@ -25,7 +25,7 @@ * \ingroup stripe * \brief File Class actionsstripeconnect */ -require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';; +require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php'; $langs->load("stripe@stripe"); @@ -44,8 +44,8 @@ class ActionsStripeconnect private $config=array(); // For Hookmanager return - var $resprints; - var $results=array(); + public $resprints; + public $results=array(); /** diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index c71f7f861a3..f7f79b03414 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -237,7 +237,7 @@ function Print(id){ function TakeposPrinting(id){ var receipt; $.get("receipt.php?facid="+id, function(data, status){ - receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');; + receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, ''); $.ajax({ type: "POST", url: 'http://global->TAKEPOS_PRINT_SERVER;?>:8111/print', diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 8a11f80b489..3422135628c 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -4705,7 +4705,7 @@ a span.select2-chosen /* Special case for the select2 add widget */ #addbox .select2-container .select2-choice > .select2-chosen, #actionbookmark .select2-container .select2-choice > .select2-chosen { - text-align: ;; + text-align: ; opacity: 0.3; } .select2-container--default .select2-selection--single .select2-selection__placeholder { diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index f51fb404579..6c0ff6e4915 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2283,7 +2283,7 @@ class User extends CommonObject $label.= '
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')'; $label.= '
'.$langs->trans("Layout").': '.$conf->browser->layout; $label.= '
'.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight']; - if ($conf->browser->layout == 'phone') $label.= '
'.$langs->trans("Phone").': '.$langs->trans("Yes");; + if ($conf->browser->layout == 'phone') $label.= '
'.$langs->trans("Phone").': '.$langs->trans("Yes"); if (! empty($_SESSION["disablemodules"])) $label.= '
'.$langs->trans("DisabledModules").':
'.join(', ',explode(',',$_SESSION["disablemodules"])); } if ($infologin < 0) $label=''; diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php index 1f04e5edb87..374341c51f6 100644 --- a/htdocs/variants/card.php +++ b/htdocs/variants/card.php @@ -300,4 +300,4 @@ if ($action == 'edit') { ?> // End of page llxFooter(); -$db->close();; +$db->close();