Defect #644 and cleanout some old code

1 files changed, 26 insertions, 81 deletions

diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp
index b23bc57..a0405d0 100755
--- a/src/pvsDaemon.cpp
+++ b/src/pvsDaemon.cpp
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include "pvs.h"
 #include "src/net/pvsLocalhostCommunicator.h"
-#include "src/util/pvsSettingsManager.h"
 #include "setup.h"
 #include "src/net/pvsMsg.h"
 #include "src/core/pvsChatClient.h"
@@ -67,19 +66,6 @@ int main(int argc, char** argv)
     int frequency = 5;
     int port = -1;
 
-    QFileInfo script;
-    #ifdef __WIN32__
-        //TODO Win32
-        if (!script.exists())
-            script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv_win32.bat");
-    #else
-        script.setFile("/usr/bin/pvs-vncsrv");
-        if (!script.exists())
-            script.setFile("/usr/local/bin/pvs-vncsrv");
-        if (!script.exists())
-            script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv");
-    #endif //__WIN32__
-
     QCoreApplication app(argc, argv);
     app.setOrganizationName("openslx");
     app.setOrganizationDomain("openslx.org");
@@ -89,6 +75,27 @@ int main(int argc, char** argv)
     translator.load(":pvs");
     app.installTranslator(&translator);
 
+    QFileInfo script;
+#ifdef __WIN32__
+    //TODO Win32
+    if (!script.exists())
+        script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv_win32.bat");
+#else
+    QSettings settings;
+    if (!QFile::exists(settings.fileName()))
+    {
+        QDir::root().mkpath(QFileInfo(settings.fileName()).path());
+        QFile::copy("/etc/openslx/pvs.conf", settings.fileName());
+    }
+    QString s = settings.value("VNC/script").toString();
+    script.setFile(s);
+    if (!script.exists())
+        script.setFile("/usr/bin/pvs-vncsrv");
+    if (!script.exists())
+        script.setFile("/usr/local/bin/pvs-vncsrv");
+    if (!script.exists())
+        script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv");
+#endif //__WIN32__
 
     PVSLocalhostCommunicator com(getPolicyFilePath(QString(
                                      ".comfile")));
@@ -149,73 +156,17 @@ int main(int argc, char** argv)
                 }
                 else
                 {
-                    QStringList line = QString::fromLocal8Bit(argv[option_index
-                                       + 1]).split(":");
-                    QString &ident = line[0];
-                    QString message;
-                    if (line.size() > 1)
-                        message = line[1];
-                    if (ident.size() > 0) // no use sending empty idents... not even sure if this COULD happen
-                    {
-                        bool flag = false;
-                        if (ident == "make")
-                            PVSSettingsManager::getManager()->setConfigs();
-                        else if (ident == "chat" && message == "boss")
-                        {
-                            PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "bossmode");
-                            flag = true;
-
-                        }
-                        else if (ident == "chat" && message == "all")
-                        {
-                            PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "community");
-                            flag = true;
-                        }
-                        else if (ident == "chat" && message == "private")
-                        {
-                            PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "private");
-                            flag = true;
-                        }
-                        else if (ident == "chat" && message == "on")
-                        {
-                            PVSSettingsManager::getManager()->reWriteConfigs("chatstate", "on");
-                            flag = true;
-                        }
-                        else if (ident == "chat" && message == "off")
-                        {
-                            PVSSettingsManager::getManager()->reWriteConfigs("chatstate", "off");
-                            flag = true;
-                        }
-                        else if (ident == "room")
-                        {
-                            //PVSSettingsManager::getManager()->reWriteConfigs(ident, message);
-                            flag = true;
-                        }
-                        else if (ident == "stop" && message == NULL)
-                            flag = true;
-                        else
-                            printf("option %s doesn't exist\n", ident.toUtf8().data());
-
-                        if (flag)
-                        {
-                            qDebug("Will send i: %s, m: %s\n", ident.toUtf8().data(), message.toUtf8().data());
-                            com.sendCommand(ident, message);
-                            QCoreApplication::processEvents(QEventLoop::AllEvents);
-                            printf("Sent command. Exiting.\n");
-                        }
-                    }
-
-                    else
-                        printf("Something went horribly wrong, since the ident is empty.\n");
-
-                }
+                    printf("Will send i: %s, m: %s\n", argv[option_index + 1], "");
+                    com.sendCommand(QString(argv[option_index + 1]), "");
+                    QCoreApplication::processEvents(QEventLoop::AllEvents);
+                    printf("Sent command. Exiting.\n");
+                 }
             }
             else
             {
                 printf("Error. No command issued. Exiting.\n");
             }
             exit(0); // and gone
-            break;
         }
         case 'f':
         {
@@ -336,7 +287,6 @@ int main(int argc, char** argv)
     }
 
     mainClient = new PVS();
-    PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("clientconf"));
     com.getDispatcher()->addListener("*", mainClient, &PVS::onDaemonCommand);
 
     if (port <= 0)
@@ -347,11 +297,6 @@ int main(int argc, char** argv)
     createPolicyDir();
     createPolicyFiles();
 
-    //  long int gr = 0;
-    mainClient->setScriptPath(script.filePath());
     app.exec();
-    delete mainClient;
-
-    return 0;
 }