diff --git a/app/helper/Util.js b/app/helper/Util.js index 149707f24..d9fc9252c 100755 --- a/app/helper/Util.js +++ b/app/helper/Util.js @@ -372,7 +372,7 @@ Ext.define('Helper.Util', { return value; }, formatDirection: function(value) { - value = value == 1 ? t('Outbound') : t('Inbound'); + value = value == 1 ? t('Outbound') : value == 2 ? t('Inbound') : t('Outbound & CallerID'); return value; }, formatHangupCause: function(value) { diff --git a/build/MagnusBilling-current.tar.gz b/build/MagnusBilling-current.tar.gz index cf753d2ce..5d3dc2170 100644 Binary files a/build/MagnusBilling-current.tar.gz and b/build/MagnusBilling-current.tar.gz differ diff --git a/classic/src/view/restrictedPhonenumber/Form.js b/classic/src/view/restrictedPhonenumber/Form.js index 87de7f9d0..d0e469fdc 100755 --- a/classic/src/view/restrictedPhonenumber/Form.js +++ b/classic/src/view/restrictedPhonenumber/Form.js @@ -42,7 +42,7 @@ Ext.define('MBilling.view.restrictedPhonenumber.Form', { forceSelection: true, editable: false, value: '1', - store: window.bbx ? [ + store: window.dialC ? [ [1, t('Outbound')], [2, t('Inbound')], [3, t('Outbound & CallerID')] diff --git a/classic/src/view/restrictedPhonenumber/List.js b/classic/src/view/restrictedPhonenumber/List.js index 2f6e39bf9..2eb6f90a2 100755 --- a/classic/src/view/restrictedPhonenumber/List.js +++ b/classic/src/view/restrictedPhonenumber/List.js @@ -54,7 +54,8 @@ Ext.define('MBilling.view.restrictedPhonenumber.List', { type: 'list', options: [ [1, t('Outbound')], - [2, t('Inbound')] + [2, t('Inbound')], + [3, t('Outbound & CallerID')] ] }, flex: 1 diff --git a/protected/components/ApiAccess.php b/protected/components/ApiAccess.php index f76dfd3ba..1d085a49e 100755 --- a/protected/components/ApiAccess.php +++ b/protected/components/ApiAccess.php @@ -172,6 +172,8 @@ private function checkPermissions($modelApi) $action = 'd'; } else if ($_POST['action'] == 'buy') { $action = 'r'; + } else if ($_POST['action'] == 'liberar') { + $action = 'u'; } else if ($_POST['action'] == 'getNewUsername') { $action = 'r'; } else if ($_POST['action'] == 'getNewPassword') { diff --git a/script/install.sh b/script/install.sh index 5ce55135a..5eb0ec0a5 100755 --- a/script/install.sh +++ b/script/install.sh @@ -866,16 +866,17 @@ echo echo "Installing Fail2ban & Iptables" echo +ssh_port=$(cat /etc/ssh/sshd_config | grep Port | awk 'NR==1{print $2}') install_fail2ban - iptables -F iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT iptables -A OUTPUT -p icmp --icmp-type echo-reply -j ACCEPT iptables -A INPUT -i lo -j ACCEPT iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT iptables -A INPUT -p tcp --dport 22 -j ACCEPT +iptables -A INPUT -p tcp --dport $ssh_port -j ACCEPT iptables -P INPUT DROP iptables -P FORWARD DROP iptables -P OUTPUT ACCEPT