Skip to content

Code Improvements #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Martinski4GitHub merged 18 commits into from
Nov 8, 2025
Merged

Code Improvements #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5207a6a
Bump softprops/action-gh-release in the all-actions group
dependabot[bot] Sep 8, 2025
10f8cbc
Merge pull request #17 from AMTM-OSR/dependabot/github_actions/develo…
ExtremeFiretop Sep 8, 2025
056b18c
Bump softprops/action-gh-release in the all-actions group
dependabot[bot] Oct 6, 2025
f923d1c
Merge pull request #18 from AMTM-OSR/dependabot/github_actions/develo…
ExtremeFiretop Oct 6, 2025
f25d7e2
Bump softprops/action-gh-release in the all-actions group
dependabot[bot] Oct 13, 2025
0aa1328
Merge pull request #19 from AMTM-OSR/dependabot/github_actions/develo…
Martinski4GitHub Oct 15, 2025
6ee3fbb
Update .gitattributes
Martinski4GitHub Oct 26, 2025
f9fa738
Code Improvements
Martinski4GitHub Oct 26, 2025
7fe5d69
Merge pull request #20 from Martinski4GitHub/develop
Martinski4GitHub Oct 26, 2025
15c6b62
Added "client_function.js" reference.
Martinski4GitHub Oct 30, 2025
dbd2f14
Merge pull request #21 from Martinski4GitHub/develop
Martinski4GitHub Oct 30, 2025
21f6a64
Update uiScribe.sh
Martinski4GitHub Oct 31, 2025
ff81247
Merge pull request #22 from Martinski4GitHub/develop
Martinski4GitHub Oct 31, 2025
f77c18b
Logging with Process ID
Martinski4GitHub Nov 5, 2025
934aae9
Merge pull request #23 from Martinski4GitHub/develop
Martinski4GitHub Nov 5, 2025
bb05832
Update README.md
Martinski4GitHub Nov 8, 2025
ac1b5c7
Merge pull request #24 from Martinski4GitHub/develop
Martinski4GitHub Nov 8, 2025
64b7c00
Merge branch 'master' into develop
Martinski4GitHub Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
* text eol=lf
*.sh text eol=lf
*.md text eol=lf
*.asp text eol=lf
*.js text eol=lf
*.css text eol=lf
*.gz binary
*.png binary
*.jpg binary
*.jpeg binary
*.zip binary
*.tar.gz binary
2 changes: 1 addition & 1 deletion .github/workflows/Create-NewReleases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:

