2018-07-16 Fred Gleason <fredg@paravelsystems.com>

* Cleaned up SQL quieries in 'rdadmin/' ensure UTF-8 compatibility.
This commit is contained in:
Fred Gleason
2018-07-16 17:31:07 -04:00
parent 363dbb7878
commit 36269f7725
61 changed files with 1430 additions and 1254 deletions

View File

@@ -2,7 +2,7 @@
//
// Edit Rivendell RSS Feed Permissions
//
// (C) Copyright 2002-2005,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2005,2016-2018 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -31,9 +31,11 @@
#include <qbuttongroup.h>
#include <rddb.h>
#include <edit_feed_perms.h>
#include <rduser.h>
#include <rdescape_string.h>
#include <rdpasswd.h>
#include <rduser.h>
#include "edit_feed_perms.h"
EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent)
: QDialog(parent,"",true)
@@ -90,9 +92,8 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent)
//
// Populate Fields
//
sql=QString().sprintf("select KEY_NAME from FEED_PERMS \
where USER_NAME=\"%s\"",
(const char *)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()) {
@@ -137,18 +138,15 @@ void EditFeedPerms::okData()
// Add New Groups
//
for(unsigned i=0;i<feed_host_sel->destCount();i++) {
sql=QString().sprintf("select KEY_NAME from FEED_PERMS \
where USER_NAME=\"%s\" && KEY_NAME=\"%s\"",
(const char *)feed_user->name(),
(const char *)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().
sprintf("insert into FEED_PERMS (USER_NAME,KEY_NAME) \
values (\"%s\",\"%s\")",
(const char *)feed_user->name(),
(const char *)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;
@@ -157,11 +155,11 @@ void EditFeedPerms::okData()
//
// Delete Old Groups
//
sql=QString().sprintf("delete from FEED_PERMS where USER_NAME=\"%s\"",
(const char *)feed_user->name());
sql=QString("delete from FEED_PERMS where ")+
"USER_NAME=\""+RDEscapeString(feed_user->name())+"\"";
for(unsigned i=0;i<feed_host_sel->destCount();i++) {
sql+=QString().sprintf(" && KEY_NAME<>\"%s\"",
(const char *)feed_host_sel->destText(i));
sql+=QString(" && KEY_NAME<>\"")+
RDEscapeString(feed_host_sel->destText(i))+"\"";
}
q=new RDSqlQuery(sql);
delete q;