KAZOO-786

lib/whistle-1.0.0/src/wh_util.erl

@@ -690,9 +690,9 @@ a1hash(User, Realm, Password) ->
 -spec floor(integer() | float()) -> integer().
 floor(X) when X < 0 ->
     T = trunc(X),
-    case X - T =:= 0 of
-        'true' -> T;
-        'false' -> T - 1
+    case X - T == 0 of
+        true -> T;
+        false -> T - 1
     end;
 floor(X) -> trunc(X).
 
@@ -701,9 +701,9 @@ floor(X) -> trunc(X).
 ceiling(X) when X < 0 -> trunc(X);
 ceiling(X) ->
     T = trunc(X),
-    case X - T =:= 0 of
-        'true' -> T;
-        'false' -> T + 1
+    case X - T == 0 of
+        true -> T;
+        false -> T + 1
     end.
 
 %% returns current seconds

whistle_apps/apps/crossbar/priv/couchdb/account/cdrs.json

@@ -3,7 +3,7 @@
    "language": "javascript",
    "views": {
        "crossbar_listing": {
-           "map": "function (doc) {if (doc.pvt_deleted || doc.pvt_type != 'cdr') return;if (doc.pvt_type == 'cdr' && doc.custom_channel_vars && (doc.custom_channel_vars.account_billing == 'per_minute' || doc.custom_channel_vars.account_billing == 'per_minute_limit') && doc.custom_channel_vars.account_id == doc.pvt_account_id && doc.pvt_vsn && parseInt(doc.pvt_vsn) == 2) {var Secs = (parseInt(doc.billing_seconds) || 0) - (parseInt(doc.custom_channel_vars.billing_seconds_offset) || 0);var Cost = 0;if (Secs >= 1) {var R = parseInt(doc.custom_channel_vars.rate) || 0;var RInc = parseInt(doc.custom_channel_vars.increment) || 60;var RMin = parseInt(doc.custom_channel_vars.rate_minimum) || 0;var Sur = parseInt(doc.custom_channel_vars.surcharge) || 0;if (RInc < 1) {RInc = 60;}if (Secs <= RMin) {Cost = Sur + ((RMin / 60) * R);} else {Cost = Sur + ((RMin / 60) * R) + (Math.ceil((Secs - RMin) / RInc) * ((RInc / 60) * R));}}}if (Cost) {var Discount = (parseInt(doc.custom_channel_vars.discount_percentage) || 0) * 0.01 * Cost;emit(doc.pvt_created, {id: doc._id,caller_id_name: doc.caller_id_name,caller_id_number: doc.caller_id_number,callee_id_name: doc.callee_id_name,callee_id_number: doc.callee_id_number,duration_seconds: doc.duration_seconds,billing_seconds: doc.billing_seconds,timestamp: doc.timestamp,hangup_cause: doc.hangup_cause,other_leg_call_id: doc.other_leg_call_id,owner_id: doc.custom_channel_vars.owner_id,to: doc.to_uri,from: doc.from_uri,inception: doc.custom_channel_vars.inception,cost: Cost - Discount});} else {emit(doc.pvt_created, {id: doc._id,caller_id_name: doc.caller_id_name,caller_id_number: doc.caller_id_number,callee_id_name: doc.callee_id_name,callee_id_number: doc.callee_id_number,duration_seconds: doc.duration_seconds,billing_seconds: doc.billing_seconds,timestamp: doc.timestamp,hangup_cause: doc.hangup_cause,other_leg_call_id: doc.other_leg_call_id,owner_id: doc.custom_channel_vars.owner_id,to: doc.to_uri,from: doc.from_uri,inception: doc.custom_channel_vars.inception});}}"
+           "map": "function (doc) {if (doc.pvt_deleted || doc.pvt_type != 'cdr') return;if (doc.pvt_type == 'cdr' && doc.custom_channel_vars && (doc.custom_channel_vars.account_billing == 'per_minute' || doc.custom_channel_vars.account_billing == 'per_minute_limit') && doc.custom_channel_vars.account_id == doc.pvt_account_id && doc.pvt_vsn && parseInt(doc.pvt_vsn) == 2) {var Secs = (parseInt(doc.billing_seconds) || 0) - (parseInt(doc.custom_channel_vars.billing_seconds_offset) || 0);var Cost = 0;if (Secs >= 1) {var R = parseInt(doc.custom_channel_vars.rate) || 0;var RInc = parseInt(doc.custom_channel_vars.rate_increment) || 60;var RMin = parseInt(doc.custom_channel_vars.rate_minimum) || 0;var Sur = parseInt(doc.custom_channel_vars.surcharge) || 0;if (RInc < 1) {RInc = 60;}if (Secs <= RMin) {Cost = Sur + ((RMin / 60) * R);} else {Cost = Sur + ((RMin / 60) * R) + (Math.ceil((Secs - RMin) / RInc) * ((RInc / 60) * R));}}}if (Cost) {var Discount = (parseInt(doc.custom_channel_vars.discount_percentage) || 0) * 0.01 * Cost;emit(doc.pvt_created, {id: doc._id,caller_id_name: doc.caller_id_name,caller_id_number: doc.caller_id_number,callee_id_name: doc.callee_id_name,callee_id_number: doc.callee_id_number,duration_seconds: doc.duration_seconds,billing_seconds: doc.billing_seconds,timestamp: doc.timestamp,hangup_cause: doc.hangup_cause,other_leg_call_id: doc.other_leg_call_id,owner_id: doc.custom_channel_vars.owner_id,to: doc.to_uri,from: doc.from_uri,inception: doc.custom_channel_vars.inception,cost: Cost - Discount});} else {emit(doc.pvt_created, {id: doc._id,caller_id_name: doc.caller_id_name,caller_id_number: doc.caller_id_number,callee_id_name: doc.callee_id_name,callee_id_number: doc.callee_id_number,duration_seconds: doc.duration_seconds,billing_seconds: doc.billing_seconds,timestamp: doc.timestamp,hangup_cause: doc.hangup_cause,other_leg_call_id: doc.other_leg_call_id,owner_id: doc.custom_channel_vars.owner_id,to: doc.to_uri,from: doc.from_uri,inception: doc.custom_channel_vars.inception});}}"
        },
        "listing_by_owner" : {
            "map": "function(doc) { if(doc.pvt_deleted || !doc.custom_channel_vars.owner_id || doc.pvt_type != 'cdr') return; emit([doc.custom_channel_vars.owner_id, doc.pvt_created], {'id':doc._id, 'caller_id_name': doc.caller_id_name, 'caller_id_number': doc.caller_id_number, 'callee_id_name': doc.callee_id_name, 'callee_id_number': doc.callee_id_number, 'duration_seconds': doc.duration_seconds, 'timestamp': doc.timestamp, 'hangup_cause':doc.hangup_cause, 'other_leg_call_id':doc.other_leg_call_id, 'call_direction':doc.call_direction, 'to': doc.to_uri, 'from': doc.from_uri, 'inception':doc.custom_channel_vars.inception})}" 

whistle_apps/apps/crossbar/priv/couchdb/account/transactions.json

@@ -18,7 +18,7 @@
             "map": "function(doc) { if ( (doc.pvt_type != 'credit' && doc.pvt_type != 'debit') || doc.pvt_deleted) return; emit(doc.pvt_created, doc._id); }"
         },
        "reconcile_by_callid": {
-           "map": "function (doc) {if (doc.pvt_deleted || (doc.pvt_type != 'cdr' && doc.pvt_type != 'credit' && doc.pvt_type != 'debit') || !doc.pvt_vsn || parseInt(doc.pvt_vsn) != 2) return;if (doc.pvt_type == 'cdr' && doc.custom_channel_vars && (doc.custom_channel_vars.account_billing == 'per_minute' || doc.custom_channel_vars.account_billing == 'per_minute_limit') && doc.custom_channel_vars.account_id == doc.pvt_account_id) {var Secs = (parseInt(doc.billing_seconds) || 0) - (parseInt(doc.custom_channel_vars.billing_seconds_offset) || 0);var Cost = 0;if (Secs >= 1) {var R = parseInt(doc.custom_channel_vars.rate) || 0;var RInc = parseInt(doc.custom_channel_vars.increment) || 60;var RMin = parseInt(doc.custom_channel_vars.rate_minimum) || 0;var Sur = parseInt(doc.custom_channel_vars.surcharge) || 0;if (RInc < 1) {RInc = 60;}if (Secs <= RMin) {Cost = Sur + ((RMin / 60) * R);} else {Cost = Sur + ((RMin / 60) * R) + (Math.ceil((Secs - RMin) / RInc) * ((RInc / 60) * R));}}if (Cost) {var Discount = (parseInt(doc.custom_channel_vars.discount_percentage) || 0) * 0.01 * Cost;emit(doc._id, Cost - Discount);}} else if (doc.pvt_code && parseInt(doc.pvt_code) == 1001 && doc.call_id) {var modifier = (doc.pvt_type == 'credit' ? 1 : -1);var amount = doc.pvt_amount;emit(doc.call_id, amount * modifier);}}",
+           "map": "function (doc) {if (doc.pvt_deleted || (doc.pvt_type != 'cdr' && doc.pvt_type != 'credit' && doc.pvt_type != 'debit') || !doc.pvt_vsn || parseInt(doc.pvt_vsn) != 2) return;if (doc.pvt_type == 'cdr' && doc.custom_channel_vars && (doc.custom_channel_vars.account_billing == 'per_minute' || doc.custom_channel_vars.account_billing == 'per_minute_limit') && doc.custom_channel_vars.account_id == doc.pvt_account_id) {var Secs = (parseInt(doc.billing_seconds) || 0) - (parseInt(doc.custom_channel_vars.billing_seconds_offset) || 0);var Cost = 0;if (Secs >= 1) {var R = parseInt(doc.custom_channel_vars.rate) || 0;var RInc = parseInt(doc.custom_channel_vars.rate_increment) || 60;var RMin = parseInt(doc.custom_channel_vars.rate_minimum) || 0;var Sur = parseInt(doc.custom_channel_vars.surcharge) || 0;if (RInc < 1) {RInc = 60;}if (Secs <= RMin) {Cost = Sur + ((RMin / 60) * R);} else {Cost = Sur + ((RMin / 60) * R) + (Math.ceil((Secs - RMin) / RInc) * ((RInc / 60) * R));}}if (Cost) {var Discount = (parseInt(doc.custom_channel_vars.discount_percentage) || 0) * 0.01 * Cost;emit(doc._id, Cost - Discount);}} else if (doc.pvt_code && parseInt(doc.pvt_code) == 1001 && doc.call_id) {var modifier = (doc.pvt_type == 'credit' ? 1 : -1);var amount = doc.pvt_amount;emit(doc.call_id, amount * modifier);}}",
            "reduce": "_sum"
        }
     }

