Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 07:05:48 +01:00
Code Issues Projects Releases Wiki Activity

2021-02-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the Qt3Support library from the build system.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-23 18:07:21 -05:00
parent b2f8532e25
commit 89a0d72439
508 changed files with 5763 additions and 6078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/rdxport/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2010-2021 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
@@ -17,7 +17,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -51,7 +51,7 @@ dist_rdxport_cgi_SOURCES = audioinfo.cpp\
nodist_rdxport_cgi_SOURCES = moc_rdxport.cpp
rdxport_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
rdxport_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
EXTRA_DIST = rdxport.pro

4
web/rdxport/audiostore.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- AudioStore service
//
// (C) Copyright 2014,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2014-2021 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
@@ -39,7 +39,7 @@ void Xport::AudioStore()
struct statvfs stat;
memset(&stat,0,sizeof(stat));
if(statvfs(rda->config()->audioRoot(),&stat)<0) {
if(statvfs(rda->config()->audioRoot().toUtf8(),&stat)<0) {
XmlExit("Internal Error",400,"audiostore.cpp",LINE_NUMBER);
}
printf("Content-type: application/xml\n");

28
web/rdxport/carts.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- Cart services
//
// (C) Copyright 2010-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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
@@ -55,11 +55,11 @@ void Xport::AddCart()
if(!xport_post->getValue("TYPE",&type)) {
XmlExit("Missing TYPE",400,"carts.cpp",LINE_NUMBER);
}
if(type.lower()=="audio") {
if(type.toLower()=="audio") {
cart_type=RDCart::Audio;
}
else {
if(type.lower()=="macro") {
if(type.toLower()=="macro") {
cart_type=RDCart::Macro;
}
else {
@@ -107,7 +107,7 @@ void Xport::AddCart()
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cartAdd>\n");
if(cart->exists()) {
printf("%s",(const char *)cart->xml(false,true).utf8());
printf("%s",(const char *)cart->xml(false,true).toUtf8());
SendNotification(RDNotification::CartType,RDNotification::AddAction,
QVariant(cart->number()));
}
@@ -137,10 +137,10 @@ void Xport::ListCarts()
xport_post->getValue("FILTER",&filter);
xport_post->getValue("INCLUDE_CUTS",&include_cuts);
xport_post->getValue("TYPE",&type);
if(type.lower()=="audio") {
if(type.toLower()=="audio") {
cart_type=RDCart::Audio;
}
if(type.lower()=="macro") {
if(type.toLower()=="macro") {
cart_type=RDCart::Macro;
}
@@ -174,7 +174,7 @@ void Xport::ListCarts()
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cartList>\n");
printf("%s\n",(const char *)RDCart::xml(q,include_cuts,true).utf8());
printf("%s\n",(const char *)RDCart::xml(q,include_cuts,true).toUtf8());
printf("</cartList>\n");
delete q;
Exit(0);
@@ -213,7 +213,7 @@ void Xport::ListCart()
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cartList>\n");
cart=new RDCart(cart_number);
printf("%s",(const char *)cart->xml(include_cuts,true).utf8());
printf("%s",(const char *)cart->xml(include_cuts,true).toUtf8());
delete cart;
printf("</cartList>\n");
@@ -298,7 +298,7 @@ void Xport::EditCart()
case RDCart::Macro:
line=0;
while(xport_post->getValue(QString().sprintf("MACRO%d",line++),&value)) {
value.stripWhiteSpace();
value.trimmed();
if(value.right(1)!="!") {
delete cart;
XmlExit("Invalid macro data",400,"carts.cpp",LINE_NUMBER);
@@ -399,7 +399,7 @@ void Xport::EditCart()
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cartList>\n");
printf("%s",(const char *)cart->xml(include_cuts,true).utf8());
printf("%s",(const char *)cart->xml(include_cuts,true).toUtf8());
SendNotification(RDNotification::CartType,RDNotification::ModifyAction,
QVariant(cart->number()));
delete cart;
@@ -493,7 +493,7 @@ void Xport::AddCut()
cut=new RDCut(cart_number,cut_number);
if(cut->exists()) {
printf("%s",
(const char *)RDCart::cutXml(cart_number,cut_number,true).utf8());
(const char *)RDCart::cutXml(cart_number,cut_number,true).toUtf8());
SendNotification(RDNotification::CartType,RDNotification::ModifyAction,
QVariant(cart->number()));
}
@@ -536,7 +536,7 @@ void Xport::ListCuts()
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cutList>\n");
while(q->next()) {
printf("%s\n",(const char *)RDCut::xml(q,false).utf8());
printf("%s\n",(const char *)RDCut::xml(q,false).toUtf8());
}
printf("</cutList>\n");
delete q;
@@ -580,7 +580,7 @@ void Xport::ListCut()
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cutList>\n");
printf("%s",(const char *)RDCart::cutXml(cart_number,cut_number,true).utf8());
printf("%s",(const char *)RDCart::cutXml(cart_number,cut_number,true).toUtf8());
printf("</cutList>\n");
delete cut;
@@ -860,7 +860,7 @@ void Xport::EditCut()
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cutList>\n");
printf("%s",(const char *)RDCart::cutXml(cart_number,cut_number,true).utf8());
printf("%s",(const char *)RDCart::cutXml(cart_number,cut_number,true).toUtf8());
printf("</cutList>\n");
SendNotification(RDNotification::CartType,RDNotification::ModifyAction,
QVariant(cut->cartNumber()));

8
web/rdxport/copyaudio.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- CopyAudio service
//
// (C) Copyright 2010-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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
@@ -72,9 +72,9 @@ void Xport::CopyAudio()
//
// Make the copy
//
unlink(RDCut::pathName(destination_cartnum,destination_cutnum));
if(link(RDCut::pathName(source_cartnum,source_cutnum),
RDCut::pathName(destination_cartnum,destination_cutnum))!=0) {
unlink(RDCut::pathName(destination_cartnum,destination_cutnum).toUtf8());
if(link(RDCut::pathName(source_cartnum,source_cutnum).toUtf8(),
RDCut::pathName(destination_cartnum,destination_cutnum).toUtf8())!=0) {
XmlExit(strerror(errno),400,"copyaudio.cpp",LINE_NUMBER);
}
SendNotification(RDNotification::CartType,RDNotification::ModifyAction,

8
web/rdxport/deleteaudio.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- DeleteAudio service
//
// (C) Copyright 2010-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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
@@ -58,8 +58,8 @@ void Xport::DeleteAudio()
delete cut;
XmlExit("No such cut",404,"deleteaudio.cpp",LINE_NUMBER);
}
unlink(RDCut::pathName(cartnum,cutnum));
unlink(RDCut::pathName(cartnum,cutnum)+".energy");
unlink(RDCut::pathName(cartnum,cutnum).toUtf8());
unlink((RDCut::pathName(cartnum,cutnum)+".energy").toUtf8());
QString sql=QString("delete from CUT_EVENTS where ")+
"CUT_NAME=\""+RDCut::cutName(cartnum,cutnum)+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
@@ -67,7 +67,7 @@ void Xport::DeleteAudio()
SendNotification(RDNotification::CartType,RDNotification::ModifyAction,
QVariant(cartnum));
rda->syslog(LOG_DEBUG,"unlink(%s): %s",
(const char *)RDCut::pathName(cartnum,cutnum).utf8(),
(const char *)RDCut::pathName(cartnum,cutnum).toUtf8(),
strerror(errno));
delete cut;
XmlExit("OK",200,"deleteaudio.cpp",LINE_NUMBER);

6
web/rdxport/export.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- Export service
//
// (C) Copyright 2010-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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
@@ -178,13 +178,13 @@ void Xport::Export()
break;
}
fflush(NULL);
if((fd=open(tmpfile,O_RDONLY))>=0) {
if((fd=open(tmpfile.toUtf8(),O_RDONLY))>=0) {
while((n=read(fd,data,2048))>0) {
write(1,data,n);
}
}
close(fd);
unlink(tmpfile);
unlink(tmpfile.toUtf8());
// rmdir(tmpdir);
delete tempdir;
Exit(0);

4
web/rdxport/groups.cpp
View File

@@ -58,7 +58,7 @@ void Xport::ListGroups()
printf("<groupList>\n");
while(q->next()) {
group=new RDGroup(q->value(0).toString());
printf("%s",(const char *)group->xml().utf8());
printf("%s",(const char *)group->xml().toUtf8());
delete group;
}
printf("</groupList>\n");
@@ -102,7 +102,7 @@ void Xport::ListGroup()
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
group=new RDGroup(q->value(0).toString());
printf("%s",(const char *)group->xml().utf8());
printf("%s",(const char *)group->xml().toUtf8());
delete group;
delete q;

6
web/rdxport/import.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- Import service
//
// (C) Copyright 2010-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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
@@ -271,8 +271,8 @@ void Xport::Import()
printf("</RDWebResult>\r\n");
SendNotification(RDNotification::CartType,RDNotification::ModifyAction,
QVariant(cartnum));
unlink(filename);
rmdir(xport_post->tempDir());
unlink(filename.toUtf8());
rmdir(xport_post->tempDir().toUtf8());
exit(0);
}
XmlExit(RDAudioConvert::errorText(conv_err),resp_code,"import.cpp",

32
web/rdxport/logs.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- Log services
//
// (C) Copyright 2013-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2021 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
@@ -126,7 +126,7 @@ void Xport::ListLogs()
xport_post->getValue("LOG_NAME",&log_name);
xport_post->getValue("TRACKABLE",&trackable);
xport_post->getValue("FILTER",&filter);
filter=filter.stripWhiteSpace();
filter=filter.trimmed();
xport_post->getValue("RECENT",&recent);
//
@@ -166,11 +166,11 @@ void Xport::ListLogs()
sql+="(LOGS.DESCRIPTION like \"%%"+RDEscapeString(filter)+"%%\"))&&";
}
}
sql=sql.stripWhiteSpace();
sql=sql.trimmed();
if(sql.right(2)=="&&") {
sql=sql.left(sql.length()-2);
}
sql=sql.stripWhiteSpace();
sql=sql.trimmed();
if(sql.right(5)=="where") {
sql=sql.left(sql.length()-5);
}
@@ -192,7 +192,7 @@ void Xport::ListLogs()
printf("<logList>\n");
while(q->next()) {
log=new RDLog(q->value(0).toString());
printf("%s",(const char *)log->xml().utf8());
printf("%s",(const char *)log->xml().toUtf8());
delete log;
}
printf("</logList>\n");
@@ -233,7 +233,7 @@ void Xport::ListLog()
printf("Content-type: application/xml\n");
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("%s\n",(const char *)log_model->xml().utf8());
printf("%s\n",(const char *)log_model->xml().toUtf8());
Exit(0);
}
@@ -346,13 +346,13 @@ void Xport::SaveLog()
XmlExit("Missing "+line+"_TRANS_TYPE",400,"logs.cpp",LINE_NUMBER);
}
integer1=-1;
if(str.lower()=="play") {
if(str.toLower()=="play") {
integer1=RDLogLine::Play;
}
if(str.lower()=="segue") {
if(str.toLower()=="segue") {
integer1=RDLogLine::Segue;
}
if(str.lower()=="stop") {
if(str.toLower()=="stop") {
integer1=RDLogLine::Stop;
}
if(integer1<0) {
@@ -565,15 +565,15 @@ void Xport::LockLog()
if(!xport_post->getValue("OPERATION",&op_string)) {
XmlExit("Missing OPERATION",400,"logs.cpp",LINE_NUMBER);
}
if(op_string.lower()=="create") {
if(op_string.toLower()=="create") {
op_type=Xport::LockLogCreate;
}
else {
if(op_string.lower()=="update") {
if(op_string.toLower()=="update") {
op_type=Xport::LockLogUpdate;
}
else {
if(op_string.lower()=="clear") {
if(op_string.toLower()=="clear") {
op_type=Xport::LockLogClear;
}
else {
@@ -603,24 +603,24 @@ void Xport::LockLog()
addr=xport_remote_address;
lock_guid=RDLogLock::makeGuid(xport_remote_hostname);
if(RDLogLock::tryLock(&username,&stationname,&addr,log_name,lock_guid)) {
printf("%s",(const char *)LogLockXml(true,log_name,lock_guid,"","",addr).utf8());
printf("%s",(const char *)LogLockXml(true,log_name,lock_guid,"","",addr).toUtf8());
}
else {
printf("%s",(const char *)LogLockXml(false,log_name,"",username,
stationname,addr).utf8());
stationname,addr).toUtf8());
}
Exit(0);
break;
case Xport::LockLogUpdate:
RDLogLock::updateLock(log_name,lock_guid);
printf("%s",(const char *)LogLockXml(true,log_name,lock_guid,"","",addr).utf8());
printf("%s",(const char *)LogLockXml(true,log_name,lock_guid,"","",addr).toUtf8());
Exit(0);
break;
case Xport::LockLogClear:
RDLogLock::clearLock(lock_guid);
printf("%s",(const char *)LogLockXml(true,log_name,lock_guid,"","",addr).utf8());
printf("%s",(const char *)LogLockXml(true,log_name,lock_guid,"","",addr).toUtf8());
Exit(0);
break;
}

6
web/rdxport/podcasts.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- Podcast services
//
// (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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
@@ -397,7 +397,7 @@ bool Xport::PostRssElemental(RDFeed *feed,const QDateTime &now,QString *err_msg)
curl_easy_setopt(curl,CURLOPT_TIMEOUT,RD_CURL_TIMEOUT);
curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
curl_easy_setopt(curl,CURLOPT_USERAGENT,
(const char *)rda->config()->userAgent().utf8());
(const char *)rda->config()->userAgent().toUtf8());
curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errstr);
//
@@ -616,7 +616,7 @@ void Xport::PostImage()
curl_easy_setopt(curl,CURLOPT_TIMEOUT,RD_CURL_TIMEOUT);
curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
curl_easy_setopt(curl,CURLOPT_USERAGENT,
(const char *)rda->config()->userAgent().utf8());
(const char *)rda->config()->userAgent().toUtf8());
curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errstr);
//

20
web/rdxport/rdxport.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal
//
// (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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
@@ -29,9 +29,7 @@
#include <map>
#include <qapplication.h>
#include <qdatetime.h>
#include <qstringlist.h>
#include <QApplication>
#include <rdapplication.h>
#include <rddb.h>
@@ -56,7 +54,7 @@ Xport::Xport(QObject *parent)
printf("Content-type: text/html\n");
printf("Status: 500\n");
printf("\n");
printf("rdxport.cgi: %s\n",(const char *)err_msg.utf8());
printf("rdxport.cgi: %s\n",(const char *)err_msg.toUtf8());
Exit(0);
}
@@ -69,7 +67,7 @@ Xport::Xport(QObject *parent)
printf("Status: 500\n");
printf("\n");
printf("rdxport.cgi: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i).utf8());
(const char *)rda->cmdSwitch()->key(i).toUtf8());
Exit(0);
}
}
@@ -96,7 +94,7 @@ Xport::Xport(QObject *parent)
printf("rdxport: missing REQUEST_METHOD\n");
Exit(0);
}
if(QString(getenv("REQUEST_METHOD")).lower()!="post") {
if(QString(getenv("REQUEST_METHOD")).toLower()!="post") {
printf("Content-type: text/html\n\n");
printf("rdxport: invalid web method\n");
Exit(0);
@@ -413,9 +411,9 @@ void Xport::TryCreateTicket(const QString &name)
printf("Content-type: application/xml\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<ticketInfo>\n");
printf(" %s\n",RDXmlField("ticket",ticket).utf8().constData());
printf(" %s\n",RDXmlField("ticket",ticket).toUtf8().constData());
printf(" %s\n",
(const char *)RDXmlField("expires",expire_datetime).utf8());
(const char *)RDXmlField("expires",expire_datetime).toUtf8());
printf("</ticketInfo>\n");
exit(0);
}
@@ -460,11 +458,11 @@ void Xport::XmlExit(const QString &str,int code,const QString &srcfile,
}
#ifdef RDXPORT_DEBUG
if(srcline>0) {
RDXMLResult(str+" \""+srcfile+"\" "+QString().sprintf("line %d",srcline),
RDXMLResult((str+" \""+srcfile+"\" "+QString().sprintf("line %d",srcline)).toUtf8(),
code,err);
}
else {
RDXMLResult(str,code,err);
RDXMLResult(str.toUtf8(),code,err);
}
#else
RDXMLResult(str,code,err);

8
web/rdxport/schedcodes.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal
//
// (C) Copyright 2015-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2015-2021 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
@@ -18,8 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qstringlist.h>
#include <rdapplication.h>
#include <rdcart.h>
#include <rddb.h>
@@ -48,7 +46,7 @@ void Xport::ListSchedCodes()
printf("<schedCodeList>\n");
while(q->next()) {
schedcode=new RDSchedCode(q->value(0).toString());
printf("%s",(const char *)schedcode->xml().utf8());
printf("%s",(const char *)schedcode->xml().toUtf8());
delete schedcode;
}
printf("</schedCodeList>\n");
@@ -178,7 +176,7 @@ void Xport::ListCartSchedCodes()
printf("<schedCodeList>\n");
for(int i=0;i<codes.size();i++) {
schedcode=new RDSchedCode(codes[i]);
printf("%s",(const char *)schedcode->xml().utf8());
printf("%s",(const char *)schedcode->xml().toUtf8());
delete schedcode;
}
printf("</schedCodeList>\n");

4
web/rdxport/services.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- Service services
//
// (C) Copyright 2010-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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
@@ -78,7 +78,7 @@ void Xport::ListServices()
printf("<serviceList>\n");
while(q->next()) {
svc=new RDSvc(q->value(0).toString(),rda->station(),rda->config());
printf("%s",(const char *)svc->xml().utf8());
printf("%s",(const char *)svc->xml().toUtf8());
delete svc;
}
printf("</serviceList>\n");

2
web/rdxport/systemsettings.cpp
View File

@@ -40,6 +40,6 @@ void Xport::ListSystemSettings()
//
printf("Content-type: application/xml\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("%s\n",(const char *)sys->xml().utf8());
printf("%s\n",(const char *)sys->xml().toUtf8());
Exit(0);
}

8
web/rdxport/tests.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- save string test
//
// (C) Copyright 2018-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2021 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
@@ -50,11 +50,11 @@ void Xport::SaveString()
//
// Process Request
//
rda->syslog(LOG_INFO,"SAVESTRING: |%s|",(const char *)string.utf8());
rda->syslog(LOG_INFO,"SAVESTRING: |%s|",(const char *)string.toUtf8());
printf("Content-type: application/xml; charset: UTF-8\n");
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("%s\n",(const char *)RDXmlField("string",string).utf8());
printf("%s\n",(const char *)RDXmlField("string",string).toUtf8());
Exit(0);
}
@@ -81,7 +81,7 @@ void Xport::SaveFile()
printf("Content-type: text/html; charset: UTF-8\n");
printf("Status: 200\n\n");
printf("%s\n",(const char *)msg.utf8());
printf("%s\n",(const char *)msg.toUtf8());
Exit(0);
}