Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: avoid jenkins warning

Browse Source 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
This commit is contained in:
Regis Houssin
2011-09-20 09:40:27 +00:00
parent 493c009d5f
commit b6a2f13673
70 changed files with 287 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev/translation/langAutoParser.class.php
View File

@@ -193,12 +193,12 @@ class langAutoParser {
private function getLineKey($line){ private function getLineKey($line){
$arraykey = explode('=',$line,2); $arraykey = explode('=',$line,2);
return trim( $arraykey[0] ); return trim($arraykey[0]);
} }
private function getLineValue($line){ private function getLineValue($line){
$arraykey = explode('=',$line,2); $arraykey = explode('=',$line,2);
return trim( $arraykey[1] ); return trim($arraykey[1]);
} }
private function getTranslationFilesArray($lang){ private function getTranslationFilesArray($lang){

4
htdocs/adherents/admin/adherent.php
View File

@@ -298,9 +298,7 @@ print '<br>';
/* /*
* Edition info modele document * Edition info modele document
*/ */
$constantes=array( $constantes=array('ADHERENT_ETIQUETTE_TYPE');
'ADHERENT_ETIQUETTE_TYPE'
);
print_fiche_titre($langs->trans("MembersTickets"),'',''); print_fiche_titre($langs->trans("MembersTickets"),'','');

3
htdocs/adherents/card_subscriptions.php
View File

@@ -792,8 +792,7 @@ if ($rowid)
} }
// Create a form array // Create a form array
$formquestion=array( $formquestion=array( array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
$ret=$html->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$adh->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1); $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$adh->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';

4
htdocs/adherents/class/adherent.class.php
View File

@@ -680,7 +680,7 @@ class Adherent extends CommonObject
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."cotisation WHERE fk_adherent = ".$rowid; $sql = "DELETE FROM ".MAIN_DB_PREFIX."cotisation WHERE fk_adherent = ".$rowid;
dol_syslog(get_class($this)."::delete sql=".$sql); dol_syslog(get_class($this)."::delete sql=".$sql);
$resql=$this->db->query( $sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid; $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid;
@@ -925,7 +925,7 @@ class Adherent extends CommonObject
$sql.= " WHERE login='".$login."'"; $sql.= " WHERE login='".$login."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$resql=$this->db->query( $sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {

3
htdocs/adherents/fiche.php
View File

@@ -1111,8 +1111,7 @@ if ($rowid && $action != 'edit')
} }
// Create a form array // Create a form array
$formquestion=array( $formquestion=array( array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
$ret=$html->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1); $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';

2
htdocs/boutique/client/index.php
View File

@@ -52,7 +52,7 @@ print_barre_liste("Liste des clients", $page, "index.php");
$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; $sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c";
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit($limit ,$offset);
$resql=$dbosc->query($sql); $resql=$dbosc->query($sql);
if ($resql) if ($resql)

2
htdocs/boutique/commande/index.php
View File

@@ -50,7 +50,7 @@ print_barre_liste("Liste des commandes", $page, "commande.php");
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'"; $sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'";
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit($limit ,$offset);
$resql=$dbosc->query($sql); $resql=$dbosc->query($sql);
if ($resql) if ($resql)

2
htdocs/boutique/critiques/bestproduct.php
View File

@@ -55,7 +55,7 @@ $sql .= " WHERE r.products_id = p.products_id";
$sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status"; $sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status";
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit($limit ,$offset);
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print "<TR class=\"liste_titre\"><td>".$langs->trans("Ref"); print "<TR class=\"liste_titre\"><td>".$langs->trans("Ref");

2
htdocs/boutique/critiques/index.php
View File

@@ -51,7 +51,7 @@ $sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name F
$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id"; $sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id";
$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID; $sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit($limit ,$offset);
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print '<TR class="liste_titre">'; print '<TR class="liste_titre">';

2
htdocs/boutique/notification/index.php
View File

@@ -53,7 +53,7 @@ $sql .= ",".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."c
$sql .= " WHERE n.customers_id = c.customers_id AND p.products_id=n.products_id"; $sql .= " WHERE n.customers_id = c.customers_id AND p.products_id=n.products_id";
$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID; $sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit($limit ,$offset);
$resql=$dbosc->query($sql); $resql=$dbosc->query($sql);
if ($resql) if ($resql)

2
htdocs/boutique/notification/produits.php
View File

@@ -53,7 +53,7 @@ $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREF
$sql .= " WHERE p.products_id=n.products_id"; $sql .= " WHERE p.products_id=n.products_id";
$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID; $sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " GROUP BY p.products_name, p.products_id"; $sql .= " GROUP BY p.products_name, p.products_id";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit($limit ,$offset);
$resql=$dbosc->query($sql); $resql=$dbosc->query($sql);
if ($resql) if ($resql)

2
htdocs/boutique/produits/index.php
View File

@@ -49,7 +49,7 @@ print_barre_liste("Liste des clients", $page, "index.php");
$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter"; $sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter";
$sql .= " FROM ".DB_NAME_OSC.".customers as c"; $sql .= " FROM ".DB_NAME_OSC.".customers as c";
$sql .= " ORDER BY $sortfield $sortorder "; $sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit($limit ,$offset);
$resql=$dbosc->query($sql); $resql=$dbosc->query($sql);
if ($resql) if ($resql)

2
htdocs/boutique/produits/osc-liste.php
View File

@@ -58,7 +58,7 @@ if ($reqstock=='epuise')
} }
//$sql .= " ORDER BY $sortfield $sortorder "; //$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset); $sql .= $dbosc->plimit($limit ,$offset);
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print '<TR class="liste_titre">'; print '<TR class="liste_titre">';

4
htdocs/boutique/promotion/index.php
View File

@@ -61,7 +61,7 @@ $sql.= " expires_date as fin";
$sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials as s,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as pd,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p"; $sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials as s,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as pd,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p";
$sql.= " WHERE s.products_id = pd.products_id AND pd.products_id = p.products_id AND pd.language_id = ".$conf->global->OSC_LANGUAGE_ID; $sql.= " WHERE s.products_id = pd.products_id AND pd.products_id = p.products_id AND pd.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql.= " ORDER BY $sortfield $sortorder "; $sql.= " ORDER BY $sortfield $sortorder ";
$sql.= $dbosc->plimit( $limit ,$offset); $sql.= $dbosc->plimit($limit ,$offset);
$resql=$dbosc->query($sql); $resql=$dbosc->query($sql);
if ($resql) if ($resql)
@@ -79,7 +79,7 @@ if ($resql)
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $dbosc->fetch_object( $i); $objp = $dbosc->fetch_object($i);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";

6
htdocs/boxes.php
View File

@@ -130,10 +130,10 @@ function printBoxesArea($user,$areacode)
'; ';
print "\n"; print "\n";
print 'function updateOrder(){'."\n"; print 'function updateOrder(){'."\n";
print 'var left_list = cleanSerialize(jQuery("#left").sortable( "serialize" ));'."\n"; print 'var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));'."\n";
print 'var right_list = cleanSerialize(jQuery("#right").sortable( "serialize" ));'."\n"; print 'var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));'."\n";
print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n"; print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
//print 'alert( \'boxorder=\' + boxorder );'; //print 'alert(\'boxorder=\' + boxorder);';
print 'var userid = \''.$user->id.'\';'."\n"; print 'var userid = \''.$user->id.'\';'."\n";
print 'jQuery.get(\'core/ajaxbox.php?boxorder=\'+boxorder+\'&userid=\'+'.$user->id.');'."\n"; print 'jQuery.get(\'core/ajaxbox.php?boxorder=\'+boxorder+\'&userid=\'+'.$user->id.');'."\n";
print '}'."\n"; print '}'."\n";

2
htdocs/cashdesk/class/Auth.class.php
View File

@@ -35,7 +35,7 @@ class Auth {
function Auth ($DB) { function Auth ($DB) {
$this->db = $DB; $this->db = $DB;
$this->reponse (null); $this->reponse(null);
} }

12
htdocs/cashdesk/class/Facturation.class.php
View File

@@ -221,14 +221,14 @@ class Facturation {
*/ */
public function raz () public function raz ()
{ {
$this->id ('RESET'); $this->id('RESET');
$this->ref ('RESET'); $this->ref('RESET');
$this->qte ('RESET'); $this->qte('RESET');
$this->stock ('RESET'); $this->stock('RESET');
$this->remise_percent ('RESET'); $this->remise_percent ('RESET');
$this->montant_remise ('RESET'); $this->montant_remise ('RESET');
$this->prix ('RESET'); $this->prix('RESET');
$this->tva ('RESET'); $this->tva('RESET');
} }

10
htdocs/cashdesk/facturation_verif.php
View File

@@ -86,11 +86,11 @@ switch ( $_GET['action'] )
} }
/** end add Ditto */ /** end add Ditto */
$obj_facturation->id( $ret['rowid'] ); $obj_facturation->id($ret['rowid']);
$obj_facturation->ref( $ret['ref'] ); $obj_facturation->ref($ret['ref']);
$obj_facturation->stock( $ret['reel'] ); $obj_facturation->stock($ret['reel']);
$obj_facturation->prix( $ret['price'] ); $obj_facturation->prix($ret['price']);
$obj_facturation->tva( $ret['tva_tx'] ); $obj_facturation->tva($ret['tva_tx']);
// Definition du filtre pour n'afficher que le produit concerne // Definition du filtre pour n'afficher que le produit concerne
if ( $_POST['hdnSource'] == 'LISTE' ) if ( $_POST['hdnSource'] == 'LISTE' )

