diff --git a/ChangeLog b/ChangeLog index 8766f94d..6f29a209 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16185,3 +16185,6 @@ in RDLogManager->ManageReports. 2017-10-19 Fred Gleason * Cleaned up build warnings under Linux. +2017-10-19 Fred Gleason + * Removed 'RDStation::broadcastSecurity()' and + 'RDStation::setBroadcastSecurity()' methods. diff --git a/lib/rdstation.cpp b/lib/rdstation.cpp index 98136021..df8ba3f1 100644 --- a/lib/rdstation.cpp +++ b/lib/rdstation.cpp @@ -232,21 +232,6 @@ void RDStation::setBackupLife(int days) const } -void RDStation::setBroadcastSecurity(BroadcastSecurityMode mode) -{ - SetRow("BROADCAST_SECURITY",mode); -} - - -RDStation::BroadcastSecurityMode RDStation::broadcastSecurity() const -{ - return (RDStation::BroadcastSecurityMode)RDGetSqlValue("STATIONS","NAME", - station_name, - "BROADCAST_SECURITY"). - toUInt(); -} - - unsigned RDStation::heartbeatCart() const { return RDGetSqlValue("STATIONS","NAME",station_name,"HEARTBEAT_CART"). diff --git a/lib/rdstation.h b/lib/rdstation.h index 5c17f757..eb7a092a 100644 --- a/lib/rdstation.h +++ b/lib/rdstation.h @@ -30,15 +30,6 @@ class RDStation { public: enum AudioDriver {None=0,Hpi=1,Jack=2,Alsa=3}; - /** - * Enum to track the state of the broadcast applications security model. - * @see setBroadcastSecurity() - * @see broadcastSecurity() - */ - enum BroadcastSecurityMode { - HostSec=0, /**< HostSec - original host (or no) security. */ - UserSec=1 /**< UserSec - user based security. */ - }; enum Capability {HaveOggenc=0,HaveOgg123=1,HaveFlac=2, HaveLame=3,HaveMpg321=4,HaveTwoLame=5,HaveMp4Decode=6}; enum FilterMode {FilterSynchronous=0,FilterAsynchronous=1}; @@ -69,21 +60,6 @@ class RDStation void setBackupPath(QString path) const; int backupLife() const; void setBackupLife(int days) const; - - /** - * Set the Broadcast applications (rdairplay, rdlogedit, rdlogmanager) - * security mode. - * - * @param mode An enum with the desired mode. - */ - void setBroadcastSecurity(BroadcastSecurityMode mode); - - /** - * Get the Broadcast applicaitons security mode. - * - * @return An enum with the current mode. - */ - BroadcastSecurityMode broadcastSecurity() const; unsigned heartbeatCart() const; void setHeartbeatCart(unsigned cartnum) const; unsigned heartbeatInterval() const; diff --git a/rdairplay/list_logs.cpp b/rdairplay/list_logs.cpp index 389abf04..1ee4410d 100644 --- a/rdairplay/list_logs.cpp +++ b/rdairplay/list_logs.cpp @@ -175,12 +175,7 @@ void ListLogs::saveAsButtonData() QString logname; QString svcname=*list_svcname; RDAddLog *log; - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - log=new RDAddLog(&logname,&svcname,rdstation_conf, - tr("Rename Log"),this,rduser); - } else { // RDStation::HostSec - log=new RDAddLog(&logname,&svcname,rdstation_conf,tr("Rename Log"),this); - } + log=new RDAddLog(&logname,&svcname,rdstation_conf,tr("Rename Log"),this); if(log->exec()<0) { delete log; @@ -215,22 +210,14 @@ void ListLogs::RefreshList() list_log_list->clear(); - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - if(rduser!=NULL) { - services_list = rduser->services(); - } - } - else { // RDStation::HostSec - sql=QString().sprintf("select SERVICE_NAME from SERVICE_PERMS \ + sql=QString().sprintf("select SERVICE_NAME from SERVICE_PERMS \ where STATION_NAME=\"%s\"", - (const char *)rdstation_conf->name()); - q=new RDSqlQuery(sql); - while(q->next()) { - services_list.append( q->value(0).toString() ); - } - delete q; + (const char *)rdstation_conf->name()); + 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/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index 09cfe031..a97a47c7 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -1392,12 +1392,7 @@ void MainWidget::logReloadedData(int log) left(air_log[0]->logName().length()-4))); if(air_log[0]->logName().isEmpty()) { if(air_panel!=NULL) { - if(rdstation_conf->broadcastSecurity()==RDStation::UserSec) { - air_panel->setSvcName( - rduser->serviceCheckDefault( rdairplay_conf->defaultSvc() ) ); - } else { // RDStation::HostSec - air_panel->setSvcName(rdairplay_conf->defaultSvc()); - } + air_panel->setSvcName(rdairplay_conf->defaultSvc()); } } else { @@ -1492,19 +1487,6 @@ void MainWidget::userData() air_log_list[i]->userChanged(add_allowed,delete_allowed, arrange_allowed,playout_allowed); } - - // Update default services for the new user, if applicable. - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - QString default_svcname = - rduser->serviceCheckDefault( rdairplay_conf->defaultSvc() ); - for(int i=0;isetDefaultServiceName(default_svcname); - } - if(air_panel!=NULL) { - air_panel->setSvcName(default_svcname); - } - } - } @@ -2399,19 +2381,14 @@ void MainWidget::SetActionMode(StartButton::Mode mode) } } if(svc_quan==0) { - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - services_list = rduser->services(); - } else { // RDStation::HostSec - sql=QString().sprintf("select SERVICE_NAME from SERVICE_PERMS \ + sql=QString().sprintf("select SERVICE_NAME from SERVICE_PERMS \ where STATION_NAME=\"%s\"", - (const char *)rdstation_conf->name()); - q=new RDSqlQuery(sql); - while(q->next()) { - services_list.append( q->value(0).toString() ); - } - delete q; - } - + (const char *)rdstation_conf->name()); + q=new RDSqlQuery(sql); + while(q->next()) { + services_list.append( q->value(0).toString() ); + } + delete q; for ( QStringList::Iterator it = services_list.begin(); it != services_list.end()&&svc_quan<(RD_MAX_DEFAULT_SERVICES-1); ++it ) { diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index b9daf153..8b0131ba 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -529,16 +529,13 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_purgedate_box->setChecked(true); edit_purgedate_edit->setDate(purge_date); } - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - services_list = rduser->services(); - } else { // RDStation::HostSec - sql=QString("select NAME from SERVICES"); - q=new RDSqlQuery(sql); - while(q->next()) { - services_list.append( q->value(0).toString() ); - } - delete q; + sql=QString("select NAME from SERVICES"); + q=new RDSqlQuery(sql); + while(q->next()) { + services_list.append( q->value(0).toString() ); } + delete q; + int n=-1; int ncounter=0; QString service=edit_log->service(); @@ -1097,11 +1094,7 @@ void EditLog::saveasData() RDAddLog *log=NULL; if(rduser->createLog()) { - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this,rduser); - } else { // RDStation::HostSec - log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this); - } + log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this); if(log->exec()<0) { return; } diff --git a/rdlogedit/list_logs.cpp b/rdlogedit/list_logs.cpp index a38a082d..3ce6a820 100644 --- a/rdlogedit/list_logs.cpp +++ b/rdlogedit/list_logs.cpp @@ -136,28 +136,6 @@ void ListLogs::RefreshList() list_log_list->clear(); // Note: clear here, in case user has no perms. sql="select NAME,DESCRIPTION,SERVICE from LOGS where TYPE=0"; - - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - QStringList services_list; - QString sql_where; - - services_list = rduser->services(); - if(services_list.size()==0) { - return; - } - - sql_where=" and ("; - for ( QStringList::Iterator it = services_list.begin(); - it != services_list.end(); ++it ) { - sql_where+=QString().sprintf("SERVICE=\"%s\"||", - (const char *)*it); - } - sql_where=sql_where.left(sql_where.length()-2); - sql_where+=")"; - - sql=sql+sql_where; - } // else no filter for RDStation::HostSec - q=new RDSqlQuery(sql); while(q->next()) { l=new QListViewItem(list_log_list); diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 5792de17..9b9ad368 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -421,11 +421,6 @@ void MainWidget::userData() log_add_button->setEnabled(rduser->createLog()); log_delete_button->setEnabled(rduser->deleteLog()); log_track_button->setEnabled(rduser->voicetrackLog()); - - // Update the list of logs if applicable. - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - RefreshList(); - } } @@ -445,11 +440,7 @@ void MainWidget::addData() RDAddLog *log; if(rduser->createLog()) { - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this,rduser); - } else { // RDStation::HostSec - log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this); - } + log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this); if(log->exec()!=0) { delete log; return; @@ -841,29 +832,6 @@ void MainWidget::RefreshList() sql+=QString().sprintf("order by ORIGIN_DATETIME desc limit %d", RDLOGEDIT_LIMIT_QUAN); } - - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec - && rduser != NULL) { - QStringList services_list; - QString sql_where; - - services_list = rduser->services(); - if(services_list.size()==0) { - return; - } - - sql_where=" and ("; - for ( QStringList::Iterator it = services_list.begin(); - it != services_list.end(); ++it ) { - sql_where+=QString().sprintf("SERVICE=\"%s\"||", - (const char *)*it); - } - sql_where=sql_where.left(sql_where.length()-2); - sql_where+=")"; - - sql=sql+sql_where; - } // else no filter for RDStation::HostSec - q=new RDSqlQuery(sql); while(q->next()) { item=new ListListViewItem(log_log_list); diff --git a/rdlogmanager/generate_log.cpp b/rdlogmanager/generate_log.cpp index e2ce7c65..3cc53745 100644 --- a/rdlogmanager/generate_log.cpp +++ b/rdlogmanager/generate_log.cpp @@ -109,16 +109,12 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, gen_service_label->setFont(bold_font); gen_service_label->setAlignment(AlignRight|AlignVCenter); - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - services_list = rduser->services(); - } else { // RDStation::HostSec - QString sql="select NAME from SERVICES"; - RDSqlQuery *q=new RDSqlQuery(sql); - while(q->next()) { - services_list.append( q->value(0).toString() ); - } - delete q; + QString sql="select NAME from SERVICES"; + RDSqlQuery *q=new RDSqlQuery(sql); + while(q->next()) { + services_list.append( q->value(0).toString() ); } + delete q; for ( QStringList::Iterator it = services_list.begin(); it != services_list.end(); ++it ) { diff --git a/rdlogmanager/list_clocks.cpp b/rdlogmanager/list_clocks.cpp index 5d75bcf0..2e2e944f 100644 --- a/rdlogmanager/list_clocks.cpp +++ b/rdlogmanager/list_clocks.cpp @@ -170,16 +170,12 @@ ListClocks::ListClocks(QString *clockname,QWidget *parent) edit_filter_box->insertItem(tr("ALL")); edit_filter_box->insertItem(tr("NONE")); - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - services_list = rduser->services(); - } else { // RDStation::HostSec - QString sql="select NAME from SERVICES"; - RDSqlQuery *q=new RDSqlQuery(sql); - while(q->next()) { - services_list.append( q->value(0).toString() ); - } - delete q; - } + QString sql="select NAME from SERVICES"; + RDSqlQuery *q=new RDSqlQuery(sql); + while(q->next()) { + services_list.append( q->value(0).toString() ); + } + delete q; services_list.sort(); for ( QStringList::Iterator it = services_list.begin(); it != services_list.end(); diff --git a/rdlogmanager/list_events.cpp b/rdlogmanager/list_events.cpp index adb5219e..f76e82c3 100644 --- a/rdlogmanager/list_events.cpp +++ b/rdlogmanager/list_events.cpp @@ -161,16 +161,12 @@ ListEvents::ListEvents(QString *eventname,QWidget *parent) edit_filter_box->insertItem(tr("ALL")); edit_filter_box->insertItem(tr("NONE")); - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - services_list = rduser->services(); - } else { // RDStation::HostSec - QString sql="select NAME from SERVICES"; - RDSqlQuery *q=new RDSqlQuery(sql); - while(q->next()) { - services_list.append( q->value(0).toString() ); - } - delete q; - } + QString sql="select NAME from SERVICES"; + RDSqlQuery *q=new RDSqlQuery(sql); + while(q->next()) { + services_list.append( q->value(0).toString() ); + } + delete q; services_list.sort(); for ( QStringList::Iterator it = services_list.begin(); it != services_list.end(); diff --git a/rdlogmanager/list_grids.cpp b/rdlogmanager/list_grids.cpp index 8fd0171e..e9f394da 100644 --- a/rdlogmanager/list_grids.cpp +++ b/rdlogmanager/list_grids.cpp @@ -132,28 +132,6 @@ void ListGrids::RefreshList() QListViewItem *prev_item=edit_grids_list->selectedItem(); QString sql="select NAME,DESCRIPTION from SERVICES"; - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec - && rduser != NULL) { - QStringList services_list; - QString sql_where; - - services_list = rduser->services(); - if(services_list.size()==0) { - return; - } - - sql_where=" where ("; - for ( QStringList::Iterator it = services_list.begin(); - it != services_list.end(); ++it ) { - sql_where+=QString().sprintf("NAME=\"%s\"||", - (const char *)*it); - } - sql_where=sql_where.left(sql_where.length()-2); - sql_where+=")"; - - sql=sql+sql_where; - } // else no filter for RDStation::HostSec - edit_grids_list->clear(); RDSqlQuery *q=new RDSqlQuery(sql); QListViewItem *item=NULL; diff --git a/rdlogmanager/list_svcs.cpp b/rdlogmanager/list_svcs.cpp index 3b597276..9edd839a 100644 --- a/rdlogmanager/list_svcs.cpp +++ b/rdlogmanager/list_svcs.cpp @@ -158,28 +158,6 @@ void ListSvcs::RefreshList() list_log_list->clear(); QString sql="select NAME from SERVICES order by NAME"; - if (rdstation_conf->broadcastSecurity() == RDStation::UserSec - && rduser != NULL) { - QStringList services_list; - QString sql_where; - - services_list = rduser->services(); - if(services_list.size()==0) { - return; - } - - sql_where=" and ("; - for ( QStringList::Iterator it = services_list.begin(); - it != services_list.end(); ++it ) { - sql_where+=QString().sprintf("SERVICE=\"%s\"||", - (const char *)*it); - } - sql_where=sql_where.left(sql_where.length()-2); - sql_where+=")"; - - sql=sql+sql_where; - } // else no filter for RDStation::HostSec - RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { item=new QListViewItem(list_log_list);