Skip to content

Commit

Permalink
Fix: avoid jenkins warning
Browse files Browse the repository at this point in the history 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
  • Loading branch information
@hregis
hregis committed Sep 20, 2011
1 parent 493c009 commit b6a2f13
Show file tree
Hide file tree
Showing 70 changed files with 287 additions and 302 deletions.
4 changes: 2 additions & 2 deletions dev/translation/langAutoParser.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ private function translateFileLine($content,$file,$key,$value,$mydestLang)

private function getLineKey($line){
$arraykey = explode('=',$line,2);
return trim( $arraykey[0] );
return trim($arraykey[0]);
}

private function getLineValue($line){
$arraykey = explode('=',$line,2);
return trim( $arraykey[1] );
return trim($arraykey[1]);
}

private function getTranslationFilesArray($lang){
Expand Down
4 changes: 1 addition & 3 deletions htdocs/adherents/admin/adherent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,7 @@
/*
* Edition info modele document
*/
$constantes=array(
'ADHERENT_ETIQUETTE_TYPE'
);
$constantes=array('ADHERENT_ETIQUETTE_TYPE');

print_fiche_titre($langs->trans("MembersTickets"),'','');

Expand Down
3 changes: 1 addition & 2 deletions htdocs/adherents/card_subscriptions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,8 +792,7 @@
}

// Create a form array
$formquestion=array(
array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
$formquestion=array( 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);
if ($ret == 'html') print '<br>';
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/class/adherent.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ function delete($rowid)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."cotisation WHERE fk_adherent = ".$rowid;
dol_syslog(get_class($this)."::delete sql=".$sql);
$resql=$this->db->query( $sql);
$resql=$this->db->query($sql);
if ($resql)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid;
Expand Down Expand Up @@ -925,7 +925,7 @@ function fetch_login($login)
$sql.= " WHERE login='".$login."'";
$sql.= " AND entity = ".$conf->entity;

$resql=$this->db->query( $sql);
$resql=$this->db->query($sql);

if ($resql)
{
Expand Down
3 changes: 1 addition & 2 deletions htdocs/adherents/fiche.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1111,8 +1111,7 @@
}

// Create a form array
$formquestion=array(
array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
$formquestion=array( 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);
if ($ret == 'html') print '<br>';
Expand Down
2 changes: 1 addition & 1 deletion htdocs/boutique/client/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
$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 .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset);
$sql .= $dbosc->plimit($limit ,$offset);

$resql=$dbosc->query($sql);
if ($resql)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/boutique/commande/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
$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 .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset);
$sql .= $dbosc->plimit($limit ,$offset);

$resql=$dbosc->query($sql);
if ($resql)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/boutique/critiques/bestproduct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
$sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status";

$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 "<TR class=\"liste_titre\"><td>".$langs->trans("Ref");
Expand Down
2 changes: 1 addition & 1 deletion htdocs/boutique/critiques/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
$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 .= " 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 '<TR class="liste_titre">';
Expand Down
2 changes: 1 addition & 1 deletion htdocs/boutique/notification/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
$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 .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset);
$sql .= $dbosc->plimit($limit ,$offset);

$resql=$dbosc->query($sql);
if ($resql)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/boutique/notification/produits.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
$sql .= " WHERE p.products_id=n.products_id";
$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " GROUP BY p.products_name, p.products_id";
$sql .= $dbosc->plimit( $limit ,$offset);
$sql .= $dbosc->plimit($limit ,$offset);

$resql=$dbosc->query($sql);
if ($resql)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/boutique/produits/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
$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 .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit( $limit ,$offset);
$sql .= $dbosc->plimit($limit ,$offset);

$resql=$dbosc->query($sql);
if ($resql)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/boutique/produits/osc-liste.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}

//$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 '<TR class="liste_titre">';
Expand Down
4 changes: 2 additions & 2 deletions htdocs/boutique/promotion/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
$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.= " ORDER BY $sortfield $sortorder ";
$sql.= $dbosc->plimit( $limit ,$offset);
$sql.= $dbosc->plimit($limit ,$offset);

$resql=$dbosc->query($sql);
if ($resql)
Expand All @@ -79,7 +79,7 @@
$var=True;
while ($i < $num)
{
$objp = $dbosc->fetch_object( $i);
$objp = $dbosc->fetch_object($i);
$var=!$var;

print "<tr $bc[$var]>";
Expand Down
6 changes: 3 additions & 3 deletions htdocs/boxes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ function printBoxesArea($user,$areacode)
';
print "\n";
print 'function updateOrder(){'."\n";
print 'var left_list = cleanSerialize(jQuery("#left").sortable( "serialize" ));'."\n";
print 'var right_list = cleanSerialize(jQuery("#right").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 boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
//print 'alert( \'boxorder=\' + boxorder );';
//print 'alert(\'boxorder=\' + boxorder);';
print 'var userid = \''.$user->id.'\';'."\n";
print 'jQuery.get(\'core/ajaxbox.php?boxorder=\'+boxorder+\'&userid=\'+'.$user->id.');'."\n";
print '}'."\n";
Expand Down
2 changes: 1 addition & 1 deletion htdocs/cashdesk/class/Auth.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Auth {
function Auth ($DB) {

$this->db = $DB;
$this->reponse (null);
$this->reponse(null);

}

Expand Down
12 changes: 6 additions & 6 deletions htdocs/cashdesk/class/Facturation.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,14 @@ public function calculTotaux()
*/
public function raz ()
{
$this->id ('RESET');
$this->ref ('RESET');
$this->qte ('RESET');
$this->stock ('RESET');
$this->id('RESET');
$this->ref('RESET');
$this->qte('RESET');
$this->stock('RESET');
$this->remise_percent ('RESET');
$this->montant_remise ('RESET');
$this->prix ('RESET');
$this->tva ('RESET');
$this->prix('RESET');
$this->tva('RESET');

}

Expand Down
10 changes: 5 additions & 5 deletions htdocs/cashdesk/facturation_verif.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
}
/** end add Ditto */

$obj_facturation->id( $ret['rowid'] );
$obj_facturation->ref( $ret['ref'] );
$obj_facturation->stock( $ret['reel'] );
$obj_facturation->prix( $ret['price'] );
$obj_facturation->tva( $ret['tva_tx'] );
$obj_facturation->id($ret['rowid']);
$obj_facturation->ref($ret['ref']);
$obj_facturation->stock($ret['reel']);
$obj_facturation->prix($ret['price']);
$obj_facturation->tva($ret['tva_tx']);

// Definition du filtre pour n'afficher que le produit concerne
if ( $_POST['hdnSource'] == 'LISTE' )
Expand Down
2 changes: 1 addition & 1 deletion htdocs/cashdesk/tpl/facturation1.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled="disabled" />
</td>
<!-- 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>
<!-- Choix de la remise -->
<td><input class="texte1" type="text" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/></td>
Expand Down
2 changes: 1 addition & 1 deletion htdocs/cashdesk/tpl/liste_articles.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

$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");

}
Expand Down
4 changes: 2 additions & 2 deletions htdocs/compta/deplacement/fiche.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@