2
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@@ -124,7 +124,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled="disabled" /> <input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled="disabled" />
</td> </td>
<!-- Affichage du prix unitaire --> <!-- Affichage du prix unitaire -->
<td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num( $obj_facturation->prix(), 'MU'); ?>" disabled="disabled" /></td> <td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" disabled="disabled" /></td>
<td><?php echo $conf->monnaie; ?></td> <td><?php echo $conf->monnaie; ?></td>
<!-- Choix de la remise --> <!-- Choix de la remise -->
<td><input class="texte1" type="text" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/></td> <td><input class="texte1" type="text" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/></td>

2
htdocs/cashdesk/tpl/liste_articles.tpl.php
View File

@@ -97,7 +97,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
$remise = $tab[$i]['remise']; $remise = $tab[$i]['remise'];
echo ('<p>'.$tab[$i]['qte'].' x '.price2num( $tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($tab[$i]['total_ht'], 'MT').' '.$conf->monnaie.' '.$langs->trans("HT").' ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaie.' '.$langs->trans("TTC").')</p>'."\n"); echo ('<p>'.$tab[$i]['qte'].' x '.price2num($tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($tab[$i]['total_ht'], 'MT').' '.$conf->monnaie.' '.$langs->trans("HT").' ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaie.' '.$langs->trans("TTC").')</p>'."\n");
echo ('</div>'."\n"); echo ('</div>'."\n");
} }

4
htdocs/compta/deplacement/fiche.php
View File

@@ -101,7 +101,7 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer)
if ($id > 0) if ($id > 0)
{ {
Header ( "Location: fiche.php?id=".$id); Header ("Location: fiche.php?id=".$id);
exit; exit;
} }
else else
@@ -117,7 +117,7 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer)
} }
else else
{ {
Header ( "Location: index.php"); Header ("Location: index.php");
exit; exit;
} }
} }

4
htdocs/compta/facture/class/facture.class.php
View File

@@ -1303,7 +1303,7 @@ class Facture extends CommonObject
/* Definition de la date limite */ /* Definition de la date limite */
// 1 : ajout du nombre de jours // 1 : ajout du nombre de jours
$datelim = $this->date + ( $cdr_nbjour * 3600 * 24 ); $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
// 2 : application de la regle "fin de mois" // 2 : application de la regle "fin de mois"
if ($cdr_fdm) if ($cdr_fdm)
@@ -1325,7 +1325,7 @@ class Facture extends CommonObject
} }
// 3 : application du decalage // 3 : application du decalage
$datelim += ( $cdr_decalage * 3600 * 24); $datelim += ($cdr_decalage * 3600 * 24);
return $datelim; return $datelim;
} }

2
htdocs/compta/paiement.php
View File

@@ -634,7 +634,7 @@ if (! GETPOST('action'))
} }
$sql .= ' ORDER BY '.$sortfield.' '.$sortorder; $sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
$sql .= $db->plimit( $limit +1 ,$offset); $sql .= $db->plimit($limit +1 ,$offset);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)

2
htdocs/compta/paiement/avalider.php
View File

@@ -70,7 +70,7 @@ if ($socid)
} }
$sql .= " AND p.statut = 0"; $sql .= " AND p.statut = 0";
$sql .= " ORDER BY $sortfield $sortorder"; $sql .= " ORDER BY $sortfield $sortorder";
$sql .= $db->plimit( $limit +1 ,$offset); $sql .= $db->plimit($limit +1 ,$offset);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)

2
htdocs/compta/paiement/cheque/liste.php
View File

@@ -66,7 +66,7 @@ if ($_GET["search_montant"])
$sql.=" AND bc.amount=".price2num($_GET["search_montant"]); $sql.=" AND bc.amount=".price2num($_GET["search_montant"]);
} }
$sql.= " ORDER BY $sortfield $sortorder"; $sql.= " ORDER BY $sortfield $sortorder";
$sql.= $db->plimit( $limit+1 ,$offset); $sql.= $db->plimit($limit+1 ,$offset);
//print "$sql"; //print "$sql";
$resql = $db->query($sql); $resql = $db->query($sql);

2
htdocs/compta/paiement/liste.php
View File

@@ -114,7 +114,7 @@ else
if ($_REQUEST["search_company"]) $sql .=" AND s.nom LIKE '%".$db->escape($_REQUEST["search_company"])."%'"; if ($_REQUEST["search_company"]) $sql .=" AND s.nom LIKE '%".$db->escape($_REQUEST["search_company"])."%'";
} }
$sql.= $db->order($sortfield,$sortorder); $sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit( $limit+1 ,$offset); $sql.= $db->plimit($limit+1 ,$offset);
//print "$sql"; //print "$sql";
$resql = $db->query($sql); $resql = $db->query($sql);

2
htdocs/compta/prelevement/class/bon-prelevement.class.php
View File

@@ -999,7 +999,7 @@ class BonPrelevement extends CommonObject
//Build file //Build file
$bonprev->generate(); $bonprev->generate();
} }
dol_syslog( $filebonprev ) ; dol_syslog($filebonprev);
dol_syslog("Fin prelevement"); dol_syslog("Fin prelevement");
} }

2
htdocs/contrat/class/contrat.class.php
View File

@@ -896,7 +896,7 @@ class Contrat extends CommonObject
$sql.= " ".price2num($remise_percent).",".price2num($pu_ht).","; $sql.= " ".price2num($remise_percent).",".price2num($pu_ht).",";
$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).","; $sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
$sql.= " '".$info_bits."',"; $sql.= " '".$info_bits."',";
$sql.= " ".price2num($price).",".price2num( $remise); // TODO A virer $sql.= " ".price2num($price).",".price2num($remise); // TODO A virer
if ($date_start > 0) { $sql.= ",".$this->db->idate($date_start); } if ($date_start > 0) { $sql.= ",".$this->db->idate($date_start); }
if ($date_end > 0) { $sql.= ",".$this->db->idate($date_end); } if ($date_end > 0) { $sql.= ",".$this->db->idate($date_end); }
$sql.= ")"; $sql.= ")";

2
htdocs/core/class/commonobject.class.php
View File

@@ -1485,7 +1485,7 @@ abstract class CommonObject
$sql.= " WHERE fk_object = ".$rowid; $sql.= " WHERE fk_object = ".$rowid;
dol_syslog(get_class($this)."::fetch_optionals sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::fetch_optionals sql=".$sql, LOG_DEBUG);
$resql=$this->db->query( $sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
if ($this->db->num_rows($resql)) if ($this->db->num_rows($resql))

4
htdocs/core/class/dolgraph.class.php
View File

@@ -510,7 +510,7 @@ class DolGraph
$plot->barBorder->setColor($colorgrey); $plot->barBorder->setColor($colorgrey);
//$plot->setBarColor($color); //$plot->setBarColor($color);
$plot->setBarGradient( new LinearGradient($colorbis, $color, 90) ); $plot->setBarGradient(new LinearGradient($colorbis, $color, 90));
if ($this->mode == 'side') $plot->setBarPadding(0.1, 0.1); if ($this->mode == 'side') $plot->setBarPadding(0.1, 0.1);
if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4); if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
@@ -543,7 +543,7 @@ class DolGraph
$plot->setThickness(1); $plot->setThickness(1);
// Set line background gradient // Set line background gradient
$plot->setFillGradient( new LinearGradient($colorter, $colorbis, 90) ); $plot->setFillGradient(new LinearGradient($colorter, $colorbis, 90));
$plot->xAxis->setLabelText($legends); $plot->xAxis->setLabelText($legends);

4
htdocs/core/class/html.form.class.php
View File

@@ -2156,7 +2156,7 @@ class Form
var inputvalue = $("#" + this).val(); var inputvalue = $("#" + this).val();
options += \'&\' + inputname + \'=\' + inputvalue; options += \'&\' + inputname + \'=\' + inputvalue;
}); });
//alert( options ); //alert(options);
} }
location.href=\''.$pageyes.'\' + options; location.href=\''.$pageyes.'\' + options;
} }
@@ -2176,7 +2176,7 @@ class Form
if (button.length > 0) { if (button.length > 0) {
$( "#" + button ).click(function() { $( "#" + button ).click(function() {
$( "#" + dialogconfirm ).dialog( \'open\' ); $("#" + dialogconfirm ).dialog(\'open\');
}); });
} }
}); });

48
htdocs/core/class/rssparser.class.php
View File

