Changeset b269e7


Ignore:
Timestamp:
Sep 8, 2010, 1:15:39 PM (10 years ago)
Author:
rene <just@…>
Branches:
ng_0.6, ng_0.8, ng_0.9
Children:
ee52fc
Parents:
78a424
Message:

finally repaired final check :)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/v_identity.js

    r78a424 rb269e7  
    184184            // final check if eyerything is nice before we handover to the real sending...
    185185            var virtualIdentityData = document.getElementById("msgIdentity_clone").identityData;
     186
    186187            var currentIdentity = getCurrentIdentity();
    187             var currentSMTPobj = new vI_smtpObj(currentIdentity.smtpServerKey);
     188            //                          vI_identityData(email, fullName, id, smtp, extras, sideDescription, existingID)
     189            var currentIdentityData = new vI_identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
    188190           
    189191            vI_notificationBar.dump("\n## vI_identityData GenericSendMessage Final Check\n");
    190             vI_notificationBar.dump("## vI_identityData currentIdentity: fullName='" + currentIdentity.fullName + "' email='" + currentIdentity.email + "' smtp='" + currentSMTPobj.key + "'\n");
     192            vI_notificationBar.dump("## vI_identityData currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");
    191193            vI_notificationBar.dump("## vI_identityData virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");
    192194
    193             if  (currentIdentity.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase()   &&
    194                 currentIdentity.email.toLowerCase() == virtualIdentityData.email.toLowerCase()      &&
    195                 virtualIdentityData.smtp.equal(currentSMTPobj)  ) {
     195            if  (currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase()   &&
     196                currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase()      &&
     197                virtualIdentityData.smtp.equal(currentIdentityData.smtp)    ) {
    196198                    vI_main.original_functions.GenericSendMessage(msgType);
    197199            }
    198200            else {
    199                 if (!(currentIdentity.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) vI_notificationBar.dump("\n## vI_identityData failed check for fullName.\n");
    200                 if (!(currentIdentity.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) vI_notificationBar.dump("\n## vI_identityData failed check for email.\n");
    201                 if (!(virtualIdentityData.smtp.equal(currentSMTPobj))) vI_notificationBar.dump("\n## vI_identityData failed check for SMTP.\n");
     201                if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) vI_notificationBar.dump("\n## vI_identityData failed check for fullName.\n");
     202                if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) vI_notificationBar.dump("\n## vI_identityData failed check for email.\n");
     203                if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) vI_notificationBar.dump("\n## vI_identityData failed check for SMTP.\n");
    202204                alert(vI_main.elements.strings.getString("vident.genericSendMessage.error"));
    203205                vI_main.Cleanup();
Note: See TracChangeset for help on using the changeset viewer.