From 76870ab984e04c95f7fadfb1d9a4b55519f823a8 Mon Sep 17 00:00:00 2001 From: Blake Robertson Date: Fri, 26 Jul 2013 16:23:17 -0400 Subject: [PATCH] removed some references to window_yaai_ --- .../modules/Asterisk/api.parse.com.crt | 125 ------------------ .../Asterisk/include/javascript/callPopups.js | 32 ++--- .../Asterisk/include/javascript/dialout.js | 4 +- .../Configurator/asterisk_configurator.php | 1 + manifest.php | 4 +- 5 files changed, 21 insertions(+), 145 deletions(-) delete mode 100644 SugarModules/modules/Asterisk/api.parse.com.crt diff --git a/SugarModules/modules/Asterisk/api.parse.com.crt b/SugarModules/modules/Asterisk/api.parse.com.crt deleted file mode 100644 index 86aae1b..0000000 --- a/SugarModules/modules/Asterisk/api.parse.com.crt +++ /dev/null @@ -1,125 +0,0 @@ -Certificate Chain for api.parse.com - ------BEGIN CERTIFICATE----- -MIIGsTCCBZmgAwIBAgIQDnLpKv43TeqcHVqjzvgxUTANBgkqhkiG9w0BAQUFADBm -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j -ZSBDQS0zMB4XDTEyMDkxMDAwMDAwMFoXDTE1MDkxNTEyMDAwMFowczELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC1BhcnNlLCBJbmMuMQswCQYDVQQLEwJJVDEUMBIGA1UEAwwL -Ki5wYXJzZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9Zih3 -ny0cvRd7jxOHBTkhy7eCLje7fe5UOz1raf6G1YJVwPy6QZyapG3Qs2skTHeMhSZF -TDUr9ypciOAilc6VLs56CI9G4cG86eBn8M0zvll6D58r2xbnG9QAcGjI0m8X8mdb -sBiNTractS1J+xwfOMOJnabykUEMNsSohKuznJV+HurNqDB/VMyhER8vHUkrYPbv -pN1iu10J9SiLEgBqzdeju8gKj51zIcGMY4IDG51ZFAUO7jarmEy/N65MuILBhsc4 -JMDvvczgYtx2qdfb4hhiSWctgzKlm5dLgbPOeEWR9pYIuC9h3sspC5SorVUTbD55 -jphaOdgYvfdmHjH5AgMBAAGjggNMMIIDSDAfBgNVHSMEGDAWgBRQ6nOJ2yn7EI+e -5QEg1N55mUiD9zAdBgNVHQ4EFgQUKwxrAwnkCe6493JTk3/q3MB/sH4wIQYDVR0R -BBowGIILKi5wYXJzZS5jb22CCXBhcnNlLmNvbTAOBgNVHQ8BAf8EBAMCBaAwHQYD -VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGEGA1UdHwRaMFgwKqAooCaGJGh0 -dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9jYTMtZzEzLmNybDAqoCigJoYkaHR0cDov -L2NybDQuZGlnaWNlcnQuY29tL2NhMy1nMTMuY3JsMIIBxAYDVR0gBIIBuzCCAbcw -ggGzBglghkgBhv1sAQEwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2lj -ZXJ0LmNvbS9zc2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFW -HoIBUgBBAG4AeQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBm -AGkAYwBhAHQAZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0 -AGEAbgBjAGUAIABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAv -AEMAUABTACAAYQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0 -AHkAIABBAGcAcgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAg -AGwAaQBhAGIAaQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBw -AG8AcgBhAHQAZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBu -AGMAZQAuMHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au -ZGlnaWNlcnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2Vy -dC5jb20vRGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIw -ADANBgkqhkiG9w0BAQUFAAOCAQEATSmbUU8J6ROodbM/KVEnAycitFeB55x1Ba0Y -uCon+xTy+qSNmsJ4XdtIXU/RZ7JqQ3G2aM9mS95Z1H7tnP/8fVX4mq71HAQftyho -WcgwVV/V2h7mtZj5KdkUiuLlcX9tkx60qyaXJ+73WFmITjygHF6Yz2tAdAIM8BIt -5D/T3mpkI9bo5PSFY+4XWA2niDEdv5fZ0ofPb8yt4bu07DIS7AY0pbt8kKLiVCWa -pVUSzCaTjTuk6d+3jR1xR9t2kdo//vQEA3w/+2TbfW7R0DfARqdziKxzoszA7qJG -01ETzAcr9tP1V4XfTiBdh7YUAgHEa+WFBb/PMH/ke/plrCxVtg== ------END CERTIFICATE----- - ------BEGIN CERTIFICATE----- -MIIERjCCAy6gAwIBAgIEByd1ijANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTEyMDcyNTE3NTgyOFoX -DTE5MDcyNTE3NTc0NFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0 -IEluYzEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNl -cnQgSGlnaCBBc3N1cmFuY2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAMbM5XPm+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9p -pkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8Ok -hPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ck -RZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhak -aHPQNAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDir -CmTCv2ZdlYTBoSUeh10aUAsgEsxBu24LUTi4S8sCAwEAAaOCAQAwgf0wEgYDVR0T -AQH/BAgwBgEB/wIBATBTBgNVHSAETDBKMEgGCSsGAQQBsT4BADA7MDkGCCsGAQUF -BwIBFi1odHRwOi8vY3liZXJ0cnVzdC5vbW5pcm9vdC5jb20vcmVwb3NpdG9yeS5j -Zm0wDgYDVR0PAQH/BAQDAgEGMB8GA1UdIwQYMBaAFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9jZHAxLnB1YmxpYy10cnVzdC5j -b20vQ1JML09tbmlyb290MjAyNS5jcmwwHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoI -Au9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQB2Vlg2DRmYtNmlyzB1rrHWgJfM7jhy -aDmwAj5GtsTyrNHS4WYW5oWkVXfLLhxZ3aVL3y8zu85gVyc6oU1Jb1V2bdXXwqBb -Kpv5S/d/Id3uXFcNADU68YxGywT2Ro/OBWrVxGz+bpi/pJy9joksvnEBQ8w2KmQG -VpeTpUe9Sj+MG3XInrDwJZh3IcB2p1F6JCV9GDUG/sEJxQ47majNnSmwOon16ucq -5eIkTmipHafd0ghLodFvDL0s4Lt8+qE8Zc86UkvTIHoKEFX4rUMWVCdOU3PIo5aJ -0OF5xgl41fW9sbPFf6ZLr0kRyJecT3xwaRZcLbjQ3xwyUrne88MG6IMi ------END CERTIFICATE----- - ------BEGIN CERTIFICATE----- -MIIGWDCCBUCgAwIBAgIQCl8RTQNbF5EX0u/UA4w/OzANBgkqhkiG9w0BAQUFADBs -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j -ZSBFViBSb290IENBMB4XDTA4MDQwMjEyMDAwMFoXDTIyMDQwMzAwMDAwMFowZjEL -MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 -LmRpZ2ljZXJ0LmNvbTElMCMGA1UEAxMcRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug -Q0EtMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9hCikQH17+NDdR -CPge+yLtYb4LDXBMUGMmdRW5QYiXtvCgFbsIYOBC6AUpEIc2iihlqO8xB3RtNpcv -KEZmBMcqeSZ6mdWOw21PoF6tvD2Rwll7XjZswFPPAAgyPhBkWBATaccM7pxCUQD5 -BUTuJM56H+2MEb0SqPMV9Bx6MWkBG6fmXcCabH4JnudSREoQOiPkm7YDr6ictFuf -1EutkozOtREqqjcYjbTCuNhcBoz4/yO9NV7UfD5+gw6RlgWYw7If48hl66l7XaAs -zPw82W3tzPpLQ4zJ1LilYRyyQLYoEt+5+F/+07LJ7z20Hkt8HEyZNp496+ynaF4d -32duXvsCAwEAAaOCAvowggL2MA4GA1UdDwEB/wQEAwIBhjCCAcYGA1UdIASCAb0w -ggG5MIIBtQYLYIZIAYb9bAEDAAIwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3 -LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUH -AgIwggFWHoIBUgBBAG4AeQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQBy -AHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBj -AGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAg -AEMAUAAvAEMAUABTACAAYQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQ -AGEAcgB0AHkAIABBAGcAcgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBt -AGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBj -AG8AcgBwAG8AcgBhAHQAZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBl -AHIAZQBuAGMAZQAuMBIGA1UdEwEB/wQIMAYBAf8CAQAwNAYIKwYBBQUHAQEEKDAm -MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wgY8GA1UdHwSB -hzCBhDBAoD6gPIY6aHR0cDovL2NybDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0SGln -aEFzc3VyYW5jZUVWUm9vdENBLmNybDBAoD6gPIY6aHR0cDovL2NybDQuZGlnaWNl -cnQuY29tL0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZUVWUm9vdENBLmNybDAfBgNVHSME -GDAWgBSxPsNpA/i/RwHUmCYaCALvY2QrwzAdBgNVHQ4EFgQUUOpzidsp+xCPnuUB -INTeeZlIg/cwDQYJKoZIhvcNAQEFBQADggEBAB7ipUiebNtTOA/vphoqrOIDQ+2a -vD6OdRvw/S4iWawTwGHi5/rpmc2HCXVUKL9GYNy+USyS8xuRfDEIcOI3ucFbqL2j -CwD7GhX9A61YasXHJJlIR0YxHpLvtF9ONMeQvzHB+LGEhtCcAarfilYGzjrpDq6X -dF3XcZpCdF/ejUN83ulV7WkAywXgemFhM9EZTfkI7qA5xSU1tyvED7Ld8aW3DiTE -JiiNeXf1L/BXunwH1OH8zVowV36GEEfdMR/X/KLCvzB8XSSq6PmuX2p0ws5rs0bY -Ib4p1I5eFdZCSucyb6Sxa1GDWL4/bcf72gMhy2oWGU4K8K2Eyl2Us1p292E= ------END CERTIFICATE----- - ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp ------END CERTIFICATE----- diff --git a/SugarModules/modules/Asterisk/include/javascript/callPopups.js b/SugarModules/modules/Asterisk/include/javascript/callPopups.js index d8b45ef..b011c3f 100644 --- a/SugarModules/modules/Asterisk/include/javascript/callPopups.js +++ b/SugarModules/modules/Asterisk/include/javascript/callPopups.js @@ -41,13 +41,13 @@ var YAAI = { newMessages : [], callBoxes : [], sugarUserID : window.current_user_id, - phoneExtension : window.yaai_user_extension, - pollRate: window.yaai_poll_rate, - fop2 : window.yaai_fop_enabled, - fop2URL : window.yaai_fop_url, - fop2UserID : window.yaai_fop_user, - fop2Password : window.yaai_fop_pass, - showTransferButton : window.yaai_show_transfer_button, + phoneExtension : window.callinize_user_extension, + pollRate: window.callinize_poll_rate, + fop2 : window.callinize_fop_enabled, + fop2URL : window.callinize_fop_url, + fop2UserID : window.callinize_fop_user, + fop2Password : window.callinize_fop_pass, + showTransferButton : window.callinize_show_transfer_button, filteredCallStates : [''], //['Ringing'], // TODO make this configurable checkForNewStates : function(loop){ @@ -97,7 +97,7 @@ var YAAI = { var html; var template = ''; - if( window.yaai_dev ) { + if( window.callinize_dev ) { YAAI.log("WARNING: YAAI Developer Mode is enabled, this should not be used in production!"); var source = $("#handlebars-dev-template").html(); template = Handlebars.compile(source); @@ -316,7 +316,7 @@ var YAAI = { } // Here we show them all... - if( window.yaai_relate_to_contact_enabled ) { + if( window.callinize_relate_to_contact_enabled ) { YAAI.log(" Adding Relate to Contact"); $(dropdownDiv+" ul li.ul_relate_to_contact").show(); $(dropdownDiv+" ul li a.relate_to_contact").on("click", entry, function() { @@ -324,7 +324,7 @@ var YAAI = { }); } - if( window.yaai_relate_to_account_enabled ) { + if( window.callinize_relate_to_account_enabled ) { YAAI.log(" Adding Relate to Account"); $(dropdownDiv+" ul li.ul_relate_to_account").show(); $(dropdownDiv+" ul li a.relate_to_account").on("click", entry, function() { @@ -332,7 +332,7 @@ var YAAI = { }); } - if( window.yaai_create_new_contact_enabled ) { + if( window.callinize_create_new_contact_enabled ) { YAAI.log(" Adding Create New Contact " + dropdownDiv+" ul li.li_create_new_contact"); $(dropdownDiv+" ul li.ul_create_contact").show(); $(dropdownDiv+" ul li a.create_contact").on("click", entry, function() { @@ -341,7 +341,7 @@ var YAAI = { } /* - if( window.yaai_relate_to_contact_enabled ) { + if( window.callinize_relate_to_contact_enabled ) { YAAI.log(" Adding Relate to Contact"); // TODO Remove line below... for debugging YAAI.log( $(dropdownDiv+" ul").length + " was found?"); @@ -352,7 +352,7 @@ var YAAI = { }); } // TODO create - if( window.yaai_relate_to_account_enabled ) { + if( window.callinize_relate_to_account_enabled ) { YAAI.log(" Adding Relate to Account"); $(dropdownDiv+" ul").append("
    • "); $(dropdownDiv+" ul a.relate_to_account").on("click", entry, function() { @@ -360,7 +360,7 @@ var YAAI = { }); } - if( window.yaai_create_new_contact_enabled ) { + if( window.callinize_create_new_contact_enabled ) { YAAI.log(" Adding Create New Contact"); $(dropdownDiv+" ul").append("
  • "+entry['mod_strings']['CREATE_NEW_CONTACT']+"
    • "); $(dropdownDiv+" ul a.create_contact").on("click", entry, function() { @@ -368,7 +368,7 @@ var YAAI = { }); } - if( window.yaai_block_button_enabled ) { + if( window.callinize_block_button_enabled ) { YAAI.log(" Adding Block Button Enabled"); $(dropdownDiv+" ul").append("
  • "+entry['mod_strings']['BLOCK_NUMBER']+"
    • "); $(dropdownDiv+" ul a.block_number").on("click", { @@ -909,7 +909,7 @@ var YAAI = { }, log : function(message) { - if (window.yaai_debug == 1) { + if (window.callinize_debug == 1) { console.log(message); } }, diff --git a/SugarModules/modules/Asterisk/include/javascript/dialout.js b/SugarModules/modules/Asterisk/include/javascript/dialout.js index a72a2be..69da188 100644 --- a/SugarModules/modules/Asterisk/include/javascript/dialout.js +++ b/SugarModules/modules/Asterisk/include/javascript/dialout.js @@ -55,8 +55,8 @@ $(document).ready(function() contactId = $('input[name="mass[]"]', $(this).parents('tr:first')).attr('value'); } - if( window.yaai_user_extension ) { - $(this).append('   '); + if( window.callinize_user_extension ) { + $(this).append('   '); } else { $(this).append('   '); diff --git a/SugarModules/modules/Configurator/asterisk_configurator.php b/SugarModules/modules/Configurator/asterisk_configurator.php index 8bf2875..467111e 100644 --- a/SugarModules/modules/Configurator/asterisk_configurator.php +++ b/SugarModules/modules/Configurator/asterisk_configurator.php @@ -98,6 +98,7 @@ $callsLogged = "Unknown"; } +$licenseSummary = ''; require_once('include/Sugar_Smarty.php'); $sugar_smarty = new Sugar_Smarty(); diff --git a/manifest.php b/manifest.php index 216bc33..fd664ad 100644 --- a/manifest.php +++ b/manifest.php @@ -61,9 +61,9 @@ 'icon' => '', 'is_uninstallable' => true, 'name' => 'Callinize - community Edition', - 'published_date' => 'Jul 25, 2013', + 'published_date' => 'Jul 26, 2013', 'type' => 'module', - 'version' => '3.5.6', + 'version' => '3.5.6b', 'remove_tables' => 'true', /** This does absolutely nothing since our asterisk log table is created manually instead of as a bean **/ );