From d97f1937f8f8348338a5e6c65967822060d73402 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 29 Nov 2012 10:25:33 +0100
Subject: [PATCH] Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE
!!!!
---
htdocs/adherents/stats/byproperties.php | 12 ++++++------
htdocs/admin/dict.php | 12 ++++++------
htdocs/comm/action/class/actioncomm.class.php | 6 +++---
htdocs/comm/action/fiche.php | 2 +-
.../prelevement/class/bonprelevement.class.php | 16 ++++++++--------
htdocs/compta/prelevement/fiche.php | 16 ++++++++--------
htdocs/compta/prelevement/index.php | 4 ++--
htdocs/core/class/hookmanager.class.php | 2 +-
htdocs/core/class/html.form.class.php | 2 +-
htdocs/core/class/html.formactions.class.php | 8 ++++----
.../modules/facture/doc/pdf_crabe.modules.php | 2 +-
htdocs/exports/class/export.class.php | 2 +-
htdocs/exports/export.php | 2 +-
htdocs/fourn/commande/fiche.php | 12 ++++++------
htdocs/fourn/facture/fiche.php | 12 ++++++------
htdocs/holiday/fiche.php | 16 ++++++++--------
htdocs/holiday/index.php | 2 +-
htdocs/install/etape1.php | 4 ++--
htdocs/install/fileconf.php | 2 +-
19 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 302992a707b..dcc25501d84 100755
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -22,8 +22,8 @@
*/
require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
$graphwidth = 700;
$mapratio = 0.5;
@@ -83,8 +83,8 @@ if ($resql)
{
$obj=$db->fetch_object($resql);
- if ($obj->code == 'phy') $foundphy++;
- if ($obj->code == 'mor') $foundmor++;
+ if ($obj->code == 'phy') $foundphy++;
+ if ($obj->code == 'mor') $foundmor++;
$data[]=array('label'=>$obj->code, 'nb'=>$obj->nb, 'lastdate'=>$db->jdate($obj->lastdate));
@@ -122,8 +122,8 @@ print '<td align="center">'.$langs->trans("NbOfMembers").'</td>';
print '<td align="center">'.$langs->trans("LastMemberDate").'</td>';
print '</tr>';
-if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
-if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>'');
+if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
+if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>'');
$oldyear=0;
$var=true;
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ea9c5ca8183..e18420285c0 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1066,12 +1066,12 @@ if ($id)
}
}
- // Est-ce une entree du dictionnaire qui peut etre desactivee ?
- $iserasable=1; // Oui par defaut
- if (isset($obj->code) && ($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable=0;
- if (isset($obj->code) && $obj->code == 'RECEP') $iserasable=0;
- if (isset($obj->code) && $obj->code == 'EF0') $iserasable=0;
- if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) $iserasable=0;
+ // Est-ce une entree du dictionnaire qui peut etre desactivee ?
+ $iserasable=1; // Oui par defaut
+ if (isset($obj->code) && ($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable=0;
+ if (isset($obj->code) && $obj->code == 'RECEP') $iserasable=0;
+ if (isset($obj->code) && $obj->code == 'EF0') $iserasable=0;
+ if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) $iserasable=0;
// Active
print '<td align="center" nowrap="nowrap">';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index fd1a1e657a6..a79650fa893 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -723,7 +723,7 @@ class ActionComm extends CommonObject
{
$libelle=$label;
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->trans("Action".$this->type_code);
- $libelleshort=dol_trunc($label, $maxlength);
+ $libelleshort=dol_trunc($label, $maxlength);
}
else
{
@@ -733,8 +733,8 @@ class ActionComm extends CommonObject
if ($withpicto)
{
- if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
- {
+ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+ {
$libelle.=(($this->type_code && $libelle!=$langs->trans("Action".$this->type_code) && $langs->trans("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->trans("Action".$this->type_code).')':'');
}
$result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle,($overwritepicto?$overwritepicto:'action')).$lienfin;
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index ee9ad394f05..5b5ebee90ee 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -111,7 +111,7 @@ if ($action == 'add_action')
{
$error++;
$action = 'create';
- $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'</div>';
+ $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'</div>';
}
// Initialisation objet cactioncomm
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 630a8926b84..25153612f56 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1042,12 +1042,12 @@ class BonPrelevement extends CommonObject
}
- /**
- * Get object and lines from database
- *
- * @return int >0 if OK, <0 if KO
- */
- function delete()
+ /**
+ * Get object and lines from database
+ *
+ * @return int >0 if OK, <0 if KO
+ */
+ function delete()
{
$this->db->begin();
@@ -1057,7 +1057,7 @@ class BonPrelevement extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = '".$this->id."'";
$resql2=$this->db->query($sql);
- if (! $resql2) dol_print_error($this->db);
+ if (! $resql2) dol_print_error($this->db);
$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = '".$this->id."'";
$resql3=$this->db->query($sql);
@@ -1078,7 +1078,7 @@ class BonPrelevement extends CommonObject
return -1;
}
}
-
+
/**
* Returns clickable name (with picto)
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index af2b1bbf495..73450228480 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -54,8 +54,8 @@ if ( $action == 'confirm_delete' )
$res=$bon->delete();
if ($res > 0)
{
- header("Location: index.php");
- exit;
+ header("Location: index.php");
+ exit;
}
}
@@ -100,11 +100,11 @@ if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
$error = $bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
- if ($error)
- {
- header("Location: fiche.php?id=".$id."&error=$error");
+ if ($error)
+ {
+ header("Location: fiche.php?id=".$id."&error=$error");
exit;
- }
+ }
}
if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
@@ -244,7 +244,7 @@ if ($id > 0)
if (empty($bon->date_trans) && $user->rights->prelevement->bons->send)
{
- print "<a class=\"butAction\" href=\"fiche.php?action=settransmitted&id=".$bon->id."\">".$langs->trans("SetToStatusSent")."</a>";
+ print "<a class=\"butAction\" href=\"fiche.php?action=settransmitted&id=".$bon->id."\">".$langs->trans("SetToStatusSent")."</a>";
}
if (! empty($bon->date_trans) && $bon->date_credit == 0)
@@ -252,7 +252,7 @@ if ($id > 0)
print "<a class=\"butAction\" href=\"fiche.php?action=setcredited&id=".$bon->id."\">".$langs->trans("ClassCredited")."</a>";
}
- print "<a class=\"butActionDelete\" href=\"fiche.php?action=confirm_delete&id=".$bon->id."\">".$langs->trans("Delete")."</a>";
+ print "<a class=\"butActionDelete\" href=\"fiche.php?action=confirm_delete&id=".$bon->id."\">".$langs->trans("Delete")."</a>";
print "</div>";
}
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 62664038b7e..2f2dd82fcb7 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -127,8 +127,8 @@ if ($result)
print $bprev->getNomUrl(1);
print "</td>\n";
print '<td>'.dol_print_date($db->jdate($obj->datec),"dayhour")."</td>\n";
- print '<td align="right">'.price($obj->amount)."</td>\n";
- print '<td align="right">'.$bprev->getLibStatut(3)."</td>\n";
+ print '<td align="right">'.price($obj->amount)."</td>\n";
+ print '<td align="right">'.$bprev->getLibStatut(3)."</td>\n";
print "</tr>\n";
$i++;
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index cf3c7b8ba96..671334982e9 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -170,7 +170,7 @@ class HookManager
if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
// TODO. remove this. array result must be set into $actionclassinstance->results
- if (is_array($result)) $this->resArray = array_merge($this->resArray, $result);
+ if (is_array($result)) $this->resArray = array_merge($this->resArray, $result);
// TODO. remove this. result must not be a string. we must use $actionclassinstance->resprint to return a string
if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result;
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 945a65fb820..f031750cb5b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2238,7 +2238,7 @@ class Form
$inputko=array();
// Clean parameters
- $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
+ $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
if (is_array($formquestion) && ! empty($formquestion))
{
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 07780c1c068..5916159bd6e 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -172,7 +172,7 @@ class FormActions
print '</tr>';
print "\n";
- $userstatic = new User($this->db);
+ $userstatic = new User($this->db);
foreach($listofactions as $action)
{
@@ -219,9 +219,9 @@ class FormActions
$form=new Form($this->db);
// Suggest a list with manual event or all auto events
- $arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
- array_unshift($arraylist,' '); // Add empty line at start
- //asort($arraylist);
+ $arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+ array_unshift($arraylist,' '); // Add empty line at start
+ //asort($arraylist);
print $form->selectarray($htmlname, $arraylist, $selected);
if ($user->admin && empty($onlyautoornot)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index d8b1fb11f9e..13ec3392364 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -184,7 +184,7 @@ class pdf_crabe extends ModelePDFFactures
$nblignes = count($object->lines);
$pdf=pdf_getInstance($this->format);
- $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+ $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
$heightforinfotot = 50; // Height reserved to output the info and total part
$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5); // Height reserved to output the free text on last page
$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 2bd5b27537c..721a0c94e52 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -294,7 +294,7 @@ class Export
}
break;
case 'Boolean':
- $szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
+ $szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
break;
case 'Status':
case 'List':
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 8f4ceefcba6..6ffcc39e1c8 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -1122,7 +1122,7 @@ print '<br>';
llxFooter();
-$db->close();
+$db->close();
/**
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 972cb12bbd6..2e627fadc7b 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1498,12 +1498,12 @@ if ($id > 0 || ! empty($ref))
print '<input type="hidden" name="action" value="addline">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
- print '<script type="text/javascript">
- jQuery(document).ready(function() {
- jQuery(\'#idprodfournprice\').change(function() {
- if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
- });
- });
+ print '<script type="text/javascript">
+ jQuery(document).ready(function() {
+ jQuery(\'#idprodfournprice\').change(function() {
+ if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
+ });
+ });
</script>';
$var=true;
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 7ecc09268e6..6986b743dfd 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -469,7 +469,7 @@ elseif ($action == 'addline')
if (GETPOST('search_idprodfournprice') || GETPOST('idprodfournprice')) // With combolist idprodfournprice is > 0 or -1, with autocomplete, idprodfournprice is > 0 or ''
{
$idprod=0;
- $product=new Product($db);
+ $product=new Product($db);
if (GETPOST('idprodfournprice') == '')
{
@@ -1820,12 +1820,12 @@ else
print '<input type="hidden" name="socid" value="'. $object->socid .'">';
print '<input type="hidden" name="facid" value="'.$object->id.'">';
- print '<script type="text/javascript">
- jQuery(document).ready(function() {
- jQuery(\'#idprodfournprice\').change(function() {
- if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
+ print '<script type="text/javascript">
+ jQuery(document).ready(function() {
+ jQuery(\'#idprodfournprice\').change(function() {
+ if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
});
- });
+ });
</script>';
$var=! $var;
diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php
index 859069957a6..147d57bda7f 100644
--- a/htdocs/holiday/fiche.php
+++ b/htdocs/holiday/fiche.php
@@ -830,14 +830,14 @@ else
}
- $h=0;
- $head = array();
- $head[$h][0] = DOL_URL_ROOT . '/holiday/fiche.php?id='.$id;
- $head[$h][1] = $langs->trans("Card");
- $head[$h][2] = 'card';
- $h++;
-
- complete_head_from_modules($conf,$langs,$cp,$head,$h,'holiday');
+ $h=0;
+ $head = array();
+ $head[$h][0] = DOL_URL_ROOT . '/holiday/fiche.php?id='.$id;
+ $head[$h][1] = $langs->trans("Card");
+ $head[$h][2] = 'card';
+ $h++;
+
+ complete_head_from_modules($conf,$langs,$cp,$head,$h,'holiday');
dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index dd706ed9be2..8e063237b83 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -57,7 +57,7 @@ $search_employe = GETPOST('search_employe');
$search_valideur = GETPOST('search_valideur');
$search_statut = GETPOST('select_statut');
-$holiday = new Holiday($db);
+$holiday = new Holiday($db);
/*
* Actions
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 56fe19f37eb..b482987af0b 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -55,8 +55,8 @@ $db_prefix=GETPOST('db_prefix','alpha');
session_start(); // To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
// Save a flag to tell to restore input value if we do back
-$_SESSION['dol_save_pass']=$db_pass;
-//$_SESSION['dol_save_passroot']=$passroot;
+$_SESSION['dol_save_pass']=$db_pass;
+//$_SESSION['dol_save_passroot']=$passroot;
// Now we load forced value from install.forced.php file.
$useforcedwizard=false;
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 4cb44467761..349de13771a 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -69,7 +69,7 @@ if (@file_exists($forcedfile)) {
* View
*/
-session_start(); // To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
+session_start(); // To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
pHeader($langs->trans("ConfigurationFile"),"etape1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'));
--
GitLab