From 88d86a973ca81ec7836cdfddc81f13e9df349331 Mon Sep 17 00:00:00 2001 From: flyskyko Date: Thu, 21 Jul 2011 11:01:46 +0000 Subject: [PATCH] change validator message git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8616 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/module/ModuleHandler.class.php | 62 +++++++++++-------- classes/module/ModuleObject.class.php | 7 +++ modules/comment/tpl/comment_list.html | 2 +- modules/comment/tpl/declared_list.html | 2 +- .../skins/default/add_friend.html | 2 +- .../skins/default/add_friend_group.html | 2 +- .../communication/skins/default/friends.html | 2 +- .../skins/default/send_message.html | 2 +- modules/communication/tpl/index.html | 2 +- modules/document/tpl/category_list.html | 2 +- modules/document/tpl/document_alias.html | 2 +- modules/editor/tpl/setup_component.html | 2 +- modules/file/tpl/file_config.html | 2 +- modules/file/tpl/file_list.html | 2 +- modules/install/tpl/admin_form.html | 2 +- modules/install/tpl/config_form.html | 2 +- modules/install/tpl/form.cubrid.html | 2 +- modules/install/tpl/form.firebird.html | 1 + modules/install/tpl/form.mssql.html | 1 + modules/install/tpl/form.mysql.html | 2 +- modules/install/tpl/form.mysql_innodb.html | 2 +- modules/install/tpl/form.mysqli.html | 2 +- modules/install/tpl/form.postgresql.html | 2 +- modules/install/tpl/form.sqlite2.html | 2 +- modules/install/tpl/form.sqlite3_pdo.html | 1 + modules/integration_search/tpl/index.html | 2 +- modules/integration_search/tpl/skin_info.html | 2 +- modules/layout/tpl/insert_layout.html | 2 +- modules/layout/tpl/layout_edit.html | 2 +- modules/layout/tpl/layout_modify.html | 2 +- modules/member/skins/default/leave_form.html | 2 +- modules/member/skins/default/login_form.html | 2 +- modules/member/skins/default/modify_info.html | 2 +- .../skins/default/resend_auth_mail.html | 2 +- modules/member/skins/default/signup_form.html | 2 +- modules/member/tpl/denied_id_list.html | 2 +- modules/member/tpl/group_list.html | 2 +- modules/member/tpl/group_update_form.html | 2 +- modules/member/tpl/insert_join_form.html | 2 +- modules/member/tpl/insert_member.html | 2 +- modules/member/tpl/manage_member_group.html | 2 +- modules/member/tpl/member_config.html | 2 +- modules/menu/tpl/menu_insert.html | 2 +- modules/menu/tpl/menu_management.html | 2 +- .../message/skins/default/system_message.html | 2 +- modules/message/tpl/config.html | 2 +- modules/module/tpl/category_list.html | 2 +- modules/module/tpl/category_update_form.html | 2 +- modules/module/tpl/copy_module.html | 2 +- modules/module/tpl/module_grant_setup.html | 2 +- modules/module/tpl/module_setup.html | 2 +- modules/page/tpl/page_delete.html | 2 +- modules/page/tpl/page_info.html | 2 +- modules/page/tpl/page_insert.html | 2 +- modules/point/tpl/config.html | 2 +- modules/point/tpl/member_list.html | 2 +- modules/point/tpl/module_config.html | 2 +- modules/poll/skins/default/form.html | 2 +- modules/poll/skins/simple/form.html | 2 +- modules/poll/tpl/config.html | 2 +- modules/poll/tpl/poll_list.html | 2 +- modules/rss/tpl/rss_admin_index.html | 2 +- modules/spamfilter/tpl/denied_ip_list.html | 2 +- modules/spamfilter/tpl/denied_word_list.html | 2 +- modules/spamfilter/tpl/index.html | 2 +- modules/syndication/tpl/config.html | 2 +- .../trackback/tpl/send_trackback_form.html | 2 +- modules/trackback/tpl/trackback_list.html | 2 +- modules/trash/tpl/trash_list.html | 2 +- 69 files changed, 109 insertions(+), 91 deletions(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index f6dc858af..148a0cf39 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -312,8 +312,9 @@ $oModule->setMessage($errorMsg); //for html redirect $this->error = $errorMsg; - $_SESSION['XE_VALIDATOR_ERROR'] = $this->error; - $_SESSION['XE_VALIDATOR_ERROR_RETURN_URL'] = $returnUrl; + $_SESSION['XE_VALIDATOR_ERROR'] = -1; + $_SESSION['XE_VALIDATOR_MESSAGE'] = $this->error; + $_SESSION['XE_VALIDATOR_RETURN_URL'] = $returnUrl; $this->_setInputValueToSession(); return $oModule; } @@ -336,39 +337,45 @@ $this->_setInputErrorToContext(); $procResult = $oModule->proc(); - //if(!$oModule->proc()) - if(!$procResult) - { - $this->error = $oModule->getMessage(); - // case post, redirect page - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) - { - $returnUrl = Context::get('error_return_url')?Context::get('error_return_url'):getUrl(); - $errorMsg = $oModule->getMessage() ? $oModule->getMessage() : 'module process error'; - $_SESSION['XE_VALIDATOR_ERROR'] = $errorMsg; - $_SESSION['XE_VALIDATOR_ERROR_RETURN_URL'] = $returnUrl; + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) + { + $error = $oModule->getError(); + $message = $oModule->getMessage(); + $redirectUrl = $oModule->getRedirectUrl(); + + if (!$procResult) + { + $this->error = $oModule->getMessage(); + if (!$redirectUrl) $redirectUrl = Context::get('error_return_url')?Context::get('error_return_url'):getUrl(); $this->_setInputValueToSession(); } - } - else - { - if(count($_SESSION['INPUT_ERROR'])) + else { - Context::set('INPUT_ERROR', $_SESSION['INPUT_ERROR']); - $_SESSION['INPUT_ERROR'] = ''; + if(count($_SESSION['INPUT_ERROR'])) + { + Context::set('INPUT_ERROR', $_SESSION['INPUT_ERROR']); + $_SESSION['INPUT_ERROR'] = ''; + } } + + $_SESSION['XE_VALIDATOR_ERROR'] = $error; + if ($message != 'success') $_SESSION['XE_VALIDATOR_MESSAGE'] = $message; + $_SESSION['XE_VALIDATOR_RETURN_URL'] = $redirectUrl; } + return $oModule; } function _setInputErrorToContext() { if($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR')) Context::set('XE_VALIDATOR_ERROR', $_SESSION['XE_VALIDATOR_ERROR']); - if($_SESSION['XE_VALIDATOR_ERROR_RETURN_URL'] && !Context::get('XE_VALIDATOR_ERROR_RETURN_URL')) Context::set('XE_VALIDATOR_ERROR_RETURN_URL', $_SESSION['XE_VALIDATOR_ERROR_RETURN_URL']); + if($_SESSION['XE_VALIDATOR_MESSAGE'] && !Context::get('XE_VALIDATOR_MESSAGE')) Context::set('XE_VALIDATOR_MESSAGE', $_SESSION['XE_VALIDATOR_MESSAGE']); + if($_SESSION['XE_VALIDATOR_RETURN_URL'] && !Context::get('XE_VALIDATOR_RETURN_URL')) Context::set('XE_VALIDATOR_RETURN_URL', $_SESSION['XE_VALIDATOR_RETURN_URL']); $_SESSION['XE_VALIDATOR_ERROR'] = ''; - $_SESSION['XE_VALIDATOR_ERROR_RETURN_URL'] = ''; + $_SESSION['XE_VALIDATOR_MESSAGE'] = ''; + $_SESSION['XE_VALIDATOR_RETURN_URL'] = ''; } function _setInputValueToSession() @@ -399,14 +406,15 @@ // Use message view object, if HTML call if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + + if($_SESSION['XE_VALIDATOR_RETURN_URL']) + { + header('location:'.$_SESSION['XE_VALIDATOR_RETURN_URL']); + return; + } + // If error occurred, handle it if($this->error) { - if($_SESSION['XE_VALIDATOR_ERROR'] && $_SESSION['XE_VALIDATOR_ERROR_RETURN_URL']) - { - header('location:'.$_SESSION['XE_VALIDATOR_ERROR_RETURN_URL']); - return; - } - // display content with message module instance $type = Mobile::isFromMobilePhone() ? 'mobile' : 'view'; $oMessageObject = &ModuleHandler::getModuleInstance('message',$type); diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index 7375a1ed5..3d96320e4 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -51,6 +51,13 @@ function setRedirectUrl($url='./') { $this->add('redirect_url', $url); } + + /** + * @brief get url for redirection + **/ + function getRedirectUrl(){ + return $this->get('redirect_url'); + } /** * @brief sett to set the template path for refresh.html diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html index c1feeacf4..d19900aec 100644 --- a/modules/comment/tpl/comment_list.html +++ b/modules/comment/tpl/comment_list.html @@ -21,7 +21,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/comment/tpl/declared_list.html b/modules/comment/tpl/declared_list.html index a9a9b6016..9f5454bd2 100644 --- a/modules/comment/tpl/declared_list.html +++ b/modules/comment/tpl/declared_list.html @@ -1,6 +1,6 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/communication/skins/default/add_friend.html b/modules/communication/skins/default/add_friend.html index ef2069b9f..71846a1a4 100644 --- a/modules/communication/skins/default/add_friend.html +++ b/modules/communication/skins/default/add_friend.html @@ -5,7 +5,7 @@

{$lang->cmd_add_friend}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/communication/skins/default/add_friend_group.html b/modules/communication/skins/default/add_friend_group.html index 8a82a87f0..ce6454ade 100644 --- a/modules/communication/skins/default/add_friend_group.html +++ b/modules/communication/skins/default/add_friend_group.html @@ -9,7 +9,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/communication/skins/default/friends.html b/modules/communication/skins/default/friends.html index 22e44b196..5f17d442c 100644 --- a/modules/communication/skins/default/friends.html +++ b/modules/communication/skins/default/friends.html @@ -7,7 +7,7 @@

{$member_title = $lang->cmd_view_friend } ({$total_count})

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/communication/skins/default/send_message.html b/modules/communication/skins/default/send_message.html index 10a041fe9..17dd46d56 100644 --- a/modules/communication/skins/default/send_message.html +++ b/modules/communication/skins/default/send_message.html @@ -4,7 +4,7 @@

{$lang->cmd_send_message}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html index 167c94b27..fe8e0458c 100644 --- a/modules/communication/tpl/index.html +++ b/modules/communication/tpl/index.html @@ -5,7 +5,7 @@
{nl2br($lang->about_communication)}
-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/document/tpl/category_list.html b/modules/document/tpl/category_list.html index a3157c073..3d5a90210 100644 --- a/modules/document/tpl/category_list.html +++ b/modules/document/tpl/category_list.html @@ -14,7 +14,7 @@ {$lang->cmd_remake_cache}
-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/document/tpl/document_alias.html b/modules/document/tpl/document_alias.html index d5a4df659..53bbe1e42 100644 --- a/modules/document/tpl/document_alias.html +++ b/modules/document/tpl/document_alias.html @@ -8,7 +8,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html index aa08816f6..e6afff725 100644 --- a/modules/editor/tpl/setup_component.html +++ b/modules/editor/tpl/setup_component.html @@ -6,7 +6,7 @@

{$lang->cmd_setup}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/file/tpl/file_config.html b/modules/file/tpl/file_config.html index 0b6e14d59..fc0ff61cf 100644 --- a/modules/file/tpl/file_config.html +++ b/modules/file/tpl/file_config.html @@ -1,7 +1,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index b643ac7a7..0d0103490 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -3,7 +3,7 @@
-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/install/tpl/admin_form.html b/modules/install/tpl/admin_form.html index 9bf69f9a6..90f314884 100644 --- a/modules/install/tpl/admin_form.html +++ b/modules/install/tpl/admin_form.html @@ -4,7 +4,7 @@
-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/install/tpl/config_form.html b/modules/install/tpl/config_form.html index 309c33e44..04fffd42f 100644 --- a/modules/install/tpl/config_form.html +++ b/modules/install/tpl/config_form.html @@ -4,7 +4,7 @@
    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html index 905f3fe7a..79a81e9a3 100644 --- a/modules/install/tpl/form.cubrid.html +++ b/modules/install/tpl/form.cubrid.html @@ -4,7 +4,7 @@
      -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.firebird.html b/modules/install/tpl/form.firebird.html index 7e2aa1558..e0437004a 100644 --- a/modules/install/tpl/form.firebird.html +++ b/modules/install/tpl/form.firebird.html @@ -4,6 +4,7 @@
      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.mssql.html b/modules/install/tpl/form.mssql.html index e79dcdd0c..b90695bec 100644 --- a/modules/install/tpl/form.mssql.html +++ b/modules/install/tpl/form.mssql.html @@ -4,6 +4,7 @@
      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html index fe0178a8f..32eff9fe3 100644 --- a/modules/install/tpl/form.mysql.html +++ b/modules/install/tpl/form.mysql.html @@ -4,7 +4,7 @@
      -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.mysql_innodb.html b/modules/install/tpl/form.mysql_innodb.html index fe0178a8f..32eff9fe3 100644 --- a/modules/install/tpl/form.mysql_innodb.html +++ b/modules/install/tpl/form.mysql_innodb.html @@ -4,7 +4,7 @@
      -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.mysqli.html b/modules/install/tpl/form.mysqli.html index fe0178a8f..32eff9fe3 100644 --- a/modules/install/tpl/form.mysqli.html +++ b/modules/install/tpl/form.mysqli.html @@ -4,7 +4,7 @@
      -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.postgresql.html b/modules/install/tpl/form.postgresql.html index f1d2391bc..ddb5bf920 100644 --- a/modules/install/tpl/form.postgresql.html +++ b/modules/install/tpl/form.postgresql.html @@ -4,7 +4,7 @@
      -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.sqlite2.html b/modules/install/tpl/form.sqlite2.html index a0e646fdf..c2fc91b6c 100644 --- a/modules/install/tpl/form.sqlite2.html +++ b/modules/install/tpl/form.sqlite2.html @@ -4,7 +4,7 @@
      -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/install/tpl/form.sqlite3_pdo.html b/modules/install/tpl/form.sqlite3_pdo.html index 97fd0cda6..c2fc91b6c 100644 --- a/modules/install/tpl/form.sqlite3_pdo.html +++ b/modules/install/tpl/form.sqlite3_pdo.html @@ -4,6 +4,7 @@
      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html index f20887a64..4955fc129 100644 --- a/modules/integration_search/tpl/index.html +++ b/modules/integration_search/tpl/index.html @@ -1,7 +1,7 @@ -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/integration_search/tpl/skin_info.html b/modules/integration_search/tpl/skin_info.html index e91423828..f73ffe8df 100644 --- a/modules/integration_search/tpl/skin_info.html +++ b/modules/integration_search/tpl/skin_info.html @@ -1,6 +1,6 @@ -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/layout/tpl/insert_layout.html b/modules/layout/tpl/insert_layout.html index 583305050..77a0fce15 100644 --- a/modules/layout/tpl/insert_layout.html +++ b/modules/layout/tpl/insert_layout.html @@ -1,6 +1,6 @@ -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html index f458f9f20..96c31b789 100644 --- a/modules/layout/tpl/layout_edit.html +++ b/modules/layout/tpl/layout_edit.html @@ -17,7 +17,7 @@

      {$lang->layout_image_repository}

      {nl2br($lang->about_layout_image_repository)}

      -

      {$XE_VALIDATOR_ERROR}

      +

      {$XE_VALIDATOR_MESSAGE}

      diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html index 78b434c85..5c9e44f03 100644 --- a/modules/layout/tpl/layout_modify.html +++ b/modules/layout/tpl/layout_modify.html @@ -10,7 +10,7 @@
    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/skins/default/leave_form.html b/modules/member/skins/default/leave_form.html index bdd878a00..0f8735d50 100644 --- a/modules/member/skins/default/leave_form.html +++ b/modules/member/skins/default/leave_form.html @@ -1,7 +1,7 @@

    {$member_title = $lang->msg_leave_member}

    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html index 2f14ed2e3..cca693620 100644 --- a/modules/member/skins/default/login_form.html +++ b/modules/member/skins/default/login_form.html @@ -7,7 +7,7 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    {$lang->cmd_login}
    diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html index b6fa83665..985c7c64a 100644 --- a/modules/member/skins/default/modify_info.html +++ b/modules/member/skins/default/modify_info.html @@ -24,7 +24,7 @@

    {$lang->msg_update_member}

    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    profile_image == 'Y' || $member_config->image_name=='Y' || $member_config->image_mark=='Y')-->enctype="multipart/form-data"> diff --git a/modules/member/skins/default/resend_auth_mail.html b/modules/member/skins/default/resend_auth_mail.html index 8bac3e057..b0d304106 100644 --- a/modules/member/skins/default/resend_auth_mail.html +++ b/modules/member/skins/default/resend_auth_mail.html @@ -2,7 +2,7 @@
    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    {$lang->cmd_resend_auth_mail}

    diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html index 2b243663e..f30cba7c6 100644 --- a/modules/member/skins/default/signup_form.html +++ b/modules/member/skins/default/signup_form.html @@ -8,7 +8,7 @@

    {$lang->cmd_signup}

    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/tpl/denied_id_list.html b/modules/member/tpl/denied_id_list.html index 719ec67fe..086d1d393 100644 --- a/modules/member/tpl/denied_id_list.html +++ b/modules/member/tpl/denied_id_list.html @@ -45,7 +45,7 @@
    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html index 9e3c3181e..5a2936ca0 100644 --- a/modules/member/tpl/group_list.html +++ b/modules/member/tpl/group_list.html @@ -61,7 +61,7 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/tpl/group_update_form.html b/modules/member/tpl/group_update_form.html index 2fddcf33b..95d80b541 100644 --- a/modules/member/tpl/group_update_form.html +++ b/modules/member/tpl/group_update_form.html @@ -3,7 +3,7 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html index 67897047b..fe02bb423 100644 --- a/modules/member/tpl/insert_join_form.html +++ b/modules/member/tpl/insert_join_form.html @@ -1,6 +1,6 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 127eb7588..47a0502ab 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -5,7 +5,7 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/tpl/manage_member_group.html b/modules/member/tpl/manage_member_group.html index b64877b90..afad7978a 100644 --- a/modules/member/tpl/manage_member_group.html +++ b/modules/member/tpl/manage_member_group.html @@ -4,7 +4,7 @@

    {$lang->cmd_member_group} ({$lang->target} : {count($member_list)})

    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html index 8e9875a86..a12d2d58c 100644 --- a/modules/member/tpl/member_config.html +++ b/modules/member/tpl/member_config.html @@ -2,7 +2,7 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/menu/tpl/menu_insert.html b/modules/menu/tpl/menu_insert.html index 64a1a1a18..7eafeb905 100644 --- a/modules/menu/tpl/menu_insert.html +++ b/modules/menu/tpl/menu_insert.html @@ -1,7 +1,7 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/menu/tpl/menu_management.html b/modules/menu/tpl/menu_management.html index 6f4e79201..a205d03b7 100644 --- a/modules/menu/tpl/menu_management.html +++ b/modules/menu/tpl/menu_management.html @@ -15,7 +15,7 @@
    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/message/skins/default/system_message.html b/modules/message/skins/default/system_message.html index d2c41f3ea..a62768868 100644 --- a/modules/message/skins/default/system_message.html +++ b/modules/message/skins/default/system_message.html @@ -1,6 +1,6 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    {$system_message}

    diff --git a/modules/message/tpl/config.html b/modules/message/tpl/config.html index c19690298..d1ba562f3 100644 --- a/modules/message/tpl/config.html +++ b/modules/message/tpl/config.html @@ -1,6 +1,6 @@

    {$lang->message} {$lang->cmd_management}

    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    {$lang->about_skin}

    diff --git a/modules/module/tpl/category_list.html b/modules/module/tpl/category_list.html index c16fe99c7..2d9772852 100644 --- a/modules/module/tpl/category_list.html +++ b/modules/module/tpl/category_list.html @@ -2,7 +2,7 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/module/tpl/category_update_form.html b/modules/module/tpl/category_update_form.html index 206e976c8..484ffe7b9 100644 --- a/modules/module/tpl/category_update_form.html +++ b/modules/module/tpl/category_update_form.html @@ -1,7 +1,7 @@ -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/module/tpl/copy_module.html b/modules/module/tpl/copy_module.html index a2bddcf4f..ca1d9987c 100644 --- a/modules/module/tpl/copy_module.html +++ b/modules/module/tpl/copy_module.html @@ -3,7 +3,7 @@

    {$lang->module_copy}

    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/module/tpl/module_grant_setup.html b/modules/module/tpl/module_grant_setup.html index d9b054116..9875d27e3 100644 --- a/modules/module/tpl/module_grant_setup.html +++ b/modules/module/tpl/module_grant_setup.html @@ -9,7 +9,7 @@

    {$lang->bundle_grant_setup}

    -

    {$XE_VALIDATOR_ERROR}

    +

    {$XE_VALIDATOR_MESSAGE}

    diff --git a/modules/module/tpl/module_setup.html b/modules/module/tpl/module_setup.html index a3dabcc2a..cd38125bc 100644 --- a/modules/module/tpl/module_setup.html +++ b/modules/module/tpl/module_setup.html @@ -4,7 +4,7 @@

    {$lang->bundle_setup}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html index 7bce13ca1..024a91ff7 100644 --- a/modules/page/tpl/page_delete.html +++ b/modules/page/tpl/page_delete.html @@ -1,7 +1,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html index 221919066..b927befae 100644 --- a/modules/page/tpl/page_info.html +++ b/modules/page/tpl/page_info.html @@ -1,6 +1,6 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index d63b55d30..730e6abad 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -1,7 +1,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html index 7f51adc2b..2016d6736 100644 --- a/modules/point/tpl/config.html +++ b/modules/point/tpl/config.html @@ -1,6 +1,6 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html index 65961eb03..21cc75062 100644 --- a/modules/point/tpl/member_list.html +++ b/modules/point/tpl/member_list.html @@ -2,7 +2,7 @@

