added: parameter 'l' to 'ls' function
added: Db::ItemQuery struct for querying items changed: some refactoring (renamed some config variables) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@589 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
35
core/data.h
35
core/data.h
@@ -2,7 +2,7 @@
|
||||
* This file is a part of CMSLU -- Content Management System like Unix
|
||||
* and is not publicly distributed
|
||||
*
|
||||
* Copyright (c) 2008-2009, Tomasz Sowa
|
||||
* Copyright (c) 2008-2010, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
*/
|
||||
@@ -69,12 +69,6 @@ public:
|
||||
std::string db_user;
|
||||
std::string db_pass;
|
||||
|
||||
std::string base_server;
|
||||
std::string base_url_prefix;
|
||||
std::string base_url_static_prefix;
|
||||
std::string base_url_static_ext_prefix;
|
||||
std::string base_url_static_auth_prefix;
|
||||
|
||||
std::string http_session_id_name;
|
||||
|
||||
// when the HOST_HTTP environment variable doesn't point into 'base_url' (the part 'http://' and the last slash is removed)
|
||||
@@ -113,12 +107,12 @@ public:
|
||||
int post_file_max;
|
||||
|
||||
// directories for static files
|
||||
std::string static_simplefs_dir;
|
||||
std::string static_hashfs_dir;
|
||||
std::string auth_simplefs_dir;
|
||||
std::string auth_hashfs_dir;
|
||||
|
||||
// temporary directory for static content used by the upload function
|
||||
// should be on the same partition as static_simplefs_dir and static_hashfs_dir
|
||||
std::string static_tmp_dir;
|
||||
// should be on the same partition as auth_simplefs_dir and auth_hashfs_dir
|
||||
std::string auth_tmp_dir;
|
||||
|
||||
// default locale: en pl
|
||||
std::string locale_str;
|
||||
@@ -129,19 +123,20 @@ public:
|
||||
// directory with default locale files (those from winix)
|
||||
std::string locale_dir_default;
|
||||
|
||||
// below variables are based on the other config variables
|
||||
// the main address of the server (e.g. someserver.com) (without the 'www' part etc)
|
||||
std::string base_server;
|
||||
|
||||
// base_url_prefix + base_server
|
||||
// the main address of the site (e.g. http://www.someserver.com)
|
||||
std::string base_url;
|
||||
|
||||
// base_url_static_prefix + base_server
|
||||
// static content authorized by winix
|
||||
std::string base_url_auth;
|
||||
|
||||
// static content not authorized by winix
|
||||
std::string base_url_static;
|
||||
|
||||
// additional static server for common content such as ckeditor
|
||||
std::string base_url_static_ext;
|
||||
|
||||
// base_url_static_auth_prefix + base_server
|
||||
std::string base_url_static_auth;
|
||||
// additional static server for common content (not authorized)
|
||||
std::string base_url_common;
|
||||
|
||||
// separator used in <title> html tag
|
||||
std::string title_separator;
|
||||
@@ -166,7 +161,7 @@ public:
|
||||
// set by SetAdditionalVariables()
|
||||
// without the first part http:// (or https://) or the whole string is empty
|
||||
std::string base_url_http_host;
|
||||
std::string base_url_static_auth_http_host;
|
||||
std::string base_url_auth_http_host;
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user