mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #2292 from magicbug/dev 

Dev
pull/2362/head
Peter Goodhall 2023-07-14 22:58:32 +01:00 zatwierdzone przez GitHub
rodzic 3920b7990e 36585d12f6
commit b20723355d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 43 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

74
application/views/debug/main.php
Wyświetl plik

@ -111,7 +111,7 @@
<td>
<?php if(in_array ('curl', get_loaded_extensions())) { ?>
<span class="badge badge-success">Installed</span>
<?php } else { ?>
<?php } else { ?>
<span class="badge badge-danger">Not Installed</span>
<?php } ?>
</td>
@ -122,7 +122,7 @@
<td>
<?php if(in_array ('mysqli', get_loaded_extensions())) { ?>
<span class="badge badge-success">Installed</span>
<?php } else { ?>
<?php } else { ?>
<span class="badge badge-danger">Not Installed</span>
<?php } ?>
</td>
@ -133,7 +133,7 @@
<td>
<?php if(in_array ('mbstring', get_loaded_extensions())) { ?>
<span class="badge badge-success">Installed</span>
<?php } else { ?>
<?php } else { ?>
<span class="badge badge-danger">Not Installed</span>
<?php } ?>
</td>
@ -144,7 +144,7 @@
<td>
<?php if(in_array ('xml', get_loaded_extensions())) { ?>
<span class="badge badge-success">Installed</span>
<?php } else { ?>
<?php } else { ?>
<span class="badge badge-danger">Not Installed</span>
<?php } ?>
</td>
@ -155,7 +155,7 @@
<td>
<?php if(in_array ('openssl', get_loaded_extensions())) { ?>
<span class="badge badge-success">Installed</span>
<?php } else { ?>
<?php } else { ?>
<span class="badge badge-danger">Not Installed</span>
<?php } ?>
</td>
@ -165,29 +165,39 @@
</div>
<?php if (file_exists('.git')) { ?>
<?php
$commitHash = trim(exec('git log --pretty="%H" -n1 HEAD'));
$branch = '';
$remote = '';
$owner = '';
// only proceed here if git can actually be executed
if ($commitHash != "") {
$commitDate = trim(exec('git log --pretty="%ci" -n1 HEAD'));
$line = trim(exec('git log -n 1 --pretty=%D HEAD'));
$pieces = explode(', ', $line);
$lastFetch = trim(exec('stat -c %Y .git/FETCH_HEAD'));
$dt = new DateTime("@$lastFetch");
if (isset($pieces[1])) {
$remote = substr($pieces[1], 0, strpos($pieces[1], '/'));
$branch = substr($pieces[1], strpos($pieces[1], '/')+1);
$url = trim(exec('git remote get-url '.$remote));
if (strpos($url, 'https://github.com') !== false) {
$owner = preg_replace('/https:\/\/github\.com\/(\w+)\/Cloudlog\.git/', '$1', $url);
} else if (strpos($url, 'git@github.com') !== false) {
$owner = preg_replace('/git@github\.com:(\w+)\/Cloudlog\.git/', '$1', $url);
}
}
$tag = trim(exec('git describe --tags '.$commitHash));
}
//Below is a failsafe where git commands fail
try {
$commitHash = trim(exec('git log --pretty="%H" -n1 HEAD'));
$branch = '';
$remote = '';
$owner = '';
// only proceed here if git can actually be executed
if ($commitHash != "") {
$commitDate = trim(exec('git log --pretty="%ci" -n1 HEAD'));
$line = trim(exec('git log -n 1 --pretty=%D HEAD'));
$pieces = explode(', ', $line);
$lastFetch = trim(exec('stat -c %Y .git/FETCH_HEAD'));
//Below is a failsafe for systems without the stat command
try {
$dt = new DateTime("@$lastFetch");
} catch(Exception $e) {
$dt = new DateTime(date("Y-m-d H:i:s"));
}
if (isset($pieces[1])) {
$remote = substr($pieces[1], 0, strpos($pieces[1], '/'));
$branch = substr($pieces[1], strpos($pieces[1], '/')+1);
$url = trim(exec('git remote get-url '.$remote));
if (strpos($url, 'https://github.com') !== false) {
$owner = preg_replace('/https:\/\/github\.com\/(\w+)\/Cloudlog\.git/', '$1', $url);
} else if (strpos($url, 'git@github.com') !== false) {
$owner = preg_replace('/git@github\.com:(\w+)\/Cloudlog\.git/', '$1', $url);
}
}
$tag = trim(exec('git describe --tags '.$commitHash));
}
} catch (\Throwable $th) {
$commitHash = "";
}
?>
<?php if($commitHash != "") { ?>
@ -206,7 +216,7 @@
<?php if($owner != "") { ?>
</a>
<?php } ?>
<?php } else { ?>
<?php } else { ?>
<span class="badge badge-danger">n/a</span>
<?php } ?>
</td>
@ -217,7 +227,7 @@
<td>
<?php if($commitHash != "") { ?>
<a target="_blank" href="https://github.com/magicbug/Cloudlog/commit/<?php echo $commitHash?>"><span class="badge badge-success"><?php echo substr($commitHash,0,8); ?></span></a>
<?php } else { ?>
<?php } else { ?>
<span class="badge badge-danger">n/a</span>
<?php } ?>
</td>
@ -227,7 +237,7 @@
<td>
<?php if($commitHash != "") { ?>
<a target="_blank" href="https://github.com/magicbug/Cloudlog/releases/tag/<?php echo substr($tag,0,strpos($tag, '-')); ?>"><span class="badge badge-success"><?php echo $tag; ?></span></a>
<?php } else { ?>
<?php } else { ?>
<span class="badge badge-danger">n/a</span>
<?php } ?>
</td>
@ -235,7 +245,7 @@
<tr>
<td>Last Fetch</td>
<td>
<?php echo $dt->format(\DateTime::RFC850); ?>
<?php echo ($dt == null ? '' : $dt->format(\DateTime::RFC850)); ?>
</td>
</tr>
</table>

2
application/views/view_log/qso.php
Wyświetl plik

@ -562,7 +562,7 @@
<div class="tab-pane fade" id="eqslcard" role="tabpanel" aria-labelledby="table-tab">
<?php
if ($row->eqsl_image_file != null) {
echo '<img class="d-block" src="' . base_url() . '/images/eqsl_card_images/' . $row->eqsl_image_file .'" alt="QSL picture #'. $i++.'">';
echo '<img class="d-block" src="' . base_url() . '/images/eqsl_card_images/' . $row->eqsl_image_file .'" alt="eQSL picture">';
}
?>
</div>