summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac2
-rw-r--r--htdocs/handlers/exception_dev7
-rw-r--r--htdocs/sources.chtml5
-rw-r--r--htdocs/view.chtml9
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,4 +1,4 @@
1AC_INIT([sitecing-showcase], [0.0.1], [sitecing-bugs@klever.net]) 1AC_INIT([sitecing-showcase], [0.0.1-svn], [sitecing-bugs@klever.net])
2AC_CONFIG_SRCDIR([htdocs/index.chtml]) 2AC_CONFIG_SRCDIR([htdocs/index.chtml])
3AC_CONFIG_AUX_DIR([aux]) 3AC_CONFIG_AUX_DIR([aux])
4AC_CONFIG_HEADER([include/acconfig.h]) 4AC_CONFIG_HEADER([include/acconfig.h])
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
@@ -10,6 +10,7 @@
10 #include <sitecing/sitecing_util.h> 10 #include <sitecing/sitecing_util.h>
11 #include <sitecing/util.h> 11 #include <sitecing/util.h>
12 #include <sitecing/magic.h> 12 #include <sitecing/magic.h>
13 #include <konforka/util.h>
13 #include <konforka/exception.h> 14 #include <konforka/exception.h>
14</%impl> 15</%impl>
15%%var string message; 16%%var string message;
@@ -254,7 +255,7 @@
254 } 255 }
255 } 256 }
256 if((oel>0 && !oef.empty()) && (oel!=error_line || oef!=error_file)) { 257 if((oel>0 && !oef.empty()) && (oel!=error_line || oef!=error_file)) {
257 string ef = "/"+sitecing::combine_path(root_source+component,oef); 258 string ef = "/"+konforka::combine_path(root_source+component,oef);
258 report_error(ef,oel,remove_roots(cumulative)); 259 report_error(ef,oel,remove_roots(cumulative));
259 cumulative.clear(); 260 cumulative.clear();
260 } 261 }
@@ -264,7 +265,7 @@
264 cumulative += line; 265 cumulative += line;
265 } 266 }
266 if(!(cumulative.empty() || error_file.empty() || error_line<0)) { 267 if(!(cumulative.empty() || error_file.empty() || error_line<0)) {
267 error_file = "/"+sitecing::combine_path(root_source+component,error_file); 268 error_file = "/"+konforka::combine_path(root_source+component,error_file);
268 report_error(error_file,error_line,remove_roots(cumulative)); 269 report_error(error_file,error_line,remove_roots(cumulative));
269 } 270 }
270 } 271 }
@@ -318,7 +319,7 @@
318 </div> 319 </div>
319</%method> 320</%method>
320<%codemethod string strip_roots(const string& filename) %> 321<%codemethod string strip_roots(const string& filename) %>
321 string np = sitecing::normalize_path(filename); 322 string np = konforka::normalize_path(filename);
322 try{ 323 try{
323 return sitecing::strip_prefix(np,root_source); 324 return sitecing::strip_prefix(np,root_source);
324 }catch(sitecing::utility_no_prefix& e){ } 325 }catch(sitecing::utility_no_prefix& e){ }
diff --git a/htdocs/sources.chtml b/htdocs/sources.chtml
index 268b0e0..57a03e9 100644
--- a/htdocs/sources.chtml
+++ b/htdocs/sources.chtml
@@ -4,6 +4,7 @@
4%%pragma main=page 4%%pragma main=page
5<%impl> 5<%impl>
6 #include <sitecing/sitecing_util.h> 6 #include <sitecing/sitecing_util.h>
7 #include <konforka/util.h>
7</%impl> 8</%impl>
8<%constructor> 9<%constructor>
9 b_strict = false; 10 b_strict = false;
@@ -31,9 +32,9 @@
31 </ul> 32 </ul>
32 33
33 <%code> 34 <%code>
34 string rfile = sitecing::normalize_path( 35 string rfile = konforka::normalize_path(
35 sitecing::strip_prefix(__CGI->get_meta("PATH_INFO"),"/sources.chtml"), 36 sitecing::strip_prefix(__CGI->get_meta("PATH_INFO"),"/sources.chtml"),
36 sitecing::restrict_dotdot|sitecing::strip_leading_slash ); 37 konforka::restrict_dotdot|konforka::strip_leading_slash );
37 if(rfile.empty()) 38 if(rfile.empty())
38 rfile = "about:blank"; 39 rfile = "about:blank";
39 else 40 else
diff --git a/htdocs/view.chtml b/htdocs/view.chtml
index f729465..809c54f 100644
--- a/htdocs/view.chtml
+++ b/htdocs/view.chtml
@@ -8,6 +8,7 @@
8 using namespace std; 8 using namespace std;
9 #include <sitecing/util.h> 9 #include <sitecing/util.h>
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>
12 #include "acconfig.h" 13 #include "acconfig.h"
13</%impl> 14</%impl>
@@ -16,21 +17,21 @@
16</%codemethod> 17</%codemethod>
17<%method void body() %> 18<%method void body() %>
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;
23 for(int n=0;n<source_files_count;n++) { 24 for(int n=0;n<source_files_count;n++) {
24 sof = &source_files[n]; 25 sof = &source_files[n];
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;
28 } 29 }
29 sof = 0; 30 sof = 0;
30 } 31 }
31 if(!sof) 32 if(!sof)
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>
35 <div class="source"> 36 <div class="source">
36 <h1><% rfile %></h1> 37 <h1><% rfile %></h1>