Small bug fix. :P

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@395 2b68903e-0b30-0410-9a39-a2e4f3c5be39

diff --git a/inc/admin/main.php b/inc/admin/main.php
index 36af39a..03a04fb 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 12/10/2009 SVN 394 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 12/11/2009 SVN 395 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -108,11 +108,12 @@ if($Settings['sqltype']=="mysql") {
 $OptimizeTea = sql_query(sql_pre_query("OPTIMIZE TABLE \"".$TableChCk[$ti]."\"", array(null)),$SQLStat); }
 if($Settings['sqltype']=="pgsql") {
 $OptimizeTea = sql_query(sql_pre_query("VACUUM ANALYZE \"".$TableChCk[$ti]."\"", array(null)),$SQLStat); }
+if($Settings['sqltype']=="mysql") {
 $OptimizeAr = sql_fetch_array($OptimizeTea);
 if(!isset($OptimizeAr["Msg_text"])&&
        isset($OptimizeAr[3])) { $OptimizeAr["Msg_text"] = $OptimizeAr[3]; }
 if($OptimizeAr["Msg_text"]=="OK") { 
-       ++$TblOptimized; } ++$ti; }
+       ++$TblOptimized; } } ++$ti; }
 if($Settings['sqltype']=="mysql") {
 $OutPutLog = "MySQL Output: ".$TblOptimized." tables optimized."; }
 if($Settings['sqltype']=="pgsql") {

diff --git a/inc/misc/pgsql.php b/inc/misc/pgsql.php
index 5497cc9..8de0ddf 100644 (file)
--- a/inc/misc/pgsql.php
+++ b/inc/misc/pgsql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: pgsql.php - Last Update: 12/10/2009 SVN 391 - Author: cooldude2k $
+    $FileInfo: pgsql.php - Last Update: 12/11/2009 SVN 395 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mysql.php"||$File3Name=="/mysql.php") {
@@ -63,14 +63,22 @@ if ($num===false) {
     output_error("SQL Error: ".sql_error(),E_USER_ERROR);
        return false; }
        return $num; }
-// Connect to mysql database
+// Connect to pgsql database
 function sql_connect_db($server,$username,$password,$database=null,$new_link=false) {
 if($new_link!==true) { $new_link = false; }
+$pgport = "5432";
+$hostex = explode(":", $server);
+if(isset($hostex[1])&&
+       !is_numeric($hostex[1])) {
+       $hostex[1] = $pgport; }
+if(isset($hostex[1])) { 
+       $server = $hostex[0];
+       $pgport = $hostex[1]; }
 $pgstring = null;
 if($database===null) {
-$pgstring = "host=".$server." port=5432 user=".$username." password=".$password; }
+$pgstring = "host=".$server." port=".$pgport." user=".$username." password=".$password; }
 if($database!==null) {
-$pgstring = "host=".$server." port=5432 dbname=".$database." user=".$username." password=".$password; }
+$pgstring = "host=".$server." port=".$pgport." dbname=".$database." user=".$username." password=".$password; }
 $link = pg_connect($pgstring);
 if ($link===false) {
     output_error("Not connected: ".sql_error(),E_USER_ERROR);

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index e4acaf8..89d2895 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 12/10/2009 SVN 394 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 12/11/2009 SVN 395 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 3; $VER1[2] = 4; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 394; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 12; $SVNDay[1] = 10; $SVNDay[2] = 2009; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 395; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 12; $SVNDay[1] = 11; $SVNDay[2] = 2009; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);
 $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true);
 $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false);