From 35997e9d743721ee0392812d38e29616885a427c Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sun, 13 Dec 2015 15:53:59 +0100
Subject: renamed the project to aCms (avoid confusion)

---
 src/aCms.cpp           | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/aCms.hpp           | 35 +++++++++++++++++++++++++
 src/intro.cpp          |  4 +--
 src/intro.hpp          |  2 +-
 src/main.cpp           | 10 +++----
 src/master.cpp         |  8 +++---
 src/master.hpp         |  6 ++---
 src/master_content.hpp |  2 +-
 src/page.cpp           |  8 +++---
 src/page.hpp           |  2 +-
 src/page_content.hpp   |  6 ++---
 src/strusCms.cpp       | 71 --------------------------------------------------
 src/strusCms.hpp       | 35 -------------------------
 src/user.cpp           | 12 ++++-----
 src/user.hpp           |  2 +-
 src/user_content.hpp   | 14 +++++-----
 16 files changed, 144 insertions(+), 144 deletions(-)
 create mode 100644 src/aCms.cpp
 create mode 100644 src/aCms.hpp
 delete mode 100644 src/strusCms.cpp
 delete mode 100644 src/strusCms.hpp

(limited to 'src')

diff --git a/src/aCms.cpp b/src/aCms.cpp
new file mode 100644
index 0000000..52f533d
--- /dev/null
+++ b/src/aCms.cpp
@@ -0,0 +1,71 @@
+#include "aCms.hpp"
+
+#include <cppcms/url_mapper.h>   
+#include <cppcms/http_response.h>
+#include <cppcms/json.h>
+#include <cppdb/frontend.h>
+
+namespace {
+
+void setup_dbconnection( cppdb::session &sql )
+{
+	std::string driver = sql.driver( );
+		
+	if( driver == "sqlite3" ) {
+		sql << "PRAGMA foreign_keys = 1" << cppdb::exec;
+	}
+}
+
+}
+
+namespace apps {
+
+aCms::aCms( cppcms::service &srv )
+	: cppcms::application( srv ),
+	master( *this ),
+	intro( *this ),
+	user( *this ),
+	page( *this ),
+ 	conn( settings( ).get<std::string>( "aCms.db_connection" ) ),
+ 	mail( settings( ).get<std::string>( "aCms.mail.server" ),
+		settings( ).get<unsigned short>( "aCms.mail.port" ),
+		settings( ).get<std::string>( "aCms.mail.username" ),
+		settings( ).get<std::string>( "aCms.mail.password" ),
+		settings( ).get<std::string>( "aCms.mail.from" )
+		 )
+{
+	locale_name = "en";
+	script = settings( ).get<std::string>( "aCms.script" );
+	media = settings( ).get<std::string>( "aCms.media" );
+
+	cppdb::session sql( conn );
+	sql.once( setup_dbconnection );
+	
+	add( master );
+	add( intro );
+	add( user );
+	add( page );
+	
+	master.register_common_pages( );
+
+	mapper( ).root( root( ) );
+}
+
+std::string aCms::root( std::string l )
+{
+	return script;
+	// TODO: localization later
+	//~ if( l.empty( ) ) l = locale_name;
+	//~ return script + "/" + l;
+}
+
+std::string aCms::media_root( std::string l )
+{
+	return media;
+	// TODO: localization later
+	//~ if( l.empty( ) ) l = locale_name;
+	//~ return script + "/" + l;
+}
+
+
+}
diff --git a/src/aCms.hpp b/src/aCms.hpp
new file mode 100644
index 0000000..f50253c
--- /dev/null
+++ b/src/aCms.hpp
@@ -0,0 +1,35 @@
+#ifndef ACMS_HPP
+#define ACMS_HPP
+
+#include <cppcms/application.h>  
+
+#include "mail.hpp"
+#include "intro.hpp"
+#include "user.hpp"
+#include "page.hpp"
+
+namespace apps {
+
+class aCms : public cppcms::application {
+	public:
+		aCms( cppcms::service &srv );
+		std::string root( std::string locale_name = "" );
+		std::string media_root( std::string locale_name = "" );
+
+	public:
+		apps::master master;
+		apps::intro intro;
+		apps::user user;
+		apps::page page;
+		std::string conn;
+		mailer mail;
+	
+	private:
+		std::string script;
+		std::string media;
+		std::string locale_name;
+};
+
+}
+
+#endif
diff --git a/src/intro.cpp b/src/intro.cpp
index 6b91bff..4927c93 100644
--- a/src/intro.cpp
+++ b/src/intro.cpp
@@ -1,13 +1,13 @@
 #include "content.hpp"
 #include "intro.hpp"
