goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Cleaned up code formatting

浏览代码
这个提交包含在：
Peter Goodhall 2025-05-23 11:55:35 +01:00
父节点 a5cf402827
当前提交 d853963384
共有 9 个文件被更改，包括 239 次插入 和 212 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

24
application/views/timeplotter/index.php
查看文件

@ -8,8 +8,8 @@
<div class="col-md-3"> <div class="col-md-3">
<select id="band" name="band" class="form-select"> <select id="band" name="band" class="form-select">
<option value="All">All</option> <option value="All">All</option>
<?php foreach($worked_bands as $band) { <?php foreach ($worked_bands as $band) {
echo '<option value="' . $band . '">' . $band . '</option>'."\n"; echo '<option value="' . $band . '">' . $band . '</option>' . "\n";
} ?> } ?>
</select> </select>
</div> </div>
@ -17,16 +17,16 @@
<label class="col-md-1 control-label" for="dxcc">DXCC</label> <label class="col-md-1 control-label" for="dxcc">DXCC</label>
<div class="col-md-3"> <div class="col-md-3">
<select id="dxcc" name="dxcc" class="form-select"> <select id="dxcc" name="dxcc" class="form-select">
<option value = 'All'>All</option> <option value='All'>All</option>
<?php <?php
if ($dxcc_list->num_rows() > 0) { if ($dxcc_list->num_rows() > 0) {
foreach ($dxcc_list->result() as $dxcc) { foreach ($dxcc_list->result() as $dxcc) {
echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
if ($dxcc->end != null) { if ($dxcc->end != null) {
echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; echo ' (' . lang('gen_hamradio_deleted_dxcc') . ')';
}
echo '</option>';
} }
echo '</option>';
}
} }
?> ?>
</select> </select>
@ -37,10 +37,10 @@
<label class="col-md-1 control-label" for="cqzone">CQ Zone</label> <label class="col-md-1 control-label" for="cqzone">CQ Zone</label>
<div class="col-md-3"> <div class="col-md-3">
<select id="cqzone" name="cqzone" class="form-select"> <select id="cqzone" name="cqzone" class="form-select">
<option value = 'All'>All</option> <option value='All'>All</option>
<?php <?php
for ($i = 1; $i<=40; $i++) { for ($i = 1; $i <= 40; $i++) {
echo '<option value='. $i . '>'. $i .'</option>'; echo '<option value=' . $i . '>' . $i . '</option>';
} }
?> ?>
</select> </select>

24
application/views/update/index.php
查看文件

@ -3,7 +3,7 @@
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right" id="myTab" role="tablist"> <ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right" id="myTab" role="tablist">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" id="dxcc-tab" data-bs-toggle="tab" href="#dxcc" role="tab" aria-controls="update" aria-selected="true">DXCC Lookup Data</a> <a class="nav-link active" id="dxcc-tab" data-bs-toggle="tab" href="#dxcc" role="tab" aria-controls="update" aria-selected="true">DXCC Lookup Data</a>
</li> </li>
@ -19,9 +19,9 @@
<p class="card-text">Here you can update the DXCC lookup data that is used for displaying callsign information.</p> <p class="card-text">Here you can update the DXCC lookup data that is used for displaying callsign information.</p>
<p class="card-text">This data is provided by <a href="https://clublog.org/">Clublog</a>.</p> <p class="card-text">This data is provided by <a href="https://clublog.org/">Clublog</a>.</p>
<?php if(!extension_loaded('xml')) { ?> <?php if (!extension_loaded('xml')) { ?>
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
You must install php-xml for this to work. You must install php-xml for this to work.
</div> </div>
<?php } else { ?> <?php } else { ?>
<h5>Check for DXCC Data Updates</h5> <h5>Check for DXCC Data Updates</h5>
@ -29,37 +29,35 @@
<div id="dxcc_update_status">Status:</br></div> <div id="dxcc_update_status">Status:</br></div>
<br/> <br />
<br/> <br />
<h5>Apply DXCC Data to Logbook</h5> <h5>Apply DXCC Data to Logbook</h5>
<p class="card-text"> <p class="card-text">
After updating, Cloudlog can fill in missing callsign information in the logbook using the newly-obtained DXCC data. After updating, Cloudlog can fill in missing callsign information in the logbook using the newly-obtained DXCC data.
You can choose to check just the QSOs in the logbook that are missing DXCC metadata or to re-check the entire logbook You can choose to check just the QSOs in the logbook that are missing DXCC metadata or to re-check the entire logbook
and update existing metadata as well, in case it has changed. and update existing metadata as well, in case it has changed.
</p> </p>
<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc');?>">Check QSOs missing DXCC data</a></p> <p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc'); ?>">Check QSOs missing DXCC data</a></p>
<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc/all');?>">Re-check all QSOs in logbook</a></p> <p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc/all'); ?>">Re-check all QSOs in logbook</a></p>
<h5>Apply Continent Data to Logbook</h5> <h5>Apply Continent Data to Logbook</h5>
<p class="card-text"> <p class="card-text">
This function can be used to update QSO continent information for all QSOs in Cloudlog missing that information. This function can be used to update QSO continent information for all QSOs in Cloudlog missing that information.
</p> </p>
<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_continent');?>">Check QSOs missing continent data</a></p> <p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_continent'); ?>">Check QSOs missing continent data</a></p>
<style> <style>
#dxcc_update_status{ #dxcc_update_status {
display: None; display: None;
} }
</style> </style>
<?php } ?> <?php } ?>
</div> </div>
<div class="tab-pane fade" id="distance" role="tabpanel" aria-labelledby="distance-tab"> <div class="tab-pane fade" id="distance" role="tabpanel" aria-labelledby="distance-tab">
<p class="card-text">Here you can update QSOs with missing distance information.</p> <p class="card-text">Here you can update QSOs with missing distance information.</p>
<p><a class="btn btn-primary" hx-get="<?php echo site_url('update/update_distances');?>" hx-target="#distance_results" href="<?php echo site_url('update/update_distances');?>">Update distance data</a></p> <p><a class="btn btn-primary" hx-get="<?php echo site_url('update/update_distances'); ?>" hx-target="#distance_results" href="<?php echo site_url('update/update_distances'); ?>">Update distance data</a></p>
<div id="distance_results"></div> <div id="distance_results"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

