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

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Grand Philippe 2013-03-19 08:37:34 +01:00
commit d541bc874d
7 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/fckeditor.php
View File

@ -41,6 +41,8 @@ $modules = array(
'PRODUCTDESC' => 'FCKeditorForProduct', 'PRODUCTDESC' => 'FCKeditorForProduct',
'MAILING' => 'FCKeditorForMailing', 'MAILING' => 'FCKeditorForMailing',
'DETAILS' => 'FCKeditorForProductDetails', 'DETAILS' => 'FCKeditorForProductDetails',
'USERSIGN' => 'FCKeditorForUserSignature',
'MAIL' => 'FCKeditorForMail'
); );
// Conditions pour que l'option soit proposee // Conditions pour que l'option soit proposee
$conditions = array( $conditions = array(
@ -48,6 +50,8 @@ $conditions = array(
'PRODUCTDESC' => (! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'PRODUCTDESC' => (! empty($conf->product->enabled) || ! empty($conf->service->enabled)),
'MAILING' => ! empty($conf->mailing->enabled), 'MAILING' => ! empty($conf->mailing->enabled),
'DETAILS' => (! empty($conf->facture->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)), 'DETAILS' => (! empty($conf->facture->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)),
'USERSIGN' => 1,
'MAIL' => (! empty($conf->facture->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled))
); );
// Picto // Picto
$picto = array( $picto = array(
@ -55,6 +59,8 @@ $picto = array(
'PRODUCTDESC' => 'product', 'PRODUCTDESC' => 'product',
'MAILING' => 'email', 'MAILING' => 'email',
'DETAILS' => 'generic', 'DETAILS' => 'generic',
'USERSIGN' => 'user',
'MAIL' => 'email'
); );

3
htdocs/core/class/html.formmail.class.php
View File

@ -593,6 +593,9 @@ class FormMail
// Editor wysiwyg // Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
$this->withfckeditor=1;
}
$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72); $doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
$out.= $doleditor->Create(1); $out.= $doleditor->Create(1);
} }

9
htdocs/core/modules/modFckeditor.class.php
View File

@ -67,9 +67,12 @@ class modFckeditor extends DolibarrModules
// Constantes // Constantes
$this->const = array(); $this->const = array();
$this->const[0] = array("FCKEDITOR_ENABLE_SOCIETE","yesno","1","Activation fckeditor sur notes autres"); $this->const[0] = array("FCKEDITOR_ENABLE_SOCIETE","yesno","1","WYSIWIG for description and note (except products/services)");
$this->const[1] = array("FCKEDITOR_ENABLE_PRODUCTDESC","yesno","1","Activation fckeditor sur notes produits"); $this->const[1] = array("FCKEDITOR_ENABLE_PRODUCTDESC","yesno","1","WYSIWIG for products/services description and note");
$this->const[2] = array("FCKEDITOR_ENABLE_MAILING","yesno","1","Activation fckeditor sur emailing"); $this->const[2] = array("FCKEDITOR_ENABLE_MAILING","yesno","1","WYSIWIG for mass emailings");
$this->const[3] = array("FCKEDITOR_ENABLE_DETAILS","yesno","1","WYSIWIG for products details lines for all entities");
$this->const[4] = array("FCKEDITOR_ENABLE_USERSIGN","yesno","1","WYSIWIG for products details lines for all entities");
$this->const[5] = array("FCKEDITOR_ENABLE_MAIL","yesno","1","WYSIWIG for products details lines for all entities");
// Boites // Boites
$this->boxes = array(); $this->boxes = array();

4
htdocs/langs/en_US/admin.lang
View File

@ -1274,7 +1274,9 @@ ActivateFCKeditor=Activate advanced editor for:
FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommanded as it can create problems with special characters and page formating when building PDF files.</font> FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommanded as it can create problems with special characters and page formating when building PDF files.</font>
FCKeditorForMailing=WYSIWIG creation/edition of mailings FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
##### OSCommerce 1 ##### ##### OSCommerce 1 #####
OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s). OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull. OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.

4
htdocs/langs/es_ES/admin.lang
View File

@ -1270,7 +1270,9 @@ ActivateFCKeditor=Activar editor avanzado para :
FCKeditorForCompany=Creación/edición WYSIWIG de la descripción y notas de los terceros FCKeditorForCompany=Creación/edición WYSIWIG de la descripción y notas de los terceros
FCKeditorForProduct=Creación/edición WYSIWIG de la descripción y notas de los productos/servicios FCKeditorForProduct=Creación/edición WYSIWIG de la descripción y notas de los productos/servicios
FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, presupuestos, facturas, etc.) FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, presupuestos, facturas, etc.)
FCKeditorForMailing=Creación/edición WYSIWIG de los E-Mails FCKeditorForMailing=Creación/edición WYSIWIG de los E-Mails (Utilidades->E-Mailings)
FCKeditorForUserSignature=Creación/edición WYSIWIG de los usuario firma
FCKeditorForMail=Creación/edición WYSIWIG de todos los E-Mails (excepto Utilidades->E-Mailings)
##### OSCommerce 1 ##### ##### OSCommerce 1 #####
OSCommerceErrorConnectOkButWrongDatabase=La conexión se ha establecido, pero la base de datos no parece de OSCommerce. OSCommerceErrorConnectOkButWrongDatabase=La conexión se ha establecido, pero la base de datos no parece de OSCommerce.
OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' es correcta. OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' es correcta.