@@ -145,11 +145,11 @@ class RssParser
$xmlparser=xml_parser_create(''); $xmlparser=xml_parser_create('');
if (!is_resource($xmlparser)) { $this->error="ErrorFailedToCreateParser"; return -1; } if (!is_resource($xmlparser)) { $this->error="ErrorFailedToCreateParser"; return -1; }
xml_set_object( $xmlparser, $this ); xml_set_object($xmlparser, $this);
xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element' ); xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element' );
xml_set_character_data_handler( $xmlparser, 'feed_cdata' ); xml_set_character_data_handler($xmlparser, 'feed_cdata');
$status = xml_parse( $xmlparser, $str ); $status = xml_parse($xmlparser, $str);
xml_parser_free( $xmlparser ); xml_parser_free($xmlparser);
$rss=$this; $rss=$this;
//var_dump($rss->_format);exit; //var_dump($rss->_format);exit;
} }
@@ -341,7 +341,7 @@ class RssParser
// check for a namespace, and split if found // check for a namespace, and split if found
$ns = false; $ns = false;
if ( strpos( $element, ':' ) ) { if ( strpos( $element, ':' ) ) {
list($ns, $el) = explode( ':', $element, 2); list($ns, $el) = explode(':', $element, 2);
} }
if ( $ns and $ns != 'rdf' ) { if ( $ns and $ns != 'rdf' ) {
$this->current_namespace = $ns; $this->current_namespace = $ns;
@@ -418,9 +418,9 @@ class RssParser
array_keys($attrs), array_keys($attrs),
array_values($attrs) ) ); array_values($attrs) ) );
$this->append_content( "<$element $attrs_str>" ); $this->append_content("<$element $attrs_str>" );
array_unshift( $this->stack, $el ); array_unshift($this->stack, $el);
} }
// Atom support many links per containging element. // Atom support many links per containging element.
@@ -456,7 +456,7 @@ class RssParser
{ {
if ($this->_format == 'atom' and $this->incontent) if ($this->_format == 'atom' and $this->incontent)
{ {
$this->append_content( $text ); $this->append_content($text);
} }
else { else {
$current_el = join('_', array_reverse($this->stack)); $current_el = join('_', array_reverse($this->stack));
@@ -507,10 +507,10 @@ class RssParser
$this->append_content("<$el />"); $this->append_content("<$el />");
} }
array_shift( $this->stack ); array_shift($this->stack);
} }
else { else {
array_shift( $this->stack ); array_shift($this->stack);
} }
$this->current_namespace = false; $this->current_namespace = false;
@@ -536,10 +536,10 @@ class RssParser
function append_content($text) function append_content($text)
{ {
if ( $this->initem ) { if ( $this->initem ) {
$this->concat( $this->current_item[ $this->incontent ], $text ); $this->concat($this->current_item[ $this->incontent ], $text);
} }
elseif ( $this->inchannel ) { elseif ( $this->inchannel ) {
$this->concat( $this->channel[ $this->incontent ], $text ); $this->concat($this->channel[ $this->incontent ], $text);
} }
} }
@@ -554,38 +554,30 @@ class RssParser
if ( $this->current_namespace ) if ( $this->current_namespace )
{ {
if ( $this->initem ) { if ( $this->initem ) {
$this->concat( $this->concat( $this->current_item[ $this->current_namespace ][ $el ], $text);
$this->current_item[ $this->current_namespace ][ $el ], $text);
} }
elseif ($this->inchannel) { elseif ($this->inchannel) {
$this->concat( $this->concat( $this->channel[ $this->current_namespace][ $el ], $text);
$this->channel[ $this->current_namespace][ $el ], $text );
} }
elseif ($this->intextinput) { elseif ($this->intextinput) {
$this->concat( $this->concat( $this->textinput[ $this->current_namespace][ $el ], $text);
$this->textinput[ $this->current_namespace][ $el ], $text );
} }
elseif ($this->inimage) { elseif ($this->inimage) {
$this->concat( $this->concat( $this->image[ $this->current_namespace ][ $el ], $text);
$this->image[ $this->current_namespace ][ $el ], $text );
} }
} }
else { else {
if ( $this->initem ) { if ( $this->initem ) {
$this->concat( $this->concat( $this->current_item[ $el ], $text);
$this->current_item[ $el ], $text);
} }
elseif ($this->intextinput) { elseif ($this->intextinput) {
$this->concat( $this->concat( $this->textinput[ $el ], $text);
$this->textinput[ $el ], $text );
} }
elseif ($this->inimage) { elseif ($this->inimage) {
$this->concat( $this->concat( $this->image[ $el ], $text);
$this->image[ $el ], $text );
} }
elseif ($this->inchannel) { elseif ($this->inchannel) {
$this->concat( $this->concat( $this->channel[ $el ], $text);
$this->channel[ $el ], $text );
} }
} }

78
htdocs/core/class/smtps.class.php
View File

