1) Massive whitespace reorganization (untabified, and made consistent everything).

2) Dropped some currently unneeded, commented-out, code from pbx-users.lua.

1 files changed, 27 insertions, 27 deletions

diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
index 128c7a3071..08256dbb72 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
@@ -31,24 +31,24 @@ defaultstatus        = "dnd"
 defaultstatusmessage = "PBX online, may lose messages"
 
 m = Map (modulename, translate("Google Accounts"),
-	 translate("This is where you set up your Google (Talk and Voice) Accounts, in order to start\
-		using them for dialing and receiving calls (voice chat and real phone calls). Click \"Add\"\
-		to add as many accounts as you wish."))
+         translate("This is where you set up your Google (Talk and Voice) Accounts, in order to start\
+                using them for dialing and receiving calls (voice chat and real phone calls). Click \"Add\"\
+                to add as many accounts as you wish."))
 
 -- Recreate the config, and restart services after changes are commited to the configuration.
 function m.on_after_commit(self)
    -- Create a field "name" for each account which identifies the account in the backend.
    commit = false
    m.uci:foreach(modulename, "gtalk_jabber", 
-		 function(s1)
-		    if s1.username ~= nil then
-		       name=string.gsub(s1.username, "%W", "_")
-		       if s1.name ~= name then
-			  m.uci:set(modulename, s1['.name'], "name", name)
-			  commit = true
-		       end
-		    end
-		 end)
+                 function(s1)
+                    if s1.username ~= nil then
+                       name=string.gsub(s1.username, "%W", "_")
+                       if s1.name ~= name then
+                          m.uci:set(modulename, s1['.name'], "name", name)
+                          commit = true
+                       end
+                    end
+                 end)
    if commit == true then  m.uci:commit(modulename) end
    
    luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
@@ -63,9 +63,9 @@ s.addremove = true
 s:option(Value, "username",     translate("Email"))
 
 pwd = s:option(Value, "secret", translate("Password"),
-	       translate("When your password is saved, it disappears from this field and is not displayed\
-			 for your protection. The previously saved password will be changed only when you\
-			 enter a value different from the saved one."))
+               translate("When your password is saved, it disappears from this field and is not displayed\
+                         for your protection. The previously saved password will be changed only when you\
+                         enter a value different from the saved one."))
 pwd.password = true
 pwd.rmempty = false
 
@@ -85,22 +85,22 @@ end
 
 
 p = s:option(ListValue, "register",
-	     translate("Enable Incoming Calls (See Status, Message below)"),
-	     translate("When somebody starts voice chat with your GTalk account or calls the GVoice,\
-		       number (if you have Google Voice), the call will be forwarded to any users\
-			that are online (registered using a SIP device or softphone) and permitted to\
-			receive the call. If you have Google Voice, you must go to your GVoice settings and\
-			forward calls to Google chat in order to actually receive calls made to your\
-			GVoice number. If you have trouble receiving calls from GVoice, experiment\
-			with the Call Screening option in your GVoice Settings. Finally, make sure no other\
-			client is online with this account (browser in gmail, mobile/desktop Google Talk\
-			App) as it may interfere."))
+             translate("Enable Incoming Calls (See Status, Message below)"),
+             translate("When somebody starts voice chat with your GTalk account or calls the GVoice,\
+                       number (if you have Google Voice), the call will be forwarded to any users\
+                        that are online (registered using a SIP device or softphone) and permitted to\
+                        receive the call. If you have Google Voice, you must go to your GVoice settings and\
+                        forward calls to Google chat in order to actually receive calls made to your\
+                        GVoice number. If you have trouble receiving calls from GVoice, experiment\
+                        with the Call Screening option in your GVoice Settings. Finally, make sure no other\
+                        client is online with this account (browser in gmail, mobile/desktop Google Talk\
+                        App) as it may interfere."))
 p:value("yes", translate("Yes"))
 p:value("no",  translate("No"))
 p.default = "yes"
 
 p = s:option(ListValue, "make_outgoing_calls", translate("Enable Outgoing Calls"),
-	     translate("Use this account to make outgoing calls as configured in the \"Call Routing\" section."))
+             translate("Use this account to make outgoing calls as configured in the \"Call Routing\" section."))
 p:value("yes", translate("Yes"))
 p:value("no",  translate("No"))
 p.default = "yes"
@@ -113,7 +113,7 @@ st:value("available",  translate("Available"))
 st.default = defaultstatus
 
 stm = s:option(Value, "statusmessage", translate("Account Status Message"),
-	     translate("Avoid using anything but alpha-numeric characters, space, comma, and period."))
+             translate("Avoid using anything but alpha-numeric characters, space, comma, and period."))
 stm:depends("register", "yes")
 stm.default = defaultstatusmessage