fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 04:24:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Sort mail/SMS drivers more naturally, and translate 'Dummy'

Browse source
This commit is contained in:
Kijin Sung 2021-01-06 23:01:29 +09:00
parent bace9d919e
commit b3b89dc0a1
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/drivers/mail/mailfunction.php
View file

@ -22,7 +22,7 @@ class MailFunction extends Base implements \Rhymix\Framework\Drivers\MailInterfa
*/ */
public static function getName() public static function getName()
{ {
return 'PHP mail()'; return 'mail() Function';
} }
/** /**

10
modules/admin/admin.admin.view.php
View file

@ -444,11 +444,21 @@ class adminAdminView extends admin
// Load mail drivers. // Load mail drivers.
$mail_drivers = Rhymix\Framework\Mail::getSupportedDrivers(); $mail_drivers = Rhymix\Framework\Mail::getSupportedDrivers();
uasort($mail_drivers, function($a, $b) {
if ($a['name'] === 'Dummy') return -1;
if ($b['name'] === 'Dummy') return 1;
return strnatcasecmp($a['name'], $b['name']);
});
Context::set('mail_drivers', $mail_drivers); Context::set('mail_drivers', $mail_drivers);
Context::set('mail_driver', config('mail.type') ?: 'mailfunction'); Context::set('mail_driver', config('mail.type') ?: 'mailfunction');
// Load SMS drivers. // Load SMS drivers.
$sms_drivers = Rhymix\Framework\SMS::getSupportedDrivers(); $sms_drivers = Rhymix\Framework\SMS::getSupportedDrivers();
uasort($sms_drivers, function($a, $b) {
if ($a['name'] === 'Dummy') return -1;
if ($b['name'] === 'Dummy') return 1;
return strnatcasecmp($a['name'], $b['name']);
});
Context::set('sms_drivers', $sms_drivers); Context::set('sms_drivers', $sms_drivers);
Context::set('sms_driver', config('sms.type') ?: 'dummy'); Context::set('sms_driver', config('sms.type') ?: 'dummy');

4
modules/admin/tpl/config_notification.html
View file

@ -58,7 +58,7 @@
<div class="x_controls"> <div class="x_controls">
<select name="mail_driver" id="mail_driver"> <select name="mail_driver" id="mail_driver">
<!--@foreach($mail_drivers as $driver_name => $driver_definition)--> <!--@foreach($mail_drivers as $driver_name => $driver_definition)-->
<option value="{$driver_name}" selected="selected"|cond="$mail_driver === $driver_name">{$driver_definition['name']}</option> <option value="{$driver_name}" selected="selected"|cond="$mail_driver === $driver_name">{$driver_name === 'dummy' ? $lang->notuse : $driver_definition['name']}</option>
<!--@end--> <!--@end-->
</select> </select>
<p class="x_help-block hidden-by-default show-for-dummy" style="margin-top:10px"> <p class="x_help-block hidden-by-default show-for-dummy" style="margin-top:10px">
@ -228,7 +228,7 @@
<div class="x_controls"> <div class="x_controls">
<select name="sms_driver" id="sms_driver"> <select name="sms_driver" id="sms_driver">
<!--@foreach($sms_drivers as $driver_name => $driver_definition)--> <!--@foreach($sms_drivers as $driver_name => $driver_definition)-->
<option value="{$driver_name}" selected="selected"|cond="$sms_driver === $driver_name">{$driver_definition['name']}</option> <option value="{$driver_name}" selected="selected"|cond="$sms_driver === $driver_name">{$driver_name === 'dummy' ? $lang->notuse : $driver_definition['name']}</option>
<!--@end--> <!--@end-->
</select> </select>
<p class="x_help-block hidden-by-default show-for-dummy" style="margin-top:10px"> <p class="x_help-block hidden-by-default show-for-dummy" style="margin-top:10px">