From 18da3fe7fb9cb4e98596b146df4fe8ba59bcb725 Mon Sep 17 00:00:00 2001
From: ndparker <>
Date: Wed, 7 Mar 2001 20:19:20 +0000
Subject: [PATCH] changed the handling of pathes, defined in config files. They
 are now absolute, not relative to anything. please change your config files.
 also changed 'wselfhtm.css' in all template files to 'forum.css', rename (or
 copy) your wselfhtm.css in wwwroot/selfaktuell/src/, please

---
 selfforum-cgi/user/config/answer.tmp.xml  |  2 +-
 selfforum-cgi/user/config/common.xml      |  6 +++---
 selfforum-cgi/user/config/fo_posting.xml  |  2 +-
 selfforum-cgi/user/config/fo_view.xml     |  4 ++--
 selfforum-cgi/user/config/forum.tmp.xml   |  2 +-
 selfforum-cgi/user/config/posting.tmp.xml |  2 +-
 selfforum-cgi/user/fo_posting.pl          |  6 +++---
 selfforum-cgi/user/fo_view.pl             | 14 ++++++--------
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/selfforum-cgi/user/config/answer.tmp.xml b/selfforum-cgi/user/config/answer.tmp.xml
index 8da9959..8ea9c3e 100644
--- a/selfforum-cgi/user/config/answer.tmp.xml
+++ b/selfforum-cgi/user/config/answer.tmp.xml
@@ -218,7 +218,7 @@
 <Scrap id="LINK_ARCHIV"><![CDATA[ <a href="/selfaktuell/forum/forumsarchiv.htm"><b>Forumsarchiv</b></a> ]]></Scrap>
 <Scrap id="LINK_SUCHE"><![CDATA[ <a href="/cgi-local/sfasuch.pl"><b>Forumsarchiv-Suche</b></a> ]]></Scrap>
 
-<Scrap id="_CSS_FILE"><![CDATA[ /selfaktuell/src/wselfhtm.css ]]></Scrap>
+<Scrap id="_CSS_FILE"><![CDATA[ /selfaktuell/src/forum.css ]]></Scrap>
 
 <!--
 	Bilder
diff --git a/selfforum-cgi/user/config/common.xml b/selfforum-cgi/user/config/common.xml
index f0496b0..fb9d4f9 100644
--- a/selfforum-cgi/user/config/common.xml
+++ b/selfforum-cgi/user/config/common.xml
@@ -2,9 +2,9 @@
 
 <Config>
   <Property name="files">
-    <Variable name="messagePath">/selfaktuell/forum/messages/</Variable>
-    <Variable name="forum">/selfaktuell/forum/messages/selfforum.xml</Variable>
-    <Variable name="adminDefault">config/fo_admin_default.xml</Variable>
+    <Variable name="messagePath">e:/localhosts/i_selfhtml/htdocs/selfaktuell/forum/messages/</Variable>
+    <Variable name="forum">e:/localhosts/i_selfhtml/htdocs/selfaktuell/forum/messages/selfforum.xml</Variable>
+    <Variable name="adminDefault">e:/localhosts/i_selfhtml/cgi-local/user/config/fo_admin_default.xml</Variable>
   </Property>
 
   <Property name="template">
diff --git a/selfforum-cgi/user/config/fo_posting.xml b/selfforum-cgi/user/config/fo_posting.xml
index 0616273..fd6e4fc 100644
--- a/selfforum-cgi/user/config/fo_posting.xml
+++ b/selfforum-cgi/user/config/fo_posting.xml
@@ -3,7 +3,7 @@
 <Config>
   <Property name="show">
     <Property name="Posting">
-      <Variable name="templateFile">config/answer.tmp.xml</Variable>
+      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/answer.tmp.xml</Variable>
 
       <Property name="assign">
         <Variable name="docNew">DOC_OPENING</Variable>
diff --git a/selfforum-cgi/user/config/fo_view.xml b/selfforum-cgi/user/config/fo_view.xml
index c5995c7..3b507ad 100644
--- a/selfforum-cgi/user/config/fo_view.xml
+++ b/selfforum-cgi/user/config/fo_view.xml
@@ -31,7 +31,7 @@
 
     <Property name="Forum">
 
-      <Variable name="templateFile">config/forum.tmp.xml</Variable>
+      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/forum.tmp.xml</Variable>
 
       <Property name="assign">
         <Variable name="mainDocStart">DOC_FORUM_START</Variable>
@@ -43,7 +43,7 @@
     </Property>
 
     <Property name="Posting">
-      <Variable name="templateFile">config/posting.tmp.xml</Variable>
+      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/posting.tmp.xml</Variable>
 
       <Property name="assign">
         <Variable name="mainDoc">DOC_POSTING</Variable>
diff --git a/selfforum-cgi/user/config/forum.tmp.xml b/selfforum-cgi/user/config/forum.tmp.xml
index 89c7e56..4ed9a2e 100644
--- a/selfforum-cgi/user/config/forum.tmp.xml
+++ b/selfforum-cgi/user/config/forum.tmp.xml
@@ -101,7 +101,7 @@
 	Links/URLs
 -->
 
