Updated CMS support for unicode.

This commit is contained in:
2013-06-12 18:22:56 +02:00
parent 110a95b786
commit f3f5384d9b
11 changed files with 142 additions and 161 deletions

View File

@@ -13,6 +13,11 @@ inherit
CMS_HOOK_AUTO_REGISTER
SHARED_EXECUTION_ENVIRONMENT
export
{NONE} all
end
create
make
@@ -68,22 +73,22 @@ feature -- Handler
if attached cms.configuration as cfg and then attached cfg.configuration_location as l_loc then
s.append ("<hr/>")
append_info_to ("Configuration file", l_loc, e, s)
append_info_to ("Configuration file", l_loc.name, e, s)
end
s.append ("<hr/>")
append_info_to ("Current dir", (create {EXECUTION_ENVIRONMENT}).current_working_directory, e, s)
append_info_to ("Current dir", execution_environment.current_working_path.utf_8_name, e, s)
append_info_to ("Base url", cms.base_url, e, s)
append_info_to ("Script url", cms.script_url, e, s)
s.append ("<hr/>")
append_info_to ("Dir", cms.site_dir, e, s)
append_info_to ("Var dir", cms.site_var_dir, e, s)
append_info_to ("Dir", cms.site_dir.utf_8_name, e, s)
append_info_to ("Var dir", cms.site_var_dir.utf_8_name, e, s)
s.append ("<hr/>")
append_info_to ("Theme", cms.theme_name, e, s)
append_info_to ("Theme location", cms.theme_resource_location, e, s)
append_info_to ("Theme location", cms.theme_resource_location.utf_8_name, e, s)
s.append ("<hr/>")
append_info_to ("Files location", cms.files_location, e, s)
append_info_to ("Files location", cms.files_location.utf_8_name, e, s)
s.append ("<hr/>")
append_info_to ("Url", e.url ("/", Void), e, s)

View File

@@ -75,7 +75,7 @@ feature -- Execution
password_form_submit (fd: WSF_FORM_DATA; b: STRING)
local
e: detachable NOTIFICATION_EMAIL
e: detachable CMS_EMAIL
l_uuid: UUID
do
debug
@@ -144,7 +144,7 @@ feature -- Execution
Result := f
end
new_password_email (u: CMS_USER; a_mail_address: STRING; a_extra: READABLE_STRING_8): NOTIFICATION_EMAIL
new_password_email (u: CMS_USER; a_mail_address: STRING; a_extra: READABLE_STRING_8): CMS_EMAIL
local
b: STRING
opts: CMS_URL_API_OPTIONS

View File

@@ -73,7 +73,7 @@ feature -- Execution
b: STRING
u: detachable CMS_USER
up: detachable CMS_USER_PROFILE
e: detachable NOTIFICATION_EMAIL
e: detachable CMS_EMAIL
l_pass: detachable READABLE_STRING_32
l_uuid: UUID
do
@@ -174,7 +174,7 @@ feature -- Execution
Result := f
end
new_registration_email (a_mail_address: STRING; u: CMS_USER; a_password: detachable like {CMS_USER}.password; a_extra: READABLE_STRING_8): NOTIFICATION_EMAIL
new_registration_email (a_mail_address: STRING; u: CMS_USER; a_password: detachable like {CMS_USER}.password; a_extra: READABLE_STRING_8): CMS_EMAIL
require
has_clear_password: u.password /= Void or else a_password /= Void
local
@@ -202,7 +202,7 @@ feature -- Execution
create Result.make (service.site_email, a_mail_address, "Account details for " + u.name + " at " + service.site_name, b)
end
new_user_account_email (a_mail_address: STRING; u: CMS_USER): NOTIFICATION_EMAIL
new_user_account_email (a_mail_address: STRING; u: CMS_USER): CMS_EMAIL
local
b: STRING
opts: CMS_URL_API_OPTIONS