From: Wilfried Göesgens <willi@citadel.org>
Date: Mon, 5 Feb 2007 21:45:11 +0000 (+0000)
Subject: * corrected use of our absolute directories
X-Git-Tag: v7.86~3594
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6501d8ee84a1ecbcb1af32baa4df843e73b96c20

* corrected use of our absolute directories
* updated changelog.
---

diff --git a/webcit/debian/changelog b/webcit/debian/changelog
index bb0214450..0f870279f 100644
--- a/webcit/debian/changelog
+++ b/webcit/debian/changelog
@@ -1,3 +1,9 @@
+webcit (7.02-6) unstable; urgency=low
+
+  * calculate static directories acurate
+  * new css features by tierry
+
+ -- Wilfried Goesgens <citadel@outgesourced.org>  Wed, 3 Jan 2007 21:09:00 +0100
 webcit (7.02-5) unstable; urgency=low
 
   * ask questions in the obvious cases. 
diff --git a/webcit/debian/rules b/webcit/debian/rules
index c7333e143..318110962 100755
--- a/webcit/debian/rules
+++ b/webcit/debian/rules
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DESTDIR=$(CURDIR)/debian/citadel-webcit/
+DESTDIR=$(CURDIR)/debian/citadel-webcit
 
 
 
diff --git a/webcit/webcit.c b/webcit/webcit.c
index afb88822e..6e11ccfed 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1013,7 +1013,7 @@ void session_loop(struct httprequest *req)
 	char user_agent[256];
 	int body_start = 0;
 	int is_static = 0;
-
+	int n_static = 0;
 	/**
 	 * We stuff these with the values coming from the client cookies,
 	 * so we can use them to reconnect a timed out session if we have to.
@@ -1173,13 +1173,15 @@ void session_loop(struct httprequest *req)
 	for (a=0; a<ndirs; ++a) {
 		if (!strcasecmp(action, (char*)static_content_dirs[a])) { /* map web to disk location */
 			is_static = 1;
+			n_static = a;
 		}
 	}
 	if (is_static) {
 		if (nBackDots < 2)
 		{
 			snprintf(buf, sizeof buf, "%s/%s/%s/%s/%s/%s/%s/%s",
-				 index[0], index[1], index[2], index[3], index[4], index[5], index[6], index[7]);
+				 static_dirs[n_static], 
+				 index[1], index[2], index[3], index[4], index[5], index[6], index[7]);
 			for (a=0; a<8; ++a) {
 				if (buf[strlen(buf)-1] == '/') {
 					buf[strlen(buf)-1] = 0;
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 64d63d27a..78ee06f31 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -33,9 +33,10 @@ extern pthread_key_t MyConKey;
 char socket_dir[PATH_MAX];      /**< where to talk to our citadel server */
 static const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /**< nailed to what configure gives us. */
 static char static_dir[PATH_MAX]; /**< calculated on startup */
+static char static_local_dir[PATH_MAX]; /**< calculated on startup */
 char  *static_dirs[]={ /**< needs same sort order as the web mapping */
 	(char*)static_dir,                  /** our templates on disk */
-	(char*)static_dir,                  /** our templates on disk */
+	(char*)static_local_dir,            /** user provided templates disk */
 	(char*)editor_absolut_dir           /** the editor on disk */
 };
 
@@ -747,8 +748,10 @@ int main(int argc, char **argv)
 			 (dirbuffer[0]!='\0')?"/":"");
 	basedir=RUNDIR;
 	COMPUTE_DIRECTORY(socket_dir);
-	basedir=DATADIR;
+	basedir=DATADIR "/static";
 	COMPUTE_DIRECTORY(static_dir);
+	basedir=DATADIR "/static.local";
+	COMPUTE_DIRECTORY(static_local_dir);
 	/** we should go somewhere we can leave our coredump, if enabled... */
 	lprintf(9, "Changing directory to %s\n", socket_dir);
 	if (chdir(webcitdir) != 0) {