-<Scrap id="_CSS_FILE"><![CDATA[ /selfaktuell/src/wselfhtm.css ]]></Scrap>
+<Scrap id="_CSS_FILE"><![CDATA[ /selfaktuell/src/forum.css ]]></Scrap>
 
 <Scrap id="LINK_SELFHTML"><![CDATA[ <a href="/selfhtml/"><b>SELFHTML</b></a> ]]></Scrap>
 <Scrap id="LINK_SELFAKTUELL"><![CDATA[ <a href="/selfaktuell/"><b>SELFHTML&nbsp;aktuell</b></a> ]]></Scrap>
diff --git a/selfforum-cgi/user/config/posting.tmp.xml b/selfforum-cgi/user/config/posting.tmp.xml
index f37c575..32b1ce0 100644
--- a/selfforum-cgi/user/config/posting.tmp.xml
+++ b/selfforum-cgi/user/config/posting.tmp.xml
@@ -113,7 +113,7 @@
 <Scrap id="LINK_SELFLIVE"><![CDATA[ <a href="../live/"><b>SELFHTML&nbsp;live!</b></a> ]]></Scrap>
 <Scrap id="LINK_SELFFORUM"><![CDATA[ <a href="./"><b>SELFHTML&nbsp;Forum</b></a> ]]></Scrap>
 
-<Scrap id="_CSS_FILE"><![CDATA[ ../src/wselfhtm.css ]]></Scrap>
+<Scrap id="_CSS_FILE"><![CDATA[ ../src/forum.css ]]></Scrap>
 
 <!--
 	Bilder
diff --git a/selfforum-cgi/user/fo_posting.pl b/selfforum-cgi/user/fo_posting.pl
index 3889632..6bcde80 100644
--- a/selfforum-cgi/user/fo_posting.pl
+++ b/selfforum-cgi/user/fo_posting.pl
@@ -44,12 +44,12 @@ our $assign   = $show_posting -> {assign};
 our $formmust = $show_posting -> {form} -> {must};
 our $formdata = $show_posting -> {form} -> {data};
 our $formact  = $show_posting -> {form} -> {action};
-our $template = new Template "$Bin/".$show_posting -> {templateFile};
+our $template = new Template $show_posting -> {templateFile};
 our $pars = {};
 our ($failed, %dparam, $threads, $last_thread, $last_message, $ftid, $fmid, $flocked);
 
-sub forum_filename () {$conf -> {wwwRoot} . $conf -> {files} -> {forum};}
-sub message_path () {$conf -> {wwwRoot} . $conf -> {files} -> {messagePath};}
+sub forum_filename () {$conf -> {files} -> {forum};}
+sub message_path () {$conf -> {files} -> {messagePath};}
 
 ################################
 
diff --git a/selfforum-cgi/user/fo_view.pl b/selfforum-cgi/user/fo_view.pl
index f92d376..5773ddd 100644
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -23,17 +23,17 @@ print header(-type => 'text/html');
 
 my $conf = read_script_conf ($Bin, $Shared, $Script);
 
-$conf -> {wwwRoot} = 'i:/i_selfhtml/htdocs' unless ($ENV{GATEWAY_INTERFACE} =~ /CGI/);
+#$conf -> {wwwRoot} = 'i:/i_selfhtml/htdocs' unless ($ENV{GATEWAY_INTERFACE} =~ /CGI/);
 
 my $show = $conf -> {show};
 my $show_forum = $show -> {Forum};
 my $show_posting = $show -> {Posting};
 my $cgi = $show -> {assign} -> {cgi};
 my $tree = $show -> {assign} -> {thread};
-my $adminDefault = read_admin_conf ("$Bin/".$conf -> {files} -> {adminDefault});
+my $adminDefault = read_admin_conf ($conf -> {files} -> {adminDefault});
 
-my $forum_file = $conf -> {wwwRoot}.$conf -> {files} -> {forum};
-my $message_path = $conf -> {wwwRoot}.$conf -> {files} -> {messagePath};
+my $forum_file = $conf -> {files} -> {forum};
+my $message_path = $conf -> {files} -> {messagePath};
 
 #use Lock qw(:ALL);release_file(forum_file);die;
 
@@ -41,7 +41,7 @@ my ($tid, $mid) = (param ($cgi -> {thread}), param ($cgi -> {posting}));
 
 if (defined ($tid) and defined ($mid)) {
   print_posting_as_HTML ($message_path,
-                         "$Bin/".$show_posting -> {templateFile},
+                         $show_posting -> {templateFile},
                         {assign       => $show_posting -> {assign},
                          thread       => $tid,
                          posting      => $mid,
@@ -54,12 +54,10 @@ if (defined ($tid) and defined ($mid)) {
 
 else {
   print_forum_as_HTML ($forum_file,
-                       "$Bin/".$show_forum -> {templateFile},
+                       $show_forum -> {templateFile},
                       {assign       => $show_forum -> {assign},
                        adminDefault => $adminDefault,
                        cgi          => $cgi,
                        tree         => $tree
                       });}
-
-print "t1 ";
 # eos
\ No newline at end of file
-- 
2.34.1