Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Avoid errors into rpm packages

Browse Source
This commit is contained in:
Laurent Destailleur
2011-07-31 21:24:20 +00:00
parent ee0a321c92
commit 3153d466b6
76 changed files with 559 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/deb/README
View File

@@ -7,9 +7,18 @@ This directory contains files used by makepack-dolibarr.pl
script to build a package, ready to be distributed,
with format .DEB (for Debian, Ubuntu, ...).
# To build a debian package, you need first
# apt-get -i debhelper
# apt-get -i dpkg-source
# apt-get -i gpg
# This is standard command to work on Debian packaging:
#
# gpg --gen-key Generate a GPG key
#
# debconf-updatepo To run into po dir to regenate templates.pot
#
# lintian --pedantic -E -I package.deb To test a package
#
# dpkg -l List all packages
@@ -20,6 +29,8 @@ with format .DEB (for Debian, Ubuntu, ...).
#
# dpkg -L packagename List content of installed package
# dpkg --purge Remove config files and interactive saved answers
#
# dpkg-buildpackage -us -uc Build a source and binary package
To submit a package to Debian:
@@ -36,3 +47,7 @@ For first ITP submission of Dolibarr, bug id was 634783.
- Add a line for upstream into file changelog with bug number
- Call for a mentor on ML debian-mentors to upload packages
- Once package is uploaded, following URL are available:
http://packages.qa.debian.org/package.html
http://bugs.debian.org/package

2
build/deb/changelog
View File

@@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
* New upstream release.
closes: bug#634783
-- Dolibarr team <contact@dolibarr.org> Mon, 30 Jul 2011 12:00:00 +0100
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 30 Jul 2011 12:00:00 +0100
# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file.

38
build/deb/config
View File

@@ -13,29 +13,16 @@ db_version 2.0
echo Run the dolibarr config script
# Rotate old configuration
#if [ "$1" = "reconfigure" ] ; then
# config="/etc/dolibarr/apache.conf"
# if [ -f $config ] ; then
# for i in $(seq 8 -1 0) ; do
# if [ -f ${config}.$i ] ; then
# mv ${config}.$i ${config}.$(($i +1))
# fi
# done
# mv ${config} ${config}.0
# fi
#fi
# Rotate old configuration
#if [ "$1" = "reconfigure" ] ; then
# config="/etc/dolibarr/lighttpd.conf"
# if [ -f $config ] ; then
# for i in $(seq 8 -1 0) ; do
# if [ -f ${config}.$i ] ; then
# mv ${config}.$i ${config}.$(($i +1))
# fi
# done
# mv ${config} ${config}.0
# fi
#fi
if [ "$1" = "reconfigure" ] ; then
config="/etc/dolibarr/apache.conf"
for i in $(seq 8 -1 0) ; do
if [ -f ${config}.$i ] ; then
mv ${config}.$i ${config}.$(($i +1))
fi
done
mv ${config} ${config}.0
fi
db_capb backup
@@ -43,9 +30,8 @@ db_capb backup
db_title "dolibarr" || true
# Ask if we must delete database
echo "Ask for web server to setup"
db_input critical dolibarr/reconfigure-webserver || true
# Ask for web server type.
#db_input critical "dolibarr/webserver" || true
if db_go ; then
okcancel="1"

48
build/deb/control
View File

@@ -1,48 +0,0 @@
Package: dolibarr
Version: __VERSION__
Architecture: all
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
Installed-Size: 61200
Depends: debconf, 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
Section: web
Priority: optional
Recommends: firefox
Homepage: http://www.dolibarr.org
Description: Easy to use web based ERP & CRM software
Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
It's a web software you can install as a standalone program or on any web
hosting provider to use it from anywhere with any web browser.
Dolibarr was designed to provide only features you need and be easy to use.
.
Only features you need are visible, depending on which module were activated.
Most common used modules are:
.
Customers, Suppliers or Prospects directory
Contacts directory
Orders management
Commercial proposals management
Invoices management
Products and services catalog
Stock management
Foundations members management
Bank accounts management
Point of Sale
Payments management
Commercial actions management
Contracts management
Standing orders management
Shipping management
Donations management
Bookmarks management
Mass Emailings
Reports
Data export and import tools
LDAP connectivity
PDF exports
And a lot of more modules...
.
You can also add third parties external modules or develop yours.

0
build/deb/control.debianbin → build/deb/control.DEBIAN
View File

10
build/deb/control.debian
View File

