Fixes for image generation

[shipsimu.git] / application / blog / config.php

diff --git a/application/blog/config.php b/application/blog/config.php
index cf43842047dd2de3463ed71fe7b4473c57829b60..f06094d50d4d7f8c46ed6a789dac134e63da7f90 100644 (file)
--- a/application/blog/config.php
+++ b/application/blog/config.php
@@ -25,6 +25,9 @@
 // Get a configuration instance for shorter lines
 $cfg = FrameworkConfiguration::getInstance();
 
+// CFG: HEADER-CHARSET
+$cfg->setConfigEntry('header_charset', "utf-8");
+
 // CFG: DEFAULT-WEB-COMMAND
 $cfg->setConfigEntry('default_web_command', "home");
 
@@ -95,28 +98,28 @@ $cfg->setConfigEntry('login_helper_class', "ShipSimuLoginHelper");
 $cfg->setConfigEntry('auth_method_class', "CookieAuth");
 
 // CFG: APP-LOGIN-URL
-$cfg->setConfigEntry('app_login_url', "index.php?app=blog&page=login_area");
+$cfg->setConfigEntry('app_login_url', "index.php?app={?app_short_name?}&page=login_area");
 
 // CFG: LOGIN-FAILED-URL
-$cfg->setConfigEntry('login_failed_url', "index.php?app=blog&page=login_failed");
+$cfg->setConfigEntry('login_failed_url', "index.php?app={?app_short_name?}&page=login_failed");
 
 // CFG: LOGOUT-DONE-URL
-$cfg->setConfigEntry('logout_done_url', "index.php?app=blog&page=logout_done");
+$cfg->setConfigEntry('logout_done_url', "index.php?app={?app_short_name?}&page=logout_done");
 
 // CFG: LOGIN-USER-STATUS-URL
-$cfg->setConfigEntry('login_user_status_url', "index.php?app=blog&page=login_area&action=status_problem");
+$cfg->setConfigEntry('login_user_status_url', "index.php?app={?app_short_name?}&page=login_area&action=status_problem");
 
 // CFG: USER-NOT-UNCONFIRMED-URL
-$cfg->setConfigEntry('user_not_unconfirmed_url', "index.php?app=blog&page=status&status=unconfirmed_problem");
+$cfg->setConfigEntry('user_not_unconfirmed_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_problem");
 
 // CFG: USER-UNCONFIRMED-EMAIL-MISSING-URL
-$cfg->setConfigEntry('user_unconfirmed_email_missing_url', "index.php?app=blog&page=status&status=unconfirmed_email_missing");
+$cfg->setConfigEntry('user_unconfirmed_email_missing_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_email_missing");
 
 // CFG: CONFIRM-CODE-INVALID-URL
-$cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app=blog&page=status&status=confirm_code_invalid");
+$cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app={?app_short_name?}&page=status&status=confirm_code_invalid");
 
 // CFG: USER-NOT-FOUND-URL
-$cfg->setConfigEntry('user_not_found_url', "index.php?app=ship-simu&page=status&status=user_not_found");
+$cfg->setConfigEntry('user_not_found_url', "index.php?app={?app_short_name?}&page=status&status=user_not_found");
 
 // CFG: LOGIN-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', "welcome");
@@ -205,9 +208,6 @@ $cfg->setConfigEntry('blog_user_login_captcha', "GraphicalCodeCaptcha");
 // CFG: blog-GUEST-LOGIN-CAPTCHA
 $cfg->setConfigEntry('blog_guest_login_captcha', "GraphicalCodeCaptcha");
 
-// CFG: LOGOUT-IMMEDIATE
-$cfg->setConfigEntry('logout_immediate', "N");
-
 // CFG: CAPTCHA-STRING-LENGTH
 $cfg->setConfigEntry('captcha_string_length', 5);