diff options
| author | Iordan Iordanov <iiordanov@gmail.com> | 2011-11-26 02:29:26 +0000 |
|---|---|---|
| committer | Iordan Iordanov <iiordanov@gmail.com> | 2011-11-26 02:29:26 +0000 |
| commit | 60e46ff416448164fc8c65940b908d61c9e6e85d (patch) | |
| tree | f17ebc098eeadf661f000fdd07b8a4c626ed272e /applications/luci-pbx | |
| parent | c0a776877858ee5354b7acd73d84dccfda0a9513 (diff) | |
1) Fixed wording in a few places.
2) Fixed a bug in voicemail section of pbx-asterisk init script which was causing
the script to exit if no configuration for voicemail was found.
Diffstat (limited to 'applications/luci-pbx')
| -rw-r--r-- | applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua | 4 | ||||
| -rwxr-xr-x | applications/luci-pbx/root/etc/init.d/pbx-asterisk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua index 68bfaca85..af18c6ff0 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua @@ -206,7 +206,7 @@ for k,v in pairs(validinaccounts) do value = self.map:get(section, self.option) if value == nil then - return {translate("Rings all users enabled for incoming calls")} + return {translate("All users enabled for incoming calls")} else return value end @@ -259,7 +259,7 @@ for k,v in pairs(validoutusers) do value = self.map:get(section, self.option) if value == nil then - return {translate("Uses all providers enabled for outgoing calls")} + return {translate("All providers enabled for outgoing calls")} else newvalue = {} -- Convert internal names to user@host values. diff --git a/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/applications/luci-pbx/root/etc/init.d/pbx-asterisk index fdd01d76b..6b4808b73 100755 --- a/applications/luci-pbx/root/etc/init.d/pbx-asterisk +++ b/applications/luci-pbx/root/etc/init.d/pbx-asterisk @@ -601,7 +601,7 @@ pbx_configure_voicemail() config_get enabled global_voicemail enabled # First check if voicemail is enabled. - [ "$enabled" != "yes" ] && exit + [ "$enabled" != "yes" ] && return config_get global_timeout global_voicemail global_timeout #config_get global_email_addresses global_voicemail global_email_addresses @@ -665,7 +665,7 @@ start() { pbx_cook_sip_template pbx_cook_rtp_template - # Prepare sip.conf using settings from the "advanced" section. + # Prepare voicemail config. config_unset config_load ${MODULENAME}-voicemail pbx_configure_voicemail |