From 0e343ae3b2920ccd01353f2216d4d81ac0d66470 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 8 Oct 2015 09:34:02 +0200
Subject: [PATCH] syntax error
---
htdocs/adherents/admin/public.php | 4 ++--
htdocs/adherents/card.php | 2 +-
htdocs/admin/dict.php | 2 +-
htdocs/cashdesk/admin/cashdesk.php | 2 +-
htdocs/categories/class/categorie.class.php | 2 +-
htdocs/compta/bank/releve.php | 2 +-
htdocs/compta/stats/index.php | 2 +-
htdocs/core/lib/memory.lib.php | 2 +-
htdocs/core/lib/project.lib.php | 10 +++++-----
htdocs/core/lib/tax.lib.php | 2 +-
htdocs/core/modules/import/import_csv.modules.php | 2 +-
.../project/task/doc/doc_generic_task_odt.modules.php | 2 +-
htdocs/livraison/card.php | 2 +-
htdocs/opensurvey/card.php | 2 +-
htdocs/product/composition/card.php | 4 ++--
htdocs/product/stock/valo.php | 2 +-
htdocs/projet/note.php | 2 +-
htdocs/societe/canvas/company/tpl/card_view.tpl.php | 2 +-
htdocs/societe/canvas/individual/tpl/card_view.tpl.php | 2 +-
htdocs/webservices/demo_wsclient_actioncomm.php-NORUN | 4 ++--
htdocs/webservices/demo_wsclient_category.php-NORUN | 4 ++--
htdocs/webservices/demo_wsclient_invoice.php-NORUN | 4 ++--
htdocs/webservices/demo_wsclient_other.php-NORUN | 4 ++--
.../demo_wsclient_productorservice.php-NORUN | 4 ++--
htdocs/webservices/demo_wsclient_thirdparty.php-NORUN | 4 ++--
.../email_expire_services_to_representatives.php | 2 +-
.../email_unpaid_invoices_to_representatives.php | 2 +-
27 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 088f96b00c1..e8381584355 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -164,7 +164,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr '.$bc[$var].' id="tramount"><td>';
print $langs->trans("DefaultAmount");
print '</td><td align="right">';
-print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(! empty($conf->global->MEMBER_NEWFORM_AMOUNT)?$conf->global->MEMBER_NEWFORM_AMOUNT:'').'">';;
+print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(! empty($conf->global->MEMBER_NEWFORM_AMOUNT)?$conf->global->MEMBER_NEWFORM_AMOUNT:'').'">';
print "</td></tr>\n";
// Can edit
@@ -197,7 +197,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
print '<tr '.$bc[$var].' id="tremail"><td>';
print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL");
print '</td><td align="right">';
- print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';;
+ print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';
print "</td></tr>\n";
}
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 94f12a61f8b..a2fe0763e97 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -249,7 +249,7 @@ if (empty($reshook))
}
$lastname=$_POST["lastname"];
$firstname=$_POST["firstname"];
- $morphy=$morphy=$_POST["morphy"];;
+ $morphy=$morphy=$_POST["morphy"];
if ($morphy != 'mor' && empty($lastname)) {
$error++;
$langs->load("errors");
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 580770e7ba2..ae8ce969f70 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -913,7 +913,7 @@ if ($id)
print "</tr>";
$colspan=count($fieldlist)+2;
- if ($id == 4) $colspan++;;
+ if ($id == 4) $colspan++;
if (! empty($alabelisused)) // Si un des champs est un libelle
{
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 7571befb121..15f15cedc10 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -164,7 +164,7 @@ if (! empty($conf->service->enabled))
$var=! $var;
print '<tr '.$bc[$var].'><td>';
print $langs->trans("CashdeskShowServices");
- print '<td colspan="2">';;
+ print '<td colspan="2">';
print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1);
print "</td></tr>\n";
}
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b9876bb8382..7814b198a02 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1164,7 +1164,7 @@ class Categorie extends CommonObject
{
$cats = array();
- $typeid=-1; $table='';;
+ $typeid=-1; $table='';
if ($type == '0' || $type == 'product') { $typeid=0; $table='product'; $type='product'; }
else if ($type == '1' || $type == 'supplier') { $typeid=1; $table='societe'; $type='fournisseur'; }
else if ($type == '2' || $type == 'customer') { $typeid=2; $table='societe'; $type='societe'; }
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index e4afe6f2b25..c5ca2ef3835 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -343,7 +343,7 @@ else
elseif ($links[$key]['type']=='payment_supplier')
{
$paymentsupplierstatic->id=$links[$key]['url_id'];
- $paymentsupplierstatic->ref=$langs->trans("Payment");;
+ $paymentsupplierstatic->ref=$langs->trans("Payment");
print ' '.$paymentsupplierstatic->getNomUrl(1);
$newline=0;
}
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index cfd816c29b6..8dfb0d76fc0 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -298,7 +298,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
if ($annee_decalage != $year_end) print '<td width="15"> </td>';
}
- $total_ht[$annee]+=!empty($cum_ht[$case]) ? $cum_ht[$case] : 0;;
+ $total_ht[$annee]+=!empty($cum_ht[$case]) ? $cum_ht[$case] : 0;
$total[$annee]+=$cum[$case];
}
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index a6fae1c7b1f..b68016c3a46 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -231,7 +231,7 @@ function dol_getshmop($memoryid)
global $shmkeys,$shmoffset;
if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
- $shmkey=dol_getshmopaddress($memoryid);;
+ $shmkey=dol_getshmopaddress($memoryid);
//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
$handle=@shmop_open($shmkey,'a',0,0);
if ($handle)
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index f3e77916c4b..6b636e99462 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -121,17 +121,17 @@ function task_prepare_head($object)
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');;
+ $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'task_task';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');;
+ $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
$head[$h][1] = $langs->trans("TaskRessourceLinks");
$head[$h][2] = 'task_contact';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');;
+ $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
$head[$h][1] = $langs->trans("TimeSpent");
$head[$h][2] = 'task_time';
$h++;
@@ -147,14 +147,14 @@ function task_prepare_head($object)
$nbNote = 0;
if(!empty($object->note_private)) $nbNote++;
if(!empty($object->note_public)) $nbNote++;
- $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');;
+ $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
$head[$h][1] = $langs->trans('Notes');
if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
$head[$h][2] = 'task_notes';
$h++;
}
- $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');;
+ $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$listoffiles=dol_dir_list($filesdir,'files',1,'','thumbs');
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 011f3d26de0..de705111b9d 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -494,7 +494,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
$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)";
else $sql.= " AND f.type IN (0,1,2,3)";
- $sql.= " AND f.rowid = d.".$fk_facture;;
+ $sql.= " AND f.rowid = d.".$fk_facture;
$sql.= " AND pf.".$fk_facture2." = f.rowid";
$sql.= " AND pa.rowid = pf.".$fk_payment;
if ($y && $m)
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index cd3a35e4060..989418794bc 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -376,7 +376,7 @@ class ImportCsv extends ModeleImports
if ($obj) $tablewithentity_cache[$tablename]=1; // table contains entity field
else $tablewithentity_cache[$tablename]=0; // table does not contains entity field
}
- else dol_print_error($this->db);;
+ else dol_print_error($this->db);
}
else
{
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index c074cba31e5..18f0c2fed88 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -416,7 +416,7 @@ class doc_generic_task_odt extends ModelePDFTask
$project= new Project($this->db);
$project->fetch($object->fk_project);
- $dir = $conf->projet->dir_output. "/" . $project->ref. "/";;
+ $dir = $conf->projet->dir_output. "/" . $project->ref. "/";
$objectref = dol_sanitizeFileName($object->ref);
if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
$file = $dir . "/" . $objectref . ".odt";
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 1a89a377fef..cf30a7dfcac 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -383,7 +383,7 @@ if ($action == 'create')
*/
print '<td align="center">';
$quantite_livree = $commande->livraisons[$line->id];
- print $quantite_livree;;
+ print $quantite_livree;
print '</td>';
$quantite_commandee = $line->qty;
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 70e1b49ad48..7096c3947b2 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -367,7 +367,7 @@ if ($comments) {
}
else
{
- print $langs->trans("NoCommentYet").'<br>';;
+ print $langs->trans("NoCommentYet").'<br>';
}
print '<br>';
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index ec616b2f222..89760dc66ba 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -252,7 +252,7 @@ if ($id > 0 || ! empty($ref))
$productstatic->type=$value["fk_product_type"];
$productstatic->ref=$value['label'];
print '<tr>';
- print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';;
+ print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';
print '</tr>';
}
print '</table>';
@@ -401,7 +401,7 @@ if ($id > 0 || ! empty($ref))
$productstatic->type=$value["fk_product_type"];
$productstatic->ref=$value['label'];
print '<tr>';
- print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';;
+ print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';
print '</tr>';
}
print '</table>';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 7c73da3794c..59b4f895b73 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -31,7 +31,7 @@ $langs->load("stocks");
// Security check
$result=restrictedArea($user,'stock');
-$sref=GETPOST("sref");;
+$sref=GETPOST("sref");
$snom=GETPOST("snom");
$sall=GETPOST("sall");
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index b581ca01be9..0091ffcc23b 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref))
$colwidth=30;
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
- dol_fiche_end();;
+ dol_fiche_end();
}
llxFooter();
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 4ea5afcbdcb..26c1e77742f 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -107,7 +107,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
<tr>
<td><?php echo $langs->trans('EMail'); ?></td>
- <td><?php echo $this->control->tpl['email'];; ?></td>
+ <td><?php echo $this->control->tpl['email']; ?></td>
<td><?php echo $langs->trans('Web'); ?></td>
<td><?php echo $this->control->tpl['url']; ?></td>
</tr>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index d2fc7e5551b..bc83f2955da 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -106,7 +106,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
<tr>
<td><?php echo $langs->trans('EMail'); ?></td>
- <td><?php echo $this->control->tpl['email'];; ?></td>
+ <td><?php echo $this->control->tpl['email']; ?></td>
<td><?php echo $langs->trans('Web'); ?></td>
<td><?php echo $this->control->tpl['url']; ?></td>
</tr>
diff --git a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
index 1e14c07a5bf..d3044fc9bd8 100755
--- a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
@@ -160,6 +160,6 @@ echo '</pre>';
echo '<h4>SOAP Message</h4>';
echo '<pre>' . htmlspecialchars($soapclient->response, ENT_QUOTES) . '</pre>';
-echo '</body>'."\n";;
-echo '</html>'."\n";;
+echo '</body>'."\n";
+echo '</html>'."\n";
?>
diff --git a/htdocs/webservices/demo_wsclient_category.php-NORUN b/htdocs/webservices/demo_wsclient_category.php-NORUN
index 0793fd1806c..e0d78681eac 100755
--- a/htdocs/webservices/demo_wsclient_category.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_category.php-NORUN
@@ -92,6 +92,6 @@ echo '<h4>SOAP Message</h4>';
echo '<pre>' . htmlspecialchars($soapclient->response, ENT_QUOTES) . '</pre>';
-echo '</body>'."\n";;
-echo '</html>'."\n";;
+echo '</body>'."\n";
+echo '</html>'."\n";
?>
diff --git a/htdocs/webservices/demo_wsclient_invoice.php-NORUN b/htdocs/webservices/demo_wsclient_invoice.php-NORUN
index ad6612692fc..8708e89e13f 100755
--- a/htdocs/webservices/demo_wsclient_invoice.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_invoice.php-NORUN
@@ -136,6 +136,6 @@ echo '</pre>';
echo '<h4>SOAP Message</h4>';
echo '<pre>' . htmlspecialchars($soapclient2->response, ENT_QUOTES) . '</pre>';
-echo '</body>'."\n";;
-echo '</html>'."\n";;
+echo '</body>'."\n";
+echo '</html>'."\n";
?>
diff --git a/htdocs/webservices/demo_wsclient_other.php-NORUN b/htdocs/webservices/demo_wsclient_other.php-NORUN
index 60c801e10fc..0de1ac6b71a 100755
--- a/htdocs/webservices/demo_wsclient_other.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_other.php-NORUN
@@ -99,6 +99,6 @@ echo '</pre>';
echo '<h4>SOAP Message</h4>';
echo '<pre>' . htmlspecialchars($soapclient->response, ENT_QUOTES) . '</pre>';
-echo '</body>'."\n";;
-echo '</html>'."\n";;
+echo '</body>'."\n";
+echo '</html>'."\n";
?>
diff --git a/htdocs/webservices/demo_wsclient_productorservice.php-NORUN b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN
index e27db313bfc..e684a39b1e7 100755
--- a/htdocs/webservices/demo_wsclient_productorservice.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN
@@ -177,6 +177,6 @@ echo '</pre>';
echo '<h4>SOAP Message</h4>';
echo '<pre>' . htmlspecialchars($soapclient3->response, ENT_QUOTES) . '</pre>';
-echo '</body>'."\n";;
-echo '</html>'."\n";;
+echo '</body>'."\n";
+echo '</html>'."\n";
?>
diff --git a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
index 3260549b712..45f3d89939f 100755
--- a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
@@ -223,6 +223,6 @@ echo '</pre>';
echo '<h4>SOAP Message</h4>';
echo '<pre>' . htmlspecialchars($soapclient->response, ENT_QUOTES) . '</pre>';
-echo '</body>'."\n";;
-echo '</html>'."\n";;
+echo '</body>'."\n";
+echo '</html>'."\n";
?>
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index ae51af38009..44ccb4c7e97 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -116,7 +116,7 @@ if ($resql)
$oldemail = $obj->email;
$olduid = $obj->uid;
$oldlang = $obj->lang;
- $oldsalerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);;
+ $oldsalerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);
$message = '';
$total = 0;
$foundtoprocess = 0;
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 2960e2eb685..2870766ff21 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -120,7 +120,7 @@ if ($resql)
$oldemail = $obj->email;
$olduid = $obj->uid;
$oldlang = $obj->lang;
- $oldsalerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);;
+ $oldsalerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);
$message = '';
$total = 0;
$foundtoprocess = 0;
--
GitLab