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

Qual: Normalize function name

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-15 13:55:00 +01:00
parent 1810189cda
commit 56f7196aa2
13 changed files with 102 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dev/skeletons/skeleton_webservice_server.php
View File

@ -53,45 +53,45 @@ $server->wsdl->schemaTargetNamespace=$ns;
// Define WSDL Authentication object // Define WSDL Authentication object
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
'authentication', 'authentication',
'complexType', 'complexType',
'struct', 'struct',
'all', 'all',
'', '',
array( array(
'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'), 'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'), 'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
'login' => array('name'=>'login','type'=>'xsd:string'), 'login' => array('name'=>'login','type'=>'xsd:string'),
'password' => array('name'=>'password','type'=>'xsd:string'), 'password' => array('name'=>'password','type'=>'xsd:string'),
'entity' => array('name'=>'entity','type'=>'xsd:string'), 'entity' => array('name'=>'entity','type'=>'xsd:string'),
) )
); );
// Define WSDL Return object // Define WSDL Return object
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
'result', 'result',
'complexType', 'complexType',
'struct', 'struct',
'all', 'all',
'', '',
array( array(
'result_code' => array('name'=>'result_code','type'=>'xsd:string'), 'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
'result_label' => array('name'=>'result_label','type'=>'xsd:string'), 'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
) )
); );
// Define other specific objects // Define other specific objects
$server->wsdl->addComplexType( $server->wsdl->addComplexType(
'skeleton', 'skeleton',
'complexType', 'complexType',
'struct', 'struct',
'all', 'all',
'', '',
array( array(
'prop1'=>'xxx', 'prop1'=>'xxx',
'prop2'=>'xxx', 'prop2'=>'xxx',
//... //...
) )
); );

4
htdocs/admin/modules.php
View File