22
application/views/user/delete.php
查看文件

@ -1,18 +1,18 @@
<div class="container"> <div class="container">
<br> <br>
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<?php echo lang('account_delete_user_account'); ?> <?php echo $user_name; ?> <?php echo lang('account_delete_user_account'); ?> <?php echo $user_name; ?>
</div> </div>
<div class="card-body"> <div class="card-body">
<h5 class="card-title"></h5> <h5 class="card-title"></h5>
<p class="card-text"><?php echo lang('account_are_you_sure_you_want_to_delete_the_user_account'); ?> <b><?php echo $user_name; ?></b>?</p> <p class="card-text"><?php echo lang('account_are_you_sure_you_want_to_delete_the_user_account'); ?> <b><?php echo $user_name; ?></b>?</p>
<form method="post" action="<?php echo site_url('user/delete')."/".$this->uri->segment(3); ?>" name="users"> <form method="post" action="<?php echo site_url('user/delete') . "/" . $this->uri->segment(3); ?>" name="users">
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" /> <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
<input class="btn btn-danger" type="submit" value="<?php echo lang('account_yes_delete_this_user'); ?>" /> <a href="<?php echo site_url('user'); ?>" class="btn btn-success"><?php echo lang('account_no_do_not_delete_this_user'); ?></a> <input class="btn btn-danger" type="submit" value="<?php echo lang('account_yes_delete_this_user'); ?>" /> <a href="<?php echo site_url('user'); ?>" class="btn btn-success"><?php echo lang('account_no_do_not_delete_this_user'); ?></a>
</form> </form>
</div> </div>
</div> </div>
</div> </div>

58
application/views/user/edit.php
查看文件

