Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-25 16:58:04 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' of https://github.com/waynemerricks/rivendell into waynemerricks-stable

Browse Source
This commit is contained in:
Fred Gleason 2016-05-25 07:23:39 -04:00
commit c0999387eb
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rdadmin/createdb.cpp
View File

@ -1239,7 +1239,6 @@ bool CreateDb(QString name,QString pwd)
sql="create table if not exists RDAIRPLAY (\ sql="create table if not exists RDAIRPLAY (\
ID int not null primary key auto_increment,\ ID int not null primary key auto_increment,\
STATION char(40) not null,\ STATION char(40) not null,\
INSTANCE int unsigned not null,\
CARD0 int default 0,\ CARD0 int default 0,\
PORT0 int default 0,\ PORT0 int default 0,\
START_RML0 char(255),\ START_RML0 char(255),\
@ -1351,7 +1350,7 @@ bool CreateDb(QString name,QString pwd)
LOG2_LOG_LINE int default -1,\ LOG2_LOG_LINE int default -1,\
LOG2_NOW_CART int unsigned default 0,\ LOG2_NOW_CART int unsigned default 0,\
LOG2_NEXT_CART int unsigned default 0,\ LOG2_NEXT_CART int unsigned default 0,\
index STATION_IDX (STATION,INSTANCE))"; index STATION_IDX (STATION))";
if(!RunQuery(sql)) { if(!RunQuery(sql)) {
return false; return false;
} }
@ -6048,7 +6047,6 @@ int UpdateDb(int ver)
sql="create table if not exists RDPANEL (\ sql="create table if not exists RDPANEL (\
ID int not null primary key auto_increment,\ ID int not null primary key auto_increment,\
STATION char(40) not null,\ STATION char(40) not null,\
INSTANCE int unsigned not null,\
CARD2 int default -1,\ CARD2 int default -1,\
PORT2 int default -1,\ PORT2 int default -1,\
START_RML2 char(255),\ START_RML2 char(255),\
@ -6075,7 +6073,7 @@ int UpdateDb(int ver)
FLASH_PANEL enum('N','Y') default 'N',\ FLASH_PANEL enum('N','Y') default 'N',\
PANEL_PAUSE_ENABLED enum('N','Y') default 'N',\ PANEL_PAUSE_ENABLED enum('N','Y') default 'N',\
DEFAULT_SERVICE char(10),\ DEFAULT_SERVICE char(10),\
index STATION_IDX (STATION,INSTANCE))"; index STATION_IDX (STATION))";
q=new QSqlQuery(sql); q=new QSqlQuery(sql);
delete q; delete q;

14
rdadmin/opendb.cpp
View File

@ -238,17 +238,13 @@ and we will try to get this straightened out.");
if (check_remote_server(host)) { if (check_remote_server(host)) {
host=format_remote_host(host); host=format_remote_host(host);
} }
sql=QString().sprintf("insert into user set Host=\"%s\",\ sql=QString().sprintf("create user %s@'%s' identified by '%s'",
User=\"%s\",Password=PASSWORD(\"%s\")", (const char *)login, (const char *)host, (const char *)pwd);
(const char *)host, (const char *)login,(const char *)pwd);
q=new QSqlQuery(sql); q=new QSqlQuery(sql);
delete q; delete q;
sql=QString(). sql=QString().sprintf("grant SELECT, INSERT, UPDATE, DELETE, CREATE, DROP,\
sprintf("insert into db set Host=\"%s\",Db=\"%s\",\ INDEX, ALTER, LOCK TABLES on %s.* to %s@'%s'",
User=\"%s\",Select_priv=\"Y\",Insert_priv=\"Y\",Update_priv=\"Y\",\ (const char *)dbname, (const char *)login, (const char *)host);
Delete_priv=\"Y\",Create_priv=\"Y\",Drop_priv=\"Y\",\
Index_priv=\"Y\",Alter_priv=\"Y\",Lock_tables_priv=\"Y\"",
(const char *)host, (const char *)dbname,(const char *)login);
q=new QSqlQuery(sql); q=new QSqlQuery(sql);
delete q; delete q;
q=new QSqlQuery("flush privileges"); q=new QSqlQuery("flush privileges");