Mise a jour fckeditor 2.3.1 et correction pour que le code soit touché au minimum.
Correction pour faire fonctionner l'upload de fichiers
This commit is contained in:
parent
d4f72730b9
commit
e16472c697
@ -1,26 +1,31 @@
|
|||||||
If fckeditor files are replaced by new version, following changes must be done:
|
If fckeditor files are replaced by new version, following changes must be done:
|
||||||
|
|
||||||
|
|
||||||
* Edit fckconfig.js to set:
|
* Edit fckconfig.js to set:
|
||||||
***************************
|
***************************
|
||||||
|
|
||||||
FCKConfig.LinkUpload = false ;
|
FCKConfig.LinkUpload = false ;
|
||||||
FCKConfig.ImageUpload = false ;
|
FCKConfig.ImageUpload = false ;
|
||||||
FCKConfig.FlashUpload = false ;
|
FCKConfig.FlashUpload = false ;
|
||||||
|
|
||||||
|
|
||||||
* Edit htdocs\includes\fckeditor\editor\filemanager\browser\default\connectors\php\config.php to set:
|
* Edit htdocs\includes\fckeditor\editor\filemanager\browser\default\connectors\php\config.php to set:
|
||||||
*****************************************************************************************************
|
*****************************************************************************************************
|
||||||
|
|
||||||
//require_once("../../../../../../../../master.inc.php");
|
//require_once("../../../../../../../../master.inc.php");
|
||||||
require_once("../../../../../../../../conf/conf.php"); // ajouté car include master.inc.php ne marche pas
|
require_once("../../../../../../../../conf/conf.php"); // ajouté car include master.inc.php ne marche pas
|
||||||
/*
|
$uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root);
|
||||||
$conf->syslog->enabled=1;
|
$pos = strstr ($uri, '/'); // $pos contient alors url sans nom domaine
|
||||||
define('SYSLOG_FILE','c:/log/dolibarr/dolibarr.log');
|
if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a ''
|
||||||
|
define('DOL_URL_ROOT', $pos);
|
||||||
|
|
||||||
|
/*
|
||||||
|
$conf->syslog->enabled=1;
|
||||||
|
define('SYSLOG_FILE','c:/log/dolibarr/dolibarr.log');
|
||||||
require_once("../../../../../../../../lib/functions.inc.php");
|
require_once("../../../../../../../../lib/functions.inc.php");
|
||||||
dolibarr_syslog("eee".$conf->fckeditor->dir_output);
|
dolibarr_syslog("eee".$conf->fckeditor->dir_output);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// SECURITY: You must explicitelly enable this "connector". (Set it to "true").
|
// SECURITY: You must explicitelly enable this "connector". (Set it to "true").
|
||||||
$Config['Enabled'] = true ;
|
$Config['Enabled'] = true ;
|
||||||
|
|
||||||
|
|||||||
@ -22,6 +22,11 @@ global $Config ;
|
|||||||
|
|
||||||
//require_once("../../../../../../../../master.inc.php");
|
//require_once("../../../../../../../../master.inc.php");
|
||||||
require_once("../../../../../../../../conf/conf.php"); // ajouté car include master.inc.php ne marche pas
|
require_once("../../../../../../../../conf/conf.php"); // ajouté car include master.inc.php ne marche pas
|
||||||
|
$uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root);
|
||||||
|
$pos = strstr ($uri, '/'); // $pos contient alors url sans nom domaine
|
||||||
|
if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a ''
|
||||||
|
define('DOL_URL_ROOT', $pos);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
$conf->syslog->enabled=1;
|
$conf->syslog->enabled=1;
|
||||||
define('SYSLOG_FILE','c:/log/dolibarr/dolibarr.log');
|
define('SYSLOG_FILE','c:/log/dolibarr/dolibarr.log');
|
||||||
@ -33,7 +38,7 @@ dolibarr_syslog("eee".$conf->fckeditor->dir_output);
|
|||||||
$Config['Enabled'] = true ;
|
$Config['Enabled'] = true ;
|
||||||
|
|
||||||
// Path to user files relative to the document root.
|
// Path to user files relative to the document root.
|
||||||
$Config['UserFilesPath'] = '/viewimage.php?modulepart=fckeditor&file=' ;
|
$Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=fckeditor&file=' ;
|
||||||
|
|
||||||
// Fill the following value it you prefer to specify the absolute path for the
|
// Fill the following value it you prefer to specify the absolute path for the
|
||||||
// user files directory. Usefull if you are using a virtual directory, symbolic
|
// user files directory. Usefull if you are using a virtual directory, symbolic
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user