Index: trunk/core/kernel/utility/http_query.php =================================================================== diff -u -r3229 -r3236 --- trunk/core/kernel/utility/http_query.php (.../http_query.php) (revision 3229) +++ trunk/core/kernel/utility/http_query.php (.../http_query.php) (revision 3236) @@ -454,7 +454,7 @@ // 2. return error template then $template_found = true; $template_path = $this->Application->ConfigValue('ErrorTemplate'); - if(!$template_path) $template_path = 'error_template'; + if(!$template_path) $template_path = 'error_notfound'; } } @@ -472,6 +472,12 @@ $this->Application->HandleEvent($module_event); $item_id = $this->Get($module_prefix.'_id'); $module_params = Array($module_prefix.'_id' => $item_id ? $item_id : '0' ); + + if($module_event->status == erFAIL) + { + $not_found = $this->Application->ConfigValue('ErrorTemplate'); + $this->Set('t', $not_found ? $not_found : 'error_notfound' ); + } } $this->finalizeParsing($passed, $module_params); Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql =================================================================== diff -u -r3229 -r3236 --- trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql (.../inportal_upgrade_v1.1.4.sql) (revision 3229) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql (.../inportal_upgrade_v1.1.4.sql) (revision 3236) @@ -1,7 +1,7 @@ INSERT INTO ConfigurationValues VALUES ('SessionReferrerCheck', '1', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('UseModRewrite', '0', 'In-Portal', 'in-portal:configure_general'); -INSERT INTO ConfigurationValues VALUES ('ErrorTemplate', 'error_template', 'In-Portal', 'in-portal:configure_general'); +INSERT INTO ConfigurationValues VALUES ('ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationAdmin VALUES ('SessionReferrerCheck', 'la_Text_Website', 'la_promt_ReferrerCheck', 'checkbox', NULL , NULL , '9', '1'); INSERT INTO ConfigurationAdmin VALUES ('SessionCookieName', 'la_Text_Website', 'la_prompt_session_cookie_name', 'text', '', '', 8, 1); Index: trunk/themes/default/error_notfound.tpl =================================================================== diff -u --- trunk/themes/default/error_notfound.tpl (revision 0) +++ trunk/themes/default/error_notfound.tpl (revision 3236) @@ -0,0 +1,125 @@ + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

+ + + + + + +

+ + + + + + + +

" width="18" height="12" alt="" />

+ +

+ + +
+ + + + + + + + +

+ + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + +



	+ + +


	+ " /> + " class="button"> + +

+ +

+ + + Index: trunk/kernel/parser.php =================================================================== diff -u -r3208 -r3236 --- trunk/kernel/parser.php (.../parser.php) (revision 3208) +++ trunk/kernel/parser.php (.../parser.php) (revision 3236) @@ -3693,6 +3693,11 @@ return $ret; } +function m_IsDebugMode($params) +{ + echo 'kool'; + return IsDebugMode() ? true : ''; +} /*function m_object($attribs=Array()) { Index: trunk/core/kernel/event_handler.php =================================================================== diff -u -r3220 -r3236 --- trunk/core/kernel/event_handler.php (.../event_handler.php) (revision 3220) +++ trunk/core/kernel/event_handler.php (.../event_handler.php) (revision 3236) @@ -245,6 +245,10 @@ { $this->Application->SetVar($event->getPrefixSpecial().'_id', $item_id); } + else + { + $event->status = erFAIL; + } } } Index: trunk/admin/browse.php =================================================================== diff -u -r3184 -r3236 --- trunk/admin/browse.php (.../browse.php) (revision 3184) +++ trunk/admin/browse.php (.../browse.php) (revision 3236) @@ -217,9 +217,11 @@ " ImagePath=""> " ImagePath=""> "> - " ImagePath=""> +" ImagePath=""> " ImagePath=""> - "> + ">*/ +?> " ImagePath=""> " ImagePath=""> " ImagePath=""> Index: trunk/admin/templates/cat_element.tpl =================================================================== diff -u -r13 -r3236 --- trunk/admin/templates/cat_element.tpl (.../cat_element.tpl) (revision 13) +++ trunk/admin/templates/cat_element.tpl (.../cat_element.tpl) (revision 3236) @@ -10,7 +10,10 @@ ( / )

-
+
+ + + ()

Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -r3229 -r3236 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 3229) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 3236) @@ -174,7 +174,7 @@ INSERT INTO ConfigurationValues VALUES ('SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('UseModRewrite', '0', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('SessionReferrerCheck', '1', 'In-Portal', 'in-portal:configure_general'); -INSERT INTO ConfigurationValues VALUES ('ErrorTemplate', 'error_template', 'In-Portal', 'in-portal:configure_general'); +INSERT INTO ConfigurationValues VALUES ('ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_general'); INSERT INTO Events VALUES (30, 'USER.ADD', 1, 0, 'In-Portal:Users', 'la_event_user.add', 0) INSERT INTO Events VALUES (32, 'USER.ADD', 2, 0, 'In-Portal:Users', 'la_event_user.add', 1)