4
htdocs/langs/fr_FR/admin.lang
View File

@ -1275,7 +1275,9 @@ ActivateFCKeditor= Activer éditeur avancé pour :
FCKeditorForCompany= Création/édition WYSIWIG de la description et note des éléments (autre que produits/services) FCKeditorForCompany= Création/édition WYSIWIG de la description et note des éléments (autre que produits/services)
FCKeditorForProduct= Création/édition WYSIWIG de la description et note des produits/services FCKeditorForProduct= Création/édition WYSIWIG de la description et note des produits/services
FCKeditorForProductDetails= Création/édition WYSIWIG des lignes détails produits (sur commandes, propales, factures, etc...). <font class="warning">Attention: L'utilisation pour ce cas est fortement déconseillée car peut poser des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés.</font> FCKeditorForProductDetails= Création/édition WYSIWIG des lignes détails produits (sur commandes, propales, factures, etc...). <font class="warning">Attention: L'utilisation pour ce cas est fortement déconseillée car peut poser des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés.</font>
FCKeditorForMailing= Création/édition WYSIWIG des mailings FCKeditorForMailing= Création/édition WYSIWIG des mailings (Outils->EMailings)
FCKeditorForUserSignature=Création/édition WYSIWIG de la signature des utilisateurs
FCKeditorForMail=Création/édition WYSIWIG tous les mails (sauf Outils->EMailings)
##### OSCommerce 1 ##### ##### OSCommerce 1 #####
OSCommerceErrorConnectOkButWrongDatabase= La connexion a réussi mais la base ne semble pas être une base OSCommerce (clé %s non trouvée dans la table %s). OSCommerceErrorConnectOkButWrongDatabase= La connexion a réussi mais la base ne semble pas être une base OSCommerce (clé %s non trouvée dans la table %s).
OSCommerceTestOk= La connexion au serveur '%s' sur la base '%s' par l'utilisateur '%s' a réussi. OSCommerceTestOk= La connexion au serveur '%s' sur la base '%s' par l'utilisateur '%s' a réussi.

30
htdocs/user/fiche.php
View File

@ -886,7 +886,17 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Signature // Signature
print '<tr><td valign="top">'.$langs->trans("Signature").'</td>'; print '<tr><td valign="top">'.$langs->trans("Signature").'</td>';
print '<td>'; print '<td>';
print '<textarea rows="'.ROWS_5.'" cols="90" name="signature">'.GETPOST('signature').'</textarea>'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)) {
$withfckeditor=1;
//Mailing is mandatory to have dolHTMLencode done by ckeditor
$ckeditortoolbar='dolibarr_mailings';
} else {
$withfckeditor=0;
$ckeditortoolbar='';
}
$doleditor=new DolEditor('signature',GETPOST('signature'),'',280,$ckeditortoolbar,'In',true,true,$withfckeditor,8,72);
print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// Multicompany // Multicompany
@ -1195,7 +1205,11 @@ else
// Signature // Signature
print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>'; print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>';
print dol_textishtml($object->signature)?$object->signature:dol_nl2br($object->signature,1,false); if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) && dol_textishtml(dol_html_entity_decode($object->signature, ENT_COMPAT | ENT_HTML401))) {
print dol_html_entity_decode($object->signature, ENT_COMPAT | ENT_HTML401);
}else {
print dol_textishtml($object->signature)?$object->signature:dol_nl2br($object->signature,1,false);
}
print "</td></tr>\n"; print "</td></tr>\n";
// Hierarchy // Hierarchy
@ -1794,7 +1808,17 @@ else
// Signature // Signature
print "<tr>".'<td valign="top">'.$langs->trans("Signature").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("Signature").'</td>';
print '<td>'; print '<td>';
print '<textarea name="signature" rows="5" cols="90">'.dol_htmlentitiesbr_decode($object->signature).'</textarea>'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)) {
$withfckeditor=1;
//Mailing is mandatory to have dolHTMLencode done by ckeditor
$ckeditortoolbar='dolibarr_mailings';
} else {
$withfckeditor=0;
$ckeditortoolbar='';
}
$doleditor=new DolEditor('signature',$object->signature,'',280,$ckeditortoolbar,'In',true,true,$withfckeditor,8,72);
print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// openid // openid