From: ndparker <>
Date: Sat, 21 Apr 2001 15:31:07 +0000 (+0000)
Subject: Conf.pm: turned $Bin into $Config (we're now interested in config path not longer...
X-Git-Url: https://git.p6c8.net/selfforum.git/commitdiff_plain/2a78476e5bf2aee7120b59f5ee5e30ad5609fe55?hp=489e7846289d4fb66eb4b9fab0fed4af719b98ee
Conf.pm: turned $Bin into $Config (we're now interested in config path not longer the script path)
---
diff --git a/selfforum-cgi/shared/Conf.pm b/selfforum-cgi/shared/Conf.pm
index 3d2d5be..b675995 100644
--- a/selfforum-cgi/shared/Conf.pm
+++ b/selfforum-cgi/shared/Conf.pm
@@ -28,12 +28,12 @@ use base qw(Exporter);
################################
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
- 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...
diff --git a/selfforum-cgi/user/config/fo_posting.xml b/selfforum-cgi/user/config/fo_posting.xml
index dc93824..d478b98 100644
--- a/selfforum-cgi/user/config/fo_posting.xml
+++ b/selfforum-cgi/user/config/fo_posting.xml
@@ -3,8 +3,8 @@
- e:/localhosts/i_selfhtml/cgi-local/user/config/answer.tmp.xml
-
+ e:/localhosts/i_selfhtml/cgi-local/user/config/answer.tmpl.xml
+
DOC_OPENING
DOC_THANKYOU
@@ -52,6 +52,7 @@
/cgi-local/user/fo_posting.pl
+
_FORM_ACTION
@@ -177,37 +178,17 @@
fetch
category
- ASP
- BROWSER
- CGI
- CSS
- DATENBANK
- DESIGN
- DHTML
- E-MAIL
- FTP
- GRAFIK
- HTML
- HTTP
- INTERNET-ANBINDUNG
- JAVA
- JAVASCRIPT
- MEINUNG
- MENSCHELEI
- PERL
- PHP
- PROGRAMMIERTECHNIK
- PROJEKTVERWALTUNG
- PROVIDER
- RECHT
+ DEV-ALLGEMEIN
+ DEV-INTERN
+ FEATURE-ARTIKEL
+ FINDER
+ FORUM
+ LINKVERZEICHNIS
+ SELFBROWSER
+ SELFHTML
SERVER
- SOFTWARE
- VBSCRIPT
- XML
- XML-DERIVAT
- XSL
+ SUCHE
ZUR INFO
- ZU DIESEM FORUM
@@ -277,4 +258,4 @@
-
\ No newline at end of file
+
\ 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 b6bbe85..6ec121f 100644
--- a/selfforum-cgi/user/config/fo_view.xml
+++ b/selfforum-cgi/user/config/fo_view.xml
@@ -31,16 +31,14 @@
- e:/localhosts/i_selfhtml/cgi-local/user/config/forum.tmp.xml
-
+ e:/localhosts/i_selfhtml/cgi-local/user/config/forum.tmpl.xml
+
DOC_FORUM_START
DOC_FORUM_END
_LOAD_TIME
_CSS_FILE
DOC_ERROR
- CITE_START
- CITE_END
_N_A
_OCCUPIED
@@ -50,8 +48,8 @@
- e:/localhosts/i_selfhtml/cgi-local/user/config/posting.tmp.xml
-
+ e:/localhosts/i_selfhtml/cgi-local/user/config/posting.tmpl.xml
+
DOC_POSTING
DOC_ERROR
@@ -81,11 +79,13 @@
/cgi-local/user/fo_posting.pl
+
_FORM_ACTION
/cgi-local/user/fo_voting.pl
+
_VOTE_ACTION
@@ -191,4 +191,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/selfforum-cgi/user/fo_posting.pl b/selfforum-cgi/user/fo_posting.pl
index 111f045..0bb18de 100644
--- a/selfforum-cgi/user/fo_posting.pl
+++ b/selfforum-cgi/user/fo_posting.pl
@@ -11,17 +11,17 @@
################################################################################
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 :-(
- ($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);
@@ -30,7 +30,7 @@ use Conf::Admin;
# 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
diff --git a/selfforum-cgi/user/fo_view.pl b/selfforum-cgi/user/fo_view.pl
index cd29709..ee83ce2 100644
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -11,13 +11,14 @@
################################################################################
use strict;
-use vars qw($Bin $Shared $Script);
+use vars qw($Bin $Shared $Script $Config);
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";
@@ -32,7 +33,7 @@ use CGI qw(param header);
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};