diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 7f247da56..7e65801a4 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS += favicon info jquery lcd4linux installdir = $(PRIVATE_HTTPDDIR) install_DATA = channels.js \ - extentions.txt \ + extensions.txt \ favicon.ico \ index.html \ prototype.js \ diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index c5915117f..b2532c6e1 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -146,7 +146,7 @@ end-block~personalize_save_settings # ------- Ext save Settings start-block~ext_save_settings -{=file-action:%(CONFIGDIR)/extentions.txt;add;{=extentions=}=} +{=file-action:%(CONFIGDIR)/extensions.txt;add;{=extensions=}=} end-block~ext_save_settings # ------- No Managemant Error diff --git a/data/y-web/Y_Ext_Menue.yhtm b/data/y-web/Y_Ext_Menue.yhtm index 3a3226323..e1bfa0fc0 100644 --- a/data/y-web/Y_Ext_Menue.yhtm +++ b/data/y-web/Y_Ext_Menue.yhtm @@ -1,4 +1,4 @@ -{=var-set:extension={=if-file-exists:%(CONFIGDIR)/extentions.txt~%(CONFIGDIR)/extentions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~%(PUBLIC_HTTPDDIR)/extentions.txt~%(PRIVATE_HTTPDDIR)/extentions.txt=}=}=} +{=var-set:extension={=if-file-exists:%(CONFIGDIR)/extensions.txt~%(CONFIGDIR)/extensions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extensions.txt~%(PUBLIC_HTTPDDIR)/extensions.txt~%(PRIVATE_HTTPDDIR)/extensions.txt=}=}=} {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~1~=}=} {=include-block:Y_Blocks.txt;head=} diff --git a/data/y-web/Y_Ext_Settings.yhtm b/data/y-web/Y_Ext_Settings.yhtm index 50678f9d4..071ff8adf 100644 --- a/data/y-web/Y_Ext_Settings.yhtm +++ b/data/y-web/Y_Ext_Settings.yhtm @@ -23,7 +23,7 @@ function do_submit(){ - +
 

