Conf.pm: turned $Bin into $Config (we're now interested in config path not longer...

diff --git a/selfforum-cgi/shared/Conf.pm b/selfforum-cgi/shared/Conf.pm
index 3d2d5be9e7881ac1908e4c90e2c477889c298909..b67599568d79dba92359e358ea8c6d27caf221a5 100644 (file)
--- a/selfforum-cgi/shared/Conf.pm
+++ b/selfforum-cgi/shared/Conf.pm
@@ -28,12 +28,12 @@ use base qw(Exporter);
 ################################
 
 sub read_script_conf ($$$) {
 ################################
 
 sub read_script_conf ($$$) {

-  my ($Bin, $Shared, $Script) = @_;
+  my ($Config, $Shared, $Script) = @_;

 
   $Script =~ s/^(.*)\..*$/$1/;             # Vornamen extrahieren
   my $common  = "$Shared/common.xml";      # gemeinsame Konf-datei
 
   $Script =~ s/^(.*)\..*$/$1/;             # Vornamen extrahieren
   my $common  = "$Shared/common.xml";      # gemeinsame Konf-datei

-  my $group   = "$Bin/config/common.xml";  # gemeinsame (Gruppen-)Konf-datei
-  my $special = "$Bin/config/$Script.xml"; # spezielle Konf-datei
+  my $group   = "$Config/common.xml";  # gemeinsame (Gruppen-)Konf-datei
+  my $special = "$Config/$Script.xml"; # spezielle Konf-datei

   my %conf=();                             # conf-Hash
 
   &parse_script_conf ($common , \%conf, $Script);   # und los...
   my %conf=();                             # conf-Hash
 
   &parse_script_conf ($common , \%conf, $Script);   # und los...

diff --git a/selfforum-cgi/user/config/fo_posting.xml b/selfforum-cgi/user/config/fo_posting.xml
index dc93824ddd0977f18fc342668f6ffb2e78540f71..d478b98c10de21694f52afbcc8898f89b718b885 100644 (file)
--- a/selfforum-cgi/user/config/fo_posting.xml
+++ b/selfforum-cgi/user/config/fo_posting.xml
@@ -3,8 +3,8 @@
 <Config>
   <Property name="show">
     <Property name="Posting">
 <Config>
   <Property name="show">
     <Property name="Posting">

-      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/answer.tmp.xml</Variable>
-
+      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/answer.tmpl.xml</Variable>
+<!-- * -->

       <Property name="assign">
         <Variable name="docNew">DOC_OPENING</Variable>
         <Variable name="docThx">DOC_THANKYOU</Variable>
       <Property name="assign">
         <Variable name="docNew">DOC_OPENING</Variable>
         <Variable name="docThx">DOC_THANKYOU</Variable>


@@ -52,6 +52,7 @@
         <Property name="action">
           <Property name="post">
             <Variable name="url">/cgi-local/user/fo_posting.pl</Variable>
         <Property name="action">
           <Property name="post">
             <Variable name="url">/cgi-local/user/fo_posting.pl</Variable>

+<!-- * -->

             <Variable name="assign">_FORM_ACTION</Variable>
           </Property>
         </Property>
             <Variable name="assign">_FORM_ACTION</Variable>
           </Property>
         </Property>


@@ -177,37 +178,17 @@
             <Variable name="errorType">fetch</Variable>
             <Variable name="header">category</Variable>
             <List name="values">
             <Variable name="errorType">fetch</Variable>
             <Variable name="header">category</Variable>
             <List name="values">

-              <ListItem>ASP</ListItem>
-              <ListItem>BROWSER</ListItem>
-              <ListItem>CGI</ListItem>
-              <ListItem>CSS</ListItem>
-              <ListItem>DATENBANK</ListItem>
-              <ListItem>DESIGN</ListItem>
-              <ListItem>DHTML</ListItem>
-              <ListItem>E-MAIL</ListItem>
-              <ListItem>FTP</ListItem>
-              <ListItem>GRAFIK</ListItem>
-              <ListItem>HTML</ListItem>
-              <ListItem>HTTP</ListItem>
-              <ListItem>INTERNET-ANBINDUNG</ListItem>
-              <ListItem>JAVA</ListItem>
-              <ListItem>JAVASCRIPT</ListItem>
-              <ListItem>MEINUNG</ListItem>
-              <ListItem>MENSCHELEI</ListItem>
-              <ListItem>PERL</ListItem>
-              <ListItem>PHP</ListItem>
-              <ListItem>PROGRAMMIERTECHNIK</ListItem>
-              <ListItem>PROJEKTVERWALTUNG</ListItem>
-              <ListItem>PROVIDER</ListItem>
-              <ListItem>RECHT</ListItem>
+              <ListItem>DEV-ALLGEMEIN</ListItem>
+              <ListItem>DEV-INTERN</ListItem>
+              <ListItem>FEATURE-ARTIKEL</ListItem>
+              <ListItem>FINDER</ListItem>
+              <ListItem>FORUM</ListItem>
+              <ListItem>LINKVERZEICHNIS</ListItem>
+              <ListItem>SELFBROWSER</ListItem>
+              <ListItem>SELFHTML</ListItem>

               <ListItem>SERVER</ListItem>
               <ListItem>SERVER</ListItem>

-              <ListItem>SOFTWARE</ListItem>
-              <ListItem>VBSCRIPT</ListItem>
-              <ListItem>XML</ListItem>
-              <ListItem>XML-DERIVAT</ListItem>
-              <ListItem>XSL</ListItem>
+              <ListItem>SUCHE</ListItem>

               <ListItem>ZUR INFO</ListItem>
               <ListItem>ZUR INFO</ListItem>

-              <ListItem>ZU DIESEM FORUM</ListItem>

             </List>
           </Property>
 
             </List>
           </Property>
 


@@ -277,4 +258,4 @@
   </Property>
 </Config>
 
   </Property>
 </Config>
 

-<!-- Ende -->
\ No newline at end of file
+<!-- The End -->
\ No newline at end of file

diff --git a/selfforum-cgi/user/config/fo_view.xml b/selfforum-cgi/user/config/fo_view.xml
index b6bbe85c65428d37a027a6c904e988bd4c33701f..6ec121f2b14923b766d78415c77c70a9cc201c3f 100644 (file)
--- a/selfforum-cgi/user/config/fo_view.xml
+++ b/selfforum-cgi/user/config/fo_view.xml
@@ -31,16 +31,14 @@
 
     <Property name="Forum">
 
 
     <Property name="Forum">
 

-      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/forum.tmp.xml</Variable>
-
+      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/forum.tmpl.xml</Variable>
+<!-- * -->

       <Property name="assign">
         <Variable name="mainDocStart">DOC_FORUM_START</Variable>
         <Variable name="mainDocEnd">DOC_FORUM_END</Variable>
         <Variable name="loadingTime">_LOAD_TIME</Variable>
         <Variable name="cssFile">_CSS_FILE</Variable>
         <Variable name="errorDoc">DOC_ERROR</Variable>
       <Property name="assign">
         <Variable name="mainDocStart">DOC_FORUM_START</Variable>
         <Variable name="mainDocEnd">DOC_FORUM_END</Variable>
         <Variable name="loadingTime">_LOAD_TIME</Variable>
         <Variable name="cssFile">_CSS_FILE</Variable>
         <Variable name="errorDoc">DOC_ERROR</Variable>

-        <Variable name="startCite">CITE_START</Variable>
-        <Variable name="endCite">CITE_END</Variable>

 
         <Variable name="notAvailable">_N_A</Variable>
         <Variable name="occupied">_OCCUPIED</Variable>
 
         <Variable name="notAvailable">_N_A</Variable>
         <Variable name="occupied">_OCCUPIED</Variable>


@@ -50,8 +48,8 @@
     </Property>
 
     <Property name="Posting">
     </Property>
 
     <Property name="Posting">

-      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/posting.tmp.xml</Variable>
-
+      <Variable name="templateFile">e:/localhosts/i_selfhtml/cgi-local/user/config/posting.tmpl.xml</Variable>
+<!-- * -->

       <Property name="assign">
         <Variable name="mainDoc">DOC_POSTING</Variable>
         <Variable name="errorDoc">DOC_ERROR</Variable>
       <Property name="assign">
         <Variable name="mainDoc">DOC_POSTING</Variable>
         <Variable name="errorDoc">DOC_ERROR</Variable>


@@ -81,11 +79,13 @@
         <Property name="action">
           <Property name="post">
             <Variable name="url">/cgi-local/user/fo_posting.pl</Variable>
         <Property name="action">
           <Property name="post">
             <Variable name="url">/cgi-local/user/fo_posting.pl</Variable>

+<!-- * -->

             <Variable name="assign">_FORM_ACTION</Variable>
           </Property>
 
           <Property name="vote">
             <Variable name="url">/cgi-local/user/fo_voting.pl</Variable>
             <Variable name="assign">_FORM_ACTION</Variable>
           </Property>
 
           <Property name="vote">
             <Variable name="url">/cgi-local/user/fo_voting.pl</Variable>

+<!-- * -->

             <Variable name="assign">_VOTE_ACTION</Variable>
           </Property>
         </Property>
             <Variable name="assign">_VOTE_ACTION</Variable>
           </Property>
         </Property>


@@ -191,4 +191,4 @@
   </Property>
 </Config>
 
   </Property>
 </Config>
 

-<!-- Ende -->
\ No newline at end of file
+<!-- The End -->
\ No newline at end of file

diff --git a/selfforum-cgi/user/fo_posting.pl b/selfforum-cgi/user/fo_posting.pl
index 111f045492a1a5f929ba3f3bf52141c8485daedc..0bb18deb8b50ff1461f1e9db1493414a4f27e477 100644 (file)
--- a/selfforum-cgi/user/fo_posting.pl
+++ b/selfforum-cgi/user/fo_posting.pl
@@ -11,17 +11,17 @@
 ################################################################################
 
 use strict;
 ################################################################################
 
 use strict;

-use vars qw($Bin $Shared $Script);
+use vars qw($Bin $Shared $Script $Config);

 
 # locate the script
 #
 BEGIN {
   my $null = $0; $null =~ s/\\/\//g; # for win :-(
 
 # locate the script
 #
 BEGIN {
   my $null = $0; $null =~ s/\\/\//g; # for win :-(

-  ($Bin)    = ($null =~ /^(.*)\/.*$/)? $1 : '.';
-  $Shared   = "$Bin/../shared";
-  ($Script) = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+  $Bin     = ($null =~ /^(.*)\/.*$/)? $1 : '.';
+  $Shared  = "$Bin/../shared";
+  $Config  = "$Bin/config";
+  $Script  = ($null =~ /^.*\/(.*)$/)? $1 : $null;

 }
 }

-

 use lib "$Shared";
 use CGI::Carp qw(fatalsToBrowser);
 
 use lib "$Shared";
 use CGI::Carp qw(fatalsToBrowser);
 


@@ -30,7 +30,7 @@ use Conf::Admin;
 
 # load script configuration and admin default conf.
 #
 
 # load script configuration and admin default conf.
 #

-my $conf         = read_script_conf ($Bin, $Shared, $Script);
+my $conf         = read_script_conf ($Config, $Shared, $Script);

 my $adminDefault = read_admin_conf ($conf -> {files} -> {adminDefault});
 
 # Initialize the request
 my $adminDefault = read_admin_conf ($conf -> {files} -> {adminDefault});
 
 # Initialize the request

diff --git a/selfforum-cgi/user/fo_view.pl b/selfforum-cgi/user/fo_view.pl
index cd29709f6c0e697c98de9b5cc4ded387a0b2ed8b..ee83ce28ba9955c5d1606d488f67a2cd5af49cf0 100644 (file)
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -11,13 +11,14 @@
 ################################################################################
 
 use strict;
 ################################################################################
 
 use strict;

-use vars qw($Bin $Shared $Script);
+use vars qw($Bin $Shared $Script $Config);

 
 BEGIN {
   my $null = $0; $null =~ s/\\/\//g; # for win :-(
 
 BEGIN {
   my $null = $0; $null =~ s/\\/\//g; # for win :-(

-  ($Bin)    = ($null =~ /^(.*)\/.*$/)? $1 : '.';
-  $Shared   = "$Bin/../shared";
-  ($Script) = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+  $Bin     = ($null =~ /^(.*)\/.*$/)? $1 : '.';
+  $Shared  = "$Bin/../shared";
+  $Config  = "$Bin/config";
+  $Script  = ($null =~ /^.*\/(.*)$/)? $1 : $null;

 }
 
 use lib "$Shared";
 }
 
 use lib "$Shared";


@@ -32,7 +33,7 @@ use CGI qw(param header);
 
 print header(-type => 'text/html');
 
 
 print header(-type => 'text/html');
 

-my $conf = read_script_conf ($Bin, $Shared, $Script);
+my $conf = read_script_conf ($Config, $Shared, $Script);

 
 my $show = $conf -> {show};
 my $show_forum = $show -> {Forum};
 
 my $show = $conf -> {show};
 my $show_forum = $show -> {Forum};