{$lang->point_update_desc}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/point/tpl/module_config.html b/modules/point/tpl/module_config.html index 657a38e90..5d136184d 100644 --- a/modules/point/tpl/module_config.html +++ b/modules/point/tpl/module_config.html @@ -1,6 +1,6 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/poll/skins/default/form.html b/modules/poll/skins/default/form.html index 44e599275..7c8764f91 100644 --- a/modules/poll/skins/default/form.html +++ b/modules/poll/skins/default/form.html @@ -12,7 +12,7 @@
-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/poll/skins/simple/form.html b/modules/poll/skins/simple/form.html index 7cd2676e3..8b2d53567 100644 --- a/modules/poll/skins/simple/form.html +++ b/modules/poll/skins/simple/form.html @@ -12,7 +12,7 @@
-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/poll/tpl/config.html b/modules/poll/tpl/config.html index b343e922f..4ff962586 100644 --- a/modules/poll/tpl/config.html +++ b/modules/poll/tpl/config.html @@ -1,7 +1,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index 9c84811aa..3a9624432 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -2,7 +2,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html index 668b20806..b1efe3ebe 100644 --- a/modules/rss/tpl/rss_admin_index.html +++ b/modules/rss/tpl/rss_admin_index.html @@ -1,7 +1,7 @@

