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

Fix: Avoid errors into rpm packages

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-31 23:45:11 +00:00
parent 660f301b3e
commit 2367608442
51 changed files with 201 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/makepack-dolibarr.pl
View File

@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
# \version $Id: makepack-dolibarr.pl,v 1.122 2011/07/30 10:23:26 eldy Exp $
# \version $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.122 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@ -263,7 +263,6 @@ if ($nboftargetok) {
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
$ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
@ -292,6 +291,11 @@ if ($nboftargetok) {
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
@ -302,7 +306,6 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;

33
htdocs/admin/modules.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2010 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
@ -22,7 +22,7 @@
/**
* \file htdocs/admin/modules.php
* \brief Page to activate/disable all modules
* \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $
* \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
*/
require("../main.inc.php");
@ -79,35 +79,12 @@ $modules = array();
$orders = array();
$categ = array();
$dirmod = array();
$modulesdir = array();
$i = 0; // is a sequencer of modules found
$j = 0; // j is module number. Automatically affected if module number not defined.
foreach ($conf->file->dol_document_root as $type => $dirroot)
foreach ($conf->file->dol_document_root as $dirroot)
{
$modulesdir[] = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$althandle=@opendir($dirroot);
if (is_resource($althandle))
{
while (($file = readdir($althandle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
}
}
}
$dir = $dirroot . "/includes/modules/";
foreach ($modulesdir as $dir)
{
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
dol_syslog("Scan directory ".$dir." for modules");
@ -472,5 +449,5 @@ print '</div>';
$db->close();
llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $');
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
?>

32
htdocs/admin/perms.php
View File

@ -21,7 +21,7 @@
* \file htdocs/admin/perms.php
* \ingroup core
* \brief Page d'administration/configuration des permissions par defaut
* \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $
* \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $
*/
require("../main.inc.php");
@ -76,34 +76,10 @@ $db->begin();
// Charge les modules soumis a permissions
$modules = array();
$modulesdir = array();
foreach ($conf->file->dol_document_root as $type => $dirroot)
foreach ($conf->file->dol_document_root as $dirroot)
{
$modulesdir[] = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$handle=@opendir($dirroot);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
closedir($handle);
}
}
}
$dir = $dirroot . "/includes/modules/";
foreach ($modulesdir as $dir)
{
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
$handle=@opendir($dir);
@ -218,5 +194,5 @@ print '</div>';
$db->close();
llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $');
llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
?>

7
htdocs/admin/proxy.php
View File

@ -12,15 +12,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/proxy.php
* \ingroup core
* \brief Page setup proxy to use for external web access
* \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
* \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
*/
require("../main.inc.php");
@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg);
$db->close();
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
?>

7
htdocs/admin/security_other.php
View File

@ -13,15 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/security_other.php
* \ingroup core
* \brief Security options setup
* \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
* \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
*/
require("../main.inc.php");
@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-
$db->close();
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
?>

5
htdocs/admin/system/constall.php
View File

@ -14,14 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/system/constall.php
* \brief Page to show all Dolibarr setup (config file and database constants)
* \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $
* \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $
*/
require("../../main.inc.php");

7
htdocs/admin/system/index.php
View File

@ -14,14 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/system/index.php
* \brief Home page of system information
* \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $
* \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
*/
require("../../main.inc.php");
@ -127,5 +126,5 @@ print '<br>';
print info_admin($langs->trans("SystemInfoDesc")).'<br>';
llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $');
llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
?>

3
htdocs/cashdesk/validation_verif.php
View File

@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
require('../main.inc.php');

7
htdocs/comm/action/index.php
View File

@ -16,15 +16,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/comm/action/index.php
* \ingroup agenda
* \brief Home page of calendar events
* \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $
* \version $Id: index.php,v 1.184 2011/07/31 22:23:20 eldy Exp $
*/
require("../../main.inc.php");
@ -786,7 +785,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format
';
*/
llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $');
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.184 $');
/**

7
htdocs/compta/bank/bankid_fr.php
View File

@ -15,15 +15,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/bank/bankid_fr.php
* \ingroup banque
* \brief Fiche creation compte bancaire
* \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
* \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $
*/
require("./pre.inc.php");
@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
$db->close();
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $');
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $');
?>

7
htdocs/compta/bank/fiche.php
View File

@ -15,15 +15,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/bank/fiche.php
* \ingroup banque
* \brief Page to create/view a bank account
* \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
* \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $
*/
require("./pre.inc.php");
@ -608,5 +607,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $');
?>

7
htdocs/compta/bank/rappro.php
View File

@ -14,15 +14,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/bank/rappro.php
* \ingroup banque
* \brief Page to reconciliate bank transactions
* \version $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $
* \version $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $
*/
require("./pre.inc.php");
@ -403,5 +402,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $');
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $');
?>

7
htdocs/compta/prelevement/create.php
View File

@ -15,14 +15,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/compta/prelevement/create.php
* \brief Prelevement
* \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $
* \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $
*/
require("../bank/pre.inc.php");
@ -276,5 +275,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $');
llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $');
?>

5
htdocs/core/class/conf.class.php
View File

@ -16,8 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@ -25,7 +24,7 @@
* \ingroup core
* \brief File of class to manage storage of current setup
* Config is stored into file conf.php
* \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $
* \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $
*/

5
htdocs/core/class/cookie.class.php
View File

@ -12,14 +12,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/class/cookie.class.php
* \ingroup core
* \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
* \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $
* \brief File of class to manage cookies
*/

11
htdocs/core/class/html.form.class.php
View File

@ -23,15 +23,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/class/html.form.class.php
* \ingroup core
* \brief File of class with all html predefined components
* \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $
* \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $
*/
@ -161,8 +160,10 @@ class Form
$htmltext=str_replace("\n","",$htmltext);
$htmltext=str_replace('"',"&quot;",$htmltext);
$paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
$paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
$s="";
if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr>';

5
htdocs/core/class/interfaces.class.php
View File

@ -14,15 +14,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/class/interfaces.class.php
* \ingroup core
* \brief Fichier de la classe de gestion des triggers
* \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $
* \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $
*/

7
htdocs/filefunc.inc.php
View File

@ -20,15 +20,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/filefunc.inc.php
* \ingroup core
* \brief File that include conf.php file and functions.lib.php
* \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
* \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $
*/
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php";
# Define localization of conf file
$conffile = "conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
# For debian like systems
# For debian/redhat like systems
#$conffile = "/etc/dolibarr/conf.php";
#$conffiletoshow = "/etc/dolibarr/conf.php";

7
htdocs/imports/import.php
View File

@ -13,15 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/imports/import.php
* \ingroup import
* \brief Pages of import Wizard
* \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $
* \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $
*/
require_once("../main.inc.php");
@ -1669,7 +1668,7 @@ print '<br>';
$db->close();
llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $');
llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $');
/*

5
htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
@ -22,7 +21,7 @@
* \ingroup societe
* \brief File of class to build ODT documents for third parties
* \author Laurent Destailleur
* \version $Id: doc_generic_invoice_odt.modules.php,v 1.19 2011/07/21 22:54:36 eldy Exp $
* \version $Id: doc_generic_invoice_odt.modules.php,v 1.20 2011/07/31 23:28:15 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");

5
htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
@ -22,7 +21,7 @@
* \ingroup societe
* \brief File of class to build ODT documents for third parties
* \author Laurent Destailleur
* \version $Id: doc_generic_odt.modules.php,v 1.32 2011/07/21 22:54:35 eldy Exp $
* \version $Id: doc_generic_odt.modules.php,v 1.33 2011/07/31 23:28:18 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");

7
htdocs/index.php
View File

@ -14,14 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/index.php
* \brief Dolibarr home page
* \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $
* \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $
*/
define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site.
@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
$db->close();
llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $');
llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $');
/**

9
htdocs/install/check.php
View File

@ -15,15 +15,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/check.php
* \ingroup install
* \brief Test if file conf can be modified and if does not exists, test if install process can create it
* \version $Id: check.php,v 1.85 2011/07/30 10:23:25 eldy Exp $
* \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $
*/
include_once("./inc.php");
@ -39,7 +38,9 @@ $langs->load("install");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("Dolibarr install/upgrade process started");

9
htdocs/install/etape0.php
View File

@ -14,15 +14,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/etape0.php
* \ingroup install
* \brief Show and ask charset for database
* \version $Id: etape0.php,v 1.40 2011/07/30 10:23:25 eldy Exp $
* \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $
*/
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
@ -49,7 +48,9 @@ $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:"";
$main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):'';
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("--- etape0: Entering etape0.php page");

10
htdocs/install/etape1.php
View File

@ -16,15 +16,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/etape1.php
* \ingroup install
* \brief Build conf file on disk
* \version $Id: etape1.php,v 1.134 2011/07/30 10:23:25 eldy Exp $
* \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $
*/
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
@ -39,7 +38,9 @@ $langs->load("admin");
$langs->load("install");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("--- etape1: Entering etape1.php page");
@ -526,6 +527,7 @@ function write_conf_file($conffile)
global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host;
global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass;
global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication;
global $conffile,$conffiletoshow,$conffiletoshowshort;
$error=0;

9
htdocs/install/etape2.php
View File

@ -13,15 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/etape2.php
* \ingroup install
* \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
* \version $Id: etape2.php,v 1.104 2011/07/30 10:23:25 eldy Exp $
* \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $
*/
include("./inc.php");
@ -54,7 +53,9 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2;
if ($dolibarr_main_db_type == "mssql") $choix=3;
// Init "forced values" to nothing. "forced values" are used after a Doliwamp install wizard.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("--- etape2: Entering etape2.php page");

9
htdocs/install/etape4.php
View File

@ -15,15 +15,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/etape4.php
* \ingroup install
* \brief Ask login and password of Dolibarr admin user
* \version $Id: etape4.php,v 1.36 2011/07/30 10:23:25 eldy Exp $
* \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $
*/
@ -41,7 +40,9 @@ $langs->load("install");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("--- etape4: Entering etape4.php page");

19
htdocs/install/etape5.php
View File

@ -16,15 +16,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/etape5.php
* \ingroup install
* \brief Last page of upgrade or install process
* \version $Id: etape5.php,v 1.103 2011/07/30 10:23:25 eldy Exp $
* \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $
*/
include_once("./inc.php");
@ -63,12 +62,9 @@ if (! isset($force_install_databasepass)) $force_install_databasepass='';
if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
if (! isset($force_install_lockinstall)) $force_install_lockinstall='';
$usedoliwamp=false;
if (file_exists("./install.forced.php"))
{
$usedoliwamp=true;
include_once("./install.forced.php");
}
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO);
@ -105,6 +101,7 @@ if ($action == "set")
*/
pHeader($langs->trans("SetupEnd"),"etape5");
print '<br>';
// Test if we can run a first install process
if (! GETPOST("versionfrom") && ! GETPOST("versionto") && ! is_writable($conffile))
@ -208,7 +205,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
if (! $resql) dol_print_error($db,'Error in setup program');
$conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion;
if ($usedoliwamp)
if ($useforcedwizard)
{
dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
$resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
@ -317,7 +314,6 @@ if ($action == "set")
if (! empty($force_install_lockinstall))
{
// Install is finished, we create the lock file
$lockfile="../../install.lock";
$fp = @fopen($lockfile, "w");
if ($fp)
{
@ -367,7 +363,6 @@ elseif (preg_match('/upgrade/i',$action))
if (! empty($force_install_lockinstall))
{
// Upgrade is finished, we create the lock file
$lockfile="../../install.lock";
$fp = @fopen($lockfile, "w");
if ($fp)
{

46
htdocs/install/fileconf.php
View File

@ -17,15 +17,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/fileconf.php
* \ingroup install
* \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
* \version $Id: fileconf.php,v 1.92 2011/07/30 10:23:25 eldy Exp $
* \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $
*/
include_once("./inc.php");
@ -39,8 +38,8 @@ $langs->load("install");
$langs->load("errors");
// You can force preselected values of the config step of Dolibarr by adding a file
// install.forced.php into directory htdocs/install (This is the case with some installer
// lile DoliWamp, DoliMamp or DoliBuntu.
// install.forced.php into directory htdocs/install (This is the case with some wizard
// installer like DoliWamp, DoliMamp or DoliBuntu).
// We first init "forced values" to nothing.
if (! isset($force_install_noedit)) $force_install_noedit='';
if (! isset($force_install_type)) $force_install_type='';
@ -53,7 +52,9 @@ if (! isset($force_install_databasepass)) $force_install_databasepass='';
if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
// Now we load forced value from install.forced.php file.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
@ -159,7 +160,10 @@ if (! empty($force_install_message))
}
?>
<td class="label" valign="top">
<input type="text" size="60" value="<?php print $dolibarr_main_data_root; ?>"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?> name="main_data_dir">
<?php
if ($force_install_noedit == 2) print '<input type="hidden" value="'.$dolibarr_main_data_root.'" name="main_data_dir">';
print '<input type="text" size="60" value="'.$dolibarr_main_data_root.'"'.(($force_install_noedit != 2)?'':' disabled="true"').' name="main_data_dir'.(($force_install_noedit != 2)?'':'_bis').'">';
?>
</td>
<td class="comment"><?php
print $langs->trans("WithNoSlashAtTheEnd")."<br>";
@ -167,7 +171,7 @@ if (! empty($force_install_message))
print $langs->trans("Examples").":<br>";
?>
<ul>
<li>/var/dolibarr_documents</li>
<li>/var/lib/dolibarr/documents</li>
<li>C:/My Documents/dolibarr/</li>
</ul>
</td>
@ -205,7 +209,10 @@ if (empty($dolibarr_main_url_root))
<td valign="top" class="label"><b> <?php echo $langs->trans("URLRoot"); ?></b>
</td>
<td valign="top" class="label">
<input type="text" size="60" name="main_url"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?> value="<?php print $dolibarr_main_url_root; ?>">
<?php
if ($force_install_noedit == 2) print '<input type="hidden" value="'.$dolibarr_main_url_root.'" name="main_url">';
print '<input type="text" size="60" value="'.$dolibarr_main_url_root.'"'.(($force_install_noedit != 2)?'':' disabled="true"').' name="main_url'.(($force_install_noedit != 2)?'':'_bis').'">';
?>
</td>
<td class="comment"><?php print $langs->trans("Examples").":<br>"; ?>
<ul>
@ -304,9 +311,9 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
if ($force_install_noedit && $force_install_type) print '<input id="db_type" type="hidden" value="'.$force_install_type.'" name="db_type">';
print '<select id="db_type" name="db_type'.(empty($force_install_noedit) || empty($force_install_type)?'':'_bis').'"'.($force_install_noedit && $force_install_type?' disabled="true"':'').'>';
print $option;
print '</select> &nbsp;</td>';
print '</select>';
?>
?></td>
<td class="comment"><?php echo $langs->trans("DatabaseType"); ?></td>
</tr>
@ -339,7 +346,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
<tr>
<td class="label" valign="top"><b> <?php echo $langs->trans("DatabaseName"); ?> </b></td>
<td class="label" valign="top"><input type="text" name="db_name"
<td class="label" valign="top"><input type="text" id="db_name" name="db_name"
value="<?php echo (! empty($dolibarr_main_db_name))?$dolibarr_main_db_name:$force_install_database; ?>"></td>
<td class="comment"><?php echo $langs->trans("DatabaseName"); ?></td>
</tr>
@ -358,7 +365,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
<tr>
<td class="label" valign="top"><b><?php echo $langs->trans("Login"); ?></b>
</td>
<td class="label" valign="top"><input type="text" name="db_user"
<td class="label" valign="top"><input type="text" id="db_user" name="db_user"
value="<?php print (! empty($dolibarr_main_db_user))?$dolibarr_main_db_user:$force_install_databaselogin; ?>"></td>
<td class="comment"><?php echo $langs->trans("AdminLogin"); ?></td>
</tr>
@ -366,7 +373,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
<tr>
<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
</td>
<td class="label" valign="top"><input type="password" name="db_pass"
<td class="label" valign="top"><input type="password" id="db_pass" name="db_pass"
value="<?php print (! empty($dolibarr_main_db_pass))?$dolibarr_main_db_pass:$force_install_databasepass; ?>"></td>
<td class="comment"><?php echo $langs->trans("AdminPassword"); ?></td>
</tr>
@ -375,8 +382,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
<td class="label" valign="top"><?php echo $langs->trans("CreateUser"); ?>
</td>
<td class="label" valign="top"><input type="checkbox"
id="db_create_user" name="db_create_user"
<td class="label" valign="top"><input type="checkbox" id="db_create_user" name="db_create_user"
<?php if (! empty($force_install_createuser)) print ' checked="on"'; ?>></td>
<td class="comment"><?php echo $langs->trans("CheckToCreateUser"); ?>
</td>
@ -393,7 +399,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
<tr>
<td class="label" valign="top"><?php echo $langs->trans("Login"); ?></td>
<td class="label" valign="top"><input type="text" name="db_user_root" class="needroot"
<td class="label" valign="top"><input type="text" id="db_user_root" name="db_user_root" class="needroot"
value="<?php print (! empty($db_user_root))?$db_user_root:$force_install_databaserootlogin; ?>"></td>
<td class="label">
<div class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?>
@ -404,8 +410,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
<tr>
<td class="label" valign="top"><?php echo $langs->trans("Password"); ?>
</td>
<td class="label" valign="top"><input type="password" class="needroot"
name="db_pass_root"
<td class="label" valign="top"><input type="password" id="db_pass_root" name="db_pass_root" class="needroot"
value="<?php print (! empty($db_pass_root))?$db_pass_root:$force_install_databaserootpass; ?>"></td>
<td class="label">
<div class="comment"><?php echo $langs->trans("KeepEmptyIfNoPassword"); ?>
@ -436,6 +441,9 @@ jQuery(document).ready(function() {
jQuery("#db_create_user").click(function() {
init_needroot();
});
<?php if ($force_install_noedit) { ?>
jQuery("#db_pass").focus();
<?php } ?>
});
function checkDatabaseName(databasename) {

13
htdocs/install/inc.php
View File

@ -15,14 +15,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file htdocs/install/inc.php
* \ingroup core
* \brief File that define environment for install pages
* \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $
* \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $
*/
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php";
# Define localization of conf file
$conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
# For debian like systems
$lockfile = '../../install.lock';
# For debian/redhat like systems
#$conffile = "/etc/dolibarr/conf.php";
#$conffiletoshow = "/etc/dolibarr/conf.php";
#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here
$lockfile = '../../install.lock';
if (! defined('DONOTLOADCONF') && file_exists($conffile))
{
@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"]))
}
exit;
}
if (file_exists('../../install.lock'))
if (file_exists($lockfile))
{
print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).<br>';
if (! empty($dolibarr_main_url_root))

9
htdocs/install/licence.php
View File

@ -13,15 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/licence.php
* \ingroup install
* \brief Page to show licence (Removed from install process to save time)
* \version $Id: licence.php,v 1.19 2011/07/30 10:23:25 eldy Exp $
* \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $
*/
include_once("./inc.php");
@ -33,7 +32,9 @@ $langs->setDefaultLang($setuplang);
$langs->load("install");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("Licence: Entering licence.php page");

5
htdocs/install/upgrade2.php
View File

@ -15,14 +15,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/install/upgrade2.php
* \brief Upgrade some data
* \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $
* \version $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $
*/
include_once('./inc.php');

77
htdocs/lib/admin.lib.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2009 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
@ -20,7 +20,7 @@
/**
* \file htdocs/lib/admin.lib.php
* \brief Library of admin functions
* \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $
* \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $
*/
@ -467,7 +467,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
/**
* \brief Define head array for tabs of security setup pages
* \return Array of head
* \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $
* \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $
*/
function security_prepare_head()
{
@ -615,41 +615,16 @@ function Activate($value,$withdeps=1)
// Activate module
if ($modName)
{
$modFile = $modName . ".class.php";
$file = $modName . ".class.php";
// Loop on each directory
$found=false;
foreach ($conf->file->dol_document_root as $type => $dirroot)
foreach ($conf->file->dol_document_root as $dol_document_root)
{
$modulesdir[] = $dirroot."/includes/modules/";
if ($type == 'alt')
{
$handle=@opendir($dirroot);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
closedir($handle);
}
}
}
$dir = $dol_document_root."/includes/modules/";
foreach ($modulesdir as $dir)
{
if (file_exists($dir.$modFile))
{
$found=@include_once($dir.$modFile);
if ($found) break;
}
$found=@include_once($dir.$file);
if ($found) break;
}
$objMod = new $modName($db);
@ -725,46 +700,20 @@ function UnActivate($value,$requiredby=1)
$modName = $value;
$ret='';
$modulesdir=array();
// Desactivation du module
if ($modName)
{
$modFile = $modName . ".class.php";
$file = $modName . ".class.php";
// Loop on each directory
$found=false;
foreach ($conf->file->dol_document_root as $type => $dirroot)
foreach ($conf->file->dol_document_root as $dol_document_root)
{
$modulesdir[] = $dirroot."/includes/modules/";
if ($type == 'alt')
{
$handle=@opendir($dirroot);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
closedir($handle);
}
}
}
$dir = $dol_document_root."/includes/modules/";
foreach ($modulesdir as $dir)
{
if (file_exists($dir.$modFile))
{
$found=@include_once($dir.$modFile);
if ($found) break;
}
$found=@include_once($dir.$file);
if ($found) break;
}
if ($found)

5
htdocs/lib/agenda.lib.php
View File

@ -14,15 +14,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
/**
* \file htdocs/lib/agenda.lib.php
* \brief Set of function for the agenda module
* \version $Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $
* \version $Id: agenda.lib.php,v 1.43 2011/07/31 23:25:33 eldy Exp $
*/

5
htdocs/lib/ajax.lib.php
View File

@ -13,15 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
/**
* \file htdocs/lib/ajax.lib.php
* \brief Page called by Ajax request for produts
* \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $
* \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $
*/

5
htdocs/lib/pdf.lib.php
View File

@ -16,8 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
@ -25,7 +24,7 @@
* \file htdocs/lib/pdf.lib.php
* \brief Set of functions used for PDF generation
* \ingroup core
* \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $
* \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $
*/

5
htdocs/main.inc.php
View File

@ -18,15 +18,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/main.inc.php
* \ingroup core
* \brief File that defines environment for Dolibarr pages only (variables not required by scripts)
* \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $
* \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $
*/
@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP

5
htdocs/master.inc.php
View File

@ -21,8 +21,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@ -30,7 +29,7 @@
* \ingroup core
* \brief File that defines environment for all Dolibarr process (pages or scripts)
* This script reads the conf file, init $lang, $db and and empty $user
* \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $
* \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $
*/

5
htdocs/product/class/product.class.php
View File

@ -17,15 +17,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/product/class/product.class.php
* \ingroup produit
* \brief Fichier de la classe des produits predefinis
* \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $
* \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");

7
htdocs/product/fiche.php
View File

@ -18,15 +18,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/product/fiche.php
* \ingroup product
* \brief Page to show product
* \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $
* \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $
*/
require("../main.inc.php");
@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status)
$db->close();
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $');
llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $');
?>

5
htdocs/societe/class/companybankaccount.class.php
View File

@ -13,15 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* \files htdocs/societe/class/companybankaccount.class.php
* \ingroup societe
* \brief File of class to manage bank accounts description of third parties
* \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $
* \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php");

7
htdocs/societe/rib.php
View File

@ -15,15 +15,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/societe/rib.php
* \ingroup societe
* \brief BAN tab for companies
* \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $
* \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $
*/
require("../main.inc.php");
@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
$db->close();
llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $');
llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $');
?>

10
htdocs/societe/soc.php
View File

@ -25,7 +25,7 @@
* \file htdocs/societe/soc.php
* \ingroup societe
* \brief Third party card page
* \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $
* \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $
*/
require("../main.inc.php");
@ -587,8 +587,7 @@ else
if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; }
if (GETPOST("private")==1) { $object->particulier=1; }
$object->name=$_POST["nom"];
$object->nom=$_POST["nom"]; // deprecated
$object->nom=$_POST["nom"];
$object->prenom=$_POST["prenom"];
$object->particulier=$_REQUEST["private"];
$object->prefix_comm=$_POST["prefix_comm"];
@ -1094,8 +1093,7 @@ else
if (! empty($_POST["nom"]))
{
// We overwrite with values if posted
$object->name=$_POST["nom"];
$object->nom=$_POST["nom"]; // deprecated
$object->nom=$_POST["nom"];
$object->prefix_comm=$_POST["prefix_comm"];
$object->client=$_POST["client"];
$object->code_client=$_POST["code_client"];
@ -1969,5 +1967,5 @@ else
$db->close();
llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $');
llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $');
?>

5
htdocs/theme/auguria/style.css.php
View File

@ -14,14 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/theme/auguria/style.css.php
* \brief Fichier de style CSS du theme auguria
* \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $
* \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language

5
htdocs/theme/bureau2crea/style.css.php
View File

@ -16,14 +16,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/theme/bureau2crea/style.css.php
* \brief Fichier de style CSS du theme bureau2crea
* \version $Id: style.css.php,v 1.40 2011/07/21 09:05:33 simnandez Exp $
* \version $Id: style.css.php,v 1.41 2011/07/31 23:19:57 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language

5
htdocs/theme/eldy/style.css.php
View File

@ -14,14 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Eldy
* \version $Id: style.css.php,v 1.88 2011/07/28 13:22:19 eldy Exp $
* \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language

5
htdocs/theme/freelug/style.css.php
View File

@ -13,14 +13,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/theme/freelug/style.css.php
* \brief Fichier de style CSS du theme Freelug
* \version $Id: style.css.php,v 1.43 2011/07/28 13:31:58 eldy Exp $
* \version $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language

5
htdocs/theme/yellow/style.css.php
View File

@ -13,14 +13,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/theme/yellow/style.css.php
* \brief Fichier de style CSS du theme Yellow
* \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $
* \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language

34
htdocs/user/group/perms.php
View File

@ -22,7 +22,7 @@
/**
* \file htdocs/user/group/perms.php
* \brief Onglet user et permissions de la fiche utilisateur
* \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $
* \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $
*/
require("../../main.inc.php");
@ -93,34 +93,10 @@ if ($_GET["id"])
// Charge les modules soumis a permissions
$modules = array();
$modulesdir = array();
foreach ($conf->file->dol_document_root as $type => $dirroot)
{
$modulesdir[] = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$handle=@opendir($dirroot);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
closedir($handle);
}
}
}
foreach ($modulesdir as $dir)
foreach ($conf->file->dol_document_root as $dirroot)
{
$dir = $dirroot . "/includes/modules/";
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
$handle=@opendir($dir);
@ -316,5 +292,5 @@ if ($_GET["id"])
$db->close();
llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $');
llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $');
?>

32
htdocs/user/perms.php
View File

@ -22,7 +22,7 @@
/**
* \file htdocs/user/perms.php
* \brief Onglet user et permissions de la fiche utilisateur
* \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $
* \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $
*/
require("../main.inc.php");
@ -120,34 +120,12 @@ $db->begin();
// Search all modules with permission and reload permissions def.
$modules = array();
$modulesdir = array();
foreach ($conf->file->dol_document_root as $type => $dirroot)
$listdir=$conf->file->dol_document_root;
foreach($listdir as $dirroot)
{
$modulesdir[] = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$handle=@opendir($dirroot);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
closedir($handle);
}
}
}
$dir=$dirroot."/includes/modules/";
foreach($modulesdir as $dir)
{
$handle=opendir($dir);
if (is_resource($handle))
{
@ -395,5 +373,5 @@ print '</table>';
$db->close();
llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $');
llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $');
?>

5
htdocs/viewimage.php
View File

@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
@ -23,7 +22,7 @@
* \file htdocs/viewimage.php
* \brief Wrapper to show images into Dolibarr screens
* \remarks Call to wrapper is '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=diroffile&file=relativepathofofile&cache=0">'
* \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $
* \version $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $
*/
// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).