@@ -299,7 +299,7 @@ class SMTPs
if ( (! is_ip($host)) && ((gethostbyname ( $host )) == $host) ) if ( (! is_ip($host)) && ((gethostbyname ( $host )) == $host) )
{ {
$this->_setErr ( 99, $host . ' is either offline or is an invalid host name.' ); $this->_setErr (99, $host . ' is either offline or is an invalid host name.');
$_retVal = false; $_retVal = false;
} }
else else
@@ -326,7 +326,7 @@ class SMTPs
{ {
// DOL_CHANGE LDR // DOL_CHANGE LDR
if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort(); if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
$this->_setErr ( $this->errno, $this->errstr ); $this->_setErr ($this->errno, $this->errstr);
$_retVal = false; $_retVal = false;
} }
} }
@@ -359,11 +359,11 @@ class SMTPs
// The error here just means the ID/password combo doesn't work. // The error here just means the ID/password combo doesn't work.
// There is not a method to determine which is the problem, ID or password // There is not a method to determine which is the problem, ID or password
if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') ) if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
$this->_setErr ( 130, 'Invalid Authentication Credentials.' ); $this->_setErr (130, 'Invalid Authentication Credentials.');
} }
else else
{ {
$this->_setErr ( 126, '"' . $host . '" does not support authenticated connections.' ); $this->_setErr (126, '"' . $host . '" does not support authenticated connections.');
} }
return $_retVal; return $_retVal;
@@ -410,7 +410,7 @@ class SMTPs
// From this point onward most server response codes should be 250 // From this point onward most server response codes should be 250
// Specify who the mail is from.... // Specify who the mail is from....
// This has to be the raw email address, strip the "name" off // This has to be the raw email address, strip the "name" off
$this->socket_send_str('MAIL FROM: ' . $this->getFrom( 'addr' ), '250'); $this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr' ), '250');
// 'RCPT TO:' must be given a single address, so this has to loop // 'RCPT TO:' must be given a single address, so this has to loop
// through the list of addresses, regardless of TO, CC or BCC // through the list of addresses, regardless of TO, CC or BCC
@@ -491,7 +491,7 @@ class SMTPs
// it will simply return FALSE. // it will simply return FALSE.
if ( ! @include ( $_strConfigPath ) ) if ( ! @include ( $_strConfigPath ) )
{ {
$this->_setErr ( 110, '"' . $_strConfigPath . '" is not a valid path.' ); $this->_setErr (110, '"' . $_strConfigPath . '" is not a valid path.');
$_retVal = false; $_retVal = false;
} }
} }
@@ -502,13 +502,13 @@ class SMTPs
// Set these properties ONLY if they are set in the php.ini file. // Set these properties ONLY if they are set in the php.ini file.
// Otherwise the default values will be used. // Otherwise the default values will be used.
if ( $_host = ini_get ('SMTPs') ) if ( $_host = ini_get ('SMTPs') )
$this->setHost ( $_host ); $this->setHost($_host);
if ( $_port = ini_get ('smtp_port') ) if ( $_port = ini_get ('smtp_port') )
$this->setPort ( $_port ); $this->setPort($_port);
if ( $_from = ini_get ('sendmail_from') ) if ( $_from = ini_get ('sendmail_from') )
$this->setFrom ( $_from ); $this->setFrom($_from);
} }
// Send back what we have // Send back what we have
@@ -751,7 +751,7 @@ class SMTPs
function setFrom($_strFrom) function setFrom($_strFrom)
{ {
if ( $_strFrom ) if ( $_strFrom )
$this->_msgFrom = $this->_strip_email ( $_strFrom ); $this->_msgFrom = $this->_strip_email ($_strFrom);
} }
/** /**
@@ -799,7 +799,7 @@ class SMTPs
// This could be a COMMA delimited string // This could be a COMMA delimited string
if ( strstr ($_addrList, ',') ) if ( strstr ($_addrList, ',') )
// "explode "list" into an array // "explode "list" into an array
$_addrList = explode ( ',', $_addrList ); $_addrList = explode (',', $_addrList);
// Stick it in an array // Stick it in an array
else else
@@ -810,28 +810,28 @@ class SMTPs
foreach ( $_addrList as $_strAddr ) foreach ( $_addrList as $_strAddr )
{ {
// Strip off the end '>' // Strip off the end '>'
$_strAddr = str_replace ( '>', '', $_strAddr ); $_strAddr = str_replace ('>', '', $_strAddr);
// Seperate "Real Name" from eMail address // Seperate "Real Name" from eMail address
$_tmpaddr = null; $_tmpaddr = null;
$_tmpaddr = explode ( '<', $_strAddr ); $_tmpaddr = explode ('<', $_strAddr);
// We have a "Real Name" and eMail address // We have a "Real Name" and eMail address
if ( count ($_tmpaddr) == 2 ) if ( count ($_tmpaddr) == 2 )
{ {
$_tmpHost = explode ( '@', $_tmpaddr[1] ); $_tmpHost = explode ('@', $_tmpaddr[1]);
$_tmpaddr[0] = trim ( $_tmpaddr[0], ' ">' ); $_tmpaddr[0] = trim ($_tmpaddr[0], ' ">');
$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0]; $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
} }
// We only have an eMail address // We only have an eMail address
else else
{ {
// Strip off the beggining '<' // Strip off the beggining '<'
$_strAddr = str_replace ( '<', '', $_strAddr ); $_strAddr = str_replace ('<', '', $_strAddr);
$_tmpHost = explode ( '@', $_strAddr ); $_tmpHost = explode ('@', $_strAddr);
$_tmpHost[0] = trim ( $_tmpHost[0] ); $_tmpHost[0] = trim ($_tmpHost[0]);
$_tmpHost[1] = trim ( $_tmpHost[1] ); $_tmpHost[1] = trim ($_tmpHost[1]);
$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = ''; $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
} }
@@ -863,20 +863,20 @@ class SMTPs
$_aryEmail['org'] = $_strAddr; $_aryEmail['org'] = $_strAddr;
// Set entire string to Lower Case // Set entire string to Lower Case
$_strAddr = strtolower ( $_strAddr ); $_strAddr = strtolower ($_strAddr);
// Drop "stuff' off the end // Drop "stuff' off the end
$_strAddr = trim ( $_strAddr, ' ">' ); $_strAddr = trim ($_strAddr, ' ">');
// Seperate "Real Name" from eMail address, if we have one // Seperate "Real Name" from eMail address, if we have one
$_tmpAry = explode ( '<', $_strAddr ); $_tmpAry = explode ('<', $_strAddr);
// Do we have a "Real name" // Do we have a "Real name"
if ( count ($_tmpAry) == 2 ) if ( count ($_tmpAry) == 2 )
{ {
// We may not really have a "Real Name" // We may not really have a "Real Name"
if ( $_tmpAry[0]) if ( $_tmpAry[0])
$_aryEmail['real'] = trim ( $_tmpAry[0], ' ">' ); $_aryEmail['real'] = trim ($_tmpAry[0], ' ">');
$_aryEmail['addr'] = $_tmpAry[1]; $_aryEmail['addr'] = $_tmpAry[1];
} }
@@ -884,7 +884,7 @@ class SMTPs
$_aryEmail['addr'] = $_tmpAry[0]; $_aryEmail['addr'] = $_tmpAry[0];
// Pull User Name and Host.tld apart // Pull User Name and Host.tld apart
list($_aryEmail['user'], $_aryEmail['host'] ) = explode ( '@', $_aryEmail['addr'] ); list($_aryEmail['user'], $_aryEmail['host'] ) = explode ('@', $_aryEmail['addr']);
// Put the brackets back around the address // Put the brackets back around the address
$_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>'; $_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>';
@@ -904,7 +904,7 @@ class SMTPs
/** /**
* An array of bares addresses for use with 'RCPT TO:' * An array of bares addresses for use with 'RCPT TO:'
*/ */
unset ( $_RCPT_list ); unset ($_RCPT_list);
// walk down Recipients array and pull just email addresses // walk down Recipients array and pull just email addresses
foreach ( $this->_msgRecipients as $_host => $_list ) foreach ( $this->_msgRecipients as $_host => $_list )
@@ -961,13 +961,13 @@ class SMTPs
} }
else else
{ {
$this->_setErr ( 101, 'No eMail Address for message to be sent to.' ); $this->_setErr (101, 'No eMail Address for message to be sent to.');
return false; return false;
} }
} }
else else
{ {
$this->_setErr ( 102, 'eMail type not defined.' ); $this->_setErr (102, 'eMail type not defined.');
return false; return false;
} }
@@ -982,7 +982,7 @@ class SMTPs
function setTO($_addrTo) function setTO($_addrTo)
{ {
if ( $_addrTo ) if ( $_addrTo )
$this->_buildAddrList( 'to', $_addrTo ); $this->_buildAddrList('to', $_addrTo);
} }
/** /**
@@ -992,7 +992,7 @@ class SMTPs
*/ */
function getTo() function getTo()
{ {
return $this->get_email_list( 'to' ); return $this->get_email_list('to');
} }
/** /**
@@ -1004,7 +1004,7 @@ class SMTPs
function setCC($_strCC) function setCC($_strCC)
{ {
if ( $_strCC ) if ( $_strCC )
$this->_buildAddrList( 'cc', $_strCC ); $this->_buildAddrList('cc', $_strCC);
} }
/** /**
@@ -1014,7 +1014,7 @@ class SMTPs
*/ */
function getCC() function getCC()
{ {
return $this->get_email_list( 'cc' ); return $this->get_email_list('cc');
} }
/** /**
@@ -1026,7 +1026,7 @@ class SMTPs
function setBCC($_strBCC) function setBCC($_strBCC)
{ {
if ( $_strBCC ) if ( $_strBCC )
$this->_buildAddrList( 'bcc', $_strBCC ); $this->_buildAddrList('bcc', $_strBCC);
} }
/** /**
@@ -1036,7 +1036,7 @@ class SMTPs
*/ */
function getBCC() function getBCC()
{ {
return $this->get_email_list( 'bcc' ); return $this->get_email_list('bcc');
} }
/** /**
@@ -1149,14 +1149,14 @@ class SMTPs
$this->_setBoundary(); $this->_setBoundary();
// What type[s] of content do we have // What type[s] of content do we have
$_types = array_keys ( $this->_msgContent ); $_types = array_keys ($this->_msgContent);
// How many content types do we have // How many content types do we have
$keyCount = count ( $_types ); $keyCount = count ($_types);
// If we have ZERO, we have a problem // If we have ZERO, we have a problem
if( $keyCount === 0 ) if( $keyCount === 0 )
die ( "Sorry, no content" ); die ("Sorry, no content");
// If we have ONE, we can use the simple format // If we have ONE, we can use the simple format
else if( $keyCount === 1 ) else if( $keyCount === 1 )
@@ -1252,7 +1252,7 @@ class SMTPs
// $content .= ( $type == 'html') ? '; name="HTML Part"' : ''; // $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
$content .= "\r\n"; $content .= "\r\n";
// $content .= 'Content-Transfer-Encoding: '; // $content .= 'Content-Transfer-Encoding: ';
// $content .= ( $type == 'html') ? 'quoted-printable' : $this->getTransEncodeType(); // $content .= ($type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
// $content .= "\r\n" // $content .= "\r\n"
// . 'Content-Disposition: inline' . "\r\n" // . 'Content-Disposition: inline' . "\r\n"
// . 'Content-Description: ' . $type . ' message' . "\r\n"; // . 'Content-Description: ' . $type . ' message' . "\r\n";
@@ -1486,14 +1486,14 @@ class SMTPs
{ {
if( !( $server_response = fgets($socket, 256) ) ) if( !( $server_response = fgets($socket, 256) ) )
{ {
$this->_setErr ( 121, "Couldn't get mail server response codes" ); $this->_setErr (121, "Couldn't get mail server response codes");
$_retVal = false; $_retVal = false;
} }
} }
if( !( substr($server_response, 0, 3) == $response ) ) if( !( substr($server_response, 0, 3) == $response ) )
{ {
$this->_setErr ( 120, "Ran into problems sending Mail.\r\nResponse: $server_response" ); $this->_setErr (120, "Ran into problems sending Mail.\r\nResponse: $server_response");
$_retVal = false; $_retVal = false;
} }

6
htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
View File

@@ -68,7 +68,7 @@ function ProtectPath(path)
oListManager.GetFolderRowHtml = function( folderName, folderPath ) oListManager.GetFolderRowHtml = function( folderName, folderPath )
{ {
// Build the link to view the folder. // Build the link to view the folder.
var sLink = '<a href="#" onclick="OpenFolder(\'' + ProtectPath( folderPath ) + '\');return false;">' ; var sLink = '<a href="#" onclick="OpenFolder(\'' + ProtectPath(folderPath ) + '\');return false;">' ;
return '<tr>' + return '<tr>' +
'<td width="16">' + '<td width="16">' +
@@ -84,7 +84,7 @@ oListManager.GetFolderRowHtml = function( folderName, folderPath )
oListManager.GetFileRowHtml = function( fileName, fileUrl, fileSize ) oListManager.GetFileRowHtml = function( fileName, fileUrl, fileSize )
{ {
// Build the link to view the folder. // Build the link to view the folder.
var sLink = '<a href="#" onclick="OpenFile(\'' + ProtectPath( fileUrl ) + '\');return false;">' ; var sLink = '<a href="#" onclick="OpenFile(\'' + ProtectPath(fileUrl ) + '\');return false;">' ;
// Get the file icon. // Get the file icon.
var sIcon = oIcons.GetIcon( fileName ) ; var sIcon = oIcons.GetIcon( fileName ) ;
@@ -123,7 +123,7 @@ function GetUrlParam( paramName )
function OpenFile( fileUrl ) function OpenFile( fileUrl )
{ {
funcNum = GetUrlParam('CKEditorFuncNum') ; funcNum = GetUrlParam('CKEditorFuncNum') ;
window.top.opener.CKEDITOR.tools.callFunction( funcNum, encodeURI( fileUrl ).replace( '#', '%23' )); window.top.opener.CKEDITOR.tools.callFunction(funcNum, encodeURI( fileUrl ).replace( '#', '%23' ));
/////////////////////////////////// ///////////////////////////////////
window.top.close() ; window.top.close() ;

2
htdocs/core/filemanagerdol/connectors/php/io.php
View File

@@ -311,7 +311,7 @@ function SendCKEditorResults ($callback, $sFileUrl, $customMsg = '')
$rpl = array( '\\' => '\\\\', '"' => '\\"' ) ; $rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
echo 'window.parent.CKEDITOR.tools.callFunction("'. $callback. '","'. echo 'window.parent.CKEDITOR.tools.callFunction("'. $callback. '","'.
strtr($sFileUrl, $rpl). '", "'. strtr( $customMsg, $rpl). '");' ; strtr($sFileUrl, $rpl). '", "'. strtr($customMsg, $rpl). '");' ;
echo '</script>'; echo '</script>';
} }

3
htdocs/core/tpl/ajaxrow.tpl.php
View File

@@ -59,8 +59,7 @@ jQuery(document).ready(function(){
onDragClass: "dragClass", onDragClass: "dragClass",
dragHandle: "tdlineupdown" dragHandle: "tdlineupdown"
}); });
jQuery(".tdlineupdown").hover( jQuery(".tdlineupdown").hover( function() { jQuery(this).addClass('showDragHandle'); },
function() { jQuery(this).addClass('showDragHandle'); },
function() { jQuery(this).removeClass('showDragHandle'); } function() { jQuery(this).removeClass('showDragHandle'); }
); );
}); });

2
htdocs/fichinter/list.php
View File

@@ -85,7 +85,7 @@ if ($search_desc) $sql .= " AND (f.description like '%".$db->escape($search_d
if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; 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; if ($socid) $sql.= " AND s.rowid = " . $socid;
$sql.= " ORDER BY ".$sortfield." ".$sortorder; $sql.= " ORDER BY ".$sortfield." ".$sortorder;
$sql.= $db->plimit( $limit + 1 ,$offset); $sql.= $db->plimit($limit + 1 ,$offset);
$result=$db->query($sql); $result=$db->query($sql);
if ($result) if ($result)

2
htdocs/fourn/class/fournisseur.commande.class.php
View File

@@ -1639,7 +1639,7 @@ class CommandeFournisseur extends Commande
$sql.= " WHERE rowid = ".$rowid; $sql.= " WHERE rowid = ".$rowid;
dol_syslog("CommandeFournisseur::updateline sql=".$sql); dol_syslog("CommandeFournisseur::updateline sql=".$sql);
$result = $this->db->query( $sql); $result = $this->db->query($sql);
if ($result > 0) if ($result > 0)
{ {
// Mise a jour info denormalisees au niveau facture // Mise a jour info denormalisees au niveau facture

4
htdocs/fourn/commande/liste.php
View File

@@ -35,8 +35,8 @@ $suser=isset($_GET['search_user'])?$_GET['search_user']:$_POST['search_user'];
$sttc=isset($_GET['search_ttc'])?$_GET['search_ttc']:$_POST['search_ttc']; $sttc=isset($_GET['search_ttc'])?$_GET['search_ttc']:$_POST['search_ttc'];
$sall=isset($_GET['search_all'])?$_GET['search_all']:$_POST['search_all']; $sall=isset($_GET['search_all'])?$_GET['search_all']:$_POST['search_all'];
$page = ( is_numeric($_GET["page"]) ? $_GET["page"] : 0 ); $page = (is_numeric($_GET["page"]) ? $_GET["page"] : 0);
$socid = ( is_numeric($_GET["socid"]) ? $_GET["socid"] : 0 ); $socid = (is_numeric($_GET["socid"]) ? $_GET["socid"] : 0);
$sortorder = $_GET["sortorder"]; $sortorder = $_GET["sortorder"];
$sortfield = $_GET["sortfield"]; $sortfield = $_GET["sortfield"];

2
htdocs/fourn/contact.php
View File

@@ -82,7 +82,7 @@ if ($socid) {
$sql .= " AND s.rowid = ".$socid; $sql .= " AND s.rowid = ".$socid;
} }
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit, $offset); $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($limit, $offset);
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)

2
htdocs/fourn/facture/index.php
View File

@@ -159,7 +159,7 @@ if ($_GET["search_montant_ttc"])
} }
$sql.= $db->order($sortfield,$sortorder); $sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit( $limit+1, $offset); $sql.= $db->plimit($limit+1, $offset);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)

6
htdocs/imports/import.php
View File

@@ -967,11 +967,11 @@ if ($step == 4 && $datatoimport)
'; ';
print "\n"; print "\n";
print 'function updateOrder(){'."\n"; print 'function updateOrder(){'."\n";
print 'var left_list = cleanSerialize(jQuery("#left").sortable( "serialize" ));'."\n"; print 'var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));'."\n";
//print 'var right_list = cleanSerialize(jQuery("#right").sortable( "serialize" ));'."\n"; //print 'var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));'."\n";
print 'var boxorder = \'A:\' + left_list;'."\n"; print 'var boxorder = \'A:\' + left_list;'."\n";
//print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n"; //print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
//print 'alert( \'boxorder=\' + boxorder );'; //print 'alert(\'boxorder=\' + boxorder);';
//print 'var userid = \''.$user->id.'\';'."\n"; //print 'var userid = \''.$user->id.'\';'."\n";
//print 'var datatoimport = "'.$datatoimport.'";'."\n"; //print 'var datatoimport = "'.$datatoimport.'";'."\n";
// print 'jQuery.ajax({ url: "ajaximport.php?step=4&boxorder=" + boxorder + "&userid=" + userid + "&datatoimport=" + datatoimport, // print 'jQuery.ajax({ url: "ajaximport.php?step=4&boxorder=" + boxorder + "&userid=" + userid + "&datatoimport=" + datatoimport,

4
htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
View File

@@ -723,8 +723,8 @@ class pdf_oursin extends ModelePDFFactures
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->line( $this->marges['g'], $tab_top+8, 210-$this->marges['d'], $tab_top+8 ); $pdf->line($this->marges['g'], $tab_top+8, 210-$this->marges['d'], $tab_top+8);
$pdf->line( $this->marges['g'], $tab_top + $tab_height, 210-$this->marges['d'], $tab_top + $tab_height ); $pdf->line($this->marges['g'], $tab_top + $tab_height, 210-$this->marges['d'], $tab_top + $tab_height);
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);

2
htdocs/includes/modules/mailings/peche.modules.php
View File

@@ -76,7 +76,7 @@ class mailing_peche extends MailingTargets
{ {
global $langs; global $langs;
return $langs->trans('LineInFile',$id); return $langs->trans('LineInFile',$id);
//' - '.$langs->trans("File").' '.dol_trunc( ,12); //' - '.$langs->trans("File").' '.dol_trunc(,12);
} }

6
htdocs/install/etape1.php
View File

@@ -368,13 +368,13 @@ if (! $error && $db->connected && $action == "set")
} }
// Force https // Force https
$main_force_https = ( (GETPOST("main_force_https") && ( GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1) ) ? '1' : '0'); $main_force_https = ((GETPOST("main_force_https") && ( GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1) ) ? '1' : '0');
// Use alternative directory // Use alternative directory
$main_use_alt_dir = ( (GETPOST("main_use_alt_dir") && ( GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1) ) ? '' : '#'); $main_use_alt_dir = ((GETPOST("main_use_alt_dir") && ( GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1) ) ? '' : '#');
// Alternative root directory name // Alternative root directory name
$main_alt_dir_name = ( (GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom'); $main_alt_dir_name = ((GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom');
// Write conf file on disk // Write conf file on disk
if (! $error) if (! $error)

26
htdocs/lib/ajax.lib.php
View File

@@ -72,7 +72,7 @@ function ajax_autocompleter($selected='',$htmlname,$url,$option='',$minLength=2,
return jQuery( "<li></li>" ) return jQuery( "<li></li>" )
.data( "item.autocomplete", item ) .data( "item.autocomplete", item )
.append( \'<a href="#"><span class="tag">\' + item.label + "</span></a>" ) .append( \'<a href="#"><span class="tag">\' + item.label + "</span></a>" )
.appendTo( ul ); .appendTo(ul);
}; };
});'; });';
$script.= '</script>'; $script.= '</script>';
@@ -186,7 +186,7 @@ function ajax_dialog($title,$message,$w=350,$h=150)
modal: true, modal: true,
buttons: { buttons: {
Ok: function() { Ok: function() {
jQuery( this ).dialog(\'close\'); jQuery(this ).dialog(\'close\');
} }
} }
}); });
@@ -208,7 +208,7 @@ function ajax_combobox($htmlname)
{ {
$msg.= '<script type="text/javascript"> $msg.= '<script type="text/javascript">
$(function() { $(function() {
$( "#'.$htmlname.'" ).combobox(); $("#'.$htmlname.'" ).combobox();
}); });
</script>'; </script>';
@@ -239,15 +239,15 @@ function ajax_constantonoff($code,$input=array())
name: \''.$code.'\' name: \''.$code.'\'
}, },
function() { function() {
$( "#set_'.$code.'" ).hide(); $("#set_'.$code.'" ).hide();
$( "#del_'.$code.'" ).show(); $("#del_'.$code.'" ).show();
// Enable another object // Enable another object
if (input.length > 0) { if (input.length > 0) {
$.each(input, function(key,value) { $.each(input, function(key,value) {
$( "#" + value).removeAttr("disabled"); $("#" + value).removeAttr("disabled");
if ( $( "#" + value).hasClass("butActionRefused") == true ) { if ( $( "#" + value).hasClass("butActionRefused") == true ) {
$( "#" + value).removeClass("butActionRefused"); $("#" + value).removeClass("butActionRefused");
$( "#" + value).addClass("butAction"); $("#" + value).addClass("butAction");
} }
}); });
} }
@@ -261,15 +261,15 @@ function ajax_constantonoff($code,$input=array())
name: \''.$code.'\' name: \''.$code.'\'
}, },
function() { function() {
$( "#del_'.$code.'" ).hide(); $("#del_'.$code.'" ).hide();
$( "#set_'.$code.'" ).show(); $("#set_'.$code.'" ).show();
// Disable another object // Disable another object
if (input.length > 0) { if (input.length > 0) {
$.each(input, function(key,value) { $.each(input, function(key,value) {
$( "#" + value).attr("disabled", true); $("#" + value).attr("disabled", true);
if ( $( "#" + value).hasClass("butAction") == true ) { if ( $( "#" + value).hasClass("butAction") == true ) {
$( "#" + value).removeClass("butAction"); $("#" + value).removeClass("butAction");
$( "#" + value).addClass("butActionRefused"); $("#" + value).addClass("butActionRefused");
} }
}); });
} }

2
htdocs/lib/date.lib.php
View File

@@ -136,7 +136,7 @@ function ConvertSecondToTime($iSecond,$format='all',$lengthOfDay=86400,$lengthOf
{ {
if ($sDay >= $lengthOfWeek) if ($sDay >= $lengthOfWeek)
{ {
$sWeek = (int) ( ( $sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek ); $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
$sDay = $sDay % $lengthOfWeek; $sDay = $sDay % $lengthOfWeek;
$weekTranslate = $langs->trans("DurationWeek"); $weekTranslate = $langs->trans("DurationWeek");
if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks"); if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");

2
htdocs/lib/files.lib.php
View File

@@ -888,7 +888,7 @@ function dol_convert_file($file,$ext='png')
if ($ret) if ($ret)
{ {
$count = $image->getNumberImages(); $count = $image->getNumberImages();
$ret = $image->writeImages( $file . "." . $ext, true ); $ret = $image->writeImages($file . "." . $ext, true);
if ($ret) return $count; if ($ret) return $count;
else return -3; else return -3;
} }

10
htdocs/lib/ldap.class.php
View File

@@ -168,7 +168,7 @@ class Ldap
else else
{ {
// Connected, now try binding anonymously // Connected, now try binding anonymously
$this->result=@ldap_bind( $this->connection); $this->result=@ldap_bind($this->connection);
} }
return true; return true;
} }
@@ -837,8 +837,8 @@ class Ldap
// Get values // Get values
if (! $values = ldap_get_attributes( $this->connection, $entry)) if (! $values = ldap_get_attributes( $this->connection, $entry))
{ {
$this->ldapErrorCode = ldap_errno( $this->connection); $this->ldapErrorCode = ldap_errno($this->connection);
$this->ldapErrorText = ldap_error( $this->connection); $this->ldapErrorText = ldap_error($this->connection);
return false; // No matching attributes return false; // No matching attributes
} }
@@ -872,8 +872,8 @@ class Ldap
// Get values // Get values
if (! $values = @ldap_get_values( $this->connection, $entry, $attribute)) if (! $values = @ldap_get_values( $this->connection, $entry, $attribute))
{ {
$this->ldapErrorCode = ldap_errno( $this->connection); $this->ldapErrorCode = ldap_errno($this->connection);
$this->ldapErrorText = ldap_error( $this->connection); $this->ldapErrorText = ldap_error($this->connection);
return false; // No matching attributes return false; // No matching attributes
} }

44
htdocs/lib/price.lib.php
View File

@@ -47,59 +47,59 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $txlocalta
{ {
// We work to define prices using the price without tax // We work to define prices using the price without tax
$tot_sans_remise = $pu * $qty; $tot_sans_remise = $pu * $qty;
$tot_avec_remise_ligne = $tot_sans_remise * ( 1 - ($remise_percent_ligne / 100)); $tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));
$tot_avec_remise = $tot_avec_remise_ligne * ( 1 - ($remise_percent_global / 100)); $tot_avec_remise = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
$result[6] = price2num($tot_sans_remise, 'MT'); $result[6] = price2num($tot_sans_remise, 'MT');
$result[8] = price2num($tot_sans_remise * ( 1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result8bis= price2num($tot_sans_remise * ( 1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
$result[7] = $result8bis - $result[6]; $result[7] = $result8bis - $result[6];
$result[0] = price2num($tot_avec_remise, 'MT'); $result[0] = price2num($tot_avec_remise, 'MT');
$result[2] = price2num($tot_avec_remise * ( 1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result2bis= price2num($tot_avec_remise * ( 1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
$result[1] = $result2bis - $result[0]; // Total VAT = TTC - HT $result[1] = $result2bis - $result[0]; // Total VAT = TTC - HT
$result[3] = price2num($pu, 'MU'); $result[3] = price2num($pu, 'MU');
$result[5] = price2num($pu * ( 1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU'); // Selon TVA NPR ou non $result[5] = price2num($pu * (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU'); // Selon TVA NPR ou non
$result5bis= price2num($pu * ( 1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR) $result5bis= price2num($pu * (1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR)
$result[4] = $result5bis - $result[3]; $result[4] = $result5bis - $result[3];
} }
else else
{ {
// We work to define prices using the price with tax // We work to define prices using the price with tax
$tot_sans_remise = $pu * $qty; $tot_sans_remise = $pu * $qty;
$tot_avec_remise_ligne = $tot_sans_remise * ( 1 - ($remise_percent_ligne / 100)); $tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));
$tot_avec_remise = $tot_avec_remise_ligne * ( 1 - ($remise_percent_global / 100)); $tot_avec_remise = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
$result[8] = price2num($tot_sans_remise, 'MT'); $result[8] = price2num($tot_sans_remise, 'MT');
$result[6] = price2num($tot_sans_remise / ( 1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result6bis= price2num($tot_sans_remise / ( 1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
$result[7] = $result[8] - $result6bis; $result[7] = $result[8] - $result6bis;
$result[2] = price2num($tot_avec_remise, 'MT'); $result[2] = price2num($tot_avec_remise, 'MT');
$result[0] = price2num($tot_avec_remise / ( 1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non $result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT'); // Selon TVA NPR ou non
$result0bis= price2num($tot_avec_remise / ( 1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR) $result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
$result[1] = $result[2] - $result0bis; // Total VAT = TTC - HT $result[1] = $result[2] - $result0bis; // Total VAT = TTC - HT
$result[5] = price2num($pu, 'MU'); $result[5] = price2num($pu, 'MU');
$result[3] = price2num($pu / ( 1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU'); // Selon TVA NPR ou non $result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU'); // Selon TVA NPR ou non
$result3bis= price2num($pu / ( 1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR) $result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR)
$result[4] = $result[5] - $result3bis; $result[4] = $result[5] - $result3bis;
} }
//Local taxes //Local taxes
if ($txlocaltax1>0) if ($txlocaltax1>0)
{ {
$result[14] = price2num(($tot_sans_remise * ( 1 + ( $txlocaltax1 / 100))) - $tot_sans_remise, 'MT'); $result[14] = price2num(($tot_sans_remise * (1 + ( $txlocaltax1 / 100))) - $tot_sans_remise, 'MT');
$result[8] = $result[8] + $result[14]; $result[8] = $result[8] + $result[14];
$result[9] = price2num(($tot_avec_remise * ( 1 + ( $txlocaltax1 / 100))) - $tot_avec_remise, 'MT'); $result[9] = price2num(($tot_avec_remise * (1 + ( $txlocaltax1 / 100))) - $tot_avec_remise, 'MT');
$result[2] = $result[2] + $result[9]; $result[2] = $result[2] + $result[9];
$result[11] = price2num(($pu * ( 1 + ( $txlocaltax1 / 100))) - $pu, 'MT'); $result[11] = price2num(($pu * (1 + ( $txlocaltax1 / 100))) - $pu, 'MT');
$result[5] = $result[5] + $result[11]; $result[5] = $result[5] + $result[11];
} }
else else
@@ -111,9 +111,9 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $txlocalta
if ($txlocaltax2>0) if ($txlocaltax2>0)
{ {
$result[15] = price2num(($tot_sans_remise * ( 1 + ( $txlocaltax2 / 100))) - $tot_sans_remise, 'MT'); $result[15] = price2num(($tot_sans_remise * (1 + ( $txlocaltax2 / 100))) - $tot_sans_remise, 'MT');
$result[10] = price2num(($tot_avec_remise * ( 1 + ( $txlocaltax2 / 100))) - $tot_avec_remise, 'MT'); $result[10] = price2num(($tot_avec_remise * (1 + ( $txlocaltax2 / 100))) - $tot_avec_remise, 'MT');
$result[12] = price2num(($pu * ( 1 + ( $txlocaltax2 / 100))) - $pu, 'MT'); $result[12] = price2num(($pu * (1 + ( $txlocaltax2 / 100))) - $pu, 'MT');
//If Country is Spain, localtax2 (IRPF) will be subtracted //If Country is Spain, localtax2 (IRPF) will be subtracted
if ($mysoc->pays_code=='ES') if ($mysoc->pays_code=='ES')

2
htdocs/main.inc.php
View File

@@ -1098,7 +1098,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
{ {
print '<script type="text/javascript"> print '<script type="text/javascript">
jQuery(document).ready(function () { jQuery(document).ready(function () {
jQuery("body").layout( layoutSettings ); jQuery("body").layout(layoutSettings);
}); });
var layoutSettings = { var layoutSettings = {
name: "mainlayout", name: "mainlayout",

2
htdocs/paypal/lib/paypal.lib.php
View File

@@ -696,7 +696,7 @@ function deformatNVP($nvpstr)
$keyval=substr($nvpstr,$intial,$keypos); $keyval=substr($nvpstr,$intial,$keypos);
$valval=substr($nvpstr,$keypos+1,$valuepos-$keypos-1); $valval=substr($nvpstr,$keypos+1,$valuepos-$keypos-1);
//decoding the respose //decoding the respose
$nvpArray[urldecode($keyval)] =urldecode( $valval); $nvpArray[urldecode($keyval)] =urldecode($valval);
$nvpstr=substr($nvpstr,$valuepos+1,strlen($nvpstr)); $nvpstr=substr($nvpstr,$valuepos+1,strlen($nvpstr));
} }
return $nvpArray; return $nvpArray;

2
htdocs/product/traduction.php
View File

@@ -202,7 +202,7 @@ else
print '<tr><td width="15%">'.$langs->trans('Note').'</td><td>'.$product->multilangs[$key]["note"].'</td></tr>'; print '<tr><td width="15%">'.$langs->trans('Note').'</td><td>'.$product->multilangs[$key]["note"].'</td></tr>';
print '</table>'; print '</table>';
} }
if ( !$cnt_trans ) print '<br>'. $langs->trans('NoTranslation'); if (!$cnt_trans ) print '<br>'. $langs->trans('NoTranslation');
} }
print "</div>\n"; print "</div>\n";

2
htdocs/projet/ganttchart.php
View File

@@ -156,7 +156,7 @@ function constructGanttLine($tarr,$task,$project_dependencies,$level=0,$project_
} }
function findChildGanttLine($tarr,$parent,$project_dependencies,$level) { function findChildGanttLine($tarr,$parent,$project_dependencies,$level) {
$n=count( $tarr ); $n=count($tarr);
for ($x=0; $x < $n; $x++) { for ($x=0; $x < $n; $x++) {
if($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"]) if($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"])
{ {

4
htdocs/projet/ganttview.php
View File

@@ -55,9 +55,7 @@ $langs->load("projects");
* View * View
*/ */
$arrayofcss=array( $arrayofcss=array('/includes/jsgantt/jsgantt.css');
'/includes/jsgantt/jsgantt.css'
);
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax))
{ {

4
htdocs/societe/class/societe.class.php
View File

@@ -1049,7 +1049,7 @@ class Societe extends CommonObject
global $conf; global $conf;
$sql = "SELECT nom as name FROM ".MAIN_DB_PREFIX."societe WHERE rowid = '".$this->id."'"; $sql = "SELECT nom as name FROM ".MAIN_DB_PREFIX."societe WHERE rowid = '".$this->id."'";
$resql=$this->db->query( $sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
if ($this->db->num_rows($resql)) if ($this->db->num_rows($resql))
@@ -1116,7 +1116,7 @@ class Societe extends CommonObject
$sql.= " WHERE prefix_comm = '".$prefix."'"; $sql.= " WHERE prefix_comm = '".$prefix."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$resql=$this->db->query( $sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$obj=$this->db->fetch_object($resql); $obj=$this->db->fetch_object($resql);

36
htdocs/theme/auguria/fckeditor/fck_dialog_ie6.js
View File

@@ -34,45 +34,45 @@
switch ( child.className ) switch ( child.className )
{ {
case 'contents' : case 'contents' :
child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ; // -left -right child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ; // -bottom -top child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
break ; break ;
case 'blocker' : case 'blocker' :
case 'cover' : case 'cover' :
child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ; // -left -right + 4 child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ; // -bottom -top + 4 child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
break ; break ;
case 'tr' : case 'tr' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 16);
break ; break ;
case 'tc' : case 'tc' :
child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ; child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
break ; break ;
case 'ml' : case 'ml' :
child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
break ; break ;
case 'mr' : case 'mr' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 16);
child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
break ; break ;
case 'bl' : case 'bl' :
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
case 'br' : case 'br' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 30);
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
case 'bc' : case 'bc' :
child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ; child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
} }
} }
@@ -90,7 +90,7 @@
var fixCloseButton = function() var fixCloseButton = function()
{ {
var closeButton = document.getElementById ( 'closeButton' ) ; var closeButton = document.getElementById ('closeButton');
closeButton.onmouseover = closeButtonOver ; closeButton.onmouseover = closeButtonOver ;
closeButton.onmouseout = closeButtonOut ; closeButton.onmouseout = closeButtonOut ;
@@ -101,10 +101,10 @@
fixSizes() ; fixSizes() ;
fixCloseButton() ; fixCloseButton() ;
window.attachEvent( 'onresize', fixSizes ) ; window.attachEvent('onresize', fixSizes);
window.detachEvent( 'onload', onLoad ) ; window.detachEvent('onload', onLoad);
} }
window.attachEvent( 'onload', onLoad ) ; window.attachEvent('onload', onLoad);
})() ; })() ;