@@ -4,16 +4,10 @@ Standards-Version: 3.9.1
Section: web
Priority: optional
Homepage: http://www.dolibarr.org
Build-Depends: debhelper (>= 7), po-debconf
Build-Depends: debhelper, po-debconf
Package: dolibarr
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
php5-mysql | php5-mysqli,
php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
${misc:Depends}, xdg-utils,
mysql-server, perl
Recommends: apache2 | lighttpd | httpd, mysql-client
Suggests: www-browser
Depends: ${misc: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
Architecture: all
Section: web
Priority: optional

4
build/deb/dolibarr.desktop
View File

@@ -9,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
# Command to open an URL
# For Fedora: xdg-open
# For Debian/Ubuntu: x-www-browser
# For Debian/Ubuntu: xdg-open or x-www-browser
# (exo-open for xfde, gnome-open for gnome, ...)
Exec=x-www-browser http://localhost/dolibarr
Exec=xdg-open http://localhost/dolibarr
Icon=dolibarr
Terminal=false
Type=Application

9
build/deb/dolibarr.lintian-overrides
View File

@@ -1,9 +0,0 @@
# embedded libraries, which don't seem to be available in Debian in correct version
# or because they were modified and are specific dolibarr code
embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/adapters/jquery.js
embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/ckeditor.js
embedded-javascript-library usr/share/dolibarr/htdocs/includes/fckeditor/fckeditor.js
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

1
build/deb/install
View File

@@ -1,5 +1,4 @@
etc/dolibarr/apache.conf
etc/dolibarr/lighttpd.conf
usr/share/applications/dolibarr.desktop
usr/share/doc/dolibarr
usr/share/dolibarr

22
build/deb/lighttpd.conf
View File

@@ -1,22 +0,0 @@
# Alias for dolibarr directory
alias.url += (
"/dolibarr" => "/usr/share/dolibarr/htdocs",
)
# Disallow access to libraries
#$HTTP["url"] =~ "^/dolibarr/libraries" {
# url.access-deny = ( "" )
#}
# Limit access to setup script
#$HTTP["url"] =~ "^/dolibarr/setup" {
# auth.backend = "htpasswd"
# auth.backend.htpasswd.userfile = "/etc/dolibarr/htpasswd.setup"
# auth.require = (
# "/" => (
# "method" => "basic",
# "realm" => "Dolibarr Setup",
# "require" => "valid-user"
# )
# )
#}

22
build/deb/po/fr.po
View File

@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-01 18:17+0200\n"
"POT-Creation-Date: 2011-07-27 19:49+0200\n"
"PO-Revision-Date: 2011-07-29 22:45+0100\n"
"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
@@ -25,26 +25,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Project-Id: dolibarr\n"
#. Type: multiselect
#. Description
#: ../templates:1001
msgid "Web server to reconfigure automatically:"
msgstr "Seveur web à reconfigurer automatiquement:"
#. Type: multiselect
#. Description
#: ../templates:1001
msgid ""
"Please choose the web server that should be automatically configured to run "
"dolibarr."
msgstr ""
"Selectionnez le serveur web à configurer automatiquement pour utiliser "
"dolibarr."
#
#. Type: boolean
#. Description
#: ../templates:2001
#: ../templates:1001
#, fuzzy
msgid "Delete database and uploaded files ?"
msgstr "Effacer la base de donnée et les fichiers uploadés ?"
@@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?"
#
#. Type: boolean
#. Description
#: ../templates:2001
#: ../templates:1001
#, fuzzy
msgid ""
"Answer if you want to removed the Dolibarr MySQL database and all other "

20
build/deb/po/templates.pot
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-01 18:17+0200\n"
"POT-Creation-Date: 2011-07-27 19:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,29 +17,15 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: multiselect
#. Description
#: ../templates:1001
msgid "Web server to reconfigure automatically:"
msgstr ""
#. Type: multiselect
#. Description
#: ../templates:1001
msgid ""
"Please choose the web server that should be automatically configured to run "
"dolibarr."
msgstr ""
#. Type: boolean
#. Description
#: ../templates:2001
#: ../templates:1001
msgid "Delete database and uploaded files ?"
msgstr ""
#. Type: boolean
#. Description
#: ../templates:2001
#: ../templates:1001
msgid ""
"Answer if you want to removed the Dolibarr MySQL database and all other "
"datas (datas related to this question are the Dolibarr DBMS account, all "

84
build/deb/postinst
View File

@@ -1,5 +1,7 @@
#!/bin/sh
# postinst script for dolibarr
#
# see: dh_installdeb(1)
set -e
@@ -14,31 +16,6 @@ set -e
# for details, see /usr/share/doc/packaging-manual/
lighttpd_install() {
if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
if which lighty-enable-mod >/dev/null 2>&1 ; then
echo "Add link for Lighttpd config file"
ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf
# We enabled it
lighty-enable-mod dolibarr fastcgi-php
else
echo "Lighttpd not installed, skipping"
fi
fi
}
apache_install() {
webserver=$1
if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
echo "Add link for Apache config file"
ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf
fi
}
. /usr/share/debconf/confmodule
db_version 2.0
@@ -50,6 +27,8 @@ echo Run the dolibarr postinst script
# Define vars
docdir='/var/lib/dolibarr/documents'
#docdir='/usr/share/dolibarr/documents'
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
apacheconfig="/etc/dolibarr/apache.conf"
installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
installconfig="/etc/dolibarr/install.forced.php"
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
@@ -65,6 +44,10 @@ case "$1" in
chmod -R 775 $docdir
chmod -R g+s $docdir
# Copy apache.conf file into target directory
#mkdir -p /etc/dolibarr
#cp -p $apachefileorig $apacheconfig
# Copy install config file (with matching Debian) values into target directory
superuserlogin=''
superuserpassword=''
@@ -91,15 +74,21 @@ case "$1" in
chmod -R 660 $config
fi
# Get the web server type (use db_get for interactive mode).
#db_reset "dolibarr/webserver"
#db_get "dolibarr/webserver" # Read value for webserver.
#webserver="$RET"
db_get dolibarr/reconfigure-webserver
webservers="$RET"
case $webserver in
Apache) webservers="apache2" ;;
Apache-SSL) webservers="apache2-ssl" ;;
Both) webservers="apache2 apache2-ssl" ;;
*) webservers="apache2 apache2-ssl" ;;
esac
# Set up web server.
for webserver in $webservers ; do
webserver=${webserver%,}
echo Complete config of server $webserver
for server in $webservers ; do
echo Complete config of server $server
# Detect webuser and webgroup
webuser=
@@ -117,32 +106,27 @@ case "$1" in
# Set permissions to web server
chown -R $webuser:$webgroup /usr/share/dolibarr
chown -R root:$webgroup $config
# Add link to config file
echo Setup web server $server to add dolibarr config file
ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf
done
# Restart web server.
for webserver in $webservers; do
webserver=${webserver%,}
if [ "$webserver" = "lighttpd" ] ; then
lighttpd_install
else
apache_install $webserver
fi
# Reload webserver in any case, configuration might have changed
# Redirection of 3 is needed because Debconf uses it and it might
# be inherited by webserver. See bug #446324.
if [ -f /etc/init.d/$webserver ] ; then
# Restart servers
servers="apache2-ssl apache2 mysql"
# Another way to restart
for server in $servers ; do
if [ -x /usr/sbin/invoke-rc.d ]; then
echo Restart web server $server using invoke-rc.d
# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
invoke-rc.d $webserver reload 3>/dev/null || true
invoke-rc.d $server reload || true
else
echo Restart web server $server using $server reload
/etc/init.d/$webserver reload 3>/dev/null || true
fi
/etc/init.d/$server reload || true
fi
done
echo ----------
echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
echo ----------
@@ -152,13 +136,13 @@ case "$1" in
;;
*)
echo "postinst called with unknown argument $1" >&2
echo "postinst called with unknown argument \`$1'" >&2
exit 0
;;
esac
#DEBHELPER#
db_stop
#DEBHELPER#
exit 0

