Made DBI connect changes suggested by Brett Williams.

diff --git a/bin/backup_phpgw_db b/bin/backup_phpgw_db
index b00afdabffcb0f04944482e548f46847bbae1923..beaf25488ca3f956947ff07e839d5db0d6313434 100755 (executable)
--- a/bin/backup_phpgw_db
+++ b/bin/backup_phpgw_db
@@ -1,13 +1,14 @@
 #!/bin/bash
 
 MNTPNT="/backup"
+MOUNTIT=1
 DSTDIR="/backup/mysql/"
 DBNAME=phpgroupware
 DBUSER=phpgroupware
 DBPASS=phpgroupware
 
-mount -w -o remount $MNTPNT 
+[ $MOUNTIT == 1 ] && mount -w -o remount $MNTPNT 
 /usr/bin/mysqldump --databases $DBNAME -u $DBUSER --password=$DBPASS -c > $DSTDIR/mysql_phpgw_backup.sql
 ls -l $DSTDIR/mysql_phpgw_backup.sql
-mount -r -o remount $MNTPNT
+[ $MOUNTIT == 1 ] && mount -r -o remount $MNTPNT
 

diff --git a/bin/import_ward_data b/bin/import_ward_data
index ef6d62b4359b104970b9ec48a38956fb1706ea02..53a3c3d05aefbc4d28b5421bb2a6411da3f5e4c7 100755 (executable)
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -667,7 +667,7 @@ sub check_for_changed_ids
 
 ###################################################
 # Open a connection to the database
-$dbh=DBI->connect("dbi:mysql:dbname=$dbname;host=$dbhost;port=$dbport",$dbuser,$dbpass,{
+$dbh=DBI->connect("dbi:mysql:dbname=$dbname:host=$dbhost:port=$dbport",$dbuser,$dbpass,{
     AutoCommit=>0,
     PrintError=>0}) or print "Connect Failure:".$DBI::errstr."\n" and exit 2;
 

diff --git a/bin/parse_ward_data b/bin/parse_ward_data
index c2397cf211ee586971b917ac5a964508788ef28e..7a3c07249ef4b5edafa6a21d19f7114a1f2fc153 100755 (executable)
--- a/bin/parse_ward_data
+++ b/bin/parse_ward_data
@@ -94,7 +94,7 @@ sub print_birthdays
 
 ###################################################
 # Open a connection to the database
-$dbh=DBI->connect("dbi:mysql:dbname=$dbname;host=$dbhost;port=$dbport",$dbuser,$dbpass,{
+$dbh=DBI->connect("dbi:mysql:dbname=$dbname:host=$dbhost:port=$dbport",$dbuser,$dbpass,{
     AutoCommit=>0,
     PrintError=>0}) or print "Connect Failure:".$DBI::errstr."\n" and exit 2;