diff --git a/www/configs/config.inc b/www/configs/config.inc index 5bbe67d9..397bfb8f 100644 --- a/www/configs/config.inc +++ b/www/configs/config.inc @@ -9,9 +9,9 @@ /************* SESSION NAMES *************/ // backend - DEFINE('EDIT_SESSION_NAME', "ADMIN_SESSION_NAME"); + DEFINE('EDIT_SESSION_NAME', ""); // frontend - DEFINE('SESSION_NAME', "SESSION_NAME"); + DEFINE('SESSION_NAME', ""); /************* LANGUAGE / ENCODING *******/ DEFINE('DEFAULT_LANG', "en_utf8"); @@ -34,7 +34,7 @@ DEFINE('ROOT', getcwd()."/"); // libs path DEFINE('LIBS', "libs/"); - // includes (strings, arrays for stati, etc) + // includes (strings, arrays for static, etc) DEFINE('INCLUDES', "includes/"); // layout base path DEFINE('LAYOUT', 'layout/'); @@ -85,7 +85,7 @@ /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/ // default hash type - DEFINE('DEFAULT_HASH', 'sha1'); + DEFINE('DEFAULT_HASH', 'sha256'); // default acl level DEFINE('DEFAULT_ACL_LEVEL', 80); // default levels for certain actions @@ -106,7 +106,7 @@ // DEFINE('ERROR_STRICT', 3); // allow page caching in general, set to "FALSE" if you do debugging or development! // DEFINE('ALLOW_SMARTY_CACHE', FALSE); - // cache life time, in second', default here is 2 days (172800s) + // cache life time, in seconds, default here is 2 days (172800s) // -1 is never expire cache // DEFINE('SMARTY_CACHE_LIFETIME', -1); @@ -151,7 +151,7 @@ "db_pass" => "", "db_host" => "", "db_port" => "5432", - "db_schema" => "public", + "db_schema" => "public", // if not set, uses public "db_type" => "pgsql", "db_encoding" => '', "db_ssl" => 'disable' // allow, disable, require, prefer @@ -204,7 +204,7 @@ // DEFINE('TEST_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']); // DEFINE('PUBLIC_SCHEMA', $DB_CONFIG[TARGET_DB]['db_schema']); DEFINE('LOGIN_DB_SCHEMA', 'public'); // where the edit* tables are - DEFINE('GLOBAL_DB_SCHEMA', 'public'); // where global tables are that are used by all schemas (eg queue tables for online', etc) + DEFINE('GLOBAL_DB_SCHEMA', 'public'); // where global tables are that are used by all schemas (eg queue tables for online, etc) DEFINE('TARGET', $LOCATION[$HOST_NAME]); // DEFINE('CSV_PATH', $PATHS[TARGET]['csv_path']); // DEFINE('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']); diff --git a/www/configs/config.template.inc b/www/configs/config.template.inc index f2b6db00..424014b4 100644 --- a/www/configs/config.template.inc +++ b/www/configs/config.template.inc @@ -30,11 +30,11 @@ DEFINE('TABLEARRAYDIR', DIR.'table_arrays/'); // ** OLD DIR DECLARATIONS ** - // path to document root + // path to document root of file called DEFINE('ROOT', getcwd()."/"); // libs path DEFINE('LIBS', "libs/"); - // includes (strings', arrays for stati, etc) + // includes (strings, arrays for static, etc) DEFINE('INCLUDES', "includes/"); // layout base path DEFINE('LAYOUT', 'layout/'); @@ -85,7 +85,7 @@ /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/ // default hash type - DEFINE('DEFAULT_HASH', 'ripemd160'); + DEFINE('DEFAULT_HASH', 'sha256'); // default acl level DEFINE('DEFAULT_ACL_LEVEL', 80); // default levels for certain actions @@ -97,7 +97,7 @@ DEFINE('DEFAULT_ACL_DEL', 80); DEFINE('DEFAULT_ACL_ADMIN', 100); */ // SSL host name -// DEFINE('SSL_HOST', "www4.adidas.co.jp"); +// DEFINE('SSL_HOST', "ssl.host.name"); // error page strictness, Default is 3 // 1: only show error page as the last mesure if really no mid & aid can be loaded and found at all // 2: if template not found, do not search, show error template @@ -135,6 +135,12 @@ // live_queue is a global queue system // DEFINE('QUEUE', 'live_queue'); + /************* DB PATHS (PostgreSQL) *****************/ + // schema names, can also be defined per + DEFINE('PUBLIC_SCHEMA', 'public'); + DEFINE('DEV_SCHEMA', 'public'); + DEFINE('TEST_SCHEMA', 'public'); + // non constant part /************* DB ACCESS *****************/ // please be VERY carefull only to change the right side @@ -145,8 +151,9 @@ "db_pass" => "", "db_host" => "", "db_port" => "5432", - "db_schema" => "", + "db_schema" => "", // if not set, uses public "db_type" => "pgsql", + "db_encoding" => '', "db_ssl" => 'disable' // allow, disable, require, prefer ) ); @@ -166,15 +173,11 @@ // $DB_URL_REDIRECT_HOST[''] = ""; // location flagging // test/dev/live - $LOCATION[''] = 'test'; + $LOCATION[''] = ''; // show DEBUG override // true/false $DEBUG_FLAG[''] = true; - // schema names, can also be defined per - DEFINE('PUBLIC_SCHEMA', 'public'); - DEFINE('DEV_SCHEMA', 'public'); - DEFINE('TEST_SCHEMA', 'public'); - // and set to domain + // set postgresql paths (schemas) $DB_PATH[''] = PUBLIC_SCHEMA; // set the USE_DATABASE var, if there is nothing set, we assume TRUE @@ -207,6 +210,7 @@ // DEFINE('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']); // DEFINE('REDIRECT_URL', $PATHS[TARGET]['redirect_url']); DEFINE('DEBUG', $DEBUG_FLAG[$HOST_NAME]); + DEFINE('SHOW_ALL_ERRORS', false); // show all errors if debug_all & show_error_handling are enabled /************* GENERAL PAGE TITLE ********/ $G_TITLE = ''; @@ -234,6 +238,16 @@ } } + // turn off debug if debug flag is OFF + if (DEBUG == false) + { + $ECHO_ALL = 0; + $DEBUG_ALL = 0; + $PRINT_ALL = 0; + $DB_DEBUG = 0; + $ENABLE_ERROR_HANDLING = 0; + } + // any other global definitons here // DEFINE('SOME_ID', );