mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: replace hardcoded paths (/var/httpd -> %(PUBLIC_HTTPDDIR))

Browse Source 
Origin commit data
------------------
Commit: d5e62bd379
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- yWeb: replace hardcoded paths (/var/httpd -> %(PUBLIC_HTTPDDIR))
This commit is contained in:
vanhofen
2016-10-01 11:06:11 +02:00
parent c4afe9d19d
commit 57589fc83c
10 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nhttpd/web/Makefile.am
View File

@@ -106,5 +106,6 @@ install-data-hook:
sed -i \ sed -i \
-e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \ -e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \
-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \ -e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
-e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \
; ;

2
src/nhttpd/web/Y_About.yhtm
View File

@@ -1,7 +1,7 @@
{=var-set:cancache=yPConf=} {=var-set:cancache=yPConf=}
{=include-block:Y_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head=}
</head> </head>
{=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;/var/httpd=}=} {=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=}
{=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=} {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=}
<body> <body>
<div class="work_box"> <div class="work_box">

2
src/nhttpd/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:/var/httpd/extentions.txt~/var/httpd/extentions.txt~/share/tuxbox/neutrino/httpd/extentions.txt=}=}=} {=var-set:extension={=if-file-exists:%(CONFIGDIR)/extentions.txt~%(CONFIGDIR)/extentions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~%(PUBLIC_HTTPDDIR)/extentions.txt~/share/tuxbox/neutrino/httpd/extentions.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
src/nhttpd/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:/var/httpd/extentions.txt~{=include:/var/httpd/extentions.txt=}~{=include:/share/tuxbox/neutrino/httpd/extentions.txt=}=}=}</textarea></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:/share/tuxbox/neutrino/httpd/extentions.txt=}=}=}</textarea></td>
</tr> </tr>
</table> </table>
<br/> <br/>

2
src/nhttpd/web/Y_Menue.yhtm
View File

@@ -80,7 +80,7 @@ function vlc() {
} }
</style> </style>
</head> </head>
{=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;/var/httpd=}=} {=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=}
{=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=} {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=}
<body> <body>
<div class="y_menu_prim_box"> <div class="y_menu_prim_box">

2
src/nhttpd/web/Y_Settings_Timer.yhtm
View File

@@ -50,7 +50,7 @@ function do_submit() {
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td><textarea name="channels" cols="60" rows="10">{=if-file-exists:%(CONFIGDIR)/channels.txt~{=include:%(CONFIGDIR)/channels.txt=}~{=if-file-exists:/var/httpd/channels.txt~{=include:/var/httpd/channels.txt=}~{=include:/share/tuxbox/neutrino/httpd/channels.txt=}=}=}</textarea></td> <td><textarea name="channels" cols="60" rows="10">{=if-file-exists:%(CONFIGDIR)/channels.txt~{=include:%(CONFIGDIR)/channels.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/channels.txt~{=include:%(PUBLIC_HTTPDDIR)/channels.txt=}~{=include:/share/tuxbox/neutrino/httpd/channels.txt=}=}=}</textarea></td>
</tr> </tr>
</table> </table>
<br/> <br/>

2
src/nhttpd/web/extentions/boxinfo/install.sh
View File

@@ -19,7 +19,7 @@ yI_Version="$Revision: 1.3 $"
y_path_usrbin="/var/bin" y_path_usrbin="/var/bin"
y_path_config="%(CONFIGDIR)" y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp" y_path_tmp="/tmp"
y_ywebover_dir="/var/httpd" y_ywebover_dir="%(PUBLIC_HTTPDDIR)"
y_ext_conf_dir="$y_path_config/ext" y_ext_conf_dir="$y_path_config/ext"
# ----------------------------------------------------------- # -----------------------------------------------------------

2
src/nhttpd/web/extentions/boxinfo/uninstall.sh
View File

@@ -19,7 +19,7 @@ yI_Version="$Revision: 1.4 $"
y_path_usrbin="/var/bin" y_path_usrbin="/var/bin"
y_path_config="%(CONFIGDIR)" y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp" y_path_tmp="/tmp"
y_ywebover_dir="/var/httpd" y_ywebover_dir="%(PUBLIC_HTTPDDIR)"
y_ext_conf_dir="$y_path_config/ext" y_ext_conf_dir="$y_path_config/ext"
# ----------------------------------------------------------- # -----------------------------------------------------------

2
src/nhttpd/web/extentions/hddtools/install.sh
View File

@@ -19,7 +19,7 @@ yI_Version="$Revision: 1.3 $"
y_path_usrbin="/var/bin" y_path_usrbin="/var/bin"
y_path_config="%(CONFIGDIR)" y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp" y_path_tmp="/tmp"
y_ywebover_dir="/var/httpd" y_ywebover_dir="%(PUBLIC_HTTPDDIR)"
y_ext_conf_dir="$y_path_config/ext" y_ext_conf_dir="$y_path_config/ext"
# ----------------------------------------------------------- # -----------------------------------------------------------

2
src/nhttpd/web/extentions/hddtools/uninstall.sh
View File

@@ -19,7 +19,7 @@ yI_Version="$Revision: 1.4 $"
y_path_usrbin="/var/bin" y_path_usrbin="/var/bin"
y_path_config="%(CONFIGDIR)" y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp" y_path_tmp="/tmp"
y_ywebover_dir="/var/httpd" y_ywebover_dir="%(PUBLIC_HTTPDDIR)"
y_ext_conf_dir="$y_path_config/ext" y_ext_conf_dir="$y_path_config/ext"
# ----------------------------------------------------------- # -----------------------------------------------------------