@ -43,7 +43,7 @@ if (!$user->admin) accessforbidden();
if (isset($_GET["action"]) && $_GET["action"] == 'set' && $user->admin) if (isset($_GET["action"]) && $_GET["action"] == 'set' && $user->admin)
{ {
$result=Activate($_GET["value"]); $result=activateModule($_GET["value"]);
$mesg=''; $mesg='';
if ($result) $mesg=$result; if ($result) $mesg=$result;
Header("Location: modules.php?mode=".$mode."&mesg=".urlencode($mesg)); Header("Location: modules.php?mode=".$mode."&mesg=".urlencode($mesg));
@ -52,7 +52,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'set' && $user->admin)
if (isset($_GET["action"]) && $_GET["action"] == 'reset' && $user->admin) if (isset($_GET["action"]) && $_GET["action"] == 'reset' && $user->admin)
{ {
$result=UnActivate($_GET["value"]); $result=unActivateModule($_GET["value"]);
$mesg=''; $mesg='';
if ($result) $mesg=$result; if ($result) $mesg=$result;
Header("Location: modules.php?mode=".$mode."&mesg=".urlencode($mesg)); Header("Location: modules.php?mode=".$mode."&mesg=".urlencode($mesg));

24
htdocs/core/db/mssql.class.php
View File

@ -44,7 +44,7 @@ class DoliDBMssql
//! Version min database //! Version min database
static $versionmin=array(2000); static $versionmin=array(2000);
//! Resultset of last request //! Resultset of last request
private $results; private $_results;
//! 1 si connecte, 0 sinon //! 1 si connecte, 0 sinon
var $connected; var $connected;
//! 1 si base selectionne, 0 sinon //! 1 si base selectionne, 0 sinon
@ -406,7 +406,7 @@ class DoliDBMssql
dol_syslog(get_class($this)."::query SQL error: ".$query, LOG_WARNING); dol_syslog(get_class($this)."::query SQL error: ".$query, LOG_WARNING);
} }
$this->lastquery=$query; $this->lastquery=$query;
$this->results = $ret; $this->_results = $ret;
} }
return $ret; return $ret;
@ -421,7 +421,7 @@ class DoliDBMssql
function fetch_object($resultset) function fetch_object($resultset)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return mssql_fetch_object($resultset); return mssql_fetch_object($resultset);
} }
@ -434,7 +434,7 @@ class DoliDBMssql
function fetch_array($resultset) function fetch_array($resultset)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return mssql_fetch_array($resultset); return mssql_fetch_array($resultset);
} }
@ -448,7 +448,7 @@ class DoliDBMssql
function fetch_row($resultset) function fetch_row($resultset)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return @mssql_fetch_row($resultset); return @mssql_fetch_row($resultset);
} }
@ -462,7 +462,7 @@ class DoliDBMssql
function num_rows($resultset) function num_rows($resultset)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return mssql_num_rows($resultset); return mssql_num_rows($resultset);
} }
@ -476,7 +476,7 @@ class DoliDBMssql
function affected_rows($resultset) function affected_rows($resultset)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
// mssql necessite un link de base pour cette fonction contrairement // mssql necessite un link de base pour cette fonction contrairement
// a pqsql qui prend un resultset // a pqsql qui prend un resultset
$rsRows = mssql_query("select @@rowcount as rows", $this->db); $rsRows = mssql_query("select @@rowcount as rows", $this->db);
@ -494,7 +494,7 @@ class DoliDBMssql
function free($resultset=0) function free($resultset=0)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
// Si resultset en est un, on libere la memoire // Si resultset en est un, on libere la memoire
if (is_resource($resultset)) mssql_free_result($resultset); if (is_resource($resultset)) mssql_free_result($resultset);
} }
@ -819,8 +819,8 @@ class DoliDBMssql
*/ */
function DDLListTables($database,$table='') function DDLListTables($database,$table='')
{ {
$this->results = mssql_list_tables($database, $this->db); $this->_results = mssql_list_tables($database, $this->db);
return $this->results; return $this->_results;
} }
/** /**
@ -912,8 +912,8 @@ class DoliDBMssql
$sql="DESC ".$table." ".$field; $sql="DESC ".$table." ".$field;
dol_syslog($sql); dol_syslog($sql);
$this->results = $this->query($sql); $this->_results = $this->query($sql);
return $this->results; return $this->_results;
} }
/** /**

20
htdocs/core/db/mysql.class.php
View File

@ -44,7 +44,7 @@ class DoliDBMysql
//! Version min database //! Version min database
static $versionmin=array(4,1,0); static $versionmin=array(4,1,0);
//! Resultset of last request //! Resultset of last request
private $results; private $_results;
//! 1 if connected, 0 else //! 1 if connected, 0 else
var $connected; var $connected;
//! 1 if database selected, 0 else //! 1 if database selected, 0 else
@ -383,7 +383,7 @@ class DoliDBMysql
dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING); dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING);
} }
$this->lastquery=$query; $this->lastquery=$query;
$this->results = $ret; $this->_results = $ret;
} }
return $ret; return $ret;
@ -398,7 +398,7 @@ class DoliDBMysql
function fetch_object($resultset) function fetch_object($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return mysql_fetch_object($resultset); return mysql_fetch_object($resultset);
} }
@ -411,7 +411,7 @@ class DoliDBMysql
function fetch_array($resultset) function fetch_array($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return mysql_fetch_array($resultset); return mysql_fetch_array($resultset);
} }
@ -425,7 +425,7 @@ class DoliDBMysql
function fetch_row($resultset) function fetch_row($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return @mysql_fetch_row($resultset); return @mysql_fetch_row($resultset);
} }
@ -439,7 +439,7 @@ class DoliDBMysql
function num_rows($resultset) function num_rows($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return mysql_num_rows($resultset); return mysql_num_rows($resultset);
} }
@ -453,7 +453,7 @@ class DoliDBMysql
function affected_rows($resultset) function affected_rows($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
// mysql necessite un link de base pour cette fonction contrairement // mysql necessite un link de base pour cette fonction contrairement
// a pqsql qui prend un resultset // a pqsql qui prend un resultset
return mysql_affected_rows($this->db); return mysql_affected_rows($this->db);
@ -469,7 +469,7 @@ class DoliDBMysql
function free($resultset=0) function free($resultset=0)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
// Si resultset en est un, on libere la memoire // Si resultset en est un, on libere la memoire
if (is_resource($resultset)) mysql_free_result($resultset); if (is_resource($resultset)) mysql_free_result($resultset);
} }
@ -948,8 +948,8 @@ class DoliDBMysql
$sql="DESC ".$table." ".$field; $sql="DESC ".$table." ".$field;
dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG); dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
$this->results = $this->query($sql); $this->_results = $this->query($sql);
return $this->results; return $this->_results;
} }
/** /**

20
htdocs/core/db/mysqli.class.php
View File

@ -44,7 +44,7 @@ class DoliDBMysqli
//! Version min database //! Version min database
static $versionmin=array(4,1,0); static $versionmin=array(4,1,0);
//! Resultset of last request //! Resultset of last request
private $results; private $_results;
//! 1 if connected, 0 else //! 1 if connected, 0 else
var $connected; var $connected;
//! 1 if database selected, 0 else //! 1 if database selected, 0 else
@ -385,7 +385,7 @@ class DoliDBMysqli
dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING); dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING);
} }
$this->lastquery=$query; $this->lastquery=$query;
$this->results = $ret; $this->_results = $ret;
} }
return $ret; return $ret;
@ -400,7 +400,7 @@ class DoliDBMysqli
function fetch_object($resultset) function fetch_object($resultset)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
return mysqli_fetch_object($resultset); return mysqli_fetch_object($resultset);
} }
@ -414,7 +414,7 @@ class DoliDBMysqli
function fetch_array($resultset) function fetch_array($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
return mysqli_fetch_array($resultset); return mysqli_fetch_array($resultset);
} }
@ -429,7 +429,7 @@ class DoliDBMysqli
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_bool($resultset)) if (! is_bool($resultset))
{ {
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
return mysqli_fetch_row($resultset); return mysqli_fetch_row($resultset);
} }
else else
@ -449,7 +449,7 @@ class DoliDBMysqli
function num_rows($resultset) function num_rows($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
return mysqli_num_rows($resultset); return mysqli_num_rows($resultset);
} }
@ -464,7 +464,7 @@ class DoliDBMysqli
function affected_rows($resultset) function affected_rows($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
// mysql necessite un link de base pour cette fonction contrairement // mysql necessite un link de base pour cette fonction contrairement
// a pqsql qui prend un resultset // a pqsql qui prend un resultset
return mysqli_affected_rows($this->db); return mysqli_affected_rows($this->db);
@ -480,7 +480,7 @@ class DoliDBMysqli
function free($resultset=0) function free($resultset=0)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
// Si resultset en est un, on libere la memoire // Si resultset en est un, on libere la memoire
if (is_object($resultset)) mysqli_free_result($resultset); if (is_object($resultset)) mysqli_free_result($resultset);
} }
@ -951,8 +951,8 @@ class DoliDBMysqli
$sql="DESC ".$table." ".$field; $sql="DESC ".$table." ".$field;
dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG); dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
$this->results = $this->query($sql); $this->_results = $this->query($sql);
return $this->results; return $this->_results;
} }
/** /**

20
htdocs/core/db/pgsql.class.php
View File

@ -45,7 +45,7 @@ class DoliDBPgsql
static $versionmin=array(8,4,0); // Version min database static $versionmin=array(8,4,0); // Version min database
//! Resultset of last request //! Resultset of last request
private $results; private $_results;
var $connected; // 1 si connecte, 0 sinon var $connected; // 1 si connecte, 0 sinon
var $database_selected; // 1 si base selectionne, 0 sinon var $database_selected; // 1 si base selectionne, 0 sinon
@ -573,7 +573,7 @@ class DoliDBPgsql
} }
} }
$this->lastquery=$query; $this->lastquery=$query;
$this->results = $ret; $this->_results = $ret;
} }
return $ret; return $ret;
@ -588,7 +588,7 @@ class DoliDBPgsql
function fetch_object($resultset) function fetch_object($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return pg_fetch_object($resultset); return pg_fetch_object($resultset);
} }
@ -601,7 +601,7 @@ class DoliDBPgsql
function fetch_array($resultset) function fetch_array($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return pg_fetch_array($resultset); return pg_fetch_array($resultset);
} }
@ -614,7 +614,7 @@ class DoliDBPgsql
function fetch_row($resultset) function fetch_row($resultset)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return pg_fetch_row($resultset); return pg_fetch_row($resultset);
} }
@ -628,7 +628,7 @@ class DoliDBPgsql
function num_rows($resultset) function num_rows($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
return pg_num_rows($resultset); return pg_num_rows($resultset);
} }
@ -642,7 +642,7 @@ class DoliDBPgsql
function affected_rows($resultset) function affected_rows($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
// pgsql necessite un resultset pour cette fonction contrairement // pgsql necessite un resultset pour cette fonction contrairement
// a mysql qui prend un link de base // a mysql qui prend un link de base
return pg_affected_rows($resultset); return pg_affected_rows($resultset);
@ -658,7 +658,7 @@ class DoliDBPgsql
function free($resultset=0) function free($resultset=0)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_resource($resultset)) { $resultset=$this->results; } if (! is_resource($resultset)) { $resultset=$this->_results; }
// Si resultset en est un, on libere la memoire // Si resultset en est un, on libere la memoire
if (is_resource($resultset)) pg_free_result($resultset); if (is_resource($resultset)) pg_free_result($resultset);
} }
@ -1136,8 +1136,8 @@ class DoliDBPgsql
if ($field) $sql.= " AND attname = '".$field."'"; if ($field) $sql.= " AND attname = '".$field."'";
dol_syslog($sql,LOG_DEBUG); dol_syslog($sql,LOG_DEBUG);
$this->results = $this->query($sql); $this->_results = $this->query($sql);
return $this->results; return $this->_results;
} }
/** /**

20
htdocs/core/db/sqlite.class.php
View File

@ -44,7 +44,7 @@ class DoliDBSqlite
//! Version min database //! Version min database
static $versionmin=array(3,0,0); static $versionmin=array(3,0,0);
//! Resultset of last request //! Resultset of last request
private $results; private $_results;
//! 1 if connected, 0 else //! 1 if connected, 0 else
var $connected; var $connected;
//! 1 if database selected, 0 else //! 1 if database selected, 0 else
@ -516,7 +516,7 @@ class DoliDBSqlite
else dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING); else dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING);
} }
$this->lastquery=$query; $this->lastquery=$query;
$this->results = $ret; $this->_results = $ret;
} }
return $ret; return $ret;
@ -531,7 +531,7 @@ class DoliDBSqlite
function fetch_object($resultset) function fetch_object($resultset)
{ {
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
return $resultset->fetch(PDO::FETCH_OBJ); return $resultset->fetch(PDO::FETCH_OBJ);
} }
@ -545,7 +545,7 @@ class DoliDBSqlite
function fetch_array($resultset) function fetch_array($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
return $resultset->fetch(PDO::FETCH_ASSOC); return $resultset->fetch(PDO::FETCH_ASSOC);
} }
@ -560,7 +560,7 @@ class DoliDBSqlite
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_bool($resultset)) if (! is_bool($resultset))
{ {
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
return $resultset->fetch(PDO::FETCH_NUM); return $resultset->fetch(PDO::FETCH_NUM);
} }
else else
@ -580,7 +580,7 @@ class DoliDBSqlite
function num_rows($resultset) function num_rows($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
return $resultset->rowCount(); return $resultset->rowCount();
} }
@ -594,7 +594,7 @@ class DoliDBSqlite
function affected_rows($resultset) function affected_rows($resultset)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
// mysql necessite un link de base pour cette fonction contrairement // mysql necessite un link de base pour cette fonction contrairement
// a pqsql qui prend un resultset // a pqsql qui prend un resultset
return $resultset->rowCount(); return $resultset->rowCount();
@ -610,7 +610,7 @@ class DoliDBSqlite
function free($resultset=0) function free($resultset=0)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (! is_object($resultset)) { $resultset=$this->results; } if (! is_object($resultset)) { $resultset=$this->_results; }
// Si resultset en est un, on libere la memoire // Si resultset en est un, on libere la memoire
if (is_object($resultset)) $resultset->closeCursor(); if (is_object($resultset)) $resultset->closeCursor();
} }
@ -1091,8 +1091,8 @@ class DoliDBSqlite
$sql="DESC ".$table." ".$field; $sql="DESC ".$table." ".$field;
dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG); dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
$this->results = $this->query($sql); $this->_results = $this->query($sql);
return $this->results; return $this->_results;
} }
/** /**

12
htdocs/core/lib/admin.lib.php
View File

@ -645,7 +645,7 @@ function purgeSessions($mysessionid)
* @param int $withdeps Activate/Disable also all dependencies * @param int $withdeps Activate/Disable also all dependencies
* @return string Error message or ''; * @return string Error message or '';
*/ */
function Activate($value,$withdeps=1) function activateModule($value,$withdeps=1)
{ {
global $db, $modules, $langs, $conf; global $db, $modules, $langs, $conf;
@ -728,7 +728,7 @@ function Activate($value,$withdeps=1)
{ {
if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->depends[$i].".class.php")) if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->depends[$i].".class.php"))
{ {
Activate($objMod->depends[$i]); activateModule($objMod->depends[$i]);
} }
} }
} }
@ -741,7 +741,7 @@ function Activate($value,$withdeps=1)
{ {
if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->conflictwith[$i].".class.php")) if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->conflictwith[$i].".class.php"))
{ {
UnActivate($objMod->conflictwith[$i],0); unActivateModule($objMod->conflictwith[$i],0);
} }
} }
} }
@ -758,7 +758,7 @@ function Activate($value,$withdeps=1)
* @param int $requiredby 1=Desactive aussi modules dependants * @param int $requiredby 1=Desactive aussi modules dependants
* @return string Error message or ''; * @return string Error message or '';
*/ */
function UnActivate($value, $requiredby=1) function unActivateModule($value, $requiredby=1)
{ {
global $db, $modules, $conf; global $db, $modules, $conf;
@ -816,7 +816,7 @@ function UnActivate($value, $requiredby=1)
//$genericMod->style_sheet=1; //$genericMod->style_sheet=1;
//$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName)); //$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
//$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName)); //$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
dol_syslog("modules::UnActivate Failed to find module file, we use generic function with name " . $modName); dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName);
//$genericMod->_remove(); //$genericMod->_remove();
} }
@ -826,7 +826,7 @@ function UnActivate($value, $requiredby=1)
$countrb=count($objMod->requiredby); $countrb=count($objMod->requiredby);
for ($i = 0; $i < $countrb; $i++) for ($i = 0; $i < $countrb; $i++)
{ {
UnActivate($objMod->requiredby[$i]); unActivateModule($objMod->requiredby[$i]);
} }
} }

