mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: switch to own (empty) yWeb-Extensions infrastructure

Browse Source 
* fix typo (extentions => extensions)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 64f3c0295b
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-09-18 (Sun, 18 Sep 2022)

Origin message was:
------------------
- yWeb: switch to own (empty) yWeb-Extensions infrastructure

* fix typo (extentions => extensions)


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-09-18 22:16:57 +02:00
parent 3bf3fdf369
commit 468e4035e5
14 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/y-web/Makefile.am
View File

@@ -6,7 +6,7 @@ SUBDIRS += favicon info jquery lcd4linux
installdir = $(PRIVATE_HTTPDDIR) installdir = $(PRIVATE_HTTPDDIR)
install_DATA = channels.js \ install_DATA = channels.js \
extentions.txt \ extensions.txt \
favicon.ico \ favicon.ico \
index.html \ index.html \
prototype.js \ prototype.js \

2
data/y-web/Y_Blocks.txt
View File

@@ -146,7 +146,7 @@ end-block~personalize_save_settings
# ------- Ext save Settings # ------- Ext save Settings
start-block~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 end-block~ext_save_settings
# ------- No Managemant Error # ------- No Managemant Error

2
data/y-web/Y_Ext_Menue.yhtm
View File

@@ -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~=}=} {=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=} {=include-block:Y_Blocks.txt;head=}
<script type="text/javascript" src="/prototype.js"></script> <script type="text/javascript" src="/prototype.js"></script>

2
data/y-web/Y_Ext_Settings.yhtm
View File

