integrated libcaptcha and working on captcha in login form

4 files changed, 16 insertions, 1 deletions

diff --git a/src/master.hpp b/src/master.hpp
index d29073e..90bd985 100644
--- a/src/master.hpp
+++ b/src/master.hpp
@@ -15,7 +15,7 @@ class master : public cppcms::application {
 		
 	public:
 		master( strusCms &cms );
-		virtual void ini( content::master &c );
+		void ini( content::master &c );
 };
 
 }
diff --git a/src/user.cpp b/src/user.cpp
index 649c40e..8f18706 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -81,6 +81,12 @@ bool user::check_login( std::string user, std::string password )
 	return true;
 }
 
+void user::ini( content::user &c )
+{
+	master::ini( c );
+	c.captcha = ">> CAPTCHA <<";
+}
+
 } // namespace apps
 
 namespace content {
@@ -93,14 +99,18 @@ login_form::login_form( apps::strusCms &cms  )
 	username.error_message( "The login is illegal" );
 	password.message( "Your password" );
 	password.error_message( "Your password is illegal" );
+	captcha.message( "Enter the correct captcha" );
+	captcha.error_message( "Captcha didn't match" );
 	submit.value( "Log in" );
 	
 	add( username );
 	add( password );
+	add( captcha );
 	add( submit );
 	
 	username.non_empty( );
 	password.non_empty( );
+	captcha.non_empty( );
 }
 	
 bool login_form::validate( )
diff --git a/src/user.hpp b/src/user.hpp
index 9f35a0d..f255fbf 100644
--- a/src/user.hpp
+++ b/src/user.hpp
@@ -3,6 +3,8 @@
 
 #include "master.hpp"
 
+#include "user_content.hpp"
+
 namespace apps {
 
 class user : public master {
@@ -13,6 +15,7 @@ class user : public master {
 	private:
 		void login( );
 		void logout( );	
+		void ini( content::user &c );
 };
 
 }
diff --git a/src/user_content.hpp b/src/user_content.hpp
index 4b260f5..887c61a 100644
--- a/src/user_content.hpp
+++ b/src/user_content.hpp
@@ -11,6 +11,7 @@ struct login_form : public cppcms::form {
 	apps::strusCms &cms;
 	cppcms::widgets::text username;
 	cppcms::widgets::password password;
+	cppcms::widgets::text captcha;
 	cppcms::widgets::submit submit;
 
 	public:
@@ -21,6 +22,7 @@ struct login_form : public cppcms::form {
 
 struct user : public master {
 	login_form login;
+	std::string captcha;
 	
 	public:
 		user( apps::strusCms &cms );