-rw-r--r-- | htdocs/handlers/exception_dev | 7 | ||||
-rw-r--r-- | htdocs/sources.chtml | 5 | ||||
-rw-r--r-- | htdocs/view.chtml | 9 |
3 files changed, 12 insertions, 9 deletions
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 @@ -11,4 +11,5 @@ #include <sitecing/util.h> #include <sitecing/magic.h> + #include <konforka/util.h> #include <konforka/exception.h> </%impl> @@ -255,5 +256,5 @@ } 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)); cumulative.clear(); @@ -265,5 +266,5 @@ } 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)); } @@ -319,5 +320,5 @@ </%method> <%codemethod string strip_roots(const string& filename) %> - string np = sitecing::normalize_path(filename); + string np = konforka::normalize_path(filename); try{ return sitecing::strip_prefix(np,root_source); diff --git a/htdocs/sources.chtml b/htdocs/sources.chtml index 268b0e0..57a03e9 100644 --- a/htdocs/sources.chtml +++ b/htdocs/sources.chtml @@ -5,4 +5,5 @@ <%impl> #include <sitecing/sitecing_util.h> + #include <konforka/util.h> </%impl> <%constructor> @@ -32,7 +33,7 @@ <%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()) rfile = "about:blank"; diff --git a/htdocs/view.chtml b/htdocs/view.chtml index f729465..809c54f 100644 --- a/htdocs/view.chtml +++ b/htdocs/view.chtml @@ -9,4 +9,5 @@ #include <sitecing/util.h> #include <sitecing/sitecing_util.h> + #include <konforka/util.h> #include <konforka/exception.h> #include "acconfig.h" @@ -17,12 +18,12 @@ <%method void body() %> <%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; for(int n=0;n<source_files_count;n++) { sof = &source_files[n]; 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; } @@ -31,5 +32,5 @@ if(!sof) 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> <div class="source"> |