Skip to content

Commit 100c6f3

Browse files
davidlstdavidlst
committed
Update webAdmin
1 parent d82c5cd commit 100c6f3

File tree

8 files changed

+24
-29
lines changed

8 files changed

+24
-29
lines changed

‎dist/admin/html.open/index.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<!-- This is auto generated -->
2222
</ol>
2323
<!-- end breadcrumb -->
24-
<span class="hide pull-right well well-sm text-warning"><i class="fa fa-bell"></i> <?php DMsg::EchoUIStr('note_configmodified')?></span>
24+
<span class="hide pull-right well well-sm text-warning"><i class="fa fa-bell"></i> <?php DMsg::EchoUIStr('note_configmodified'); ?></span>
2525
<span id="readonlynotice" class="hide pull-right well well-sm text-warning"></span>
2626
</div>
2727
<!-- END RIBBON -->
@@ -44,11 +44,11 @@
4444
<div class="page-footer">
4545
<div class="row">
4646
<div class="col-xs-12 col-sm-6">
47-
<span class="txt-color-white">LiteSpeed WebAdmin Console © 2014-2020 <?php DMsg::EchoUIStr('note_copyrightreserved')?></span>
47+
<span class="txt-color-white">LiteSpeed WebAdmin Console © 2014-2020 <?php DMsg::EchoUIStr('note_copyrightreserved'); ?></span>
4848
</div>
4949
<div class="col-xs-6 col-sm-6 text-right hidden-xs">
5050
<i class="txt-color-blueLight hidden-mobile"> <i class="fa fa-clock-o"></i>
51-
<i><?php DMsg::EchoUIStr('note_dataretrievedat')?> <span id="lst_UpdateStamp"></span> </i>
51+
<i><?php DMsg::EchoUIStr('note_dataretrievedat'); ?> <span id="lst_UpdateStamp"></span> </i>
5252
</div>
5353
</div>
5454
</div>
@@ -63,5 +63,4 @@
6363
?>
6464

6565
</body>
66-
67-
</html>
66+
</html>

‎dist/admin/html.open/lib/CData.php

+4
Original file line numberDiff line numberDiff line change
@@ -972,6 +972,10 @@ private function write_file($filepath, $buf)
972972
}
973973
fclose($fd);
974974

