diff options
| author | Iordan Iordanov <iiordanov@gmail.com> | 2011-10-31 01:00:22 +0000 |
|---|---|---|
| committer | Iordan Iordanov <iiordanov@gmail.com> | 2011-10-31 01:00:22 +0000 |
| commit | 62118b369bdc6db3c5d9d680e7f941ebe9235c27 (patch) | |
| tree | ce9dc2b129c46cb4d89bbef165758755768f8ac2 /applications/luci-pbx/luasrc/model/cbi | |
| parent | 96f494f4bae187c700e9d9ad77f77b4085908e9a (diff) | |
1) Made pbx-asterisk executable.
2) Removed a few unused templates.
3) Removed old firewall rule-creation routine from pbx-asterisk.
4) Updated text on main page.
Diffstat (limited to 'applications/luci-pbx/luasrc/model/cbi')
| -rw-r--r-- | applications/luci-pbx/luasrc/model/cbi/pbx.lua | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx.lua b/applications/luci-pbx/luasrc/model/cbi/pbx.lua index f73930eee3..910c749e26 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx.lua @@ -75,16 +75,16 @@ end m = Map (modulename, translate("PBX Main Page"), translate("This configuration page allows you to configure a phone system (PBX) service which\ - permits making phone calls with, and sharing multiple Google and SIP (like Sipgate,\ - SipSorcery, and Betamax) accounts among many SIP devices. Note that Google\ - accounts, SIP accounts, and local user accounts are configured in the\ - \"Google Accounts\", \"SIP Accounts\", and \"User Accounts\" sub-sections.\ - You must configure at least one local SIP account\ - on this PBX, to make and receive calls with your Google/SIP accounts.\ - Configuring multiple users will allow you to make free calls between users, and share the configured\ - Google and SIP accounts. If you have more than one Google and SIP accounts set up,\ - you should probably configure how calls to and from them are routed in the \"Call Routing\" page.\ - If you're interested in using your own PBX from anywhere in the world,\ + permits making phone calls through multiple Google and SIP (like Sipgate,\ + SipSorcery, and Betamax) accounts and sharing them among many SIP devices. \ + Note that Google accounts, SIP accounts, and local user accounts are configured in the \ + \"Google Accounts\", \"SIP Accounts\", and \"User Accounts\" sub-sections. \ + You must add at least one User Account to this PBX, and then configure a SIP device or softphone \ + to use the account, in order to make and receive calls with your Google/SIP accounts. \ + Configuring multiple users will allow you to make free calls between all users, and share the configured \ + Google and SIP accounts. If you have more than one Google and SIP accounts set up, \ + you should probably configure how calls to and from them are routed in the \"Call Routing\" page. \ + If you're interested in using your own PBX from anywhere in the world, \ then visit the \"Remote Usage\" section in the \"Advanced Settings\" page.")) ---------------------------------------------------------------------------------------------------- @@ -105,7 +105,7 @@ function sts.cfgvalue(self, section) usrs = luci.sys.exec("asterisk -rx 'sip show users'") chan = luci.sys.exec("asterisk -rx 'core show channels'") return format_two_indices(reg, 1, 5) .. format_two_indices(jab, 2, 4) .. "\n" - .. format_one_index(usrs,1) .. "\n" .. chan + .. format_one_index(usrs, 1) .. "\n" .. chan elseif server == "freeswitch" then return "Freeswitch is not supported yet.\n" else |