login

CMakeLists.txt

@@ -13,6 +13,7 @@ src/Startup.cpp
 src/Module.cpp
 src/Parameter_text.cpp
 src/Parameter.cpp
+src/login.cpp
 
 )
 # src/WGrassLayerManager.cpp

Makefile.simple

@@ -1,7 +1,7 @@
 all: wgrass.wt
 
-wgrass.wt: src/main.o src/global.o src/WGApplication.o src/MainUI.o src/LayerManager.o src/Display.o src/Toolbar.o src/Module.o src/Parameter.o src/Parameter_text.o src/WOpenLayers.o
-	g++ src/main.o src/global.o src/WGApplication.o src/MainUI.o src/LayerManager.o src/Display.o src/Toolbar.o src/Module.o src/Parameter.o src/Parameter_text.o src/WOpenLayers.o -o wgrass.wt \
+wgrass.wt: src/main.o src/global.o src/WGApplication.o src/login.o src/MainUI.o src/LayerManager.o src/Display.o src/Toolbar.o src/Module.o src/Parameter.o src/Parameter_text.o src/WOpenLayers.o
+	g++ src/main.o src/global.o src/WGApplication.o src/login.o src/MainUI.o src/LayerManager.o src/Display.o src/Toolbar.o src/Module.o src/Parameter.o src/Parameter_text.o src/WOpenLayers.o -o wgrass.wt \
 		-L/usr/local/lib -lwt -lwthttp -lpugixml -lboost_system -lboost_signals -lpthread
 
 main.o: main.cpp
@@ -13,6 +13,9 @@ global.o: global.cpp
 WGApplication.o: WGApplication.cpp
 	g++ -c WGApplication.cpp
 
+login.o: login.cpp
+	g++ -c login.cpp
+
 MainUI.o: MainUI.cpp
 	g++ -c MainUI.cpp
 

Makefile2

@@ -1,7 +1,7 @@
 all: wgrass.wt
 
-wgrass.wt: src/main.o src/global.o src/WGApplication.o src/MainUI.o src/LayerManager.o src/Display.o src/Toolbar.o src/Module.o src/Parameter.o src/Parameter_text.o src/WOpenLayers.o
-	g++ src/main.o src/global.o src/WGApplication.o src/MainUI.o src/LayerManager.o src/Display.o src/Toolbar.o src/Module.o src/Parameter.o src/Parameter_text.o src/WOpenLayers.o -o wgrass.wt \
+wgrass.wt: src/main.o src/global.o src/WGApplication.o src/login.o src/MainUI.o src/LayerManager.o src/Display.o src/Toolbar.o src/Module.o src/Parameter.o src/Parameter_text.o src/WOpenLayers.o
+	g++ src/main.o src/global.o src/WGApplication.o src/login.o src/MainUI.o src/LayerManager.o src/Display.o src/Toolbar.o src/Module.o src/Parameter.o src/Parameter_text.o src/WOpenLayers.o -o wgrass.wt \
 		-L/usr/local/lib -lwt -lwthttp -lpugixml -lboost_system -lboost_signals -lpthread
 
 main.o: main.cpp
@@ -13,6 +13,9 @@ global.o: global.cpp
 WGApplication.o: WGApplication.cpp
 	g++ -c WGApplication.cpp
 
+login.o: login.cpp
+	g++ -c login.cpp
+
 MainUI.o: MainUI.cpp
 	g++ -c MainUI.cpp
 

src/WGApplication.cpp

@@ -13,6 +13,7 @@ License (>=v2). Read the file COPYING for details.
 #include "WGApplication.h"
 #include "MainUI.h"
 #include "Startup.h"
+#include "login.h"
 
 
 WGApplication::WGApplication(const Wt::WEnvironment& env)
@@ -24,7 +25,7 @@ WGApplication::WGApplication(const Wt::WEnvironment& env)
 
   internalPathChanged().connect(this, &WGApplication::handlePathChanged);
 
-  Wt::WApplication::instance()->setInternalPath("/start", true);
+  Wt::WApplication::instance()->setInternalPath("/login", true);
 
   WApplication::instance()->useStyleSheet("style.css");
 
@@ -50,12 +51,19 @@ root()->clear();
              MainUI * page_entry = new MainUI(root());
 setTitle("GRASS GIS UI");
 }
-else {
+else if(current_path == "/start") {
 root()->clear();
 Startup* startup = new Startup(uname, root());
 setTitle("Select Location and Mapset");
 }
 
+else
+{
+  root()->clear();
+Login* login = new Login(root());
+setTitle("Select Location and Mapset");
+}
+
 }
 
 

src/login.cpp

@@ -32,6 +32,7 @@ using namespace Wt;
 #include <Wt/WLabel>
 #include <Wt/WRandom>
 #include <Wt/WComboBox>
+#include <postgresql/libpq-fe.h>
 
 using namespace std;
 
@@ -85,8 +86,8 @@ WLabel *prjlabel = new WLabel(" Project:");
 ulayout->addWidget(prjlabel,3,0);
 cmbProject = new WComboBox();
 
-
-PGconn *conn =  ConnectDB("/var/lib/postgresql/9.5/main/admin");
+conninfo = "dbname = postgres";
+PGconn *conn =  PQconnectdb(conninfo);
 
 
 
@@ -188,7 +189,7 @@ new WText("<br/> <br/>",d->contents());
       //return;
     }
 
-conn =  ConnectDB("/var/lib/postgresql/9.5/main/admin");
+conn =  PQconnectdb("/var/lib/postgresql/9.5/main/admin");
 
 
 string query =  "SELECT * FROM users WHERE uname='" + uname->text().narrow() +  "'";
@@ -231,7 +232,7 @@ if (PQresultStatus(res) != PGRES_COMMAND_OK)
     {
 
         PQclear(res);
-        CloseConn(conn);
+        PQfinish(conn);
 //WApplication::instance()->doJavaScript("alert('Thank')");
     }
 else {WApplication::instance()->doJavaScript("alert('Thankyou for registering')");
@@ -267,7 +268,7 @@ WApplication::instance()->setCookie("wgrass_login", "", 0);
 
 void Login::checkLogin() {
 
-PGconn *conn =  ConnectDB("/var/lib/postgresql/9.5/main/admin");
+PGconn *conn =  PQconnectdb("/var/lib/postgresql/9.5/main/admin");
 
 
 string query =  "SELECT * FROM users WHERE uname='" + uname->text().narrow() + "' AND passwd=md5('" + passwd->text().toUTF8() + "')";
@@ -285,7 +286,7 @@ string query =  "SELECT * FROM users WHERE uname='" + uname->text().narrow() + "
     // else {
 	      WApplication::instance()->setCookie("wgrass_login", uname->text().narrow(), 60*60*24*24);
 
-      WApplication::instance()->redirect("/");
+      WApplication::instance()->setInternalPath("/start",true);
 //}
 
 

src/login.h

@@ -34,6 +34,7 @@ WPushButton *login;
 WApplication *wapp;
 
 WContainerWidget *unameWidget;
+const char *conninfo;
 
 
 };