From 39536e651427e7c1034729258ccbcfd6ff903613 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 7 Nov 2017 14:43:21 -0500 Subject: [PATCH] 2017-11-07 Fred Gleason * Removed vestigal remnants of Host Security mode. --- ChangeLog | 2 ++ lib/librd_cs.ts | 2 +- lib/librd_de.ts | 2 +- lib/librd_es.ts | 2 +- lib/librd_fr.ts | 4 ---- lib/librd_nb.ts | 4 ---- lib/librd_nn.ts | 4 ---- lib/librd_pt_BR.ts | 2 +- lib/rdlist_logs.cpp | 29 ++++++++++------------------- lib/rdlist_logs.h | 11 +---------- rdadmin/edit_rdairplay.cpp | 2 +- 11 files changed, 18 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61d29cea..66c303d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16327,3 +16327,5 @@ dialog in rdlibrary(1). 2017-11-07 Fred Gleason * Added an 'RDLogFilter' widget. +2017-11-07 Fred Gleason + * Removed vestigal remnants of Host Security mode. diff --git a/lib/librd_cs.ts b/lib/librd_cs.ts index ce5ca9d5..27d01d59 100644 --- a/lib/librd_cs.ts +++ b/lib/librd_cs.ts @@ -1885,7 +1885,7 @@ Bitte Kofiguration prüfen und erneut versuchen. RDListLogs Select Log - User: - Vybrat zápis - uživatel: + Vybrat zápis - uživatel: Select Log diff --git a/lib/librd_de.ts b/lib/librd_de.ts index 1bbbb8d8..ce08e324 100644 --- a/lib/librd_de.ts +++ b/lib/librd_de.ts @@ -1876,7 +1876,7 @@ Bitte Kofiguration prüfen und erneut versuchen. RDListLogs Select Log - User: - Logbenutzer auswählen: + Logbenutzer auswählen: Select Log diff --git a/lib/librd_es.ts b/lib/librd_es.ts index f59f3801..3969b929 100644 --- a/lib/librd_es.ts +++ b/lib/librd_es.ts @@ -1882,7 +1882,7 @@ Do you still want to proceed? RDListLogs Select Log - User: - Seleccionar Playlist - Usuario: + Seleccionar Playlist - Usuario: Select Log diff --git a/lib/librd_fr.ts b/lib/librd_fr.ts index 155fe798..ee9508b3 100644 --- a/lib/librd_fr.ts +++ b/lib/librd_fr.ts @@ -1703,10 +1703,6 @@ Do you want to overwrite it? RDListLogs - - Select Log - User: - - Select Log diff --git a/lib/librd_nb.ts b/lib/librd_nb.ts index dc50f116..bb71d485 100644 --- a/lib/librd_nb.ts +++ b/lib/librd_nb.ts @@ -1876,10 +1876,6 @@ Sjekk eksportoppsettet ditt og prøv att. RDListLogs - - Select Log - User: - - Select Log diff --git a/lib/librd_nn.ts b/lib/librd_nn.ts index dc50f116..bb71d485 100644 --- a/lib/librd_nn.ts +++ b/lib/librd_nn.ts @@ -1876,10 +1876,6 @@ Sjekk eksportoppsettet ditt og prøv att. RDListLogs - - Select Log - User: - - Select Log diff --git a/lib/librd_pt_BR.ts b/lib/librd_pt_BR.ts index c9a5a8bf..5594a591 100644 --- a/lib/librd_pt_BR.ts +++ b/lib/librd_pt_BR.ts @@ -1880,7 +1880,7 @@ Por Favor, cheque suas configurações e tenbte outra vez. RDListLogs Select Log - User: - Selecionar Lista - Usuario: + Selecionar Lista - Usuario: Select Log diff --git a/lib/rdlist_logs.cpp b/lib/rdlist_logs.cpp index a76d9cc3..f3ea4ca5 100644 --- a/lib/rdlist_logs.cpp +++ b/lib/rdlist_logs.cpp @@ -21,15 +21,15 @@ #include #include #include +#include #include RDListLogs::RDListLogs(QString *logname,const QString &stationname, - QWidget *parent,RDUser *rduser) + QWidget *parent) : QDialog(parent,"",true) { list_stationname=stationname; list_logname=logname; - list_user=rduser; // // Fix the Window Size @@ -45,12 +45,7 @@ RDListLogs::RDListLogs(QString *logname,const QString &stationname, QFont button_font("Helvetica",12,QFont::Bold); button_font.setPixelSize(12); - if (list_user != 0) { // RDStation::UserSec - setCaption(QString().sprintf("%s%s",(const char *)tr("Select Log - User: "), - (const char *)list_user->name() )); - } else { // RDStation::HostSec - setCaption(tr("Select Log")); - } + setCaption(tr("Select Log")); // // Log List @@ -147,18 +142,14 @@ void RDListLogs::RefreshList() list_log_list->clear(); - if (list_user != 0) { // RDStation::UserSec - services_list = list_user->services(); - } else { // RDStation::HostSec - sql=QString().sprintf("select SERVICE_NAME from SERVICE_PERMS \ - where STATION_NAME=\"%s\"", - (const char *)list_stationname); - RDSqlQuery *q=new RDSqlQuery(sql); - while(q->next()) { - services_list.append( q->value(0).toString() ); - } - delete q; + sql=QString("select ")+ + "SERVICE_NAME from SERVICE_PERMS where "+ + "STATION_NAME=\""+RDEscapeString(list_stationname)+"\""; + q=new RDSqlQuery(sql); + while(q->next()) { + services_list.append( q->value(0).toString() ); } + delete q; if(services_list.size()==0) { return; diff --git a/lib/rdlist_logs.h b/lib/rdlist_logs.h index f92459d4..8f2d2903 100644 --- a/lib/rdlist_logs.h +++ b/lib/rdlist_logs.h @@ -30,21 +30,13 @@ #include #include #include -#include class RDListLogs : public QDialog { Q_OBJECT public: - /** - * Constructor for the RDListLogs object. - * - * NOTE: the presence of the optional rduser parameter is used to flag if - * user security should be used instead of host based security. - */ - RDListLogs(QString *logname,const QString &stationname, - QWidget *parent=0,RDUser *rduser=0); + RDListLogs(QString *logname,const QString &stationname,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; @@ -59,7 +51,6 @@ class RDListLogs : public QDialog QListView *list_log_list; QString *list_logname; QString list_stationname; - RDUser *list_user; }; diff --git a/rdadmin/edit_rdairplay.cpp b/rdadmin/edit_rdairplay.cpp index 8c310b98..b75147e1 100644 --- a/rdadmin/edit_rdairplay.cpp +++ b/rdadmin/edit_rdairplay.cpp @@ -1000,7 +1000,7 @@ void EditRDAirPlay::selectData() { QString logname=air_startlog_edit->text(); - RDListLogs *ll=new RDListLogs(&logname,air_conf->station(),this,admin_user); + RDListLogs *ll=new RDListLogs(&logname,air_conf->station(),this); if(ll->exec()==0) { air_startlog_edit->setText(logname); }