115
build/deb/postrm
View File

@@ -17,36 +17,7 @@ set -e
# for details, see /usr/share/doc/packaging-manual/
lighttpd_remove() {
if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
echo "Remove link for Lighttpd config file"
rm -f /etc/lighttpd/conf-available/50-dolibarr.conf
if which lighty-enable-mod >/dev/null 2>&1 ; then
lighty-disable-mod dolibarr
else
echo "Lighttpd not installed, skipping"
fi
# See bug #448682
if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then
echo 'Manually deleting lighttpd/dolibarr configuration link'
rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
fi
fi
}
apache_remove() {
if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then
echo "Remove link for Apache config file"
rm -f /etc/$webserver/conf.d/dolibarr.conf
fi
}
if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
db_version 2.0
@@ -55,62 +26,63 @@ echo Run the dolibarr postrm script
docdir='/var/lib/dolibarr/documents'
#docdir='/usr/share/dolibarr/documents'
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
apacheconfig="/etc/dolibarr/apache.conf"
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="/etc/dolibarr/conf.php"
lockfile="/usr/share/dolibarr/install.lock"
export webserver=""
# Allows us to loop and substitute in one pass
case $webserver in
Apache) webservers="apache2" ;;
Apache-SSL) webservers="apache2-ssl" ;;
Both) webservers="apache2 apache2-ssl" ;;
*) webservers="apache2 apache2-ssl" ;;
esac
case "$1" in
# Call when we upgrade
upgrade)
echo "postrm upgrade"
;;
# Call when we uninstall
remove)
echo "postrm remove"
rm -f $lockfile
# Reconfigure web server
db_get dolibarr/reconfigure-webserver
webservers="$RET"
# Restart web servers
for webserver in $webservers; do
webserver=${webserver%,}
if [ "$webserver" = "lighttpd" ] ; then
lighttpd_remove
else
apache_remove $webserver
fi
# Redirection of 3 is needed because Debconf uses it and it might
# be inherited by webserver. See bug #446324.
if [ -f /etc/init.d/$webserver ] ; then
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d $webserver reload 3>/dev/null || true
else
/etc/init.d/$webserver reload 3>/dev/null || true
# Remove include files
export restart=""
for server in $webservers ; do
export conffile="/etc/$server/conf.d/dolibarr.conf"
if [ -f $conffile ] ;
then
echo Delete link $conffile
rm -f $conffile
status=purge
fi
if [ "x$status" = "xpurge" ] ;
then restart="$restart $server"
fi
done
;;
# Call when we uninstall and purge
purge)
echo "postrm purge"
echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
# Ask if we must delete database
echo "postrm db_input dolibarr/postrm"
db_input critical dolibarr/postrm || true
db_input critical "dolibarr/postrm" || true
db_go || true
echo "postrm db_get dolibarr/postrm"
# We disable set -e to avoid premature end of script if error
set +e
db_get dolibarr/postrm
db_get "dolibarr/postrm"
set -e
if [ "$RET" = "true" ] ; then
@@ -213,12 +185,41 @@ case "$1" in
echo "postrm Delete of dolibarr database and uploaded files not wanted"
fi
# Remove include files
export restart=""
for server in $webservers ; do
export conffile="/etc/$server/conf.d/dolibarr.conf"
if [ -f $conffile ] ;
then
echo Delete file $conffile
rm -f $conffile
status=purge
fi
if [ "x$status" = "xpurge" ] ;
then restart="$restart $server"
fi
done
rm -rf /etc/dolibarr
# Restart servers
for server in $restart ; do
# We disable blocking errors
set +e
echo "Restart server $server if exists"
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d $server reload || true
else
/etc/init.d/$server reload || true
fi
# We restore blocking errors
set -e
done
# We clean variable (we ignore errors because db_reset can fails if var was never set)
set +e
db_reset dolibarr/reconfigure-webserver
db_reset dolibarr/postrm
db_reset "dolibarr/postrm"
set -e
#db_purge
@@ -228,7 +229,7 @@ case "$1" in
;;
*)
echo "postrm called with unknown argument $1" >&2
echo "postrm called with unknown argument \`$1'" >&2
exit 0
;;
esac