@@ -23,7 +23,7 @@ function do_submit(){
<table border="0" class="y_form_table" cellspacing="0" cellpadding="0"> <table border="0" class="y_form_table" cellspacing="0" cellpadding="0">
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td><textarea name="extentions" id="ext" cols="90" rows="30" title="extention list">{=if-file-exists:%(CONFIGDIR)/extentions.txt~{=include:%(CONFIGDIR)/extentions.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~{=include:%(PUBLIC_HTTPDDIR)/extentions.txt=}~{=include:%(PRIVATE_HTTPDDIR)/extentions.txt=}=}=}</textarea></td> <td><textarea name="extensions" id="ext" cols="90" rows="30" title="extension list">{=if-file-exists:%(CONFIGDIR)/extensions.txt~{=include:%(CONFIGDIR)/extensions.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extensions.txt~{=include:%(PUBLIC_HTTPDDIR)/extensions.txt=}~{=include:%(PRIVATE_HTTPDDIR)/extensions.txt=}=}=}</textarea></td>
</tr> </tr>
</table> </table>
<br/> <br/>

2
data/y-web/Y_Ext_Uninstall.yhtm
View File

@@ -63,7 +63,7 @@ function init(){
<form name="f" accept-charset="UTF-8" action="/y/cgi"> <form name="f" accept-charset="UTF-8" action="/y/cgi">
<table border="0" class="y_form_table" cellspacing="0" cellpadding="0"> <table border="0" class="y_form_table" cellspacing="0" cellpadding="0">
<tr> <tr>
<td><textarea name="extentions" cols="90" rows="5" title="extention list"></textarea></td> <td><textarea name="extensions" cols="90" rows="5" title="extension list"></textarea></td>
</tr> </tr>
</table> </table>
<br/> <br/>

6
data/y-web/Y_Ext_Update.js
View File

@@ -33,7 +33,7 @@ function sLog_addRow(_body, state, action_text, state_text){
var update_body; var update_body;
/*<upd_site>,<type=n|m>,<link text>,<link helptext>,<url>,<unique tag>,<version>,<url of installer>*/ /*<upd_site>,<type=n|m>,<link text>,<link helptext>,<url>,<unique tag>,<version>,<url of installer>*/
/*<type=n|m>,<link text>,<link helptext>,<url>,<unique tag>,<version>*/ /*<type=n|m>,<link text>,<link helptext>,<url>,<unique tag>,<version>*/
/*<type=u>,<update site name>,<update site helptext>,<url of extention list>*/ /*<type=u>,<update site name>,<update site helptext>,<url of extension list>*/
function list_init(){ function list_init(){
update_body=$("update_list"); update_body=$("update_list");
} }
@@ -150,7 +150,7 @@ function do_set_updates2(){
} }
sLog_addRow(sLog_body, "green", "updating local extension list. Starting ...", "ok"); sLog_addRow(sLog_body, "green", "updating local extension list. Starting ...", "ok");
var extfile=ext.build_extension_file(); var extfile=ext.build_extension_file();
document.f.extentions.value=extfile; document.f.extensions.value=extfile;
show_waitbox(false); show_waitbox(false);
alert("Update finished. Menue reload."); alert("Update finished. Menue reload.");
do_submit(); do_submit();
@@ -217,7 +217,7 @@ function do_uninstall2(tag){
sLog_addRow(sLog_body, "green", "uninstalled: "+tag+"<br/>"+res, "ok"); sLog_addRow(sLog_body, "green", "uninstalled: "+tag+"<br/>"+res, "ok");
sLog_addRow(sLog_body, "green", "updating local extension list. Starting ...", "ok"); sLog_addRow(sLog_body, "green", "updating local extension list. Starting ...", "ok");
var extfile=ext.build_extension_file(); var extfile=ext.build_extension_file();
document.f.extentions.value=extfile; document.f.extensions.value=extfile;
show_waitbox(false); show_waitbox(false);
alert("Update finished. Menue reload."); alert("Update finished. Menue reload.");
do_submit(); do_submit();

2
data/y-web/Y_Ext_Update.yhtm
View File

@@ -54,7 +54,7 @@
<form name="f" accept-charset="UTF-8" action="/y/cgi"> <form name="f" accept-charset="UTF-8" action="/y/cgi">
<table border="0" class="y_form_table" cellspacing="0" cellpadding="0"> <table border="0" class="y_form_table" cellspacing="0" cellpadding="0">
<tr> <tr>
<td><textarea name="extentions" cols="90" rows="5" title="extention list"></textarea></td> <td><textarea name="extensions" cols="90" rows="5" title="extension list"></textarea></td>
</tr> </tr>
</table> </table>
<br/> <br/>

2
data/y-web/Y_Filemgr.yhtm
View File

@@ -437,7 +437,7 @@ function do_prop(prop){
show_prop(); show_prop();
document.edit.fitem.value = explorer.ac_item; document.edit.fitem.value = explorer.ac_item;
// Fileextention handling // Fileextension handling
var fullfname = explorer.build_fname(); var fullfname = explorer.build_fname();
switch(explorer.ac_prop.get('ext')){ switch(explorer.ac_prop.get('ext')){
case "xml": case "xml":

4
data/y-web/Y_Version.txt
View File

@@ -1,3 +1,3 @@
version=2.9.1.12 version=2.9.1.13
date=06.09.2022 date=18.09.2022
info=NI-Neutrino info=NI-Neutrino

2
data/y-web/Y_yweb.js
View File

@@ -76,7 +76,7 @@ else
/* Class Y.extension */ /* Class Y.extension */
Y.extension = new Class.create(); Y.extension = new Class.create();
Object.extend(Y.extension.prototype, { 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 */ conf_version: 2,/* ver of local conf file */
upd_version: 2, /* ver of upd file */ upd_version: 2, /* ver of upd file */
file: "", file: "",

2
data/y-web/extensions.txt Normal file
View File

@@ -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

1
data/y-web/extentions.txt
View File

@@ -1 +0,0 @@
type:u,site:Tuxbox-Neutrino,desc:yWeb extentions,url:https://raw.githubusercontent.com/tuxbox-neutrino/gui-yweb/master/Y_Extentions.txt

10
data/y-web/scripts/Y_Tools.sh
View File

@@ -336,7 +336,7 @@ do_installer()
} }
# ----------------------------------------------------------- # -----------------------------------------------------------
# extention Installer $1=URL # extension Installer $1=URL
# ----------------------------------------------------------- # -----------------------------------------------------------
do_ext_installer() do_ext_installer()
{ {
@@ -515,16 +515,16 @@ case "$1" in
fi fi
;; ;;
get_extension_list) get_extension_list)
if [ -e "$y_path_config/extentions.txt" ] if [ -e "$y_path_config/extensions.txt" ]
then then
cat $y_path_config/extentions.txt cat $y_path_config/extensions.txt
else else
cat $y_path_httpd/extentions.txt cat $y_path_httpd/extensions.txt
fi fi
;; ;;
write_extension_list) write_extension_list)
shift 1 shift 1
echo "$*" >$y_path_config/extentions.txt echo "$*" >$y_path_config/extensions.txt
;; ;;
url_get) url_get)
shift 1 shift 1

2
src/nhttpd/yhttpd_core/helper.cpp
View File

@@ -413,7 +413,7 @@ std::string yExecuteScript(std::string cmd) {
script = cmd; script = cmd;
// get file // get file
std::string fullfilename; std::string fullfilename;
script += ".sh"; //add script extention script += ".sh"; //add script extension
char cwd[255]; char cwd[255];
getcwd(cwd, 254); getcwd(cwd, 254);