lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: avoid php strict mode warning

Browse Source
This commit is contained in:
Regis Houssin 2012-03-23 18:19:50 +01:00
parent 3c794967c3
commit ffc6812241
41 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/class/accountancyaccount.class.php
View File

@ -59,9 +59,11 @@ class AccountancyAccount
*/
function create($user)
{
$now=dol_now();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."accountingaccount";
$sql.= " (date_creation, fk_user_author, numero,intitule)";
$sql.= " VALUES (".$this->db->idate(gmmktime()).",".$user->id.",'".$this->numero."','".$this->intitule."')";
$sql.= " VALUES (".$this->db->idate($now).",".$user->id.",'".$this->numero."','".$this->intitule."')";
$resql = $this->db->query($sql);
if ($resql)

9
htdocs/adherents/index.php
View File

@ -87,14 +87,15 @@ if ($result)
$db->free($result);
}
$now=dol_now();
// List members up to date
// current rule: uptodate = the end date is in future whatever is type
// old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future)
$sql = "SELECT count(*) as somme , d.fk_adherent_type";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
//$sql.= " WHERE d.statut = 1 AND ((t.cotisation = 0 AND d.datefin IS NULL) OR d.datefin >= ".$db->idate(gmmktime()).')';
$sql.= " WHERE d.statut = 1 AND d.datefin >= ".$db->idate(gmmktime());
//$sql.= " WHERE d.statut = 1 AND ((t.cotisation = 0 AND d.datefin IS NULL) OR d.datefin >= ".$db->idate($now).')';
$sql.= " WHERE d.statut = 1 AND d.datefin >= ".$db->idate($now);
$sql.= " AND t.rowid = d.fk_adherent_type";
$sql.= " GROUP BY d.fk_adherent_type";
@ -321,7 +322,7 @@ foreach ($AdherentType as $key => $adhtype)
print '<td><a href="type.php?rowid='.$adhtype->id.'">'.img_object($langs->trans("ShowType"),"group").' '.$adhtype->getNomUrl(0,dol_size(16)).'</a></td>';
print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).'</td>';
print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-$MemberUpToDate[$key] > 0) ? $MembersValidated[$key]-$MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).'</td>';
print '<td align="right">'.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,gmmktime(),3).'</td>';
print '<td align="right">'.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,$now,3).'</td>';
print '<td align="right">'.(isset($MembersResiliated[$key]) && $MembersResiliated[$key]> 0 ?$MembersResiliated[$key]:'').' '.$staticmember->LibStatut(0,$adhtype->cotisation,0,3).'</td>';
print "</tr>\n";
}
@ -329,7 +330,7 @@ print '<tr class="liste_total">';
print '<td class="liste_total">'.$langs->trans("Total").'</td>';
print '<td class="liste_total" align="right">'.$SommeA.' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).'</td>';
print '<td class="liste_total" align="right">'.$SommeB.' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).'</td>';
print '<td class="liste_total" align="right">'.$SommeC.' '.$staticmember->LibStatut(1,$adhtype->cotisation,gmmktime(),3).'</td>';
print '<td class="liste_total" align="right">'.$SommeC.' '.$staticmember->LibStatut(1,$adhtype->cotisation,$now,3).'</td>';
print '<td class="liste_total" align="right">'.$SommeD.' '.$staticmember->LibStatut(0,$adhtype->cotisation,0,3).'</td>';
print '</tr>';

4
htdocs/bookmarks/class/bookmark.class.php
View File

@ -101,6 +101,8 @@ class Bookmark
$this->url=trim($this->url);
$this->title=trim($this->title);
if (empty($this->position)) $this->position=0;
$now=dol_now();
$this->db->begin();
@ -109,7 +111,7 @@ class Bookmark
if ($this->fk_soc) $sql.=",fk_soc";
$sql.= ") VALUES (";
$sql.= ($this->fk_user > 0?"'".$this->fk_user."'":"0").",";
$sql.= " ".$this->db->idate(gmmktime()).",";
$sql.= " ".$this->db->idate($now).",";
$sql.= " '".$this->url."', '".$this->target."',";
$sql.= " '".$this->db->escape($this->title)."', '".$this->favicon."', '".$this->position."'";
if ($this->fk_soc) $sql.=",".$this->fk_soc;

