Small update to CUBRID support.

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

diff --git a/inc/admin/main.php b/inc/admin/main.php
index f75edaf..2a846ee 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 07/08/2011 SVN 697 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 07/09/2011 SVN 702 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -93,17 +93,18 @@ if($Settings['sqltype']!="mysql"&&
        $Settings['sqltype'] = "mysql"; }
 if($Settings['sqltype']=="mysql"||
        $Settings['sqltype']=="mysqli") {
-$DBType['Server'] = "MySQL version ".sql_server_info($SQLStat);
-$DBType['Client'] = "MySQL version ".sql_client_info($SQLStat); }
+$DBType['Server'] = "MySQL ".sql_server_info($SQLStat);
+$DBType['Client'] = "MySQL ".sql_client_info($SQLStat); }
 if($Settings['sqltype']=="pgsql") {
-$DBType['Server'] = "PostgreSQL version ".sql_server_info($SQLStat);
-$DBType['Client'] = "PostgreSQL version ".sql_client_info($SQLStat); }
+$DBType['Server'] = "Postgres ".sql_server_info($SQLStat);
+$DBType['Client'] = "Postgres ".sql_client_info($SQLStat); }
 if($Settings['sqltype']=="sqlite") {
-$DBType['Server'] = "SQLite version ".sql_server_info($SQLStat);
+$DBType['Server'] = "SQLite ".sql_server_info($SQLStat);
 $DBType['Client'] = sql_client_info($SQLStat); }
 if($Settings['sqltype']=="cubrid") {
-$DBType['Server'] = "CUBRID version ".sql_server_info($SQLStat);
-$DBType['Client'] = "CUBRID version ".sql_client_info($SQLStat); }
+$DBType['Server'] = "CUBRID ".sql_server_info($SQLStat);
+$DBType['Client'] = "CUBRID ".sql_client_info($SQLStat); 
+$DBType['PHP'] = "CUBRID ".cubrid_version(); }
 if(!isset($Settings['vercheck'])) { 
        $Settings['vercheck'] = 2; }
 if($Settings['vercheck']!=1&&
@@ -353,6 +354,7 @@ $themeresult=sql_query($themequery,$SQLStat);
 $themenum=sql_num_rows($themeresult);
 require($SettDir['inc'].'sqlthemes.php');
 $_POST['update'] = "now"; $_GET['act'] = "optimize"; }
+if($_GET['act']=="optimize"&&$Settings['sqltype']=="cubrid") { $_GET['act'] = "view"; }
 if($_GET['act']=="optimize"&&$GroupInfo['ViewDBInfo']=="yes") {
 $TablePreFix = $Settings['sqltable'];
 function add_prefix($tarray) {
@@ -937,6 +939,9 @@ require('settings.php'); $admincptitle = " ".$ThemeSet['TitleDivider']." Databas
 ?><tr style="text-align: left;">
        <td style="width: 50%;"><span class="TextBoxLabel">Database File Size:</span></td>
        <td style="width: 50%;"><?php echo sprintf("%u", filesize($Settings['sqldb']))." bytes"; ?></td>
+</tr><?php } if($Settings['sqltype']=="cubrid") { ?><tr style="text-align: left;">
+       <td style="width: 50%;"><span class="TextBoxLabel">CUBRID PHP:</span></td>
+       <td style="width: 50%;"><?php echo $DBType['PHP']; ?></td>
 </tr><?php } ?><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="DatabaseUserName">Insert Database User Name:</label></td>
        <td style="width: 50%;"><input type="text" name="DatabaseUserName" class="TextBox" id="DatabaseUserName" size="20" value="<?php echo $Settings['sqluser']; ?>" /></td>

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 0706700..6b13fb9 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2008-2011 iDB Support - http://idb.berlios.de/
     Copyright 2008-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 07/09/2011 SVN 701 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 07/09/2011 SVN 702 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,7 +27,7 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 4; $VER1[2] = 7; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 701;
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 702;
 $SVNDay[0] = 07; $SVNDay[1] = 09; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $AltName = "RDB"; $AltName2 = "ReneeDB"; $RName = "iDB"; $SFName = "IntDB";
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Renee Discussion Boards"; $AltGM2k = "ReneeDB Team";

diff --git a/preindex.php b/preindex.php
index 9e3a0d1..838f07e 100644 (file)
--- a/preindex.php
+++ b/preindex.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: preindex.php - Last Update: 07/08/2011 SVN 697 - Author: cooldude2k $
+    $FileInfo: preindex.php - Last Update: 07/09/2011 SVN 702 - Author: cooldude2k $
 */
 $pretime = explode(" ", microtime());
 $utime = $pretime[0];
@@ -22,6 +22,7 @@ if ($File3Name=="preindex.php"||$File3Name=="/preindex.php") {
        header('Location: index.php');
        exit(); }
 require('sql.php');
+if($_GET['act']=="sqldumper"&&$Settings['sqltype']=="cubrid") { $_GET['act'] = "view"; }
 if($_GET['act']=="sqldumper"&&$_SESSION['UserGroup']!=$Settings['GuestGroup']&&
        $GroupInfo['HasAdminCP']=="yes") { 
        if($Settings['sqltype']=="mysql"||$Settings['sqltype']=="mysqli") {