diff --git a/data/y-web/Y_Ext_Uninstall.yhtm b/data/y-web/Y_Ext_Uninstall.yhtm index 77a486323..5f6b862b3 100644 --- a/data/y-web/Y_Ext_Uninstall.yhtm +++ b/data/y-web/Y_Ext_Uninstall.yhtm @@ -63,7 +63,7 @@ function init(){
- +

diff --git a/data/y-web/Y_Ext_Update.js b/data/y-web/Y_Ext_Update.js index 888c1e422..5be7badf7 100644 --- a/data/y-web/Y_Ext_Update.js +++ b/data/y-web/Y_Ext_Update.js @@ -33,7 +33,7 @@ function sLog_addRow(_body, state, action_text, state_text){ var update_body; /*,,,,,,,*/ /*,,,,,*/ -/*,,,*/ +/*,,,*/ function list_init(){ update_body=$("update_list"); } @@ -150,7 +150,7 @@ function do_set_updates2(){ } sLog_addRow(sLog_body, "green", "updating local extension list. Starting ...", "ok"); var extfile=ext.build_extension_file(); - document.f.extentions.value=extfile; + document.f.extensions.value=extfile; show_waitbox(false); alert("Update finished. Menue reload."); do_submit(); @@ -217,7 +217,7 @@ function do_uninstall2(tag){ sLog_addRow(sLog_body, "green", "uninstalled: "+tag+"
"+res, "ok"); sLog_addRow(sLog_body, "green", "updating local extension list. Starting ...", "ok"); var extfile=ext.build_extension_file(); - document.f.extentions.value=extfile; + document.f.extensions.value=extfile; show_waitbox(false); alert("Update finished. Menue reload."); do_submit(); diff --git a/data/y-web/Y_Ext_Update.yhtm b/data/y-web/Y_Ext_Update.yhtm index bf0fa6109..ff9dd158c 100644 --- a/data/y-web/Y_Ext_Update.yhtm +++ b/data/y-web/Y_Ext_Update.yhtm @@ -54,7 +54,7 @@ - +

diff --git a/data/y-web/Y_Filemgr.yhtm b/data/y-web/Y_Filemgr.yhtm index b6da493f0..1c2732301 100644 --- a/data/y-web/Y_Filemgr.yhtm +++ b/data/y-web/Y_Filemgr.yhtm @@ -437,7 +437,7 @@ function do_prop(prop){ show_prop(); document.edit.fitem.value = explorer.ac_item; - // Fileextention handling + // Fileextension handling var fullfname = explorer.build_fname(); switch(explorer.ac_prop.get('ext')){ case "xml": diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index 71257f361..45c594f50 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=2.9.1.12 -date=06.09.2022 +version=2.9.1.13 +date=18.09.2022 info=NI-Neutrino diff --git a/data/y-web/Y_yweb.js b/data/y-web/Y_yweb.js index 868da7d1f..2e92a727a 100644 --- a/data/y-web/Y_yweb.js +++ b/data/y-web/Y_yweb.js @@ -76,7 +76,7 @@ else /* Class Y.extension */ Y.extension = new Class.create(); Object.extend(Y.extension.prototype, { - ext_version: 1, /* ver of Y.extention*/ + ext_version: 1, /* ver of Y.extension*/ conf_version: 2,/* ver of local conf file */ upd_version: 2, /* ver of upd file */ file: "", diff --git a/data/y-web/extensions.txt b/data/y-web/extensions.txt new file mode 100644 index 000000000..2a34a9359 --- /dev/null +++ b/data/y-web/extensions.txt @@ -0,0 +1,2 @@ +type:u,site:Neutrino-Images,desc:yWeb Extensions,url:https://raw.githubusercontent.com/neutrino-images/ni-neutrino-plugins/master/yWeb-Extensions/Y_Extensions.txt + diff --git a/data/y-web/extentions.txt b/data/y-web/extentions.txt deleted file mode 100644 index 9df0559ef..000000000 --- a/data/y-web/extentions.txt +++ /dev/null @@ -1 +0,0 @@ -type:u,site:Tuxbox-Neutrino,desc:yWeb extentions,url:https://raw.githubusercontent.com/tuxbox-neutrino/gui-yweb/master/Y_Extentions.txt diff --git a/data/y-web/scripts/Y_Tools.sh b/data/y-web/scripts/Y_Tools.sh index 58e7b4bc4..08b7095d9 100644 --- a/data/y-web/scripts/Y_Tools.sh +++ b/data/y-web/scripts/Y_Tools.sh @@ -336,7 +336,7 @@ do_installer() } # ----------------------------------------------------------- -# extention Installer $1=URL +# extension Installer $1=URL # ----------------------------------------------------------- do_ext_installer() { @@ -515,16 +515,16 @@ case "$1" in fi ;; get_extension_list) - if [ -e "$y_path_config/extentions.txt" ] + if [ -e "$y_path_config/extensions.txt" ] then - cat $y_path_config/extentions.txt + cat $y_path_config/extensions.txt else - cat $y_path_httpd/extentions.txt + cat $y_path_httpd/extensions.txt fi ;; write_extension_list) shift 1 - echo "$*" >$y_path_config/extentions.txt + echo "$*" >$y_path_config/extensions.txt ;; url_get) shift 1 diff --git a/src/nhttpd/yhttpd_core/helper.cpp b/src/nhttpd/yhttpd_core/helper.cpp index 8bd342654..83a0cd277 100644 --- a/src/nhttpd/yhttpd_core/helper.cpp +++ b/src/nhttpd/yhttpd_core/helper.cpp @@ -413,7 +413,7 @@ std::string yExecuteScript(std::string cmd) { script = cmd; // get file std::string fullfilename; - script += ".sh"; //add script extention + script += ".sh"; //add script extension char cwd[255]; getcwd(cwd, 254);