4
htdocs/comm/mailing/class/mailing.class.php
View File

@ -314,8 +314,10 @@ class Mailing extends CommonObject
*/
function valid($user)
{
$now=dol_now();
$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
$sql .= " SET statut = 1, date_valid = ".$this->db->idate(gmmktime()).", fk_user_valid=".$user->id;
$sql .= " SET statut = 1, date_valid = ".$this->db->idate($now).", fk_user_valid=".$user->id;
$sql .= " WHERE rowid = ".$this->id;
dol_syslog("Mailing::valid sql=".$sql, LOG_DEBUG);

8
htdocs/comm/mailing/fiche.php
View File

@ -154,9 +154,11 @@ if ($_REQUEST["action"] == 'sendallconfirmed' && $_REQUEST['confirm'] == 'yes')
if ($num)
{
dol_syslog("comm/mailing/fiche.php: nb of targets = ".$num, LOG_DEBUG);
$now=dol_now();
// Positionne date debut envoi
$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=".$db->idate(gmmktime())." WHERE rowid=".$id;
$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=".$db->idate($now)." WHERE rowid=".$id;
$resql2=$db->query($sql);
if (! $resql2)
{
@ -245,7 +247,7 @@ if ($_REQUEST["action"] == 'sendallconfirmed' && $_REQUEST['confirm'] == 'yes')
dol_syslog("comm/mailing/fiche.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=1, date_envoi=".$db->idate(gmmktime())." WHERE rowid=".$obj->rowid;
$sql.=" SET statut=1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
$resql2=$db->query($sql);
if (! $resql2)
{
@ -260,7 +262,7 @@ if ($_REQUEST["action"] == 'sendallconfirmed' && $_REQUEST['confirm'] == 'yes')
dol_syslog("comm/mailing/fiche.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=-1, date_envoi=".$db->idate(gmmktime())." WHERE rowid=".$obj->rowid;
$sql.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
$resql2=$db->query($sql);
if (! $resql2)
{

2
htdocs/comm/propal/class/propal.class.php
View File

@ -2072,7 +2072,7 @@ class Propal extends CommonObject
{
global $conf, $user;
$now=gmmktime();
$now=dol_now();
$this->nbtodo=$this->nbtodolate=0;
$clause = " WHERE";

2
htdocs/comm/propal/note.php
View File

@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref))
{
if ($mesg) print $mesg;
$now=gmmktime();
$now=dol_now();
if ($object->fetch($id, $ref))
{

7
htdocs/commande/class/commande.class.php
View File

@ -620,7 +620,8 @@ class Commande extends CommonObject
// $date_commande is deprecated
$date = ($this->date_commande ? $this->date_commande : $this->date);
$now=dol_now();
$this->db->begin();
@ -630,7 +631,7 @@ class Commande extends CommonObject
$sql.= ", remise_absolue, remise_percent";
$sql.= ", entity";
$sql.= ")";
$sql.= " VALUES ('(PROV)',".$this->socid.", ".$this->db->idate(gmmktime()).", ".$user->id;
$sql.= " VALUES ('(PROV)',".$this->socid.", ".$this->db->idate($now).", ".$user->id;
$sql.= ", ".($this->fk_project?$this->fk_project:"null");
$sql.= ", ".$this->db->idate($date);
$sql.= ", ".($this->source>=0 && $this->source != '' ?$this->source:'null');
@ -2348,7 +2349,7 @@ class Commande extends CommonObject
{
global $conf, $user;
$now=gmmktime();
$now=dol_now();
$this->nbtodo=$this->nbtodolate=0;
$clause = " WHERE";

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

@ -1323,7 +1323,7 @@ class Contrat extends CommonObject
{
global $conf, $user;
$now=gmmktime();
$now=dol_now();
$this->nbtodo=$this->nbtodolate=0;

4
htdocs/contrat/liste.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -59,7 +59,7 @@ $staticcontratligne=new ContratLigne($db);
* View
*/
$now=gmmktime();
$now=dol_now();
llxHeader();

2
htdocs/core/boxes/box_contracts.php
View File

@ -87,7 +87,7 @@ class box_contracts extends ModeleBoxes
if ($resql)
{
$num = $db->num_rows($resql);
$now=gmmktime();
$now=dol_now();
$i = 0;

2
htdocs/core/boxes/box_factures.php
View File

@ -93,7 +93,7 @@ class box_factures extends ModeleBoxes
if ($result)
{
$num = $db->num_rows($result);
$now=gmmktime();
$now=dol_now();
$i = 0;
$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';

2
htdocs/core/boxes/box_factures_fourn.php
View File

@ -93,7 +93,7 @@ class box_factures_fourn extends ModeleBoxes
if ($result)
{
$num = $db->num_rows($result);
$now=gmmktime();
$now=dol_now();
$i = 0;
$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';

2
htdocs/core/boxes/box_factures_fourn_imp.php
View File

@ -91,7 +91,7 @@ class box_factures_fourn_imp extends ModeleBoxes
if ($result)
{
$num = $db->num_rows($result);
$now=gmmktime();
$now=dol_now();
$i = 0;
$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateEcheance').': %s)';

2
htdocs/core/boxes/box_factures_imp.php
View File

@ -94,7 +94,7 @@ class box_factures_imp extends ModeleBoxes
if ($result)
{
$num = $db->num_rows($result);
$now=gmmktime();
$now=dol_now();
$i = 0;
$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';

2
htdocs/core/boxes/box_propales.php
View File

@ -90,7 +90,7 @@ class box_propales extends ModeleBoxes
if ($result)
{
$num = $db->num_rows($result);
$now=gmmktime();
$now=dol_now();
$i = 0;

2
htdocs/core/boxes/box_services_contracts.php
View File

@ -95,7 +95,7 @@ class box_services_contracts extends ModeleBoxes
if ($result)
{
$num = $db->num_rows($result);
$now=gmmktime();
$now=dol_now();
$i = 0;

1
htdocs/core/lib/functions.lib.php
View File

@ -1102,6 +1102,7 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
function dol_now($mode='gmt')
{
// Note that gmmktime and mktime return same value (GMT) whithout parameters
//if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() function instead
if ($mode == 'gmt') $ret=time(); // Time for now at greenwich.
else if ($mode == 'tzserver') // Time for now with PHP server timezone added
{

2
htdocs/core/modules/cheque/pdf/modules_chequereceipts.php
View File

@ -45,7 +45,7 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/commande/modules_commande.php
View File

@ -48,7 +48,7 @@ abstract class ModelePDFCommandes extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/dons/html_cerfafr.modules.php
View File

@ -71,7 +71,7 @@ class html_cerfafr extends ModeleDon
{
global $user,$conf,$langs,$mysoc;
$now=gmmktime();
$now=dol_now();
if (! is_object($outputlangs)) $outputlangs=$langs;

2
htdocs/core/modules/dons/modules_don.php
View File

@ -43,7 +43,7 @@ abstract class ModeleDon extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/expedition/methode_expedition.modules.php
View File

@ -51,7 +51,7 @@ class ModeleShippingMethod
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/expedition/modules_expedition.php
View File

@ -45,7 +45,7 @@ abstract class ModelePdfExpedition extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/facture/modules_facture.php
View File

@ -46,7 +46,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/fichinter/modules_fichinter.php
View File

@ -44,7 +44,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/livraison/modules_livraison.php
View File

@ -44,7 +44,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/project/modules_project.php
View File

@ -40,7 +40,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/propale/modules_propale.php
View File

@ -45,7 +45,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of templates
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/societe/modules_societe.class.php
View File

@ -144,7 +144,7 @@ abstract class ModeleThirdPartyCode
* @param string $maxfilenamelength Max length of value to show
* @return array List of numbers
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
$liste=array();
$sql ="";

2
htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
View File

@ -41,7 +41,7 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of numbers
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/modules/supplier_order/modules_commandefournisseur.php
View File

@ -47,7 +47,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
* @param string $maxfilenamelength Max length of value to show
* @return array List of numbers
*/
function liste_modeles($db,$maxfilenamelength=0)
static function liste_modeles($db,$maxfilenamelength=0)
{
global $conf;

2
htdocs/core/triggers/interface_20_all_Logevents.class.php
View File

@ -111,7 +111,7 @@ class InterfaceLogevents
if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
$this->date=gmmktime();
$this->date=dol_now();
$this->duree=0;
// Actions

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

@ -155,6 +155,8 @@ class Expedition extends CommonObject
function create($user)
{
global $conf, $langs;
$now=dol_now();
require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php";
$error = 0;
@ -192,7 +194,7 @@ class Expedition extends CommonObject
$sql.= ", ".$conf->entity;
$sql.= ", ".($this->ref_customer?"'".$this->ref_customer."'":"null");
$sql.= ", ".($this->ref_int?"'".$this->ref_int."'":"null");
$sql.= ", '".$this->db->idate(gmmktime())."'";
$sql.= ", '".$this->db->idate($now)."'";
$sql.= ", ".$user->id;
$sql.= ", ".($this->date_expedition>0?"'".$this->db->idate($this->date_expedition)."'":"null");
$sql.= ", ".($this->date_delivery>0?"'".$this->db->idate($this->date_delivery)."'":"null");

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

@ -1665,7 +1665,7 @@ class CommandeFournisseur extends Commande
{
global $conf, $user;
$now=gmmktime();
$now=dol_now();
$this->nbtodo=$this->nbtodolate=0;
$clause = " WHERE";

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

@ -1166,7 +1166,7 @@ class FactureFournisseur extends Facture
{
global $conf, $user;
$now=gmmktime();
$now=dol_now();
$this->nbtodo=$this->nbtodolate=0;
$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin';

2
htdocs/fourn/commande/fiche.php
View File

@ -926,7 +926,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'valid')
{
$object->date_commande=gmmktime();
$object->date_commande=dol_now();
// We check if number is temporary number
if (preg_match('/^[\(]?PROV/i',$object->ref)) $newref = $object->getNextNumRef($soc);

2
htdocs/fourn/commande/history.php
View File

@ -44,7 +44,7 @@ $result = restrictedArea($user, 'commande_fournisseur', $id,'');
$form = new Form($db);
$now=gmmktime();
$now=dol_now();
$ref= $_GET['ref'];

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

@ -49,7 +49,7 @@ if ($user->societe_id > 0)
* View
*/
$now=gmmktime();
$now=dol_now();
llxHeader('',$langs->trans("BillsSuppliersUnpaid"));

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

@ -94,7 +94,7 @@ if ($mode == 'search')
* View
*/
$now=gmmktime();
$now=dol_now();
$form=new Form($db);
$htmlother=new FormOther($db);

5
scripts/emailings/mailing-send.php
View File

@ -119,6 +119,7 @@ if ($resql)
while ($i < $num)
{
$res=1;
$now=dol_now();
$obj = $db->fetch_object($resql);
@ -192,7 +193,7 @@ if ($resql)
dol_syslog("ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=1, date_envoi=".$db->idate(gmmktime())." WHERE rowid=".$obj->rowid;
$sql.=" SET statut=1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
$resql2=$db->query($sql);
if (! $resql2)
{
@ -207,7 +208,7 @@ if ($resql)
dol_syslog("error for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=-1, date_envoi=".$db->idate(gmmktime())." WHERE rowid=".$obj->rowid;
$sql.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
$resql2=$db->query($sql);
if (! $resql2)
{