Correcting regex in admin.pl

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@834 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 14 insertions, 48 deletions

diff --git a/bin/admin.pl b/bin/admin.pl
index 0fa468cb..67cb2414 100755
--- a/bin/admin.pl
+++ b/bin/admin.pl
@@ -357,7 +357,7 @@ sub form_header {
 	}
 
 	opendir TEMPLATEDIR, "${LedgerSMB::Sysconfig::templates}/." or $form->error(__FILE__.':'.__LINE__.': '."$templates : $!");
-	@all = grep !/(\.\.?|^\.?)/, readdir TEMPLATEDIR;
+	@all = grep !/(^\.\.?$|^\.svn)/, readdir TEMPLATEDIR;
 	closedir TEMPLATEDIR;
 
 	@allhtml = sort grep /\.html/, @all;
diff --git a/ledger-smb.conf b/ledger-smb.conf
index 0b906640..29024dc5 100644
--- a/ledger-smb.conf
+++ b/ledger-smb.conf
@@ -1,52 +1,18 @@
-session  : DB
-logging  : 0
-
-# Set language for login and admin pages
-language : 
-
-# If you have LaTeX installed, set to 1
-latex : 1
-
-# Maximum number of invoices that can be printed on a cheque
-check_max_invoices : 5
-
 [environment]
-# If the server can't find applications, append to the path
-PATH: /usr/local/pgsql/bin
+# if the server can't find gzip, latex, dvips or pdflatex, append the path
 PATH: /usr/local/bin
+PATH: /usr/local/pgsql/bin
 
-# If on Mac OS X using Fink's Perl libs, append to the path
-#PERL5LIB = /sw/lib/perl5
-
-[paths]
-# spool directory for batch printing
-spool      = spool
-# path to user configuration files
-userspath  = users
-# templates base directory
-templates  = templates
-# member file
-memberfile = users/members
-localepath = locale/po
-
-[programs]
-# program to use for file compression
-gzip       = gzip -S .gz
-
-[mail]
-### How to send mail.  The sendmail command is used unless smtphost is set.
-sendmail   = /usr/bin/sendmail -t
-# smtphost = 127.0.0.1
-# smtptimeout = 60
-
-[printers]
-# Available printers
-Laser      = lpr -Plaser
-Epson      = lpr -PEpson
+# on mac os X using Fink's Perl libs, add the path
+#PERL5LIB: /sw/lib/perl5
 
+#################################
+# Global database parameters
+#################################
+# These parameters *must* be set correctly for LedgerSMB >= 1.2 to work
+#
 [globaldb]
-# These paramaters *must* be set correctly
-# for LedgerSMB >= 1.2 to work
-DBConnect  = dbi:Pg:dbname=ledgersmb;host=localhost;port=5432
-DBUserName   = ledgersmb
-DBPassword   = set me to correct password
+##uncomment below and set to correct values
+DBConnect: dbi:Pg:dbname=lsmb13;host=localhost;port=5432
+DBUserName: postgres
+DBPassword: test