8
build/deb/templates
View File

@@ -1,7 +1,7 @@
Template: dolibarr/postrm
Type: boolean
Default: true
Description: Delete database ?
Answer if you want to removed the Dolibarr MySQL database and all
its datas (datas related to this quetion are the Dolibarr DBMS account
and all Dolibarr tables).
_Description: Delete database and uploaded files ?
Answer if you want to removed the Dolibarr MySQL database and all other
datas (datas related to this question are the Dolibarr DBMS account, all
Dolibarr tables, and all uploaded files).

239
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.112 2011/07/21 22:11:30 eldy Exp $
# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@@ -11,7 +11,7 @@ use Cwd;
$PROJECT="dolibarr";
$MAJOR="3";
$MINOR="1";
$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$RPMSUBVERSION="auto"; # auto use value found into BUILD
@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
@@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot";
$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
if (-d "/usr/src/redhat") {
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.112 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@@ -248,16 +248,22 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
$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-*.deb`;
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
$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`;
@@ -266,25 +272,41 @@ if ($nboftargetok) {
$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/install/mssql/README`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
$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`;
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
$ret=`rm -fr $BUILDROOT/$PROJECT/build/deb/po/CVS*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
$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 -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`;
@@ -392,14 +414,19 @@ if ($nboftargetok) {
}
if ($target eq 'RPM') { # Linux only
$ARCH='i386';
#$ARCH='i386';
$ARCH='noarch';
if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
$newbuild = $BUILD;
$newbuild =~ s/(dev|alpha)/0/gi; # dev
$newbuild =~ s/beta/1/gi; # beta
$newbuild =~ s/rc./2/gi; # rc
# For fedora
$newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev
$newbuild =~ s/beta/0.2.beta1/gi; # beta
$newbuild =~ s/rc./0.3.rc1/gi; # rc
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
# now newbuild is 0-0 or 0-3 for example
#$newbuild =~ s/(dev|alpha)/0/gi; # dev
#$newbuild =~ s/beta/1/gi; # beta
#$newbuild =~ s/rc./2/gi; # rc
#if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
@@ -417,6 +444,16 @@ if ($nboftargetok) {
print "Remove other files\n";
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
@@ -445,6 +482,10 @@ if ($nboftargetok) {
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
$ret=`$cmd`;
print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
$cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
$ret=`$cmd`;
next;
}
@@ -457,9 +498,12 @@ if ($nboftargetok) {
if ($newbuild !~ /-/) { $newbuild.='-4'; } # finale
# now newbuild is 0-1 or 0-4 for example
print "Version is $MAJOR.$MINOR.$newbuild\n";
$build = $newbuild;
$build =~ s/-.*$//g;
# now build is 0 for example
print "Remove target $FILENAMEDEB.deb...\n";
unlink("$DESTI/$FILENAMEDEB.deb");
print "Remove target ${FILENAMEDEB}_all.deb...\n";
unlink("$DESTI/${FILENAMEDEB}_all.deb");
#rmdir "$BUILDROOT/$PROJECT.tmp";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
@@ -468,31 +512,73 @@ if ($nboftargetok) {
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
$ret=`$cmd`;
# Create DEBIAN directory
print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
$ret=`cp -r "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`cp -r "$SOURCE/build/deb/control" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`cp -r "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`cp -r "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`cp -r "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`;
print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error";
open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
while (<SPECFROM>) {
$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
print SPECTO $_;
}
close SPECFROM;
close SPECTO;
print "Version set to $MAJOR.$MINOR.$newbuild\n";
print "Remove other files\n";
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`;
#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/doap`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/exe`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/live`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/patch`;
$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/dev/dbmodel`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/fpdf`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/initdata`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/uml`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/xdebug`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;
@@ -513,16 +599,13 @@ if ($nboftargetok) {
# To remove once stable
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
open (SPECFROM,"<$SOURCE/build/deb/control") || die "Error";
open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
while (<SPECFROM>) {
$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
print SPECTO $_;
}
close SPECFROM;
close SPECTO;
print "Version set to $MAJOR.$MINOR.$newbuild\n";
# Apache conf files
print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
# Dolibarr conf files
# TODO
# dolibarr.desktop
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
@@ -539,15 +622,16 @@ if ($nboftargetok) {
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
#$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
# copyright (to build binary package directly without sources. Useless if we build from sources)
#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
#$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
# copyright
$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
# changelog (to build binary package directly without sources. Useless if we build from sources)
#$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
#$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
print "Set owners on files/dir\n";
$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
@@ -581,21 +665,63 @@ if ($nboftargetok) {
$olddir=getcwd();
chdir("$BUILDROOT");
$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb";
# Creation of binary package (to build without sources)
#$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
#print "Launch DEB build ($cmd)\n";
#$ret=`$cmd`;
#print $ret."\n";
# Creation of source package
print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
# Add files for dpkg-source
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
# Add files also required to build binary package with dpkg-buildpackages
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$ret=`$cmd`;
chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$cmd="dpkg-buildpackage -us -uc";
print "Launch DEB build ($cmd)\n";
$ret=`$cmd`;
print $ret."\n";
chdir("$olddir");
if ($OS =~ /windows/i)
{
print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
print "Move *_all.deb to $DESTI\n";
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
}
else
{
print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
print "Move *_all.deb to $DESTI\n";
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
}
next;
}
@@ -623,14 +749,21 @@ if ($nboftargetok) {
$ret=`$cmd`;
print "Remove other files\n";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/dbmodel`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/fpdf`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/initdata`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/iso-normes`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpcheckstyle`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpunit`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/uml`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/xdebug`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/flyer`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/font`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/tshirt`;

8
build/rpm/README
View File

@@ -10,8 +10,6 @@ with format RPM (for Redhat, Mandriva, ...).
# This is standard command to work on Debian packaging:
#
# rpmlint file.rpm Test a package
#
# On Fedora
# rpm -i --test dolibarr-...rpm To list dependencies of RPM
# yum install dolibarr-...rpm To install package and dependencies
@@ -42,9 +40,7 @@ different features for Enterprise Resource Planning (ERP) and Customer
Relationship Management (CRM) but also for different other activities.
I am author of other already packaged OpenSources packages (awstats) but this
is my first package to maintain myself. So i'm seeking a sponsor.
- Edit field "Block" and add FE-NEEDSPONSOR
- Check bug is into database by searching with id on https://bugzilla.redhat.com/
- Install fedora packager tools: yum install fedora-packager
- Setup fedora packagers tools: fedora-packager-setup
- Send your package: koji build --scratch f16 path_to_source_RPM
- Check if package is available: http://koji.fedoraproject.org/koji/

2
build/rpm/dolibarr.desktop
View File

@@ -19,7 +19,7 @@ Exec=xdg-open http://localhost/dolibarr
Icon=dolibarr
Terminal=false
Type=Application
Categories=Office;
Categories=Office
StartupNotify=true
InitialPreference=5
#NoDisplay=true

27
build/rpm/dolibarr.spec
View File

@@ -48,7 +48,7 @@ AutoReqProv: no
%description
An easy to use CRM & ERP open source/free software for small
Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
@@ -56,7 +56,7 @@ Dolibarr was designed to provide only features you need and be easy to
use.
%description -l es
Un software ERP y CRM open source/gratis para pequeñas y
Dolibarr ERP y CRM es un software open source/gratis para pequeñas y
medianas empresas, asociaciones o autónomos. Incluye diferentes
funcionalidades para la Planificación de Recursos Empresariales (ERP) y
Gestión de la Relación con los Clientes (CRM) así como para para otras
@@ -65,13 +65,13 @@ solamente las funcionalidades que necesita y haciendo hincapié en su
facilidad de uso.
%description -l fr
Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs,
Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs,
artisans ou associations. Il permet de gérer vos clients, prospect,
fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
et bien d'autres choses dans une interface pensée pour la simplicité.
%description -l it
Un programma gestionale open source e gratuito per piccole e medie
Dolibarr è un programma gestionale open source e gratuito per piccole e medie
imprese, fondazioni e liberi professionisti. Include varie funzionalità per
Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno
@@ -101,7 +101,6 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
# %{_datadir} = /usr/share
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -154,8 +153,6 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="%{_sysconfdir}/dolibarr/conf.php"
lockfile="/usr/share/dolibarr/install.lock"
@@ -221,7 +218,7 @@ then
chmod -R 660 $config
fi
# Create config file for apache $apacheconfig
# Create a config file $apacheconfig
if [ ! -f $apacheconfig ]; then
echo Create dolibarr web server config file $apacheconfig
cp $apachefileorig $apacheconfig
@@ -229,15 +226,7 @@ if [ ! -f $apacheconfig ]; then
chmod go-w $apacheconfig
fi
# Create config file for se $seconfig
if [ ! -f $seconfig ]; then
echo Create se config file $seconfig
cp $sefileorig $seconfig
# chmod a-x $apacheconfig
# chmod go-w $apacheconfig
fi
# Create a config link dolibarr.conf
# Create a config link dolibarr.conf for Fedora or Redhat
if [ ! -f $apachelink ]; then
echo Create dolibarr web server config link $apachelink
ln -fs $apacheconfig $apachelink
@@ -370,5 +359,5 @@ rmdir $targetdir/doc >/dev/null 2>&1
#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm
%changelog
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
- Initial version (#723326)
* Wed Jul 31 2011 Laurent Destailleur 3.1.0
- Initial upstream (#723326)

4
dev/skeletons/modMyModule.class.php
View File

@@ -27,7 +27,7 @@
* \file htdocs/includes/modules/modMyModule.class.php
* \ingroup mymodule
* \brief Description and activation file for module MyModule
* \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $
* \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
*/
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='generic';
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
$this->triggers = 0;
// Data directories to create when module is enabled.

2
doc/images/README
View File

@@ -12,3 +12,5 @@ Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com
-------------------------------------------------------
List of icons from http://led24.de/iconset/ are:
- dolihelp.ico

8
htdocs/admin/boxes.php
View File

@@ -20,7 +20,7 @@
/**
* \file htdocs/admin/boxes.php
* \brief Page to setup boxes
* \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $
* \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
*/
require("../main.inc.php");
@@ -278,7 +278,7 @@ if ($resql)
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
}
else
{
@@ -394,7 +394,7 @@ if ($resql)
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
}
else
{
@@ -470,5 +470,5 @@ print '</table>';
$db->close();
llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $');
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
?>

35
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 $dirroot)
{
$dir = $dirroot . "/includes/modules/";
foreach ($conf->file->dol_document_root as $type => $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/';
}
}
}
}
}
}
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 $');
?>

34
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 $dirroot)
{
$dir = $dirroot . "/includes/modules/";
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)
{
// 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,14 +12,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/proxy.php
* \ingroup core
* \brief Page setup proxy to use for external web access
* \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
* \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
*/
require("../main.inc.php");
@@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg);
$db->close();
llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
?>

7
htdocs/admin/security_other.php
View File

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

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

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

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

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

6
htdocs/boxes.php
View File

@@ -22,7 +22,7 @@
* \brief File of class to manage widget boxes
* \author Rodolphe Qiedeville
* \author Laurent Destailleur
* \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $
* \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $
*/
@@ -220,7 +220,7 @@ class InfoBox
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php");
$sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php");
}
else
{
@@ -281,7 +281,7 @@ class InfoBox
{
$boxname = $regs[1];
$module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
}
else
{

3
htdocs/cashdesk/validation_verif.php
View File

@@ -14,7 +14,8 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
require('../main.inc.php');

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

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

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

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

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

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

5
htdocs/compta/journal/sellsjournal.php
View File

@@ -14,7 +14,8 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
require("../../main.inc.php");
@@ -203,5 +204,5 @@ print "</table>";
// End of page
$db->close();
llxFooter('$Date: 2011/07/31 22:08:25 $ - $Revision: 1.10 $');
llxFooter('$Date: 2011/07/31 21:26:51 $ - $Revision: 1.9 $');
?>

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

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

6
htdocs/contrat/fiche.php
View File

@@ -23,7 +23,7 @@
* \file htdocs/contrat/fiche.php
* \ingroup contrat
* \brief Page of a contract
* \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $
* \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $
*/
require ("../main.inc.php");
@@ -757,7 +757,7 @@ else
$var=!$var;
if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid)
if ($action != 'editline' || $_GET["rowid"] != $objp->rowid)
{
print '<tr '.$bc[$var].' valign="top">';
// Libelle
@@ -1286,5 +1286,5 @@ else
$db->close();
llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $');
llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $');
?>

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

@@ -16,7 +16,8 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
@@ -24,7 +25,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.64 2011/08/01 13:26:22 hregis Exp $
* \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $
*/
@@ -144,13 +145,13 @@ class Conf
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
{
$modulename = strtolower($reg[1]);
$this->triggers_modules[] = '/'.$modulename.'/includes/triggers/';
$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard
}
// If this is constant for login method activated by a module
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
{
$modulename = strtolower($reg[1]);
$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/';
$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
}
// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))

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

@@ -12,13 +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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/core/class/cookie.class.php
* \ingroup core
* \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $
* \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
* \brief File of class to manage cookies
*/

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

@@ -31,7 +31,7 @@
* \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.191 2011/07/21 22:55:06 eldy Exp $
* \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $
*/
@@ -677,7 +677,7 @@ class Form
$sql = "SELECT s.rowid, s.name, s.firstname, s.poste FROM";
$sql.= " ".MAIN_DB_PREFIX ."socpeople as s";
$sql.= " WHERE entity = ".$conf->entity;
if ($socid) $sql.= " AND fk_soc=".$socid;
if ($socid > 0) $sql.= " AND fk_soc=".$socid;
$sql.= " ORDER BY s.name ASC";
dol_syslog("Form::select_contacts sql=".$sql);

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

@@ -14,14 +14,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \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.9 2011/07/31 23:45:13 eldy Exp $
* \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $
*/

7
htdocs/core/class/translate.class.php
View File

@@ -23,7 +23,7 @@
* \brief File for Tanslate class
* \author Eric Seigne
* \author Laurent Destailleur
* \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $
* \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $
*/
@@ -512,10 +512,9 @@ class Translate {
* Return list of all available languages
* @param langdir Directory to scan
* @param maxlength Max length for each value in combo box (will be truncated)
* @param usecode Show code instead of country name for language variant
* @return array List of languages
*/
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0)
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0)
{
global $conf;
@@ -528,7 +527,7 @@ class Translate {
{
$this->load("languages");
if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE)
{
$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
}

13
htdocs/filefunc.inc.php
View File

@@ -28,7 +28,7 @@
* \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.19 2011/07/21 22:11:30 eldy Exp $
* \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
*/
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -61,8 +61,17 @@ error_reporting(E_ALL ^ E_NOTICE);
//error_reporting(E_ALL);
$conffiletoshowshort = "conf.php";
# Define localization of conf file
$conffile = "conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
# For debian like systems
#$conffile = "/etc/dolibarr/conf.php";
#$conffiletoshow = "/etc/dolibarr/conf.php";
// Include configuration
$result=@include_once("conf/conf.php");
$result=@include_once($conffile);
if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session
{
header("Location: install/index.php");

7
htdocs/imports/import.php
View File

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

4
htdocs/includes/modules/modWorkflow.class.php
View File

@@ -19,7 +19,7 @@
/**
* \defgroup workflow Module workflow
* \brief Workflow management
* \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $
* \version $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
*/
/**
@@ -68,7 +68,7 @@ class modWorkflow extends DolibarrModules
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='technic';
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
$this->triggers = 1;
// Data directories to create when module is enabled

7
htdocs/index.php
View File

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

5
htdocs/install/check.php
View File

@@ -15,14 +15,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \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.87 2011/07/31 23:26:19 eldy Exp $
* \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $
*/
include_once("./inc.php");

5
htdocs/install/etape0.php
View File

@@ -14,14 +14,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/install/etape0.php
* \ingroup install
* \brief Show and ask charset for database
* \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $
* \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $
*/
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php

5
htdocs/install/etape1.php
View File

@@ -16,14 +16,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/install/etape1.php
* \ingroup install
* \brief Build conf file on disk
* \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $
* \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $
*/
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php

5
htdocs/install/etape2.php
View File

@@ -13,14 +13,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \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.106 2011/07/31 23:26:19 eldy Exp $
* \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $
*/
include("./inc.php");

5
htdocs/install/etape4.php
View File

@@ -15,14 +15,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/install/etape4.php
* \ingroup install
* \brief Ask login and password of Dolibarr admin user
* \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $
* \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $
*/

5
htdocs/install/etape5.php
View File

@@ -16,14 +16,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/install/etape5.php
* \ingroup install
* \brief Last page of upgrade or install process
* \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $
* \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
*/
include_once("./inc.php");

5
htdocs/install/fileconf.php
View File

@@ -17,14 +17,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \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.94 2011/07/31 23:26:27 eldy Exp $
* \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $
*/
include_once("./inc.php");

13
htdocs/install/inc.php
View File

@@ -15,13 +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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/** \file htdocs/install/inc.php
* \ingroup core
* \brief File that define environment for install pages
* \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $
* \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $
*/
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php";
# Define localization of conf file
$conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
$lockfile = '../../install.lock';
# For debian/redhat like systems
# For debian 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))
{
@@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"]))
}
exit;
}
if (file_exists($lockfile))
if (file_exists('../../install.lock'))
{
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))

5
htdocs/install/licence.php
View File

@@ -13,14 +13,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \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.21 2011/07/31 23:26:22 eldy Exp $
* \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $
*/
include_once("./inc.php");

5
htdocs/install/upgrade2.php
View File

@@ -15,13 +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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/install/upgrade2.php
* \brief Upgrade some data
* \version $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $
* \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $
*/
include_once('./inc.php');

10
htdocs/langs/ca_ES/admin.lang
View File

@@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons)
ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
DaylingSavingTime=Horari d'estiu (usuari)
CurrentHour=Hora PHP (servidor)
CompanyTZ=Zona Horària empresa (casa mare)
CompanyHour=Hora empresa (casa mare)
CompanyTZ=Zona Horària empresa (seu central)
CompanyHour=Hora empresa (seu central)
CurrentSessionTimeOut=Time out sessió actual
OSEnv=Entorn SO
Box=Panell
@@ -1246,9 +1246,9 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te
CashDesk=TPV
CashDeskSetup=Mòdul de configuració Terminal Punt de Venda
CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes
CashDeskBankAccountForSell=Compte a utilitzar per als cobraments en efectiu (caixa)
CashDeskBankAccountForCheque=Compte a utilitzar per als cobraments amb xecs
CashDeskBankAccountForCB=Compte a utilitzar per als cobraments amb targeta de crèdit
CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
CashDeskBankAccountForCheque=Compte per defecte a utilitzar per als cobraments amb xecs
CashDeskBankAccountForCB=Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes
##### Bookmark #####
BookmarkSetup=Configuració del mòdul Bookmark

2
htdocs/langs/ca_ES/paypal.lang
View File

@@ -5,7 +5,7 @@ PaypalDesc=Aquest mòdul ofereix una pàgina de pagament a través del proveïdo
PaypalOrCBDoPayment=Continuar el pagament mitjançant targeta o Paypal
PaypalDoPayment=Continuar el pagament mitjançant Paypal
PaypalCBDoPayment=Continuar el pagament mitjançant targeta
PAYPAL_API_SANDBOX=Mode de proves(sandbox)
PAYPAL_API_SANDBOX=Mode de prova / caixa de sorra (sandbox)
PAYPAL_API_USER=Nom usuari API
PAYPAL_API_PASSWORD=Contrasenya usuari API
PAYPAL_API_SIGNATURE=Signatura API

10
htdocs/langs/es_ES/admin.lang
View File

@@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset servidor con Greenwich (segundos)
ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos)
DaylingSavingTime=Horario de verano (usuario)
CurrentHour=Hora PHP (servidor)
CompanyTZ=Zona Horaria empresa (casa madre)
CompanyHour=Hora empresa (casa madre)
CompanyTZ=Zona Horaria empresa (sede central)
CompanyHour=Hora empresa (sede central)
CurrentSessionTimeOut=Time out sesión actual
OSEnv=Entorno SO
Box=Panel
@@ -1246,9 +1246,9 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
CashDesk=TPV
CashDeskSetup=Configuración del módulo Terminal Punto de Venta
CashDeskThirdPartyForSell=Tercero genérico a usar para la venta
CashDeskBankAccountForSell=Cuenta a utilizar para los cobros en efectivo (caja)
CashDeskBankAccountForCheque=Cuenta a utilizar para los cobros con cheques
CashDeskBankAccountForCB=Cuenta a utilizar para los cobros con tarjeta de crédito
CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
CashDeskBankAccountForCheque=Cuenta por defecto a utilizar para los cobros con cheques
CashDeskBankAccountForCB=Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
CashDeskIdWareHouse=Almacén a utilizar para las ventas
##### Bookmark #####
BookmarkSetup=Configuración del módulo Marcadores

2
htdocs/langs/es_ES/paypal.lang
View File

@@ -5,7 +5,7 @@ PaypalDesc=Este módulo ofrece una página de pago a través del proveedor <a h
PaypalOrCBDoPayment=Continuar el pago mediante tarjeta o Paypal
PaypalDoPayment=Continuar el pago mediante Paypal
PaypalCBDoPayment=Continuar el pago mediante tarjeta
PAYPAL_API_SANDBOX=Modo de pruebas (sandbox)
PAYPAL_API_SANDBOX=Modo de prueba/caja de arena (sandbox)
PAYPAL_API_USER=Nombre usuario API
PAYPAL_API_PASSWORD=Contraseña usuario API
PAYPAL_API_SIGNATURE=Firma API

73
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,42 +615,17 @@ 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/";
$dir = $dol_document_root."/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)
{
if (file_exists($dir.$modFile))
{
$found=@include_once($dir.$modFile);
$found=@include_once($dir.$file);
if ($found) break;
}
}
$objMod = new $modName($db);
@@ -725,47 +700,21 @@ 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/";
$dir = $dol_document_root."/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)
{
if (file_exists($dir.$modFile))
{
$found=@include_once($dir.$modFile);
$found=@include_once($dir.$file);
if ($found) break;
}
}
if ($found)
{

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

@@ -13,14 +13,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* 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.60 2011/07/31 23:25:18 eldy Exp $
* \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $
*/

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

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

5
htdocs/main.inc.php
View File

@@ -18,14 +18,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \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.756 2011/07/31 23:19:05 eldy Exp $
* \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $
*/
@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP

9
htdocs/master.inc.php
View File

@@ -21,7 +21,8 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
@@ -29,7 +30,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.352 2011/08/01 12:25:14 hregis Exp $
* \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $
*/
@@ -70,14 +71,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse);
$conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey;
// Define array of document root directories
$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT);
$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT);
if (! empty($dolibarr_main_document_root_alt))
{
// dolibarr_main_document_root_alt contains several directories
$values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
foreach($values as $value)
{
$conf->file->dol_document_root['alt']=$value;
$conf->file->dol_document_root[]=$value;
}
}

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

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

7
htdocs/product/fiche.php
View File

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

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

@@ -13,14 +13,15 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/*
* \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.11 2011/07/31 23:22:58 eldy Exp $
* \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php");

7
htdocs/societe/rib.php
View File

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

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,13 +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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/theme/auguria/style.css.php
* \brief Fichier de style CSS du theme auguria
* \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $
* \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 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,13 +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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Eldy
* \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $
* \version $Id: style.css.php,v 1.88 2011/07/28 13:22:19 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,13 +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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/theme/freelug/style.css.php
* \brief Fichier de style CSS du theme Freelug
* \version $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $
* \version $Id: style.css.php,v 1.43 2011/07/28 13:31:58 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,13 +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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/theme/yellow/style.css.php
* \brief Fichier de style CSS du theme Yellow
* \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $
* \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 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 $dirroot)
{
$dir = $dirroot . "/includes/modules/";
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)
{
// 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/";
$dir=$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)
{
$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,7 +14,8 @@
* 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, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
*/
@@ -22,7 +23,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.97 2011/07/31 23:19:04 eldy Exp $
* \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $
*/
// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).