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 文件 展开所有文件 折叠所有文件

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

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

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

@ -19,7 +19,7 @@
<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>
<?php if(!extension_loaded('xml')) { ?>
<?php if (!extension_loaded('xml')) { ?>
<div class="alert alert-danger" role="alert">
You must install php-xml for this to work.
</div>
@ -29,24 +29,24 @@
<div id="dxcc_update_status">Status:</br></div>
<br/>
<br/>
<br />
<br />
<h5>Apply DXCC Data to Logbook</h5>
<p class="card-text">
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
and update existing metadata as well, in case it has changed.
</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'); ?>">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>
<h5>Apply Continent Data to Logbook</h5>
<p class="card-text">
This function can be used to update QSO continent information for all QSOs in Cloudlog missing that information.
</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>
#dxcc_update_status{
#dxcc_update_status {
display: None;
}
</style>
@ -54,12 +54,10 @@
</div>
<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><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>
</div>
</div>
</div>
</div>

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

@ -1,5 +1,5 @@
<div class="container">
<br>
<br>
<div class="card">
<div class="card-header">
<?php echo lang('account_delete_user_account'); ?> <?php echo $user_name; ?>
@ -9,7 +9,7 @@
<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 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>

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

@ -296,28 +296,38 @@
<div class="card-body">
<div class="mb-3">
<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'; } ?>>
<label class="form-check-label" for="DashboardUpcomingDXpeditionCheck" >Enable Upcoming DXPedition Card</label>
<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';
} ?>>
<label class="form-check-label" for="DashboardUpcomingDXpeditionCheck">Enable Upcoming DXPedition Card</label>
</div>
<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'; } ?>>
<label class="form-check-label" for="DashboardQSLCardCheck" >Enable QSL Cards Card</label>
<input name="user_dashboard_enable_qslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardQSLCardCheck" <?php if ($dashboard_qslcard_card) {
echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardQSLCardCheck">Enable QSL Cards Card</label>
</div>
<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'; } ?>>
<label class="form-check-label" for="DashboardeQSLCardCheck" >Enable eQSL Cards Card</label>
<input name="user_dashboard_enable_eqslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardeQSLCardCheck" <?php if ($dashboard_eqslcard_card) {
echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardeQSLCardCheck">Enable eQSL Cards Card</label>
</div>
<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'; } ?>>
<label class="form-check-label" for="DashboardlotwCardCheck" >Enable Logbook of the World Card</label>
<input name="user_dashboard_enable_lotw_card" class="form-check-input" type="checkbox" role="switch" id="DashboardlotwCardCheck" <?php if ($dashboard_lotw_card) {
echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardlotwCardCheck">Enable Logbook of the World Card</label>
</div>
<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'; } ?>>
<label class="form-check-label" for="DashboardvuccgridsCardCheck" >Enable VUCC-Grids Card</label>
<input name="user_dashboard_enable_vuccgrids_card" class="form-check-input" type="checkbox" role="switch" id="DashboardvuccgridsCardCheck" <?php if ($dashboard_vuccgrids_card) {
echo 'checked';
} ?>>
<label class="form-check-label" for="DashboardvuccgridsCardCheck">Enable VUCC-Grids Card</label>
</div>
</div>
</div>
@ -1177,13 +1187,17 @@
<!-- Winkeyer -->
<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-body"> <div class="mb-3">
<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-body">
<div class="mb-3">
<div class="form-check form-switch">
<?php if (!isset($user_winkey)) {
$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>
</div>
</div>
@ -1194,7 +1208,9 @@
<?php if (!isset($user_winkey_websocket)) {
$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>
</div>
</div>

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

@ -1,32 +1,32 @@
<style>
html,
body {
html,
body {
height: 100%;
}
}
body {
body {
display: flex;
align-items: center;
padding-top: 40px;
padding-bottom: 40px;
}
}
.form-forgot {
.form-forgot {
width: 100%;
max-width: 430px;
padding: 15px;
margin: auto;
}
}
input[type="email"] {
input[type="email"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
}
</style>
<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="card-body">
<div class="text-center">
@ -34,7 +34,7 @@ input[type="email"] {
<p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
<div class="panel-body">
<?php if(validation_errors() != ''): ?>
<?php if (validation_errors() != ''): ?>
<div class="alert alert-danger" role="alert">
<?php echo validation_errors(); ?>
</div>

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

@ -1,36 +1,36 @@
<style>
html,
body {
html,
body {
height: 100%;
}
}
body {
body {
display: flex;
align-items: center;
padding-top: 40px;
padding-bottom: 40px;
}
}
.form-signin {
.form-signin {
width: 100%;
max-width: 430px;
padding: 15px;
margin: auto;
}
}
.form-signin input[type="email"] {
.form-signin input[type="email"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
}
.form-signin input[type="password"] {
.form-signin input[type="password"] {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
}
</style>
<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="card-body">
<h3><?php echo lang('account_login_to_cloudlog'); ?></h3>

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

@ -70,7 +70,7 @@
echo $row->last_login_date;
} else {
echo lang('general_word_never');
}?>
} ?>
</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;">
@ -81,7 +81,7 @@
?></td>
<td style="text-align: center; vertical-align: middle;">
<?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 } ?>
</td>
</td>

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

@ -1,10 +1,10 @@
<div class="container">
<br>
<br>
<div class="card">
<div class="card">
<div class="card-header">
<?php echo $this->session->userdata('user_name')."'s profile"; ?>
<?php echo $this->session->userdata('user_name') . "'s profile"; ?>
</div>
<div class="card-body">
<h5 class="card-title"></h5>
@ -12,44 +12,57 @@
<table class="profile">
<tr>
<td width="100px">Username</td>
<td><?php if(isset($user_name)) { echo $user_name; } ?></td>
<td><?php if (isset($user_name)) {
echo $user_name;
} ?></td>
</tr>
<tr>
<td>Level</td>
<td><?php $l = $this->config->item('auth_level'); echo $l[$user_type]; ?></td>
<td><?php $l = $this->config->item('auth_level');
echo $l[$user_type]; ?></td>
</tr>
<tr>
<td>E-mail</td>
<td><?php if(isset($user_email)) { echo $user_email; } ?></td>
<td><?php if (isset($user_email)) {
echo $user_email;
} ?></td>
</tr>
<tr>
<td>Callsign</td>
<td><?php if(isset($user_callsign)) { echo $user_callsign; } ?></td>
<td><?php if (isset($user_callsign)) {
echo $user_callsign;
} ?></td>
</tr>
<tr>
<td>Gridsquare</td>
<td><?php if(isset($user_locator)) { echo $user_locator; } ?></td>
<td><?php if (isset($user_locator)) {
echo $user_locator;
} ?></td>
</tr>
<tr>
<td>First name</td>
<td><?php if(isset($user_firstname)) { echo $user_firstname; } ?></td>
<td><?php if (isset($user_firstname)) {
echo $user_firstname;
} ?></td>
</tr>
<tr>
<td>Last name</td>
<td><?php if(isset($user_lastname)) { echo $user_lastname; } ?></td>
<td><?php if (isset($user_lastname)) {
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>

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

@ -9,7 +9,7 @@
<p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
<div class="panel-body">
<?php if(validation_errors() != ''): ?>
<?php if (validation_errors() != ''): ?>
<div class="alert alert-danger" role="alert">
<?php echo validation_errors(); ?>
</div>