diff --git a/radius.php b/radius.php index 183f2e0c..5b646d9b 100644 --- a/radius.php +++ b/radius.php @@ -323,7 +323,7 @@ try { $d->macaddr = _post('macAddr'); $d->dateAdded = date('Y-m-d H:i:s'); $d->save(); - if ($d->acctstatustype == 'Start') { + if (_post('acctStatusType') == 'Start') { $tur = ORM::for_table('tbl_user_recharges')->whereRaw("BINARY `username` = '$username'")->where('status', 'on')->where('routers', 'radius')->find_one(); $plan = ORM::for_table('tbl_plans')->where('id', $tur['plan_id'])->find_one(); if ($plan['limit_type'] == "Data_Limit" || $plan['limit_type'] == "Both_Limit") { diff --git a/system/autoload/Validator.php b/system/autoload/Validator.php index c435fe95..a5e02091 100644 --- a/system/autoload/Validator.php +++ b/system/autoload/Validator.php @@ -325,6 +325,6 @@ class Validator public static function containsKeyword($string, $keywords = ['mikrotik', 'hotspot', 'pppoe', 'radius', 'dummy']) { $regex = '/' . implode('|', $keywords) . '/i'; - return preg_match($regex, $string); + return preg_match($regex, strtolower($string)); } } diff --git a/system/lan/english.json b/system/lan/english.json index 9337da6a..0ceb54a5 100644 --- a/system/lan/english.json +++ b/system/lan/english.json @@ -702,5 +702,26 @@ "New_Voucher_Created": "New Voucher Created", "New_Voucher_for_10mbps_Created": "New Voucher for 10mbps Created", "Show_Chart": "Show Chart", - "": "" + "For_PDF_Reports___Best_size_1078_x_200___uploaded_image_will_be_autosize": "For PDF Reports | Best size 1078 x 200 | uploaded image will be autosize", + "For_invoice_print_using_Thermal_Printer": "For invoice print using Thermal Printer", + "Theme": "Theme", + "Theme_Info": "Theme Info", + "This_used_for_admin_to_select_payment_in_recharge__using_comma_for_every_new_options": "This used for admin to select payment in recharge, using comma for every new options", + "Income_will_reset_every_this_day": "Income will reset every this day", + "edit_at_config_php": "edit at config.php", + "Hide_Dashboard_Content": "Hide Dashboard Content", + "Radius_Instructions": "Radius Instructions", + "Customer_can_request_to_extend_expirations": "Customer can request to extend expirations", + "i_agree_to_extends_and_will_paid_full_after_this": "i agree to extends and will paid full after this", + "Telegram_Bot_Token": "Telegram Bot Token", + "You_will_get_Payment_and_Error_notification_": "You will get Payment and Error notification<", + "Must_include": "Must include", + "it_will_be_replaced_": "it will be replaced.", + "Or_use_Mikrotik_SMS": "Or use Mikrotik SMS", + "You_can_use": "You can use", + "in_here_too_": "in here too.", + "Empty_this_to_use_internal_mail___PHP": "Empty this to use internal mail() PHP", + "Mail_Reply_To": "Mail Reply To", + "Customer_will_reply_email_to_this_address__empty_if_you_want_to_use_From_Address": "Customer will reply email to this address, empty if you want to use From Address", + "You_will_get_Payment_and_Error_notification": "You will get Payment and Error notification" } \ No newline at end of file diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index 9c32c576..5c597a0e 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -83,7 +83,8 @@
+ href="https://github.com/hotspotbilling/phpnuxbill/wiki/Themes" + target="_blank">{Lang::T('Theme Info')}{Lang::T('This used for admin to select payment in recharge, using comma - for every new options')}
++ {Lang::T('This used for admin to select payment in recharge, using comma for every new options')} +
- {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be - password')} + {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be password')}
- {Lang::T('After Customer activate voucher or login, customer will be redirected to this - url')} + {Lang::T('After Customer activate voucher or login, customer will be redirected to this url')}
{/if} @@ -326,8 +326,9 @@ value="{$_c['telegram_target_id']}" placeholder="12345678"> - {Lang::T('You will get Payment and Error - notification<')}/small> + + {Lang::T('You will get Payment and Error notification')} +{Lang::T('Must include')} [text] & [number], {Lang::T('it will be replaced.')} +
{Lang::T('Must include')} [text] & [number], + {Lang::T('it will be replaced.')}
{Lang::T('Must include')} [text] & [number], {Lang::T('it will be replaced.')} +
{Lang::T('Must include')} [text] & [number], + {Lang::T('it will be replaced.')}
- {Lang::T('You can use')} WhatsApp {Lang::T('in here too.')} Free Server + {Lang::T('You can use')} WhatsApp + {Lang::T('in here too.')} Free + Server{Lang::T('Must include')} [text] & [number], {Lang::T('it will be replaced.')} +
{Lang::T('Must include')} [text] & [number], + {Lang::T('it will be replaced.')}
{Lang::T('Customer will reply email to this address, empty if you want to - use From Address')}
++ {Lang::T('Customer will reply email to this address, empty if you want to use From Address')} +
{Lang::T('Logout Admin if not Available/Online a period of time')}
++ {Lang::T('Logout Admin if not Available/Online a period of time')}
{Lang::T('OTP is required when user want to change phone - number')}
++ {Lang::T('OTP is required when user want to change phone number')} +