7
htdocs/core/lib/functions2.lib.php
View File

@ -350,6 +350,7 @@ function array2tr($data,$troptions='',$tdoptions='')
* *
* @param array $data Array of data * @param array $data Array of data
* @param int $tableMarkup Table markup * @param int $tableMarkup Table markup
* @param string $tableoptions Options for table
* @param string $troptions Options for tr * @param string $troptions Options for tr
* @param string $tdoptions Options for td * @param string $tdoptions Options for td
* @return string * @return string
@ -665,9 +666,9 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
/** /**
* Check value * Check value
* *
* @param $mask Mask to use * @param string $mask Mask to use
* @param $value Value * @param string $value Value
* @return int <0 if KO, 0 if OK * @return int <0 if KO, 0 if OK
*/ */
function check_value($mask,$value) function check_value($mask,$value)
{ {

8
htdocs/core/lib/project.lib.php
View File

@ -267,7 +267,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlen
* @param int $mytask 0 or 1 to enable only if task is a task i am affected to * @param int $mytask 0 or 1 to enable only if task is a task i am affected to
* @return $inc * @return $inc
*/ */
function PLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mytask=0) function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mytask=0)
{ {
global $user, $bc, $langs; global $user, $bc, $langs;
global $form, $projectstatic, $taskstatic; global $form, $projectstatic, $taskstatic;
@ -354,7 +354,7 @@ function PLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $
print "</tr>\n"; print "</tr>\n";
$inc++; $inc++;
$level++; $level++;
if ($lines[$i]->id) PLinesb($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mytask); if ($lines[$i]->id) projectLinesb($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mytask);
$level--; $level--;
} }
else else
@ -379,7 +379,7 @@ function PLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $
* @param int &$taskrole Array of roles of user for each tasks * @param int &$taskrole Array of roles of user for each tasks
* @param int $projectsListId List of id of project allowed to user (separated with comma) * @param int $projectsListId List of id of project allowed to user (separated with comma)
*/ */
function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='') function projectLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='')
{ {
global $user, $bc, $langs; global $user, $bc, $langs;
global $projectstatic, $taskstatic; global $projectstatic, $taskstatic;
@ -500,7 +500,7 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole
if (! $showlineingray) $inc++; if (! $showlineingray) $inc++;
$level++; $level++;
if ($lines[$i]->id) PLines($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId); if ($lines[$i]->id) projectLines($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId);
$level--; $level--;
$total += $lines[$i]->duration; $total += $lines[$i]->duration;
} }