whistle_apps/apps/crossbar/src/crossbar.hrl

@@ -7,7 +7,7 @@
 -include_lib("whistle/include/wh_log.hrl").
 -include_lib("whistle/include/wh_databases.hrl").
 
--include("src/crossbar_types.hrl").
+-include("crossbar_types.hrl").
 
 -define(CONFIG_CAT, <<"crossbar">>).
 

whistle_apps/apps/crossbar/src/modules/cb_about.erl

@@ -16,7 +16,7 @@
          ,validate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 %%%===================================================================
 %%% API

whistle_apps/apps/crossbar/src/modules/cb_accounts.erl

@@ -23,7 +23,7 @@
 
 -export([is_unique_realm/2]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(SERVER, ?MODULE).
 

whistle_apps/apps/crossbar/src/modules/cb_acls.erl

@@ -17,7 +17,7 @@
          ,validate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 -define(ECALLMGR, <<"ecallmgr">>).
 -define(ECALLMGR_ACLS, <<"acls">>).
 

whistle_apps/apps/crossbar/src/modules/cb_agents.erl

@@ -27,7 +27,7 @@
          ,validate/1, validate/2, validate/3
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".queues">>).
 

whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl

@@ -25,7 +25,7 @@
          ,put/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(AGG_VIEW_FILE, <<"views/accounts.json">>).
 -define(AGG_VIEW_API, <<"accounts/listing_by_api">>).