if ($id > 0)
{
Header ( "Location: fiche.php?id=".$id);
Header ("Location: fiche.php?id=".$id);
exit;
}
else
Expand All @@ -117,7 +117,7 @@
}
else
{
Header ( "Location: index.php");
Header ("Location: index.php");
exit;
}
}
Expand Down
4 changes: 2 additions & 2 deletions htdocs/compta/facture/class/facture.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,7 @@ function calculate_date_lim_reglement($cond_reglement_id=0)
/* Definition de la date limite */

// 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"
if ($cdr_fdm)
Expand All @@ -1325,7 +1325,7 @@ function calculate_date_lim_reglement($cond_reglement_id=0)
}

// 3 : application du decalage
$datelim += ( $cdr_decalage * 3600 * 24);
$datelim += ($cdr_decalage * 3600 * 24);

return $datelim;
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/paiement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ function callToBreakdown(imgSelector) {
}

$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
$sql .= $db->plimit( $limit +1 ,$offset);
$sql .= $db->plimit($limit +1 ,$offset);
$resql = $db->query($sql);

if ($resql)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/paiement/avalider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}
$sql .= " AND p.statut = 0";
$sql .= " ORDER BY $sortfield $sortorder";
$sql .= $db->plimit( $limit +1 ,$offset);
$sql .= $db->plimit($limit +1 ,$offset);
$resql = $db->query($sql);

if ($resql)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/paiement/cheque/liste.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
$sql.=" AND bc.amount=".price2num($_GET["search_montant"]);
}
$sql.= " ORDER BY $sortfield $sortorder";
$sql.= $db->plimit( $limit+1 ,$offset);
$sql.= $db->plimit($limit+1 ,$offset);
//print "$sql";

$resql = $db->query($sql);
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/paiement/liste.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
if ($_REQUEST["search_company"]) $sql .=" AND s.nom LIKE '%".$db->escape($_REQUEST["search_company"])."%'";
}
$sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit( $limit+1 ,$offset);
$sql.= $db->plimit($limit+1 ,$offset);
//print "$sql";

$resql = $db->query($sql);
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/prelevement/class/bon-prelevement.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ function Create($banque=0, $guichet=0, $mode='real')
//Build file
$bonprev->generate();
}
dol_syslog( $filebonprev ) ;
dol_syslog($filebonprev);
dol_syslog("Fin prelevement");
}

Expand Down
2 changes: 1 addition & 1 deletion htdocs/contrat/class/contrat.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f
$sql.= " ".price2num($remise_percent).",".price2num($pu_ht).",";
$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
$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_end > 0) { $sql.= ",".$this->db->idate($date_end); }
$sql.= ")";
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/class/commonobject.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ function fetch_optionals($rowid,$optionsArray='')
$sql.= " WHERE fk_object = ".$rowid;

dol_syslog(get_class($this)."::fetch_optionals sql=".$sql, LOG_DEBUG);
$resql=$this->db->query( $sql);
$resql=$this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
Expand Down
4 changes: 2 additions & 2 deletions htdocs/core/class/dolgraph.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ function draw_artichow($file)

$plot->barBorder->setColor($colorgrey);
//$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 == 'depth') $plot->setBarPadding(0.1, 0.4);
Expand Down Expand Up @@ -543,7 +543,7 @@ function draw_artichow($file)
$plot->setThickness(1);

// Set line background gradient
$plot->setFillGradient( new LinearGradient($colorter, $colorbis, 90) );
$plot->setFillGradient(new LinearGradient($colorter, $colorbis, 90));

$plot->xAxis->setLabelText($legends);

Expand Down
4 changes: 2 additions & 2 deletions htdocs/core/class/html.form.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2156,7 +2156,7 @@ function formconfirm($page, $title, $question, $action, $formquestion='', $selec
var inputvalue = $("#" + this).val();
options += \'&\' + inputname + \'=\' + inputvalue;
});
//alert( options );
//alert(options);
}
location.href=\''.$pageyes.'\' + options;
}
Expand All @@ -2176,7 +2176,7 @@ function formconfirm($page, $title, $question, $action, $formquestion='', $selec
if (button.length > 0) {
$( "#" + button ).click(function() {
$( "#" + dialogconfirm ).dialog( \'open\' );
$("#" + dialogconfirm ).dialog(\'open\');
});
}
});
Expand Down
Loading

0 comments on commit b6a2f13

Please sign in to comment.