14
htdocs/theme/auguria/fckeditor/fckconfig.js
View File

@@ -50,13 +50,13 @@ FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCK
FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
// FCKConfig.Plugins.Add( 'autogrow' ) ; // FCKConfig.Plugins.Add('autogrow');
// FCKConfig.Plugins.Add( 'dragresizetable' ); // FCKConfig.Plugins.Add( 'dragresizetable' );
FCKConfig.AutoGrowMax = 400 ; FCKConfig.AutoGrowMax = 400 ;
// FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ; // ASP style server side code <%...%> // FCKConfig.ProtectedSource.Add(/<%[\s\S]*?%>/g); // ASP style server side code <%...%>
// FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ; // PHP style server side code // FCKConfig.ProtectedSource.Add(/<\?[\s\S]*?\?>/g); // PHP style server side code
// FCKConfig.ProtectedSource.Add( /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi ) ; // ASP.Net style tags <asp:control> // FCKConfig.ProtectedSource.Add(/(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi); // ASP.Net style tags <asp:control>
FCKConfig.AutoDetectLanguage = true ; FCKConfig.AutoDetectLanguage = true ;
FCKConfig.DefaultLanguage = 'en' ; FCKConfig.DefaultLanguage = 'en' ;
@@ -317,17 +317,17 @@ var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowse
var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ; var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ;
FCKConfig.LinkBrowser = true ; FCKConfig.LinkBrowser = true ;
FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70%
FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70%
FCKConfig.ImageBrowser = true ; FCKConfig.ImageBrowser = true ;
FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ;
FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ;
FCKConfig.FlashBrowser = true ; FCKConfig.FlashBrowser = true ;
FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ; FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ;
FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ; FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;

