From 6264ec3235620385e43ef2c355a0b3c04cf42cfb Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sun, 18 Apr 2021 21:23:19 -0400 Subject: [PATCH] 2021-04-18 Fred Gleason * Escaped all SQL identifiers in 'rdadmin/'. * Replaced " with ' delimiters in all SQL literal strings in 'rdadmin/'. Signed-off-by: Fred Gleason --- ChangeLog | 4 + rdadmin/add_feed.cpp | 7 +- rdadmin/add_group.cpp | 35 ++++--- rdadmin/add_matrix.cpp | 69 ++++++-------- rdadmin/add_replicator.cpp | 14 +-- rdadmin/add_report.cpp | 10 +- rdadmin/add_schedcodes.cpp | 16 ++-- rdadmin/add_station.cpp | 11 +-- rdadmin/add_svc.cpp | 19 +--- rdadmin/add_svc.h | 5 +- rdadmin/add_user.cpp | 36 ++++---- rdadmin/autofill_carts.cpp | 18 ++-- rdadmin/edit_cartslots.cpp | 66 +++++++------- rdadmin/edit_cartslots.h | 2 + rdadmin/edit_decks.cpp | 63 ++++++++----- rdadmin/edit_dropbox.cpp | 42 ++++----- rdadmin/edit_dropbox.h | 2 + rdadmin/edit_endpoint.cpp | 28 +++--- rdadmin/edit_feed_perms.cpp | 39 ++++---- rdadmin/edit_gpi.cpp | 58 +++++------- rdadmin/edit_group.cpp | 44 ++++----- rdadmin/edit_hostvar.cpp | 20 ++-- rdadmin/edit_image.cpp | 32 +++---- rdadmin/edit_jack.cpp | 19 ++-- rdadmin/edit_jack_client.cpp | 21 ++--- rdadmin/edit_livewiregpio.cpp | 23 +++-- rdadmin/edit_matrix.cpp | 137 ++++++++++++++-------------- rdadmin/edit_node.cpp | 72 +++++++-------- rdadmin/edit_pypad.cpp | 20 ++-- rdadmin/edit_replicator.cpp | 42 ++++----- rdadmin/edit_replicator.h | 2 + rdadmin/edit_report.cpp | 78 ++++++++-------- rdadmin/edit_sas_resource.cpp | 22 ++--- rdadmin/edit_schedcodes.cpp | 12 +-- rdadmin/edit_station.cpp | 6 +- rdadmin/edit_superfeed.cpp | 42 ++++----- rdadmin/edit_svc.cpp | 2 +- rdadmin/edit_svc_perms.cpp | 30 +++--- rdadmin/edit_system.cpp | 48 +++++----- rdadmin/edit_ttys.cpp | 18 ++-- rdadmin/edit_user_perms.cpp | 35 +++---- rdadmin/edit_user_service_perms.cpp | 36 ++++---- rdadmin/edit_vguest_resource.cpp | 26 +++--- rdadmin/list_dropboxes.cpp | 8 +- rdadmin/list_encoders.cpp | 6 +- rdadmin/list_feeds.cpp | 64 ++++++------- rdadmin/list_groups.cpp | 42 ++++----- rdadmin/list_hostvars.cpp | 14 +-- rdadmin/list_images.cpp | 22 ++--- rdadmin/list_matrices.cpp | 69 +++++++------- rdadmin/list_pypads.cpp | 20 ++-- rdadmin/list_replicator_carts.cpp | 12 +-- rdadmin/list_replicators.cpp | 16 ++-- rdadmin/list_reports.cpp | 14 +-- rdadmin/list_schedcodes.cpp | 20 ++-- rdadmin/list_svcs.cpp | 4 +- rdadmin/list_users.cpp | 24 ++--- rdadmin/rdadmin_cs.ts | 2 +- rdadmin/rdadmin_de.ts | 2 +- rdadmin/rdadmin_es.ts | 2 +- rdadmin/rdadmin_fr.ts | 4 - rdadmin/rdadmin_nb.ts | 2 +- rdadmin/rdadmin_nn.ts | 2 +- rdadmin/rdadmin_pt_BR.ts | 2 +- rdadmin/rename_group.cpp | 88 ++++++++---------- rdadmin/test_import.cpp | 6 +- rdadmin/view_pypad_errors.cpp | 4 +- 67 files changed, 841 insertions(+), 939 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd248ac0..c38b320f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21457,3 +21457,7 @@ 2021-04-17 Fred Gleason * Escaped all SQL identifiers in 'lib/'. * Replaced " with ' delimiters in all SQL literal strings in 'lib/'. +2021-04-18 Fred Gleason + * Escaped all SQL identifiers in 'rdadmin/'. + * Replaced " with ' delimiters in all SQL literal strings in + 'rdadmin/'. diff --git a/rdadmin/add_feed.cpp b/rdadmin/add_feed.cpp index 62cca166..823cff77 100644 --- a/rdadmin/add_feed.cpp +++ b/rdadmin/add_feed.cpp @@ -18,13 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include -#include +#include -#include #include +#include #include #include diff --git a/rdadmin/add_group.cpp b/rdadmin/add_group.cpp index 85959dd7..be5e7dd9 100644 --- a/rdadmin/add_group.cpp +++ b/rdadmin/add_group.cpp @@ -136,8 +136,8 @@ void AddGroup::okData() return; } - sql=QString("insert into GROUPS set ")+ - "NAME=\""+RDEscapeString(group_name_edit->text())+"\""; + sql=QString("insert into `GROUPS` set ")+ + "`NAME`='"+RDEscapeString(group_name_edit->text())+"'"; q=new RDSqlQuery(sql); if(!q->isActive()) { @@ -152,14 +152,13 @@ void AddGroup::okData() // Create Default Users Perms // if(group_users_box->isChecked()) { - sql="select LOGIN_NAME from USERS"; + sql="select `LOGIN_NAME` from `USERS`"; q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("insert into USER_PERMS set ")+ - "USER_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q1=new RDSqlQuery(sql); - delete q1; + sql=QString("insert into `USER_PERMS` set ")+ + "`USER_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); } delete q; } @@ -168,12 +167,12 @@ void AddGroup::okData() // Create Default Service Perms // if(group_svcs_box->isChecked()) { - sql="select NAME from SERVICES"; + sql="select `NAME` from `SERVICES`"; q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("insert into AUDIO_PERMS set ")+ - "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; + sql=QString("insert into `AUDIO_PERMS` set ")+ + "`SERVICE_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; q1=new RDSqlQuery(sql); delete q1; } @@ -182,16 +181,16 @@ void AddGroup::okData() EditGroup *group=new EditGroup(group_name_edit->text(),this); if(group->exec()<0) { - sql=QString("delete from USER_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; + sql=QString("delete from `USER_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; q=new RDSqlQuery(sql); delete q; - sql=QString("delete from AUDIO_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; + sql=QString("delete from `AUDIO_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; q=new RDSqlQuery(sql); delete q; - sql=QString("delete from GROUPS where ")+ - "NAME=\""+RDEscapeString(group_name_edit->text())+"\""; + sql=QString("delete from `GROUPS` where ")+ + "`NAME`='"+RDEscapeString(group_name_edit->text())+"'"; q=new RDSqlQuery(sql); delete q; delete group; diff --git a/rdadmin/add_matrix.cpp b/rdadmin/add_matrix.cpp index 4d632ad5..ea6900a3 100644 --- a/rdadmin/add_matrix.cpp +++ b/rdadmin/add_matrix.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell Matrix // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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,14 +18,12 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include #include -#include #include #include +#include #include "edit_user.h" #include "add_matrix.h" @@ -34,8 +32,6 @@ AddMatrix::AddMatrix(QString station,QWidget *parent) : RDDialog(parent) { - setModal(true); - add_station=station; // @@ -117,9 +113,9 @@ QSizePolicy AddMatrix::sizePolicy() const void AddMatrix::okData() { - QString sql=QString("select MATRIX from MATRICES where STATION_NAME=\"")+ - RDEscapeString(add_station)+"\" && MATRIX="+ - QString().sprintf("%d",add_matrix_box->value()); + QString sql=QString("select `MATRIX` from `MATRICES` where ")+ + "`STATION_NAME`='"+RDEscapeString(add_station)+"' && "+ + QString().sprintf("`MATRIX`=%d",add_matrix_box->value()); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { delete q; @@ -129,40 +125,31 @@ void AddMatrix::okData() } delete q; - sql=QString("insert into MATRICES set STATION_NAME=\"")+ - RDEscapeString(add_station)+"\","+ - "NAME=\""+tr("New Switcher")+"\","+ - "GPIO_DEVICE=\""+RD_DEFAULT_GPIO_DEVICE+"\","+ - QString(). - sprintf("MATRIX=%d,\ - PORT=0,\ - TYPE=%d,\ - INPUTS=%d,\ - OUTPUTS=%d,\ - GPIS=%d,\ - GPOS=%d,\ - PORT_TYPE=%d,\ - PORT_TYPE_2=%d", - add_matrix_box->value(), - add_type_box->currentIndex(), + sql=QString("insert into `MATRICES` set ")+ + "`STATION_NAME`='"+RDEscapeString(add_station)+"',"+ + "`NAME`='"+tr("New Switcher")+"',"+ + "`GPIO_DEVICE`='"+RD_DEFAULT_GPIO_DEVICE+"',"+ + QString().sprintf("`MATRIX`=%d,",add_matrix_box->value())+ + "`PORT`=0,"+ + QString().sprintf("`TYPE`=%d,",add_type_box->currentIndex())+ + QString().sprintf("`INPUTS`=%d", RDMatrix::defaultControlValue((RDMatrix::Type)add_type_box-> - currentIndex(), - RDMatrix::InputsControl), + currentIndex(),RDMatrix::InputsControl))+ + QString().sprintf("`OUTPUTS`=%d", RDMatrix::defaultControlValue((RDMatrix::Type)add_type_box-> - currentIndex(), - RDMatrix::OutputsControl), + currentIndex(),RDMatrix::OutputsControl))+ + QString().sprintf("`GPIS`=%d", RDMatrix::defaultControlValue((RDMatrix::Type)add_type_box-> - currentIndex(), - RDMatrix::GpisControl), + currentIndex(),RDMatrix::GpisControl))+ + QString().sprintf("`GPOS`=%d,", RDMatrix::defaultControlValue((RDMatrix::Type)add_type_box-> - currentIndex(), - RDMatrix::GposControl), + currentIndex(),RDMatrix::GposControl))+ + QString().sprintf("`PORT_TYPE`=%d,", RDMatrix::defaultControlValue((RDMatrix::Type)add_type_box-> - currentIndex(), - RDMatrix::PortTypeControl), - RDMatrix::NoPort); - q=new RDSqlQuery(sql); - delete q; + currentIndex(),RDMatrix::PortTypeControl))+ + QString().sprintf("`PORT_TYPE_2`=%d",RDMatrix::NoPort); + RDSqlQuery::apply(sql); + done(add_matrix_box->value()); } @@ -177,8 +164,8 @@ int AddMatrix::GetNextMatrix() { int n=0; - QString sql=QString("select MATRIX from MATRICES where STATION_NAME=\"")+ - RDEscapeString(add_station)+"\" order by MATRIX"; + QString sql=QString("select `MATRIX` from `MATRICES` where ")+ + "`STATION_NAME`='"+RDEscapeString(add_station)+"' order by `MATRIX`"; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { if(n!=q->value(0).toInt()) { diff --git a/rdadmin/add_replicator.cpp b/rdadmin/add_replicator.cpp index 71cdae46..21dec3fe 100644 --- a/rdadmin/add_replicator.cpp +++ b/rdadmin/add_replicator.cpp @@ -18,9 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include #include #include @@ -31,8 +29,6 @@ AddReplicator::AddReplicator(QString *rname,QWidget *parent) : RDDialog(parent) { - setModal(true); - repl_name=rname; // @@ -110,8 +106,8 @@ void AddReplicator::okData() return; } - sql=QString("insert into REPLICATORS set ")+ - "NAME=\""+RDEscapeString(repl_name_edit->text())+"\""; + sql=QString("insert into `REPLICATORS` set ")+ + "`NAME`='"+RDEscapeString(repl_name_edit->text())+"'"; q=new RDSqlQuery(sql); if(!q->isActive()) { QMessageBox::warning(this,tr("Replicator Exists"),tr("A replicator with that name already exists!")); @@ -122,8 +118,8 @@ void AddReplicator::okData() EditReplicator *replicator=new EditReplicator(repl_name_edit->text(),this); if(replicator->exec()<0) { - sql=QString("delete from REPLICATORS where ")+ - "NAME=\""+RDEscapeString(repl_name_edit->text())+"\""; + sql=QString("delete from `REPLICATORS` where ")+ + "`NAME`='"+RDEscapeString(repl_name_edit->text())+"'"; q=new RDSqlQuery(sql); delete q; delete replicator; diff --git a/rdadmin/add_report.cpp b/rdadmin/add_report.cpp index ba406953..a4aeb709 100644 --- a/rdadmin/add_report.cpp +++ b/rdadmin/add_report.cpp @@ -33,8 +33,6 @@ AddReport::AddReport(QString *rptname,QWidget *parent) : RDDialog(parent) { - setModal(true); - // // Fix the Window Size // @@ -107,8 +105,8 @@ void AddReport::okData() tr("You must provide a report name!")); return; } - sql=QString("select NAME from REPORTS where ")+ - "NAME=\""+RDEscapeString(add_name_edit->text())+"\""; + sql=QString("select `NAME` from `REPORTS` where ")+ + "`NAME`='"+RDEscapeString(add_name_edit->text())+"'"; q=new RDSqlQuery(sql); if(q->first()) { QMessageBox::warning(this,tr("Report Exists"), @@ -117,8 +115,8 @@ void AddReport::okData() return; } delete q; - sql=QString("insert into REPORTS set ")+ - "NAME=\""+RDEscapeString(add_name_edit->text())+"\""; + sql=QString("insert into `REPORTS` set ")+ + "`NAME`='"+RDEscapeString(add_name_edit->text())+"'"; q=new RDSqlQuery(sql); delete q; *add_name=add_name_edit->text(); diff --git a/rdadmin/add_schedcodes.cpp b/rdadmin/add_schedcodes.cpp index 98d7790f..7f0cf402 100644 --- a/rdadmin/add_schedcodes.cpp +++ b/rdadmin/add_schedcodes.cpp @@ -108,8 +108,8 @@ void AddSchedCode::okData() return; } - QString sql=QString("insert into SCHED_CODES set ")+ - "CODE=\""+RDEscapeString(d_code_edit->text())+"\""; + QString sql=QString("insert into `SCHED_CODES` set ")+ + "`CODE`='"+RDEscapeString(d_code_edit->text())+"'"; if(!RDSqlQuery::apply(sql)) { QMessageBox::warning(this,"RDAdmin - "+tr("Error"), tr("Schedule Code Already Exists!")); @@ -120,14 +120,14 @@ void AddSchedCode::okData() // Add schedcode rules // sql=QString("select ")+ - "NAME " // 00 - "from CLOCKS "+ - "order by NAME"; + "`NAME` " // 00 + "from `CLOCKS` "+ + "order by `NAME`"; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("insert into RULE_LINES set ")+ - "CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "CODE=\""+RDEscapeString(d_code_edit->text())+"\""; + sql=QString("insert into `RULE_LINES` set ")+ + "`CLOCK_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`CODE`='"+RDEscapeString(d_code_edit->text())+"'"; RDSqlQuery::apply(sql); } delete q; diff --git a/rdadmin/add_station.cpp b/rdadmin/add_station.cpp index eafac73e..1dcef295 100644 --- a/rdadmin/add_station.cpp +++ b/rdadmin/add_station.cpp @@ -32,8 +32,6 @@ AddStation::AddStation(QString *stationname,QWidget *parent) : RDDialog(parent) { - setModal(true); - add_name=stationname; // @@ -172,16 +170,15 @@ void AddStation::CloneEncoderValues(const QString ¶mname, RDSqlQuery *q; RDSqlQuery *q1; -sql=QString("select ")+ + sql=QString("select ")+ paramname+" from `ENCODER_"+paramname+"` where "+ - QString().sprintf("ENCODER_ID=%d",src_id); + QString().sprintf("`ENCODER_ID`=%d",src_id); q=new RDSqlQuery(sql); while(q->next()) { sql=QString("insert into `ENCODER_")+ paramname+"` set "+paramname+ - QString().sprintf("=%d,ENCODER_ID=%d",q->value(0).toInt(),dest_id); - q1=new RDSqlQuery(sql); - delete q1; + QString().sprintf("=%d,`ENCODER_ID`=%d",q->value(0).toInt(),dest_id); + RDSqlQuery::apply(sql); } delete q; } diff --git a/rdadmin/add_svc.cpp b/rdadmin/add_svc.cpp index 7ba73303..46de40cb 100644 --- a/rdadmin/add_svc.cpp +++ b/rdadmin/add_svc.cpp @@ -32,8 +32,6 @@ AddSvc::AddSvc(QString *svcname,QWidget *parent) : RDDialog(parent) { - setModal(true); - svc_name=svcname; // @@ -68,6 +66,10 @@ AddSvc::AddSvc(QString *svcname,QWidget *parent) // svc_exemplar_box=new QComboBox(this); svc_exemplar_box->setGeometry(155,36,sizeHint().width()-165,19); + svc_services_model=new RDServiceListModel(true,this); + svc_services_model->setFont(defaultFont()); + svc_services_model->setPalette(palette()); + svc_exemplar_box->setModel(svc_services_model); QLabel *svc_exemplar_label= new QLabel(tr("Base Service On:"),this); svc_exemplar_label->setGeometry(10,36,140,19); @@ -93,24 +95,13 @@ AddSvc::AddSvc(QString *svcname,QWidget *parent) cancel_button->setFont(buttonFont()); cancel_button->setText(tr("Cancel")); connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); - - // - // Populate Exemplar List - // - svc_exemplar_box->insertItem(0,tr("Empty Host Config")); - QString sql="select NAME from SERVICES"; - RDSqlQuery *q=new RDSqlQuery(sql); - while(q->next()) { - svc_exemplar_box-> - insertItem(svc_exemplar_box->count(),q->value(0).toString()); - } - delete q; } AddSvc::~AddSvc() { delete svc_name_edit; + delete svc_services_model; } diff --git a/rdadmin/add_svc.h b/rdadmin/add_svc.h index 64f88dc5..a05e9a44 100644 --- a/rdadmin/add_svc.h +++ b/rdadmin/add_svc.h @@ -24,6 +24,7 @@ #include #include +#include #include class AddSvc : public RDDialog @@ -42,9 +43,9 @@ class AddSvc : public RDDialog private: QLineEdit *svc_name_edit; QComboBox *svc_exemplar_box; + RDServiceListModel *svc_services_model; QString *svc_name; }; -#endif - +#endif // ADD_SVC_H diff --git a/rdadmin/add_user.cpp b/rdadmin/add_user.cpp index 24f80038..49d465e4 100644 --- a/rdadmin/add_user.cpp +++ b/rdadmin/add_user.cpp @@ -30,8 +30,6 @@ AddUser::AddUser(QString *username,QWidget *parent) : RDDialog(parent) { - setModal(true); - user_name=username; // @@ -97,7 +95,6 @@ QSizePolicy AddUser::sizePolicy() const void AddUser::okData() { RDSqlQuery *q; - RDSqlQuery *q1; QString sql; QString username=RDEscapeString(user_name_edit->text()); @@ -106,9 +103,9 @@ void AddUser::okData() return; } - sql=QString("insert into USERS set ")+ - "LOGIN_NAME=\""+RDEscapeString(username)+"\","+ - "PASSWORD=PASSWORD(\"\")"; + sql=QString("insert into `USERS` set ")+ + "`LOGIN_NAME`='"+RDEscapeString(username)+"',"+ + "`PASSWORD`=PASSWORD('')"; q=new RDSqlQuery(sql); if(!q->isActive()) { QMessageBox::warning(this,tr("User Exists"),tr("User Already Exists!"), @@ -117,32 +114,31 @@ void AddUser::okData() return; } delete q; - sql="select NAME from GROUPS"; + sql="select `NAME` from `GROUPS`"; q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("insert into USER_PERMS set ")+ - "USER_NAME=\""+RDEscapeString(username)+"\","+ - "GROUP_NAME=\""+RDEscapeString(q->value(0).toString())+"\""; - q1=new RDSqlQuery(sql); - delete q1; + sql=QString("insert into `USER_PERMS` set ")+ + "`USER_NAME`='"+RDEscapeString(username)+"',"+ + "`GROUP_NAME`='"+RDEscapeString(q->value(0).toString())+"'"; + RDSqlQuery::apply(sql); } delete q; EditUser *user=new EditUser(user_name_edit->text(),this); if(user->exec()<0) { - sql=QString("delete from USER_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(username)+"\""; - q=new RDSqlQuery(sql); - delete q; - sql=QString("delete from USERS where ")+ - "LOGIN_NAME=\""+RDEscapeString(username)+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("delete from `USER_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(username)+"'"; + RDSqlQuery::apply(sql); + + sql=QString("delete from `USERS` where ")+ + "`LOGIN_NAME`='"+RDEscapeString(username)+"'"; + RDSqlQuery::apply(sql); delete user; done(false); return; } delete user; *user_name=user_name_edit->text(); + done(true); } diff --git a/rdadmin/autofill_carts.cpp b/rdadmin/autofill_carts.cpp index de0c6e43..142f45ce 100644 --- a/rdadmin/autofill_carts.cpp +++ b/rdadmin/autofill_carts.cpp @@ -77,9 +77,9 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent) svc_close_button->setText(tr("Close")); connect(svc_close_button,SIGNAL(clicked()),this,SLOT(closeData())); - QString sql=QString("left join AUTOFILLS ")+ - "on CART.NUMBER=AUTOFILLS.CART_NUMBER where "+ - "AUTOFILLS.SERVICE=\""+RDEscapeString(svc_svc->name())+"\""; + QString sql=QString("left join `AUTOFILLS` ")+ + "on `CART`.`NUMBER`=`AUTOFILLS`.`CART_NUMBER` where "+ + "`AUTOFILLS`.`SERVICE`='"+RDEscapeString(svc_svc->name())+"'"; svc_cart_model->setFilterSql(sql); } @@ -107,9 +107,9 @@ void AutofillCarts::addData() int cartnum=0; if(admin_cart_dialog->exec(&cartnum,RDCart::Audio,svc_svc->name(),NULL)) { - sql=QString("insert into AUTOFILLS set ")+ - "SERVICE=\""+RDEscapeString(svc_svc->name())+"\","+ - QString().sprintf("CART_NUMBER=%d",cartnum); + sql=QString("insert into `AUTOFILLS` set ")+ + "`SERVICE`='"+RDEscapeString(svc_svc->name())+"',"+ + QString().sprintf("`CART_NUMBER`=%d",cartnum); RDSqlQuery::apply(sql); QModelIndex index=svc_cart_model->addCart(cartnum); if(index.isValid()) { @@ -127,9 +127,9 @@ void AutofillCarts::deleteData() return; } - QString sql=QString("delete from AUTOFILLS where ")+ - "SERVICE=\""+RDEscapeString(svc_svc->name())+"\" && "+ - QString().sprintf("CART_NUMBER=%u", + QString sql=QString("delete from `AUTOFILLS` where ")+ + "`SERVICE`='"+RDEscapeString(svc_svc->name())+"' && "+ + QString().sprintf("`CART_NUMBER`=%u", svc_cart_model->cartNumber(rows.first())); RDSqlQuery::apply(sql); svc_cart_model->removeCart(rows.first()); diff --git a/rdadmin/edit_cartslots.cpp b/rdadmin/edit_cartslots.cpp index d11a0136..d1ad919e 100644 --- a/rdadmin/edit_cartslots.cpp +++ b/rdadmin/edit_cartslots.cpp @@ -19,7 +19,7 @@ // #include -#include +#include #include #include @@ -34,11 +34,6 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, QWidget *parent) : RDDialog(parent) { - setModal(true); - - QString sql; - RDSqlQuery *q; - edit_station=station; edit_cae_station=cae_station; edit_previous_slot=0; @@ -162,17 +157,14 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, // edit_service_box=new QComboBox(this); edit_service_box->setGeometry(127,240,120,20); + edit_service_model=new RDServiceListModel(true,this); + edit_service_model->setFont(defaultFont()); + edit_service_model->setPalette(palette()); + edit_service_box->setModel(edit_service_model); edit_service_label=new QLabel(tr("Service:"),this); edit_service_label->setGeometry(10,240,112,20); edit_service_label->setFont(labelFont()); edit_service_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - sql="select NAME from SERVICES order by NAME"; - q=new RDSqlQuery(sql); - while(q->next()) { - edit_service_box-> - insertItem(edit_service_box->count(),q->value(0).toString()); - } - delete q; // // Slot Mode @@ -388,11 +380,18 @@ void EditCartSlots::ReadSlot(unsigned slotnum) RDSlotOptions *opts=new RDSlotOptions(edit_station->name(),slotnum); delete opts; - sql=QString("select CARD,INPUT_PORT,OUTPUT_PORT,DEFAULT_MODE,")+ - "DEFAULT_HOOK_MODE,"+ - "DEFAULT_STOP_ACTION,DEFAULT_CART_NUMBER,SERVICE_NAME from CARTSLOTS "+ - "where (STATION_NAME=\""+RDEscapeString(edit_station->name())+"\")&&"+ - QString().sprintf("(SLOT_NUMBER=%u)",slotnum); + sql=QString("select ")+ + "`CARD`,"+ // 00 + "`INPUT_PORT`,"+ // 01 + "`OUTPUT_PORT`,"+ // 02 + "`DEFAULT_MODE`,"+ // 03 + "`DEFAULT_HOOK_MODE`,"+ // 04 + "`DEFAULT_STOP_ACTION`,"+ // 05 + "`DEFAULT_CART_NUMBER`,"+ // 06 + "`SERVICE_NAME` "+ // 07 + "from `CARTSLOTS` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station->name())+"')&&"+ + QString().sprintf("(`SLOT_NUMBER`=%u)",slotnum); q=new RDSqlQuery(sql); if(q->first()) { edit_card_spin->setValue(q->value(0).toInt()); @@ -430,36 +429,33 @@ void EditCartSlots::ReadSlot(unsigned slotnum) void EditCartSlots::WriteSlot(unsigned slotnum) { QString sql; - RDSqlQuery *q; - sql=QString("update CARTSLOTS set ")+ - QString().sprintf("CARD=%d,INPUT_PORT=%d,OUTPUT_PORT=%d,", - edit_card_spin->value(), - edit_input_spin->value(), - edit_output_spin->value())+ - QString().sprintf("DEFAULT_MODE=%d,", + sql=QString("update `CARTSLOTS` set ")+ + QString().sprintf("`CARD`=%d,",edit_card_spin->value())+ + QString().sprintf("`INPUT_PORT`=%d,",edit_input_spin->value())+ + QString().sprintf("`OUTPUT_PORT`=%d,",edit_output_spin->value())+ + QString().sprintf("`DEFAULT_MODE`=%d,", edit_mode_box->currentIndex()-1)+ - QString().sprintf("DEFAULT_HOOK_MODE=%d,", + QString().sprintf("`DEFAULT_HOOK_MODE`=%d,", edit_play_mode_box->currentIndex()-1)+ - QString().sprintf("DEFAULT_STOP_ACTION=%d,", + QString().sprintf("`DEFAULT_STOP_ACTION`=%d,", edit_stop_action_box->currentIndex()-1); switch(edit_cartaction_box->currentIndex()) { case 0: - sql+="DEFAULT_CART_NUMBER=-1,"; + sql+="`DEFAULT_CART_NUMBER`=-1,"; break; case 1: - sql+="DEFAULT_CART_NUMBER=0,"; + sql+="`DEFAULT_CART_NUMBER`=0,"; break; default: - sql+=QString().sprintf("DEFAULT_CART_NUMBER=%d,", + sql+=QString().sprintf("`DEFAULT_CART_NUMBER`=%d,", edit_cart_edit->text().toInt()); break; } - sql+="SERVICE_NAME=\""+RDEscapeString(edit_service_box->currentText())+"\" "; - sql+="where (STATION_NAME=\""+RDEscapeString(edit_station->name())+"\")&&"; - sql+=QString().sprintf("(SLOT_NUMBER=%u)",slotnum); - q=new RDSqlQuery(sql); - delete q; + sql+="`SERVICE_NAME`='"+RDEscapeString(edit_service_box->currentText())+"' "; + sql+="where (`STATION_NAME`='"+RDEscapeString(edit_station->name())+"')&&"; + sql+=QString().sprintf("(`SLOT_NUMBER`=%u)",slotnum); + RDSqlQuery::apply(sql); } diff --git a/rdadmin/edit_cartslots.h b/rdadmin/edit_cartslots.h index 6658a6a4..4e87c56c 100644 --- a/rdadmin/edit_cartslots.h +++ b/rdadmin/edit_cartslots.h @@ -28,6 +28,7 @@ #include #include +#include #include class EditCartSlots : public RDDialog @@ -72,6 +73,7 @@ class EditCartSlots : public RDDialog QPushButton *edit_cart_button; QLabel *edit_service_label; QComboBox *edit_service_box; + RDServiceListModel *edit_service_model; QSpinBox *edit_card_spin; QSpinBox *edit_input_spin; QSpinBox *edit_output_spin; diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp index 81b1a116..24cd769e 100644 --- a/rdadmin/edit_decks.cpp +++ b/rdadmin/edit_decks.cpp @@ -482,11 +482,11 @@ void EditDecks::matrixActivatedData(const QString &str) return; } int matrix=edit_matrix_ids[edit_swmatrix_box->currentIndex()]; - sql=QString("select NAME from OUTPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_swstation_box->currentText())+ - "\")&&"+ - QString().sprintf("(MATRIX=%d)&&",matrix)+ - "(NAME!=\"\")"; + sql=QString("select `NAME` from `OUTPUTS` where ")+ + "(`STATION_NAME`='"+ + RDEscapeString(edit_swstation_box->currentText())+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",matrix)+ + "(`NAME`!='')"; q=new RDSqlQuery(sql); while(q->next()) { edit_swoutput_box-> @@ -668,9 +668,12 @@ void EditDecks::ReadRecord(int chan) } if(chan>128) { - sql=QString("select NUMBER,CART_NUMBER from DECK_EVENTS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_station->name())+"\")&&"+ - QString().sprintf("(CHANNEL=%d)",chan); + sql=QString("select ")+ + "`NUMBER`,"+ // 00 + "`CART_NUMBER` "+ // 01 + "from `DECK_EVENTS` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station->name())+"')&&"+ + QString().sprintf("(`CHANNEL`=%d)",chan); q=new RDSqlQuery(sql); while(q->next()) { if((q->value(0).toInt()-1)text().toUInt(); } - sql=QString("update DECK_EVENTS set ")+ - QString().sprintf("CART_NUMBER=%u ",cartnum)+ - "where (STATION_NAME=\""+RDEscapeString(edit_station->name())+"\")&&"+ - QString().sprintf("(CHANNEL=%d)&&",chan)+ - QString().sprintf("(NUMBER=%u)",i+1); + sql=QString("update `DECK_EVENTS` set ")+ + QString().sprintf("`CART_NUMBER`=%u ",cartnum)+ + "where (`STATION_NAME`='"+RDEscapeString(edit_station->name())+"')&&"+ + QString().sprintf("(`CHANNEL`=%d)&&",chan)+ + QString().sprintf("(`NUMBER`=%u)",i+1); q=new RDSqlQuery(sql); delete q; } @@ -773,10 +776,11 @@ int EditDecks::GetOutput() { int output=-1; - QString sql=QString("select NUMBER from OUTPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_swstation_box->currentText())+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",GetMatrix())+ - "(NAME=\""+RDEscapeString(edit_swoutput_box->currentText())+"\")"; + QString sql=QString("select `NUMBER` from `OUTPUTS` where ")+ + "(`STATION_NAME`='"+ + RDEscapeString(edit_swstation_box->currentText())+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",GetMatrix())+ + "(`NAME`='"+RDEscapeString(edit_swoutput_box->currentText())+"')"; RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { output=q->value(0).toInt(); @@ -794,24 +798,33 @@ QStringList EditDecks::GetActiveOutputMatrices() RDSqlQuery *q1; edit_matrix_ids.clear(); - sql=QString("select TYPE,NAME,OUTPUTS,MATRIX from MATRICES where ")+ - "STATION_NAME=\""+RDEscapeString(edit_swstation_box->currentText())+"\""; + sql=QString("select ")+ + "`TYPE`,"+ // 00 + "`NAME`,"+ // 01 + "`OUTPUTS`,"+ // 02 + "`MATRIX` "+ // 03 + "from `MATRICES` where "+ + "`STATION_NAME`='"+RDEscapeString(edit_swstation_box->currentText())+"'"; q=new RDSqlQuery(sql); while(q->next()) { switch((RDMatrix::Type)q->value(0).toInt()) { case RDMatrix::LiveWireLwrpAudio: - sql=QString("select HOSTNAME,PASSWORD,TCP_PORT,BASE_OUTPUT ")+ - "from SWITCHER_NODES "+ - "where (STATION_NAME=\""+RDEscapeString(edit_station->name())+"\")&& "+ - QString().sprintf("(MATRIX=%d) ",q->value(3).toInt())+ - "order by BASE_OUTPUT desc"; + sql=QString("select ")+ + "`HOSTNAME`,"+ // 00 + "`PASSWORD`,"+ // 01 + "`TCP_PORT`,"+ // 02 + "`BASE_OUTPUT` "+ // 03 + "from `SWITCHER_NODES` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station->name())+"')&& "+ + QString().sprintf("(`MATRIX`=%d) ",q->value(3).toInt())+ + "order by `BASE_OUTPUT` desc"; q1=new RDSqlQuery(sql); if(q1->first()) { RDLiveWire *lw=new RDLiveWire(0,this); if(!lw->loadSettings(q1->value(0).toString(),q1->value(2).toUInt(), q1->value(1).toString(),q1->value(3).toInt())) { QMessageBox::warning(this,"RDAdmin - "+tr("Connection Error"), - tr("Unable to connect to node at")+" \""+ + tr("Unable to connect to node at")+" \" "+ q1->value(0).toString()+"\"."+ tr("Check that the unit is online and try again.")); delete lw; diff --git a/rdadmin/edit_dropbox.cpp b/rdadmin/edit_dropbox.cpp index 83d85fd3..12136398 100644 --- a/rdadmin/edit_dropbox.cpp +++ b/rdadmin/edit_dropbox.cpp @@ -58,6 +58,10 @@ EditDropbox::EditDropbox(int id,bool duplicate,QWidget *parent) // box_group_name_box=new QComboBox(this); box_group_name_box->setGeometry(140,10,100,20); + box_group_name_model=new RDGroupListModel(true,true,this); + box_group_name_model->setFont(defaultFont()); + box_group_name_model->setPalette(palette()); + box_group_name_box->setModel(box_group_name_model); QLabel *label=new QLabel(tr("Default Group:"),this); label->setGeometry(10,10,125,20); label->setFont(labelFont()); @@ -408,17 +412,7 @@ EditDropbox::EditDropbox(int id,bool duplicate,QWidget *parent) // // Populate Fields // - sql="select NAME from GROUPS order by NAME"; - q=new RDSqlQuery(sql); - QString groupname=box_dropbox->groupName(); - while(q->next()) { - box_group_name_box-> - insertItem(box_group_name_box->count(),q->value(0).toString()); - if(q->value(0).toString()==groupname) { - box_group_name_box->setCurrentIndex(box_group_name_box->count()-1); - } - } - delete q; + box_group_name_box->setCurrentText(box_dropbox->groupName()); box_path_edit->setText(box_dropbox->path()); if(box_dropbox->toCart()>0) { box_to_cart_edit->setText(QString().sprintf("%06u",box_dropbox->toCart())); @@ -458,8 +452,8 @@ EditDropbox::EditDropbox(int id,bool duplicate,QWidget *parent) box_segue_level_spin->setValue(box_dropbox->segueLevel()/100); box_segue_length_spin->setValue(box_dropbox->segueLength()); - sql=QString("select SCHED_CODE from DROPBOX_SCHED_CODES ")+ - QString().sprintf("where DROPBOX_ID=%d",box_dropbox->id()); + sql=QString("select `SCHED_CODE` from `DROPBOX_SCHED_CODES` ")+ + QString().sprintf("where `DROPBOX_ID`=%d",box_dropbox->id()); q=new RDSqlQuery(sql); while(q->next()) { box_schedcodes.push_back(q->value(0).toString()); @@ -588,8 +582,8 @@ void EditDropbox::resetData() QMessageBox::Yes,QMessageBox::No)!=QMessageBox::Yes) { return; } - QString sql=QString("delete from DROPBOX_PATHS where ")+ - QString().sprintf("DROPBOX_ID=%d",box_dropbox->id()); + QString sql=QString("delete from `DROPBOX_PATHS` where ")+ + QString().sprintf("`DROPBOX_ID`=%d",box_dropbox->id()); RDSqlQuery *q=new RDSqlQuery(sql); delete q; QMessageBox::information(this,"RDAdmin - "+tr("Reset Dropbox"), @@ -600,7 +594,6 @@ void EditDropbox::resetData() void EditDropbox::okData() { QString sql; - RDSqlQuery *q; // // Validate End Date Offsets @@ -661,16 +654,15 @@ void EditDropbox::okData() box_dropbox->setSegueLength(0); } - sql=QString("delete from DROPBOX_SCHED_CODES where ")+ - QString().sprintf("DROPBOX_ID=%d",box_dropbox->id()); - q=new RDSqlQuery(sql); - delete q; + sql=QString("delete from `DROPBOX_SCHED_CODES` where ")+ + QString().sprintf("`DROPBOX_ID`=%d",box_dropbox->id()); + RDSqlQuery::apply(sql); + for(int i=0;iid())+ - "SCHED_CODE=\""+RDEscapeString(box_schedcodes[i])+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("insert into `DROPBOX_SCHED_CODES` set ")+ + QString().sprintf("`DROPBOX_ID`=%d,",box_dropbox->id())+ + "`SCHED_CODE`='"+RDEscapeString(box_schedcodes[i])+"'"; + RDSqlQuery::apply(sql); } done(true); } diff --git a/rdadmin/edit_dropbox.h b/rdadmin/edit_dropbox.h index 1c6dca5b..4f990283 100644 --- a/rdadmin/edit_dropbox.h +++ b/rdadmin/edit_dropbox.h @@ -27,6 +27,7 @@ #include #include +#include #include class EditDropbox : public RDDialog @@ -54,6 +55,7 @@ class EditDropbox : public RDDialog private: RDDropbox *box_dropbox; QComboBox *box_group_name_box; + RDGroupListModel *box_group_name_model; QLineEdit *box_path_edit; QString box_path; QLineEdit *box_to_cart_edit; diff --git a/rdadmin/edit_endpoint.cpp b/rdadmin/edit_endpoint.cpp index b1399d1d..081df328 100644 --- a/rdadmin/edit_endpoint.cpp +++ b/rdadmin/edit_endpoint.cpp @@ -33,10 +33,8 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); // // Text Validator @@ -116,24 +114,22 @@ int EditEndpoint::exec(RDMatrix *mtx,RDMatrix::Endpoint endpt_type,int endpt_id) edit_endpoint_type=endpt_type; edit_endpoint_id=endpt_id; if(endpt_type==RDMatrix::Input) { - edit_table="INPUTS"; + edit_table="`INPUTS`"; setWindowTitle("RDAdmin - "+tr("Edit Input")); } else { - edit_table="OUTPUTS"; + edit_table="`OUTPUTS`"; setWindowTitle("RDAdmin - "+tr("Edit Output")); } sql=QString("select ")+ - "NAME,"+ // 00 - "ENGINE_NUM,"+ // 01 - "DEVICE_NUM "+ // 02 + "`NAME`,"+ // 00 + "`ENGINE_NUM`,"+ // 01 + "`DEVICE_NUM` "+ // 02 "from "+edit_table+" where "+ - QString().sprintf("ID=%d",endpt_id); + QString().sprintf("`ID`=%d",endpt_id); q=new RDSqlQuery(sql); if(q->first()) { - - edit_endpoint_edit->setText(q->value(0).toString()); if(q->value(1).toInt()>=0) { edit_enginenum_edit->setText(QString().sprintf("%d",q->value(1).toInt())); @@ -167,12 +163,12 @@ void EditEndpoint::okData() QString sql; sql=QString("update ")+edit_table+" set "+ - "NAME=\""+RDEscapeString(edit_endpoint_edit->text())+"\","+ - QString().sprintf("ENGINE_NUM=%d,",edit_enginenum_edit->text().toInt())+ + "`NAME`='"+RDEscapeString(edit_endpoint_edit->text())+"',"+ + QString().sprintf("`ENGINE_NUM`=%d,",edit_enginenum_edit->text().toInt())+ QString(). - sprintf("DEVICE_NUM=%d ",edit_devicenum_edit->text().toInt(NULL,16))+ + sprintf("`DEVICE_NUM`=%d ",edit_devicenum_edit->text().toInt(NULL,16))+ "where "+ - QString().sprintf("ID=%d",edit_endpoint_id); + QString().sprintf("`ID`=%d",edit_endpoint_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/edit_feed_perms.cpp b/rdadmin/edit_feed_perms.cpp index ab2e2f44..e6285128 100644 --- a/rdadmin/edit_feed_perms.cpp +++ b/rdadmin/edit_feed_perms.cpp @@ -28,8 +28,6 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent) : RDDialog(parent) { - setModal(true); - QString sql; RDSqlQuery *q; @@ -38,10 +36,8 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent) // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); setWindowTitle("RDAdmin - "+tr("User: ")+feed_user->name()); @@ -76,16 +72,15 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent) // // Populate Fields // - sql=QString("select KEY_NAME from FEED_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(feed_user->name())+"\""; - + sql=QString("select `KEY_NAME` from `FEED_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(feed_user->name())+"'"; q=new RDSqlQuery(sql); while(q->next()) { feed_host_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString().sprintf("select KEY_NAME from FEEDS"); + sql=QString().sprintf("select `KEY_NAME` from `FEEDS`"); q=new RDSqlQuery(sql); while(q->next()) { if(feed_host_sel->destFindItem(q->value(0).toString())==0) { @@ -122,15 +117,15 @@ void EditFeedPerms::okData() // Add New Groups // for(unsigned i=0;idestCount();i++) { - sql=QString("select KEY_NAME from FEED_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(feed_user->name())+"\" && "+ - "KEY_NAME=\""+RDEscapeString(feed_host_sel->destText(i))+"\""; + sql=QString("select `KEY_NAME` from `FEED_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(feed_user->name())+"' && "+ + "`KEY_NAME`='"+RDEscapeString(feed_host_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into FEED_PERMS (USER_NAME,KEY_NAME) ")+ - "values (\""+RDEscapeString(feed_user->name())+"\","+ - "\""+RDEscapeString(feed_host_sel->destText(i))+"\")"; + sql=QString("insert into `FEED_PERMS` (`USER_NAME`,`KEY_NAME`) ")+ + "values ('"+RDEscapeString(feed_user->name())+"',"+ + "'"+RDEscapeString(feed_host_sel->destText(i))+"')"; q=new RDSqlQuery(sql); } delete q; @@ -139,14 +134,14 @@ void EditFeedPerms::okData() // // Delete Old Groups // - sql=QString("delete from FEED_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(feed_user->name())+"\""; + sql=QString("delete from `FEED_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(feed_user->name())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && KEY_NAME<>\"")+ - RDEscapeString(feed_host_sel->destText(i))+"\""; + sql+=QString(" && `KEY_NAME`<>'")+ + RDEscapeString(feed_host_sel->destText(i))+"'"; } - q=new RDSqlQuery(sql); - delete q; + RDSqlQuery::apply(sql); + done(0); } diff --git a/rdadmin/edit_gpi.cpp b/rdadmin/edit_gpi.cpp index 42c795cc..c1063818 100644 --- a/rdadmin/edit_gpi.cpp +++ b/rdadmin/edit_gpi.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Gpi // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include +#include #include #include @@ -36,10 +35,8 @@ EditGpi::EditGpi(QWidget *parent) // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); // // Text Validator @@ -161,10 +158,6 @@ EditGpi::EditGpi(QWidget *parent) button->setFont(buttonFont()); button->setText(tr("Cancel")); connect(button,SIGNAL(clicked()),this,SLOT(cancelData())); - - // - // Load Data - // } @@ -184,22 +177,22 @@ int EditGpi::exec(RDMatrix::GpioType type,int id) { edit_id=id; edit_type=type; - edit_table="GPIS"; + edit_table="`GPIS`"; if(type==RDMatrix::GpioOutput) { - edit_table="GPOS"; + edit_table="`GPOS`"; } // // ON Values // QString sql=QString("select ")+ - edit_table+".NUMBER,"+ // 00 - edit_table+".MACRO_CART,"+ // 01 - "CART.TITLE "+ // 02 + edit_table+".`NUMBER`,"+ // 00 + edit_table+".`MACRO_CART`,"+ // 01 + "`CART.TITLE` "+ // 02 "from "+edit_table+" "+ - "left join CART "+ - "on "+edit_table+".MACRO_CART=CART.NUMBER where "+ - edit_table+QString().sprintf(".ID=%d",id); + "left join `CART` "+ + "on "+edit_table+".`MACRO_CART`=`CART`.`NUMBER` where "+ + edit_table+QString().sprintf(".`ID`=%d",id); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { setWindowTitle("RDAdmin - "+tr("Edit GPI")+ @@ -219,13 +212,13 @@ int EditGpi::exec(RDMatrix::GpioType type,int id) // OFF Values // sql=QString("select ")+ - edit_table+".NUMBER,"+ // 00 - edit_table+".OFF_MACRO_CART,"+ // 01 - "CART.TITLE "+ // 02 + edit_table+".`NUMBER`,"+ // 00 + edit_table+".`OFF_MACRO_CART`,"+ // 01 + "`CART`.`TITLE` "+ // 02 "from "+edit_table+" "+ - "left join CART "+ - "on "+edit_table+".OFF_MACRO_CART=CART.NUMBER where "+ - edit_table+QString().sprintf(".ID=%d",id); + "left join `CART` "+ + "on "+edit_table+".`OFF_MACRO_CART`=`CART`.`NUMBER` where "+ + edit_table+QString().sprintf(".`ID`=%d",id); q=new RDSqlQuery(sql); if(q->first()) { if(q->value(1).toUInt()>0) { @@ -239,15 +232,6 @@ int EditGpi::exec(RDMatrix::GpioType type,int id) } } - /* - if(*edit_offcart>0) { - RDCart *rdcart=new RDCart(*offcart); - edit_offmacro_edit->setText(QString().sprintf("%06d",*offcart)); - edit_offdescription_edit->setText(rdcart->title()); - delete rdcart; - } - */ - return QDialog::exec(); } @@ -327,9 +311,9 @@ void EditGpi::okData() } QString sql=QString("update ")+edit_table+" set "+ - QString().sprintf("MACRO_CART=%u,",oncart)+ - QString().sprintf("OFF_MACRO_CART=%u ",offcart)+ - QString().sprintf("where ID=%d",edit_id); + QString().sprintf("`MACRO_CART`=%u,",oncart)+ + QString().sprintf("`OFF_MACRO_CART`=%u ",offcart)+ + QString().sprintf("where `ID`=%d",edit_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/edit_group.cpp b/rdadmin/edit_group.cpp index 8e97d639..814133c2 100644 --- a/rdadmin/edit_group.cpp +++ b/rdadmin/edit_group.cpp @@ -32,8 +32,6 @@ EditGroup::EditGroup(QString group,QWidget *parent) : RDDialog(parent) { - setModal(true); - QString sql; RDSqlQuery *q; @@ -241,15 +239,15 @@ EditGroup::EditGroup(QString group,QWidget *parent) } purgeEnabledData(group_shelflife_check->isChecked()); group_nownext_check->setChecked(group_group->enableNowNext()); - sql=QString("select SERVICE_NAME from AUDIO_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(group_group->name())+"\""; + sql=QString("select `SERVICE_NAME` from `AUDIO_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(group_group->name())+"'"; q=new RDSqlQuery(sql); while(q->next()) { group_svcs_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString().sprintf("select NAME from SERVICES"); + sql=QString().sprintf("select `NAME` from `SERVICES`"); q=new RDSqlQuery(sql); while(q->next()) { if(group_svcs_sel->destFindItem(q->value(0).toString())==0) { @@ -375,16 +373,15 @@ void EditGroup::okData() // Add New Services // for(unsigned i=0;idestCount();i++) { - sql=QString("select SERVICE_NAME from AUDIO_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(group_group->name())+"\" && "+ - "SERVICE_NAME=\""+RDEscapeString(group_svcs_sel->destText(i))+"\""; + sql=QString("select `SERVICE_NAME` from `AUDIO_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(group_group->name())+"' && "+ + "`SERVICE_NAME`='"+RDEscapeString(group_svcs_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { - delete q; - sql=QString("insert into AUDIO_PERMS (GROUP_NAME,SERVICE_NAME) ")+ - "values (\""+RDEscapeString(group_group->name())+"\","+ - "\""+RDEscapeString(group_svcs_sel->destText(i))+"\")"; - q=new RDSqlQuery(sql); + sql=QString("insert into `AUDIO_PERMS` (`GROUP_NAME`,`SERVICE_NAME`) ")+ + "values ('"+RDEscapeString(group_group->name())+"',"+ + "'"+RDEscapeString(group_svcs_sel->destText(i))+"')"; + RDSqlQuery::apply(sql); } delete q; } @@ -392,14 +389,13 @@ void EditGroup::okData() // // Delete Old Services // - sql=QString("delete from AUDIO_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(group_group->name())+"\""; + sql=QString("delete from `AUDIO_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(group_group->name())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && SERVICE_NAME<>\"")+ - RDEscapeString(group_svcs_sel->destText(i))+"\""; + sql+=QString(" && `SERVICE_NAME`<>'")+ + RDEscapeString(group_svcs_sel->destText(i))+"'"; } - q=new RDSqlQuery(sql); - delete q; + RDSqlQuery::apply(sql); done(true); } @@ -483,11 +479,11 @@ bool EditGroup::CheckRange() tr("The selected cart range conflicts with the following groups:\n\n"); sql=QString("select ")+ - "NAME,"+ // 00 - "DEFAULT_LOW_CART,"+ // 01 - "DEFAULT_HIGH_CART "+ // 02 - "from GROUPS where "+ - "NAME!=\""+RDEscapeString(group_name_edit->text())+"\""; + "`NAME`,"+ // 00 + "`DEFAULT_LOW_CART`,"+ // 01 + "`DEFAULT_HIGH_CART` "+ // 02 + "from `GROUPS` where "+ + "`NAME`!='"+RDEscapeString(group_name_edit->text())+"'"; q=new RDSqlQuery(sql); while(q->next()) { if(((group_lowcart_box->value()<=q->value(1).toInt())&& diff --git a/rdadmin/edit_hostvar.cpp b/rdadmin/edit_hostvar.cpp index baa2dd75..649150b3 100644 --- a/rdadmin/edit_hostvar.cpp +++ b/rdadmin/edit_hostvar.cpp @@ -114,11 +114,11 @@ int EditHostvar::exec(int id) edit_id=id; QString sql=QString("select ")+ - "NAME,"+ // 00 - "VARVALUE,"+ // 01 - "REMARK "+ // 02 - "from HOSTVARS where "+ - QString().sprintf("ID=%d",id); + "`NAME`,"+ // 00 + "`VARVALUE`,"+ // 01 + "`REMARK` "+ // 02 + "from `HOSTVARS` where "+ + QString().sprintf("`ID`=%d",id); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { edit_name_edit->setText(q->value(0).toString()); @@ -133,11 +133,11 @@ int EditHostvar::exec(int id) void EditHostvar::okData() { - QString sql=QString("update HOSTVARS set ")+ - "NAME=\""+RDEscapeString(edit_name_edit->text())+"\","+ - "VARVALUE=\""+RDEscapeString(edit_varvalue_edit->text())+"\","+ - "REMARK=\""+RDEscapeString(edit_remark_edit->text())+"\" "+ - QString().sprintf("where ID=%d",edit_id); + QString sql=QString("update `HOSTVARS` set ")+ + "`NAME`='"+RDEscapeString(edit_name_edit->text())+"',"+ + "`VARVALUE`='"+RDEscapeString(edit_varvalue_edit->text())+"',"+ + "`REMARK`='"+RDEscapeString(edit_remark_edit->text())+"' "+ + QString().sprintf("where `ID`=%d",edit_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/edit_image.cpp b/rdadmin/edit_image.cpp index 093f3027..af4654d5 100644 --- a/rdadmin/edit_image.cpp +++ b/rdadmin/edit_image.cpp @@ -2,7 +2,7 @@ // // View a pixmap image and modify its metadata // -// (C) Copyright 2020 Fred Gleason +// (C) Copyright 2020-2021 Fred Gleason // // 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 @@ -102,17 +102,17 @@ int EditImage::exec(int img_id) c_image_id=img_id; sql=QString("select ")+ - "FEED_IMAGES.DESCRIPTION,"+ // 00 - "FEED_IMAGES.FILE_EXTENSION,"+ // 01 - "FEED_IMAGES.WIDTH,"+ // 02 - "FEED_IMAGES.HEIGHT,"+ // 03 - "FEED_IMAGES.DEPTH,"+ // 04 - "FEED_IMAGES.DATA,"+ // 05 - "FEED_IMAGES.FEED_ID,"+ // 06 - "FEEDS.BASE_URL "+ // 07 - "from FEED_IMAGES left join FEEDS "+ - "on FEED_IMAGES.FEED_ID=FEEDS.ID where "+ - QString().sprintf("FEED_IMAGES.ID=%d",img_id); + "`FEED_IMAGES`.`DESCRIPTION`,"+ // 00 + "`FEED_IMAGES`.`FILE_EXTENSION`,"+ // 01 + "`FEED_IMAGES`.`WIDTH`,"+ // 02 + "`FEED_IMAGES`.`HEIGHT`,"+ // 03 + "`FEED_IMAGES`.`DEPTH`,"+ // 04 + "`FEED_IMAGES`.`DATA`,"+ // 05 + "`FEED_IMAGES`.`FEED_ID`,"+ // 06 + "`FEEDS`.`BASE_URL` "+ // 07 + "from `FEED_IMAGES` left join `FEEDS` "+ + "on `FEED_IMAGES`.`FEED_ID`=`FEEDS`.`ID` where "+ + QString().sprintf("`FEED_IMAGES`.`ID`=%d",img_id); q=new RDSqlQuery(sql); if(q->first()) { c_description_edit->setText(q->value(0).toString()); @@ -130,8 +130,6 @@ int EditImage::exec(int img_id) c_image_label->setPixmap(QPixmap::fromImage(c_image. scaled(fsize, Qt::KeepAspectRatio))); - // resize(EDIT_IMAGE_WIDTH_OFFSET+fsize.width(), - // EDIT_IMAGE_HEIGHT_OFFSET+fsize.height()); resize(sizeHint()); } delete q; @@ -142,9 +140,9 @@ int EditImage::exec(int img_id) void EditImage::okData() { - QString sql=QString("update FEED_IMAGES set ")+ - "DESCRIPTION=\""+RDEscapeString(c_description_edit->text())+"\" "+ - QString().sprintf("where ID=%d",c_image_id); + QString sql=QString("update `FEED_IMAGES` set ")+ + "`DESCRIPTION`='"+RDEscapeString(c_description_edit->text())+"' "+ + QString().sprintf("where `ID`=%d",c_image_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/edit_jack.cpp b/rdadmin/edit_jack.cpp index 982e8b54..2b4d6c91 100644 --- a/rdadmin/edit_jack.cpp +++ b/rdadmin/edit_jack.cpp @@ -23,12 +23,13 @@ #include -#include #include #include #include #include +#include "globals.h" + EditJack::EditJack(RDStation *station,QWidget *parent) : RDDialog(parent) { @@ -173,10 +174,10 @@ void EditJack::addData() { QString sql; - sql=QString("insert into JACK_CLIENTS set ")+ - "STATION_NAME=\""+RDEscapeString(edit_station->name())+"\","+ - "DESCRIPTION=\""+RDEscapeString(tr("[New client]"))+"\","+ - "COMMAND_LINE=\"\""; + sql=QString("insert into `JACK_CLIENTS` set ")+ + "`STATION_NAME`='"+RDEscapeString(edit_station->name())+"',"+ + "`DESCRIPTION`='"+RDEscapeString(tr("[New client]"))+"',"+ + "`COMMAND_LINE`=''"; unsigned id=RDSqlQuery::run(sql).toUInt(); EditJackClient *d=new EditJackClient(edit_station,this); @@ -185,8 +186,8 @@ void EditJack::addData() edit_jack_client_view->selectRow(row.row()); } else { - sql=QString("delete from JACK_CLIENTS where ")+ - QString().sprintf("ID=%u",id); + sql=QString("delete from `JACK_CLIENTS` where ")+ + QString().sprintf("`ID`=%u",id); RDSqlQuery::apply(sql); } } @@ -223,8 +224,8 @@ void EditJack::deleteData() tr("Are you sure you want to delete JACK Client")+ " \""+edit_jack_client_model->data(rows.first()).toString()+"\"?",QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes) { - sql=QString().sprintf("delete from JACK_CLIENTS where ")+ - QString().sprintf("ID=%d",id); + sql=QString().sprintf("delete from `JACK_CLIENTS` where ")+ + QString().sprintf("`ID`=%d",id); RDSqlQuery::apply(sql); edit_jack_client_model->removeClient(id); } diff --git a/rdadmin/edit_jack_client.cpp b/rdadmin/edit_jack_client.cpp index 54be8db2..b7c7e497 100644 --- a/rdadmin/edit_jack_client.cpp +++ b/rdadmin/edit_jack_client.cpp @@ -20,12 +20,11 @@ #include -#include - #include #include #include "edit_jack_client.h" +#include "globals.h" EditJackClient::EditJackClient(RDStation *station,QWidget *parent) : RDDialog(parent) @@ -101,10 +100,10 @@ int EditJackClient::exec(unsigned id) edit_id=id; sql=QString("select ")+ - "DESCRIPTION," // 00 - "COMMAND_LINE "+ // 01 - "from JACK_CLIENTS where "+ - QString().sprintf("ID=%u",id); + "`DESCRIPTION`," // 00 + "`COMMAND_LINE` "+ // 01 + "from `JACK_CLIENTS` where "+ + QString().sprintf("`ID`=%u",id); q=new RDSqlQuery(sql); if(q->first()) { edit_jack_description_edit->setText(q->value(0).toString()); @@ -120,12 +119,12 @@ void EditJackClient::okData() { QString sql; - sql=QString("update JACK_CLIENTS set ")+ - "DESCRIPTION=\""+RDEscapeString(edit_jack_description_edit->text())+"\","+ - "COMMAND_LINE=\""+ - RDEscapeString(edit_jack_command_line_edit->text().trimmed())+"\" "+ + sql=QString("update `JACK_CLIENTS` set ")+ + "`DESCRIPTION`='"+RDEscapeString(edit_jack_description_edit->text())+"',"+ + "`COMMAND_LINE`='"+ + RDEscapeString(edit_jack_command_line_edit->text().trimmed())+"' "+ "where "+ - QString().sprintf("ID=%u",edit_id); + QString().sprintf("`ID`=%u",edit_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/edit_livewiregpio.cpp b/rdadmin/edit_livewiregpio.cpp index b42522c0..69ec81a4 100644 --- a/rdadmin/edit_livewiregpio.cpp +++ b/rdadmin/edit_livewiregpio.cpp @@ -18,9 +18,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include #include #include @@ -107,11 +106,11 @@ int EditLiveWireGpio::exec(int slot_id) edit_id=slot_id; QString sql=QString("select ")+ - "SLOT,"+ // 00 - "SOURCE_NUMBER,"+ // 01 - "IP_ADDRESS "+ // 02 - "from LIVEWIRE_GPIO_SLOTS where "+ - QString().sprintf("ID=%u",slot_id); + "`SLOT`,"+ // 00 + "`SOURCE_NUMBER`,"+ // 01 + "`IP_ADDRESS` "+ // 02 + "from `LIVEWIRE_GPIO_SLOTS` where "+ + QString().sprintf("`ID`=%u",slot_id); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { edit_title_label-> @@ -142,10 +141,10 @@ void EditLiveWireGpio::okData() tr("The Surface Address is invalid!")); return; } - QString sql=QString("update LIVEWIRE_GPIO_SLOTS set ")+ - QString().sprintf("SOURCE_NUMBER=%d,",edit_source_number_spin->value())+ - "IP_ADDRESS=\""+RDEscapeString(addr.toString())+"\" "+ - QString().sprintf("where ID=%u",edit_id); + QString sql=QString("update `LIVEWIRE_GPIO_SLOTS` set ")+ + QString().sprintf("`SOURCE_NUMBER`=%d,",edit_source_number_spin->value())+ + "`IP_ADDRESS`='"+RDEscapeString(addr.toString())+"' "+ + QString().sprintf("where `ID`=%u",edit_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/edit_matrix.cpp b/rdadmin/edit_matrix.cpp index edc6d683..a0a32687 100644 --- a/rdadmin/edit_matrix.cpp +++ b/rdadmin/edit_matrix.cpp @@ -1361,17 +1361,16 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type) { QString sql; RDSqlQuery *q; - RDSqlQuery *q1; QString tablename; int line_quan=0; switch(type) { case RDMatrix::GpioInput: - tablename="GPIS"; + tablename="`GPIS`"; line_quan=edit_gpis_box->value(); break; case RDMatrix::GpioOutput: - tablename="GPOS"; + tablename="`GPOS`"; line_quan=edit_gpos_box->value(); break; } @@ -1379,18 +1378,17 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type) if(!RDMatrix::controlActive(edit_matrix->type(), RDMatrix::DynamicGpioControl)) { for(int i=0;ifirst()) { sql=QString("insert into `")+tablename+ - "` set STATION_NAME=\""+RDEscapeString(edit_stationname)+"\","+ - QString().sprintf("MATRIX=%d,NUMBER=%d,MACRO_CART=0", + "` set `STATION_NAME`='"+RDEscapeString(edit_stationname)+"',"+ + QString().sprintf("`MATRIX`=%d,`NUMBER`=%d,`MACRO_CART`=0", edit_matrix_number,i+1); - q1=new RDSqlQuery(sql); - delete q1; + RDSqlQuery::apply(sql); } delete q; } @@ -1399,11 +1397,10 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type) // Purge Stale Entries // sql=QString("delete from `")+tablename+ - "` where (STATION_NAME=\""+RDEscapeString(edit_stationname)+ - QString().sprintf("\")&&(MATRIX=%d)&&(NUMBER>%d)", + "` where (`STATION_NAME`='"+RDEscapeString(edit_stationname)+ + QString().sprintf("')&&(`MATRIX`=%d)&&(`NUMBER`>%d)", edit_matrix_number,line_quan); - q=new RDSqlQuery(sql); - delete q; + RDSqlQuery::apply(sql); } } @@ -1418,28 +1415,28 @@ void EditMatrix::AddEndpoints(RDMatrix::Endpoint ep) const QString sql; RDSqlQuery *q=NULL; - QString table="INPUTS"; + QString table="`INPUTS`"; int endpoint_quan=edit_inputs_box->value(); QString name=tr("Input"); if(ep==RDMatrix::Output) { - table="OUTPUTS"; + table="`OUTPUTS`"; endpoint_quan=edit_outputs_box->value(); name=tr("Output"); } for(int i=0;istation())+"\" && "+ - QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+ - QString().sprintf("NUMBER=%d",i+1); + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"' && "+ + QString().sprintf("`MATRIX`=%d && ",edit_matrix->matrix())+ + QString().sprintf("`NUMBER`=%d",i+1); q=new RDSqlQuery(sql); if(!q->first()) { sql=QString("insert into ")+table+" set "+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\","+ - QString().sprintf("MATRIX=%d,",edit_matrix->matrix())+ - QString().sprintf("NUMBER=%d,",i+1)+ - "NAME=\""+RDEscapeString(name+QString().sprintf(" %03d",i+1))+"\""; + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"',"+ + QString().sprintf("`MATRIX`=%d,",edit_matrix->matrix())+ + QString().sprintf("`NUMBER`=%d,",i+1)+ + "`NAME`='"+RDEscapeString(name+QString().sprintf(" %03d",i+1))+"'"; RDSqlQuery::apply(sql); } } @@ -1451,17 +1448,17 @@ void EditMatrix::PruneEndpoints(RDMatrix::Endpoint ep) const { QString sql; - QString table="INPUTS"; + QString table="`INPUTS`"; int endpoint_quan=edit_inputs_box->value(); if(ep==RDMatrix::Output) { - table="OUTPUTS"; + table="`OUTPUTS`"; endpoint_quan=edit_outputs_box->value(); } sql=QString("delete from ")+table+" where "+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+ - QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+ - QString().sprintf("NUMBER>%d",endpoint_quan); + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"' && "+ + QString().sprintf("`MATRIX`=%d && ",edit_matrix->matrix())+ + QString().sprintf("`NUMBER`>%d",endpoint_quan); RDSqlQuery::apply(sql); } @@ -1471,21 +1468,21 @@ bool EditMatrix::ConfirmPruneEndpoints(RDMatrix::Endpoint ep) QString sql; RDSqlQuery *q=NULL; - QString table="INPUTS"; + QString table="`INPUTS`"; int endpoint_quan=edit_inputs_box->value(); QString name=tr("Inputs"); if(ep==RDMatrix::Output) { - table="OUTPUTS"; + table="`OUTPUTS`"; endpoint_quan=edit_outputs_box->value(); name=tr("Outputs"); } sql=QString("select ")+ - "ID "+ // 00 + "`ID` "+ // 00 "from "+table+" where "+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+ - QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+ - QString().sprintf("NUMBER>%d",endpoint_quan); + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"' && "+ + QString().sprintf("`MATRIX`=%d && ",edit_matrix->matrix())+ + QString().sprintf("`NUMBER`>%d",endpoint_quan); q=new RDSqlQuery(sql); if(q->first()) { if(QMessageBox::warning(this,"RDAdmin - "+tr("Warning"), @@ -1524,23 +1521,23 @@ void EditMatrix::AddResources(RDMatrix::VguestType type) const } for(int i=0;istation())+"\" && "+ - QString().sprintf("MATRIX_NUM=%d && ",edit_matrix->matrix()); + "`ID` "+ // 00 + "from `VGUEST_RESOURCES` where "+ + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"' && "+ + QString().sprintf("`MATRIX_NUM`=%d && ",edit_matrix->matrix()); if(edit_matrix->type()==RDMatrix::LogitekVguest) { - sql+=QString().sprintf("VGUEST_TYPE=%d && ",type); + sql+=QString().sprintf("`VGUEST_TYPE`=%d && ",type); } - sql+=QString().sprintf("NUMBER=%d",i+1); + sql+=QString().sprintf("`NUMBER`=%d",i+1); q=new RDSqlQuery(sql); if(!q->first()) { - sql=QString("insert into VGUEST_RESOURCES set ")+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\","+ - QString().sprintf("MATRIX_NUM=%d,",edit_matrix->matrix()); + sql=QString("insert into `VGUEST_RESOURCES` set ")+ + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"',"+ + QString().sprintf("`MATRIX_NUM`=%d,",edit_matrix->matrix()); if(edit_matrix->type()==RDMatrix::LogitekVguest) { - sql+=QString().sprintf("VGUEST_TYPE=%d,",type); + sql+=QString().sprintf("`VGUEST_TYPE`=%d,",type); } - sql+=QString().sprintf("NUMBER=%d",i+1); + sql+=QString().sprintf("`NUMBER`=%d",i+1); RDSqlQuery::apply(sql); } delete q; @@ -1557,13 +1554,13 @@ void EditMatrix::PruneResources(RDMatrix::VguestType type) const entry_quan=edit_displays_box->value(); } - sql=QString("delete from VGUEST_RESOURCES where ")+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+ - QString().sprintf("MATRIX_NUM=%d && ",edit_matrix->matrix()); + sql=QString("delete from `VGUEST_RESOURCES` where ")+ + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"' && "+ + QString().sprintf("`MATRIX_NUM`=%d && ",edit_matrix->matrix()); if(edit_matrix->type()==RDMatrix::LogitekVguest) { - sql+=QString().sprintf("VGUEST_TYPE=%d && ",type); + sql+=QString().sprintf("`VGUEST_TYPE`=%d && ",type); } - sql+=QString().sprintf("NUMBER>%d",entry_quan); + sql+=QString().sprintf("`NUMBER`>%d",entry_quan); RDSqlQuery::apply(sql); } @@ -1581,14 +1578,14 @@ bool EditMatrix::ConfirmPruneResources(RDMatrix::VguestType type) } sql=QString("select ")+ - "ID "+ // 00 - "from VGUEST_RESOURCES where "+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+ - QString().sprintf("MATRIX_NUM=%d && ",edit_matrix->matrix()); + "`ID` "+ // 00 + "from `VGUEST_RESOURCES` where "+ + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"' && "+ + QString().sprintf("`MATRIX_NUM`=%d && ",edit_matrix->matrix()); if(edit_matrix->type()==RDMatrix::LogitekVguest) { - sql+=QString().sprintf("VGUEST_TYPE=%d && ",type); + sql+=QString().sprintf("`VGUEST_TYPE`=%d && ",type); } - sql+=QString().sprintf("NUMBER>%d",entry_quan); + sql+=QString().sprintf("`NUMBER`>%d",entry_quan); q=new RDSqlQuery(sql); if(q->first()) { if(QMessageBox::warning(this,"RDAdmin - "+tr("Warning"), @@ -1617,17 +1614,17 @@ void EditMatrix::AddGpioSlots() int bundle_end=edit_gpis_box->value()/5; for(int i=0;istation())+"\" && "+ - QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+ - QString().sprintf("SLOT=%d",i); + "`ID` "+ // 00 + "from `LIVEWIRE_GPIO_SLOTS` where "+ + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"' && "+ + QString().sprintf("`MATRIX`=%d && ",edit_matrix->matrix())+ + QString().sprintf("`SLOT`=%d",i); RDSqlQuery *q=new RDSqlQuery(sql); if(!q->first()) { - sql=QString("insert into LIVEWIRE_GPIO_SLOTS set ")+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\","+ - QString().sprintf("MATRIX=%d,",edit_matrix->matrix())+ - QString().sprintf("SLOT=%d",i); + sql=QString("insert into `LIVEWIRE_GPIO_SLOTS` set ")+ + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"',"+ + QString().sprintf("`MATRIX`=%d,",edit_matrix->matrix())+ + QString().sprintf("`SLOT`=%d",i); RDSqlQuery::apply(sql); } delete q; @@ -1639,10 +1636,10 @@ void EditMatrix::AddGpioSlots() void EditMatrix::PurgeGpioSlots() { if(edit_matrix->type()==RDMatrix::LiveWireMcastGpio) { - QString sql=QString("delete from LIVEWIRE_GPIO_SLOTS where ")+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\" && "+ - QString().sprintf("MATRIX=%d && ",edit_matrix->matrix())+ - QString().sprintf("SLOT>=%d",edit_gpis_box->value()/5); + QString sql=QString("delete from `LIVEWIRE_GPIO_SLOTS` where ")+ + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"' && "+ + QString().sprintf("`MATRIX`=%d && ",edit_matrix->matrix())+ + QString().sprintf("`SLOT`>=%d",edit_gpis_box->value()/5); RDSqlQuery::apply(sql); } } diff --git a/rdadmin/edit_node.cpp b/rdadmin/edit_node.cpp index 71720cf8..9946a68a 100644 --- a/rdadmin/edit_node.cpp +++ b/rdadmin/edit_node.cpp @@ -18,9 +18,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include #include #include @@ -32,8 +31,6 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) : RDDialog(parent) { - setModal(true); - edit_id=id; edit_matrix=matrix; edit_password_changed=false; @@ -42,10 +39,8 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); // // Node Hostname @@ -141,10 +136,14 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) else { QString sql; RDSqlQuery *q; - sql=QString().sprintf("select HOSTNAME,TCP_PORT,DESCRIPTION,PASSWORD,\ - BASE_OUTPUT \ - from SWITCHER_NODES \ - where ID=%d",*edit_id); + sql=QString("select ")+ + "`HOSTNAME`,"+ // 00 + "`TCP_PORT`,"+ // 01 + "`DESCRIPTION`,"+ // 02 + "`PASSWORD`,"+ // 03 + "`BASE_OUTPUT` "+ // 04 + "from `SWITCHER_NODES` where "+ + QString().sprintf("`ID`=%d",*edit_id); q=new RDSqlQuery(sql); if(q->first()) { edit_hostname_edit->setText(q->value(0).toString()); @@ -199,11 +198,11 @@ void EditNode::okData() } if((*edit_id)<0) { - sql=QString("select ID from SWITCHER_NODES where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\") && "+ - QString().sprintf("(MATRIX=%d) && ",edit_matrix->matrix())+ - "(HOSTNAME=\""+RDEscapeString(edit_hostname_edit->text())+"\") && "+ - QString().sprintf("(TCP_PORT=%d)",edit_tcpport_spin->value()); + sql=QString("select `ID` from `SWITCHER_NODES` where ")+ + "(`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"') && "+ + QString().sprintf("(`MATRIX`=%d) && ",edit_matrix->matrix())+ + "(`HOSTNAME`='"+RDEscapeString(edit_hostname_edit->text())+"') && "+ + QString().sprintf("(`TCP_PORT`=%d)",edit_tcpport_spin->value()); q=new RDSqlQuery(sql); if(q->first()) { delete q; @@ -213,7 +212,7 @@ void EditNode::okData() } delete q; - sql="select ID from SWITCHER_NODES order by ID desc"; + sql="select `ID` from `SWITCHER_NODES` order by `ID` desc"; q=new RDSqlQuery(sql); if(q->first()) { *edit_id=q->value(0).toInt()+1; @@ -222,26 +221,25 @@ void EditNode::okData() *edit_id=1; } delete q; - sql=QString("insert into SWITCHER_NODES set ")+ - QString().sprintf("ID=%d,",*edit_id)+ - "STATION_NAME=\""+RDEscapeString(edit_matrix->station())+"\","+ - QString().sprintf("MATRIX=%d,",edit_matrix->matrix())+ - "HOSTNAME=\""+RDEscapeString(edit_hostname_edit->text())+"\","+ - QString().sprintf("TCP_PORT=%d,",edit_tcpport_spin->value())+ - "DESCRIPTION=\""+RDEscapeString(edit_description_edit->text())+"\","+ - QString().sprintf("BASE_OUTPUT=%d,",edit_output_spin->value())+ - "PASSWORD=\""+RDEscapeString(edit_password)+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("insert into `SWITCHER_NODES` set ")+ + QString().sprintf("`ID`=%d,",*edit_id)+ + "`STATION_NAME`='"+RDEscapeString(edit_matrix->station())+"',"+ + QString().sprintf("`MATRIX`=%d,",edit_matrix->matrix())+ + "`HOSTNAME`='"+RDEscapeString(edit_hostname_edit->text())+"',"+ + QString().sprintf("`TCP_PORT`=%d,",edit_tcpport_spin->value())+ + "`DESCRIPTION`='"+RDEscapeString(edit_description_edit->text())+"',"+ + QString().sprintf("`BASE_OUTPUT`=%d,",edit_output_spin->value())+ + "`PASSWORD`='"+RDEscapeString(edit_password)+"'"; + RDSqlQuery::apply(sql); } else { - sql=QString("update SWITCHER_NODES set ")+ - "HOSTNAME=\""+RDEscapeString(edit_hostname_edit->text())+"\","+ - QString().sprintf("TCP_PORT=%d,",edit_tcpport_spin->value())+ - "DESCRIPTION=\""+RDEscapeString(edit_description_edit->text())+"\","+ - QString().sprintf("BASE_OUTPUT=%d,",edit_output_spin->value())+ - "PASSWORD=\""+RDEscapeString(edit_password)+"\" where "+ - QString().sprintf("ID=%d",*edit_id); + sql=QString("update `SWITCHER_NODES` set ")+ + "`HOSTNAME`='"+RDEscapeString(edit_hostname_edit->text())+"',"+ + QString().sprintf("`TCP_PORT`=%d,",edit_tcpport_spin->value())+ + "`DESCRIPTION`='"+RDEscapeString(edit_description_edit->text())+"',"+ + QString().sprintf("`BASE_OUTPUT`=%d,",edit_output_spin->value())+ + "`PASSWORD`='"+RDEscapeString(edit_password)+"' where "+ + QString().sprintf("`ID`=%d",*edit_id); q=new RDSqlQuery(sql); delete q; } diff --git a/rdadmin/edit_pypad.cpp b/rdadmin/edit_pypad.cpp index 39ddf3da..420c0fed 100644 --- a/rdadmin/edit_pypad.cpp +++ b/rdadmin/edit_pypad.cpp @@ -2,7 +2,7 @@ // // Edit a PyPAD Instance Configuration // -// (C) Copyright 2018-2019 Fred Gleason +// (C) Copyright 2018-2021 Fred Gleason // // 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 @@ -77,11 +77,11 @@ EditPypad::EditPypad(int id,QWidget *parent) // Load Values // QString sql=QString("select ")+ - "SCRIPT_PATH,"+ // 00 - "DESCRIPTION,"+ // 01 - "CONFIG "+ // 02 - "from PYPAD_INSTANCES where "+ - QString().sprintf("ID=%u",edit_id); + "`SCRIPT_PATH`,"+ // 00 + "`DESCRIPTION`,"+ // 01 + "`CONFIG` "+ // 02 + "from `PYPAD_INSTANCES` where "+ + QString().sprintf("`ID`=%u",edit_id); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { edit_script_path_edit->setText(q->value(0).toString()); @@ -107,10 +107,10 @@ QSizePolicy EditPypad::sizePolicy() const void EditPypad::okData() { - QString sql=QString("update PYPAD_INSTANCES set ")+ - "DESCRIPTION=\""+RDEscapeString(edit_description_edit->text())+"\","+ - "CONFIG=\""+RDEscapeString(edit_config_text->toPlainText())+"\" where "+ - QString().sprintf("ID=%u",edit_id); + QString sql=QString("update `PYPAD_INSTANCES` set ")+ + "`DESCRIPTION`='"+RDEscapeString(edit_description_edit->text())+"',"+ + "`CONFIG`='"+RDEscapeString(edit_config_text->toPlainText())+"' where "+ + QString().sprintf("`ID`=%u",edit_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/edit_replicator.cpp b/rdadmin/edit_replicator.cpp index a6e31ef4..f305f6a7 100644 --- a/rdadmin/edit_replicator.cpp +++ b/rdadmin/edit_replicator.cpp @@ -91,16 +91,11 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) // repl_station_box=new QComboBox(this); repl_station_box->setGeometry(155,77,sizeHint().width()-165,19); - sql="select NAME from STATIONS order by NAME"; - q=new RDSqlQuery(sql); - while(q->next()) { - repl_station_box->insertItem(repl_station_box->count(), - q->value(0).toString()); - if(repl_replicator->stationName()==q->value(0).toString()) { - repl_station_box->setCurrentIndex(repl_station_box->count()-1); - } - } - delete q; + repl_station_model=new RDStationListModel(false,"",this); + repl_station_model->setFont(defaultFont()); + repl_station_model->setPalette(palette()); + repl_station_box->setModel(repl_station_model); + repl_station_box->setCurrentText(repl_replicator->stationName()); QLabel *repl_station_label=new QLabel(tr("Host System:"),this); repl_station_label->setFont(labelFont()); repl_station_label->setGeometry(10,77,140,19); @@ -233,15 +228,15 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) repl_normalize_box->setChecked(true); repl_normalize_spin->setValue(repl_replicator->normalizeLevel()/1000); } - sql=QString("select GROUP_NAME from REPLICATOR_MAP where ")+ - "REPLICATOR_NAME=\""+RDEscapeString(repl_name_edit->text())+"\""; + sql=QString("select `GROUP_NAME` from `REPLICATOR_MAP` where ")+ + "`REPLICATOR_NAME`='"+RDEscapeString(repl_name_edit->text())+"'"; q=new RDSqlQuery(sql); while(q->next()) { repl_groups_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString().sprintf("select NAME from GROUPS"); + sql=QString().sprintf("select `NAME` from `GROUPS`"); q=new RDSqlQuery(sql); while(q->next()) { if(repl_groups_sel->destFindItem(q->value(0).toString())==0) { @@ -256,6 +251,7 @@ EditReplicator::~EditReplicator() { delete repl_settings; delete repl_replicator; + delete repl_station_model; } @@ -315,15 +311,15 @@ void EditReplicator::okData() // Add New Groups // for(unsigned i=0;idestCount();i++) { - sql=QString("select GROUP_NAME from REPLICATOR_MAP where ")+ - "REPLICATOR_NAME=\""+RDEscapeString(repl_name_edit->text())+"\" && "+ - "GROUP_NAME=\""+RDEscapeString(repl_groups_sel->destText(i))+"\""; + sql=QString("select `GROUP_NAME` from `REPLICATOR_MAP` where ")+ + "`REPLICATOR_NAME`='"+RDEscapeString(repl_name_edit->text())+"' && "+ + "`GROUP_NAME`='"+RDEscapeString(repl_groups_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into REPLICATOR_MAP (REPLICATOR_NAME,GROUP_NAME) ")+ - "values (\""+RDEscapeString(repl_name_edit->text())+"\","+ - "\""+RDEscapeString(repl_groups_sel->destText(i))+"\")"; + sql=QString("insert into `REPLICATOR_MAP` (`REPLICATOR_NAME`,`GROUP_NAME`) ")+ + "values ('"+RDEscapeString(repl_name_edit->text())+"',"+ + "'"+RDEscapeString(repl_groups_sel->destText(i))+"')"; q=new RDSqlQuery(sql); } delete q; @@ -332,11 +328,11 @@ void EditReplicator::okData() // // Delete Old Groups // - sql=QString("delete from REPLICATOR_MAP where ")+ - "REPLICATOR_NAME=\""+RDEscapeString(repl_name_edit->text())+"\""; + sql=QString("delete from `REPLICATOR_MAP` where ")+ + "`REPLICATOR_NAME`='"+RDEscapeString(repl_name_edit->text())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && GROUP_NAME<>\"")+ - RDEscapeString(repl_groups_sel->destText(i))+"\""; + sql+=QString(" && `GROUP_NAME`<>'")+ + RDEscapeString(repl_groups_sel->destText(i))+"'"; } q=new RDSqlQuery(sql); delete q; diff --git a/rdadmin/edit_replicator.h b/rdadmin/edit_replicator.h index 46a6a36b..79d0ba89 100644 --- a/rdadmin/edit_replicator.h +++ b/rdadmin/edit_replicator.h @@ -33,6 +33,7 @@ #include #include #include +#include class EditReplicator : public RDDialog { @@ -55,6 +56,7 @@ class EditReplicator : public RDDialog QLineEdit *repl_description_edit; QComboBox *repl_type_box; QComboBox *repl_station_box; + RDStationListModel *repl_station_model; QLineEdit *repl_url_edit; QLabel *repl_username_label; QLineEdit *repl_username_edit; diff --git a/rdadmin/edit_report.cpp b/rdadmin/edit_report.cpp index cfc08c77..df778264 100644 --- a/rdadmin/edit_report.cpp +++ b/rdadmin/edit_report.cpp @@ -392,15 +392,15 @@ EditReport::EditReport(QString rptname,QWidget *parent) edit_endtime_edit->setDisabled(ok); edit_daypart_check->setChecked(!ok); - sql=QString("select SERVICE_NAME from REPORT_SERVICES where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\""; + sql=QString("select `SERVICE_NAME` from `REPORT_SERVICES` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"'"; q=new RDSqlQuery(sql); while(q->next()) { edit_service_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString().sprintf("select NAME from SERVICES"); + sql=QString().sprintf("select `NAME` from `SERVICES`"); q=new RDSqlQuery(sql); while(q->next()) { if(edit_service_sel->destFindItem(q->value(0).toString())==0) { @@ -409,15 +409,15 @@ EditReport::EditReport(QString rptname,QWidget *parent) } delete q; - sql=QString("select STATION_NAME from REPORT_STATIONS where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\""; + sql=QString("select `STATION_NAME` from `REPORT_STATIONS` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"'"; q=new RDSqlQuery(sql); while(q->next()) { edit_station_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString().sprintf("select NAME from STATIONS"); + sql=QString().sprintf("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql); while(q->next()) { if(edit_station_sel->destFindItem(q->value(0).toString())==0) { @@ -428,15 +428,15 @@ EditReport::EditReport(QString rptname,QWidget *parent) edit_group_box->setChecked(edit_report->filterGroups()); edit_group_sel->setEnabled(edit_report->filterGroups()); - sql=QString("select GROUP_NAME from REPORT_GROUPS where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\""; + sql=QString("select `GROUP_NAME` from `REPORT_GROUPS` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"'"; q=new RDSqlQuery(sql); while(q->next()) { edit_group_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString().sprintf("select NAME from GROUPS"); + sql=QString().sprintf("select `NAME` from `GROUPS`"); q=new RDSqlQuery(sql); while(q->next()) { if(edit_group_sel->destFindItem(q->value(0).toString())==0) { @@ -524,15 +524,15 @@ void EditReport::okData() // Add New Services // for(unsigned i=0;idestCount();i++) { - sql=QString("select SERVICE_NAME from REPORT_SERVICES where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\" && "+ - "SERVICE_NAME=\""+RDEscapeString(edit_service_sel->destText(i))+"\""; + sql=QString("select `SERVICE_NAME` from `REPORT_SERVICES` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"' && "+ + "`SERVICE_NAME`='"+RDEscapeString(edit_service_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into REPORT_SERVICES (REPORT_NAME,SERVICE_NAME) ")+ - "values (\""+RDEscapeString(edit_report->name())+"\","+ - "\""+RDEscapeString(edit_service_sel->destText(i))+"\")"; + sql=QString("insert into `REPORT_SERVICES` (`REPORT_NAME`,`SERVICE_NAME`) ")+ + "values ('"+RDEscapeString(edit_report->name())+"',"+ + "'"+RDEscapeString(edit_service_sel->destText(i))+"')"; q=new RDSqlQuery(sql); } delete q; @@ -541,11 +541,11 @@ void EditReport::okData() // // Delete Old Services // - sql=QString("delete from REPORT_SERVICES where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\""; + sql=QString("delete from `REPORT_SERVICES` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && SERVICE_NAME<>\"")+ - RDEscapeString(edit_service_sel->destText(i))+"\""; + sql+=QString(" && `SERVICE_NAME`<>'")+ + RDEscapeString(edit_service_sel->destText(i))+"'"; } q=new RDSqlQuery(sql); delete q; @@ -554,15 +554,15 @@ void EditReport::okData() // Add New Stations // for(unsigned i=0;idestCount();i++) { - sql=QString("select STATION_NAME from REPORT_STATIONS where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\" && "+ - "STATION_NAME=\""+RDEscapeString(edit_station_sel->destText(i))+"\""; + sql=QString("select `STATION_NAME` from `REPORT_STATIONS` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"' && "+ + "`STATION_NAME`='"+RDEscapeString(edit_station_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into REPORT_STATIONS (REPORT_NAME,STATION_NAME) ")+ - "values (\""+RDEscapeString(edit_report->name())+"\","+ - "\""+RDEscapeString(edit_station_sel->destText(i))+"\")"; + sql=QString("insert into `REPORT_STATIONS` (`REPORT_NAME`,`STATION_NAME`) ")+ + "values ('"+RDEscapeString(edit_report->name())+"',"+ + "'"+RDEscapeString(edit_station_sel->destText(i))+"')"; q=new RDSqlQuery(sql); } delete q; @@ -571,11 +571,11 @@ void EditReport::okData() // // Delete Old Stations // - sql=QString("delete from REPORT_STATIONS where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\""; + sql=QString("delete from `REPORT_STATIONS` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && STATION_NAME<>\"")+ - RDEscapeString(edit_station_sel->destText(i))+"\""; + sql+=QString(" && `STATION_NAME`<>'")+ + RDEscapeString(edit_station_sel->destText(i))+"'"; } q=new RDSqlQuery(sql); delete q; @@ -584,15 +584,15 @@ void EditReport::okData() // Add New Groups // for(unsigned i=0;idestCount();i++) { - sql=QString("select GROUP_NAME from REPORT_GROUPS where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\" && "+ - "GROUP_NAME=\""+RDEscapeString(edit_group_sel->destText(i))+"\""; + sql=QString("select `GROUP_NAME` from `REPORT_GROUPS` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"' && "+ + "`GROUP_NAME`='"+RDEscapeString(edit_group_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into REPORT_GROUPS (REPORT_NAME,GROUP_NAME) ")+ - "values (\""+RDEscapeString(edit_report->name())+"\","+ - "\""+RDEscapeString(edit_group_sel->destText(i))+"\")"; + sql=QString("insert into `REPORT_GROUPS` (`REPORT_NAME`,`GROUP_NAME`) ")+ + "values ('"+RDEscapeString(edit_report->name())+"',"+ + "'"+RDEscapeString(edit_group_sel->destText(i))+"')"; q=new RDSqlQuery(sql); } delete q; @@ -601,11 +601,11 @@ void EditReport::okData() // // Delete Old Groups // - sql=QString("delete from REPORT_GROUPS where ")+ - "REPORT_NAME=\""+RDEscapeString(edit_report->name())+"\""; + sql=QString("delete from `REPORT_GROUPS` where ")+ + "`REPORT_NAME`='"+RDEscapeString(edit_report->name())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && GROUP_NAME<>\"")+ - RDEscapeString(edit_group_sel->destText(i))+"\""; + sql+=QString(" && `GROUP_NAME`<>'")+ + RDEscapeString(edit_group_sel->destText(i))+"'"; } q=new RDSqlQuery(sql); delete q; diff --git a/rdadmin/edit_sas_resource.cpp b/rdadmin/edit_sas_resource.cpp index 36f33c58..35222490 100644 --- a/rdadmin/edit_sas_resource.cpp +++ b/rdadmin/edit_sas_resource.cpp @@ -102,12 +102,12 @@ int EditSasResource::exec(unsigned id) edit_id=id; QString sql=QString("select ")+ - "NUMBER,"+ // 00 - "ENGINE_NUM,"+ // 01 - "DEVICE_NUM,"+ // 02 - "RELAY_NUM "+ // 03 - "from VGUEST_RESOURCES where "+ - QString().sprintf("ID=%u",edit_id); + "`NUMBER`,"+ // 00 + "`ENGINE_NUM`,"+ // 01 + "`DEVICE_NUM`,"+ // 02 + "`RELAY_NUM` "+ // 03 + "from `VGUEST_RESOURCES` where "+ + QString().sprintf("`ID`=%u",edit_id); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { if(q->value(1).toInt()>=0) { @@ -171,11 +171,11 @@ void EditSasResource::okData() } } - QString sql=QString("update VGUEST_RESOURCES set ")+ - QString().sprintf("ENGINE_NUM=%d,",enginenum)+ - QString().sprintf("DEVICE_NUM=%d,",devicenum)+ - QString().sprintf("RELAY_NUM=%d ",relaynum)+ - QString().sprintf("where ID=%u",edit_id); + QString sql=QString("update `VGUEST_RESOURCES` set ")+ + QString().sprintf("`ENGINE_NUM`=%d,",enginenum)+ + QString().sprintf("`DEVICE_NUM`=%d,",devicenum)+ + QString().sprintf("`RELAY_NUM`=%d ",relaynum)+ + QString().sprintf("where `ID`=%u",edit_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/edit_schedcodes.cpp b/rdadmin/edit_schedcodes.cpp index 042d9ab8..4bf82146 100644 --- a/rdadmin/edit_schedcodes.cpp +++ b/rdadmin/edit_schedcodes.cpp @@ -106,9 +106,9 @@ int EditSchedCode::exec(const QString &scode) d_code_edit->setText(scode); QString sql=QString("select ")+ - "DESCRIPTION "+ // 00 - "from SCHED_CODES where "+ - "CODE=\""+RDEscapeString(scode)+"\""; + "`DESCRIPTION` "+ // 00 + "from `SCHED_CODES` where "+ + "`CODE`='"+RDEscapeString(scode)+"'"; RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { d_description_edit->setText(q->value(0).toString()); @@ -124,9 +124,9 @@ void EditSchedCode::okData() RDSqlQuery *q; QString sql; - sql=QString("update SCHED_CODES set ")+ - "DESCRIPTION=\""+RDEscapeString(d_description_edit->text())+"\" "+ - "where CODE=\""+RDEscapeString(d_code_edit->text())+"\""; + sql=QString("update `SCHED_CODES` set ")+ + "`DESCRIPTION`='"+RDEscapeString(d_description_edit->text())+"' "+ + "where `CODE`='"+RDEscapeString(d_code_edit->text())+"'"; q=new RDSqlQuery(sql); delete q; diff --git a/rdadmin/edit_station.cpp b/rdadmin/edit_station.cpp index 99a738e0..dfd31c1c 100644 --- a/rdadmin/edit_station.cpp +++ b/rdadmin/edit_station.cpp @@ -636,9 +636,9 @@ void EditStation::okData() RDSqlQuery *q; if(!station_maint_box->isChecked()) { - sql=QString("select NAME from STATIONS where ")+ - "(NAME!=\""+RDEscapeString(station_station->name())+"\")&&"+ - "(SYSTEM_MAINT=\"Y\")"; + sql=QString("select `NAME` from `STATIONS` where ")+ + "(`NAME`!='"+RDEscapeString(station_station->name())+"')&&"+ + "(`SYSTEM_MAINT`='Y')"; q=new RDSqlQuery(sql); if(!q->first()) { QMessageBox::warning(this,tr("System Maintenance"), diff --git a/rdadmin/edit_superfeed.cpp b/rdadmin/edit_superfeed.cpp index b0ef2f83..5e077852 100644 --- a/rdadmin/edit_superfeed.cpp +++ b/rdadmin/edit_superfeed.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell Superfeed // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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 - #include #include @@ -75,17 +73,17 @@ EditSuperfeed::EditSuperfeed(RDFeed *feed,QWidget *parent) // Populate Fields // sql=QString("select ")+ - "MEMBER_KEY_NAME "+ // 00 - "from SUPERFEED_MAPS where "+ - "KEY_NAME=\""+RDEscapeString(feed_feed->keyName())+"\""; + "`MEMBER_KEY_NAME` "+ // 00 + "from `SUPERFEED_MAPS` where "+ + "`KEY_NAME`='"+RDEscapeString(feed_feed->keyName())+"'"; q=new RDSqlQuery(sql); while(q->next()) { feed_host_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString("select KEY_NAME from FEEDS where ")+ - "IS_SUPERFEED='N'"; + sql=QString("select `KEY_NAME` from `FEEDS` where ")+ + "`IS_SUPERFEED`='N'"; q=new RDSqlQuery(sql); while(q->next()) { if(feed_host_sel->destFindItem(q->value(0).toString())==0) { @@ -122,7 +120,7 @@ void EditSuperfeed::okData() // Feed ID Map // QMap feed_ids; - sql=QString("select KEY_NAME,ID from FEEDS"); + sql=QString("select `KEY_NAME`,`ID` from `FEEDS`"); q=new RDSqlQuery(sql); while(q->next()) { feed_ids[q->value(0).toString()]=q->value(1).toUInt(); @@ -134,18 +132,18 @@ void EditSuperfeed::okData() // for(unsigned i=0;idestCount();i++) { sql=QString("select ")+ - "MEMBER_KEY_NAME " // 00 - "from SUPERFEED_MAPS where "+ - "KEY_NAME=\""+RDEscapeString(feed_feed->keyName())+"\" && " - "MEMBER_KEY_NAME=\""+RDEscapeString(feed_host_sel->destText(i))+"\""; + "`MEMBER_KEY_NAME` " // 00 + "from `SUPERFEED_MAPS` where "+ + "`KEY_NAME`='"+RDEscapeString(feed_feed->keyName())+"' && " + "`MEMBER_KEY_NAME`='"+RDEscapeString(feed_host_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into SUPERFEED_MAPS set ")+ - "KEY_NAME=\""+RDEscapeString(feed_feed->keyName())+"\","+ - "MEMBER_KEY_NAME=\""+RDEscapeString(feed_host_sel->destText(i))+"\","+ - QString().sprintf("FEED_ID=%u,",feed_ids.value(feed_feed->keyName()))+ - QString().sprintf("MEMBER_FEED_ID=%u",feed_ids.value(feed_host_sel->destText(i))); + sql=QString("insert into `SUPERFEED_MAPS` set ")+ + "`KEY_NAME`='"+RDEscapeString(feed_feed->keyName())+"',"+ + "`MEMBER_KEY_NAME`='"+RDEscapeString(feed_host_sel->destText(i))+"',"+ + QString().sprintf("`FEED_ID`=%u,",feed_ids.value(feed_feed->keyName()))+ + QString().sprintf("`MEMBER_FEED_ID`=%u",feed_ids.value(feed_host_sel->destText(i))); q=new RDSqlQuery(sql); } delete q; @@ -154,11 +152,11 @@ void EditSuperfeed::okData() // // Delete Old Groups // - sql=QString("delete from SUPERFEED_MAPS where ")+ - "KEY_NAME=\""+RDEscapeString(feed_feed->keyName())+"\""; + sql=QString("delete from `SUPERFEED_MAPS` where ")+ + "`KEY_NAME`='"+RDEscapeString(feed_feed->keyName())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && MEMBER_KEY_NAME<>\"")+ - RDEscapeString(feed_host_sel->destText(i))+"\""; + sql+=QString(" && `MEMBER_KEY_NAME`<>'")+ + RDEscapeString(feed_host_sel->destText(i))+"'"; } q=new RDSqlQuery(sql); delete q; diff --git a/rdadmin/edit_svc.cpp b/rdadmin/edit_svc.cpp index 5c59314a..837d7989 100644 --- a/rdadmin/edit_svc.cpp +++ b/rdadmin/edit_svc.cpp @@ -522,7 +522,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) setText(svc_svc->preimportCommand(RDSvc::Traffic)); svc_tfc_import_template_box->insertItem(0,tr("[custom]")); svc_mus_import_template_box->insertItem(0,tr("[custom]")); - sql="select NAME from IMPORT_TEMPLATES order by NAME"; + sql="select `NAME` from `IMPORT_TEMPLATES` order by `NAME`"; q=new RDSqlQuery(sql); while(q->next()) { svc_tfc_import_template_box-> diff --git a/rdadmin/edit_svc_perms.cpp b/rdadmin/edit_svc_perms.cpp index f262df72..fbe3fac6 100644 --- a/rdadmin/edit_svc_perms.cpp +++ b/rdadmin/edit_svc_perms.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell Service Permissions // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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 @@ -26,8 +26,6 @@ EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent) : RDDialog(parent) { - setModal(true); - QString sql; RDSqlQuery *q; @@ -73,15 +71,15 @@ EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent) // // Populate Fields - sql=QString("select STATION_NAME from SERVICE_PERMS where ")+ - "SERVICE_NAME=\""+RDEscapeString(svc_svc->name())+"\""; + sql=QString("select `STATION_NAME` from `SERVICE_PERMS` where ")+ + "`SERVICE_NAME`='"+RDEscapeString(svc_svc->name())+"'"; q=new RDSqlQuery(sql); while(q->next()) { svc_host_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql); while(q->next()) { if(svc_host_sel->destFindItem(q->value(0).toString())==0) { @@ -118,15 +116,15 @@ void EditSvcPerms::okData() // Add New Hosts // for(unsigned i=0;idestCount();i++) { - sql=QString("select STATION_NAME from SERVICE_PERMS where ")+ - "SERVICE_NAME=\""+RDEscapeString(svc_svc->name())+"\" && "+ - "STATION_NAME=\""+RDEscapeString(svc_host_sel->destText(i))+"\""; + sql=QString("select `STATION_NAME` from `SERVICE_PERMS` where ")+ + "`SERVICE_NAME`='"+RDEscapeString(svc_svc->name())+"' && "+ + "`STATION_NAME`='"+RDEscapeString(svc_host_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into SERVICE_PERMS (SERVICE_NAME,STATION_NAME) ")+ - "values (\""+RDEscapeString(svc_svc->name())+"\","+ - "\""+RDEscapeString(svc_host_sel->destText(i))+"\")"; + sql=QString("insert into `SERVICE_PERMS` (`SERVICE_NAME`,`STATION_NAME`) ")+ + "values ('"+RDEscapeString(svc_svc->name())+"',"+ + "'"+RDEscapeString(svc_host_sel->destText(i))+"')"; q=new RDSqlQuery(sql); } delete q; @@ -135,11 +133,11 @@ void EditSvcPerms::okData() // // Delete Old Hosts // - sql=QString("delete from SERVICE_PERMS where ")+ - "SERVICE_NAME=\""+RDEscapeString(svc_svc->name())+"\""; + sql=QString("delete from `SERVICE_PERMS` where ")+ + "`SERVICE_NAME`='"+RDEscapeString(svc_svc->name())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && STATION_NAME<>\"")+ - RDEscapeString(svc_host_sel->destText(i))+"\""; + sql+=QString(" && `STATION_NAME`<>'")+ + RDEscapeString(svc_host_sel->destText(i))+"'"; } q=new RDSqlQuery(sql); delete q; diff --git a/rdadmin/edit_system.cpp b/rdadmin/edit_system.cpp index c7386889..8a975074 100644 --- a/rdadmin/edit_system.cpp +++ b/rdadmin/edit_system.cpp @@ -357,9 +357,9 @@ void EditSystem::okData() pd->setMaximum(10); pd->setValue(0); while(q->next()) { - sql=QString("select NUMBER from CART where ")+ - "(TITLE=\""+RDEscapeString(q->value(1).toString())+"\")&&"+ - QString().sprintf("(NUMBER!=%u)",q->value(0).toUInt()); + sql=QString("select `NUMBER` from `CART` where ")+ + "(`TITLE`='"+RDEscapeString(q->value(1).toString())+"')&&"+ + QString().sprintf("(`NUMBER`!=%u)",q->value(0).toUInt()); q1=new RDSqlQuery(sql); while(q1->next()) { dups.insert(q1->value(0).toUInt(),q->value(1).toString()); @@ -390,10 +390,10 @@ void EditSystem::okData() QString filter_sql="where ("; for(QMultiMap::const_iterator ci=dups.begin(); ci!=dups.end();ci++) { - filter_sql+=QString().sprintf("CART.NUMBER=%u||",ci.key()); + filter_sql+=QString().sprintf("`CART`.`NUMBER`=%u||",ci.key()); } filter_sql=filter_sql.left(filter_sql.length()-2)+ - ") order by CART.TITLE "; + ") order by `CART`.`TITLE` "; edit_duplicate_model->setFilterSql(filter_sql); return; } @@ -401,24 +401,24 @@ void EditSystem::okData() // // All ok -- make the change // - sql="alter table CART drop index TITLE_IDX"; - q=new RDSqlQuery(sql); - delete q; - sql="alter table CART modify column TITLE varchar(191) unique"; - q=new RDSqlQuery(sql); - delete q; + sql="alter table `CART` drop index `TITLE_IDX`"; + RDSqlQuery::apply(sql); + + sql="alter table `CART` modify column `TITLE` varchar(191) unique"; + RDSqlQuery::apply(sql); + edit_system->setAllowDuplicateCartTitles(false); } else { - sql="alter table CART drop index TITLE"; - q=new RDSqlQuery(sql); - delete q; - sql="alter table CART modify column TITLE varchar(191)"; - q=new RDSqlQuery(sql); - delete q; - sql="alter table CART add index TITLE_IDX(TITLE)"; - q=new RDSqlQuery(sql); - delete q; + sql="alter table `CART` drop index `TITLE`"; + RDSqlQuery::apply(sql); + + sql="alter table `CART` modify column `TITLE` varchar(191)"; + RDSqlQuery::apply(sql); + + sql="alter table `CART` add index `TITLE_IDX`(`TITLE`)"; + RDSqlQuery::apply(sql); + edit_system->setAllowDuplicateCartTitles(true); } delete pd; @@ -456,12 +456,12 @@ void EditSystem::BuildDuplicatesList(std::map *dups) RDSqlQuery *q; RDSqlQuery *q1; - sql="select NUMBER,TITLE from CART order by NUMBER"; + sql="select `NUMBER`,`TITLE` from `CART` order by `NUMBER`"; q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("select NUMBER from CART where ")+ - "(TITLE=\""+RDEscapeString(q->value(1).toString())+"\")&&"+ - QString().sprintf("(NUMBER!=%u)",q->value(0).toUInt()); + sql=QString("select `NUMBER` from `CART` where ")+ + "(`TITLE`='"+RDEscapeString(q->value(1).toString())+"')&&"+ + QString().sprintf("(`NUMBER`!=%u)",q->value(0).toUInt()); q1=new RDSqlQuery(sql); while(q1->next()) { (*dups)[q1->value(0).toUInt()]=q->value(1).toString(); diff --git a/rdadmin/edit_ttys.cpp b/rdadmin/edit_ttys.cpp index 4616f460..4c2db2a6 100644 --- a/rdadmin/edit_ttys.cpp +++ b/rdadmin/edit_ttys.cpp @@ -33,8 +33,6 @@ EditTtys::EditTtys(QString station,QWidget *parent) : RDDialog(parent) { - setModal(true); - // // Fix the Window Size // @@ -241,14 +239,14 @@ void EditTtys::enableButtonData(int state) if(!state) { sql=QString("select ")+ - "NAME,"+ // 00 - "MATRIX,"+ // 01 - "TYPE "+ // 02 - "from MATRICES where "+ - "STATION_NAME=\""+RDEscapeString(edit_station)+"\" && "+ - QString().sprintf("(PORT_TYPE=%d && PORT=%d) || ", + "`NAME`,"+ // 00 + "`MATRIX`,"+ // 01 + "`TYPE` "+ // 02 + "from `MATRICES` where "+ + "`STATION_NAME`='"+RDEscapeString(edit_station)+"' && "+ + QString().sprintf("(`PORT_TYPE`=%d && `PORT`=%d) || ", RDMatrix::TtyPort,edit_port_box->currentIndex())+ - QString().sprintf("(PORT_TYPE_2=%d && PORT_2=%d)", + QString().sprintf("(`PORT_TYPE_2`=%d && `PORT_2`=%d)", RDMatrix::TtyPort,edit_port_box->currentIndex()); q=new RDSqlQuery(sql); if(q->first()) { @@ -290,7 +288,7 @@ void EditTtys::closeData() macro.setEchoRequested(false); for(int i=0;ifirst()) { macro.setCommand(RDMacro::SZ); diff --git a/rdadmin/edit_user_perms.cpp b/rdadmin/edit_user_perms.cpp index 026b203f..9233c763 100644 --- a/rdadmin/edit_user_perms.cpp +++ b/rdadmin/edit_user_perms.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell User/Group Permissions // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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 - #include #include @@ -28,8 +26,6 @@ EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent) : RDDialog(parent) { - setModal(true); - QString sql; RDSqlQuery *q; @@ -74,15 +70,15 @@ EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent) // // Populate Fields // - sql=QString("select GROUP_NAME from USER_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(user_user->name())+"\""; + sql=QString("select `GROUP_NAME` from `USER_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(user_user->name())+"'"; q=new RDSqlQuery(sql); while(q->next()) { user_host_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString("select NAME from GROUPS"); + sql=QString("select `NAME` from `GROUPS`"); q=new RDSqlQuery(sql); while(q->next()) { if(user_host_sel->destFindItem(q->value(0).toString())==0) { @@ -119,15 +115,15 @@ void EditUserPerms::okData() // Add New Groups // for(unsigned i=0;idestCount();i++) { - sql=QString("select GROUP_NAME from USER_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(user_user->name())+"\" && " - "GROUP_NAME=\""+RDEscapeString(user_host_sel->destText(i))+"\""; + sql=QString("select `GROUP_NAME` from `USER_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(user_user->name())+"' && " + "`GROUP_NAME`='"+RDEscapeString(user_host_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into USER_PERMS (USER_NAME,GROUP_NAME) ")+ - "values (\""+RDEscapeString(user_user->name())+ - "\",\""+RDEscapeString(user_host_sel->destText(i))+"\")"; + sql=QString("insert into `USER_PERMS` (`USER_NAME`,`GROUP_NAME`) ")+ + "values ('"+RDEscapeString(user_user->name())+ + "','"+RDEscapeString(user_host_sel->destText(i))+"')"; q=new RDSqlQuery(sql); } delete q; @@ -136,14 +132,13 @@ void EditUserPerms::okData() // // Delete Old Groups // - sql=QString("delete from USER_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(user_user->name())+"\""; + sql=QString("delete from `USER_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(user_user->name())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && GROUP_NAME<>\"")+ - RDEscapeString(user_host_sel->destText(i))+"\""; + sql+=QString(" && `GROUP_NAME`<>'")+ + RDEscapeString(user_host_sel->destText(i))+"'"; } - q=new RDSqlQuery(sql); - delete q; + RDSqlQuery::apply(sql); done(0); } diff --git a/rdadmin/edit_user_service_perms.cpp b/rdadmin/edit_user_service_perms.cpp index 0b208b52..4a8efeda 100644 --- a/rdadmin/edit_user_service_perms.cpp +++ b/rdadmin/edit_user_service_perms.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell User/Group Permissions // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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 - #include #include @@ -28,8 +26,6 @@ EditUserServicePerms::EditUserServicePerms(RDUser *user,QWidget *parent) : RDDialog(parent) { - setModal(true); - QString sql; RDSqlQuery *q; @@ -74,15 +70,15 @@ EditUserServicePerms::EditUserServicePerms(RDUser *user,QWidget *parent) // // Populate Fields // - sql=QString("select SERVICE_NAME from USER_SERVICE_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(user_user->name())+"\""; + sql=QString("select `SERVICE_NAME` from `USER_SERVICE_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(user_user->name())+"'"; q=new RDSqlQuery(sql); while(q->next()) { user_host_sel->destInsertItem(q->value(0).toString()); } delete q; - sql=QString().sprintf("select NAME from SERVICES"); + sql=QString().sprintf("select `NAME` from `SERVICES`"); q=new RDSqlQuery(sql); while(q->next()) { if(user_host_sel->destFindItem(q->value(0).toString())==0) { @@ -119,15 +115,15 @@ void EditUserServicePerms::okData() // Add New Groups // for(unsigned i=0;idestCount();i++) { - sql=QString("select SERVICE_NAME from USER_SERVICE_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(user_user->name())+"\" && "+ - "SERVICE_NAME=\""+RDEscapeString(user_host_sel->destText(i))+"\""; + sql=QString("select `SERVICE_NAME` from `USER_SERVICE_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(user_user->name())+"' && "+ + "`SERVICE_NAME`='"+RDEscapeString(user_host_sel->destText(i))+"'"; q=new RDSqlQuery(sql); if(q->size()==0) { delete q; - sql=QString("insert into USER_SERVICE_PERMS (USER_NAME,SERVICE_NAME) ")+ - "values (\""+RDEscapeString(user_user->name())+"\","+ - "\""+RDEscapeString(user_host_sel->destText(i))+"\")"; + sql=QString("insert into `USER_SERVICE_PERMS` (`USER_NAME`,`SERVICE_NAME`) ")+ + "values ('"+RDEscapeString(user_user->name())+"',"+ + "'"+RDEscapeString(user_host_sel->destText(i))+"')"; q=new RDSqlQuery(sql); } delete q; @@ -136,14 +132,14 @@ void EditUserServicePerms::okData() // // Delete Old Groups // - sql=QString("delete from USER_SERVICE_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(user_user->name())+"\""; + sql=QString("delete from `USER_SERVICE_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(user_user->name())+"'"; for(unsigned i=0;idestCount();i++) { - sql+=QString(" && SERVICE_NAME<>\"")+ - RDEscapeString(user_host_sel->destText(i))+"\""; + sql+=QString(" && `SERVICE_NAME`<>'")+ + RDEscapeString(user_host_sel->destText(i))+"'"; } - q=new RDSqlQuery(sql); - delete q; + RDSqlQuery::apply(sql); + done(0); } diff --git a/rdadmin/edit_vguest_resource.cpp b/rdadmin/edit_vguest_resource.cpp index ad620e6f..349c35f3 100644 --- a/rdadmin/edit_vguest_resource.cpp +++ b/rdadmin/edit_vguest_resource.cpp @@ -113,13 +113,13 @@ int EditVguestResource::exec(RDMatrix::VguestType type,unsigned id) edit_id=id; QString sql=QString("select ")+ - "ENGINE_NUM,"+ // 00 - "DEVICE_NUM,"+ // 01 - "SURFACE_NUM,"+ // 02 - "RELAY_NUM,"+ // 03 - "BUSS_NUM "+ // 04 - "from VGUEST_RESOURCES where "+ - QString().sprintf("ID=%u",id); + "`ENGINE_NUM`,"+ // 00 + "`DEVICE_NUM`,"+ // 01 + "`SURFACE_NUM`,"+ // 02 + "`RELAY_NUM`,"+ // 03 + "`BUSS_NUM` "+ // 04 + "from `VGUEST_RESOURCES` where "+ + QString().sprintf("`ID`=%u",id); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { if(q->value(0).toInt()>=0) { @@ -205,12 +205,12 @@ void EditVguestResource::okData() return; } } - QString sql=QString("update VGUEST_RESOURCES set ")+ - QString().sprintf("ENGINE_NUM=%d,",enginenum)+ - QString().sprintf("DEVICE_NUM=%d,",devicenum)+ - QString().sprintf("SURFACE_NUM=%d,",surfacenum)+ - QString().sprintf("RELAY_NUM=%d ",relaynum)+ - QString().sprintf("where ID=%u",edit_id); + QString sql=QString("update `VGUEST_RESOURCES` set ")+ + QString().sprintf("`ENGINE_NUM`=%d,",enginenum)+ + QString().sprintf("`DEVICE_NUM`=%d,",devicenum)+ + QString().sprintf("`SURFACE_NUM`=%d,",surfacenum)+ + QString().sprintf("`RELAY_NUM`=%d ",relaynum)+ + QString().sprintf("where `ID`=%u",edit_id); RDSqlQuery::apply(sql); done(true); diff --git a/rdadmin/list_dropboxes.cpp b/rdadmin/list_dropboxes.cpp index d3e461ea..360cf2c3 100644 --- a/rdadmin/list_dropboxes.cpp +++ b/rdadmin/list_dropboxes.cpp @@ -131,7 +131,7 @@ void ListDropboxes::addData() delete notify; } else { - QString sql=QString().sprintf("delete from DROPBOXES where ID=%d",id); + QString sql=QString().sprintf("delete from `DROPBOXES` where `ID`=%d",id); RDSqlQuery *q=new RDSqlQuery(sql); delete q; delete edit_dropbox; @@ -186,7 +186,7 @@ void ListDropboxes::duplicateData() delete notify; } else { - QString sql=QString().sprintf("delete from DROPBOXES where ID=%d", + QString sql=QString().sprintf("delete from `DROPBOXES` where `ID`=%d", new_box_id); RDSqlQuery::apply(sql); } @@ -203,11 +203,11 @@ void ListDropboxes::deleteData() return; } int box_id=list_dropboxes_model->dropboxId(rows.first()); - sql=QString().sprintf("delete from DROPBOX_PATHS where DROPBOX_ID=%d", + sql=QString().sprintf("delete from `DROPBOX_PATHS` where `DROPBOX_ID`=%d", box_id); RDSqlQuery::apply(sql); - sql=QString().sprintf("delete from DROPBOXES where ID=%d",box_id); + sql=QString().sprintf("delete from `DROPBOXES` where `ID`=%d",box_id); RDSqlQuery::apply(sql); list_dropboxes_model->removeDropbox(box_id); diff --git a/rdadmin/list_encoders.cpp b/rdadmin/list_encoders.cpp index 5e9b5ec6..c1e55f0a 100644 --- a/rdadmin/list_encoders.cpp +++ b/rdadmin/list_encoders.cpp @@ -190,9 +190,9 @@ void ListEncoders::RefreshList() c_list->clear(); sql=QString("select ")+ - "ID,"+ // 00 - "NAME "+ // 01 - "from ENCODER_PRESETS order by NAME"; + "`ID`,"+ // 00 + "`NAME` "+ // 01 + "from `ENCODER_PRESETS` order by `NAME`"; q=new RDSqlQuery(sql); while(q->next()) { item=new QListWidgetItem(c_list); diff --git a/rdadmin/list_feeds.cpp b/rdadmin/list_feeds.cpp index c18bf07f..060c55eb 100644 --- a/rdadmin/list_feeds.cpp +++ b/rdadmin/list_feeds.cpp @@ -147,16 +147,16 @@ void ListFeeds::addData() } } else { - sql=QString("delete from FEED_PERMS where ")+ - "KEY_NAME=\""+RDEscapeString(feed)+"\""; + sql=QString("delete from `FEED_PERMS` where ")+ + "`KEY_NAME`='"+RDEscapeString(feed)+"'"; RDSqlQuery::apply(sql); - sql=QString("delete from FEED_IMAGES where ")+ - "FEED_KEY_NAME=\""+RDEscapeString(feed)+"\""; + sql=QString("delete from `FEED_IMAGES` where ")+ + "`FEED_KEY_NAME`='"+RDEscapeString(feed)+"'"; RDSqlQuery::apply(sql); - sql=QString("delete from FEEDS where ")+ - "KEY_NAME=\""+RDEscapeString(feed)+"\""; + sql=QString("delete from `FEEDS` where ")+ + "`KEY_NAME`='"+RDEscapeString(feed)+"'"; RDSqlQuery::apply(sql); return; @@ -211,9 +211,9 @@ void ListFeeds::deleteData() // RDPodcast *cast; sql=QString("select ")+ - "ID "+ // 00 - "from PODCASTS where "+ - QString().sprintf("FEED_ID=%u",list_feeds_model->feedId(rows.first())); + "`ID` "+ // 00 + "from `PODCASTS` where "+ + QString().sprintf("`FEED_ID`=%u",list_feeds_model->feedId(rows.first())); q=new RDSqlQuery(sql); QProgressDialog *pd= new QProgressDialog(tr("Deleting remote audio..."),"",0,q->size()+1,this); @@ -241,30 +241,30 @@ void ListFeeds::deleteData() // // Delete Cast Entries // - sql=QString("delete from PODCASTS where ")+ - QString().sprintf("FEED_ID=%u",list_feeds_model->feedId(rows.first())); + sql=QString("delete from `PODCASTS` where ")+ + QString().sprintf("`FEED_ID`=%u",list_feeds_model->feedId(rows.first())); RDSqlQuery::apply(sql); // // Delete Images // feed->removeAllImages(); - sql=QString("delete from FEED_IMAGES where ")+ - QString().sprintf("FEED_ID=%d",feed->id()); + sql=QString("delete from `FEED_IMAGES` where ")+ + QString().sprintf("`FEED_ID`=%d",feed->id()); RDSqlQuery::apply(sql); // // Delete Feed // - sql=QString("delete from FEED_PERMS where ")+ - "KEY_NAME=\""+RDEscapeString(feedname)+"\""; + sql=QString("delete from `FEED_PERMS` where ")+ + "`KEY_NAME`='"+RDEscapeString(feedname)+"'"; RDSqlQuery::apply(sql); - sql=QString("delete from SUPERFEED_MAPS where ")+ - "KEY_NAME=\""+RDEscapeString(feedname)+"\" || "+ - "MEMBER_KEY_NAME=\""+RDEscapeString(feedname)+"\""; + sql=QString("delete from `SUPERFEED_MAPS` where ")+ + "`KEY_NAME`='"+RDEscapeString(feedname)+"' || "+ + "`MEMBER_KEY_NAME`='"+RDEscapeString(feedname)+"'"; RDSqlQuery::apply(sql); - sql=QString("delete from FEEDS where ")+ - "KEY_NAME=\""+RDEscapeString(feedname)+"\""; + sql=QString("delete from `FEEDS` where ")+ + "`KEY_NAME`='"+RDEscapeString(feedname)+"'"; RDSqlQuery::apply(sql); list_feeds_model->removeFeed(feedname); @@ -312,9 +312,9 @@ void ListFeeds::repostData() // Post Images // sql=QString("select ")+ - "ID "+ // 00 - "from FEED_IMAGES where "+ - QString().sprintf("FEED_ID=%u",feed->id()); + "`ID` "+ // 00 + "from `FEED_IMAGES` where "+ + QString().sprintf("`FEED_ID`=%u",feed->id()); q=new RDSqlQuery(sql); pd->setLabelText(tr("Posting images...")); pd->setRange(0,q->size()); @@ -330,9 +330,9 @@ void ListFeeds::repostData() // Post Item Data // sql=QString("select ")+ - "ID "+ // 00 - "from PODCASTS where "+ - QString().sprintf("FEED_ID=%u",feed->id()); + "`ID` "+ // 00 + "from `PODCASTS` where "+ + QString().sprintf("`FEED_ID`=%u",feed->id()); q=new RDSqlQuery(sql); pd->setLabelText(tr("Posting item data...")); pd->setRange(0,q->size()); @@ -397,9 +397,9 @@ void ListFeeds::unpostData() // Remove Item Data // sql=QString("select ")+ - "ID "+ // 00 - "from PODCASTS where "+ - QString().sprintf("FEED_ID=%u",feed->id()); + "`ID` "+ // 00 + "from `PODCASTS` where "+ + QString().sprintf("`FEED_ID`=%u",feed->id()); q=new RDSqlQuery(sql); pd->setLabelText(tr("Unposting item data...")); pd->setRange(0,q->size()); @@ -418,9 +418,9 @@ void ListFeeds::unpostData() // Remove Images // sql=QString("select ")+ - "ID "+ // 00 - "from FEED_IMAGES where "+ - QString().sprintf("FEED_ID=%u",feed->id()); + "`ID` "+ // 00 + "from `FEED_IMAGES` where "+ + QString().sprintf("`FEED_ID`=%u",feed->id()); q=new RDSqlQuery(sql); pd->setLabelText(tr("Unposting images...")); pd->setRange(0,q->size()); diff --git a/rdadmin/list_groups.cpp b/rdadmin/list_groups.cpp index 8c194b83..100350f9 100644 --- a/rdadmin/list_groups.cpp +++ b/rdadmin/list_groups.cpp @@ -199,9 +199,9 @@ void ListGroups::deleteData() return; } sql=QString("select ")+ - "NUMBER "+ // 00 - "from CART where "+ - "GROUP_NAME=\""+RDEscapeString(grpname)+"\""; + "`NUMBER` "+ // 00 + "from `CART` where "+ + "`GROUP_NAME`='"+RDEscapeString(grpname)+"'"; q=new RDSqlQuery(sql); if((carts=q->size())>0) { warning=QString().sprintf("%d ",carts)+tr("member carts will be deleted along with group")+" \""+grpname+"\"!\n"; @@ -232,29 +232,29 @@ void ListGroups::deleteData() // // Delete Member Audio Perms // - sql=QString("delete from AUDIO_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(grpname)+"\""; + sql=QString("delete from `AUDIO_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(grpname)+"'"; RDSqlQuery::apply(sql); // // Delete Member User Perms // - sql=QString("delete from USER_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(grpname)+"\""; + sql=QString("delete from `USER_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(grpname)+"'"; RDSqlQuery::apply(sql); // // Delete Replicator Map Records // - sql=QString("delete from REPLICATOR_MAP where ")+ - "GROUP_NAME=\""+RDEscapeString(grpname)+"\""; + sql=QString("delete from `REPLICATOR_MAP` where ")+ + "`GROUP_NAME`='"+RDEscapeString(grpname)+"'"; RDSqlQuery::apply(sql); // // Delete from Group List // - sql=QString("delete from GROUPS where ")+ - "NAME=\""+RDEscapeString(grpname)+"\""; + sql=QString("delete from `GROUPS` where ")+ + "`NAME`='"+RDEscapeString(grpname)+"'"; RDSqlQuery::apply(sql); list_groups_model->removeGroup(grpname); } @@ -279,16 +279,16 @@ void ListGroups::reportData() // Generate Body // sql=QString("select ")+ - "NAME,"+ // 00 - "DESCRIPTION,"+ // 01 - "DEFAULT_LOW_CART,"+ // 02 - "DEFAULT_HIGH_CART,"+ // 03 - "ENFORCE_CART_RANGE,"+ // 04 - "DEFAULT_CART_TYPE,"+ // 05 - "REPORT_MUS,"+ // 06 - "REPORT_TFC,"+ // 07 - "ENABLE_NOW_NEXT "+ // 08 - "from GROUPS order by NAME"; + "`NAME`,"+ // 00 + "`DESCRIPTION`,"+ // 01 + "`DEFAULT_LOW_CART`,"+ // 02 + "`DEFAULT_HIGH_CART`,"+ // 03 + "`ENFORCE_CART_RANGE`,"+ // 04 + "`DEFAULT_CART_TYPE`,"+ // 05 + "`REPORT_MUS`,"+ // 06 + "`REPORT_TFC`,"+ // 07 + "`ENABLE_NOW_NEXT` "+ // 08 + "from `GROUPS` order by `NAME`"; q=new RDSqlQuery(sql); while(q->next()) { // diff --git a/rdadmin/list_hostvars.cpp b/rdadmin/list_hostvars.cpp index c8f0a30a..593dc3dd 100644 --- a/rdadmin/list_hostvars.cpp +++ b/rdadmin/list_hostvars.cpp @@ -118,9 +118,9 @@ QSizePolicy ListHostvars::sizePolicy() const void ListHostvars::addData() { - QString sql=QString("insert into HOSTVARS set ")+ - "STATION_NAME=\""+RDEscapeString(list_station)+"\","+ - "NAME=\""+RDEscapeString("%NEW_VAR%")+"\""; + QString sql=QString("insert into `HOSTVARS` set ")+ + "`STATION_NAME`='"+RDEscapeString(list_station)+"',"+ + "`NAME`='"+RDEscapeString("%NEW_VAR%")+"'"; int id=RDSqlQuery::run(sql).toInt(); if(list_edit_hostvar_dialog->exec(id)) { QModelIndex row=list_model->addVar(id); @@ -128,8 +128,8 @@ void ListHostvars::addData() list_view->selectRow(row.row()); } else { - sql=QString("delete from HOSTVARS ")+ - QString().sprintf("where ID=%d",id); + sql=QString("delete from `HOSTVARS` ")+ + QString().sprintf("where `ID`=%d",id); RDSqlQuery::apply(sql); } } @@ -164,8 +164,8 @@ void ListHostvars::deleteData() QMessageBox::Yes,QMessageBox::No)!=QMessageBox::Yes) { return; } - QString sql=QString("delete from HOSTVARS ")+ - QString().sprintf("where ID=%d",list_model->varId(rows.first())); + QString sql=QString("delete from `HOSTVARS` ")+ + QString().sprintf("where `ID`=%d",list_model->varId(rows.first())); RDSqlQuery::apply(sql); list_model->removeVar(rows.first()); } diff --git a/rdadmin/list_images.cpp b/rdadmin/list_images.cpp index e86416f6..fb82c249 100644 --- a/rdadmin/list_images.cpp +++ b/rdadmin/list_images.cpp @@ -173,25 +173,25 @@ void ListImages::deleteData() if((row=SelectedRow())>=0) { sql=QString("select ")+ - "ID "+ - "from FEEDS where "+ - QString().sprintf("CHANNEL_IMAGE_ID=%d",list_model->imageId(row)); + "`ID` "+ + "from `FEEDS` where "+ + QString().sprintf("`CHANNEL_IMAGE_ID`=%d",list_model->imageId(row)); q=new RDSqlQuery(sql); channel_ids=q->size(); delete q; sql=QString("select ")+ - "ID "+ - "from FEEDS where "+ - QString().sprintf("DEFAULT_ITEM_IMAGE_ID=%d",list_model->imageId(row)); + "`ID` "+ + "from `FEEDS` where "+ + QString().sprintf("`DEFAULT_ITEM_IMAGE_ID`=%d",list_model->imageId(row)); q=new RDSqlQuery(sql); channel_default_ids=q->size(); delete q; sql=QString("select ")+ - "ID "+ - "from PODCASTS where "+ - QString().sprintf("ITEM_IMAGE_ID=%d",list_model->imageId(row)); + "`ID` "+ + "from `PODCASTS` where "+ + QString().sprintf("`ITEM_IMAGE_ID`=%d",list_model->imageId(row)); q=new RDSqlQuery(sql); item_ids=q->size(); delete q; @@ -212,8 +212,8 @@ void ListImages::deleteData() return; } - sql=QString("select ID from FEED_IMAGES where ")+ - QString().sprintf("ID=%d",list_model->imageId(row)); + sql=QString("select `ID` from `FEED_IMAGES` where ")+ + QString().sprintf("`ID`=%d",list_model->imageId(row)); q=new RDSqlQuery(sql); if(q->first()) { if((row=SelectedRow())>=0) { diff --git a/rdadmin/list_matrices.cpp b/rdadmin/list_matrices.cpp index d4a46760..fd978aa7 100644 --- a/rdadmin/list_matrices.cpp +++ b/rdadmin/list_matrices.cpp @@ -224,41 +224,40 @@ void ListMatrices::resizeEvent(QResizeEvent *e) void ListMatrices::DeleteMatrix(RDMatrix *mtx) { - QString sql=QString("delete from MATRICES where ")+ - "STATION_NAME=\""+RDEscapeString(list_station)+"\" && "+ - QString().sprintf("MATRIX=%d",mtx->matrix()); - RDSqlQuery *q=new RDSqlQuery(sql); - delete q; - sql=QString("delete from INPUTS where ")+ - "STATION_NAME=\""+RDEscapeString(list_station)+"\" && "+ - QString().sprintf("MATRIX=%d",mtx->matrix()); - q=new RDSqlQuery(sql); - delete q; - sql=QString("delete from OUTPUTS where ")+ - "STATION_NAME=\""+RDEscapeString(list_station)+"\" && "+ - QString().sprintf("MATRIX=%d",mtx->matrix()); - q=new RDSqlQuery(sql); - delete q; - sql=QString("delete from SWITCHER_NODES where ")+ - "STATION_NAME=\""+RDEscapeString(list_station)+"\" && "+ - QString().sprintf("MATRIX=%d",mtx->matrix()); - q=new RDSqlQuery(sql); - delete q; -sql=QString("delete from GPIS where ")+ - "STATION_NAME=\""+RDEscapeString(list_station)+"\" && "+ - QString().sprintf("MATRIX=%d",mtx->matrix()); - q=new RDSqlQuery(sql); - delete q; -sql=QString("delete from GPOS where ")+ - "STATION_NAME=\""+RDEscapeString(list_station)+"\" && "+ - QString().sprintf("MATRIX=%d",mtx->matrix()); - q=new RDSqlQuery(sql); - delete q; -sql=QString("delete from VGUEST_RESOURCES where ")+ - "STATION_NAME=\""+RDEscapeString(list_station)+"\" && "+ - QString().sprintf("MATRIX_NUM=%d",mtx->matrix()); - q=new RDSqlQuery(sql); - delete q; + QString sql=QString("delete from `MATRICES` where ")+ + "`STATION_NAME`='"+RDEscapeString(list_station)+"' && "+ + QString().sprintf("`MATRIX`=%d",mtx->matrix()); + RDSqlQuery::apply(sql); + + sql=QString("delete from `INPUTS` where ")+ + "`STATION_NAME`='"+RDEscapeString(list_station)+"' && "+ + QString().sprintf("`MATRIX`=%d",mtx->matrix()); + RDSqlQuery::apply(sql); + + sql=QString("delete from `OUTPUTS` where ")+ + "`STATION_NAME`='"+RDEscapeString(list_station)+"' && "+ + QString().sprintf("`MATRIX`=%d",mtx->matrix()); + RDSqlQuery::apply(sql); + + sql=QString("delete from `SWITCHER_NODES` where ")+ + "`STATION_NAME`='"+RDEscapeString(list_station)+"' && "+ + QString().sprintf("`MATRIX`=%d",mtx->matrix()); + RDSqlQuery::apply(sql); + + sql=QString("delete from `GPIS` where ")+ + "`STATION_NAME`='"+RDEscapeString(list_station)+"' && "+ + QString().sprintf("`MATRIX`=%d",mtx->matrix()); + RDSqlQuery::apply(sql); + + sql=QString("delete from `GPOS` where ")+ + "`STATION_NAME`='"+RDEscapeString(list_station)+"' && "+ + QString().sprintf("`MATRIX`=%d",mtx->matrix()); + RDSqlQuery::apply(sql); + + sql=QString("delete from `VGUEST_RESOURCES` where ")+ + "`STATION_NAME`='"+RDEscapeString(list_station)+"' && "+ + QString().sprintf("`MATRIX_NUM`=%d",mtx->matrix()); + RDSqlQuery::apply(sql); list_model->removeMatrix(mtx->id()); } diff --git a/rdadmin/list_pypads.cpp b/rdadmin/list_pypads.cpp index 5be68054..1e13e8be 100644 --- a/rdadmin/list_pypads.cpp +++ b/rdadmin/list_pypads.cpp @@ -140,12 +140,12 @@ void ListPypads::addData() } delete file; - QString sql=QString("insert into PYPAD_INSTANCES set ")+ - "STATION_NAME=\""+RDEscapeString(list_station->name())+"\","+ - "SCRIPT_PATH=\""+RDEscapeString(script)+"\","+ - "DESCRIPTION=\""+ - RDEscapeString("new "+script.split("/").last()+" instance")+"\","+ - "CONFIG=\""+RDEscapeString(exemplar)+"\""; + QString sql=QString("insert into `PYPAD_INSTANCES` set ")+ + "`STATION_NAME`='"+RDEscapeString(list_station->name())+"',"+ + "`SCRIPT_PATH`='"+RDEscapeString(script)+"',"+ + "`DESCRIPTION`='"+ + RDEscapeString("new "+script.split("/").last()+" instance")+"',"+ + "`CONFIG`='"+RDEscapeString(exemplar)+"'"; int id=RDSqlQuery::run(sql).toInt(); EditPypad *d=new EditPypad(id,this); if(d->exec()) { @@ -158,8 +158,8 @@ void ListPypads::addData() rda->ripc()->sendNotification(notify); } else { - sql=QString("delete from PYPAD_INSTANCES where ")+ - QString().sprintf("ID=%u",id); + sql=QString("delete from `PYPAD_INSTANCES` where ")+ + QString().sprintf("`ID`=%u",id); RDSqlQuery::apply(sql); } delete d; @@ -200,8 +200,8 @@ void ListPypads::deleteData() QMessageBox::No) { return; } - sql=QString("delete from PYPAD_INSTANCES where ")+ - QString().sprintf("ID=%d",id); + sql=QString("delete from `PYPAD_INSTANCES` where ")+ + QString().sprintf("`ID`=%d",id); RDSqlQuery::apply(sql); list_list_model->removeInstance(id); RDNotification notify= diff --git a/rdadmin/list_replicator_carts.cpp b/rdadmin/list_replicator_carts.cpp index 8fa21039..079422fc 100644 --- a/rdadmin/list_replicator_carts.cpp +++ b/rdadmin/list_replicator_carts.cpp @@ -108,10 +108,10 @@ void ListReplicatorCarts::repostData() if(rows.size()==0) { return; } - QString sql=QString("update REPL_CART_STATE set ")+ - "REPOST=\"Y\" where "; + QString sql=QString("update `REPL_CART_STATE` set ")+ + "`REPOST`='Y' where "; for(int i=0;icartId(rows.at(i))); + sql+=QString().sprintf("(`ID`=%u)||",list_model->cartId(rows.at(i))); } sql=sql.left(sql.length()-2); RDSqlQuery::apply(sql); @@ -120,9 +120,9 @@ void ListReplicatorCarts::repostData() void ListReplicatorCarts::repostAllData() { - QString sql=QString("update REPL_CART_STATE set ")+ - "REPOST=\"Y\" where "+ - "REPLICATOR_NAME=\""+RDEscapeString(list_model->replicatorName())+"\""; + QString sql=QString("update `REPL_CART_STATE` set ")+ + "`REPOST`='Y' where "+ + "`REPLICATOR_NAME`='"+RDEscapeString(list_model->replicatorName())+"'"; RDSqlQuery::apply(sql); } diff --git a/rdadmin/list_replicators.cpp b/rdadmin/list_replicators.cpp index f2756726..c566d492 100644 --- a/rdadmin/list_replicators.cpp +++ b/rdadmin/list_replicators.cpp @@ -171,25 +171,25 @@ void ListReplicators::deleteData() // // Delete Group Assignments // - sql=QString("delete from REPLICATOR_MAP where ")+ - "REPLICATOR_NAME=\""+RDEscapeString(name)+"\""; + sql=QString("delete from `REPLICATOR_MAP` where ")+ + "`REPLICATOR_NAME`='"+RDEscapeString(name)+"'"; RDSqlQuery::apply(sql); // // Delete State Records // - sql=QString("delete from REPL_CART_STATE where ")+ - "REPLICATOR_NAME=\""+RDEscapeString(name)+"\""; + sql=QString("delete from `REPL_CART_STATE` where ")+ + "`REPLICATOR_NAME`='"+RDEscapeString(name)+"'"; RDSqlQuery::apply(sql); - sql=QString("delete from REPL_CUT_STATE where ")+ - "REPLICATOR_NAME=\""+RDEscapeString(name)+"\""; + sql=QString("delete from `REPL_CUT_STATE` where ")+ + "`REPLICATOR_NAME`='"+RDEscapeString(name)+"'"; RDSqlQuery::apply(sql); // // Delete from Replicator List // - sql=QString("delete from REPLICATORS where ")+ - "NAME=\""+RDEscapeString(name)+"\""; + sql=QString("delete from `REPLICATORS` where ")+ + "`NAME`='"+RDEscapeString(name)+"'"; RDSqlQuery::apply(sql); list_replicators_model->removeReplicator(name); diff --git a/rdadmin/list_reports.cpp b/rdadmin/list_reports.cpp index 95c67845..b5bee793 100644 --- a/rdadmin/list_reports.cpp +++ b/rdadmin/list_reports.cpp @@ -183,16 +183,16 @@ void ListReports::DeleteReport(QString rptname) QString sql; RDSqlQuery *q; - sql=QString("delete from REPORTS where ")+ - "NAME=\""+RDEscapeString(rptname)+"\""; + sql=QString("delete from `REPORTS` where ")+ + "`NAME`='"+RDEscapeString(rptname)+"'"; q=new RDSqlQuery(sql); delete q; - sql=QString("delete from REPORT_SERVICES where ")+ - "REPORT_NAME=\""+RDEscapeString(rptname)+"\""; + sql=QString("delete from `REPORT_SERVICES` where ")+ + "`REPORT_NAME`='"+RDEscapeString(rptname)+"'"; q=new RDSqlQuery(sql); delete q; - sql=QString("delete from REPORT_STATIONS where ")+ - "REPORT_NAME=\""+RDEscapeString(rptname)+"\""; + sql=QString("delete from `REPORT_STATIONS` where ")+ + "`REPORT_NAME`='"+RDEscapeString(rptname)+"'"; q=new RDSqlQuery(sql); delete q; } @@ -205,7 +205,7 @@ void ListReports::RefreshList(QString rptname) int count=0; list_box->clear(); - q=new RDSqlQuery("select NAME from REPORTS"); + q=new RDSqlQuery("select `NAME` from `REPORTS`"); while (q->next()) { list_box->insertItem(list_box->count(),q->value(0).toString()); if(rptname==q->value(0).toString()) { diff --git a/rdadmin/list_schedcodes.cpp b/rdadmin/list_schedcodes.cpp index 7001b78c..cb10179d 100644 --- a/rdadmin/list_schedcodes.cpp +++ b/rdadmin/list_schedcodes.cpp @@ -129,11 +129,11 @@ void ListSchedCodes::addData() } } else { - QString sql=QString("delete from SCHED_CODES where ")+ - "CODE=\""+RDEscapeString(scode)+"\""; + QString sql=QString("delete from `SCHED_CODES` where ")+ + "`CODE`='"+RDEscapeString(scode)+"'"; RDSqlQuery::apply(sql); - sql=QString("delete from RULE_LINES where ")+ - "CODE=\""+RDEscapeString(scode)+"\""; + sql=QString("delete from `RULE_LINES` where ")+ + "`CODE`='"+RDEscapeString(scode)+"'"; RDSqlQuery::apply(sql); } } @@ -175,16 +175,16 @@ void ListSchedCodes::deleteData() return; } - sql=QString("delete from DROPBOX_SCHED_CODES where ")+ - "SCHED_CODE=\""+RDEscapeString(codename)+"\""; + sql=QString("delete from `DROPBOX_SCHED_CODES` where ")+ + "`SCHED_CODE`='"+RDEscapeString(codename)+"'"; RDSqlQuery::apply(sql); - sql=QString("delete from RULE_LINES where ")+ - "CODE=\""+RDEscapeString(codename)+"\""; + sql=QString("delete from `RULE_LINES` where ")+ + "`CODE`='"+RDEscapeString(codename)+"'"; RDSqlQuery::apply(sql); - sql=QString("delete from SCHED_CODES where ")+ - "CODE=\""+RDEscapeString(codename)+"\""; + sql=QString("delete from `SCHED_CODES` where ")+ + "`CODE`='"+RDEscapeString(codename)+"'"; RDSqlQuery::apply(sql); list_schedcodes_model->removeSchedCode(rows.first()); } diff --git a/rdadmin/list_svcs.cpp b/rdadmin/list_svcs.cpp index caf97a64..a51fbf9d 100644 --- a/rdadmin/list_svcs.cpp +++ b/rdadmin/list_svcs.cpp @@ -156,8 +156,8 @@ void ListSvcs::deleteData() return; } - sql=QString("select NAME from LOGS where ")+ - "SERVICE=\""+RDEscapeString(svcname)+"\""; + sql=QString("select `NAME` from `LOGS` where ")+ + "`SERVICE`='"+RDEscapeString(svcname)+"'"; q=new RDSqlQuery(sql); if(q->first()) { if(QMessageBox::warning(this,"RDAdmin - "+tr("Logs Exist"), diff --git a/rdadmin/list_users.cpp b/rdadmin/list_users.cpp index f0d4e1f1..c3e2c826 100644 --- a/rdadmin/list_users.cpp +++ b/rdadmin/list_users.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include @@ -168,9 +168,9 @@ void ListUsers::deleteData() // Check for default user assignments // sql=QString("select ")+ - "NAME "+ // 00 - "from STATIONS where "+ - "DEFAULT_NAME=\""+RDEscapeString(username)+"\""; + "`NAME` "+ // 00 + "from `STATIONS` where "+ + "`DEFAULT_NAME`='"+RDEscapeString(username)+"'"; q=new RDSqlQuery(sql); if(q->first()) { str=tr("This user is set as the default user for the following hosts:\n\n"); @@ -195,29 +195,29 @@ void ListUsers::deleteData() // // Delete RSS Feed Perms // - sql=QString("delete from FEED_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(username)+"\""; + sql=QString("delete from `FEED_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(username)+"'"; RDSqlQuery::apply(sql); // // Delete Member User Perms // - sql=QString("delete from USER_PERMS where ")+ - "USER_NAME=\""+RDEscapeString(username)+"\""; + sql=QString("delete from `USER_PERMS` where ")+ + "`USER_NAME`='"+RDEscapeString(username)+"'"; RDSqlQuery::apply(sql); // // Delete from User List // - sql=QString("delete from USERS where ")+ - "LOGIN_NAME=\""+RDEscapeString(username)+"\""; + sql=QString("delete from `USERS` where ")+ + "`LOGIN_NAME`='"+RDEscapeString(username)+"'"; RDSqlQuery::apply(sql); // // Delete from Cached Web Connections // - sql=QString("delete from WEB_CONNECTIONS where ")+ - "LOGIN_NAME=\""+RDEscapeString(username)+"\""; + sql=QString("delete from `WEB_CONNECTIONS` where ")+ + "`LOGIN_NAME`='"+RDEscapeString(username)+"'"; RDSqlQuery::apply(sql); list_users_model->removeUser(username); diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index f26b7c8c..7c139663 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -633,7 +633,7 @@ a záloha původní databáze uložena v Empty Host Config - Vyprázdnit nastavení serveru + Vyprázdnit nastavení serveru Invalid Name diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 3dc99f5c..d21b0c28 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -551,7 +551,7 @@ worden. Aktuelle Version Empty Host Config - Host Konfiguration leeren + Host Konfiguration leeren Invalid Name diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index c1254521..3f34e956 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -641,7 +641,7 @@ y un respaldo de la base de datos se guardó en Empty Host Config - Configuración en blanco + Configuración en blanco Invalid Name diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index ede1e649..2ebb674b 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -229,10 +229,6 @@ Base Service On: - - Empty Host Config - - Invalid Name diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 67396b5e..d8e21dae 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -533,7 +533,7 @@ oppdatert til versjon Empty Host Config - Tomt vertsoppsett + Tomt vertsoppsett Invalid Name diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 67396b5e..d8e21dae 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -533,7 +533,7 @@ oppdatert til versjon Empty Host Config - Tomt vertsoppsett + Tomt vertsoppsett Invalid Name diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index d6862667..78706845 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -518,7 +518,7 @@ atualizada para a Versão Empty Host Config - Configuração vazia de Cliente + Configuração vazia de Cliente Invalid Name diff --git a/rdadmin/rename_group.cpp b/rdadmin/rename_group.cpp index 24c9a0b1..513eab1e 100644 --- a/rdadmin/rename_group.cpp +++ b/rdadmin/rename_group.cpp @@ -134,8 +134,8 @@ void RenameGroup::okData() return; } - sql=QString("select NAME from GROUPS where ")+ - "NAME=\""+RDEscapeString(group_newname_edit->text())+"\""; + sql=QString("select `NAME` from `GROUPS` where ")+ + "`NAME`='"+RDEscapeString(group_newname_edit->text())+"'"; q=new RDSqlQuery(sql); if(q->first()) { if(QMessageBox::question(this,"RDAdmin - "+tr("Group Exists"), @@ -153,88 +153,78 @@ void RenameGroup::okData() // // Update Cart List // - sql=QString("update CART set ")+ - "GROUP_NAME=\""+RDEscapeString(group_newname_edit->text())+"\" where "+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("update `CART` set ")+ + "`GROUP_NAME`='"+RDEscapeString(group_newname_edit->text())+"' where "+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); // // Update LogManager Events // - sql=QString("update EVENTS set ")+ - "SCHED_GROUP=\""+RDEscapeString(group_newname_edit->text())+"\" where "+ - "SCHED_GROUP=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("update `EVENTS` set ")+ + "`SCHED_GROUP`='"+RDEscapeString(group_newname_edit->text())+"' where "+ + "`SCHED_GROUP`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); // // Update Replicators // - sql=QString("update REPLICATOR_MAP set ")+ - "GROUP_NAME=\""+RDEscapeString(group_newname_edit->text())+"\" where "+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\"", - q=new RDSqlQuery(sql); - delete q; + sql=QString("update `REPLICATOR_MAP` set ")+ + "`GROUP_NAME`='"+RDEscapeString(group_newname_edit->text())+"' where "+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); // // Update Dropboxes // - sql=QString("update DROPBOXES set ")+ - "GROUP_NAME=\""+RDEscapeString(group_newname_edit->text())+"\" where "+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("update `DROPBOXES` set ")+ + "`GROUP_NAME`='"+RDEscapeString(group_newname_edit->text())+"' where "+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); // // Update Group List // if(!merging) { - sql=QString("update GROUPS set ")+ - "NAME=\""+RDEscapeString(group_newname_edit->text())+"\" where "+ - "NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("update `GROUPS` set ")+ + "`NAME`='"+RDEscapeString(group_newname_edit->text())+"' where "+ + "`NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); // // Update AUDIO_PERMS // - sql=QString("update AUDIO_PERMS set ")+ - "GROUP_NAME=\""+RDEscapeString(group_newname_edit->text())+"\" where "+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("update `AUDIO_PERMS` set ")+ + "`GROUP_NAME`='"+RDEscapeString(group_newname_edit->text())+"' where "+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); // // Update USER_PERMS // - sql=QString("update USER_PERMS set ")+ - "GROUP_NAME=\""+RDEscapeString(group_newname_edit->text())+"\" where "+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("update `USER_PERMS` set ")+ + "`GROUP_NAME`='"+RDEscapeString(group_newname_edit->text())+"' where "+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); } else { - sql=QString("delete from GROUPS where ")+ - "NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("delete from `GROUPS` where ")+ + "`NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); // // Update AUDIO_PERMS // - sql=QString("delete from AUDIO_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("delete from `AUDIO_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); // // Update USER_PERMS // - sql=QString("delete from USER_PERMS where ")+ - "GROUP_NAME=\""+RDEscapeString(group_name_edit->text())+"\""; - q=new RDSqlQuery(sql); - delete q; + sql=QString("delete from `USER_PERMS` where ")+ + "`GROUP_NAME`='"+RDEscapeString(group_name_edit->text())+"'"; + RDSqlQuery::apply(sql); } *group_new_name=group_newname_edit->text(); diff --git a/rdadmin/test_import.cpp b/rdadmin/test_import.cpp index f8619fad..e0f2ac44 100644 --- a/rdadmin/test_import.cpp +++ b/rdadmin/test_import.cpp @@ -162,9 +162,9 @@ void TestImport::importData() } test_events_model->refresh(); - QString sql=QString("delete from IMPORTER_LINES where ")+ - "STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\" && "+ - QString().sprintf("PROCESS_ID=%u",getpid()); + QString sql=QString("delete from `IMPORTER_LINES` where ")+ + "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"' && "+ + QString().sprintf("`PROCESS_ID`=%u",getpid()); // printf("IMPORTER_LINES cleanup SQL: %s\n",(const char *)sql); RDSqlQuery::apply(sql); } diff --git a/rdadmin/view_pypad_errors.cpp b/rdadmin/view_pypad_errors.cpp index f655e1da..007b98ee 100644 --- a/rdadmin/view_pypad_errors.cpp +++ b/rdadmin/view_pypad_errors.cpp @@ -34,8 +34,8 @@ ViewPypadErrors::ViewPypadErrors(int id,QWidget *parent) // view_text=new QTextEdit(this); view_text->setReadOnly(true); - QString sql=QString("select ERROR_TEXT from PYPAD_INSTANCES where ")+ - QString().sprintf("ID=%u",id); + QString sql=QString("select `ERROR_TEXT` from `PYPAD_INSTANCES` where ")+ + QString().sprintf("`ID`=%u",id); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { view_text->setPlainText(q->value(0).toString());