'.$langs->trans("MailMessage").'
';
print '
'.$langs->trans("CommonSubstitutions").':
';
- print '__ID__ = '.$langs->trans("IdRecord").'
';
- print '__EMAIL__ = '.$langs->trans("EMail").'
';
- if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
- {
- print '__CHECK_READ__ = '.$langs->trans("CheckRead").'
';
- print '__UNSUSCRIBE__ = '.$langs->trans("MailUnsubcribe").'
';
- }
- print '__MAILTOEMAIL__ = '.$langs->trans("MailtoEMail").'
';
- print '__LASTNAME__ = '.$langs->trans("Lastname").'
';
- print '__FIRSTNAME__ = '.$langs->trans("Firstname").'
';
- print '__OTHER1__ = '.$langs->trans("Other").'1
';
- print '__OTHER2__ = '.$langs->trans("Other").'2
';
- print '__OTHER3__ = '.$langs->trans("Other").'3
';
- print '__OTHER4__ = '.$langs->trans("Other").'4
';
- print '__OTHER5__ = '.$langs->trans("Other").'5
';
+ foreach($object->substitutionarray as $key => $val)
+ {
+ print $key.' = '.$langs->trans($val).'
';
+ }
print ' | ';
print '';
// Editeur wysiwyg
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 2914a1aecd1..32f4634e40e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -52,13 +52,11 @@ class Conf
public $smart_menu;
public $modules = array(); // List of activated modules
- public $modules_parts = array('js'=>array(),'triggers'=>array(),'login'=>array(),'substitutions'=>array(),'menus'=>array(),'theme'=>array(),'tpl'=>array(),'barcode'=>array(),'models'=>array()); // List of modules parts
+ public $modules_parts = array('js'=>array(),'triggers'=>array(),'login'=>array(),'substitutions'=>array(),'menus'=>array(),'theme'=>array(),'tpl'=>array(),'barcode'=>array(),'models'=>array(),'hooks'=>array()); // List of modules parts
// TODO Remove thoose arrays with generic module_parts
public $tabs_modules = array();
public $sms_engine_modules = array();
- // TODO Remove thoose arrays with generic module_parts
- public $hooks_modules = array();
public $societe_modules = array();
var $logbuffer = array();
@@ -202,7 +200,7 @@ class Conf
}
$i++;
}
-
+
$db->free($resql);
}
//var_dump($this->modules);
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 4f16862c82e..d6d1bd86539 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -176,7 +176,7 @@ class DolEditor
/* should be editor=CKEDITOR.replace but what if serveral editors ? */
CKEDITOR.replace(\''.$this->htmlname.'\',
{
- customConfig : \''.dol_buildpath('/theme/'.$conf->theme.'/ckeditor/config.js',1).'\',
+ customConfig : ckeditorConfig,
toolbar: \''.$this->toolbarname.'\',
toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
@@ -201,8 +201,8 @@ class DolEditor
{
$out.= ','."\n";
// To use filemanager with old fckeditor (GPL)
- $out.= ' filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\',';
- $out.= ' filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\',';
+ $out.= ' filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
+ $out.= ' filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
//$out.= ' filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';
//$out.= ' filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
$out.= "\n";
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index a7f0edd173f..46230d678b2 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -70,14 +70,14 @@ class HookManager
global $conf;
// Test if there is hooks to manage
- if (! is_array($conf->hooks_modules) || empty($conf->hooks_modules)) return;
+ if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
// For backward compatibility
if (! is_array($arraycontext)) $arraycontext=array($arraycontext);
$this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray)); // All contexts are concatenated
- foreach($conf->hooks_modules as $module => $hooks)
+ foreach($conf->modules_parts['hooks'] as $module => $hooks)
{
if ($conf->$module->enabled)
{
diff --git a/htdocs/core/js/editinplace.js b/htdocs/core/js/editinplace.js
index 7748b73fce6..bf94a47749a 100644
--- a/htdocs/core/js/editinplace.js
+++ b/htdocs/core/js/editinplace.js
@@ -80,7 +80,13 @@ $(document).ready(function() {
indicator : indicatorInPlace,
ckeditor : {
customConfig: ckeditorConfig,
- toolbar: $('#ckeditor_toolbar').val()
+ toolbar: $('#ckeditor_toolbar').val(),
+ filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,
+ filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,
+ filebrowserWindowWidth : '900',
+ filebrowserWindowHeight : '500',
+ filebrowserImageWindowWidth : '900',
+ filebrowserImageWindowHeight : '500'
},
submitdata : function(result, settings) {
return getParameters(this, 'ckeditor');
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index a67d2bcf9e7..a6790fd7106 100755
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -34,4 +34,5 @@ INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (10, 'SRC_EMPLOY
ALTER TABLE llx_commande_fournisseur CHANGE COLUMN date_cloture date_approve datetime;
ALTER TABLE llx_commande_fournisseur CHANGE COLUMN fk_user_cloture fk_user_approve integer;
-ALTER TABLE llx_mailing MODIFY COLUMN body mediumtext;
\ No newline at end of file
+ALTER TABLE llx_mailing MODIFY COLUMN body mediumtext;
+ALTER TABLE llx_mailing ADD COLUMN extraparams varchar(255);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql
index aad9949d2d9..0656a1e83aa 100644
--- a/htdocs/install/mysql/tables/llx_mailing.sql
+++ b/htdocs/install/mysql/tables/llx_mailing.sql
@@ -46,6 +46,7 @@ create table llx_mailing
fk_user_creat integer, -- user creator
fk_user_valid integer, -- user validator
fk_user_appro integer, -- not used
+ extraparams varchar(255), -- for stock other parameters with json format
joined_file1 varchar(255),
joined_file2 varchar(255),
joined_file3 varchar(255),
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0678797c8aa..4e1e373782e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -978,7 +978,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
print 'var indicatorInPlace = \' theme."/img/working.gif".'">\';'."\n";
- print 'var ckeditorConfig = \''.dol_buildpath('/theme/'.$conf->theme.'/ckeditor/config.js',1).'\';'."\n";
print ''."\n";
print ''."\n";
print ''."\n";
@@ -1019,7 +1018,12 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
}
else
{
- print ''."\n";
+ print ''."\n";
print ''."\n";
}
}
|