2
htdocs/theme/auguria/style.css.php
View File

@@ -33,7 +33,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter( FALSE ); session_cache_limiter(FALSE);
require_once("../../main.inc.php"); require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");

36
htdocs/theme/bureau2crea/fckeditor/fck_dialog_ie6.js
View File

@@ -34,45 +34,45 @@
switch ( child.className ) switch ( child.className )
{ {
case 'contents' : case 'contents' :
child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ; // -left -right child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ; // -bottom -top child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
break ; break ;
case 'blocker' : case 'blocker' :
case 'cover' : case 'cover' :
child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ; // -left -right + 4 child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ; // -bottom -top + 4 child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
break ; break ;
case 'tr' : case 'tr' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 16);
break ; break ;
case 'tc' : case 'tc' :
child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ; child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
break ; break ;
case 'ml' : case 'ml' :
child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
break ; break ;
case 'mr' : case 'mr' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 16);
child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
break ; break ;
case 'bl' : case 'bl' :
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
case 'br' : case 'br' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 30);
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
case 'bc' : case 'bc' :
child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ; child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
} }
} }
@@ -90,7 +90,7 @@
var fixCloseButton = function() var fixCloseButton = function()
{ {
var closeButton = document.getElementById ( 'closeButton' ) ; var closeButton = document.getElementById ('closeButton');
closeButton.onmouseover = closeButtonOver ; closeButton.onmouseover = closeButtonOver ;
closeButton.onmouseout = closeButtonOut ; closeButton.onmouseout = closeButtonOut ;
@@ -101,10 +101,10 @@
fixSizes() ; fixSizes() ;
fixCloseButton() ; fixCloseButton() ;
window.attachEvent( 'onresize', fixSizes ) ; window.attachEvent('onresize', fixSizes);
window.detachEvent( 'onload', onLoad ) ; window.detachEvent('onload', onLoad);
} }
window.attachEvent( 'onload', onLoad ) ; window.attachEvent('onload', onLoad);
})() ; })() ;