{$lang->total_feed} {$lang->cmd_management}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html index cf2a34cb7..0ad87a34f 100644 --- a/modules/spamfilter/tpl/denied_ip_list.html +++ b/modules/spamfilter/tpl/denied_ip_list.html @@ -7,7 +7,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}
diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html index bbc060765..837a28481 100644 --- a/modules/spamfilter/tpl/denied_word_list.html +++ b/modules/spamfilter/tpl/denied_word_list.html @@ -7,7 +7,7 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html index 91fda18f7..ed221a475 100644 --- a/modules/spamfilter/tpl/index.html +++ b/modules/spamfilter/tpl/index.html @@ -1,6 +1,6 @@ -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/syndication/tpl/config.html b/modules/syndication/tpl/config.html index 7c8848d88..d21094f5b 100644 --- a/modules/syndication/tpl/config.html +++ b/modules/syndication/tpl/config.html @@ -4,7 +4,7 @@

{$lang->syndication} {$lang->cmd_management}

{$lang->about_syndication}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/trackback/tpl/send_trackback_form.html b/modules/trackback/tpl/send_trackback_form.html index 6aa6ce02f..1728aa74e 100644 --- a/modules/trackback/tpl/send_trackback_form.html +++ b/modules/trackback/tpl/send_trackback_form.html @@ -2,7 +2,7 @@

{$lang->cmd_send_trackback}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index 2c5a52afe..4fdbb6050 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -2,7 +2,7 @@

{$lang->trackback} {$lang->cmd_management}

-

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index a318f3136..19d2bd760 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -3,7 +3,7 @@ var confirm_restore_msg = '{$lang->confirm_restore}'; -

{$XE_VALIDATOR_ERROR}

+

{$XE_VALIDATOR_MESSAGE}