whistle_apps/apps/crossbar/src/modules/cb_braintree.erl

@@ -20,7 +20,7 @@
          ,delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 -include_lib("braintree/include/braintree.hrl").
 
 -define(CUSTOMER_PATH_TOKEN, <<"customer">>).

whistle_apps/apps/crossbar/src/modules/cb_bulk.erl

@@ -19,7 +19,7 @@
          ,delete/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 %%%===================================================================
 %%% API

whistle_apps/apps/crossbar/src/modules/cb_callflows.erl

@@ -19,7 +19,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".callflows">>).
 

whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl

@@ -20,7 +20,7 @@
          ,validate/1, validate/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".cdrs">>).
 

whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl

@@ -26,7 +26,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(CONNECT_CALL, <<"connect">>).
 -define(HISTORY, <<"history">>).

whistle_apps/apps/crossbar/src/modules/cb_conferences.erl

@@ -21,7 +21,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(CB_LIST, <<"conferences/crossbar_listing">>).
 

whistle_apps/apps/crossbar/src/modules/cb_configs.erl

@@ -21,7 +21,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 %%%===================================================================
 %%% API

whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl

@@ -20,7 +20,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(CB_LIST, <<"trunkstore/crossbar_listing">>).
 

whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl

@@ -17,7 +17,7 @@
          ,validate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 %%%===================================================================
 %%% API

whistle_apps/apps/crossbar/src/modules/cb_devices.erl