14
htdocs/theme/bureau2crea/fckeditor/fckconfig.js
View File

@@ -50,13 +50,13 @@ FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCK
FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
// FCKConfig.Plugins.Add( 'autogrow' ) ; // FCKConfig.Plugins.Add('autogrow');
// FCKConfig.Plugins.Add( 'dragresizetable' ); // FCKConfig.Plugins.Add( 'dragresizetable' );
FCKConfig.AutoGrowMax = 400 ; FCKConfig.AutoGrowMax = 400 ;
// FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ; // ASP style server side code <%...%> // FCKConfig.ProtectedSource.Add(/<%[\s\S]*?%>/g); // ASP style server side code <%...%>
// FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ; // PHP style server side code // FCKConfig.ProtectedSource.Add(/<\?[\s\S]*?\?>/g); // PHP style server side code
// FCKConfig.ProtectedSource.Add( /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi ) ; // ASP.Net style tags <asp:control> // FCKConfig.ProtectedSource.Add(/(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi); // ASP.Net style tags <asp:control>
FCKConfig.AutoDetectLanguage = true ; FCKConfig.AutoDetectLanguage = true ;
FCKConfig.DefaultLanguage = 'en' ; FCKConfig.DefaultLanguage = 'en' ;
@@ -316,17 +316,17 @@ var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowse
var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ; var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ;
FCKConfig.LinkBrowser = true ; FCKConfig.LinkBrowser = true ;
FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70%
FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70%
FCKConfig.ImageBrowser = true ; FCKConfig.ImageBrowser = true ;
FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ;
FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ;
FCKConfig.FlashBrowser = true ; FCKConfig.FlashBrowser = true ;
FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ; FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ;
FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ; FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;

36
htdocs/theme/cameleo/fckeditor/fck_dialog_ie6.js
View File

@@ -34,45 +34,45 @@
switch ( child.className ) switch ( child.className )
{ {
case 'contents' : case 'contents' :
child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ; // -left -right child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ; // -bottom -top child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
break ; break ;
case 'blocker' : case 'blocker' :
case 'cover' : case 'cover' :
child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ; // -left -right + 4 child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ; // -bottom -top + 4 child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
break ; break ;
case 'tr' : case 'tr' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 16);
break ; break ;
case 'tc' : case 'tc' :
child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ; child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
break ; break ;
case 'ml' : case 'ml' :
child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
break ; break ;
case 'mr' : case 'mr' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 16);
child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
break ; break ;
case 'bl' : case 'bl' :
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
case 'br' : case 'br' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 30);
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
case 'bc' : case 'bc' :
child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ; child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
} }
} }
@@ -90,7 +90,7 @@
var fixCloseButton = function() var fixCloseButton = function()
{ {
var closeButton = document.getElementById ( 'closeButton' ) ; var closeButton = document.getElementById ('closeButton');
closeButton.onmouseover = closeButtonOver ; closeButton.onmouseover = closeButtonOver ;
closeButton.onmouseout = closeButtonOut ; closeButton.onmouseout = closeButtonOut ;
@@ -101,10 +101,10 @@
fixSizes() ; fixSizes() ;
fixCloseButton() ; fixCloseButton() ;
window.attachEvent( 'onresize', fixSizes ) ; window.attachEvent('onresize', fixSizes);
window.detachEvent( 'onload', onLoad ) ; window.detachEvent('onload', onLoad);
} }
window.attachEvent( 'onload', onLoad ) ; window.attachEvent('onload', onLoad);
})() ; })() ;

14
htdocs/theme/cameleo/fckeditor/fckconfig.js
View File

