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

Merge remote-tracking branch 'origin/3.4' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-07-24 14:15:35 +02:00
commit cc83ad0b0e
5 changed files with 156 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
build/rpm/dolibarr_fedora.spec
View File

@ -297,28 +297,36 @@ echo "-------------------------------------------------------"
echo echo
#---- postun (after uninstall) #---- postun (after upgrade or uninstall)
%postun %postun
# Define vars if [ "x$1" = "x0" ] ;
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then then
echo "Delete apache config link for Dolibarr ($apachelink)" # Remove
%{__rm} -f $apachelink echo "Removed package"
status=purge
fi
# Restart web servers if required # Define vars
if [ "x$status" = "xpurge" ] ; export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
then
# Restart web server
echo Restart web server
/sbin/service httpd restart
fi
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
/sbin/service httpd restart
fi
else
# Upgrade
echo "No remove ation done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog

111
build/rpm/dolibarr_generic.spec
View File

@ -463,9 +463,16 @@ echo Restart mysql server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service mysqld restart /sbin/service mysqld restart
%else %else
%if 0%{?suse_version}
/sbin/service mysql restart
%else
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart /etc/init.d/mysqld restart
fi fi
if [ -f /etc/init.d/mysql ]; then
/etc/init.d/mysql restart
fi
%endif
%endif %endif
# Show result # Show result
@ -481,61 +488,69 @@ echo
#---- postun (after uninstall) #---- postun (after upgrade or uninstall)
%postun %postun
# Define vars if [ "x$1" = "x0" ] ;
os='unknown';
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
%else
%if 0%{?suse_version}
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
%else
if [ -d %{_sysconfdir}/httpd/conf.d ]; then
export os='fedora-redhat';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
export os='opensuse';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
export os='mageia-mandriva';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
export os='ubuntu-debian';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi
%endif
%endif
# Remove apache link
if [ -L $apachelink ] ;
then then
echo "Delete apache config link for Dolibarr ($apachelink)" # Remove
%{__rm} -f $apachelink echo "Removed package"
status=purge
fi
# Restart web servers if required # Define vars
if [ "x$status" = "xpurge" ] ; os='unknown';
then
# Restart web server
echo Restart web server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service httpd restart export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
%else %else
if [ -f %{_sysconfdir}/init.d/httpd ]; then %if 0%{?suse_version}
%{_sysconfdir}/init.d/httpd restart export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi %else
if [ -f %{_sysconfdir}/init.d/apache2 ]; then if [ -d %{_sysconfdir}/httpd/conf.d ]; then
%{_sysconfdir}/init.d/apache2 restart export os='fedora-redhat';
fi export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
%endif fi
fi if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
export os='opensuse';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
export os='mageia-mandriva';
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
export os='ubuntu-debian';
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
fi
%endif
%endif
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
/sbin/service httpd restart
%else
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
%endif
fi
else
# Upgrade
echo "No remove ation done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release

54
build/rpm/dolibarr_mandriva.spec
View File

@ -280,6 +280,9 @@ echo Restart mysql
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart /etc/init.d/mysqld restart
fi fi
if [ -f /etc/init.d/mysql ]; then
/etc/init.d/mysql restart
fi
# Show result # Show result
echo echo
@ -293,31 +296,40 @@ echo "-------------------------------------------------------"
echo echo
#---- postun (after uninstall) #---- postun (after upgrade or uninstall)
%postun %postun
# Define vars if [ "x$1" = "x0" ] ;
export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then then
echo "Delete apache config link for Dolibarr ($apachelink)" # Remove
%{__rm} -f $apachelink echo "Removed package"
status=purge
fi
# Restart web servers if required # Define vars
if [ "x$status" = "xpurge" ] ; export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
then
# Restart web server # Remove apache link
echo Restart web server if [ -L $apachelink ] ;
if [ -f %{_sysconfdir}/init.d/httpd ]; then then
%{_sysconfdir}/init.d/httpd restart echo "Delete apache config link for Dolibarr ($apachelink)"
fi %{__rm} -f $apachelink
if [ -f %{_sysconfdir}/init.d/apache2 ]; then status=purge
%{_sysconfdir}/init.d/apache2 restart fi
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
fi
else
# Upgrade
echo "No remove ation done (this is an upgrade)"
fi fi

56
build/rpm/dolibarr_opensuse.spec
View File

@ -288,9 +288,7 @@ fi
# Restart mysql # Restart mysql
echo Restart mysql echo Restart mysql
if [ -f /etc/init.d/mysqld ]; then /sbin/service mysql restart
/etc/init.d/mysqld restart
fi
# Show result # Show result
echo echo
@ -304,33 +302,41 @@ echo "-------------------------------------------------------"
echo echo
#---- postun (after uninstall) #---- postun (after upgrade or uninstall)
%postun %postun
# Define vars if [ "x$1" = "x0" ] ;
export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
# Remove apache link
if [ -L $apachelink ] ;
then then
echo "Delete apache config link for Dolibarr ($apachelink)" # Remove
%{__rm} -f $apachelink echo "Removed package"
status=purge
fi
# Restart web servers if required # Define vars
if [ "x$status" = "xpurge" ] ; export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
then
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
fi
# Remove apache link
if [ -L $apachelink ] ;
then
echo "Delete apache config link for Dolibarr ($apachelink)"
%{__rm} -f $apachelink
status=purge
fi
# Restart web servers if required
if [ "x$status" = "xpurge" ] ;
then
# Restart web server
echo Restart web server
if [ -f %{_sysconfdir}/init.d/httpd ]; then
%{_sysconfdir}/init.d/httpd restart
fi
if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart
fi
fi
else
# Upgrade
echo "No remove ation done (this is an upgrade)"
fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release

4
htdocs/core/lib/files.lib.php
View File

@ -997,18 +997,20 @@ function dol_add_file_process($upload_dir,$allowoverwrite=0,$donotupdatesession=
if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error'] if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
{ {
dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession, LOG_DEBUG);
if (dol_mkdir($upload_dir) >= 0) if (dol_mkdir($upload_dir) >= 0)
{ {
$resupload = dol_move_uploaded_file($_FILES[$varfiles]['tmp_name'], $upload_dir . "/" . $_FILES[$varfiles]['name'], $allowoverwrite, 0, $_FILES[$varfiles]['error'], 0, $varfiles); $resupload = dol_move_uploaded_file($_FILES[$varfiles]['tmp_name'], $upload_dir . "/" . $_FILES[$varfiles]['name'], $allowoverwrite, 0, $_FILES[$varfiles]['error'], 0, $varfiles);
if (is_numeric($resupload) && $resupload > 0) if (is_numeric($resupload) && $resupload > 0)
{ {
include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
if (empty($donotupdatesession)) if (empty($donotupdatesession))
{ {
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db); $formmail = new FormMail($db);
$formmail->add_attached_files($upload_dir . "/" . $_FILES[$varfiles]['name'],$_FILES[$varfiles]['name'],$_FILES[$varfiles]['type']); $formmail->add_attached_files($upload_dir . "/" . $_FILES[$varfiles]['name'],$_FILES[$varfiles]['name'],$_FILES[$varfiles]['type']);
} }
else if (image_format_supported($upload_dir . "/" . $_FILES[$varfiles]['name']) == 1) if (image_format_supported($upload_dir . "/" . $_FILES[$varfiles]['name']) == 1)
{ {
// Create small thumbs for image (Ratio is near 16/9) // Create small thumbs for image (Ratio is near 16/9)
// Used on logon for example // Used on logon for example