author | Michael Krelin <hacker@klever.net> | 2005-04-25 17:07:02 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-04-25 17:07:02 (UTC) |
commit | 33efe232e5ed39c2dcb486fc1c381f09654c0126 (patch) (unidiff) | |
tree | 967b0c795cc8c407234640ed196c18c259394f6a /htdocs/view.chtml | |
parent | dc836540970e798a91ae9460690e4462365e770a (diff) | |
download | sitecing-33efe232e5ed39c2dcb486fc1c381f09654c0126.zip sitecing-33efe232e5ed39c2dcb486fc1c381f09654c0126.tar.gz sitecing-33efe232e5ed39c2dcb486fc1c381f09654c0126.tar.bz2 |
1. -svn-ed version
2. made changes necessary to get along well with recent konforka-sitecing changes
-rw-r--r-- | htdocs/view.chtml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/htdocs/view.chtml b/htdocs/view.chtml index f729465..809c54f 100644 --- a/htdocs/view.chtml +++ b/htdocs/view.chtml | |||
@@ -10,2 +10,3 @@ | |||
10 | #include <sitecing/sitecing_util.h> | 10 | #include <sitecing/sitecing_util.h> |
11 | #include <konforka/util.h> | ||
11 | #include <konforka/exception.h> | 12 | #include <konforka/exception.h> |
@@ -18,5 +19,5 @@ | |||
18 | <%code> | 19 | <%code> |
19 | string rfile = sitecing::normalize_path( | 20 | string rfile = konforka::normalize_path( |
20 | sitecing::strip_prefix(__CGI->get_meta("PATH_INFO"),"/view.chtml"), | 21 | sitecing::strip_prefix(__CGI->get_meta("PATH_INFO"),"/view.chtml"), |
21 | sitecing::restrict_dotdot|sitecing::strip_leading_slash ); | 22 | konforka::restrict_dotdot|konforka::strip_leading_slash ); |
22 | sourcefile_t *sof = 0; | 23 | sourcefile_t *sof = 0; |
@@ -25,3 +26,3 @@ | |||
25 | if(sof->name && sof->dir) { | 26 | if(sof->name && sof->dir) { |
26 | if(sitecing::normalize_path(sitecing::combine_path(sof->dir,sof->name,0),sitecing::strip_leading_slash)==rfile) | 27 | if(konforka::normalize_path(konforka::combine_path(sof->dir,sof->name,0),konforka::strip_leading_slash)==rfile) |
27 | break; | 28 | break; |
@@ -32,3 +33,3 @@ | |||
32 | throw konforka::exception(CODEPOINT,"no access to the file allowed"); | 33 | throw konforka::exception(CODEPOINT,"no access to the file allowed"); |
33 | string afile = sitecing::combine_path(WEB_ROOT,rfile,0); | 34 | string afile = konforka::combine_path(WEB_ROOT,rfile,0); |
34 | </%code> | 35 | </%code> |