From fb842199d3d32fd7973b1b5d753890f27c726c5a Mon Sep 17 00:00:00 2001 From: Blake Robertson Date: Sat, 21 Jul 2012 15:44:59 -0400 Subject: [PATCH] Added SOAP Pass to configuration. Improved Post Install Instructions --- .../Configurator/asterisk_configurator.php | 3 ++ .../Configurator/asterisk_configurator.tpl | 35 ++++++++++++++----- .../Configurator/language/en_us.lang.php | 1 + manifest.php | 6 ++-- scripts/post_install.php | 18 ++++++++-- 5 files changed, 49 insertions(+), 14 deletions(-) diff --git a/SugarModules/modules/Configurator/asterisk_configurator.php b/SugarModules/modules/Configurator/asterisk_configurator.php index 730df16..bebf9d8 100644 --- a/SugarModules/modules/Configurator/asterisk_configurator.php +++ b/SugarModules/modules/Configurator/asterisk_configurator.php @@ -52,6 +52,7 @@ $asterisk_config['asterisk_context'] = 'from-internal'; $asterisk_config['asterisk_expr'] = '^(sip\/[1-9][0-9][0-9]?[0-9]?-|Local)'; $asterisk_config['asterisk_soapuser'] = 'admin'; +$asterisk_config['asterisk_soappass'] = 'soap_password'; $asterisk_config['asterisk_log_file'] = ''; $asterisk_config['asterisk_dialout_channel'] = 'SIP/###'; @@ -128,6 +129,8 @@ $javascript->addFieldGeneric('asterisk_call_subject_max_length', "varchar", $mod_strings['LBL_ASTERISK_CALL_SUBJECT_MAX_LENGTH'], TRUE, ""); $javascript->addFieldGeneric('asterisk_listener_poll_rate', "varchar", $mod_strings['LBL_ASTERISK_LISTENER_POLL_RATE'], TRUE, ""); +// Added in yaai-2.4 +$javascript->addFieldGeneric("asterisk_soappass", "varchar", $mod_strings['LBL_ASTERISK_SOAPPASS'], TRUE, ""); echo $javascript->getScript(); diff --git a/SugarModules/modules/Configurator/asterisk_configurator.tpl b/SugarModules/modules/Configurator/asterisk_configurator.tpl index 4c07365..fa50ddc 100644 --- a/SugarModules/modules/Configurator/asterisk_configurator.tpl +++ b/SugarModules/modules/Configurator/asterisk_configurator.tpl @@ -125,15 +125,6 @@ - {$MOD.LBL_ASTERISK_EXPR}: - - {if empty($config.asterisk_expr )} - {assign var='asterisk_expr' value=$asterisk_config.asterisk_expr} - {else} - {assign var='asterisk_expr' value=$config.asterisk_expr} - {/if} - - {$MOD.LBL_ASTERISK_SOAPUSER}: {if empty($config.asterisk_soapuser )} @@ -142,8 +133,34 @@ {assign var='asterisk_soapuser' value=$config.asterisk_soapuser} {/if} +
*Note this is a SugarCRM user (Not an Asterisk User) that will be used by asteriskLogger when making SOAP calls. + {$MOD.LBL_ASTERISK_SOAPPASS}: + + {if empty($config.asterisk_soappass )} + {assign var='asterisk_soapppass' value=$asterisk_config.asterisk_soappass} + {else} + {assign var='asterisk_soapppass' value=$config.asterisk_soappass} + {/if} + +
*Password may not be displayed here after reloading page. I'm not sure why but saving still works. I thought this behavior was actually ideal for security purposes! When in doubt, look in config.override.ini for asterisk_soappass to confirm.. + + + + {$MOD.LBL_ASTERISK_EXPR}: + + {if empty($config.asterisk_expr )} + {assign var='asterisk_expr' value=$asterisk_config.asterisk_expr} + {else} + {assign var='asterisk_expr' value=$config.asterisk_expr} + {/if} + + +   +   + + diff --git a/SugarModules/modules/Configurator/language/en_us.lang.php b/SugarModules/modules/Configurator/language/en_us.lang.php index 0b5bd02..1a8f00c 100644 --- a/SugarModules/modules/Configurator/language/en_us.lang.php +++ b/SugarModules/modules/Configurator/language/en_us.lang.php @@ -47,6 +47,7 @@ $mod_strings['LBL_ASTERISK_EXPR'] = 'Dialpattern for inbound/outbound matching'; $mod_strings['LBL_ASTERISK_EXPR_DESC'] = 'Regular expression to match incoming calls'; $mod_strings['LBL_ASTERISK_SOAPUSER'] = 'Asterisk Soap-User'; +$mod_strings['LBL_ASTERISK_SOAPPASS'] = 'Asterisk Soap-Pass'; $mod_strings['LBL_ASTERISK_LOG_FILE'] = 'Log File Path'; $mod_strings['LBL_ASTERISK_DIALOUT_CHANNEL'] = 'Dialout Channel'; diff --git a/manifest.php b/manifest.php index 68a919b..4771928 100644 --- a/manifest.php +++ b/manifest.php @@ -44,7 +44,7 @@ 'regex_matches' => array ( 1 => '6\.4\.\d', - 2 => '6\.\d\.\d', /** matches 6.x.x **/ + 2 => '6\.[0-5]\.\d', /** matches 6.1.x,6.2.x,6.3.x,6.4.x,6.5.x **/ ), ), 'acceptable_sugar_flavors' => @@ -60,9 +60,9 @@ 'icon' => '', 'is_uninstallable' => true, 'name' => 'Asterisk SugarCRM Connector', - 'published_date' => '2012-06-28', + 'published_date' => '2012-07-21', 'type' => 'module', - 'version' => '2.3.4.0 for v6.x', + 'version' => '2.4.0 for v6.x', 'remove_tables' => 'true', /** This does absolutely nothing since our asterisk log table is created manually instead of as a bean **/ ); diff --git a/scripts/post_install.php b/scripts/post_install.php index eb02a71..96f863f 100644 --- a/scripts/post_install.php +++ b/scripts/post_install.php @@ -49,8 +49,22 @@ function post_install() { ?>

-Please review the documentation! There are several additional steps that must be taken. -
The User Guide can be found on the Project website here: https://github.com/blak3r/yaai/wiki/User-Manual +Please review the documentation! There are several additional steps that must be taken. +
The User Guide can be found on the Project website here: https://github.com/blak3r/yaai/wiki/User-Manual. Please note the fairly comprehensive troubleshooting section at the end of the manual. +
+
+Donate to YAAI +
Please consider making a donation to the project. Your contribution allows me to spend more time improving/supporting. +We're also in great need of some help from developers. Please see: https://github.com/blak3r/yaai/wiki/Project-TODO-List for ways you can help. +

+
+

+ + + + +
+