diff options
| author | xue <> | 2005-11-20 23:48:11 +0000 |
|---|---|---|
| committer | xue <> | 2005-11-20 23:48:11 +0000 |
| commit | 796029932b87e46d317262ab9562a5c091027dfc (patch) | |
| tree | 8a1d0638448999ae05e2fbc98c8478b48ea919e0 /framework/Exceptions | |
| parent | 2a4097f1c50e820fde0f3a769463c1858985b7fb (diff) | |
Diffstat (limited to 'framework/Exceptions')
| -rw-r--r-- | framework/Exceptions/TErrorHandler.php | 11 | ||||
| -rw-r--r-- | framework/Exceptions/messages.txt | 38 |
2 files changed, 17 insertions, 32 deletions
diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php index e9ef1f33..779224ca 100644 --- a/framework/Exceptions/TErrorHandler.php +++ b/framework/Exceptions/TErrorHandler.php @@ -33,8 +33,8 @@ * The templates <b>error.html</b> and <b>exception.html</b> are default ones
* that are used if no other appropriate templates are available.
* Note, these templates are not Prado control templates. They are simply
- * templates with keywords (e.g. %%ErrorMessage%%, %%Version%%)
- * to be replaced with corresponding information.
+ * html files with keywords (e.g. %%ErrorMessage%%, %%Version%%)
+ * to be replaced with the corresponding information.
*
* By default, TErrorHandler is registered with {@link TApplication} as the
* error handler module. It can be accessed via {@link TApplication::getErrorHandler()}.
@@ -60,7 +60,7 @@ class TErrorHandler extends TComponent implements IModule */
const EXCEPTION_FILE_NAME='exception';
/**
- * number of lines to be displayed in case of an exception
+ * number of lines before and after the error line to be displayed in case of an exception
*/
const SOURCE_LINES=12;
@@ -106,6 +106,9 @@ class TErrorHandler extends TComponent implements IModule $this->_id=$value;
}
+ /**
+ * @return string the directory containing error template files.
+ */
public function getErrorTemplatePath()
{
return $this->_templatePath;
@@ -217,7 +220,7 @@ class TErrorHandler extends TComponent implements IModule {
echo "<html><head><title>Recursive Error</title></head>\n";
echo "<body><h1>Recursive Error</h1>\n";
- echo "<pre>".$exception."</pre>\n";
+ echo "<pre>".$exception->__toString()."</pre>\n";
echo "</body></html>";
}
else
diff --git a/framework/Exceptions/messages.txt b/framework/Exceptions/messages.txt index 0d3d7a1d..72e159e8 100644 --- a/framework/Exceptions/messages.txt +++ b/framework/Exceptions/messages.txt @@ -95,31 +95,13 @@ authmanager_usermanager_invalid = TAuthManager.UserManager '%s' does not refer authmanager_usermanager_unchangeable = TAuthManager.UserManager cannot be modified after the module is initialized.
authmanager_session_required = TAuthManager requires a session application module.
-body_contents_not_allowed = %s: body contents are not allowed.
-control_id_not_unique = Control ID '%s' is not unique for control type '%s'.
-control_not_found = Unable to find a control with ID '%s'.
-control_not_in_form = Control '%s' is not enclosed within a server form.
-data_not_iterable = Data is not iterable. An array or an object implementing Traversable is required.
-event_not_defined = %s: event is not defined.
-expecting_closing_tag = Line %d: expecting closing tag %s.
-index_out_of_range = Index '%s' is out of range.
-invalid_accesskey = %s.AccessKey: only one character is allowed.
-invalid_control_id = Invalid control ID '%s' for control type '%s'.
-invalid_enum_value = Invalid value '%s' for enumeration type (%s)
-invalid_event_handler = Invalid event handler '%s' for event '%s'.
-invalid_expression = Invalid expression '%s': %s.
-invalid_statements = Invalid statements '%s': %s.
-invalid_subproperty = Invalid sub-property '%s'.
-invalid_style_value = %s.Style: only string is allowed.
-multiple_form_not_allowed = Multiple server forms are not allowed.
-must_be_component = %s must extend from TComponent.
-no_comments_in_property = Line %d: comments are not allowed in property values.
-property_not_defined = %s: property is not defined.
-property_read_only = %s: property is read-only.
-skinid_set_after_applied = %s: SkinID cannot be set after the skin is applied.
-skinid_set_after_preinit = %s: SkinID cannot be set after PreInit stage.
-stylesheet_applied = %s: StyleSheet skin is already applied.
-enabletheming_after_preinit = %s: EnableTheme cannot be set after PreInit stage.
-nonunique_template_directive = Line %d: at most one template directive is allowed.
-unexpected_closing_tag = Line %d: unexpected closing tag %s.
-unexpected_matching = Unexpected matching: %s. Please report this problem to PRADO developer team.
+thememanager_basepath_invalid = TThemeManager.BasePath '%s' is not a valid directory.
+thememanager_basepath_unchangeable = TThemeManager.BasePath cannot be modified after the module is initialized.
+
+theme_baseurl_required = TThemeManager.BasePath is required. By default, a directory named 'themes' under the directory containing the application entry script is assumed.
+theme_path_inexistent = Theme path '%s' does not exist.
+theme_control_nested = Skin for control type '%s' in theme '%s' cannot be within another skin.
+theme_skinid_duplicated = SkinID '%s.%s' is duplicated in theme '%s'.
+theme_databind_forbidden = Databind cannot be used in theme '%s' for control skin '%s.%s' about property '%s'.
+theme_property_readonly = Skin is being applied to a read-only control property '%s.%s'.
+theme_property_undefined = Skin is being applied to an inexistent control property '%s.%s'.
|