removed some references to window_yaai_

blak3r · Jul 26, 2013 · 76870ab · 76870ab
1 parent 572cc4b
commit 76870ab
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 145 deletions.
diff --git a/SugarModules/modules/Asterisk/api.parse.com.crt b/SugarModules/modules/Asterisk/api.parse.com.crt
diff --git 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,23 +316,23 @@ 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() {
                 YAAI.openContactRelatePopup(entry);
             });
         }
 
-        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() {
                 YAAI.openAccountRelatePopup(entry);
             });
         }
 
-        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,23 +352,23 @@ 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("<li><a href='#' class='relate_to_account'>"+entry['mod_strings']['RELATE_TO_ACCOUNT']+"</a></li>");
          $(dropdownDiv+" ul a.relate_to_account").on("click", entry, function() {
          YAAI.openAccountRelatePopup(entry);
          });
          }
 
-         if( window.yaai_create_new_contact_enabled ) {
+         if( window.callinize_create_new_contact_enabled ) {
          YAAI.log("  Adding Create New Contact");
          $(dropdownDiv+" ul").append("<li><a href='#' class='create_contact'>"+entry['mod_strings']['CREATE_NEW_CONTACT']+"</a></li>");
          $(dropdownDiv+" ul a.create_contact").on("click", entry, function() {
          YAAI.createContact(entry)
          });
          }
 
-         if( window.yaai_block_button_enabled ) {
+         if( window.callinize_block_button_enabled ) {
          YAAI.log("  Adding Block Button Enabled");
          $(dropdownDiv+" ul").append("<li><a href='#' class='block_number'>"+entry['mod_strings']['BLOCK_NUMBER']+"</a></li>");
          $(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
@@ -55,8 +55,8 @@ $(document).ready(function()
 				contactId = $('input[name="mass[]"]', $(this).parents('tr:first')).attr('value');
 			}		
 
-			if( window.yaai_user_extension ) {
-				$(this).append('&nbsp;&nbsp;<img title="Extension Configured for Click To Dial is: ' + window.yaai_user_extension + '" src="custom/modules/Asterisk/include/images/call_active.gif" class="asterisk_placeCall" value="anrufen" style="cursor: pointer;"/>&nbsp;');	
+			if( window.callinize_user_extension ) {
+				$(this).append('&nbsp;&nbsp;<img title="Extension Configured for Click To Dial is: ' + window.callinize_user_extension + '" src="custom/modules/Asterisk/include/images/call_active.gif" class="asterisk_placeCall" value="anrufen" style="cursor: pointer;"/>&nbsp;');
 			}
 			else {
 				$(this).append('&nbsp;&nbsp;<img title="No extension configured!  Go to user preferences to set your extension" src="custom/modules/Asterisk/include/images/call_noextset.gif" class="asterisk_placeCall" value="anrufen" style="cursor: pointer;"/>&nbsp;');	

diff --git 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
@@ -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 **/
                    );