From b02fadfd5a4620206fc1bdbd93a6e687c353b481 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Tue, 24 Jun 2003 15:21:05 +0000 Subject: [PATCH] pre-release 0.1.3 --- doc/dev/Makefile | 4 ++-- htdocs/admin/boxes.php | 3 --- htdocs/admin/index.php | 3 --- htdocs/comm/docsoc.php | 20 +++++++++----------- htdocs/conf/conf.class.php3.sample | 28 ++++++---------------------- htdocs/main.inc.php3 | 13 +++++++++---- mysql/tables/llx_propal.sql | 8 ++++---- 7 files changed, 30 insertions(+), 49 deletions(-) diff --git a/doc/dev/Makefile b/doc/dev/Makefile index dc0e971e8fd..8fd844848e7 100644 --- a/doc/dev/Makefile +++ b/doc/dev/Makefile @@ -41,10 +41,10 @@ all: $(DOC).pdf $(DOC).html %.ps: %.sgml $(FRPAGES) $(DEBIANDOC2PS) $(OPTIONS) $< -%.pdf: %.sgml +%.pdf: $(FRPAGES) $(DEBIANDOC2PDF) $(OPTIONS) $< -%.html: %.sgml $(FRPAGES) +%.html: $(FRPAGES) $(DEBIANDOC2HTML) $(HOPTIONS) $< put: diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 54ffc826503..5c7cd46e603 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -36,7 +36,6 @@ if ($HTTP_POST_VARS["action"] == 'add') if ($action == 'delete') { - $sql = "DELETE FROM llx_boxes WHERE rowid=$rowid"; $result = $db->query($sql); @@ -51,8 +50,6 @@ if ($action == 'delete') $boxes = array(); $pos[0] = "Homepage"; -$pos[1] = "Gauche"; -$pos[2] = "Droite"; print ''; diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 635826c1beb..bbb7f325686 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -24,14 +24,11 @@ llxHeader(); print_titre("Configuration Dolibarr (version ".DOL_VERSION.")"); - - print '
'; print ''; print ''; print "\n"; - print ''; print ''; print ''; diff --git a/htdocs/comm/docsoc.php b/htdocs/comm/docsoc.php index 66f7eef2790..cb270381c49 100644 --- a/htdocs/comm/docsoc.php +++ b/htdocs/comm/docsoc.php @@ -24,19 +24,18 @@ llxHeader(); $db = new Db(); -$upload_dir = SOCIETE_DOCUMENT_DIR . "/" . $socid . "/"; +$upload_dir = SOCIETE_OUTPUTDIR . "/" . $socid . "/"; + +if (! is_dir($upload_dir)) +{ + mkdir($upload_dir); +} function do_upload ($socid) { global $upload_dir; global $local_file, $error_msg; - if (! is_dir($upload_dir)) - { - mkdir($upload_dir, 0755); - } - - if (move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . $_FILES['userfile']['name'])) { print "Le fichier est valide, et a été téléchargé @@ -61,7 +60,7 @@ if ($action=='delete') dol_delete_file($file); } -if ( $sendit ) +if ( $sendit ) { do_upload ($socid); } @@ -139,9 +138,8 @@ if ($socid > 0) print "\n"; print "
NomValeurAction
Version' . DOL_VERSION . ' 
css' . $conf->css . ' 
theme' . $conf->theme . ' 
"; - - echo '
'; - + + echo ''; print ''; print ''; print '
'; diff --git a/htdocs/conf/conf.class.php3.sample b/htdocs/conf/conf.class.php3.sample index 3e704750e22..a7f319233bf 100644 --- a/htdocs/conf/conf.class.php3.sample +++ b/htdocs/conf/conf.class.php3.sample @@ -26,19 +26,10 @@ class Conf { Function Conf() { - /* A conserver */ $this->db = new DbConf(); - /* A verifier */ - - $this->theme = "dolibarr"; - - $this->css = "theme/".$this->theme."/".$this->theme.".css"; - $this->liste_limit = 10; - $this->societe = 1; - $this->voyage = 0; $this->compta = new ComptaConf(); @@ -53,10 +44,7 @@ class Conf { $this->readonly = 0; - $this->years = 2001; - - $this->password_encrypted = 1; - + $this->password_encrypted = 0; } } @@ -68,16 +56,12 @@ class ComptaConf } } -class PropalConf { - Function PropalConf() { +class PropalConf +{ + Function PropalConf() + { - $this->fromtoname = "Service Commercial"; - $this->fromtomail = "commercial@propal.com"; - - $this->replytoname = "Service Commercial"; - $this->replytomail = "commercial@propal.com"; - - } + } } /* * Base de données diff --git a/htdocs/main.inc.php3 b/htdocs/main.inc.php3 index 3f3a4742d3d..cf9d629ec4d 100644 --- a/htdocs/main.inc.php3 +++ b/htdocs/main.inc.php3 @@ -75,10 +75,6 @@ $user = new User($db); $user->fetch($GLOBALS["REMOTE_USER"]); -if ($user->limite_liste <> $conf->liste_limit) -{ - $conf->liste_limit = $user->limite_liste; -} /* * Definition de toutes les Constantes globales d'envirronement * @@ -154,6 +150,15 @@ if (defined("SIZE_LISTE_LIMIT")) { $conf->liste_limit=SIZE_LISTE_LIMIT; } +else +{ + $conf->liste_limit=20; +} + +if ($user->limite_liste <> $conf->liste_limit) +{ + $conf->liste_limit = $user->limite_liste; +} if (defined("MAIN_THEME")) { diff --git a/mysql/tables/llx_propal.sql b/mysql/tables/llx_propal.sql index 9ace492e61f..c0270d5e339 100644 --- a/mysql/tables/llx_propal.sql +++ b/mysql/tables/llx_propal.sql @@ -1,8 +1,5 @@ -- =================================================================== --- Copyright (C) 2001-2002 Rodolphe Quiedeville --- --- $Id$ --- $Source$ +-- Copyright (C) 2001-2003 Rodolphe Quiedeville -- -- 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 @@ -18,6 +15,9 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- +-- $Id$ +-- $Source$ +-- -- =================================================================== create table llx_propal