Fix warning
This commit is contained in:
parent
ba6374e6be
commit
fce5968510
@ -444,14 +444,14 @@ class AccountancyExport
|
||||
print $date.$separator;
|
||||
print $line->piece_num.$separator;
|
||||
print length_accountg($line->numero_compte).$separator;
|
||||
print ''.$separator;
|
||||
print $separator;
|
||||
print $line->label_operation.$separator;
|
||||
print $date.$separator;
|
||||
if ($line->sens == 'D') {
|
||||
print price($line->debit).$separator;
|
||||
print ''.$separator;
|
||||
print $separator;
|
||||
} elseif ($line->sens == 'C') {
|
||||
print ''.$separator;
|
||||
print $separator;
|
||||
print price($line->credit).$separator;
|
||||
}
|
||||
print $line->doc_ref.$separator;
|
||||
|
||||
@ -325,7 +325,7 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
|
||||
if (!empty($conf->global->MAIN_METEO_LEVEL0)) {
|
||||
$level0 = $conf->global->MAIN_METEO_LEVEL0;
|
||||
}
|
||||
$level1 = $offset + 1 * $cursor;
|
||||
$level1 = $offset + $cursor;
|
||||
if (!empty($conf->global->MAIN_METEO_LEVEL1)) {
|
||||
$level1 = $conf->global->MAIN_METEO_LEVEL1;
|
||||
}
|
||||
|
||||
@ -458,7 +458,7 @@ if ($result < 0) {
|
||||
if ($day > ($max + 86400)) {
|
||||
$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
|
||||
} else {
|
||||
$datas[$i] = 0 + $solde + $subtotal;
|
||||
$datas[$i] = $solde + $subtotal;
|
||||
}
|
||||
$datamin[$i] = $object->min_desired;
|
||||
$dataall[$i] = $object->min_allowed;
|
||||
|
||||
@ -1866,7 +1866,7 @@ class BonPrelevement extends CommonObject
|
||||
$XML_DEBITOR .= ' <PstlAdr>'.$CrLf;
|
||||
$XML_DEBITOR .= ' <Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
|
||||
$addressline1 = strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""));
|
||||
$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => ""));
|
||||
$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(CHR(13) => ", ", CHR(10) => ""));
|
||||
if (trim($addressline1)) {
|
||||
$XML_DEBITOR .= ' <AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
|
||||
}
|
||||
@ -1935,7 +1935,7 @@ class BonPrelevement extends CommonObject
|
||||
$XML_CREDITOR .= ' <PstlAdr>'.$CrLf;
|
||||
$XML_CREDITOR .= ' <Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
|
||||
$addressline1 = strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""));
|
||||
$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => ""));
|
||||
$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(CHR(13) => ", ", CHR(10) => ""));
|
||||
if (trim($addressline1)) {
|
||||
$XML_CREDITOR .= ' <AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
|
||||
}
|
||||
|
||||
@ -2072,7 +2072,7 @@ abstract class CommonObject
|
||||
|
||||
$sql .= " WHERE ".$id_field." = ".((int) $id);
|
||||
|
||||
dol_syslog(__METHOD__."", LOG_DEBUG);
|
||||
dol_syslog(__METHOD__, LOG_DEBUG);
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
if ($trigkey) {
|
||||
|
||||
@ -183,31 +183,31 @@ class DolEditor
|
||||
|
||||
$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
|
||||
|
||||
$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
|
||||
$out .= '<!-- Output ckeditor $disallowAnyContent='.dol_escape_htmltag($disallowAnyContent).' toolbarname='.dol_escape_htmltag($this->toolbarname).' -->'."\n";
|
||||
$out .= '<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
/* console.log("Run ckeditor"); */
|
||||
/* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
|
||||
/* should be editor=CKEDITOR.replace but what if there is several editors ? */
|
||||
tmpeditor = CKEDITOR.replace(\''.$this->htmlname.'\',
|
||||
tmpeditor = CKEDITOR.replace(\''.dol_escape_js($this->htmlname).'\',
|
||||
{
|
||||
/* property:xxx is same than CKEDITOR.config.property = xxx */
|
||||
customConfig: ckeditorConfig,
|
||||
removePlugins: \''.$pluginstodisable.'\',
|
||||
removePlugins: \''.dol_escape_js($pluginstodisable).'\',
|
||||
readOnly: '.($this->readonly ? 'true' : 'false').',
|
||||
htmlEncodeOutput:'.$htmlencode_force.',
|
||||
allowedContent:'.($disallowAnyContent ? 'false' : 'true').', /* Advanced Content Filter (ACF) is own when allowedContent is false */
|
||||
htmlEncodeOutput: '.dol_escape_js($htmlencode_force).',
|
||||
allowedContent: '.($disallowAnyContent ? 'false' : 'true').', /* Advanced Content Filter (ACF) is own when allowedContent is false */
|
||||
extraAllowedContent: \'a[target];div{float,display}\', /* Add the style float and display into div to default other allowed tags */
|
||||
disallowedContent: '.($disallowAnyContent ? '\'\'' : '\'\'').', /* Tags that are not allowed */
|
||||
fullPage: '.($fullpage ? 'true' : 'false').', /* if true, the html, header and body tags are kept */
|
||||
toolbar: \''.$this->toolbarname.'\',
|
||||
toolbar: \''.dol_escape_js($this->toolbarname).'\',
|
||||
toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
|
||||
width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
|
||||
height: '.$this->height.',
|
||||
skin: \''.$skin.'\',
|
||||
width: '.($this->width ? '\''.dol_escape_js($this->width).'\'' : '\'\'').',
|
||||
height: '.dol_escape_js($this->height).',
|
||||
skin: \''.dol_escape_js($skin).'\',
|
||||
'.$scaytautostartup.'
|
||||
language: \''.$langs->defaultlang.'\',
|
||||
textDirection: \''.$langs->trans("DIRECTION").'\',
|
||||
language: \''.dol_escape_js($langs->defaultlang).'\',
|
||||
textDirection: \''.dol_escape_js($langs->trans("DIRECTION")).'\',
|
||||
on : {
|
||||
instanceReady : function( ev )
|
||||
{
|
||||
|
||||
@ -1173,7 +1173,7 @@ class DolGraph
|
||||
} else {
|
||||
$this->stringtoshow .= 'legend: { labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
|
||||
if (!empty($legendMaxLines)) {
|
||||
$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
|
||||
$this->stringtoshow .= ', maxLines: ' . $legendMaxLines;
|
||||
}
|
||||
$this->stringtoshow .= ' }, ' . "\n";
|
||||
}
|
||||
@ -1185,7 +1185,7 @@ class DolGraph
|
||||
} else {
|
||||
$this->stringtoshow .= 'legend: { labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
|
||||
if (!empty($legendMaxLines)) {
|
||||
$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
|
||||
$this->stringtoshow .= ', maxLines: ' . $legendMaxLines;
|
||||
}
|
||||
$this->stringtoshow .= ' }, ' . "\n";
|
||||
}
|
||||
|
||||
@ -2755,7 +2755,7 @@ class lessc_parser
|
||||
|
||||
// media
|
||||
if ($this->literal('@media')) {
|
||||
if (($this->mediaQueryList($mediaQueries) || true)
|
||||
if ($this->mediaQueryList($mediaQueries)
|
||||
&& $this->literal('{')
|
||||
) {
|
||||
$media = $this->pushSpecialBlock("media");
|
||||
@ -2769,7 +2769,7 @@ class lessc_parser
|
||||
|
||||
if ($this->literal("@", false) && $this->keyword($dirName)) {
|
||||
if ($this->isDirective($dirName, $this->blockDirectives)) {
|
||||
if (($this->openString("{", $dirValue, null, array(";")) || true) &&
|
||||
if ($this->openString("{", $dirValue, null, array(";")) &&
|
||||
$this->literal("{")
|
||||
) {
|
||||
$dir = $this->pushSpecialBlock("directive");
|
||||
@ -2807,7 +2807,7 @@ class lessc_parser
|
||||
|
||||
// opening parametric mixin
|
||||
if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
|
||||
($this->guards($guards) || true) &&
|
||||
$this->guards($guards) &&
|
||||
$this->literal('{')
|
||||
) {
|
||||
$block = $this->pushBlock($this->fixTags(array($tag)));
|
||||
@ -2870,8 +2870,8 @@ class lessc_parser
|
||||
|
||||
// mixin
|
||||
if ($this->mixinTags($tags) &&
|
||||
($this->argumentDef($argv, $isVararg) || true) &&
|
||||
($this->keyword($suffix) || true) && $this->end()
|
||||
$this->argumentDef($argv, $isVararg) &&
|
||||
$this->keyword($suffix) && $this->end()
|
||||
) {
|
||||
$tags = $this->fixTags($tags);
|
||||
$this->append(array('mixin', $tags, $argv, $suffix), $s);
|
||||
@ -3165,7 +3165,7 @@ class lessc_parser
|
||||
$expressions = null;
|
||||
$parts = array();
|
||||
|
||||
if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
|
||||
if ((($this->literal("only") && ($only = true)) || ($this->literal("not") && ($not = true))) && $this->keyword($mediaType)) {
|
||||
$prop = array("mediaType");
|
||||
if (isset($only)) {
|
||||
$prop[] = "only";
|
||||
|
||||
@ -360,7 +360,7 @@ function checkBanForAccount($account)
|
||||
|
||||
for ($i = 0, $s = 0; $i < 3; $i++) {
|
||||
$code = substr($rib, 7 * $i, 7);
|
||||
$s += (0 + (int) $code) * $coef[$i];
|
||||
$s += ((int) $code) * $coef[$i];
|
||||
}
|
||||
// Soustraction du modulo 97 de $s a 97 pour obtenir la cle
|
||||
$cle_rib = 97 - ($s % 97);
|
||||
|
||||
@ -251,7 +251,7 @@ class CdavLib
|
||||
*/
|
||||
public function getFullCalendarObjects($calendarId, $bCalendarData)
|
||||
{
|
||||
$calid = ($calendarId * 1);
|
||||
$calid = (int) $calendarId;
|
||||
$calevents = array();
|
||||
|
||||
if (!$this->user->rights->agenda->myactions->read) {
|
||||
|
||||
@ -639,7 +639,7 @@ if ($step == 3 && $datatoimport) {
|
||||
$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
|
||||
$maxphp = @ini_get('upload_max_filesize'); // In unknown
|
||||
if (preg_match('/k$/i', $maxphp)) {
|
||||
$maxphp = (int) substr($maxphp, 0, -1) * 1;
|
||||
$maxphp = (int) substr($maxphp, 0, -1);
|
||||
}
|
||||
if (preg_match('/m$/i', $maxphp)) {
|
||||
$maxphp = (int) substr($maxphp, 0, -1) * 1024;
|
||||
@ -652,7 +652,7 @@ if ($step == 3 && $datatoimport) {
|
||||
}
|
||||
$maxphp2 = @ini_get('post_max_size'); // In unknown
|
||||
if (preg_match('/k$/i', $maxphp2)) {
|
||||
$maxphp2 = (int) substr($maxphp2, 0, -1) * 1;
|
||||
$maxphp2 = (int) substr($maxphp2, 0, -1);
|
||||
}
|
||||
if (preg_match('/m$/i', $maxphp2)) {
|
||||
$maxphp2 = (int) substr($maxphp2, 0, -1) * 1024;
|
||||
|
||||
@ -809,7 +809,7 @@ function getWeatherStatus($totallate)
|
||||
$weather->level = 0;
|
||||
$level0 = $offset;
|
||||
$level0 = getDolGlobalString($used_conf.'0', $level0);
|
||||
$level1 = $offset + 1 * $factor;
|
||||
$level1 = $offset + $factor;
|
||||
$level1 = getDolGlobalString($used_conf.'1', $level1);
|
||||
$level2 = $offset + 2 * $factor;
|
||||
$level2 = getDolGlobalString($used_conf.'2', $level2);
|
||||
|
||||
@ -68,9 +68,9 @@ $somme = array();
|
||||
$input = $langs->trans("Name").";";
|
||||
for ($i = 0; $toutsujet[$i]; $i++) {
|
||||
if ($object->format == "D") {
|
||||
$input .= ''.dol_print_date($toutsujet[$i], 'dayhour').';';
|
||||
$input .= dol_print_date($toutsujet[$i], 'dayhour').';';
|
||||
} else {
|
||||
$input .= ''.$toutsujet[$i].';';
|
||||
$input .= $toutsujet[$i].';';
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,7 +80,7 @@ if (strpos($object->sujet, '@') !== false) {
|
||||
$input .= ";";
|
||||
for ($i = 0; $toutsujet[$i]; $i++) {
|
||||
$heures = explode("@", $toutsujet[$i]);
|
||||
$input .= ''.$heures[1].';';
|
||||
$input .= $heures[1].';';
|
||||
}
|
||||
|
||||
$input .= "\r\n";
|
||||
|
||||
@ -5049,7 +5049,7 @@ class Societe extends CommonObject
|
||||
$sql .= $field." = '".$this->db->escape($value)."'";
|
||||
$sql .= " WHERE rowid = ".((int) $this->id);
|
||||
|
||||
dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
|
||||
dol_syslog(get_class($this)."::".__FUNCTION__, LOG_DEBUG);
|
||||
$resql = $this->db->query($sql);
|
||||
|
||||
if ($resql) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user