Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

2020-10-16 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Prepended 'RD_' to the names of all common Javascript functions
	in 'web/common/utils.js'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-10-16 13:53:24 -04:00
parent b67fefb3fc
commit bc050f937f
9 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20481,3 +20481,6 @@
filename for downloaded content.
2020-10-16 Fred Gleason <fredg@paravelsystems.com>
* Removed 'rdcastmanager.cgi'.
2020-10-16 Fred Gleason <fredg@paravelsystems.com>
* Prepended 'RD_' to the names of all common Javascript functions
in 'web/common/utils.js'.

1
configure.ac
View File

@ -526,6 +526,7 @@ AC_CONFIG_FILES([rivendell.spec \
rdhpi/Makefile \
cae/Makefile \
web/Makefile \
web/common/Makefile \
web/rdxport/Makefile \
web/tests/Makefile \
web/webget/Makefile \

3
web/Makefile.am
View File

@ -20,7 +20,8 @@
##
## Use automake to process this into a Makefile.in
SUBDIRS = rdxport\
SUBDIRS = common\
rdxport\
tests\
webget

33
web/common/Makefile.am Normal file
View File

@ -0,0 +1,33 @@
## automake.am
##
## Automake.am for rivendell/web/common
##
## (C) Copyright 2020 Fred Gleason <fredg@paravelsystems.com>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License version 2 as
## published by the Free Software Foundation.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public
## License along with this program; if not, write to the Free Software
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## Use automake to process this into a Makefile.in
install-exec-am:
mkdir -p $(DESTDIR)@libexecdir@
cp utils.js $(DESTDIR)@libexecdir@
uninstall-local:
rm -f $(DESTDIR)@libexecdir@/utils.js
EXTRA_DIST = utils.js
CLEANFILES = *~
MAINTAINERCLEANFILES = *~\
Makefile.in

12
web/tests/utils.js → web/common/utils.js
View File

@ -18,7 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
function PostForm(form,url)
function RD_PostForm(form,url)
{
var http=GetXMLHttpRequest();
if(http==null) {
@ -42,7 +42,7 @@ function PostForm(form,url)
}
function MakeMimeSeparator()
function RD_MakeMimeSeparator()
{
sep='----------------------------';
for(var i=0;i<27;i++) {
@ -53,7 +53,7 @@ function MakeMimeSeparator()
}
function AddMimePart(name,value,sep,is_last)
function RD_AddMimePart(name,value,sep,is_last)
{
var form='Content-Disposition: form-data; name="'+name+'"\r\n';
form+='\r\n';
@ -68,7 +68,7 @@ function AddMimePart(name,value,sep,is_last)
}
function UrlEncode(str) {
function RD_UrlEncode(str) {
var ret=new String;
for(i=0;i<str.length;i++) {
@ -115,7 +115,7 @@ function UrlEncode(str) {
}
function EncodeChar(c) {
function RD_EncodeChar(c) {
var ret=new String;
ret="%";
if(c<16) {
@ -143,7 +143,7 @@ var http_factories=[
];
function GetXMLHttpRequest() {
function RD_GetXMLHttpRequest() {
for(var i=0;i<http_factories.length;i++) {
try {
var factory=http_factories[i];

5
web/tests/Makefile.am
View File

@ -68,7 +68,6 @@ install-exec-am:
cp savestring.html $(DESTDIR)@libexecdir@
cp trimaudio.html $(DESTDIR)@libexecdir@
cp unassignschedcode.html $(DESTDIR)@libexecdir@
cp utils.js $(DESTDIR)@libexecdir@
uninstall-local:
rm -f $(DESTDIR)@libexecdir@/addcart.html
@ -118,7 +117,6 @@ uninstall-local:
rm -f $(DESTDIR)@libexecdir@/savestring.html
rm -f $(DESTDIR)@libexecdir@/trimaudio.html
rm -f $(DESTDIR)@libexecdir@/unassignschedcode.html
rm -f $(DESTDIR)@libexecdir@/utils.js
EXTRA_DIST = addcart.html\
addcut.html\
@ -166,8 +164,7 @@ EXTRA_DIST = addcart.html\
savepodcast.html\
savestring.html\
trimaudio.html\
unassignschedcode.html\
utils.js
unassignschedcode.html
CLEANFILES = *~
MAINTAINERCLEANFILES = *~\

20
web/tests/editcart.js
View File

@ -2,7 +2,7 @@
//
// Script for selecting cart label elements for the EditCart web method
//
// (C) Copyright 2015-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2015-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -21,7 +21,7 @@
function EditCart_Field(field,sep)
{
if(document.getElementById("USE_"+field).checked) {
return AddMimePart(field,document.getElementById(field).value,sep,false);
return RD_AddMimePart(field,document.getElementById(field).value,sep,false);
}
return '';
}
@ -29,7 +29,7 @@ function EditCart_Field(field,sep)
function EditCart_MakePost()
{
var sep=MakeMimeSeparator();
var sep=RD_MakeMimeSeparator();
form=sep+"\r\n";
form+=EditCart_Field('ASYNCHRONOUS',sep);
@ -49,14 +49,14 @@ function EditCart_MakePost()
form+=EditCart_Field('USER_DEFINED',sep);
form+=EditCart_Field('OWNER',sep);
form+=EditCart_Field('NOTES',sep);
form+=AddMimePart('LOGIN_NAME',document.getElementById('LOGIN_NAME').value,sep,false);
form+=AddMimePart('PASSWORD',document.getElementById('PASSWORD').value,sep,false);
form+=AddMimePart('TICKET',document.getElementById('TICKET').value,sep,false);
form+=AddMimePart('CART_NUMBER',document.getElementById('CART_NUMBER').value,sep,false);
form+=RD_AddMimePart('LOGIN_NAME',document.getElementById('LOGIN_NAME').value,sep,false);
form+=RD_AddMimePart('PASSWORD',document.getElementById('PASSWORD').value,sep,false);
form+=RD_AddMimePart('TICKET',document.getElementById('TICKET').value,sep,false);
form+=RD_AddMimePart('CART_NUMBER',document.getElementById('CART_NUMBER').value,sep,false);
if(document.getElementById("INCLUDE_CUTS").value.length==0) {
form+=AddMimePart('INCLUDE_CUTS',document.getElementById('INCLUDE_CUTS').value,sep,false);
form+=RD_AddMimePart('INCLUDE_CUTS',document.getElementById('INCLUDE_CUTS').value,sep,false);
}
form+=AddMimePart('COMMAND','14',sep,true);
form+=RD_AddMimePart('COMMAND','14',sep,true);
return form;
}
@ -70,5 +70,5 @@ function EditCart_ShowPost()
function EditCart_Submit()
{
PostForm(EditCart_MakePost(),"rdxport.cgi");
RD_PostForm(EditCart_MakePost(),"rdxport.cgi");
}

20
web/tests/editcut.js
View File

@ -2,7 +2,7 @@
//
// Script for selecting cut label elements for the EditCut web method
//
// (C) Copyright 2015 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2015-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -21,7 +21,7 @@
function EditCut_Field(field,sep)
{
if(document.getElementById("USE_"+field).checked) {
return AddMimePart(field,document.getElementById(field).value,sep,false);
return RD_AddMimePart(field,document.getElementById(field).value,sep,false);
}
return '';
}
@ -29,7 +29,7 @@ function EditCut_Field(field,sep)
function EditCut_MakePost()
{
var sep=MakeMimeSeparator();
var sep=RD_MakeMimeSeparator();
form=sep+"\r\n";
form+=EditCut_Field('EVERGREEN',sep);
@ -59,12 +59,12 @@ function EditCut_MakePost()
form+=EditCut_Field('TALK_START_POINT',sep);
form+=EditCut_Field('TALK_END_POINT',sep);
form+=EditCut_Field('WEIGHT',sep);
form+=AddMimePart('LOGIN_NAME',document.getElementById('LOGIN_NAME').value,sep,false);
form+=AddMimePart('PASSWORD',document.getElementById('PASSWORD').value,sep,false);
form+=AddMimePart('TICKET',document.getElementById('TICKET').value,sep,false);
form+=AddMimePart('CART_NUMBER',document.getElementById('CART_NUMBER').value,sep,false);
form+=AddMimePart('CUT_NUMBER',document.getElementById('CUT_NUMBER').value,sep,false);
form+=AddMimePart('COMMAND','15',sep,true);
form+=RD_AddMimePart('LOGIN_NAME',document.getElementById('LOGIN_NAME').value,sep,false);
form+=RD_AddMimePart('PASSWORD',document.getElementById('PASSWORD').value,sep,false);
form+=RD_AddMimePart('TICKET',document.getElementById('TICKET').value,sep,false);
form+=RD_AddMimePart('CART_NUMBER',document.getElementById('CART_NUMBER').value,sep,false);
form+=RD_AddMimePart('CUT_NUMBER',document.getElementById('CUT_NUMBER').value,sep,false);
form+=RD_AddMimePart('COMMAND','15',sep,true);
return form;
}
@ -78,5 +78,5 @@ function EditCut_ShowPost()
function EditCut_Submit()
{
PostForm(EditCut_MakePost(),"rdxport.cgi");
RD_PostForm(EditCut_MakePost(),"rdxport.cgi");
}

12
web/webget/webget.js
View File

@ -24,13 +24,13 @@ function Id(id)
function MakePost()
{
var sep=MakeMimeSeparator();
var sep=RD_MakeMimeSeparator();
form=sep+"\r\n";
form+=AddMimePart('title',Id('title').value,sep,false);
form+=AddMimePart('preset',Id('preset').value,sep,false);
form+=AddMimePart('LOGIN_NAME',Id('LOGIN_NAME').value,sep,false);
form+=AddMimePart('PASSWORD',Id('PASSWORD').value,sep,true);
form+=RD_AddMimePart('title',Id('title').value,sep,false);
form+=RD_AddMimePart('preset',Id('preset').value,sep,false);
form+=RD_AddMimePart('LOGIN_NAME',Id('LOGIN_NAME').value,sep,false);
form+=RD_AddMimePart('PASSWORD',Id('PASSWORD').value,sep,true);
return form;
}
@ -44,7 +44,7 @@ function ProcessOkButton()
function SendForm(form,url)
{
var http=GetXMLHttpRequest();
var http=RD_GetXMLHttpRequest();
if(http==null) {
return;
}