@ -55,8 +55,8 @@
<div class="input-group"> <div class="input-group">
<span class="input-group-text"><i class="fa fa-user"></i></span> <span class="input-group-text"><i class="fa fa-user"></i></span>
<input class="form-control" type="text" name="user_name" value="<?php if (isset($user_name)) { <input class="form-control" type="text" name="user_name" value="<?php if (isset($user_name)) {
echo $user_name; echo $user_name;
} ?>" /> } ?>" />
</div> </div>
<?php if (isset($username_error)) { <?php if (isset($username_error)) {
echo "<small class=\"text-danger\"><i class=\"fa fa-exclamation-circle\"></i> " . $username_error . "</small>"; echo "<small class=\"text-danger\"><i class=\"fa fa-exclamation-circle\"></i> " . $username_error . "</small>";
@ -68,8 +68,8 @@
<div class="input-group"> <div class="input-group">
<span class="input-group-text"><i class="fa fa-envelope"></i></span> <span class="input-group-text"><i class="fa fa-envelope"></i></span>
<input class="form-control" type="email" name="user_email" value="<?php if (isset($user_email)) { <input class="form-control" type="email" name="user_email" value="<?php if (isset($user_email)) {
echo $user_email; echo $user_email;
} ?>" /> } ?>" />
</div> </div>
<?php if (isset($email_error)) { <?php if (isset($email_error)) {
echo "<small class=\"text-danger\"><i class=\"fa fa-exclamation-circle\"></i> " . $email_error . "</small>"; echo "<small class=\"text-danger\"><i class=\"fa fa-exclamation-circle\"></i> " . $email_error . "</small>";
@ -296,28 +296,38 @@
<div class="card-body"> <div class="card-body">
<div class="mb-3"> <div class="mb-3">
<div class="form-check form-switch"> <div class="form-check form-switch">
<input name="user_dashboard_enable_dxpedition_card" class="form-check-input" type="checkbox" role="switch" id="DashboardUpcomingDXpeditionCheck" <?php if ($dashboard_upcoming_dx_card) { echo 'checked'; } ?>> <input name="user_dashboard_enable_dxpedition_card" class="form-check-input" type="checkbox" role="switch" id="DashboardUpcomingDXpeditionCheck" <?php if ($dashboard_upcoming_dx_card) {
<label class="form-check-label" for="DashboardUpcomingDXpeditionCheck" >Enable Upcoming DXPedition Card</label> echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardUpcomingDXpeditionCheck">Enable Upcoming DXPedition Card</label>
</div> </div>
<div class="form-check form-switch"> <div class="form-check form-switch">
<input name="user_dashboard_enable_qslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardQSLCardCheck" <?php if ($dashboard_qslcard_card) { echo 'checked'; } ?>> <input name="user_dashboard_enable_qslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardQSLCardCheck" <?php if ($dashboard_qslcard_card) {
<label class="form-check-label" for="DashboardQSLCardCheck" >Enable QSL Cards Card</label> echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardQSLCardCheck">Enable QSL Cards Card</label>
</div> </div>
<div class="form-check form-switch"> <div class="form-check form-switch">
<input name="user_dashboard_enable_eqslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardeQSLCardCheck" <?php if ($dashboard_eqslcard_card) { echo 'checked'; } ?>> <input name="user_dashboard_enable_eqslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardeQSLCardCheck" <?php if ($dashboard_eqslcard_card) {
<label class="form-check-label" for="DashboardeQSLCardCheck" >Enable eQSL Cards Card</label> echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardeQSLCardCheck">Enable eQSL Cards Card</label>
</div> </div>
<div class="form-check form-switch"> <div class="form-check form-switch">
<input name="user_dashboard_enable_lotw_card" class="form-check-input" type="checkbox" role="switch" id="DashboardlotwCardCheck" <?php if ($dashboard_lotw_card) { echo 'checked'; } ?>> <input name="user_dashboard_enable_lotw_card" class="form-check-input" type="checkbox" role="switch" id="DashboardlotwCardCheck" <?php if ($dashboard_lotw_card) {
<label class="form-check-label" for="DashboardlotwCardCheck" >Enable Logbook of the World Card</label> echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardlotwCardCheck">Enable Logbook of the World Card</label>
</div> </div>
<div class="form-check form-switch"> <div class="form-check form-switch">
<input name="user_dashboard_enable_vuccgrids_card" class="form-check-input" type="checkbox" role="switch" id="DashboardvuccgridsCardCheck" <?php if ($dashboard_vuccgrids_card) { echo 'checked'; } ?>> <input name="user_dashboard_enable_vuccgrids_card" class="form-check-input" type="checkbox" role="switch" id="DashboardvuccgridsCardCheck" <?php if ($dashboard_vuccgrids_card) {
<label class="form-check-label" for="DashboardvuccgridsCardCheck" >Enable VUCC-Grids Card</label> echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardvuccgridsCardCheck">Enable VUCC-Grids Card</label>
</div> </div>
</div> </div>
</div> </div>
@ -1036,8 +1046,8 @@
<div class="mb-3"> <div class="mb-3">
<label>Callbook Username</label> <label>Callbook Username</label>
<input class="form-control" type="text" name="user_callbook_username" value="<?php if (isset($user_callbook_username)) { <input class="form-control" type="text" name="user_callbook_username" value="<?php if (isset($user_callbook_username)) {
echo $user_callbook_username; echo $user_callbook_username;
} ?>" /> } ?>" />
<?php if (isset($callbook_username_error)) { <?php if (isset($callbook_username_error)) {
echo "<small class=\"error\">" . $callbook_username_error . "</small>"; echo "<small class=\"error\">" . $callbook_username_error . "</small>";
} ?> } ?>
@ -1177,24 +1187,30 @@
<!-- Winkeyer --> <!-- Winkeyer -->
<div class="col-md"> <div class="col-md">
<div class="card"> <div class="card-header"><?php echo lang('account_winkeyer'); ?> <span class="badge text-bg-danger float-end"><?php echo lang('admin_experimental'); ?></span></div> <div class="card">
<div class="card-body"> <div class="mb-3"> <div class="card-header"><?php echo lang('account_winkeyer'); ?> <span class="badge text-bg-danger float-end"><?php echo lang('admin_experimental'); ?></span></div>
<div class="card-body">
<div class="mb-3">
<div class="form-check form-switch"> <div class="form-check form-switch">
<?php if (!isset($user_winkey)) { <?php if (!isset($user_winkey)) {
$user_winkey = '0'; $user_winkey = '0';
} ?> } ?>
<input name="user_winkey" class="form-check-input" type="checkbox" role="switch" id="user_winkeyer" value="1" <?php if ($user_winkey == 1) { echo 'checked'; } ?>> <input name="user_winkey" class="form-check-input" type="checkbox" role="switch" id="user_winkeyer" value="1" <?php if ($user_winkey == 1) {
echo 'checked';
} ?>>
<label class="form-check-label" for="user_winkeyer"><?php echo lang('account_winkeyer_enabled'); ?></label> <label class="form-check-label" for="user_winkeyer"><?php echo lang('account_winkeyer_enabled'); ?></label>
</div> </div>
</div> </div>
<hr /> <hr />
<div class="mb-3"> <div class="mb-3">
<div class="form-check form-switch"> <div class="form-check form-switch">
<?php if (!isset($user_winkey_websocket)) { <?php if (!isset($user_winkey_websocket)) {
$user_winkey_websocket = '0'; $user_winkey_websocket = '0';
} ?> } ?>
<input name="user_winkey_websocket" class="form-check-input" type="checkbox" role="switch" id="user_winkey_websocket" value="1" <?php if (isset($user_winkey_websocket) && $user_winkey_websocket == 1) { echo 'checked'; } ?>> <input name="user_winkey_websocket" class="form-check-input" type="checkbox" role="switch" id="user_winkey_websocket" value="1" <?php if (isset($user_winkey_websocket) && $user_winkey_websocket == 1) {
echo 'checked';
} ?>>
<label class="form-check-label" for="user_winkey_websocket">Winkey Web Sockets</label> <label class="form-check-label" for="user_winkey_websocket">Winkey Web Sockets</label>
</div> </div>
</div> </div>

56
application/views/user/forgot_password.php
查看文件

@ -1,43 +1,43 @@
<style> <style>
html, html,
body { body {
height: 100%; height: 100%;
} }
body { body {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 40px; padding-top: 40px;
padding-bottom: 40px; padding-bottom: 40px;
} }
.form-forgot { .form-forgot {
width: 100%; width: 100%;
max-width: 430px; max-width: 430px;
padding: 15px; padding: 15px;
margin: auto; margin: auto;
} }
input[type="email"] { input[type="email"] {
margin-bottom: -1px; margin-bottom: -1px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
</style> </style>
<main class="form-forgot"> <main class="form-forgot">
<img src="<?php echo base_url()?>/CloudLog_logo.png" class="mx-auto d-block" alt="" style="width:100px;height:100px;"> <img src="<?php echo base_url() ?>/CloudLog_logo.png" class="mx-auto d-block" alt="" style="width:100px;height:100px;">
<div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm"> <div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
<div class="card-body"> <div class="card-body">
<div class="text-center"> <div class="text-center">
<h3 class="text-center"><?php echo lang('account_forgot_password'); ?> <i class="fa fa-lock"></i></h3> <h3 class="text-center"><?php echo lang('account_forgot_password'); ?> <i class="fa fa-lock"></i></h3>
<p><?php echo lang('account_you_can_reset_your_password_here'); ?></p> <p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
<div class="panel-body"> <div class="panel-body">
<?php if(validation_errors() != ''): ?> <?php if (validation_errors() != ''): ?>
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<?php echo validation_errors(); ?> <?php echo validation_errors(); ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
<form id="register-form" role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/forgot_password'); ?>"> <form id="register-form" role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/forgot_password'); ?>">

62
application/views/user/login.php
查看文件

@ -1,36 +1,36 @@
<style> <style>
html, html,
body { body {
height: 100%; height: 100%;
} }
body { body {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 40px; padding-top: 40px;
padding-bottom: 40px; padding-bottom: 40px;
} }
.form-signin { .form-signin {
width: 100%; width: 100%;
max-width: 430px; max-width: 430px;
padding: 15px; padding: 15px;
margin: auto; margin: auto;
} }
.form-signin input[type="email"] { .form-signin input[type="email"] {
margin-bottom: -1px; margin-bottom: -1px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.form-signin input[type="password"] { .form-signin input[type="password"] {
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
} }
</style> </style>
<main class="form-signin"> <main class="form-signin">
<img src="<?php echo base_url()?>/CloudLog_logo.png" class="mx-auto d-block" alt="" style="width:100px;height:100px;"> <img src="<?php echo base_url() ?>/CloudLog_logo.png" class="mx-auto d-block" alt="" style="width:100px;height:100px;">
<div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm"> <div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
<div class="card-body"> <div class="card-body">
<h3><?php echo lang('account_login_to_cloudlog'); ?></h3> <h3><?php echo lang('account_login_to_cloudlog'); ?></h3>
@ -38,7 +38,7 @@ body {
<?php $this->load->view('layout/messages'); ?> <?php $this->load->view('layout/messages'); ?>
<form method="post" action="<?php echo site_url('user/login'); ?>" name="users"> <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
<?php $this->form_validation->set_error_delimiters('', ''); ?> <?php $this->form_validation->set_error_delimiters('', ''); ?>
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" /> <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
<div> <div>
<label for="floatingInput"><strong><?php echo lang('account_username'); ?></strong></label> <label for="floatingInput"><strong><?php echo lang('account_username'); ?></strong></label>
@ -57,10 +57,10 @@ body {
<input type="checkbox" name="remember_me" value="1"> <?php echo lang('account_remember_me'); ?> <input type="checkbox" name="remember_me" value="1"> <?php echo lang('account_remember_me'); ?>
</label> </label>
<div> <div>
<p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo lang('account_forgot_your_password'); ?></a></small></p> <p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo lang('account_forgot_your_password'); ?></a></small></p>
</div> </div>
<button class="w-100 btn btn-info" type="submit"><?php echo lang('account_login'); ?> →</button> <button class="w-100 btn btn-info" type="submit"><?php echo lang('account_login'); ?> →</button>
</form> </form>
</div> </div>
</div> </div>

4
application/views/user/main.php
查看文件

@ -70,7 +70,7 @@
echo $row->last_login_date; echo $row->last_login_date;
} else { } else {
echo lang('general_word_never'); echo lang('general_word_never');
}?> } ?>
</td> </td>
<td style="text-align: center; vertical-align: middle;"><a href="<?php echo site_url('user/edit') . "/" . $row->user_id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-user-edit"></i></a> <td style="text-align: center; vertical-align: middle;"><a href="<?php echo site_url('user/edit') . "/" . $row->user_id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-user-edit"></i></a>
<td style="text-align: center; vertical-align: middle;"> <td style="text-align: center; vertical-align: middle;">
@ -81,7 +81,7 @@
?></td> ?></td>
<td style="text-align: center; vertical-align: middle;"> <td style="text-align: center; vertical-align: middle;">
<?php if ($_SESSION['user_id'] != $row->user_id) { ?> <?php if ($_SESSION['user_id'] != $row->user_id) { ?>
<button class="btn btn-danger btn-sm" hx-delete="<?php echo site_url('user/delete_new/'.$row->user_id);?>"><i class="fas fa-user-minus"></i></button> <button class="btn btn-danger btn-sm" hx-delete="<?php echo site_url('user/delete_new/' . $row->user_id); ?>"><i class="fas fa-user-minus"></i></button>
<?php } ?> <?php } ?>
</td> </td>
</td> </td>

95
application/views/user/profile.php
查看文件

@ -1,55 +1,68 @@
<div class="container"> <div class="container">
<br> <br>
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<?php echo $this->session->userdata('user_name')."'s profile"; ?> <?php echo $this->session->userdata('user_name') . "'s profile"; ?>
</div> </div>
<div class="card-body"> <div class="card-body">
<h5 class="card-title"></h5> <h5 class="card-title"></h5>
<p class="card-text"></p> <p class="card-text"></p>
<table class="profile"> <table class="profile">
<tr> <tr>
<td width="100px">Username</td> <td width="100px">Username</td>
<td><?php if(isset($user_name)) { echo $user_name; } ?></td> <td><?php if (isset($user_name)) {
</tr> echo $user_name;
} ?></td>
</tr>
<tr> <tr>
<td>Level</td> <td>Level</td>
<td><?php $l = $this->config->item('auth_level'); echo $l[$user_type]; ?></td> <td><?php $l = $this->config->item('auth_level');
</tr> echo $l[$user_type]; ?></td>
</tr>
<tr> <tr>
<td>E-mail</td> <td>E-mail</td>
<td><?php if(isset($user_email)) { echo $user_email; } ?></td> <td><?php if (isset($user_email)) {
</tr> echo $user_email;
} ?></td>
</tr>
<tr> <tr>
<td>Callsign</td> <td>Callsign</td>
<td><?php if(isset($user_callsign)) { echo $user_callsign; } ?></td> <td><?php if (isset($user_callsign)) {
</tr> echo $user_callsign;
} ?></td>
</tr>
<tr> <tr>
<td>Gridsquare</td> <td>Gridsquare</td>
<td><?php if(isset($user_locator)) { echo $user_locator; } ?></td> <td><?php if (isset($user_locator)) {
</tr> echo $user_locator;
} ?></td>
</tr>
<tr> <tr>
<td>First name</td> <td>First name</td>
<td><?php if(isset($user_firstname)) { echo $user_firstname; } ?></td> <td><?php if (isset($user_firstname)) {
</tr> echo $user_firstname;
} ?></td>
</tr>
<tr> <tr>
<td>Last name</td> <td>Last name</td>
<td><?php if(isset($user_lastname)) { echo $user_lastname; } ?></td> <td><?php if (isset($user_lastname)) {
</tr> echo $user_lastname;
} ?></td>
</tr>
</table> </table>
<a class="btn btn-primary" href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>">Edit profile</a> <a class="btn btn-primary" href="<?php echo site_url('user/edit') . "/" . $this->session->userdata('user_id'); ?>">Edit profile</a>
</div> </div>
</div> </div>
</div> </div>

76
application/views/user/reset_password.php
查看文件

@ -1,47 +1,47 @@
<div id="container" class="container mx-auto pt-5"> <div id="container" class="container mx-auto pt-5">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div class="text-center"> <div class="text-center">
<h3><i class="fa fa-lock fa-4x"></i></h3> <h3><i class="fa fa-lock fa-4x"></i></h3>
<h2 class="text-center"><?php echo lang('account_reset_password'); ?>?</h2> <h2 class="text-center"><?php echo lang('account_reset_password'); ?>?</h2>
<p><?php echo lang('account_you_can_reset_your_password_here'); ?></p> <p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
<div class="panel-body"> <div class="panel-body">
<?php if(validation_errors() != ''): ?> <?php if (validation_errors() != ''): ?>
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<?php echo validation_errors(); ?> <?php echo validation_errors(); ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
<form role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/reset_password'); ?>/<?php echo $reset_code; ?>"> <form role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/reset_password'); ?>/<?php echo $reset_code; ?>">
<div class="mb-3 row">
<label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_password'); ?></label>
<div class="col-sm-10">
<input type="password" name="password" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
</div>
</div>
<div class="mb-3 row">
<label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_confirm_password'); ?></label>
<div class="col-sm-10">
<input type="password" name="password_confirm" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
</div>
</div>
<div class="mb-3">
<input name="recover-submit" class="btn btn-lg btn-primary btn-block" value="<?php echo lang('account_reset_password'); ?>" type="submit">
</div>
<input type="hidden" class="hide" name="token" id="token" value="">
</form>
<div class="mb-3 row">
<label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_password'); ?></label>
<div class="col-sm-10">
<input type="password" name="password" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
</div> </div>
</div> </div>
</div>
<div class="mb-3 row">
<label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_confirm_password'); ?></label>
<div class="col-sm-10">
<input type="password" name="password_confirm" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
</div>
</div>
<div class="mb-3">
<input name="recover-submit" class="btn btn-lg btn-primary btn-block" value="<?php echo lang('account_reset_password'); ?>" type="submit">
</div>
<input type="hidden" class="hide" name="token" id="token" value="">
</form>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div>
</div> </div>