Can disable string encoding (if already done)
This commit is contained in:
Laurent Destailleur
parent
a1525f0a90
commit
996563a5ef
@ -14,3 +14,6 @@ version-phpsane.txt
|
|||||||
makepack-phpsane.conf
|
makepack-phpsane.conf
|
||||||
html
|
html
|
||||||
*.deb
|
*.deb
|
||||||
|
*.dsc
|
||||||
|
*.tar.gz
|
||||||
|
*.changes
|
||||||
|
|||||||
@ -36,7 +36,3 @@ For first ITP submission of Dolibarr, bug id was 634783.
|
|||||||
- Add a line for upstream into file changelog with bug number
|
- Add a line for upstream into file changelog with bug number
|
||||||
|
|
||||||
- Call for a mentor on ML debian-mentors to upload packages
|
- 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
|
|
||||||
http://bugs.debian.org/package
|
|
||||||
|
|||||||
@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
|
|||||||
* New upstream release.
|
* New upstream release.
|
||||||
closes: bug#634783
|
closes: bug#634783
|
||||||
|
|
||||||
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 18 Jul 2011 12:00:00 +0100
|
-- Dolibarr team <contact@dolibarr.org> Mon, 30 Jul 2011 12:00:00 +0100
|
||||||
|
|
||||||
# More information into /usr/share/dolibarr/ChangeLog file.
|
# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file.
|
||||||
@ -13,16 +13,29 @@ db_version 2.0
|
|||||||
echo Run the dolibarr config script
|
echo Run the dolibarr config script
|
||||||
|
|
||||||
# Rotate old configuration
|
# Rotate old configuration
|
||||||
if [ "$1" = "reconfigure" ] ; then
|
#if [ "$1" = "reconfigure" ] ; then
|
||||||
config="/etc/dolibarr/apache.conf"
|
# config="/etc/dolibarr/apache.conf"
|
||||||
for i in $(seq 8 -1 0) ; do
|
# if [ -f $config ] ; then
|
||||||
if [ -f ${config}.$i ] ; then
|
# for i in $(seq 8 -1 0) ; do
|
||||||
mv ${config}.$i ${config}.$(($i +1))
|
# if [ -f ${config}.$i ] ; then
|
||||||
fi
|
# mv ${config}.$i ${config}.$(($i +1))
|
||||||
done
|
# fi
|
||||||
mv ${config} ${config}.0
|
# done
|
||||||
fi
|
# 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
|
||||||
|
|
||||||
|
|
||||||
db_capb backup
|
db_capb backup
|
||||||
@ -30,8 +43,9 @@ db_capb backup
|
|||||||
db_title "dolibarr" || true
|
db_title "dolibarr" || true
|
||||||
|
|
||||||
|
|
||||||
# Ask for web server type.
|
# Ask if we must delete database
|
||||||
#db_input critical "dolibarr/webserver" || true
|
echo "Ask for web server to setup"
|
||||||
|
db_input critical dolibarr/reconfigure-webserver || true
|
||||||
|
|
||||||
if db_go ; then
|
if db_go ; then
|
||||||
okcancel="1"
|
okcancel="1"
|
||||||
|
|||||||
3
build/deb/control.DEBIAN → build/deb/control
Executable file → Normal file
3
build/deb/control.DEBIAN → build/deb/control
Executable file → Normal file
@ -3,7 +3,7 @@ Version: __VERSION__
|
|||||||
Architecture: all
|
Architecture: all
|
||||||
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
|
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
Installed-Size: 61200
|
Installed-Size: 61200
|
||||||
Depends: debconf, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
|
Depends: 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
|
Section: web
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Recommends: firefox
|
Recommends: firefox
|
||||||
@ -45,3 +45,4 @@ Description: Easy to use web based ERP & CRM software
|
|||||||
And a lot of more modules...
|
And a lot of more modules...
|
||||||
.
|
.
|
||||||
You can also add third parties external modules or develop yours.
|
You can also add third parties external modules or develop yours.
|
||||||
|
|
||||||
@ -4,14 +4,19 @@ Standards-Version: 3.9.1
|
|||||||
Section: web
|
Section: web
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Homepage: http://www.dolibarr.org
|
Homepage: http://www.dolibarr.org
|
||||||
Build-Depends: debhelper
|
Build-Depends: debhelper (>= 7), po-debconf
|
||||||
|
|
||||||
Package: dolibarr
|
Package: dolibarr
|
||||||
Depends: ${misc:Depends}, debconf, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
|
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
|
||||||
|
php5-mysql | php5-mysqli,
|
||||||
|
php5-cli, php5-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
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Section: web
|
Section: web
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Recommends: firefox
|
|
||||||
Homepage: http://www.dolibarr.org
|
Homepage: http://www.dolibarr.org
|
||||||
Description: Easy to use web based ERP & CRM software
|
Description: Easy to use web based ERP & CRM software
|
||||||
Dolibarr ERP & CRM is an easy to use open source/free software for small
|
Dolibarr ERP & CRM is an easy to use open source/free software for small
|
||||||
@ -25,28 +30,28 @@ Description: Easy to use web based ERP & CRM software
|
|||||||
Only features you need are visible, depending on which module were activated.
|
Only features you need are visible, depending on which module were activated.
|
||||||
Most common used modules are:
|
Most common used modules are:
|
||||||
.
|
.
|
||||||
Customers, Suppliers or Prospects directory
|
Customers, Suppliers or Prospects directory,
|
||||||
Contacts directory
|
Contacts directory,
|
||||||
Orders management
|
Orders management,
|
||||||
Commercial proposals management
|
Commercial proposals management,
|
||||||
Invoices management
|
Invoices management,
|
||||||
Products and services catalog
|
Products and services catalog,
|
||||||
Stock management
|
Stock management,
|
||||||
Foundations members management
|
Foundations members management,
|
||||||
Bank accounts management
|
Bank accounts management,
|
||||||
Point of Sale
|
Point of Sale,
|
||||||
Payments management
|
Payments management,
|
||||||
Commercial actions management
|
Commercial actions management,
|
||||||
Contracts management
|
Contracts management,
|
||||||
Standing orders management
|
Standing orders management,
|
||||||
Shipping management
|
Shipping management,
|
||||||
Donations management
|
Donations management,
|
||||||
Bookmarks management
|
Bookmarks management,
|
||||||
Mass Emailings
|
Mass Emailings,
|
||||||
Reports
|
Reports,
|
||||||
Data export and import tools
|
Wizards to export and import data,
|
||||||
LDAP connectivity
|
LDAP connectivity,
|
||||||
PDF exports
|
PDF exports,
|
||||||
And a lot of more modules...
|
And a lot of more modules...
|
||||||
.
|
.
|
||||||
You can also add third parties external modules or develop yours.
|
You can also add third parties external modules or develop yours.
|
||||||
46
build/deb/control.debianbin
Executable file
46
build/deb/control.debianbin
Executable file
@ -0,0 +1,46 @@
|
|||||||
|
Package: dolibarr
|
||||||
|
Version: __VERSION__
|
||||||
|
Architecture: all
|
||||||
|
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
|
Installed-Size: 61200
|
||||||
|
Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
|
||||||
|
Section: web
|
||||||
|
Priority: optional
|
||||||
|
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,
|
||||||
|
Wizards to export and import data,
|
||||||
|
LDAP connectivity,
|
||||||
|
PDF exports,
|
||||||
|
And a lot of more modules...
|
||||||
|
.
|
||||||
|
You can also add third parties external modules or develop yours.
|
||||||
@ -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
|
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
|
||||||
# Command to open an URL
|
# Command to open an URL
|
||||||
# For Fedora: xdg-open
|
# For Fedora: xdg-open
|
||||||
# For Debian/Ubuntu: xdg-open or x-www-browser
|
# For Debian/Ubuntu: x-www-browser
|
||||||
# (exo-open for xfde, gnome-open for gnome, ...)
|
# (exo-open for xfde, gnome-open for gnome, ...)
|
||||||
Exec=xdg-open http://localhost/dolibarr
|
Exec=x-www-browser http://localhost/dolibarr
|
||||||
Icon=dolibarr
|
Icon=dolibarr
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
|
|||||||
9
build/deb/dolibarr.lintian-overrides
Executable file
9
build/deb/dolibarr.lintian-overrides
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
# 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,4 +1,5 @@
|
|||||||
etc/dolibarr/apache.conf
|
etc/dolibarr/apache.conf
|
||||||
|
etc/dolibarr/lighttpd.conf
|
||||||
usr/share/applications/dolibarr.desktop
|
usr/share/applications/dolibarr.desktop
|
||||||
usr/share/doc/dolibarr
|
usr/share/doc/dolibarr
|
||||||
usr/share/dolibarr
|
usr/share/dolibarr
|
||||||
|
|||||||
@ -4,19 +4,19 @@
|
|||||||
// This file must be present into htdocs/install directory
|
// This file must be present into htdocs/install directory
|
||||||
// during install process to be used.
|
// during install process to be used.
|
||||||
//
|
//
|
||||||
// $Id: install.forced.php.install,v 1.8 2011/07/27 16:45:47 eldy Exp $
|
// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $
|
||||||
//
|
//
|
||||||
|
|
||||||
$force_install_noedit=1;
|
$force_install_noedit=2;
|
||||||
$force_install_message='KeepDefaultValuesDeb';
|
$force_install_message='KeepDefaultValuesDeb';
|
||||||
#$force_install_main_data_root='/usr/share/dolibarr/documents';
|
#$force_install_main_data_root='/usr/share/dolibarr/documents';
|
||||||
$force_install_main_data_root='/var/lib/dolibarr/documents';
|
$force_install_main_data_root='/var/lib/dolibarr/documents';
|
||||||
$force_install_type='mysqli';
|
$force_install_type='mysqli';
|
||||||
$force_install_dbserver='localhost';
|
$force_install_dbserver='localhost';
|
||||||
$force_install_port='3306';
|
$force_install_port='3306';
|
||||||
$force_install_database='dolibarr';
|
$force_install_database='dolibarrdebian';
|
||||||
$force_install_createdatabase='1';
|
$force_install_createdatabase='1';
|
||||||
$force_install_databaselogin='dolibarrmysql';
|
$force_install_databaselogin='dolibarrdebian';
|
||||||
$force_install_databasepass='';
|
$force_install_databasepass='';
|
||||||
$force_install_createuser='1';
|
$force_install_createuser='1';
|
||||||
$force_install_databaserootlogin='__SUPERUSERLOGIN__';
|
$force_install_databaserootlogin='__SUPERUSERLOGIN__';
|
||||||
|
|||||||
22
build/deb/lighttpd.conf
Executable file
22
build/deb/lighttpd.conf
Executable file
@ -0,0 +1,22 @@
|
|||||||
|
# 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"
|
||||||
|
# )
|
||||||
|
# )
|
||||||
|
#}
|
||||||
@ -15,7 +15,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 1.0\n"
|
"Project-Id-Version: 1.0\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2011-07-27 19:49+0200\n"
|
"POT-Creation-Date: 2011-08-01 18:17+0200\n"
|
||||||
"PO-Revision-Date: 2011-07-29 22:45+0100\n"
|
"PO-Revision-Date: 2011-07-29 22:45+0100\n"
|
||||||
"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
|
"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
|
||||||
"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
|
"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
|
||||||
@ -25,10 +25,26 @@ msgstr ""
|
|||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"Project-Id: dolibarr\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
|
#. Type: boolean
|
||||||
#. Description
|
#. Description
|
||||||
#: ../templates:1001
|
#: ../templates:2001
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Delete database and uploaded files ?"
|
msgid "Delete database and uploaded files ?"
|
||||||
msgstr "Effacer la base de donnée et les fichiers uploadés ?"
|
msgstr "Effacer la base de donnée et les fichiers uploadés ?"
|
||||||
@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?"
|
|||||||
#
|
#
|
||||||
#. Type: boolean
|
#. Type: boolean
|
||||||
#. Description
|
#. Description
|
||||||
#: ../templates:1001
|
#: ../templates:2001
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
"Answer if you want to removed the Dolibarr MySQL database and all other "
|
"Answer if you want to removed the Dolibarr MySQL database and all other "
|
||||||
|
|||||||
@ -8,7 +8,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2011-07-27 19:52+0200\n"
|
"POT-Creation-Date: 2011-08-01 18:17+0200\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
@ -17,15 +17,29 @@ msgstr ""
|
|||||||
"Content-Type: text/plain; charset=CHARSET\n"
|
"Content-Type: text/plain; charset=CHARSET\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
#. Type: boolean
|
#. Type: multiselect
|
||||||
#. Description
|
#. Description
|
||||||
#: ../templates:1001
|
#: ../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
|
||||||
msgid "Delete database and uploaded files ?"
|
msgid "Delete database and uploaded files ?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. Type: boolean
|
#. Type: boolean
|
||||||
#. Description
|
#. Description
|
||||||
#: ../templates:1001
|
#: ../templates:2001
|
||||||
msgid ""
|
msgid ""
|
||||||
"Answer if you want to removed the Dolibarr MySQL database and all other "
|
"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 "
|
"datas (datas related to this question are the Dolibarr DBMS account, all "
|
||||||
|
|||||||
@ -1,7 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# postinst script for dolibarr
|
# postinst script for dolibarr
|
||||||
#
|
|
||||||
# see: dh_installdeb(1)
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
@ -16,6 +14,31 @@ set -e
|
|||||||
# for details, see /usr/share/doc/packaging-manual/
|
# 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
|
. /usr/share/debconf/confmodule
|
||||||
|
|
||||||
db_version 2.0
|
db_version 2.0
|
||||||
@ -24,23 +47,25 @@ db_version 2.0
|
|||||||
echo Run the dolibarr postinst script
|
echo Run the dolibarr postinst script
|
||||||
|
|
||||||
|
|
||||||
|
# Define vars
|
||||||
docdir='/var/lib/dolibarr/documents'
|
docdir='/var/lib/dolibarr/documents'
|
||||||
#docdir='/usr/share/dolibarr/documents'
|
#docdir='/usr/share/dolibarr/documents'
|
||||||
|
installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
|
||||||
|
installconfig="/etc/dolibarr/install.forced.php"
|
||||||
|
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
|
||||||
|
config="/etc/dolibarr/conf.php"
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
configure)
|
configure)
|
||||||
|
|
||||||
# Copy apache.conf file into target directory.
|
# Create document directory for uploaded data files
|
||||||
#fileorig="/usr/share/dolibarr/build/deb/apache.conf"
|
mkdir -p $docdir
|
||||||
#config="/etc/dolibarr/apache.conf"
|
chown -R www-data:www-data $docdir
|
||||||
#mkdir -p /etc/dolibarr
|
chmod -R 775 $docdir
|
||||||
#cp -p $fileorig $config
|
chmod -R g+s $docdir
|
||||||
|
|
||||||
# Edit install.forced.php to match Debian values
|
# Copy install config file (with matching Debian) values into target directory
|
||||||
fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
|
|
||||||
config="/usr/share/dolibarr/htdocs/install/install.forced.php"
|
|
||||||
superuserlogin=''
|
superuserlogin=''
|
||||||
superuserpassword=''
|
superuserpassword=''
|
||||||
if [ -f /etc/mysql/debian.cnf ] ; then
|
if [ -f /etc/mysql/debian.cnf ] ; then
|
||||||
@ -50,42 +75,31 @@ case "$1" in
|
|||||||
fi
|
fi
|
||||||
echo Mysql superuser found to use is $superuserlogin
|
echo Mysql superuser found to use is $superuserlogin
|
||||||
if [ -z "$superuserlogin" ] ; then
|
if [ -z "$superuserlogin" ] ; then
|
||||||
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
|
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
|
||||||
else
|
else
|
||||||
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
|
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
|
||||||
fi
|
fi
|
||||||
|
chown -R root:www-data $installconfig
|
||||||
# Create document directory for uploaded data files
|
chmod -R 660 $installconfig
|
||||||
mkdir -p $docdir
|
|
||||||
chown -R www-data:www-data $docdir
|
|
||||||
chmod -R 775 $docdir
|
|
||||||
chmod -R g+s $docdir
|
|
||||||
|
|
||||||
# Create an empty conf.php with permission to web server
|
# Create an empty conf.php with permission to web server
|
||||||
if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
|
if [ ! -f $config ]
|
||||||
then
|
then
|
||||||
echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php
|
echo Create empty file $config
|
||||||
touch /usr/share/dolibarr/htdocs/conf/conf.php
|
touch $config
|
||||||
chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
|
chown -R root:www-data $config
|
||||||
chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php
|
chmod -R 660 $config
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#db_reset "dolibarr/webserver"
|
|
||||||
|
|
||||||
# Get the web server type (use db_get for interactive mode).
|
db_get dolibarr/reconfigure-webserver
|
||||||
#db_get "dolibarr/webserver" # Read value for webserver.
|
|
||||||
#webserver="$RET"
|
|
||||||
|
|
||||||
case $webserver in
|
webservers="$RET"
|
||||||
Apache) webservers="apache2" ;;
|
|
||||||
Apache-SSL) webservers="apache2-ssl" ;;
|
|
||||||
Both) webservers="apache2 apache2-ssl" ;;
|
|
||||||
*) webservers="apache2 apache2-ssl" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Set up web server.
|
# Set up web server.
|
||||||
for server in $webservers ; do
|
for webserver in $webservers ; do
|
||||||
echo Complete config of server $server
|
webserver=${webserver%,}
|
||||||
|
echo Complete config of server $webserver
|
||||||
|
|
||||||
# Detect webuser and webgroup
|
# Detect webuser and webgroup
|
||||||
webuser=
|
webuser=
|
||||||
@ -102,48 +116,33 @@ case "$1" in
|
|||||||
|
|
||||||
# Set permissions to web server
|
# Set permissions to web server
|
||||||
chown -R $webuser:$webgroup /usr/share/dolibarr
|
chown -R $webuser:$webgroup /usr/share/dolibarr
|
||||||
chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
|
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
|
done
|
||||||
|
|
||||||
#echo "Install menu entry"
|
# Restart web server.
|
||||||
# This one is for Gnome ubuntu
|
for webserver in $webservers; do
|
||||||
#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
|
webserver=${webserver%,}
|
||||||
#target="/usr/share/applications/"
|
if [ "$webserver" = "lighttpd" ] ; then
|
||||||
#cp -f $fileorig $target
|
lighttpd_install
|
||||||
# Not sure this is usefull
|
else
|
||||||
#if test -x /usr/bin/update-menus; then
|
apache_install $webserver
|
||||||
# echo "update-menus"
|
fi
|
||||||
# update-menus;
|
# Reload webserver in any case, configuration might have changed
|
||||||
#fi
|
# Redirection of 3 is needed because Debconf uses it and it might
|
||||||
|
# be inherited by webserver. See bug #446324.
|
||||||
# TODO Create the file to force parameters in Web installer
|
if [ -f /etc/init.d/$webserver ] ; then
|
||||||
#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
|
if [ -x /usr/sbin/invoke-rc.d ]; then
|
||||||
#then
|
echo Restart web server $server using invoke-rc.d
|
||||||
# perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php
|
# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
|
||||||
# perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php
|
invoke-rc.d $webserver reload 3>/dev/null || true
|
||||||
# perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php
|
else
|
||||||
# perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php
|
echo Restart web server $server using $server reload
|
||||||
#fi
|
/etc/init.d/$webserver reload 3>/dev/null || true
|
||||||
|
fi
|
||||||
# Restart servers
|
fi
|
||||||
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 $server reload || true
|
|
||||||
else
|
|
||||||
echo Restart web server $server using $server reload
|
|
||||||
/etc/init.d/$server reload || true
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
echo ----------
|
echo ----------
|
||||||
echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
|
echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
|
||||||
echo ----------
|
echo ----------
|
||||||
@ -153,13 +152,13 @@ case "$1" in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
echo "postinst called with unknown argument \`$1'" >&2
|
echo "postinst called with unknown argument $1" >&2
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
db_stop
|
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
|
||||||
|
db_stop
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
198
build/deb/postrm
198
build/deb/postrm
@ -17,7 +17,36 @@ set -e
|
|||||||
# for details, see /usr/share/doc/packaging-manual/
|
# for details, see /usr/share/doc/packaging-manual/
|
||||||
|
|
||||||
|
|
||||||
. /usr/share/debconf/confmodule
|
|
||||||
|
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
|
db_version 2.0
|
||||||
|
|
||||||
@ -26,40 +55,70 @@ echo Run the dolibarr postrm script
|
|||||||
|
|
||||||
docdir='/var/lib/dolibarr/documents'
|
docdir='/var/lib/dolibarr/documents'
|
||||||
#docdir='/usr/share/dolibarr/documents'
|
#docdir='/usr/share/dolibarr/documents'
|
||||||
|
#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
|
|
||||||
export includefile=/etc/dolibarr/apache.conf
|
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
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
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
|
||||||
# Call when we uninstall and purge
|
# Call when we uninstall and purge
|
||||||
purge)
|
purge)
|
||||||
echo "postrm purge webservers=$webservers includefile=$includefile"
|
echo "postrm purge"
|
||||||
|
|
||||||
# Ask if we must delete database
|
# Ask if we must delete database
|
||||||
echo "postrm db_input dolibarr/postrm"
|
echo "postrm db_input dolibarr/postrm"
|
||||||
db_input critical "dolibarr/postrm" || true
|
db_input critical dolibarr/postrm || true
|
||||||
db_go || true
|
db_go || true
|
||||||
|
|
||||||
echo "postrm db_get dolibarr/postrm"
|
echo "postrm db_get dolibarr/postrm"
|
||||||
# We disable set -e to avoid premature end of script if error
|
# We disable set -e to avoid premature end of script if error
|
||||||
set +e
|
set +e
|
||||||
db_get "dolibarr/postrm"
|
db_get dolibarr/postrm
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ "$RET" = "true" ] ; then
|
if [ "$RET" = "true" ] ; then
|
||||||
echo postrm Mysql database deletion
|
echo postrm Mysql database deletion
|
||||||
# Get database configuration
|
# Get database configuration
|
||||||
dbserver="localhost"
|
dbserver="localhost"
|
||||||
dbname="dolibarrmysql"
|
dbuser="dolibarrdebian"
|
||||||
|
dbname="dolibarrdebian"
|
||||||
#db_get "dolibarr/db/name"
|
#db_get "dolibarr/db/name"
|
||||||
#dbname="$RET"
|
#dbname="$RET"
|
||||||
superuserlogin=''
|
superuserlogin=''
|
||||||
@ -120,23 +179,31 @@ case "$1" in
|
|||||||
fi
|
fi
|
||||||
mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
|
mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
|
||||||
|
|
||||||
# Now run the drop commands
|
# Now run the drop user
|
||||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
|
||||||
log="${log}Droping database $dbname."
|
echo Database login $dbuser removed
|
||||||
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
|
|
||||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
|
||||||
error="Database $dbname NOT successfully droped. You have to do it manually."
|
|
||||||
echo $error
|
|
||||||
else
|
|
||||||
status=drop
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
error="Unable to run the drop database script."
|
error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
|
||||||
echo $error
|
echo $error
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Now run the drop commands
|
||||||
|
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||||
|
log="${log}Droping database $dbname."
|
||||||
|
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
|
||||||
|
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||||
|
error="Database $dbname NOT successfully droped. You have to do it manually."
|
||||||
|
echo $error
|
||||||
|
else
|
||||||
|
status=drop
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
error="Unable to run the drop database script."
|
||||||
|
echo $error
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
status=nothing
|
status=nothing
|
||||||
log="${log}Database $dbname already not exists."
|
log="${log}Database $dbname already not exists."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Remove directory $docdir"
|
echo "Remove directory $docdir"
|
||||||
@ -146,91 +213,22 @@ case "$1" in
|
|||||||
echo "postrm Delete of dolibarr database and uploaded files not wanted"
|
echo "postrm Delete of dolibarr database and uploaded files not wanted"
|
||||||
fi
|
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
|
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
|
|
||||||
|
|
||||||
# Remove file and conf file
|
|
||||||
for dir in /usr/share/dolibarr; do
|
|
||||||
if [ -d $dir ] ; then
|
|
||||||
# We disable blocking errors
|
|
||||||
set +e
|
|
||||||
echo "Remove directory $dir"
|
|
||||||
rm -rf $dir ;
|
|
||||||
# We restore blocking errors
|
|
||||||
set -e
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# We clean variable (we ignore errors because db_reset can fails if var was never set)
|
# We clean variable (we ignore errors because db_reset can fails if var was never set)
|
||||||
set +e
|
set +e
|
||||||
db_reset "dolibarr/postrm"
|
db_reset dolibarr/reconfigure-webserver
|
||||||
|
db_reset dolibarr/postrm
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
#db_purge
|
#db_purge
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# Call when we uninstall
|
|
||||||
remove)
|
|
||||||
echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
|
|
||||||
rm -fr /usr/share/dolibarr/htdocs/install
|
|
||||||
|
|
||||||
echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf"
|
|
||||||
rm -fr /usr/share/dolibarr/htdocs/conf
|
|
||||||
|
|
||||||
# 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
|
|
||||||
;;
|
|
||||||
|
|
||||||
upgrade)
|
|
||||||
;;
|
|
||||||
|
|
||||||
failed-upgrade|abort-install|abort-upgrade|disappear)
|
failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
echo "postrm called with unknown argument \`$1'" >&2
|
echo "postrm called with unknown argument $1" >&2
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@ -1,8 +1,10 @@
|
|||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
# This is the debhelper compatability version to use.
|
# Uncomment this to turn on verbose mode.
|
||||||
#export DH_COMPAT=7 # Now defined into compat file
|
export DH_VERBOSE=1
|
||||||
|
export DH_OPTIONS=-v
|
||||||
|
|
||||||
|
#export DH_COMPAT=7 # This is the debhelper compatability version to use, now defined into compat file
|
||||||
|
|
||||||
%:
|
%:
|
||||||
dh $@
|
dh $@
|
||||||
@ -2,7 +2,7 @@
|
|||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
# \file build/makepack-dolibarr.pl
|
# \file build/makepack-dolibarr.pl
|
||||||
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
||||||
# \version $Id: makepack-dolibarr.pl,v 1.115 2011/07/26 22:25:51 eldy Exp $
|
# \version $Id: makepack-dolibarr.pl,v 1.112 2011/07/21 22:11:30 eldy Exp $
|
||||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
|
|||||||
|
|
||||||
|
|
||||||
use vars qw/ $REVISION $VERSION /;
|
use vars qw/ $REVISION $VERSION /;
|
||||||
$REVISION='$Revision: 1.115 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
$REVISION='$Revision: 1.112 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||||
$VERSION="1.0 (build $REVISION)";
|
$VERSION="1.0 (build $REVISION)";
|
||||||
|
|
||||||
|
|
||||||
@ -468,33 +468,21 @@ if ($nboftargetok) {
|
|||||||
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
|
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
|
||||||
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
|
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
|
|
||||||
# Create DEBIAN directory
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
||||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
||||||
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
$ret=`cp -r "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
$ret=`cp -r "$SOURCE/build/deb/control" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
$ret=`cp -r "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
$ret=`cp -r "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
|
$ret=`cp -r "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
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";
|
print "Remove other files\n";
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
|
$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/config`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
|
$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/postinst`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
|
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`;
|
||||||
@ -525,6 +513,17 @@ if ($nboftargetok) {
|
|||||||
# To remove once stable
|
# To remove once stable
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
$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";
|
||||||
|
|
||||||
# dolibarr.desktop
|
# dolibarr.desktop
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
|
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`;
|
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`;
|
||||||
@ -582,48 +581,21 @@ if ($nboftargetok) {
|
|||||||
$olddir=getcwd();
|
$olddir=getcwd();
|
||||||
chdir("$BUILDROOT");
|
chdir("$BUILDROOT");
|
||||||
|
|
||||||
# Creation of binary package
|
$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb";
|
||||||
$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
|
|
||||||
print "Launch DEB build ($cmd)\n";
|
print "Launch DEB build ($cmd)\n";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
print $ret."\n";
|
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"`;
|
|
||||||
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
|
|
||||||
$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/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 -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"`;
|
|
||||||
|
|
||||||
$build = $newbuild;
|
|
||||||
$build =~ s/-.*$//g;
|
|
||||||
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
|
||||||
print "Launch DEB src build ($cmd)\n";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
print $ret."\n";
|
|
||||||
|
|
||||||
chdir("$olddir");
|
chdir("$olddir");
|
||||||
|
|
||||||
if ($OS =~ /windows/i)
|
if ($OS =~ /windows/i)
|
||||||
{
|
{
|
||||||
print "Move ${FILENAMEDEB}_all.deb to $DESTI/${FILENAMEDEB}_all.deb\n";
|
print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
|
||||||
$ret=`mv "$BUILDROOT/${FILENAMEDEB}_all.deb" "$DESTI/${FILENAMEDEB}_all.deb"`;
|
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Move ${FILENAMEDEB}_all.deb to $DESTI/${FILENAMEDEB}_all.deb\n";
|
print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
|
||||||
$ret=`mv "$BUILDROOT/${FILENAMEDEB}_all.deb" "$DESTI/${FILENAMEDEB}_all.deb"`;
|
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
|
||||||
}
|
}
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,7 +19,7 @@ Exec=xdg-open http://localhost/dolibarr
|
|||||||
Icon=dolibarr
|
Icon=dolibarr
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Office
|
Categories=Office;
|
||||||
StartupNotify=true
|
StartupNotify=true
|
||||||
InitialPreference=5
|
InitialPreference=5
|
||||||
#NoDisplay=true
|
#NoDisplay=true
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
* \file htdocs/includes/modules/modMyModule.class.php
|
* \file htdocs/includes/modules/modMyModule.class.php
|
||||||
* \ingroup mymodule
|
* \ingroup mymodule
|
||||||
* \brief Description and activation file for module MyModule
|
* \brief Description and activation file for module MyModule
|
||||||
* \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
|
* \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $
|
||||||
*/
|
*/
|
||||||
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
|
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'
|
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
|
||||||
$this->picto='generic';
|
$this->picto='generic';
|
||||||
|
|
||||||
// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
|
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
|
||||||
$this->triggers = 0;
|
$this->triggers = 0;
|
||||||
|
|
||||||
// Data directories to create when module is enabled.
|
// Data directories to create when module is enabled.
|
||||||
|
|||||||
@ -12,5 +12,3 @@ Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com
|
|||||||
-------------------------------------------------------
|
-------------------------------------------------------
|
||||||
List of icons from http://led24.de/iconset/ are:
|
List of icons from http://led24.de/iconset/ are:
|
||||||
- dolihelp.ico
|
- dolihelp.ico
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
/**
|
/**
|
||||||
* \file htdocs/admin/boxes.php
|
* \file htdocs/admin/boxes.php
|
||||||
* \brief Page to setup boxes
|
* \brief Page to setup boxes
|
||||||
* \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
|
* \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -278,7 +278,7 @@ if ($resql)
|
|||||||
{
|
{
|
||||||
$boxname = $regs[1];
|
$boxname = $regs[1];
|
||||||
$module = $regs[2];
|
$module = $regs[2];
|
||||||
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
|
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -394,7 +394,7 @@ if ($resql)
|
|||||||
{
|
{
|
||||||
$boxname = $regs[1];
|
$boxname = $regs[1];
|
||||||
$module = $regs[2];
|
$module = $regs[2];
|
||||||
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
|
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -470,5 +470,5 @@ print '</table>';
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
|
llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
||||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
|
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
|
||||||
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
|
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -22,7 +22,7 @@
|
|||||||
/**
|
/**
|
||||||
* \file htdocs/admin/modules.php
|
* \file htdocs/admin/modules.php
|
||||||
* \brief Page to activate/disable all modules
|
* \brief Page to activate/disable all modules
|
||||||
* \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
|
* \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -79,12 +79,35 @@ $modules = array();
|
|||||||
$orders = array();
|
$orders = array();
|
||||||
$categ = array();
|
$categ = array();
|
||||||
$dirmod = array();
|
$dirmod = array();
|
||||||
|
$modulesdir = array();
|
||||||
$i = 0; // is a sequencer of modules found
|
$i = 0; // is a sequencer of modules found
|
||||||
$j = 0; // j is module number. Automatically affected if module number not defined.
|
$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
|
// Load modules attributes in arrays (name, numero, orders) from dir directory
|
||||||
//print $dir."\n<br>";
|
//print $dir."\n<br>";
|
||||||
dol_syslog("Scan directory ".$dir." for modules");
|
dol_syslog("Scan directory ".$dir." for modules");
|
||||||
@ -449,5 +472,5 @@ print '</div>';
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
|
llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
* \file htdocs/admin/perms.php
|
* \file htdocs/admin/perms.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Page d'administration/configuration des permissions par defaut
|
* \brief Page d'administration/configuration des permissions par defaut
|
||||||
* \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $
|
* \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -76,10 +76,34 @@ $db->begin();
|
|||||||
|
|
||||||
// Charge les modules soumis a permissions
|
// Charge les modules soumis a permissions
|
||||||
$modules = array();
|
$modules = array();
|
||||||
foreach ($conf->file->dol_document_root as $dirroot)
|
$modulesdir = array();
|
||||||
{
|
|
||||||
$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
|
// Load modules attributes in arrays (name, numero, orders) from dir directory
|
||||||
//print $dir."\n<br>";
|
//print $dir."\n<br>";
|
||||||
$handle=@opendir($dir);
|
$handle=@opendir($dir);
|
||||||
@ -194,5 +218,5 @@ print '</div>';
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
|
llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -12,15 +12,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/admin/proxy.php
|
* \file htdocs/admin/proxy.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Page setup proxy to use for external web access
|
* \brief Page setup proxy to use for external web access
|
||||||
* \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
|
* \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg);
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
|
llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -13,15 +13,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/admin/security_other.php
|
* \file htdocs/admin/security_other.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Security options setup
|
* \brief Security options setup
|
||||||
* \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
|
* \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
|
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -14,14 +14,13 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/admin/system/index.php
|
* \file htdocs/admin/system/index.php
|
||||||
* \brief Home page of system information
|
* \brief Home page of system information
|
||||||
* \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $
|
* \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
@ -127,5 +126,5 @@ print '<br>';
|
|||||||
print info_admin($langs->trans("SystemInfoDesc")).'<br>';
|
print info_admin($langs->trans("SystemInfoDesc")).'<br>';
|
||||||
|
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $');
|
llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
* \brief File of class to manage widget boxes
|
* \brief File of class to manage widget boxes
|
||||||
* \author Rodolphe Qiedeville
|
* \author Rodolphe Qiedeville
|
||||||
* \author Laurent Destailleur
|
* \author Laurent Destailleur
|
||||||
* \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $
|
* \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -220,7 +220,7 @@ class InfoBox
|
|||||||
{
|
{
|
||||||
$boxname = $regs[1];
|
$boxname = $regs[1];
|
||||||
$module = $regs[2];
|
$module = $regs[2];
|
||||||
$sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php");
|
$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -281,7 +281,7 @@ class InfoBox
|
|||||||
{
|
{
|
||||||
$boxname = $regs[1];
|
$boxname = $regs[1];
|
||||||
$module = $regs[2];
|
$module = $regs[2];
|
||||||
$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
|
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@ -14,8 +14,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require('../main.inc.php');
|
require('../main.inc.php');
|
||||||
|
|||||||
@ -16,15 +16,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/comm/action/index.php
|
* \file htdocs/comm/action/index.php
|
||||||
* \ingroup agenda
|
* \ingroup agenda
|
||||||
* \brief Home page of calendar events
|
* \brief Home page of calendar events
|
||||||
* \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $
|
* \version $Id: index.php,v 1.184 2011/07/31 22:23:20 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
@ -786,7 +785,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format
|
|||||||
';
|
';
|
||||||
*/
|
*/
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $');
|
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.184 $');
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -15,15 +15,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/compta/bank/bankid_fr.php
|
* \file htdocs/compta/bank/bankid_fr.php
|
||||||
* \ingroup banque
|
* \ingroup banque
|
||||||
* \brief Fiche creation compte bancaire
|
* \brief Fiche creation compte bancaire
|
||||||
* \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
|
* \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $');
|
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -15,15 +15,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/compta/bank/fiche.php
|
* \file htdocs/compta/bank/fiche.php
|
||||||
* \ingroup banque
|
* \ingroup banque
|
||||||
* \brief Page to create/view a bank account
|
* \brief Page to create/view a bank account
|
||||||
* \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
|
* \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
@ -608,5 +607,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
|
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -14,15 +14,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/compta/bank/rappro.php
|
* \file htdocs/compta/bank/rappro.php
|
||||||
* \ingroup banque
|
* \ingroup banque
|
||||||
* \brief Page to reconciliate bank transactions
|
* \brief Page to reconciliate bank transactions
|
||||||
* \version $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $
|
* \version $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
@ -403,5 +402,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $');
|
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -15,14 +15,13 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/compta/prelevement/create.php
|
* \file htdocs/compta/prelevement/create.php
|
||||||
* \brief Prelevement
|
* \brief Prelevement
|
||||||
* \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $
|
* \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../bank/pre.inc.php");
|
require("../bank/pre.inc.php");
|
||||||
@ -276,5 +275,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $');
|
llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
* \file htdocs/contrat/fiche.php
|
* \file htdocs/contrat/fiche.php
|
||||||
* \ingroup contrat
|
* \ingroup contrat
|
||||||
* \brief Page of a contract
|
* \brief Page of a contract
|
||||||
* \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $
|
* \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require ("../main.inc.php");
|
require ("../main.inc.php");
|
||||||
@ -757,7 +757,7 @@ else
|
|||||||
|
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|
||||||
if ($action != 'editline' || $_GET["rowid"] != $objp->rowid)
|
if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid)
|
||||||
{
|
{
|
||||||
print '<tr '.$bc[$var].' valign="top">';
|
print '<tr '.$bc[$var].' valign="top">';
|
||||||
// Libelle
|
// Libelle
|
||||||
@ -1286,5 +1286,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $');
|
llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief File of class to manage storage of current setup
|
* \brief File of class to manage storage of current setup
|
||||||
* Config is stored into file conf.php
|
* Config is stored into file conf.php
|
||||||
* \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $
|
* \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -144,13 +144,13 @@ class Conf
|
|||||||
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
|
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
|
||||||
{
|
{
|
||||||
$modulename = strtolower($reg[1]);
|
$modulename = strtolower($reg[1]);
|
||||||
$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard
|
$this->triggers_modules[] = '/'.$modulename.'/includes/triggers/';
|
||||||
}
|
}
|
||||||
// If this is constant for login method activated by a module
|
// If this is constant for login method activated by a module
|
||||||
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
|
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
|
||||||
{
|
{
|
||||||
$modulename = strtolower($reg[1]);
|
$modulename = strtolower($reg[1]);
|
||||||
$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
|
$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/';
|
||||||
}
|
}
|
||||||
// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
|
// 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))
|
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))
|
||||||
|
|||||||
@ -12,14 +12,13 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/class/cookie.class.php
|
* \file htdocs/core/class/cookie.class.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
|
* \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $
|
||||||
* \brief File of class to manage cookies
|
* \brief File of class to manage cookies
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@ -14,15 +14,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/class/interfaces.class.php
|
* \file htdocs/core/class/interfaces.class.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Fichier de la classe de gestion des triggers
|
* \brief Fichier de la classe de gestion des triggers
|
||||||
* \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $
|
* \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
* \brief File for Tanslate class
|
* \brief File for Tanslate class
|
||||||
* \author Eric Seigne
|
* \author Eric Seigne
|
||||||
* \author Laurent Destailleur
|
* \author Laurent Destailleur
|
||||||
* \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $
|
* \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -512,9 +512,10 @@ class Translate {
|
|||||||
* Return list of all available languages
|
* Return list of all available languages
|
||||||
* @param langdir Directory to scan
|
* @param langdir Directory to scan
|
||||||
* @param maxlength Max length for each value in combo box (will be truncated)
|
* @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
|
* @return array List of languages
|
||||||
*/
|
*/
|
||||||
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0)
|
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0)
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
@ -527,7 +528,7 @@ class Translate {
|
|||||||
{
|
{
|
||||||
$this->load("languages");
|
$this->load("languages");
|
||||||
|
|
||||||
if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE)
|
if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
|
||||||
{
|
{
|
||||||
$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
|
$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,14 +20,15 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* 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/filefunc.inc.php
|
* \file htdocs/filefunc.inc.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief File that include conf.php file and functions.lib.php
|
* \brief File that include conf.php file and functions.lib.php
|
||||||
* \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $
|
* \version $Id: filefunc.inc.php,v 1.19 2011/07/21 22:11:30 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||||
@ -60,17 +61,8 @@ error_reporting(E_ALL ^ E_NOTICE);
|
|||||||
//error_reporting(E_ALL);
|
//error_reporting(E_ALL);
|
||||||
|
|
||||||
|
|
||||||
$conffiletoshowshort = "conf.php";
|
|
||||||
# Define localization of conf file
|
|
||||||
$conffile = "conf/conf.php";
|
|
||||||
$conffiletoshow = "htdocs/conf/conf.php";
|
|
||||||
# For debian/redhat like systems
|
|
||||||
#$conffile = "/etc/dolibarr/conf.php";
|
|
||||||
#$conffiletoshow = "/etc/dolibarr/conf.php";
|
|
||||||
|
|
||||||
|
|
||||||
// Include configuration
|
// Include configuration
|
||||||
$result=@include_once($conffile);
|
$result=@include_once("conf/conf.php");
|
||||||
if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session
|
if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session
|
||||||
{
|
{
|
||||||
header("Location: install/index.php");
|
header("Location: install/index.php");
|
||||||
|
|||||||
@ -13,15 +13,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/imports/import.php
|
* \file htdocs/imports/import.php
|
||||||
* \ingroup import
|
* \ingroup import
|
||||||
* \brief Pages of import Wizard
|
* \brief Pages of import Wizard
|
||||||
* \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $
|
* \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once("../main.inc.php");
|
require_once("../main.inc.php");
|
||||||
@ -1669,7 +1668,7 @@ print '<br>';
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $');
|
llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $');
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -12,7 +12,8 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* 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/
|
* or see http://www.gnu.org/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -21,7 +22,7 @@
|
|||||||
* \ingroup societe
|
* \ingroup societe
|
||||||
* \brief File of class to build ODT documents for third parties
|
* \brief File of class to build ODT documents for third parties
|
||||||
* \author Laurent Destailleur
|
* \author Laurent Destailleur
|
||||||
* \version $Id: doc_generic_invoice_odt.modules.php,v 1.20 2011/07/31 23:28:15 eldy Exp $
|
* \version $Id: doc_generic_invoice_odt.modules.php,v 1.19 2011/07/21 22:54:36 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
|
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
/**
|
/**
|
||||||
* \defgroup workflow Module workflow
|
* \defgroup workflow Module workflow
|
||||||
* \brief Workflow management
|
* \brief Workflow management
|
||||||
* \version $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
|
* \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis 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'
|
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
|
||||||
$this->picto='technic';
|
$this->picto='technic';
|
||||||
|
|
||||||
// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
|
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
|
||||||
$this->triggers = 1;
|
$this->triggers = 1;
|
||||||
|
|
||||||
// Data directories to create when module is enabled
|
// Data directories to create when module is enabled
|
||||||
|
|||||||
@ -12,7 +12,8 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* 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/
|
* or see http://www.gnu.org/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -21,7 +22,7 @@
|
|||||||
* \ingroup societe
|
* \ingroup societe
|
||||||
* \brief File of class to build ODT documents for third parties
|
* \brief File of class to build ODT documents for third parties
|
||||||
* \author Laurent Destailleur
|
* \author Laurent Destailleur
|
||||||
* \version $Id: doc_generic_odt.modules.php,v 1.33 2011/07/31 23:28:18 eldy Exp $
|
* \version $Id: doc_generic_odt.modules.php,v 1.32 2011/07/21 22:54:35 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
-- along with this program; if not, write to the Free Software
|
-- along with this program; if not, write to the Free Software
|
||||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
--
|
--
|
||||||
-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $
|
-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
|
||||||
--
|
--
|
||||||
|
|
||||||
--
|
--
|
||||||
@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
|
|||||||
insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1);
|
insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1);
|
||||||
|
|
||||||
-- Regions Chile (id country=67)
|
-- Regions Chile (id country=67)
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
||||||
|
|
||||||
-- Regions San Salvador (id country=86)
|
-- Regions San Salvador (id country=86)
|
||||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
|
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
-- along with this program; if not, write to the Free Software
|
-- along with this program; if not, write to the Free Software
|
||||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
--
|
--
|
||||||
-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $
|
-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
|
||||||
--
|
--
|
||||||
|
|
||||||
--
|
--
|
||||||
@ -566,7 +566,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
|
|||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
|
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--
|
--
|
||||||
-- $Id: 3.0.0-3.1.0.sql,v 1.80 2011/07/22 13:46:34 eldy Exp $
|
-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $
|
||||||
--
|
--
|
||||||
-- Be carefull to requests order.
|
-- Be carefull to requests order.
|
||||||
-- This file must be loaded by calling /install/index.php page
|
-- This file must be loaded by calling /install/index.php page
|
||||||
@ -25,8 +25,10 @@ ALTER TABLE llx_c_ziptown MODIFY fk_county integer NULL;
|
|||||||
|
|
||||||
ALTER TABLE llx_c_actioncomm ADD COLUMN position integer NOT NULL DEFAULT 0;
|
ALTER TABLE llx_c_actioncomm ADD COLUMN position integer NOT NULL DEFAULT 0;
|
||||||
ALTER TABLE llx_propal ADD COLUMN fk_demand_reason integer NULL DEFAULT 0;
|
ALTER TABLE llx_propal ADD COLUMN fk_demand_reason integer NULL DEFAULT 0;
|
||||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0;
|
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0 after model_pdf;
|
||||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0;
|
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0 after fk_cond_reglement;
|
||||||
|
ALTER TABLE llx_commande_fournisseur ADD COLUMN import_key varchar(14);
|
||||||
|
|
||||||
--ALTER TABLE llx_c_currencies ADD COLUMN symbole varchar(3) NOT NULL default '';
|
--ALTER TABLE llx_c_currencies ADD COLUMN symbole varchar(3) NOT NULL default '';
|
||||||
|
|
||||||
ALTER TABLE llx_commande_fournisseur MODIFY model_pdf varchar(255);
|
ALTER TABLE llx_commande_fournisseur MODIFY model_pdf varchar(255);
|
||||||
@ -129,6 +131,9 @@ ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOR
|
|||||||
-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
|
-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
|
||||||
ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
|
ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
|
||||||
|
|
||||||
|
-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product);
|
||||||
|
ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
|
||||||
|
|
||||||
ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
||||||
ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
||||||
ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext;
|
ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext;
|
||||||
@ -147,6 +152,12 @@ ALTER TABLE llx_actioncomm ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER id
|
|||||||
ALTER TABLE llx_actioncomm ADD COLUMN fk_element integer DEFAULT NULL AFTER note;
|
ALTER TABLE llx_actioncomm ADD COLUMN fk_element integer DEFAULT NULL AFTER note;
|
||||||
ALTER TABLE llx_actioncomm ADD COLUMN elementtype varchar(16) DEFAULT NULL AFTER fk_element;
|
ALTER TABLE llx_actioncomm ADD COLUMN elementtype varchar(16) DEFAULT NULL AFTER fk_element;
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE llx_c_regions MODIFY COLUMN cheflieu varchar(50);
|
||||||
|
ALTER TABLE llx_c_departements MODIFY COLUMN cheflieu varchar(50);
|
||||||
|
|
||||||
|
|
||||||
|
-- Table c_action_trigger
|
||||||
DROP table llx_c_action_trigger;
|
DROP table llx_c_action_trigger;
|
||||||
create table llx_c_action_trigger
|
create table llx_c_action_trigger
|
||||||
(
|
(
|
||||||
@ -158,7 +169,6 @@ create table llx_c_action_trigger
|
|||||||
rang integer DEFAULT 0
|
rang integer DEFAULT 0
|
||||||
|
|
||||||
)ENGINE=innodb;
|
)ENGINE=innodb;
|
||||||
|
|
||||||
ALTER TABLE llx_c_action_trigger ADD UNIQUE INDEX uk_action_trigger_code (code);
|
ALTER TABLE llx_c_action_trigger ADD UNIQUE INDEX uk_action_trigger_code (code);
|
||||||
|
|
||||||
INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) VALUES (1,'FICHEINTER_VALIDATE','Validation fiche intervention','Executed when a intervention is validated','ficheinter',18);
|
INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) VALUES (1,'FICHEINTER_VALIDATE','Validation fiche intervention','Executed when a intervention is validated','ficheinter',18);
|
||||||
@ -301,6 +311,13 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
|
|||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VER', 15401, '', 0, 'VER', 'Veracruz', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VER', 15401, '', 0, 'VER', 'Veracruz', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('YUC', 15401, '', 0, 'YUC', 'Yucatán', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('YUC', 15401, '', 0, 'YUC', 'Yucatán', 1);
|
||||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ZAC', 15401, '', 0, 'ZAC', 'Zacatecas', 1);
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ZAC', 15401, '', 0, 'ZAC', 'Zacatecas', 1);
|
||||||
|
-- Formes juridiques Mexique
|
||||||
|
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15401', 'Sociedad en nombre colectivo', 1);
|
||||||
|
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15402', 'Sociedad en comandita simple', 1);
|
||||||
|
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15403', 'Sociedad de responsabilidad limitada', 1);
|
||||||
|
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', 'Sociedad anónima', 1);
|
||||||
|
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', 'Sociedad en comandita por acciones', 1);
|
||||||
|
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', 'Sociedad cooperativa', 1);
|
||||||
|
|
||||||
--Add Colombie data (id pays=70)
|
--Add Colombie data (id pays=70)
|
||||||
-- Regions Colombie
|
-- Regions Colombie
|
||||||
@ -376,6 +393,28 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (15
|
|||||||
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1543,154, '10','0','VAT Frontero',1);
|
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1543,154, '10','0','VAT Frontero',1);
|
||||||
|
|
||||||
|
|
||||||
|
--Add Barbados data (id pays=46)
|
||||||
|
-- Region Barbados
|
||||||
|
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (4601, 46, 4601, 'Bridgetown', 0, 'Barbados', 1);
|
||||||
|
-- Parish Barbados
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CC', 4601, 'Oistins', 0, 'CC', 'Christ Church', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 4601, 'Greenland', 0, 'SA', 'Saint Andrew', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SG', 4601, 'Bulkeley', 0, 'SG', 'Saint George', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('JA', 4601, 'Holetown', 0, 'JA', 'Saint James', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SJ', 4601, 'Four Roads', 0, 'SJ', 'Saint John', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SB', 4601, 'Bathsheba', 0, 'SB', 'Saint Joseph', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SL', 4601, 'Crab Hill', 0, 'SL', 'Saint Lucy', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SM', 4601, 'Bridgetown', 0, 'SM', 'Saint Michael', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SP', 4601, 'Speightstown', 0, 'SP', 'Saint Peter', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SC', 4601, 'Crane', 0, 'SC', 'Saint Philip', 1);
|
||||||
|
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ST', 4601, 'Hillaby', 0, 'ST', 'Saint Thomas', 1);
|
||||||
|
-- Currency Barbados
|
||||||
|
INSERT INTO llx_c_currencies ( code, code_iso, active, label ) VALUES ( 'BD', 'BBD', 1, 'Barbadian or Bajan Dollar');
|
||||||
|
-- VAT Barbados
|
||||||
|
INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (461,46, '0','0','No VAT',1);
|
||||||
|
INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (462,46, '15','0','VAT 15%',1);
|
||||||
|
INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (463,46, '7.5','0','VAT 7.5%',1);
|
||||||
|
|
||||||
update llx_actioncomm set elementtype='invoice' where elementtype='facture';
|
update llx_actioncomm set elementtype='invoice' where elementtype='facture';
|
||||||
update llx_actioncomm set elementtype='order' where elementtype='commande';
|
update llx_actioncomm set elementtype='order' where elementtype='commande';
|
||||||
update llx_actioncomm set elementtype='contract' where elementtype='contrat';
|
update llx_actioncomm set elementtype='contract' where elementtype='contrat';
|
||||||
@ -444,3 +483,4 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email;
|
|||||||
ALTER TABLE llx_don ADD phone varchar(24) after email;
|
ALTER TABLE llx_don ADD phone varchar(24) after email;
|
||||||
|
|
||||||
ALTER TABLE llx_user ADD civilite varchar(6) after entity;
|
ALTER TABLE llx_user ADD civilite varchar(6) after entity;
|
||||||
|
|
||||||
|
|||||||
@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons)
|
|||||||
ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
|
ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
|
||||||
DaylingSavingTime=Horari d'estiu (usuari)
|
DaylingSavingTime=Horari d'estiu (usuari)
|
||||||
CurrentHour=Hora PHP (servidor)
|
CurrentHour=Hora PHP (servidor)
|
||||||
CompanyTZ=Zona Horària empresa (seu central)
|
CompanyTZ=Zona Horària empresa (casa mare)
|
||||||
CompanyHour=Hora empresa (seu central)
|
CompanyHour=Hora empresa (casa mare)
|
||||||
CurrentSessionTimeOut=Time out sessió actual
|
CurrentSessionTimeOut=Time out sessió actual
|
||||||
OSEnv=Entorn SO
|
OSEnv=Entorn SO
|
||||||
Box=Panell
|
Box=Panell
|
||||||
|
|||||||
@ -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
|
PaypalOrCBDoPayment=Continuar el pagament mitjançant targeta o Paypal
|
||||||
PaypalDoPayment=Continuar el pagament mitjançant Paypal
|
PaypalDoPayment=Continuar el pagament mitjançant Paypal
|
||||||
PaypalCBDoPayment=Continuar el pagament mitjançant targeta
|
PaypalCBDoPayment=Continuar el pagament mitjançant targeta
|
||||||
PAYPAL_API_SANDBOX=Mode de prova / caixa de sorra (sandbox)
|
PAYPAL_API_SANDBOX=Mode de proves(sandbox)
|
||||||
PAYPAL_API_USER=Nom usuari API
|
PAYPAL_API_USER=Nom usuari API
|
||||||
PAYPAL_API_PASSWORD=Contrasenya usuari API
|
PAYPAL_API_PASSWORD=Contrasenya usuari API
|
||||||
PAYPAL_API_SIGNATURE=Signatura API
|
PAYPAL_API_SIGNATURE=Signatura API
|
||||||
|
|||||||
@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset servidor con Greenwich (segundos)
|
|||||||
ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos)
|
ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos)
|
||||||
DaylingSavingTime=Horario de verano (usuario)
|
DaylingSavingTime=Horario de verano (usuario)
|
||||||
CurrentHour=Hora PHP (servidor)
|
CurrentHour=Hora PHP (servidor)
|
||||||
CompanyTZ=Zona Horaria empresa (sede central)
|
CompanyTZ=Zona Horaria empresa (casa madre)
|
||||||
CompanyHour=Hora empresa (sede central)
|
CompanyHour=Hora empresa (casa madre)
|
||||||
CurrentSessionTimeOut=Time out sesión actual
|
CurrentSessionTimeOut=Time out sesión actual
|
||||||
OSEnv=Entorno SO
|
OSEnv=Entorno SO
|
||||||
Box=Panel
|
Box=Panel
|
||||||
|
|||||||
@ -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
|
PaypalOrCBDoPayment=Continuar el pago mediante tarjeta o Paypal
|
||||||
PaypalDoPayment=Continuar el pago mediante Paypal
|
PaypalDoPayment=Continuar el pago mediante Paypal
|
||||||
PaypalCBDoPayment=Continuar el pago mediante tarjeta
|
PaypalCBDoPayment=Continuar el pago mediante tarjeta
|
||||||
PAYPAL_API_SANDBOX=Modo de prueba/caja de arena (sandbox)
|
PAYPAL_API_SANDBOX=Modo de pruebas (sandbox)
|
||||||
PAYPAL_API_USER=Nombre usuario API
|
PAYPAL_API_USER=Nombre usuario API
|
||||||
PAYPAL_API_PASSWORD=Contraseña usuario API
|
PAYPAL_API_PASSWORD=Contraseña usuario API
|
||||||
PAYPAL_API_SIGNATURE=Firma API
|
PAYPAL_API_SIGNATURE=Firma API
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
/* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -20,7 +20,7 @@
|
|||||||
/**
|
/**
|
||||||
* \file htdocs/lib/admin.lib.php
|
* \file htdocs/lib/admin.lib.php
|
||||||
* \brief Library of admin functions
|
* \brief Library of admin functions
|
||||||
* \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $
|
* \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis 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
|
* \brief Define head array for tabs of security setup pages
|
||||||
* \return Array of head
|
* \return Array of head
|
||||||
* \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $
|
* \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $
|
||||||
*/
|
*/
|
||||||
function security_prepare_head()
|
function security_prepare_head()
|
||||||
{
|
{
|
||||||
@ -615,16 +615,41 @@ function Activate($value,$withdeps=1)
|
|||||||
// Activate module
|
// Activate module
|
||||||
if ($modName)
|
if ($modName)
|
||||||
{
|
{
|
||||||
$file = $modName . ".class.php";
|
$modFile = $modName . ".class.php";
|
||||||
|
|
||||||
// Loop on each directory
|
// Loop on each directory
|
||||||
$found=false;
|
$found=false;
|
||||||
foreach ($conf->file->dol_document_root as $dol_document_root)
|
foreach ($conf->file->dol_document_root as $type => $dirroot)
|
||||||
{
|
{
|
||||||
$dir = $dol_document_root."/includes/modules/";
|
$modulesdir[] = $dirroot."/includes/modules/";
|
||||||
|
|
||||||
$found=@include_once($dir.$file);
|
if ($type == 'alt')
|
||||||
if ($found) break;
|
{
|
||||||
|
$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);
|
||||||
|
if ($found) break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$objMod = new $modName($db);
|
$objMod = new $modName($db);
|
||||||
@ -700,20 +725,46 @@ function UnActivate($value,$requiredby=1)
|
|||||||
$modName = $value;
|
$modName = $value;
|
||||||
|
|
||||||
$ret='';
|
$ret='';
|
||||||
|
$modulesdir=array();
|
||||||
|
|
||||||
// Desactivation du module
|
// Desactivation du module
|
||||||
if ($modName)
|
if ($modName)
|
||||||
{
|
{
|
||||||
$file = $modName . ".class.php";
|
$modFile = $modName . ".class.php";
|
||||||
|
|
||||||
// Loop on each directory
|
// Loop on each directory
|
||||||
$found=false;
|
$found=false;
|
||||||
foreach ($conf->file->dol_document_root as $dol_document_root)
|
foreach ($conf->file->dol_document_root as $type => $dirroot)
|
||||||
{
|
{
|
||||||
$dir = $dol_document_root."/includes/modules/";
|
$modulesdir[] = $dirroot."/includes/modules/";
|
||||||
|
|
||||||
$found=@include_once($dir.$file);
|
if ($type == 'alt')
|
||||||
if ($found) break;
|
{
|
||||||
|
$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);
|
||||||
|
if ($found) break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($found)
|
if ($found)
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief File that defines environment for all Dolibarr process (pages or scripts)
|
* \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
|
* This script reads the conf file, init $lang, $db and and empty $user
|
||||||
* \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $
|
* \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -70,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse);
|
|||||||
$conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey;
|
$conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey;
|
||||||
|
|
||||||
// Define array of document root directories
|
// Define array of document root directories
|
||||||
$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT);
|
$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT);
|
||||||
if (! empty($dolibarr_main_document_root_alt))
|
if (! empty($dolibarr_main_document_root_alt))
|
||||||
{
|
{
|
||||||
// dolibarr_main_document_root_alt contains several directories
|
// dolibarr_main_document_root_alt contains several directories
|
||||||
$values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
|
$values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
|
||||||
foreach($values as $value)
|
foreach($values as $value)
|
||||||
{
|
{
|
||||||
$conf->file->dol_document_root[]=$value;
|
$conf->file->dol_document_root['alt']=$value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
* \file htdocs/societe/soc.php
|
* \file htdocs/societe/soc.php
|
||||||
* \ingroup societe
|
* \ingroup societe
|
||||||
* \brief Third party card page
|
* \brief Third party card page
|
||||||
* \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $
|
* \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -587,7 +587,8 @@ else
|
|||||||
if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; }
|
if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; }
|
||||||
if (GETPOST("private")==1) { $object->particulier=1; }
|
if (GETPOST("private")==1) { $object->particulier=1; }
|
||||||
|
|
||||||
$object->nom=$_POST["nom"];
|
$object->name=$_POST["nom"];
|
||||||
|
$object->nom=$_POST["nom"]; // deprecated
|
||||||
$object->prenom=$_POST["prenom"];
|
$object->prenom=$_POST["prenom"];
|
||||||
$object->particulier=$_REQUEST["private"];
|
$object->particulier=$_REQUEST["private"];
|
||||||
$object->prefix_comm=$_POST["prefix_comm"];
|
$object->prefix_comm=$_POST["prefix_comm"];
|
||||||
@ -1093,7 +1094,8 @@ else
|
|||||||
if (! empty($_POST["nom"]))
|
if (! empty($_POST["nom"]))
|
||||||
{
|
{
|
||||||
// We overwrite with values if posted
|
// We overwrite with values if posted
|
||||||
$object->nom=$_POST["nom"];
|
$object->name=$_POST["nom"];
|
||||||
|
$object->nom=$_POST["nom"]; // deprecated
|
||||||
$object->prefix_comm=$_POST["prefix_comm"];
|
$object->prefix_comm=$_POST["prefix_comm"];
|
||||||
$object->client=$_POST["client"];
|
$object->client=$_POST["client"];
|
||||||
$object->code_client=$_POST["code_client"];
|
$object->code_client=$_POST["code_client"];
|
||||||
@ -1967,5 +1969,5 @@ else
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $');
|
llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $');
|
||||||
?>
|
?>
|
||||||
@ -16,13 +16,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* 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/bureau2crea/style.css.php
|
* \file htdocs/theme/bureau2crea/style.css.php
|
||||||
* \brief Fichier de style CSS du theme bureau2crea
|
* \brief Fichier de style CSS du theme bureau2crea
|
||||||
* \version $Id: style.css.php,v 1.41 2011/07/31 23:19:57 eldy Exp $
|
* \version $Id: style.css.php,v 1.40 2011/07/21 09:05:33 simnandez Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
|
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
/**
|
/**
|
||||||
* \file htdocs/user/group/perms.php
|
* \file htdocs/user/group/perms.php
|
||||||
* \brief Onglet user et permissions de la fiche utilisateur
|
* \brief Onglet user et permissions de la fiche utilisateur
|
||||||
* \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $
|
* \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
@ -93,10 +93,34 @@ if ($_GET["id"])
|
|||||||
|
|
||||||
// Charge les modules soumis a permissions
|
// Charge les modules soumis a permissions
|
||||||
$modules = array();
|
$modules = array();
|
||||||
foreach ($conf->file->dol_document_root as $dirroot)
|
$modulesdir = array();
|
||||||
{
|
|
||||||
$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
|
// Load modules attributes in arrays (name, numero, orders) from dir directory
|
||||||
//print $dir."\n<br>";
|
//print $dir."\n<br>";
|
||||||
$handle=@opendir($dir);
|
$handle=@opendir($dir);
|
||||||
@ -292,5 +316,5 @@ if ($_GET["id"])
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $');
|
llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
/**
|
/**
|
||||||
* \file htdocs/user/perms.php
|
* \file htdocs/user/perms.php
|
||||||
* \brief Onglet user et permissions de la fiche utilisateur
|
* \brief Onglet user et permissions de la fiche utilisateur
|
||||||
* \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $
|
* \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
@ -120,12 +120,34 @@ $db->begin();
|
|||||||
|
|
||||||
// Search all modules with permission and reload permissions def.
|
// Search all modules with permission and reload permissions def.
|
||||||
$modules = array();
|
$modules = array();
|
||||||
|
$modulesdir = array();
|
||||||
|
|
||||||
$listdir=$conf->file->dol_document_root;
|
foreach ($conf->file->dol_document_root as $type => $dirroot)
|
||||||
foreach($listdir as $dirroot)
|
|
||||||
{
|
{
|
||||||
$dir=$dirroot."/includes/modules/";
|
$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)
|
||||||
|
{
|
||||||
$handle=opendir($dir);
|
$handle=opendir($dir);
|
||||||
if (is_resource($handle))
|
if (is_resource($handle))
|
||||||
{
|
{
|
||||||
@ -373,5 +395,5 @@ print '</table>';
|
|||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $');
|
llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $');
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user