@@ -27,7 +27,7 @@
          ,get_all_acl_ips/0
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(QUICKCALL_URL, [{<<"devices">>, [_, <<"quickcall">>, _]}
                         ,{?WH_ACCOUNTS_DB, [_]}

whistle_apps/apps/crossbar/src/modules/cb_directories.erl

@@ -19,7 +19,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(PVT_FUNS, [fun add_pvt_type/2]).
 -define(CB_LIST, <<"directories/crossbar_listing">>).

whistle_apps/apps/crossbar/src/modules/cb_events.erl

@@ -46,7 +46,7 @@
          ,delete/1, delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(DEFAULT_USER, <<"events_user">>).
 -define(EVENT_DOC_ID(User), <<"event_sub_", User/binary>>).

whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl

@@ -35,7 +35,7 @@
 %% gen_listener handler callback
 -export([handle_req/2]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(RESPONDERS, [{?MODULE, [{<<"*">>, <<"*">>}]}]). % all matching event cat/name combos go to here
 -define(BINDINGS, []).

whistle_apps/apps/crossbar/src/modules/cb_faxes.erl

@@ -21,7 +21,7 @@
          ,delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(OUTGOING, <<"outgoing">>).
 -define(INCOMING, <<"incoming">>).

whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl

@@ -33,7 +33,7 @@
          ,delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".provisioner_templates">>).
 -define(CB_LIST, <<"provisioner_templates/crossbar_listing">>).

whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl

@@ -21,7 +21,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(CB_LIST, <<"global_resources/crossbar_listing">>).
 -define(GLOBAL_RESOURCE_DB, <<"offnet">>).

whistle_apps/apps/crossbar/src/modules/cb_groups.erl

@@ -20,7 +20,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(CB_LIST, <<"groups/crossbar_listing">>).
 

whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl

@@ -18,7 +18,7 @@
          ,validate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(VIEW_FILE, <<"views/hotdesks.json">>).
 -define(CB_LIST, <<"hotdesks/crossbar_listing">>).

whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl

@@ -20,7 +20,7 @@
          ,put/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(AGG_VIEW_FILE, <<"views/accounts.json">>).
 -define(AGG_VIEW_IP, <<"accounts/listing_by_ip">>).

whistle_apps/apps/crossbar/src/modules/cb_killio.erl

@@ -19,7 +19,7 @@
          ,post/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(PVT_TYPE, <<"skel">>).
 -define(PVT_FUNS, [fun add_pvt_type/2]).

whistle_apps/apps/crossbar/src/modules/cb_limits.erl

@@ -17,7 +17,7 @@
          ,reconcile_services/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 -include_lib("whistle/src/wh_json.hrl").
 
 -define(CB_LIST, <<"limits/crossbar_listing">>).

whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl

@@ -33,7 +33,7 @@
          ,delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".provisioner_templates">>).
 -define(CB_LIST, <<"provisioner_templates/crossbar_listing">>).

whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl

@@ -20,7 +20,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(CB_LIST, <<"local_resources/crossbar_listing">>).
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".local_resources">>).

whistle_apps/apps/crossbar/src/modules/cb_media.erl

@@ -23,7 +23,7 @@
          ,delete/2, delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(SERVER, ?MODULE).
 -define(BIN_DATA, <<"raw">>).

whistle_apps/apps/crossbar/src/modules/cb_menus.erl

@@ -21,7 +21,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(CB_LIST, <<"menus/crossbar_listing">>).
 

whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl

@@ -15,7 +15,7 @@
          ,is_superduper_admin/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -spec pass_hashes(ne_binary(), ne_binary()) -> {ne_binary(), ne_binary()}.
 pass_hashes(Username, Password) ->

whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl

@@ -16,7 +16,7 @@
          ,authenticate/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 %%%===================================================================
 %%% API

whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl

@@ -16,7 +16,7 @@
          ,authorize/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 %%%===================================================================
 %%% API

whistle_apps/apps/crossbar/src/modules/cb_onboard.erl

@@ -20,7 +20,7 @@
          ,put/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(OB_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".onboard">>).
 -define(DEFAULT_FLOW, "{\"data\": { \"id\": \"~s\" }, \"module\": \"user\", \"children\": { \"_\": { \"data\": { \"id\": \"~s\" }, \"module\": \"voicemail\", \"children\": {}}}}").

whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl

@@ -24,7 +24,7 @@
          ,populate_phone_numbers/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -include_lib("whistle_number_manager/include/wh_number_manager.hrl").
 

whistle_apps/apps/crossbar/src/modules/cb_queues.erl

@@ -46,7 +46,7 @@
          ,delete/2, delete/3
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".queues">>).
 

whistle_apps/apps/crossbar/src/modules/cb_rates.erl

@@ -18,7 +18,7 @@
          ,delete/2
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(PVT_FUNS, [fun add_pvt_type/2]).
 -define(PVT_TYPE, <<"rate">>).

whistle_apps/apps/crossbar/src/modules/cb_registrations.erl

@@ -15,7 +15,7 @@
          ,lookup_regs/1
         ]).
 
--include("src/crossbar.hrl").
+-include("crossbar.hrl").
 
 -define(MASK_REG_FIELDS, [<<"Account-DB">>, <<"Account-ID">>, <<"App-Name">>
                               ,<<"App-Version">>, <<"Event-Category">>, <<"Event-Name">>