From 382c6554b4f6b5e9c081ce9274d8a2427cd9bfd4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Jan 2012 02:06:05 +0100 Subject: [PATCH] New: Work on debian packaging to use default ckeditor package --- build/deb/control.debian | 1 + build/deb/control.debianbin | 1 + build/deb/dolibarr.lintian-overrides | 6 ++++-- build/deb/install.forced.php.install | 1 + build/makepack-dolibarr.pl | 3 ++- htdocs/admin/system/constall.php | 2 ++ htdocs/conf/conf.php.example | 2 ++ htdocs/filefunc.inc.php | 1 + htdocs/install/etape1.php | 4 ++++ htdocs/main.inc.php | 12 ++++++++++-- 10 files changed, 28 insertions(+), 5 deletions(-) diff --git a/build/deb/control.debian b/build/deb/control.debian index ffa808592c8..8661fea9d55 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -12,6 +12,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip, libnusoap-php, libphp-pclzip, + ckeditor, ttf-dejavu-core, xdg-utils, mysql-server, diff --git a/build/deb/control.debianbin b/build/deb/control.debianbin index 0507fb7a2d4..e98bc222fa3 100755 --- a/build/deb/control.debianbin +++ b/build/deb/control.debianbin @@ -7,6 +7,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5-mysql | php5-mysqli, php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip libphp-pclzip, + ckeditor, ttf-dejavu-core, xdg-utils, mysql-server diff --git a/build/deb/dolibarr.lintian-overrides b/build/deb/dolibarr.lintian-overrides index e20ec94f6b5..1a5059386ad 100755 --- a/build/deb/dolibarr.lintian-overrides +++ b/build/deb/dolibarr.lintian-overrides @@ -1,4 +1,6 @@ # 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 \ No newline at end of file +# +#None +#embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/adapters/jquery.js +#embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/ckeditor.js \ No newline at end of file diff --git a/build/deb/install.forced.php.install b/build/deb/install.forced.php.install index 7259cd7baea..3f8e2f85c1f 100755 --- a/build/deb/install.forced.php.install +++ b/build/deb/install.forced.php.install @@ -31,6 +31,7 @@ $force_dolibarr_lib_PHPEXCEL_PATH=''; $force_dolibarr_lib_TCPDF_PATH=''; $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; +$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?> \ No newline at end of file diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 87ca4767e51..dc877619f1d 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -650,10 +650,11 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/rpm`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/zip`; # We remove embedded libraries or fonts + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fonts`, $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/geoip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/nusoap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip`; # Apache and lighttpd conf files print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index d837be49912..83413719df0 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -80,6 +80,7 @@ $configfileparameters=array( '?dolibarr_lib_GEOIP_PATH', '?dolibarr_lib_ODTPHP_PATH', '?dolibarr_lib_ODTPHP_PATHTOPCLZIP', + '?dolibarr_js_CKEDITOR', '?dolibarr_font_DOL_DEFAULT_TTF', '?dolibarr_font_DOL_DEFAULT_TTF_BOLD' ); @@ -119,6 +120,7 @@ $configfilelib=array( 'dolibarr_lib_GEOIP_PATH', 'dolibarr_lib_ODTPHP_PATH', 'dolibarr_lib_ODTPHP_PATHTOPCLZIP', + 'dolibarr_js_CKEDITOR', 'dolibarr_font_DOL_DEFAULT_TTF', 'dolibarr_font_DOL_DEFAULT_TTF_BOLD' ); diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index b006e884208..9d3c326e60d 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -277,6 +277,8 @@ $dolibarr_main_prod='0'; //$dolibarr_lib_ODTPHP_PATH=''; // Value to overwrite some path to use shared libraries instead of embedded one //$dolibarr_lib_ODTPHP_PATHTOPCLZIP="/usr/share/php/libphp-pclzip"; +// Value to overwrite path to use shared javascript instead of embedded one +//$dolibarr_js_CKEDITOR='/javascript/ckeditor'; //############################## diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 5a261d011ea..ee1a2d94f88 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -189,6 +189,7 @@ if (! defined('PHPEXCEL_PATH')) { define('PHPEXCEL_PATH', (!isset( if (! defined('GEOIP_PATH')) { define('GEOIP_PATH', (!isset($dolibarr_lib_GEOIP_PATH))?DOL_DOCUMENT_ROOT.'/includes/geoip/':(empty($dolibarr_lib_GEOIP_PATH)?'':$dolibarr_lib_GEOIP_PATH.'/')); } if (! defined('ODTPHP_PATH')) { define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH))?DOL_DOCUMENT_ROOT.'/includes/odtphp/':(empty($dolibarr_lib_ODTPHP_PATH)?'':$dolibarr_lib_ODTPHP_PATH.'/')); } if (! defined('ODTPHP_PATHTOPCLZIP')) { define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP))?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/':(empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP)?'':$dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/')); } +if (! defined('JS_CKEDITOR')) { define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR))?'':(empty($dolibarr_js_CKEDITOR)?'':$dolibarr_js_CKEDITOR.'/')); } // Other required path if (! defined('DOL_DEFAULT_TTF')) { define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF))?DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf':(empty($dolibarr_font_DOL_DEFAULT_TTF)?'':$dolibarr_font_DOL_DEFAULT_TTF)); } if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD))?DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf':(empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD)?'':$dolibarr_font_DOL_DEFAULT_TTF_BOLD)); } diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index fb2f6f966f8..0bd22e41ad2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -742,6 +742,7 @@ function write_conf_file($conffile) global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH; global $force_dolibarr_lib_PHPEXCEL_PATH, $force_dolibarr_lib_GEOIP_PATH; global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP; + global $force_dolibarr_js_CKEDITOR; global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD; $error=0; @@ -850,6 +851,9 @@ function write_conf_file($conffile) if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '#'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP=''; } fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';'); fputs($fp,"\n"); + if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '#'); $force_dolibarr_js_CKEDITOR=''; } + fputs($fp, '$dolibarr_ks_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';'); + fputs($fp,"\n"); // Write params to overwrites default font path fputs($fp,"\n"); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index c92c8b2b4b9..28006c544b0 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -932,8 +932,16 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor')) { print ''."\n"; - print ''."\n"; - print ''."\n"; + if (constant('JS_CKEDITOR')) + { + print ''."\n"; + print ''."\n"; + } + else + { + print ''."\n"; + print ''."\n"; + } } // jQuery jeditable if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE))