| 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) (side-by-side diff) | |
| tree | 967b0c795cc8c407234640ed196c18c259394f6a | |
| 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-- | configure.ac | 2 | ||||
| -rw-r--r-- | htdocs/handlers/exception_dev | 7 | ||||
| -rw-r--r-- | htdocs/sources.chtml | 5 | ||||
| -rw-r--r-- | htdocs/view.chtml | 9 |
4 files changed, 13 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index e60f519..80f6321 100644 --- a/configure.ac +++ b/configure.ac @@ -1,2 +1,2 @@ -AC_INIT([sitecing-showcase], [0.0.1], [sitecing-bugs@klever.net]) +AC_INIT([sitecing-showcase], [0.0.1-svn], [sitecing-bugs@klever.net]) AC_CONFIG_SRCDIR([htdocs/index.chtml]) diff --git a/htdocs/handlers/exception_dev b/htdocs/handlers/exception_dev index d8c84e1..d62f462 100644 --- a/htdocs/handlers/exception_dev +++ b/htdocs/handlers/exception_dev @@ -12,2 +12,3 @@ #include <sitecing/magic.h> + #include <konforka/util.h> #include <konforka/exception.h> @@ -256,3 +257,3 @@ if((oel>0 && !oef.empty()) && (oel!=error_line || oef!=error_file)) { - string ef = "/"+sitecing::combine_path(root_source+component,oef); + string ef = "/"+konforka::combine_path(root_source+component,oef); report_error(ef,oel,remove_roots(cumulative)); @@ -266,3 +267,3 @@ if(!(cumulative.empty() || error_file.empty() || error_line<0)) { - error_file = "/"+sitecing::combine_path(root_source+component,error_file); + error_file = "/"+konforka::combine_path(root_source+component,error_file); report_error(error_file,error_line,remove_roots(cumulative)); @@ -320,3 +321,3 @@ <%codemethod string strip_roots(const string& filename) %> - string np = sitecing::normalize_path(filename); + string np = konforka::normalize_path(filename); try{ diff --git a/htdocs/sources.chtml b/htdocs/sources.chtml index 268b0e0..57a03e9 100644 --- a/htdocs/sources.chtml +++ b/htdocs/sources.chtml @@ -6,2 +6,3 @@ #include <sitecing/sitecing_util.h> + #include <konforka/util.h> </%impl> @@ -33,5 +34,5 @@ <%code> - string rfile = sitecing::normalize_path( + string rfile = konforka::normalize_path( sitecing::strip_prefix(__CGI->get_meta("PATH_INFO"),"/sources.chtml"), - sitecing::restrict_dotdot|sitecing::strip_leading_slash ); + konforka::restrict_dotdot|konforka::strip_leading_slash ); if(rfile.empty()) 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 @@ #include <sitecing/sitecing_util.h> + #include <konforka/util.h> #include <konforka/exception.h> @@ -18,5 +19,5 @@ <%code> - string rfile = sitecing::normalize_path( + string rfile = konforka::normalize_path( sitecing::strip_prefix(__CGI->get_meta("PATH_INFO"),"/view.chtml"), - sitecing::restrict_dotdot|sitecing::strip_leading_slash ); + konforka::restrict_dotdot|konforka::strip_leading_slash ); sourcefile_t *sof = 0; @@ -25,3 +26,3 @@ if(sof->name && sof->dir) { - if(sitecing::normalize_path(sitecing::combine_path(sof->dir,sof->name,0),sitecing::strip_leading_slash)==rfile) + if(konforka::normalize_path(konforka::combine_path(sof->dir,sof->name,0),konforka::strip_leading_slash)==rfile) break; @@ -32,3 +33,3 @@ throw konforka::exception(CODEPOINT,"no access to the file allowed"); - string afile = sitecing::combine_path(WEB_ROOT,rfile,0); + string afile = konforka::combine_path(WEB_ROOT,rfile,0); </%code> |