2
htdocs/projet/activity/list.php
View File

@ -142,7 +142,7 @@ print '<td>'.$langs->trans("LabelTask").'</td>';
print '<td align="right">'.$langs->trans("TimeSpent").'</td>'; print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
print '<td colspan="2">'.$langs->trans("AddDuration").'</td>'; print '<td colspan="2">'.$langs->trans("AddDuration").'</td>';
print "</tr>\n"; print "</tr>\n";
PLinesb($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine); projectLinesb($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine);
print '</form>'; print '</form>';

2
htdocs/projet/tasks.php
View File

@ -329,7 +329,7 @@ else
{ {
// Show all lines in taskarray (recursive function to go down on tree) // Show all lines in taskarray (recursive function to go down on tree)
$j=0; $j=0;
$nboftaskshown=PLines($j, 0, $tasksarray, $level, true, 0, $tasksrole); $nboftaskshown=projectLines($j, 0, $tasksarray, $level, true, 0, $tasksrole);
} }
else else
{ {

2
htdocs/projet/tasks/index.php
View File

@ -94,7 +94,7 @@ print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
print "</tr>\n"; print "</tr>\n";
// Show all lines in taskarray (recursive function to go down on tree) // Show all lines in taskarray (recursive function to go down on tree)
$j=0; $level=0; $j=0; $level=0;
$nboftaskshown=PLines($j, 0, $tasksarray, $level, true, 1, $tasksrole, $projectsListId); $nboftaskshown=projectLines($j, 0, $tasksarray, $level, true, 1, $tasksrole, $projectsListId);
print "</table>"; print "</table>";
print '</div>'; print '</div>';