Changeset 8038 for trunk/expressoMail1_2


Ignore:
Timestamp:
03/18/13 18:52:39 (11 years ago)
Author:
antonio
Message:

Ticket #3368 - Corrigida incompatibilidade entre formatos de assinatura.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/inc/hook_settings.inc.php

    r7690 r8038  
    272272{ 
    273273    var types = fromJSON( document.getElementById( "signature_types" ).value ); 
    274     var signatures = fromJSON( document.getElementById( "signatures" ).value ); 
     274    var signatures; 
     275    if (document.getElementById( "signatures" ).value) 
     276    { 
     277        signatures = fromJSON(document.getElementById("signatures").value); 
     278    } else if (document.getElementById( "signature" ).value) // Caso a assinatura esteja no formato da versão 2.2.10: 
     279    { 
     280        // TODO: Internazionalizar a string 
     281        signatures = {}; 
     282        signatures["Assinatura padrão"] = document.getElementById( "signature" ).value; 
     283        if (!document.getElementById("signature_default").value) 
     284        { 
     285            document.getElementById("signature_default").value = "Assinatura padrão"; 
     286        } 
     287    } 
     288 
    275289    var old_signature = document.getElementById( "signature" ).value;  
    276290    var def = document.getElementById( "signature_default" ).value; 
     
    296310 
    297311    if( def_signature !== "" ) 
    298         document.getElementById( "default_signature" + def_signature ).checked = true; 
     312        document.getElementById( "default_signature" + def_signature ).checked = true; 
    299313    else if( noSig && old_signature ) 
    300314    { 
    301         addSignature( document.getElementById("type_signature").value !== "html" ); 
    302         document.getElementById( "user_signature" + counter ).value = old_signature; 
    303     } 
    304     } 
     315        var type_signature = document.getElementById("type_signature"); 
     316        if (type_signature) 
     317        { 
     318            addSignature( type_signature.value !== "html" ); 
     319            document.getElementById( "user_signature" + counter ).value = old_signature; 
     320        } 
     321    } 
     322} 
    305323'); 
    306324//} 
Note: See TracChangeset for help on using the changeset viewer.