@@ -50,13 +50,13 @@ FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCK
FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
// FCKConfig.Plugins.Add( 'autogrow' ) ; // FCKConfig.Plugins.Add('autogrow');
// FCKConfig.Plugins.Add( 'dragresizetable' ); // FCKConfig.Plugins.Add( 'dragresizetable' );
FCKConfig.AutoGrowMax = 400 ; FCKConfig.AutoGrowMax = 400 ;
// FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ; // ASP style server side code <%...%> // FCKConfig.ProtectedSource.Add(/<%[\s\S]*?%>/g); // ASP style server side code <%...%>
// FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ; // PHP style server side code // FCKConfig.ProtectedSource.Add(/<\?[\s\S]*?\?>/g); // PHP style server side code
// FCKConfig.ProtectedSource.Add( /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi ) ; // ASP.Net style tags <asp:control> // FCKConfig.ProtectedSource.Add(/(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi); // ASP.Net style tags <asp:control>
FCKConfig.AutoDetectLanguage = true ; FCKConfig.AutoDetectLanguage = true ;
FCKConfig.DefaultLanguage = 'en' ; FCKConfig.DefaultLanguage = 'en' ;
@@ -317,17 +317,17 @@ var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowse
var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ; var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ;
FCKConfig.LinkBrowser = true ; FCKConfig.LinkBrowser = true ;
FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70%
FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70%
FCKConfig.ImageBrowser = true ; FCKConfig.ImageBrowser = true ;
FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ;
FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ;
FCKConfig.FlashBrowser = true ; FCKConfig.FlashBrowser = true ;
FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ; FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ;
FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ; FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;

8
htdocs/theme/cameleo/style.css.php
View File

@@ -35,7 +35,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter( FALSE ); session_cache_limiter(FALSE);
require_once("../../main.inc.php"); require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
@@ -344,7 +344,7 @@ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fceab
background: -webkit-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* Chrome10+,Safari5.1+ */ background: -webkit-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* Opera11.10+ */ background: -o-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* Opera11.10+ */
background: -ms-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* IE10+ */ background: -ms-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* IE10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb', endColorstr='#fbdf93',GradientType=0 ); /* IE6-9 */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceabb', endColorstr='#fbdf93',GradientType=0); /* IE6-9 */
background: linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* W3C */ background: linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* W3C */
} }
@@ -1080,7 +1080,7 @@ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fceab
background: -webkit-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* Chrome10+,Safari5.1+ */ background: -webkit-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* Opera11.10+ */ background: -o-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* Opera11.10+ */
background: -ms-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* IE10+ */ background: -ms-linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* IE10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb', endColorstr='#fbdf93',GradientType=0 ); /* IE6-9 */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceabb', endColorstr='#fbdf93',GradientType=0); /* IE6-9 */
background: linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* W3C */ background: linear-gradient(top, #fceabb 0%,#fccd4d 50%,#FFA820 87%,#fbdf93 100%); /* W3C */
} }
@@ -1620,7 +1620,7 @@ background: -moz-linear-gradient(top, #FFA820 0%, #FFA820 0%, #FFFFFF 100%); /*
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFA820), color-stop(0%,#FFA820), color-stop(100%,#FFFFFF)); /* webkit */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFA820), color-stop(0%,#FFA820), color-stop(100%,#FFFFFF)); /* webkit */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFA820', endColorstr='#FFFFFF',GradientType=0 ); /* ie */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFA820', endColorstr='#FFFFFF',GradientType=0); /* ie */
background: -o-linear-gradient(top, #FFA820 0%,#FFA820 0%,#FFFFFF 100%); /* opera */ background: -o-linear-gradient(top, #FFA820 0%,#FFA820 0%,#FFFFFF 100%); /* opera */

36
htdocs/theme/eldy/fckeditor/fck_dialog_ie6.js
View File

@@ -34,45 +34,45 @@
switch ( child.className ) switch ( child.className )
{ {
case 'contents' : case 'contents' :
child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ; // -left -right child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ; // -bottom -top child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
break ; break ;
case 'blocker' : case 'blocker' :
case 'cover' : case 'cover' :
child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ; // -left -right + 4 child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ; // -bottom -top + 4 child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
break ; break ;
case 'tr' : case 'tr' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 16);
break ; break ;
case 'tc' : case 'tc' :
child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ; child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
break ; break ;
case 'ml' : case 'ml' :
child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
break ; break ;
case 'mr' : case 'mr' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 16);
child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
break ; break ;
case 'bl' : case 'bl' :
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
case 'br' : case 'br' :
child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ; child.style.left = Math.max(0, fckDlg.clientWidth - 30);
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
case 'bc' : case 'bc' :
child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ; child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; child.style.top = Math.max(0, fckDlg.clientHeight - 51);
break ; break ;
} }
} }
@@ -90,7 +90,7 @@
var fixCloseButton = function() var fixCloseButton = function()
{ {
var closeButton = document.getElementById ( 'closeButton' ) ; var closeButton = document.getElementById ('closeButton');
closeButton.onmouseover = closeButtonOver ; closeButton.onmouseover = closeButtonOver ;
closeButton.onmouseout = closeButtonOut ; closeButton.onmouseout = closeButtonOut ;
@@ -101,10 +101,10 @@
fixSizes() ; fixSizes() ;
fixCloseButton() ; fixCloseButton() ;
window.attachEvent( 'onresize', fixSizes ) ; window.attachEvent('onresize', fixSizes);
window.detachEvent( 'onload', onLoad ) ; window.detachEvent('onload', onLoad);
} }
window.attachEvent( 'onload', onLoad ) ; window.attachEvent('onload', onLoad);
})() ; })() ;

14
htdocs/theme/eldy/fckeditor/fckconfig.js
View File

@@ -50,13 +50,13 @@ FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCK
FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ; FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
// FCKConfig.Plugins.Add( 'autogrow' ) ; // FCKConfig.Plugins.Add('autogrow');
// FCKConfig.Plugins.Add( 'dragresizetable' ); // FCKConfig.Plugins.Add( 'dragresizetable' );
FCKConfig.AutoGrowMax = 400 ; FCKConfig.AutoGrowMax = 400 ;
// FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ; // ASP style server side code <%...%> // FCKConfig.ProtectedSource.Add(/<%[\s\S]*?%>/g); // ASP style server side code <%...%>
// FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ; // PHP style server side code // FCKConfig.ProtectedSource.Add(/<\?[\s\S]*?\?>/g); // PHP style server side code
// FCKConfig.ProtectedSource.Add( /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi ) ; // ASP.Net style tags <asp:control> // FCKConfig.ProtectedSource.Add(/(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi); // ASP.Net style tags <asp:control>
FCKConfig.AutoDetectLanguage = true ; FCKConfig.AutoDetectLanguage = true ;
FCKConfig.DefaultLanguage = 'en' ; FCKConfig.DefaultLanguage = 'en' ;
@@ -317,17 +317,17 @@ var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowse
var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ; var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ;
FCKConfig.LinkBrowser = true ; FCKConfig.LinkBrowser = true ;
FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70%
FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70%
FCKConfig.ImageBrowser = true ; FCKConfig.ImageBrowser = true ;
FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ;
FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ; FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ;
FCKConfig.FlashBrowser = true ; FCKConfig.FlashBrowser = true ;
FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ; FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent(FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension);
FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ; FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ;
FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ; FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;

2
htdocs/theme/eldy/style.css.php
View File

@@ -34,7 +34,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter( FALSE ); session_cache_limiter(FALSE);
require_once("../../main.inc.php"); require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");

2
htdocs/theme/phones/smartphone/theme/default/default.css.php
View File

@@ -31,7 +31,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter( FALSE ); session_cache_limiter(FALSE);
require_once("../../../../../main.inc.php"); require_once("../../../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");

4
htdocs/user/fiche.php
View File

@@ -202,7 +202,7 @@ if ($_POST["action"] == 'add' && $canadduser)
$edituser->note = $_POST["note"]; $edituser->note = $_POST["note"];
$edituser->ldap_sid = $_POST["ldap_sid"]; $edituser->ldap_sid = $_POST["ldap_sid"];
// If multicompany is off, admin users must all be on entity 0. // If multicompany is off, admin users must all be on entity 0.
$edituser->entity = ( ! empty($_POST["admin"]) && (! empty($_POST["superadmin"]) || empty($_POST["entity"]) || empty($conf->multicompany->enabled)) ? 0 : $_POST["entity"]); $edituser->entity = (! empty($_POST["admin"]) && (! empty($_POST["superadmin"]) || empty($_POST["entity"]) || empty($conf->multicompany->enabled)) ? 0 : $_POST["entity"]);
$db->begin(); $db->begin();
@@ -298,7 +298,7 @@ if ($action == 'update' && ! $_POST["cancel"])
$edituser->webcal_login = $_POST["webcal_login"]; $edituser->webcal_login = $_POST["webcal_login"];
$edituser->phenix_login = $_POST["phenix_login"]; $edituser->phenix_login = $_POST["phenix_login"];
$edituser->phenix_pass = $_POST["phenix_pass"]; $edituser->phenix_pass = $_POST["phenix_pass"];
$edituser->entity = ( (! empty($_POST["superadmin"]) && ! empty($_POST["admin"]) || empty($_POST["entity"])) ? 0 : $_POST["entity"]); $edituser->entity = ((! empty($_POST["superadmin"]) && ! empty($_POST["admin"]) || empty($_POST["entity"])) ? 0 : $_POST["entity"]);
if (GETPOST('deletephoto')) $edituser->photo=''; if (GETPOST('deletephoto')) $edituser->photo='';
if (! empty($_FILES['photo']['name'])) $edituser->photo = dol_sanitizeFileName($_FILES['photo']['name']); if (! empty($_FILES['photo']['name'])) $edituser->photo = dol_sanitizeFileName($_FILES['photo']['name']);

2
htdocs/user/passwordforgotten.php
View File

@@ -46,7 +46,7 @@ if (! $mode) $mode='http';
$username = GETPOST('username'); $username = GETPOST('username');
$passwordmd5 = GETPOST('passwordmd5'); $passwordmd5 = GETPOST('passwordmd5');
$conf->entity = ( GETPOST('entity') ? GETPOST('entity') : 1 ); $conf->entity = (GETPOST('entity') ? GETPOST('entity') : 1);
/** /**