arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-12-14 14:53:42 +00:00
Code Issues Projects Releases Wiki Activity

add --system flag to the helper

Browse Source 
add security notes
This commit is contained in:
arcan1s
2014-08-12 23:49:35 +04:00
parent 3b1701f8b5
commit eabfac7323
14 changed files with 92 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/helper/src/netctlhelper.cpp
View File

@ -33,7 +33,8 @@
NetctlHelper::NetctlHelper(QObject *parent, QMap<QString, QVariant> args)
: QObject(parent),
configPath(args[QString("config")].toString()),
debug(args[QString("debug")].toBool())
debug(args[QString("debug")].toBool()),
system(args[QString("system")].toBool())
{
updateConfiguration();
if (!args[QString("nodaemon")].toBool())
@ -136,12 +137,16 @@ QMap<QString, QString> NetctlHelper::getDefault()
}
QMap<QString, QString> NetctlHelper::getSettings()
QMap<QString, QString> NetctlHelper::getSettings(const QString file, const QMap<QString, QString> existing)
{
if (debug) qDebug() << "[NetctlHelper]" << "[getSettings]";
QMap<QString, QString> settings = getDefault();
QFile configFile(configPath);
QMap<QString, QString> settings;
if (existing.isEmpty())
settings = getDefault();
else
settings = existing;
QFile configFile(file);
QString fileStr;
if (!configFile.open(QIODevice::ReadOnly))
return settings;
@ -168,7 +173,9 @@ void NetctlHelper::updateConfiguration()
if (debug) qDebug() << "[NetctlHelper]" << "[updateConfiguration]";
deleteInterface();
configuration = getSettings();
configuration = getSettings(QString("/etc/netctlgui-helper.conf"));
if (!system)
configuration = getSettings(configPath, configuration);
createInterface();
}