Skip to content

Commit

Permalink
Uniformize code
Browse files Browse the repository at this point in the history
  • Loading branch information
Juanjo Menent committed Sep 2, 2011
1 parent 0826cfd commit 1180238
Show file tree
Hide file tree
Showing 9 changed files with 402 additions and 494 deletions.
2 changes: 1 addition & 1 deletion htdocs/admin/menus/edit.php
View file
Expand Up @@ -261,7 +261,7 @@ function init_topleft()
if ($res)
{

while ($menu = $db->fetch_array($res))
while ($menu = $db->fetch_array ($res))
{
$parent_rowid = $menu['rowid'];
$parent_mainmenu = $menu['mainmenu'];
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/menus/index.php
View file
Expand Up @@ -300,7 +300,7 @@
$num = $db->num_rows($res);

$i = 1;
while ($menu = $db->fetch_array($res))
while ($menu = $db->fetch_array ($res))
{
if (! empty($menu['langs'])) $langs->load($menu['langs']);
$titre = $langs->trans($menu['titre']);
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/menus/menu.js.php
View file
Expand Up @@ -32,7 +32,7 @@
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');

session_cache_limiter(FALSE);
session_cache_limiter( FALSE );

require_once("../../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
Expand Down
15 changes: 2 additions & 13 deletions htdocs/admin/prelevement.php
View file
Expand Up @@ -40,11 +40,9 @@

if ($action == "set")
{
$db->begin();
for ($i = 0 ; $i < 2 ; $i++)
{
$res = dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"],'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
}

$id=$_POST["PRELEVEMENT_ID_BANKACCOUNT"];
Expand All @@ -53,32 +51,23 @@
if($account->fetch($id)>0)
{
$res = dolibarr_set_const($db, "PRELEVEMENT_ID_BANKACCOUNT", $id,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
$res = dolibarr_set_const($db, "PRELEVEMENT_CODE_BANQUE", $account->code_banque,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
$res = dolibarr_set_const($db, "PRELEVEMENT_CODE_GUICHET", $account->code_guichet,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
$res = dolibarr_set_const($db, "PRELEVEMENT_NUMERO_COMPTE", $account->number,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
$res = dolibarr_set_const($db, "PRELEVEMENT_NUMBER_KEY", $account->cle_rib,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
$res = dolibarr_set_const($db, "PRELEVEMENT_IBAN", $account->iban,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
$res = dolibarr_set_const($db, "PRELEVEMENT_BIC", $account->bic,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
$res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
}
else $error++;

if (! $res > 0) $error++;

if (! $error)
{
$db->commit();
$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
}
else
{
$db->rollback();
$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
}
}
Expand Down
101 changes: 43 additions & 58 deletions htdocs/lib/databases/mssql.lib.php
View file
Expand Up @@ -72,18 +72,16 @@ class DoliDb
var $error;


/**
* Constructor.
* This create an opened connexion to a database server and eventually to a database
*
* @param string $type Type of database (mysql, pgsql...)
* @param string $host Address of database server
* @param string $user Nom de l'utilisateur autorise
* @param string $pass Mot de passe
* @param string $name Nom de la database
* @param int $port Port of database server
* @return int 1 if OK, 0 if not
*/
/**
* Ouverture d'une connexion vers le serveur et eventuellement une database.
* @param type Type de base de donnees (mysql ou pgsql)
* @param host Addresse de la base de donnees
* @param user Nom de l'utilisateur autorise
* @param pass Mot de passe
* @param name Nom de la database
* @param port Port of database server
* @return int 1 en cas de succes, 0 sinon
*/
function DoliDb($type='mssql', $host, $user, $pass, $name='', $port=0)
{
global $conf,$langs;
Expand Down Expand Up @@ -155,38 +153,35 @@ function DoliDb($type='mssql', $host, $user, $pass, $name='', $port=0)
}

/**
* Convert a SQL request in Mysql syntax to native syntax
*
* @param string $line SQL request line to convert
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
* @return string SQL request line converted
* Convert a SQL request in Mysql syntax to PostgreSQL syntax
* @param line SQL request line to convert
* @param type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
* @return string SQL request line converted
*/
function convertSQLFromMysql($line,$type='ddl')
{
return $line;
}

/**
* Select a database
*
* @param string $database Name of database
* @return boolean true if OK, false if KO
* Selectionne une database.
* @param database Nom de la database
* @return boolean true si ok, false si ko
*/
function select_db($database)
{
return mssql_select_db($database, $this->db);
}

/**
* Connexion to server
*
* @param string $host database server host
* @param string $login login
* @param string $passwd password
* @param string $name name of database (not used for mysql, used for pgsql)
* @param string $port Port of database server
* @return resource Database access handler
* @see close
* Connection vers le serveur
* @param host addresse de la base de donnees
* @param login nom de l'utilisateur autoris
* @param passwd mot de passe
* @param name nom de la database (ne sert pas sous mysql, sert sous pgsql)
* @param port Port of database server
* @return resource handler d'acces a la base
* @see close
*/
function connect($host, $login, $passwd, $name, $port=0)
{
Expand All @@ -203,19 +198,17 @@ function connect($host, $login, $passwd, $name, $port=0)
}

/**
* Return label of manager
*
* @return string Label
* \brief Return label of manager
* \return string Label
*/
function getLabel()
{
return $this->label;
}

/**
* Return version of database server
*
* @return string Version string
* \brief Renvoie la version du serveur
* \return string Chaine version
*/
function getVersion()
{
Expand All @@ -226,9 +219,8 @@ function getVersion()


/**
* Return version of database server into an array
*
* @return array Version array
* \brief Renvoie la version du serveur dans un tableau
* \return array Tableau de chaque niveau de version
*/
function getVersionArray()
{
Expand All @@ -238,7 +230,6 @@ function getVersionArray()

/**
* Close database connexion
*
* @return boolean True if disconnect successfull, false otherwise
* @see connect
*/
Expand All @@ -255,9 +246,8 @@ function close()


/**
* Start transaction
*
* @return int 1 if transaction successfuly opened or already opened, 0 if error
* \brief Debut d'une transaction.
* \return int 1 si ouverture transaction ok ou deja ouverte, 0 en cas d'erreur
*/
function begin()
{
Expand All @@ -280,11 +270,10 @@ function begin()

/**
* Validate a database transaction
*
* @param $log Add more log to default log line
* @param log Add more log to default log line
* @return int 1 if validation is OK or transaction level no started, 0 if ERROR
*/
function commit($log='')
function commit()
{
if ($this->transaction_opened <= 1)
{
Expand All @@ -304,9 +293,8 @@ function commit($log='')
}

/**
* Annulation d'une transaction et retour aux anciennes valeurs
*
* @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
* \brief Annulation d'une transaction et retour aux anciennes valeurs
* \return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
*/
function rollback()
{
Expand All @@ -326,7 +314,6 @@ function rollback()

/**
* Execute a SQL request and return the resultset
*
* @param query SQL query string
* @param usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
Expand Down Expand Up @@ -417,10 +404,9 @@ function query($query,$usesavepoint=0,$type='auto')
}

/**
* Renvoie la ligne courante (comme un objet) pour le curseur resultset
*
* @param resultset Curseur de la requete voulue
* @return object Object result line or false if KO or end of cursor
* \brief Renvoie la ligne courante (comme un objet) pour le curseur resultset.
* \param resultset Curseur de la requete voulue
* \return object Object result line or false if KO or end of cursor
*/
function fetch_object($resultset)
{
Expand All @@ -430,10 +416,9 @@ function fetch_object($resultset)
}

/**
* Renvoie les donnees dans un tableau
*
* @param resultset Curseur de la requete voulue
* @return array
* \brief Renvoie les donnees dans un tableau.
* \param resultset Curseur de la requete voulue
* \return array
*/
function fetch_array($resultset)
{
Expand Down

0 comments on commit 1180238

Please sign in to comment.