-#include "strusCms.hpp"
+#include "aCms.hpp"
 
 #include <cppcms/url_dispatcher.h>  
 #include <cppcms/url_mapper.h>   
 
 namespace apps {
 
-intro::intro( strusCms &cms )
+intro::intro( aCms &cms )
 	: master( cms )
 {
 	cms.dispatcher( ).assign( "", &intro::show, this );
diff --git a/src/intro.hpp b/src/intro.hpp
index 0f70ed8..a6a3670 100644
--- a/src/intro.hpp
+++ b/src/intro.hpp
@@ -7,7 +7,7 @@ namespace apps {
 
 class intro : public master {
 	public:
-		intro( strusCms &cms );
+		intro( aCms &cms );
 
 	private:
 		void show( );		
diff --git a/src/main.cpp b/src/main.cpp
index a1a2e71..dfb7743 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,7 @@
 
 #include <signal.h>
 
-#include "strusCms.hpp"
+#include "aCms.hpp"
 
 static bool terminate = false;
 static bool got_sighup = false;
@@ -32,21 +32,21 @@ int main( int argc, char *argv[] )
 		global_srv = &srv;
 		
 		try {
-			BOOSTER_INFO( "strusCms" ) << "Restarting application..";
+			BOOSTER_INFO( "aCms" ) << "Restarting application..";
 			
-			srv.applications_pool( ).mount( cppcms::applications_factory<apps::strusCms>( ) );
+			srv.applications_pool( ).mount( cppcms::applications_factory<apps::aCms>( ) );
 	
 			srv.run( );
 
 			if( got_sighup ) {
-				BOOSTER_INFO( "strusCms" ) << "Reloading configuration on SIGHUP..";
+				BOOSTER_INFO( "aCms" ) << "Reloading configuration on SIGHUP..";
 				got_sighup = false;
 			} else {
 				terminate = true;
 			}
 			
 		} catch( std::exception const &e ) {
-			BOOSTER_ERROR( "strusCms" ) << e.what() ;
+			BOOSTER_ERROR( "aCms" ) << e.what() ;
 			srv.shutdown( );
 			continue;
 		}
diff --git a/src/master.cpp b/src/master.cpp
index 021fdb2..0057a79 100644
--- a/src/master.cpp
+++ b/src/master.cpp
@@ -1,5 +1,5 @@
 #include "master.hpp"
-#include "strusCms.hpp"
+#include "aCms.hpp"
 
 #include <cppcms/service.h>
 #include <cppcms/url_dispatcher.h>  
@@ -8,7 +8,7 @@
 
 namespace apps {
 
-master::master( strusCms &cms )
+master::master( aCms &cms )
 	: application( cms.service( ) ),
 	cms( cms )
 {
@@ -16,7 +16,7 @@ master::master( strusCms &cms )
 
 void master::ini( content::master &c )
 {
-	c.title = "strusCms";	
+	c.title = "aCms";	
 	if( session( ).is_set( "username" ) ) {
 		c.username = session( )["username" ];
 	} else {
@@ -37,7 +37,7 @@ void master::register_common_pages( )
 {
 	// only deliver static content here matching the static files only!
 	cms.dispatcher( ).assign( "(" + cms.media_root( ) + "/basic-profile.css)", &master::serve_file, this, 1 );	
-	cms.dispatcher( ).assign( "(" + cms.media_root( ) + "/images/strus_big.jpg)", &master::serve_file, this, 1 );	
+	cms.dispatcher( ).assign( "(" + cms.media_root( ) + "/images/logo_big.png)", &master::serve_file, this, 1 );	
 
 	// some catch all redirects pointing to the main page
 	cms.dispatcher( ).assign( "/", &master::redirect_to_master, this );
diff --git a/src/master.hpp b/src/master.hpp
index d195601..7390b8b 100644
--- a/src/master.hpp
+++ b/src/master.hpp
@@ -7,14 +7,14 @@
     
 namespace apps {
 
-class strusCms;
+class aCms;
 
 class master : public cppcms::application {
 	protected:
-		strusCms &cms;
+		aCms &cms;
 		
 	public:
-		master( strusCms &cms );
+		master( aCms &cms );
 		void ini( content::master &c );
 		void register_common_pages( );
 		void serve_file( std::string file_name );  
diff --git a/src/master_content.hpp b/src/master_content.hpp
index 5ea54ee..d340eaa 100644
--- a/src/master_content.hpp
+++ b/src/master_content.hpp
@@ -8,7 +8,7 @@
 
 namespace apps {
 	
-class strusCms;
+class aCms;
 
 }
 
diff --git a/src/page.cpp b/src/page.cpp
index cff0118..1e3debf 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -1,6 +1,6 @@
 #include "content.hpp"
 #include "page.hpp"
-#include "strusCms.hpp"
+#include "aCms.hpp"
 
 #include <cppcms/url_dispatcher.h>  
 #include <cppcms/url_mapper.h>   
@@ -10,7 +10,7 @@ namespace apps {
 
 // page
 
-page::page( strusCms &cms )
+page::page( aCms &cms )
 	: master( cms )
 {
 	cms.dispatcher( ).assign( "/page/(\\w+)", &page::display, this, 1 );
@@ -77,12 +77,12 @@ void page::ini( content::page &c )
 
 namespace content {
 
-page::page( apps::strusCms &cms )
+page::page( apps::aCms &cms )
 	: page_edit( cms )
 {
 }
 	
-page_edit_form::page_edit_form( apps::strusCms &cms  )
+page_edit_form::page_edit_form( apps::aCms &cms  )
 	: cppcms::form( ),
 	cms( cms )
 {
diff --git a/src/page.hpp b/src/page.hpp
index f3ac5d0..c11d644 100644
--- a/src/page.hpp
+++ b/src/page.hpp
@@ -11,7 +11,7 @@ namespace apps {
 
 class page : public master {
 	public:
-		page( strusCms &cms );
+		page( aCms &cms );
 
 	private:
 		void display( std::string slug );
diff --git a/src/page_content.hpp b/src/page_content.hpp
index e21d33f..3b5717b 100644
--- a/src/page_content.hpp
+++ b/src/page_content.hpp
@@ -8,14 +8,14 @@
 namespace content {
 
 struct page_edit_form : public cppcms::form {
-	apps::strusCms &cms;
+	apps::aCms &cms;
 	cppcms::widgets::text title;
 	cppcms::widgets::textarea content;
 	cppcms::widgets::submit save;
 	cppcms::widgets::submit preview;
 
 	public:
-		page_edit_form( apps::strusCms &cms );
+		page_edit_form( apps::aCms &cms );
 		virtual bool validate( );
 				
 };
@@ -24,7 +24,7 @@ struct page : public master {
 	page_edit_form page_edit;
 	
 	public:
-		page( apps::strusCms &cms );
+		page( apps::aCms &cms );
 };
 
 } // namespace content
diff --git a/src/strusCms.cpp b/src/strusCms.cpp
deleted file mode 100644
index 9d7945b..0000000
--- a/src/strusCms.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "strusCms.hpp"
-
-#include <cppcms/url_mapper.h>   
-#include <cppcms/http_response.h>
-#include <cppcms/json.h>
-#include <cppdb/frontend.h>
-
-namespace {
-
-void setup_dbconnection( cppdb::session &sql )
-{
-	std::string driver = sql.driver( );
-		
-	if( driver == "sqlite3" ) {
-		sql << "PRAGMA foreign_keys = 1" << cppdb::exec;
-	}
-}
-
-}
-
-namespace apps {
-
-strusCms::strusCms( cppcms::service &srv )
-	: cppcms::application( srv ),
-	master( *this ),
-	intro( *this ),
-	user( *this ),
-	page( *this ),
- 	conn( settings( ).get<std::string>( "strusCms.db_connection" ) ),
- 	mail( settings( ).get<std::string>( "strusCms.mail.server" ),
-		settings( ).get<unsigned short>( "strusCms.mail.port" ),
-		settings( ).get<std::string>( "strusCms.mail.username" ),
-		settings( ).get<std::string>( "strusCms.mail.password" ),
-		settings( ).get<std::string>( "strusCms.mail.from" )
-		 )
-{
-	locale_name = "en";
-	script = settings( ).get<std::string>( "strusCms.script" );
-	media = settings( ).get<std::string>( "strusCms.media" );
-
-	cppdb::session sql( conn );
-	sql.once( setup_dbconnection );
-	
-	add( master );
-	add( intro );
-	add( user );
-	add( page );
-	
-	master.register_common_pages( );
-
-	mapper( ).root( root( ) );
-}
-
-std::string strusCms::root( std::string l )
-{
-	return script;
-	// TODO: localization later
-	//~ if( l.empty( ) ) l = locale_name;
-	//~ return script + "/" + l;
-}
-
-std::string strusCms::media_root( std::string l )
-{
-	return media;
-	// TODO: localization later
-	//~ if( l.empty( ) ) l = locale_name;
-	//~ return script + "/" + l;
-}
-
-
-}
diff --git a/src/strusCms.hpp b/src/strusCms.hpp
deleted file mode 100644
index 83d4c8c..0000000
--- a/src/strusCms.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef STRUS_CMS_HPP
-#define STRUS_CMS_HPP
-
-#include <cppcms/application.h>  
-
-#include "mail.hpp"
-#include "intro.hpp"
-#include "user.hpp"
-#include "page.hpp"
-
-namespace apps {
-
-class strusCms : public cppcms::application {
-	public:
-		strusCms( cppcms::service &srv );
-		std::string root( std::string locale_name = "" );
-		std::string media_root( std::string locale_name = "" );
-
-	public:
-		apps::master master;
-		apps::intro intro;
-		apps::user user;
-		apps::page page;
-		std::string conn;
-		mailer mail;
-	
-	private:
-		std::string script;
-		std::string media;
-		std::string locale_name;
-};
-
-}
-
-#endif
diff --git a/src/user.cpp b/src/user.cpp
index 64154a7..ffa48e5 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -1,6 +1,6 @@
 #include "content.hpp"
 #include "user.hpp"
-#include "strusCms.hpp"
+#include "aCms.hpp"
 #include "captcha.hpp"
 #include "cracklib.hpp"
 
@@ -22,7 +22,7 @@ namespace apps {
 
 // user
 
-user::user( strusCms &cms )
+user::user( aCms &cms )
 	: master( cms )
 {
 	cms.dispatcher( ).assign( "/login", &user::login, this );
@@ -315,14 +315,14 @@ void user::ini( content::user &c )
 
 namespace content {
 
-user::user( apps::strusCms &cms )
+user::user( apps::aCms &cms )
 	: login( cms ), register_user( cms ), confirm_register( cms )
 {
 }
 	
 // login
 
-login_form::login_form( apps::strusCms &cms  )
+login_form::login_form( apps::aCms &cms  )
 	: cppcms::form( ),
 	cms( cms )
 {
@@ -358,7 +358,7 @@ bool login_form::validate( )
 	
 // register user
 
-register_user_form::register_user_form( apps::strusCms &cms  )
+register_user_form::register_user_form( apps::aCms &cms  )
 	: cppcms::form( ),
 	cms( cms )
 {
@@ -429,7 +429,7 @@ bool register_user_form::validate( )
 
 // confirm user registration form
 
-confirm_register_form::confirm_register_form( apps::strusCms &cms  )
+confirm_register_form::confirm_register_form( apps::aCms &cms  )
 	: cppcms::form( ),
 	cms( cms )
 {
diff --git a/src/user.hpp b/src/user.hpp
index d3463d9..7d73295 100644
--- a/src/user.hpp
+++ b/src/user.hpp
@@ -13,7 +13,7 @@ namespace apps {
 
 class user : public master {
 	public:
-		user( strusCms &cms );
+		user( aCms &cms );
 		bool check_login( const std::string user, const std::string password );
 		bool user_exists( const std::string user );
 		void delete_user( const std::string user );
diff --git a/src/user_content.hpp b/src/user_content.hpp
index 29df43d..29ac0c6 100644
--- a/src/user_content.hpp
+++ b/src/user_content.hpp
@@ -8,19 +8,19 @@
 namespace content {
 
 struct login_form : public cppcms::form {
-	apps::strusCms &cms;
+	apps::aCms &cms;
 	cppcms::widgets::text username;
 	cppcms::widgets::password password;
 	cppcms::widgets::submit submit;
 
 	public:
-		login_form( apps::strusCms &cms );
+		login_form( apps::aCms &cms );
 		virtual bool validate( );
 				
 };
 
 struct register_user_form : public cppcms::form {
-	apps::strusCms &cms;
+	apps::aCms &cms;
 	cppcms::widgets::text username;
 	cppcms::widgets::text printName;
 	cppcms::widgets::password password;
@@ -30,17 +30,17 @@ struct register_user_form : public cppcms::form {
 	cppcms::widgets::submit submit;
 	
 	public:
-		register_user_form( apps::strusCms &cms );
+		register_user_form( apps::aCms &cms );
 		virtual bool validate( );
 };
 
 struct confirm_register_form : public cppcms::form {
-	apps::strusCms &cms;
+	apps::aCms &cms;
 	cppcms::widgets::text code;
 	cppcms::widgets::submit submit;
 
 	public:
-		confirm_register_form( apps::strusCms &cms );
+		confirm_register_form( apps::aCms &cms );
 		virtual bool validate( );
 };
 
@@ -52,7 +52,7 @@ struct user : public master {
 	std::string captcha_base64;
 	
 	public:
-		user( apps::strusCms &cms );
+		user( apps::aCms &cms );
 };
 
 }
-- 
cgit v1.2.3-54-g00ecf