kevinowino869/mitrobill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Development' into newRadius

Browse Source
This commit is contained in:
Ibnu Maksum 2024-07-10 16:32:27 +07:00
commit 60bd876b7f
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/step2.php
View File

@ -51,7 +51,9 @@
if ($passed == '111') { if ($passed == '111') {
echo ("<br/> $ltext <br/> Great! System Test Completed. You can run PHPNuxBill on your server. Click Continue For Next Step. echo ("<br/> $ltext <br/> Great! System Test Completed. You can run PHPNuxBill on your server. Click Continue For Next Step.
<br><br> <br><br>
<a href=\"step3.php\" class=\"btn btn-primary\">Continue</a><br><br><a href=\"update.php\" class=\"btn btn-primary\">Update System</a>"); <a href=\"update.php\" class=\"btn btn-warning\">Update System From PHPMixBill</a>
<br><br><br><br>
<a href=\"step3.php\" class=\"btn btn-primary\">Continue to Install PHPNuxBill</a><br><br>");
} else { } else {
echo ("<br/> $ltext <br/> Sorry. The requirements of PHPNuxBill is not available on your server. echo ("<br/> $ltext <br/> Sorry. The requirements of PHPNuxBill is not available on your server.
Contact with us at Telegram <a href=\"https://t.me/phpnuxbill\">@phpnuxbill</a> with this code- $passed Or contact with your server administrator Contact with us at Telegram <a href=\"https://t.me/phpnuxbill\">@phpnuxbill</a> with this code- $passed Or contact with your server administrator

4
install/step3.php
View File

@ -59,8 +59,8 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="dbname"><input type="checkbox" class="form-control" id="radius" name="radius" value="yes"> Install Radius Table?</label> <label for="radius"><input type="checkbox" class="form-" id="radius" name="radius" value="yes"> Install <a href="https://github.com/hotspotbilling/phpnuxbill/wiki/FreeRadius" target="_blank">Radius</a> Table?</label>
<span class='help-block'>You Don't need this if you planning to use <a href="https://github.com/hotspotbilling/phpnuxbill/wiki/FreeRadius-Rest" target="_blank">FreeRadius REST</a></span>
</div> </div>
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>

3
system/controllers/radius.php
View File

@ -57,8 +57,7 @@ switch ($action) {
} }
if ($msg == '') { if ($msg == '') {
require_once $DEVICE_PATH . DIRECTORY_SEPARATOR . "Radius.php"; require_once $DEVICE_PATH . DIRECTORY_SEPARATOR . "Radius.php";
(new Radius())->nasAdd($shortname, $nasname, $ports, $secret, $routers, $description, $type, $server, $community); if ((new Radius())->nasAdd($shortname, $nasname, $ports, $secret, $routers, $description, $type, $server, $community) > 0) {
if ($id > 0) {
r2(U . 'radius/nas-list/', 's', "NAS Added"); r2(U . 'radius/nas-list/', 's', "NAS Added");
} else { } else {
r2(U . 'radius/nas-add/', 'e', "NAS Added Failed"); r2(U . 'radius/nas-add/', 'e', "NAS Added Failed");

2
ui/ui/app-settings.tpl
View File

@ -200,7 +200,7 @@
<label class="col-md-2 control-label">Redirect after Activation</label> <label class="col-md-2 control-label">Redirect after Activation</label>
<div class="col-md-6"> <div class="col-md-6">
<input type="text" class="form-control" id="voucher_redirect" name="voucher_redirect" <input type="text" class="form-control" id="voucher_redirect" name="voucher_redirect"
placeholder="https://192.168.88.1/status" value="{$voucher_redirect}"> placeholder="https://192.168.88.1/status" value="{$_c['voucher_redirect']}">
</div> </div>
<p class="help-block col-md-4"> <p class="help-block col-md-4">
{Lang::T('After Customer activate voucher or login, customer will be redirected to this {Lang::T('After Customer activate voucher or login, customer will be redirected to this