summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2015-12-13 15:53:59 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2015-12-13 15:53:59 +0100
commit35997e9d743721ee0392812d38e29616885a427c (patch)
tree36909a9eedfdbcb7591e7c568fef2a6b2ad4c692
parentebf669cdbf7854f03113a937605658f100aefd48 (diff)
downloadaCms-35997e9d743721ee0392812d38e29616885a427c.tar.gz
aCms-35997e9d743721ee0392812d38e29616885a427c.tar.bz2
renamed the project to aCms (avoid confusion)
-rw-r--r--3rdParty/libb64/base64/Makefile56
-rw-r--r--3rdParty/libb64/base64/VisualStudioProject/Makefile11
-rw-r--r--3rdParty/libb64/src/Makefile43
-rw-r--r--CMakeLists.txt32
-rw-r--r--COPYING53
-rw-r--r--config.js14
-rw-r--r--media/images/logo_big.pngbin0 -> 2029 bytes
-rw-r--r--media/images/strus_big.jpgbin36406 -> 0 bytes
-rw-r--r--sample_config.js37
-rw-r--r--src/aCms.cpp (renamed from src/strusCms.cpp)24
-rw-r--r--src/aCms.hpp (renamed from src/strusCms.hpp)8
-rw-r--r--src/intro.cpp4
-rw-r--r--src/intro.hpp2
-rw-r--r--src/main.cpp10
-rw-r--r--src/master.cpp8
-rw-r--r--src/master.hpp6
-rw-r--r--src/master_content.hpp2
-rw-r--r--src/page.cpp8
-rw-r--r--src/page.hpp2
-rw-r--r--src/page_content.hpp6
-rw-r--r--src/user.cpp12
-rw-r--r--src/user.hpp2
-rw-r--r--src/user_content.hpp14
-rw-r--r--templates/logout.tmpl4
-rw-r--r--templates/master.tmpl6
25 files changed, 118 insertions, 246 deletions
diff --git a/3rdParty/libb64/base64/Makefile b/3rdParty/libb64/base64/Makefile
deleted file mode 100644
index 30a2c5c..0000000
--- a/3rdParty/libb64/base64/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-BINARIES = base64
-
-# Build flags (uncomment one)
-#############################
-# Release build flags
-CFLAGS += -O3
-#############################
-# Debug build flags
-#CFLAGS += -g
-#############################
-
-# select a buffersize
-# a larger size should be faster, but takes more runtime memory
-#BUFFERSIZE = 4096
-#BUFFERSIZE = 65536
-BUFFERSIZE = 16777216
-
-SOURCES = base64.cc
-
-TARGETS = $(BINARIES)
-
-LINK.o = g++
-
-CFLAGS += -Werror -pedantic
-CFLAGS += -DBUFFERSIZE=$(BUFFERSIZE)
-CFLAGS += -I../include
-
-CXXFLAGS += $(CFLAGS)
-
-vpath %.h ../include/b64
-vpath %.a ../src
-
-.PHONY : clean
-
-all: $(TARGETS) #strip
-
-base64: libb64.a
-
-strip:
- strip $(BINARIES) *.exe
-
-clean: clean_VisualStudioProject
- rm -f *.exe* *.o $(TARGETS) *.bak *~
-clean_VisualStudioProject:
- $(MAKE) -C VisualStudioProject clean
-
-distclean: clean distclean_VisualStudioProject
- rm -f depend
-distclean_VisualStudioProject: clean_VisualStudioProject
- $(MAKE) -C VisualStudioProject distclean
-
-depend: $(SOURCES)
- makedepend -f- $(CFLAGS) $(SOURCES) 2> /dev/null 1> depend
-
--include depend
-
diff --git a/3rdParty/libb64/base64/VisualStudioProject/Makefile b/3rdParty/libb64/base64/VisualStudioProject/Makefile
deleted file mode 100644
index 047fcb9..0000000
--- a/3rdParty/libb64/base64/VisualStudioProject/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-DEBRIS = base64.sdf base64.suo base64.vcxproj.user
-
-all:
-
-clean:
- rm -rf Debug Release
-
-distclean: clean
- rm -f $(DEBRIS)
-
- \ No newline at end of file
diff --git a/3rdParty/libb64/src/Makefile b/3rdParty/libb64/src/Makefile
deleted file mode 100644
index 28b2382..0000000
--- a/3rdParty/libb64/src/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-LIBRARIES = libb64.a
-
-# Build flags (uncomment one)
-#############################
-# Release build flags
-CFLAGS += -O3
-#############################
-# Debug build flags
-#CFLAGS += -g
-#############################
-
-SOURCES = cdecode.c cencode.c
-
-TARGETS = $(LIBRARIES)
-
-LINK.o = gcc
-
-CFLAGS += -Werror -pedantic
-CFLAGS += -I../include
-
-vpath %.h ../include/b64
-
-.PHONY : clean
-
-all: $(TARGETS) #strip
-
-libb64.a: cencode.o cdecode.o
- $(AR) $(ARFLAGS) $@ $^
-
-strip:
- strip $(BINARIES) *.exe
-
-clean:
- rm -f *.exe* *.o $(TARGETS) *.bak *~
-
-distclean: clean
- rm -f depend
-
-depend: $(SOURCES)
- makedepend -f- $(CFLAGS) $(SOURCES) 2> /dev/null 1> depend
-
--include depend
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af1da58..c4ae3fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.6)
-project(strusCms)
+project(aCms)
find_library(CPPCMS cppcms)
find_library(BOOSTER booster)
@@ -46,7 +46,7 @@ set(TEMPLATES
set(SRC
src/main.cpp
- src/strusCms.cpp
+ src/aCms.cpp
src/captcha.cpp
src/cracklib.cpp
src/mail.cpp
@@ -66,9 +66,9 @@ add_custom_command(
)
if(USE_STATIC_VIEW)
- add_executable(strusCms ${SRC} ${CMAKE_CURRENT_BINARY_DIR}/view.cpp)
+ add_executable(aCms ${SRC} ${CMAKE_CURRENT_BINARY_DIR}/view.cpp)
else()
- add_executable(strusCms ${SRC} ${CAPTCHA})
+ add_executable(aCms ${SRC} ${CAPTCHA})
add_library(view SHARED ${CMAKE_CURRENT_BINARY_DIR}/view.cpp)
target_link_libraries(view ${BOOSTER} ${CPPCMS})
endif()
@@ -76,13 +76,13 @@ endif()
link_directories( "${PROJECT_SOURCE_DIR}/3rdParty/captcha" )
link_directories( "${PROJECT_SOURCE_DIR}/3rdParty/libb64" )
link_directories( "${PROJECT_SOURCE_DIR}/3rdParty/libquickmail" )
-target_link_libraries(strusCms ${BOOSTER} ${CPPCMS} ${CPPDB} captcha b64 quickmail curl cryptopp crack)
+target_link_libraries(aCms ${BOOSTER} ${CPPCMS} ${CPPDB} captcha b64 quickmail curl cryptopp crack)
#~ set(LOCALES de fr)
#~
#~ set(MO_FILES)
#~ set(UPDATE_PO_LIST)
-#~ set(POT_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/po/strusCms.pot")
+#~ set(POT_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/po/aCms.pot")
#~
#~ add_custom_command(
#~ OUTPUT ${POT_TEMPLATE}
@@ -104,7 +104,7 @@ target_link_libraries(strusCms ${BOOSTER} ${CPPCMS} ${CPPDB} captcha b64 quickma
#~ foreach(LOCALE ${LOCALES})
#~ set(MODIR "${CMAKE_CURRENT_BINARY_DIR}/locale/${LOCALE}/LC_MESSAGES")
#~ file(MAKE_DIRECTORY "${MODIR}")
- #~ set(MOFILE "${MODIR}/strusCms.mo")
+ #~ set(MOFILE "${MODIR}/aCms.mo")
#~ set(POFILE "${CMAKE_CURRENT_SOURCE_DIR}/po/${LOCALE}.po")
#~
#~ add_custom_command(
@@ -113,7 +113,7 @@ target_link_libraries(strusCms ${BOOSTER} ${CPPCMS} ${CPPDB} captcha b64 quickma
#~ DEPENDS ${POFILE})
#~
#~ add_custom_target(update-po-${LOCALE}
- #~ COMMAND ${MSGMERGE} -U ${POFILE} ${CMAKE_CURRENT_SOURCE_DIR}/po/strusCms.pot
+ #~ COMMAND ${MSGMERGE} -U ${POFILE} ${CMAKE_CURRENT_SOURCE_DIR}/po/aCms.pot
#~ DEPENDS ${POT_TEMPLATE}
#~ )
#~ add_dependencies(update-po update-po-${LOCALE})
@@ -124,25 +124,25 @@ target_link_libraries(strusCms ${BOOSTER} ${CPPCMS} ${CPPDB} captcha b64 quickma
#~
#~ add_custom_target(create-po ALL DEPENDS ${MO_FILES})
#~
-#~ install(TARGETS strusCms view
+#~ install(TARGETS aCms view
#~ RUNTIME DESTINATION bin
- #~ LIBRARY DESTINATION lib/strus
- #~ ARCHIVE DESTINATION lib/strus)
+ #~ LIBRARY DESTINATION lib/aCms
+ #~ ARCHIVE DESTINATION lib/aCms)
#~
#~ foreach(STYLE style style-ltr style-rtl)
- #~ install(FILES media/${STYLE}.css DESTINATION share/strusCms/media)
+ #~ install(FILES media/${STYLE}.css DESTINATION share/aCms/media)
#~ endforeach()
#~
#~ foreach(SQL sqlite3 postgresql)
- #~ install(FILES sql/${SQL}.sql DESTINATION share/strusCms/sql)
+ #~ install(FILES sql/${SQL}.sql DESTINATION share/aCms/sql)
#~ endforeach()
#~
#~ foreach(LOCALE ${LOCALES})
- #~ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/locale/${LOCALE}/LC_MESSAGES/strusCms.mo
+ #~ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/locale/${LOCALE}/LC_MESSAGES/aCms.mo
#~ DESTINATION share/locale/${LOCALE}/LC_MESSAGES/)
#~ endforeach()
#~
-#~ install(FILES sample_config.js DESTINATION share/strusCms)
+#~ install(FILES sample_config.js DESTINATION share/aCms)
if(UNIX)
ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution)
@@ -170,7 +170,7 @@ endif()
ADD_CUSTOM_TARGET(run @echo runs the web server)
ADD_CUSTOM_COMMAND(
COMMENT "run"
- COMMAND strusCms
+ COMMAND aCms
ARGS -c ./config.js
TARGET run
)
diff --git a/COPYING b/COPYING
index 2ac2a50..94a0453 100644
--- a/COPYING
+++ b/COPYING
@@ -619,56 +619,3 @@ Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- Library implementing the storage and the query evaluation of the strus IR engine
- Copyright (C) 2015 Patrick Frey <patrickpfrey@yahoo.com>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- strus Copyright (C) 2015 Patrick Frey <patrickpfrey@yahoo.com>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/config.js b/config.js
index df53d7c..2eadab3 100644
--- a/config.js
+++ b/config.js
@@ -1,14 +1,14 @@
{
- "strusCms" : {
- "script" : "/strusCms",
+ "aCms" : {
+ "script" : "/aCms",
"media" : "/media",
- "db_connection" : "sqlite3:db=./storage/db/strusCms.db;@pool_size=16",
+ "db_connection" : "sqlite3:db=./storage/db/aCms.db;@pool_size=16",
"mail" : {
- "server" : "smtp.andreasbaumann.cc",
+ "server" : "smtp.somedomain.xx",
"port" : 25,
- "username" : "struscms",
+ "username" : "user",
"password" : "xx",
- "from" : "no-reply@andreasbaumann.cc"
+ "from" : "no-reply@somedomain.xx"
}
},
@@ -18,7 +18,7 @@
"port" : 8080
},
"http" : {
- "script" : "/strusCms"
+ "script" : "/aCms"
},
"views" : {
"paths" : [ "." ],
diff --git a/media/images/logo_big.png b/media/images/logo_big.png
new file mode 100644
index 0000000..52fee74
--- /dev/null
+++ b/media/images/logo_big.png
Binary files differ
diff --git a/media/images/strus_big.jpg b/media/images/strus_big.jpg
deleted file mode 100644
index 70c0776..0000000
--- a/media/images/strus_big.jpg
+++ /dev/null
Binary files differ
diff --git a/sample_config.js b/sample_config.js
index 70157a4..91af9da 100644
--- a/sample_config.js
+++ b/sample_config.js
@@ -1,9 +1,44 @@
{
- "strusCms" : {
+ "aCms" : {
+ "script" : "/aCms",
+ "media" : "/media",
+ "db_connection" : "sqlite3:db=./storage/db/aCms.db;@pool_size=16",
+ "mail" : {
+ "server" : "smtp.somedomain.xx",
+ "port" : 25,
+ "username" : "user",
+ "password" : "xx",
+ "from" : "no-reply@somedomain.xx"
+ }
},
"service" : {
"api" : "http",
+ "ip" : "0.0.0.0",
"port" : 8080
+ },
+
+ "http" : {
+ "script" : "/aCms"
+ },
+
+ "views" : {
+ "paths" : [ "." ],
+ "skins" : [ "view" ]
+ },
+
+ "security" : {
+ "csrf" : {
+ "enable" : true
+ }
+ },
+
+ "session" : {
+ "expire" : "browser",
+ "location" : "client",
+ "client" : {
+ "hmac" : "sha1",
+ "hmac_key" : "859cf809f3d163e7e497cc1a29d2f45bcc040d97"
+ }
}
}
diff --git a/src/strusCms.cpp b/src/aCms.cpp
index 9d7945b..52f533d 100644
--- a/src/strusCms.cpp
+++ b/src/aCms.cpp
@@ -1,4 +1,4 @@
-#include "strusCms.hpp"
+#include "aCms.hpp"
#include <cppcms/url_mapper.h>
#include <cppcms/http_response.h>
@@ -20,23 +20,23 @@ void setup_dbconnection( cppdb::session &sql )
namespace apps {
-strusCms::strusCms( cppcms::service &srv )
+aCms::aCms( 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" )
+ 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>( "strusCms.script" );
- media = settings( ).get<std::string>( "strusCms.media" );
+ script = settings( ).get<std::string>( "aCms.script" );
+ media = settings( ).get<std::string>( "aCms.media" );
cppdb::session sql( conn );
sql.once( setup_dbconnection );
@@ -51,7 +51,7 @@ strusCms::strusCms( cppcms::service &srv )
mapper( ).root( root( ) );
}
-std::string strusCms::root( std::string l )
+std::string aCms::root( std::string l )
{
return script;
// TODO: localization later
@@ -59,7 +59,7 @@ std::string strusCms::root( std::string l )
//~ return script + "/" + l;
}
-std::string strusCms::media_root( std::string l )
+std::string aCms::media_root( std::string l )
{
return media;
// TODO: localization later
diff --git a/src/strusCms.hpp b/src/aCms.hpp
index 83d4c8c..f50253c 100644
--- a/src/strusCms.hpp
+++ b/src/aCms.hpp
@@ -1,5 +1,5 @@
-#ifndef STRUS_CMS_HPP
-#define STRUS_CMS_HPP
+#ifndef ACMS_HPP
+#define ACMS_HPP
#include <cppcms/application.h>
@@ -10,9 +10,9 @@
namespace apps {
-class strusCms : public cppcms::application {
+class aCms : public cppcms::application {
public:
- strusCms( cppcms::service &srv );
+ aCms( cppcms::service &srv );
std::string root( std::string locale_name = "" );
std::string media_root( std::string locale_name = "" );
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/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 );
};
}
diff --git a/templates/logout.tmpl b/templates/logout.tmpl
index c867e73..df1302d 100644
--- a/templates/logout.tmpl
+++ b/templates/logout.tmpl
@@ -8,11 +8,11 @@
<% template page_content() %>
<div>
- You have been logged out of the system. Thanks for using strus CMS.
+ You have been logged out of the system. Thanks for using aCMS.
</div>
<div>
- If you found bugs, report them in Github.
+ If you found bugs, report them on Github.
</div>
<div>
diff --git a/templates/master.tmpl b/templates/master.tmpl
index e54a5e1..e875a6c 100644
--- a/templates/master.tmpl
+++ b/templates/master.tmpl
@@ -16,12 +16,12 @@
<div id="wrap">
<div id="sidebar">
- <img src="/media/images/strus_big.jpg" width="280" height="280" alt="Strus logo" /></a>
- <h1><a href="<%= root() %>">Strus CMS</a></h1>
+ <img src="/media/images/logo_big.png" width="280" height="280" alt="aCms logo" /></a>
+ <h1><a href="<%= root() %>">aCMS</a></h1>
<p class="slogan">A simple demo CMS showing the power of the following software:</p>
<ul>
- <li><a href="http://project-strus.net">Strus</a><br/>a collection of C++ libraries for building a full-text search engine</li>
<li><a href="http://cppcms.com/wikipp/en/page/main">CppCMS</a><br/>a C++ web programming framework</li>
+ <li><a href="http://project-strus.net">Strus</a><br/>a collection of C++ libraries for building a full-text search engine</li>
<li><a href="http://brokestream.com/captcha.html"</li>libcaptcha</a><br/>a C standalone Captcha generator</li>
<li><a href="http://libb64.sourceforge.net/"</li>libb64</a><br/>a C++ BASE64 encoder/decoder library</li>
<li><a href="http://sourceforge.net/projects/libquickmail/">libquickmail</a><br/>a C++ library to send emails</li>