Updated obsolete message with expected timestamp.
Removed a few obsolete calls or implicit conversions.
This commit is contained in:
@@ -104,7 +104,7 @@ feature -- Access
|
|||||||
do
|
do
|
||||||
if not retried then
|
if not retried then
|
||||||
if attached text_item ("mailer.smtp") as l_smtp then
|
if attached text_item ("mailer.smtp") as l_smtp then
|
||||||
create {NOTIFICATION_SMTP_MAILER} l_mailer.make (l_smtp)
|
create {NOTIFICATION_SMTP_MAILER} l_mailer.make (l_smtp.as_string_8_conversion)
|
||||||
elseif attached text_item ("mailer.sendmail") as l_sendmail then
|
elseif attached text_item ("mailer.sendmail") as l_sendmail then
|
||||||
create {NOTIFICATION_SENDMAIL_MAILER} l_mailer.make_with_location (l_sendmail)
|
create {NOTIFICATION_SENDMAIL_MAILER} l_mailer.make_with_location (l_sendmail)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ feature {NONE} -- Initialization
|
|||||||
local
|
local
|
||||||
l_url: like site_url
|
l_url: like site_url
|
||||||
s, l_email: detachable READABLE_STRING_8
|
s, l_email: detachable READABLE_STRING_8
|
||||||
|
utf: UTF_CONVERTER
|
||||||
do
|
do
|
||||||
site_location := environment.path
|
site_location := environment.path
|
||||||
|
|
||||||
@@ -49,7 +50,7 @@ feature {NONE} -- Initialization
|
|||||||
l_email := string_8_item_or_default ("mailer.from", "webmaster")
|
l_email := string_8_item_or_default ("mailer.from", "webmaster")
|
||||||
end
|
end
|
||||||
if l_email.has ('<') then
|
if l_email.has ('<') then
|
||||||
l_email := site_name + " <" + l_email + ">"
|
l_email := utf.string_32_to_utf_8_string_8 (site_name) + " <" + l_email + ">"
|
||||||
end
|
end
|
||||||
site_email := l_email
|
site_email := l_email
|
||||||
|
|
||||||
@@ -125,7 +126,7 @@ feature -- Access
|
|||||||
|
|
||||||
layout: CMS_ENVIRONMENT
|
layout: CMS_ENVIRONMENT
|
||||||
-- CMS environment.
|
-- CMS environment.
|
||||||
obsolete "use `environment' [april-2015]"
|
obsolete "use `environment' [2017-05-31]"
|
||||||
do
|
do
|
||||||
Result := environment
|
Result := environment
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ feature {NONE} -- Factory: obsolete
|
|||||||
template_block (a_module: CMS_MODULE; a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE): detachable CMS_SMARTY_TEMPLATE_BLOCK
|
template_block (a_module: CMS_MODULE; a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE): detachable CMS_SMARTY_TEMPLATE_BLOCK
|
||||||
-- Smarty content block for `a_block_id' in the context of `a_module' and `a_response'.
|
-- Smarty content block for `a_block_id' in the context of `a_module' and `a_response'.
|
||||||
obsolete
|
obsolete
|
||||||
"Use smarty_template_block [Feb/2016]"
|
"Use smarty_template_block [2017-05-31]"
|
||||||
do
|
do
|
||||||
Result := smarty_template_block (a_module, a_block_id, a_response.api)
|
Result := smarty_template_block (a_module, a_block_id, a_response.api)
|
||||||
end
|
end
|
||||||
@@ -54,12 +54,12 @@ feature {NONE} -- Factory: obsolete
|
|||||||
-- Smarty content block for `a_block_id' in the context of `a_module' and `a_response',
|
-- Smarty content block for `a_block_id' in the context of `a_module' and `a_response',
|
||||||
-- With additional `a_values'.
|
-- With additional `a_values'.
|
||||||
obsolete
|
obsolete
|
||||||
"Use smarty_template_block_with_values [Feb/2016]"
|
"Use smarty_template_block_with_values [2017-05-31]"
|
||||||
do
|
do
|
||||||
Result := smarty_template_block_with_values (a_module, a_block_id, a_response.api, a_values)
|
Result := smarty_template_block_with_values (a_module, a_block_id, a_response.api, a_values)
|
||||||
end
|
end
|
||||||
|
|
||||||
note
|
note
|
||||||
copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -143,13 +143,15 @@ feature -- Conversion
|
|||||||
feature -- Debug
|
feature -- Debug
|
||||||
|
|
||||||
out: STRING
|
out: STRING
|
||||||
|
local
|
||||||
|
utf: UTF_CONVERTER
|
||||||
do
|
do
|
||||||
create Result.make_from_string (generator)
|
create Result.make_from_string (generator)
|
||||||
Result.append ("%Nname:")
|
Result.append ("%Nname:")
|
||||||
Result.append (name)
|
Result.append (name)
|
||||||
if attached title as l_title then
|
if attached title as l_title then
|
||||||
Result.append ("%N%Ttitle:")
|
Result.append ("%N%Ttitle:")
|
||||||
Result.append (l_title)
|
Result.append (utf.string_32_to_utf_8_string_8 (l_title))
|
||||||
end
|
end
|
||||||
Result.append ("%Nlocation:")
|
Result.append ("%Nlocation:")
|
||||||
Result.append (location.out)
|
Result.append (location.out)
|
||||||
@@ -160,6 +162,6 @@ feature -- Debug
|
|||||||
Result.append ("%N")
|
Result.append ("%N")
|
||||||
end
|
end
|
||||||
note
|
note
|
||||||
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -161,13 +161,15 @@ feature -- Conversion
|
|||||||
feature -- Debug
|
feature -- Debug
|
||||||
|
|
||||||
out: STRING
|
out: STRING
|
||||||
|
local
|
||||||
|
utf: UTF_CONVERTER
|
||||||
do
|
do
|
||||||
create Result.make_from_string (generator)
|
create Result.make_from_string (generator)
|
||||||
Result.append ("%Nname:")
|
Result.append ("%Nname:")
|
||||||
Result.append (name)
|
Result.append (name)
|
||||||
if attached title as l_title then
|
if attached title as l_title then
|
||||||
Result.append ("%N%Ttitle:")
|
Result.append ("%N%Ttitle:")
|
||||||
Result.append (l_title)
|
Result.append (utf.string_32_to_utf_8_string_8 (l_title))
|
||||||
end
|
end
|
||||||
Result.append ("%Nlocation:")
|
Result.append ("%Nlocation:")
|
||||||
Result.append (location.out)
|
Result.append (location.out)
|
||||||
@@ -190,6 +192,6 @@ feature -- Debug
|
|||||||
Result.append ("%N}")
|
Result.append ("%N}")
|
||||||
end
|
end
|
||||||
note
|
note
|
||||||
copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ feature -- Access
|
|||||||
|
|
||||||
main_menu: CMS_MENU
|
main_menu: CMS_MENU
|
||||||
obsolete
|
obsolete
|
||||||
"Use `primary_menu' [Nov/2014]"
|
"Use `primary_menu' [2017-05-31]"
|
||||||
do
|
do
|
||||||
Result := primary_menu
|
Result := primary_menu
|
||||||
end
|
end
|
||||||
@@ -101,4 +101,7 @@ feature {NONE} -- Implementation
|
|||||||
|
|
||||||
items: STRING_TABLE [CMS_MENU]
|
items: STRING_TABLE [CMS_MENU]
|
||||||
|
|
||||||
|
;note
|
||||||
|
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||||
|
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -280,7 +280,7 @@ feature {CMS_API_ACCESS} -- CMS Formats management
|
|||||||
if not s.is_empty then
|
if not s.is_empty then
|
||||||
s.append ("+")
|
s.append ("+")
|
||||||
end
|
end
|
||||||
s.append (f_ic.item.name)
|
s.append_string_general (f_ic.item.name)
|
||||||
end
|
end
|
||||||
ji.put_string (s, "filters")
|
ji.put_string (s, "filters")
|
||||||
|
|
||||||
@@ -293,7 +293,7 @@ feature {CMS_API_ACCESS} -- CMS Formats management
|
|||||||
if not s.is_empty then
|
if not s.is_empty then
|
||||||
s.append ("+")
|
s.append ("+")
|
||||||
end
|
end
|
||||||
s.append (ct.name)
|
s.append_string_general (ct.name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
ji.put_string (s, "types")
|
ji.put_string (s, "types")
|
||||||
@@ -1172,7 +1172,7 @@ feature -- Theming path helpers
|
|||||||
do
|
do
|
||||||
Result := setup.theme_location_for (a_theme_name)
|
Result := setup.theme_location_for (a_theme_name)
|
||||||
end
|
end
|
||||||
|
|
||||||
theme_path_for (a_theme_name: READABLE_STRING_GENERAL): STRING_8
|
theme_path_for (a_theme_name: READABLE_STRING_GENERAL): STRING_8
|
||||||
-- URL path to the theme `a_theme_name`.
|
-- URL path to the theme `a_theme_name`.
|
||||||
do
|
do
|
||||||
|
|||||||
@@ -399,7 +399,7 @@ feature -- Menu
|
|||||||
|
|
||||||
main_menu: CMS_MENU
|
main_menu: CMS_MENU
|
||||||
obsolete
|
obsolete
|
||||||
"Use `primary_menu' [Nov/2014]"
|
"Use `primary_menu' [2017-05-31]"
|
||||||
do
|
do
|
||||||
Result := primary_menu
|
Result := primary_menu
|
||||||
end
|
end
|
||||||
@@ -460,7 +460,7 @@ feature -- Blocks initialization
|
|||||||
block_region_preference (a_block_id: READABLE_STRING_8; a_default_region: READABLE_STRING_8): READABLE_STRING_8
|
block_region_preference (a_block_id: READABLE_STRING_8; a_default_region: READABLE_STRING_8): READABLE_STRING_8
|
||||||
-- Region associated with `a_block_id' in configuration, if any.
|
-- Region associated with `a_block_id' in configuration, if any.
|
||||||
do
|
do
|
||||||
Result := setup.text_item_or_default ("blocks." + a_block_id + ".region", a_default_region)
|
Result := setup.text_item_or_default ("blocks." + a_block_id + ".region", a_default_region).as_string_8_conversion
|
||||||
end
|
end
|
||||||
|
|
||||||
feature -- Block management
|
feature -- Block management
|
||||||
@@ -909,7 +909,7 @@ feature -- Hooks
|
|||||||
hooks: CMS_HOOK_CORE_MANAGER
|
hooks: CMS_HOOK_CORE_MANAGER
|
||||||
-- Manager handling hook subscriptions.
|
-- Manager handling hook subscriptions.
|
||||||
obsolete
|
obsolete
|
||||||
"Use api.hooks [dec/2015]"
|
"Use api.hooks [2017-05-31]"
|
||||||
do
|
do
|
||||||
Result := api.hooks
|
Result := api.hooks
|
||||||
end
|
end
|
||||||
@@ -918,7 +918,7 @@ feature -- Menu: change
|
|||||||
|
|
||||||
add_to_main_menu (lnk: CMS_LINK)
|
add_to_main_menu (lnk: CMS_LINK)
|
||||||
obsolete
|
obsolete
|
||||||
"use add_to_primary_menu [Nov/2014]"
|
"use add_to_primary_menu [2017-05-31]"
|
||||||
do
|
do
|
||||||
add_to_primary_menu (lnk)
|
add_to_primary_menu (lnk)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -94,11 +94,11 @@ feature -- Conversion
|
|||||||
l_table_inspector: detachable STRING_TABLE_OF_STRING_INSPECTOR
|
l_table_inspector: detachable STRING_TABLE_OF_STRING_INSPECTOR
|
||||||
do
|
do
|
||||||
prepare (page)
|
prepare (page)
|
||||||
create l_page_inspector.register (page.generating_type)
|
create l_page_inspector.register (page.generating_type.name)
|
||||||
|
|
||||||
if attached {CMS_RESPONSE} page.variables.item ("cms") as l_cms then
|
if attached {CMS_RESPONSE} page.variables.item ("cms") as l_cms then
|
||||||
if attached l_cms.regions as l_regions then
|
if attached l_cms.regions as l_regions then
|
||||||
create l_regions_inspector.register (l_regions.generating_type)
|
create l_regions_inspector.register (l_regions.generating_type.name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user