975+
if (file_exists($filepath)) {
976+
$this->copy_permission($filepath, "{$filepath}.new");
977+
}
978+
975979
@unlink("{$filepath}.bak");
976980
if (file_exists($filepath) && !rename($filepath, "{$filepath}.bak")) {
977981
error_log("failed to rename {$filepath} to {$filepath}.bak");

‎dist/admin/html.open/lib/DMsg.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ class DMsg
1010
const LANG_JAPANES = 'japanes';
1111
const _COOKIE_LANG_ = 'litespeed_admin_lang';
1212

13-
private static $_supported = array(
14-
self::LANG_ENGLISH => array('English', 'en-US'),
15-
self::LANG_CHINESE => array('中文', 'zh-CN'),
16-
self::LANG_JAPANES => array('日本語', 'ja-JP')
17-
);
13+
private static $_supported = [
14+
self::LANG_ENGLISH => ['English', 'en-US'],
15+
self::LANG_CHINESE => ['中文', 'zh-CN'],
16+
self::LANG_JAPANES => ['日本語', 'ja-JP'],
17+
];
1818
private static $_curlang = '';
1919
private static $_curtips = '';
2020

‎dist/admin/html.open/lib/util/build_php/BuildConfig.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public static function GetVersion($field)
2525

2626
case self::PHP_VERSION: return
2727
array(
28-
'7.4.11',
29-
'7.3.23',
28+
'7.4.12',
29+
'7.3.24',
3030
'7.2.34',
3131
'7.1.33',
3232
'7.0.33',

‎dist/admin/html.open/res/lang/en-US_msg.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,15 @@
8383
$_gmsg['note_configmodified'] = 'Configuration has been modified. To apply changes, please perform a graceful restart.';
8484
$_gmsg['note_confirm_delete'] = 'Are you sure you want to delete this entry? This will be permanently removed from the configuration file.';
8585
$_gmsg['note_confirm_instantiate'] = 'Are you sure you want to instantiate this virtual host? This will create a dedicated configuration file for this virtual host.';
86+
$_gmsg['note_confirm_logout'] = 'Logout';
8687
$_gmsg['note_copyrightreserved'] = 'All Rights Reserved.';
8788
$_gmsg['note_curbranch'] = 'current branch';
8889
$_gmsg['note_curver'] = 'Current Version';
8990
$_gmsg['note_dataretrievedat'] = 'Data retrieved at';
9091
$_gmsg['note_entfeature'] = 'This feature is available in Enterprise Edition';
9192
$_gmsg['note_example'] = 'Example';
9293
$_gmsg['note_fullscreen'] = 'Full Screen';
94+
$_gmsg['note_home'] = 'Home';
9395
$_gmsg['note_inputerr'] = 'Input error detected. Please resolve the error(s).';
9496
$_gmsg['note_loadavg'] = 'System Load Avg';
9597
$_gmsg['note_logout'] = 'You can improve your security further after logging out by closing this opened browser';
@@ -113,6 +115,8 @@
113115
$_gmsg['err_invalidvalat'] = 'Invalid value at';
114116
$_gmsg['err_loggedoff'] = 'You have logged off.';
115117
$_gmsg['err_login'] = 'Invalid credentials.';
118+
$_gmsg['err_menuanchornotexist'] = 'Error - menu anchor does not exist';
119+
$_gmsg['err_page_404'] = 'Error 404! Page not found.';
116120
$_gmsg['err_parentdirnotexist'] = 'Parent directory does not exist';
117121
$_gmsg['err_requireabspath'] = 'Require absolute path';
118122
$_gmsg['err_sessiontimeout'] = 'Your session has timed out.';
@@ -775,5 +779,3 @@
775779
2. change the listener port from default value 7080;
776780
3. do not use simple password;
777781
4. use https for admin console.';
778-
779-

‎dist/admin/html.open/view/inc/header.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,19 @@
2525
<link rel="icon" href="/res/img/favicon/favicon.ico" type="image/x-icon">
2626

2727
<!-- GOOGLE FONT -->
28-
<link rel="stylesheet" type="text/css" media="screen" href="/res/css/googlefonts.css">
28+
<link rel="stylesheet" type="text/css" media="screen" href="/res/css/googlefonts.css">
2929
<!-- link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,300,400,700" -->
3030

3131
<!-- iOS web-app metas : hides Safari UI Components and Changes Status Bar Appearance -->
3232
<meta name="apple-mobile-web-app-capable" content="yes">
3333
<meta name="apple-mobile-web-app-status-bar-style" content="black">
34-
<meta name="robots" content="noindex">
34+
<meta name="robots" content="noindex">
3535

3636
<script src="/res/js/libs/jquery-2.2.4.min.js"></script>
3737
<script src="/res/js/libs/jquery-ui-1.12.1.min.js"></script>
3838

3939
</head>
40-
<?php
41-
if ($no_main_header)
42-
return;
43-
?>
40+
<?php if ($no_main_header) return; ?>
4441
<body>
4542

4643
<!-- POSSIBLE CLASSES: minified, fixed-ribbon, fixed-header, fixed-width

‎dist/admin/html.open/view/inc/scripts.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ function lst_restart() {
55
buttons: '<?php echo '[' . DMsg::UIStr('btn_cancel') . '][' . DMsg::UIStr('btn_go') . ']' ; ?>'
66
}, function (ButtonPressed) {
77
if (ButtonPressed === "<?php DMsg::EchoUIStr('btn_go') ?>") {
8-
98
$.ajax({
109
type: "POST",
1110
url: "view/serviceMgr.php",
12-
data: {act: "restart"},
11+
data: {"act": "restart"},
1312
beforeSend: function () {
1413
$.smallBox({
1514
title: "<?php DMsg::EchoUIStr('service_requesting') ?>",
@@ -23,9 +22,7 @@ function lst_restart() {
2322
location.reload(true);
2423
}
2524
});
26-
2725
}
28-
2926
});
3027
}
3128

@@ -36,7 +33,6 @@ function lst_toggledebug() {
3633
buttons: '<?php echo '[' . DMsg::UIStr('btn_cancel') . '][' . DMsg::UIStr('btn_go') . ']' ; ?>'
3734
}, function (ButtonPressed) {
3835
if (ButtonPressed === "<?php DMsg::EchoUIStr('btn_go') ?>") {
39-
4036
$.ajax({
4137
type: "POST",
4238
url: "view/serviceMgr.php",
@@ -54,9 +50,7 @@ function lst_toggledebug() {
5450
setTimeout(refreshLog, 2000);
5551
}
5652
});
57-
5853
}
59-
6054
});
6155
}
6256
</script>
@@ -80,7 +74,6 @@ function lst_toggledebug() {
8074
<!-- MAIN APP JS FILE -->
8175
<script src="/res/js/lst-app.min.js"></script>
8276

83-
8477
<script type="text/javascript">
8578
// DO NOT REMOVE : GLOBAL FUNCTIONS!
8679
$(document).ready(function () {

‎src/main/lshttpdmain.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
/***
8484
* Do not change the below format, it will be set correctly while packing the code
8585
*/
86-
#define BUILDTIME " (built: Mon Nov 9 13:52:18 UTC 2020)"
86+
#define BUILDTIME " (built: Mon Nov 9 21:36:04 UTC 2020)"
8787

8888
#define GlobalServerSessionHooks (LsiApiHooks::getServerSessionHooks())
8989

0 commit comments

Comments
 (0)