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

adaptation des fichiers pour postgresql deuxieme etape

Browse Source
This commit is contained in:
opensides 2004-09-02 20:28:56 +00:00
parent 0f90a9348e
commit 8b211fcb07
7 changed files with 86 additions and 3089 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/admin/external_rss.php
View File

@ -54,8 +54,19 @@ if ($_POST["action"] == 'add')
//$external_rss_url = "external_rss_url_" . $_POST["norss"]; //$external_rss_url = "external_rss_url_" . $_POST["norss"];
//$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_URL_" . $_POST["norss"] . "', value='".$_POST[$external_rss_url]."', visible=0"; //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_URL_" . $_POST["norss"] . "', value='".$_POST[$external_rss_url]."', visible=0";
$sql1 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "', value='".$_POST[$external_rss_title]."', visible=0";
$sql2 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "', value='".$_POST[$external_rss_urlrss]."', visible=0"; $sql = "delete from ".MAIN_DB_PREFIX."const where name ='EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "'; ";
$db->query($sql); $sql='';
$sql1 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','".$_POST[$external_rss_title]."',0) ;";
//$sql1 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "', value='".$_POST[$external_rss_title]."', visible=0";
$sql = "delete from ".MAIN_DB_PREFIX."const where name ='EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "'; ";
$db->query($sql);$sql='';
$sql2 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','".$_POST[$external_rss_urlrss]."',0) ;";
//$sql2 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "', value='".$_POST[$external_rss_urlrss]."', visible=0";
if ($db->query($sql1) && $db->query($sql2)) if ($db->query($sql1) && $db->query($sql2))
{ {
@ -91,8 +102,17 @@ if ($_POST["modify"])
$external_rss_title = "external_rss_title_" . $_POST["norss"]; $external_rss_title = "external_rss_title_" . $_POST["norss"];
//$external_rss_url = "external_rss_url_" . $i; //$external_rss_url = "external_rss_url_" . $i;
//$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_URL_" . $_POST["norss"] . "', value='". $_POST[$external_rss_url]."', visible=0"; //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_URL_" . $_POST["norss"] . "', value='". $_POST[$external_rss_url]."', visible=0";
$sql1 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "', value='". $_POST[$external_rss_title]."', visible=0"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."const where name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."';";
$sql2 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "', value='". $_POST[$external_rss_urlrss]."', visible=0"; $db->query($sql);$sql='';
$sql1 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
('" . "EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "',". $_POST[$external_rss_title]."',0) ;";
//$sql1 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "', value='". $_POST[$external_rss_title]."', visible=0";
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const where name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."';";
$db->query($sql);$sql='';
$sql2 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
('" . "EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','". $_POST[$external_rss_urlrss]."',0)";
//$sql2 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "', value='". $_POST[$external_rss_urlrss]."', visible=0";
if ($db->query($sql1) && $db->query($sql2)) if ($db->query($sql1) && $db->query($sql2))
{ {

4
htdocs/admin/propale.php
View File

@ -79,6 +79,10 @@ if ($_GET["action"] == 'setpdf')
/* /*
* On la set active * On la set active
*/ */
$sql_del = "delete from ".MAIN_DB_PREFIX."propal_model_pdf
where nom = '".$_GET["value"]."';";
$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_model_pdf (nom) VALUES ('".$_GET["value"]."')"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_model_pdf (nom) VALUES ('".$_GET["value"]."')";
if ($db->query($sql)) if ($db->query($sql))

3
htdocs/html.form.class.php
View File

@ -301,7 +301,7 @@ class Form
function pays_name($id) function pays_name($id)
{ {
$sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."c_pays"; $sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."c_pays";
$sql .= " WHERE rowid=$id"; $sql .= " WHERE rowid=$id;";
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
@ -318,6 +318,7 @@ class Form
} }
} }
} }

55
htdocs/lib/functions.inc.php
View File

@ -105,9 +105,20 @@ function dolibarr_fiche_head($links, $active=0, $title='')
*/ */
function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $note='') function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $note='')
{ {
$sql = "REPLACE INTO llx_const SET name = '$name', value='$value', visible=$visible, type='$type', note='$note'";
if ($db->query($sql)) $sql = "delete from llx_const where name = '$name';";
$db->query($sql);
//$sql = "REPLACE INTO llx_const SET name = '$name', value='$value', visible=$visible, type='$type', note='$note'";
$sqql = "insert into llx_const(name,value,type,visible,note) values
('$name','$value','$type',$visible,'$note');";
//$sql = "delete from llx_const where name = '$name' and value = '$value' ;";
//$db->query($sql);
//$sql2 = "insert into llx_const values('$name','$value','$type',$visible,'$note');";
if ($db->query($sqql))
{ {
return 1; return 1;
} }
@ -603,11 +614,17 @@ function dolibarr_user_page_param($db, &$user)
{ {
if ($key == "sortfield") if ($key == "sortfield")
{ {
$sql = "REPLACE INTO ".MAIN_DB_PREFIX."user_param ";
$sql = "delete from ".MAIN_DB_PREFIX."user_param where fk_user = $user->id ;";
$db->query($sql);
$sql = "insert into ".MAIN_DB_PREFIX."user_param(fk_user,page,param,value) VALUES
($user->id,'".$GLOBALS["SCRIPT_URL"]."','sortfield','".urlencode($value)."'); ";
/*$sql = "REPLACE INTO ".MAIN_DB_PREFIX."user_param ";
$sql .= " SET fk_user =".$user->id; $sql .= " SET fk_user =".$user->id;
$sql .= " ,page='".$GLOBALS["SCRIPT_URL"] . "'"; $sql .= " ,page='".$GLOBALS["SCRIPT_URL"] . "'";
$sql .= " ,param='sortfield'"; $sql .= " ,param='sortfield'";
$sql .= " ,value='".urlencode($value)."'"; $sql .= " ,value='".urlencode($value)."'";*/
$db->query($sql); $db->query($sql);
$user->page_param["sortfield"] = $value; $user->page_param["sortfield"] = $value;
@ -617,35 +634,49 @@ function dolibarr_user_page_param($db, &$user)
if ($key == "sortorder") if ($key == "sortorder")
{ {
$sql = "REPLACE INTO ".MAIN_DB_PREFIX."user_param "; /*$sql = "REPLACE INTO ".MAIN_DB_PREFIX."user_param ";
$sql .= " SET fk_user =".$user->id; $sql .= " SET fk_user =".$user->id;
$sql .= " ,page='".$GLOBALS["SCRIPT_URL"] . "'"; $sql .= " ,page='".$GLOBALS["SCRIPT_URL"] . "'";
$sql .= " ,param='sortorder'"; $sql .= " ,param='sortorder'";
$sql .= " ,value='".urlencode($value)."'"; $sql .= " ,value='".urlencode($value)."'";*/
$sql = "delete from ".MAIN_DB_PREFIX."user_param where fk_user = $user->id ;";
$db->query($sql);
$sql = "insert into ".MAIN_DB_PREFIX."user_param(fk_user,page,param,value) VALUES
($user->id,'".$GLOBALS["SCRIPT_URL"]."','sortfield','".urlencode($value)."'); ";
$db->query($sql); $db->query($sql);
$user->page_param["sortorder"] = $value; $user->page_param["sortorder"] = $value;
} }
if ($key == "begin") if ($key == "begin")
{ {
$sql = "REPLACE INTO ".MAIN_DB_PREFIX."user_param "; /*$sql = "REPLACE INTO ".MAIN_DB_PREFIX."user_param ";
$sql .= " SET fk_user =".$user->id; $sql .= " SET fk_user =".$user->id;
$sql .= " ,page='".$GLOBALS["SCRIPT_URL"] . "'"; $sql .= " ,page='".$GLOBALS["SCRIPT_URL"] . "'";
$sql .= " ,param='begin'"; $sql .= " ,param='begin'";
$sql .= " ,value='".$value."'"; $sql .= " ,value='".$value."'";*/
$sql = "delete from ".MAIN_DB_PREFIX."user_param where fk_user = $user->id ;";
$db->query($sql); $db->query($sql);
$sql = "insert into ".MAIN_DB_PREFIX."user_param(fk_user,page,param,value) VALUES
($user->id,'".$GLOBALS["SCRIPT_URL"]."','sortfield','".urlencode($value)."'); ";
$db->query($sql);
$user->page_param["begin"] = $value; $user->page_param["begin"] = $value;
} }
if ($key == "page") if ($key == "page")
{ {
$sql = "REPLACE INTO ".MAIN_DB_PREFIX."user_param "; /*$sql = "REPLACE INTO ".MAIN_DB_PREFIX."user_param ";
$sql .= " SET fk_user =".$user->id; $sql .= " SET fk_user =".$user->id;
$sql .= " ,page='".$GLOBALS["SCRIPT_URL"] . "'"; $sql .= " ,page='".$GLOBALS["SCRIPT_URL"] . "'";
$sql .= " ,param='page'"; $sql .= " ,param='page'";
$sql .= " ,value='".$value."'"; $sql .= " ,value='".$value."'";*/
$sql = "delete from ".MAIN_DB_PREFIX."user_param where fk_user = $user->id ;";
$db->query($sql); $db->query($sql);
$sql = "insert into ".MAIN_DB_PREFIX."user_param(fk_user,page,param,value) VALUES
($user->id,'".$GLOBALS["SCRIPT_URL"]."','sortfield','".urlencode($value)."'); ";
$db->query($sql);
$user->page_param["page"] = $value; $user->page_param["page"] = $value;
} }
} }

18
htdocs/lib/pgsql.lib.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2001 Fabien Seisen <seisen@linuxfr.org> /* Copyright (C) 2001 Fabien Seisen <seisen@linuxfr.org>
* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -45,7 +45,8 @@
class DoliDb { class DoliDb
{
var $db, $results, $ok, $connected, $database_selected; var $db, $results, $ok, $connected, $database_selected;
@ -330,7 +331,6 @@ class DoliDb {
function free() function free()
{ {
return pg_free_result($this->results); return pg_free_result($this->results);
} }
@ -341,9 +341,7 @@ class DoliDb {
function fetch_object() function fetch_object()
{ {
$cpt=0; return pg_fetch_object($this->results);
return pg_fetch_object($this->results,$cpt);
} }
/*! /*!
@ -395,7 +393,7 @@ class DoliDb {
function fetch_array() function fetch_array()
{ {
return pg_fetch_array($his->results); return pg_fetch_array($this->results);
} }
/*! /*!
@ -405,7 +403,7 @@ class DoliDb {
function fetch_row() function fetch_row()
{ {
return pg_fetch_row($his->results); return pg_fetch_row($this->results);
} }
/*! /*!
@ -475,7 +473,7 @@ class DoliDb {
function last_insert_id() function last_insert_id()
{ {
return pg_last_oid($this->db); return pg_last_oid($this->results);
} }
/*! /*!
@ -485,7 +483,7 @@ class DoliDb {
function affected_rows() function affected_rows()
{ {
return pg_affected_rows($this->db); return pg_affected_rows($this->results);
} }
/*! /*!

1741
mysql/mysql.sql
View File

File diff suppressed because it is too large Load Diff

1316
pgsql/pgsql.sql
View File

File diff suppressed because it is too large Load Diff