# 7--- Publish a GitHub Release with auto-generated notes
- name: Create Release with Automated Release Notes
uses: softprops/action-gh-release@v2.3.2
uses: softprops/action-gh-release@v2.4.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ steps.nextver.outputs.tag }}
Expand Down
18 changes: 12 additions & 6 deletions Main_LogStatus_Content.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ p{font-weight:bolder}thead.collapsible-jquery{color:#fff;padding:0;width:100%;bo
<script language="JavaScript" type="text/javascript" src="/popup.js"></script>
<script language="JavaScript" type="text/javascript" src="/help.js"></script>
<script language="JavaScript" type="text/javascript" src="/ext/shared-jy/detect.js"></script>
<script language="JavaScript" type="text/javascript" src="/client_function.js"></script>
<script language="JavaScript" type="text/javascript" src="/validator.js"></script>
<script>

/**----------------------------------------**/
/** Modified by Martinski W. [2024-Sep-09] **/
/** Modified by Martinski W. [2025-Oct-27] **/
/**----------------------------------------**/

function showDST(){
function showDST()
{
var system_timezone_dut = "<% nvram_get("time_zone"); %>";
if(system_timezone_dut.search("DST") >= 0 && "<% nvram_get("time_zone_dst"); %>" == "1"){
document.getElementById('dstzone').style.display = "";
Expand All @@ -36,11 +38,15 @@ function showDST(){
}

var custom_settings;
function LoadCustomSettings(){
function LoadCustomSettings()
{
custom_settings = <% get_custom_settings(); %>;
for (var prop in custom_settings){
if(Object.prototype.hasOwnProperty.call(custom_settings, prop)){
if (prop.indexOf("uiscribe") !== -1 && prop.indexOf("uiscribe_version") === -1){
for (var prop in custom_settings)
{
if (Object.prototype.hasOwnProperty.call(custom_settings, prop))
{
if (prop.indexOf("uiscribe") !== -1 && prop.indexOf("uiscribe_version") === -1)
{
eval("delete custom_settings."+prop)
}
}
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# uiScribe

## v1.4.8
### Updated on 2025-Aug-23
## v1.4.9
### Updated on 2025-Nov-07

## About
uiScribe updates the System Log page to show log files created by Scribe (syslog-ng). Requires [**Scribe**](https://github.com/cynicastic/scribe)
Expand Down
21 changes: 12 additions & 9 deletions uiScribe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
## Forked from https://github.com/jackyaz/uiScribe ##
## ##
########################################################
# Last Modified: 2025-Aug-23
# Last Modified: 2025-Nov-04
#-------------------------------------------------------

########### Shellcheck directives ##########
Expand All @@ -29,9 +29,9 @@

### Start of script variables ###
readonly SCRIPT_NAME="uiScribe"
readonly SCRIPT_VERSION="v1.4.8"
readonly SCRIPT_VERSTAG="25082322"
SCRIPT_BRANCH="master"
readonly SCRIPT_VERSION="v1.4.9"
readonly SCRIPT_VERSTAG="25110422"
SCRIPT_BRANCH="develop"
SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH"
readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME.d"
readonly SCRIPT_PAGE_DIR="$(readlink -f /www/user)"
Expand Down Expand Up @@ -88,7 +88,7 @@ Print_Output()
"$PASS") prioNum=6 ;; #INFO#
*) prioNum=5 ;; #NOTICE#
esac
logger -t "$SCRIPT_NAME" -p $prioNum "$2"
logger -t "${SCRIPT_NAME}_[$$]" -p $prioNum "$2"
fi
printf "${BOLD}${3}%s${CLRct}\n" "$2"
if [ $# -lt 4 ] || [ "$4" != "oneline" ]
Expand Down Expand Up @@ -791,10 +791,10 @@ _CenterTextStr_()
ScriptHeader()
{
clear
local spaceLen=50
printf "\n"
local spaceLen=50 colorCT
[ "$SCRIPT_BRANCH" = "master" ] && colorCT="$GRNct" || colorCT="$MGNTct"
echo
printf "${BOLD}########################################################${CLRct}\n"
printf "${BOLD}## ##${CLRct}\n"
printf "${BOLD}## _ _____ _ _ ##${CLRct}\n"
printf "${BOLD}## (_) / ____| (_)| | ##${CLRct}\n"
printf "${BOLD}## _ _ _ | (___ ___ _ __ _ | |__ ___ ##${CLRct}\n"
Expand All @@ -803,7 +803,8 @@ ScriptHeader()
printf "${BOLD}## \__,_||_||_____/ \___||_| |_||_.__/ \___| ##${CLRct}\n"
printf "${BOLD}## ##${CLRct}\n"
printf "${BOLD}## ${GRNct}%s${CLRct}${BOLD} ##${CLRct}\n" "$(_CenterTextStr_ "$versionMod_TAG" "$spaceLen")"
printf "${BOLD}## ${GRNct}%s${CLRct}${BOLD} ##${CLRct}\n" "$(_CenterTextStr_ "$branchxStr_TAG" "$spaceLen")"
printf "${BOLD}## ${colorCT}%s${CLRct}${BOLD} ##${CLRct}\n" "$(_CenterTextStr_ "$branchxStr_TAG" "$spaceLen")"
printf "${BOLD}## ##${CLRct}\n"
printf "${BOLD}## https://github.com/AMTM-OSR/uiScribe ##${CLRct}\n"
printf "${BOLD}## Forked from https://github.com/jackyaz/uiScribe ##${CLRct}\n"
printf "${BOLD}## ##${CLRct}\n"
Expand Down Expand Up @@ -1011,6 +1012,7 @@ Menu_Startup()
Create_Symlinks
Auto_Startup create 2>/dev/null
Auto_ServiceEvent create 2>/dev/null
Set_Version_Custom_Settings local "$SCRIPT_VERSION"
Shortcut_Script create
Mount_WebUI
Clear_Lock
Expand Down Expand Up @@ -1168,6 +1170,7 @@ then
Create_Symlinks
Auto_Startup create 2>/dev/null
Auto_ServiceEvent create 2>/dev/null
Set_Version_Custom_Settings local "$SCRIPT_VERSION"
Shortcut_Script create
_CheckFor_WebGUI_Page_
ScriptHeader
Expand Down