Qual: Work to allow externalizing of fonts.
This commit is contained in:
Laurent Destailleur
parent
c3270c7c76
commit
d6bb618dfe
@ -11,6 +11,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
|
||||
php5-mysql | php5-mysqli,
|
||||
php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
|
||||
libphp-pclzip,
|
||||
ttf-dejavu-core,
|
||||
xdg-utils,
|
||||
mysql-server,
|
||||
${misc:Depends}
|
||||
|
||||
@ -3,7 +3,13 @@ Version: __VERSION__
|
||||
Architecture: all
|
||||
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
Installed-Size: 61200
|
||||
Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
|
||||
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
|
||||
php5-mysql | php5-mysqli,
|
||||
php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
|
||||
libphp-pclzip,
|
||||
ttf-dejavu-core,
|
||||
xdg-utils,
|
||||
mysql-server
|
||||
Section: web
|
||||
Priority: optional
|
||||
Homepage: http://www.dolibarr.org
|
||||
|
||||
@ -6,13 +6,8 @@ embedded-javascript-library usr/share/dolibarr/htdocs/includes/fckeditor/fckedit
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/extlib/Snoopy.class.inc
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/rss_parse.inc
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/nusoap/lib/nusoap.php
|
||||
embedded-php-library usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
|
||||
# embedded fonts, wich are specific to Dolibarr usage
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/Tuffy.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyBold.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyBoldItalic.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyItalic.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/Aerial.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialBd.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialBdIt.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/barcode/php-barcode/fonts/AerialIt.ttf
|
||||
font-in-non-font-package usr/share/dolibarr/htdocs/includes/artichow/font/TuffyItalic.ttf
|
||||
@ -4,7 +4,7 @@
|
||||
// This file must be present into htdocs/install directory
|
||||
// during install process to be used.
|
||||
//
|
||||
// $Id: install.forced.php.install,v 1.10 2011/08/14 14:31:59 eldy Exp $
|
||||
// $Id: install.forced.php.install,v 1.11 2011/08/14 17:17:19 eldy Exp $
|
||||
//
|
||||
|
||||
$force_install_noedit=2;
|
||||
@ -25,6 +25,7 @@ $force_install_dolibarrlogin='admin';
|
||||
$force_install_nophpinfo='1';
|
||||
$force_install_lockinstall='444';
|
||||
|
||||
$force_install_libpath=array('ODTPHP_PATHTOPCLZIP'=>"/usr/share/php/libphp-pclzip");
|
||||
$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
|
||||
$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
|
||||
|
||||
?>
|
||||
@ -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.143 2011/08/14 15:32:37 eldy Exp $
|
||||
# \version $Id: makepack-dolibarr.pl,v 1.144 2011/08/14 17:17:20 eldy Exp $
|
||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@ -45,8 +45,8 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake
|
||||
|
||||
|
||||
use vars qw/ $REVISION $VERSION /;
|
||||
$REVISION='$Revision: 1.143 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$VERSION="3.1 (build $REVISION)";
|
||||
$REVISION='$Revision: 1.144 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$VERSION="3.2 (build $REVISION)";
|
||||
|
||||
|
||||
|
||||
@ -250,7 +250,6 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/pom.xml`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/default.properties`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`;
|
||||
@ -270,14 +269,7 @@ if ($nboftargetok) {
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/install.lock`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/AerialMono*.ttf`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Tymes*.ttf`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/_samples`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/_testcases`;
|
||||
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
|
||||
@ -319,11 +311,22 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`;
|
||||
$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 -fr $BUILDROOT/$PROJECT/.svn $BUILDROOT/$PROJECT/*/.svn $BUILDROOT/$PROJECT/*/*/.svn $BUILDROOT/$PROJECT/*/*/*/.svn $BUILDROOT/$PROJECT/*/*/*/*/.svn`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/AerialMono*.ttf`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Tymes*.ttf`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/_samples`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/_testcases`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/license.txt`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
|
||||
@ -331,6 +334,7 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/free*.ctg.z`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/free*.z`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
|
||||
# Removed because not stable yet
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
|
||||
}
|
||||
@ -498,18 +502,12 @@ if ($nboftargetok) {
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/rpm/conf.php`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/zip`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/build/perl`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
|
||||
# We remove embedded libraries or fonts
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/fonts`,
|
||||
#$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt`;
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/COPYING`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`;
|
||||
# To remove once stable
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
|
||||
# We remove not stable feature
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
||||
|
||||
# Conf files
|
||||
@ -704,18 +702,11 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/rpm`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/zip`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
|
||||
# We remove embedded libraries or fonts
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/fonts`,
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`;
|
||||
# To remove once stable
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip`;
|
||||
# We remove not stable feature
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
||||
|
||||
# Apache and lighttpd conf files
|
||||
|
||||
@ -15,4 +15,8 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
|
||||
$force_install_dolibarrlogin='admin';
|
||||
$force_install_nophpinfo='1';
|
||||
$force_install_lockinstall='444';
|
||||
|
||||
#$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
|
||||
$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf';
|
||||
|
||||
?>
|
||||
@ -5,7 +5,7 @@
|
||||
# This file is used by Dolibarr setup process to create true Dolibarr
|
||||
# config file called "conf.php".
|
||||
#
|
||||
# $Id: conf.php.example,v 1.51 2011/08/14 15:59:49 eldy Exp $
|
||||
# $Id: conf.php.example,v 1.52 2011/08/14 17:17:19 eldy Exp $
|
||||
|
||||
|
||||
###################
|
||||
@ -262,7 +262,7 @@ $dolibarr_main_prod='0';
|
||||
##############################
|
||||
|
||||
# Value to overwrite some path to use font instead of embedded one
|
||||
#$dolibarr_font_DOL_DEFAULT_TTF="/usr/share/font/dejavu/DejaVuSans.ttf";
|
||||
#$dolibarr_font_DOL_DEFAULT_TTF_BOLD="/usr/share/font/dejavu/DejaVuSans-Bold.ttf";
|
||||
#$dolibarr_font_DOL_DEFAULT_TTF="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf";
|
||||
#$dolibarr_font_DOL_DEFAULT_TTF_BOLD="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf";
|
||||
|
||||
?>
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
<?php
|
||||
/*
|
||||
* PHP-Barcode 0.3pl1
|
||||
/* Copyright (C) 2001,2002,2003,2004 Folke Ashberg <folke@ashberg.de>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* PHP-Barcode 0.3pl2
|
||||
*
|
||||
* PHP-Barcode generates
|
||||
* - Barcode-Images using libgd2 (png, jpg, gif)
|
||||
@ -15,8 +17,6 @@
|
||||
* I25, 128RAW, CBR, MSI, PLS
|
||||
* genbarcode is available at www.ashberg.de/bar
|
||||
*
|
||||
* (C) 2001,2002,2003,2004 by Folke Ashberg <folke@ashberg.de>
|
||||
*
|
||||
* The newest version can be found at http://www.ashberg.de/bar
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -60,14 +60,15 @@ $text_color=Array(0,0,0);
|
||||
/* SAMPLE2 :
|
||||
* use font specified by full-path
|
||||
*/
|
||||
$font_loc = DOL_DOCUMENT_ROOT.'/includes/barcode/php-barcode/fonts/AerialBd.ttf';
|
||||
|
||||
if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
|
||||
/* Automatic-Detection of Font if running Windows
|
||||
* kick this lines if you don't need them! */
|
||||
// DOL_CHANGE LDR
|
||||
if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])){
|
||||
$font_loc=$_SERVER['WINDIR']."\Fonts\arialbd.ttf";
|
||||
}
|
||||
if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
|
||||
|
||||
|
||||
/* ******************************************************************** */
|
||||
/* GENBARCODE */
|
||||
@ -76,15 +77,10 @@ if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])){
|
||||
* leave blank if you don't have them :(
|
||||
* genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN
|
||||
*/
|
||||
|
||||
// DOL_CHANGE LDR
|
||||
if (isset($_SERVER['WINDIR']) && empty($conf->global->GENBARCODE_LOCATION))
|
||||
{
|
||||
$genbarcode_loc = DOL_DOCUMENT_ROOT.'/includes/barcode/php-barcode/genbarcode/genbarcode.exe';
|
||||
}
|
||||
else
|
||||
{
|
||||
$genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
|
||||
}
|
||||
if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND');
|
||||
else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
|
||||
//dol_syslog("genbarcode_loc=".$genbarcode_loc." - env_windows=".$_SERVER['WINDIR']);
|
||||
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
/**
|
||||
* \defgroup barcode Module barcode
|
||||
* \brief Module pour gerer les codes barres
|
||||
* \version $Id: modBarcode.class.php,v 1.29 2011/08/04 12:40:17 eldy Exp $
|
||||
* \version $Id: modBarcode.class.php,v 1.30 2011/08/14 17:17:20 eldy Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -61,7 +61,7 @@ class modBarcode extends DolibarrModules
|
||||
$this->dirs = array("/barcode/temp");
|
||||
|
||||
// Dependances
|
||||
$this->depends = array("modProduct");
|
||||
$this->depends = array(); // May be used for product or service or third party module
|
||||
$this->requiredby = array();
|
||||
|
||||
// Config pages
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/install/etape1.php
|
||||
* \ingroup install
|
||||
* \brief Build conf file on disk
|
||||
* \version $Id: etape1.php,v 1.137 2011/08/04 13:19:26 eldy Exp $
|
||||
* \version $Id: etape1.php,v 1.138 2011/08/14 17:17:19 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
|
||||
@ -232,6 +232,11 @@ if ($action == "set")
|
||||
$error+=write_conf_file($conffile);
|
||||
}
|
||||
|
||||
/**
|
||||
* Write main.inc.php and master.inc.php into documents dir
|
||||
*/
|
||||
// TODO
|
||||
|
||||
/**
|
||||
* Create database and admin user database
|
||||
*/
|
||||
@ -518,7 +523,8 @@ pFooter($error,$setuplang,'jsinfo');
|
||||
|
||||
/**
|
||||
* Save configuration file. No particular permissions are set by installer.
|
||||
* @param conffile Path to conf file
|
||||
*
|
||||
* @param conffile Path to conf file to generate/update
|
||||
*/
|
||||
function write_conf_file($conffile)
|
||||
{
|
||||
@ -528,6 +534,8 @@ function write_conf_file($conffile)
|
||||
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;
|
||||
global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP;
|
||||
global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD;
|
||||
|
||||
$error=0;
|
||||
|
||||
@ -609,6 +617,24 @@ function write_conf_file($conffile)
|
||||
fputs($fp, '$dolibarr_mailing_limit_sendbyweb=\'0\';');
|
||||
fputs($fp,"\n");
|
||||
|
||||
// Write params to overwrites default lib path
|
||||
fputs($fp,"\n");
|
||||
if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_ODTPHP_PATH=''; }
|
||||
fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');
|
||||
fputs($fp,"\n");
|
||||
if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '#'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP=''; }
|
||||
fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
|
||||
fputs($fp,"\n");
|
||||
|
||||
// Write params to overwrites default font path
|
||||
fputs($fp,"\n");
|
||||
if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) { fputs($fp, '#'); $force_dolibarr_font_DOL_DEFAULT_TTF=''; }
|
||||
fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.$force_dolibarr_font_DOL_DEFAULT_TTF.'\';');
|
||||
fputs($fp,"\n");
|
||||
if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fputs($fp, '#'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD=''; }
|
||||
fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
|
||||
fputs($fp,"\n");
|
||||
|
||||
fputs($fp, '?>');
|
||||
fclose($fp);
|
||||
|
||||
|
||||
@ -132,7 +132,7 @@ BecauseConnectionFailedParametersMayBeWrong=La conexión falla, los parámetros
|
||||
OrphelinsPaymentsDetectedByMethod=Pagos huérfanos detectados por el método %s
|
||||
RemoveItManuallyAndPressF5ToContinue=Suprimalo manualmente y pulse F5 para continuar.
|
||||
KeepDefaultValuesWamp=Está utilizando el asistente de instalación DoliWamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
|
||||
KeepDefaultValuesDeb=Está utilizando el asistente de instalación Dolibarr de un paquete Linux/BSD (Ubuntu, Debian, Fedora...), los valores propuestos aquí están optimizados. Sólo será necesaria la contraseña del propietario de la base de datos a crear. Cambie la otra información sólamente si está seguro de ello.
|
||||
KeepDefaultValuesDeb=Está utilizando el asistente de instalación Dolibarr de un paquete Linux o BSD (Ubuntu, Debian, Fedora...), los valores propuestos aquí están optimizados. Sólo será necesaria la contraseña del propietario de la base de datos a crear. Cambie la otra información sólamente si está seguro de ello.
|
||||
KeepDefaultValuesMamp=Está utilizando el asistente de instalación DoliMamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
|
||||
KeepDefaultValuesProxmox=Está utilizando el asistente de instalación Dolibarr desde una máquina virtual Proxmox, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
|
||||
FieldRenamed=Campo renombrado
|
||||
|
||||
@ -132,7 +132,7 @@ BecauseConnectionFailedParametersMayBeWrong=La connexion ayant échoué, les par
|
||||
OrphelinsPaymentsDetectedByMethod=Paiement orphelins détectés par la méthode %s
|
||||
RemoveItManuallyAndPressF5ToContinue=Supprimez le manuellement et appuyez sur F5 pour continuer.
|
||||
KeepDefaultValuesWamp=Comme vous utilisez l'assistant d'installation Dolibarr depuis DoliWamp, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifier qu'en connaissance de cause.
|
||||
KeepDefaultValuesDeb=Comme vous utilisez l'assistant d'installation Dolibarr depuis un package Linux/BSD (Ubuntu, Debian, Fedora, ...), les valeurs proposées aux paramètres sont déjà optimisées. Seul le mot de passe du propriétaire de la base de données à créer est à renseigner. Ne modifiez les autres informations qu'en connaissance de cause.
|
||||
KeepDefaultValuesDeb=Comme vous utilisez l'assistant d'installation Dolibarr depuis un package Linux ou BSD (Ubuntu, Debian, Fedora, ...), les valeurs proposées aux paramètres sont déjà optimisées. Seul le mot de passe du propriétaire de la base de données à créer est à renseigner. Ne modifiez les autres informations qu'en connaissance de cause.
|
||||
KeepDefaultValuesMamp=Comme vous utilisez l'assistant d'installation Dolibarr depuis DoliMamp, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifiez qu'en connaissance de cause.
|
||||
KeepDefaultValuesProxmox=Comme vous utilisez l'assistant d'installation Dolibarr depuis une machine virtuelle Proxmox, les valeurs proposées aux paramètres sont déjà optimisées. Ne les modifiez qu'en connaissance de cause.
|
||||
FieldRenamed=Champ renommé
|
||||
|
||||
@ -29,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.354 2011/08/11 19:12:58 eldy Exp $
|
||||
* \version $Id: master.inc.php,v 1.355 2011/08/14 17:17:20 eldy Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -294,16 +294,20 @@ if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR')
|
||||
* constant to path. Use '' to use include class path autodetect.
|
||||
*/
|
||||
// Path to root libraries
|
||||
if (! defined('TCPDF_PATH')) { define('TCPDF_PATH', DOL_DOCUMENT_ROOT .'/includes/tcpdf/'); }
|
||||
if (! defined('FPDFI_PATH')) { define('FPDFI_PATH', DOL_DOCUMENT_ROOT .'/includes/fpdfi/'); }
|
||||
if (! defined('MAGPIERSS_PATH')) { define('MAGPIERSS_PATH', DOL_DOCUMENT_ROOT .'/includes/magpierss/'); }
|
||||
if (! defined('NUSOAP_PATH')) { define('NUSOAP_PATH', DOL_DOCUMENT_ROOT .'/includes/nusoap/lib/'); }
|
||||
if (! defined('PHPEXCEL_PATH')) { define('PHPEXCEL_PATH', DOL_DOCUMENT_ROOT .'/includes/phpexcel/'); }
|
||||
if (! defined('TCPDF_PATH')) { define('TCPDF_PATH', DOL_DOCUMENT_ROOT .'/includes/tcpdf/'); }
|
||||
if (! defined('FPDFI_PATH')) { define('FPDFI_PATH', DOL_DOCUMENT_ROOT .'/includes/fpdfi/'); }
|
||||
if (! defined('MAGPIERSS_PATH')) { define('MAGPIERSS_PATH', DOL_DOCUMENT_ROOT .'/includes/magpierss/'); }
|
||||
if (! defined('NUSOAP_PATH')) { define('NUSOAP_PATH', DOL_DOCUMENT_ROOT .'/includes/nusoap/lib/'); }
|
||||
if (! defined('PHPEXCEL_PATH')) { define('PHPEXCEL_PATH', DOL_DOCUMENT_ROOT .'/includes/phpexcel/'); }
|
||||
if (! defined('ODTPHP_PATH')) { define('ODTPHP_PATH', empty($dolibarr_lib_ODTPHP_PATH)?DOL_DOCUMENT_ROOT.'/includes/odtphp/':$dolibarr_lib_ODTPHP_PATH.'/'); }
|
||||
if (! defined('ODTPHP_PATHTOPCLZIP')) { define('ODTPHP_PATHTOPCLZIP', empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP)?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/':$dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/'); }
|
||||
// Other required path
|
||||
if (! defined('MAGPIE_DIR')) { define('MAGPIE_DIR', MAGPIERSS_PATH); }
|
||||
if (! defined('MAGPIE_CACHE_DIR')) { define('MAGPIE_CACHE_DIR', $conf->externalrss->dir_temp); }
|
||||
if (! defined('DOL_DEFAULT_TTF')) { define('DOL_DEFAULT_TTF', empty($dolibarr_font_DOL_DEFAULT_TTF)?DOL_DOCUMENT_ROOT.'/includes/barcode/php-barcode/fonts/Aerial.ttf':$dolibarr_font_DOL_DEFAULT_TTF); }
|
||||
if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD)?DOL_DOCUMENT_ROOT.'/includes/barcode/php-barcode/fonts/AerialBd.ttf':$dolibarr_font_DOL_DEFAULT_TTF_BOLD); }
|
||||
if (! defined('MAGPIE_DIR')) { define('MAGPIE_DIR', MAGPIERSS_PATH); }
|
||||
if (! defined('MAGPIE_CACHE_DIR')) { define('MAGPIE_CACHE_DIR', $conf->externalrss->dir_temp); }
|
||||
// Old path to root deprecated (not used). Kept for extensions.
|
||||
if (! defined('FPDF_PATH')) { define('FPDF_PATH', DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf/'); }
|
||||
if (! defined('PHP_WRITEEXCEL_PATH')) { define('PHP_WRITEEXCEL_PATH',DOL_DOCUMENT_ROOT .'/includes/php_writeexcel/'); }
|
||||
if (! defined('FPDF_PATH')) { define('FPDF_PATH', DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf/'); }
|
||||
if (! defined('PHP_WRITEEXCEL_PATH')) { define('PHP_WRITEEXCEL_PATH',DOL_DOCUMENT_ROOT .'/includes/php_writeexcel/'); }
|
||||
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user