From 0c0833f3a9c98897c9c01756afb00e94b13761a1 Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Thu, 8 Oct 2009 11:22:39 +0200
Subject: [PATCH] Story Id:1166880 VM Merge

---
 setup/migrate/steps/migrateDatabase.php | 31 ++++++++++++++++++++++++++++---
 setup/migrate/templates/database.tpl    | 26 ++++++++++++++------------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php
index 05ad7ef..494bab1 100644
--- a/setup/migrate/steps/migrateDatabase.php
+++ b/setup/migrate/steps/migrateDatabase.php
@@ -153,18 +153,21 @@ class migrateDatabase extends Step
 	    	$location = $installation['location'];
 			$uname = $this->temp_variables['duname'];
 			$pwrd = $this->temp_variables['dpassword'];
+			$tmpFolder = $this->resolveTempDir();
 	    	if(WINDOWS_OS) {
-	    		$tmpFolder = "tmp/";
+//	    		$tmpFolder = "tmp/";
 	    		$exe = "\"$location\mysql\bin\mysqldump.exe\""; // Location of dump
 	    	} else {
-	    		$tmpFolder = "/tmp/";
+//	    		$tmpFolder = "/tmp/";
 	    		$exe = "'$location/mysql/bin/mysqldump'"; // Location of dump
 	    	}
-			$sqlFile = $tmpFolder."dms.sql";
+			$sqlFile = $tmpFolder."/dms_migrate.sql";
 			$dbAdminUser = $dbSettings['dbAdminUser'];
 			$dbAdminPass = $dbSettings['dbAdminPass'];
 			$dbName = $dbSettings['dbName'];
 			$cmd = "$exe -u{$dbAdminUser} -p{$dbAdminPass} $dbName > ".$sqlFile;
+//			echo $cmd;
+//			die;
 			$response = $this->util->pexec($cmd);
 			if(file_exists($sqlFile)) {
 				$fileContents = file_get_contents($sqlFile);
@@ -178,6 +181,28 @@ class migrateDatabase extends Step
 		return false;
     }
     
+    // TODO
+function resolveTempDir()
+{
+
+    if (!WINDOWS_OS)
+    {
+        $dir='/tmp/kt-db-backup';
+    }
+    else
+    {
+        $dir='c:/kt-db-backup';
+    }
+//    $oKTConfig =& KTConfig::getSingleton();
+//    $dir = $oKTConfig->get('backup/backupDirectory',$dir);
+
+    if (!is_dir($dir))
+    {
+            mkdir($dir);
+    }
+    return $dir;
+}
+
     public function doTest() {
     	return true;
     	$installation = $this->getDataFromSession("installation"); // Get installation directory
diff --git a/setup/migrate/templates/database.tpl b/setup/migrate/templates/database.tpl
index 0678fa9..eca620e 100644
--- a/setup/migrate/templates/database.tpl
+++ b/setup/migrate/templates/database.tpl
@@ -2,34 +2,36 @@
 	<p class="title">Migrate Database</p>
 	<div id="database" class="step1" style="display:block;">
 		<div class="description">
-		This step configures the connection to the database server and migrates the database. The details for an administrative <br/>
-		user on the database server are required in order to be able to configure and migrate the database.
+		This step configures the connection to the database server and migrates the database. 
+<!--		The details for an administrative <br/>-->
+<!--		user on the database server are required in order to be able to configure and migrate the database.-->
 		</div>
 		<div id="step_content_database" class="step">
-		<span class="error"> <?php if($errors['con']) { echo $errors['con']."<br/><br/>"; } ?> </span>
-		<span class="error">!!NB!! You are advised to backup your database before proceeding. !!NB!!</span>
 		<br/><br/>
+		<span class="error">!!NB!! You are advised to backup your database before proceeding. !!NB!!</span>
+<!--		<span class="error"> <?php if($errors['con']) { echo $errors['con']."<br/><br/>"; } ?> </span>
+		
+		
 		<p class="empty_space">
 			Database Details
 		</p>
 			<table class="dbconf">
 			<?php
-				$input_size = '35';
-				$align = 'left';
+//				$input_size = '35';
+//				$align = 'left';
 			?>
-		<!--	TODO: Different Databases-->
 				    <tr>
 				        <td><label for='duname'>Enter Database Administrative username: </label></td>
-				        <td><input type='text' value="<?php echo $duname?>" id='duname' name='duname' size='<?php echo $input_size; ?>' style="float:left"/></td>
-				        <td id="error" class="error"><?php if($errors['duname']) echo $errors['duname']; ?></td>
+				        <td><input type='text' value="<?php //echo $duname?>" id='duname' name='duname' size='<?php //echo $input_size; ?>' style="float:left"/></td>
+				        <td id="error" class="error"><?php //if($errors['duname']) echo $errors['duname']; ?></td>
 				    </tr>
 				    <tr>
 				        <td><label for='dpassword'>Enter the password for the Administrator: </label></td>
-				        <td><input type='password' value="<?php echo $dpassword?>" id='dpassword' name='dpassword' size='<?php echo $input_size; ?>' style="float:left"/></td>
-				        <td id="error" class="error"><?php if($errors['dpassword']) echo $errors['dpassword']; ?></td>
+				        <td><input type='password' value="<?php //echo $dpassword?>" id='dpassword' name='dpassword' size='<?php //echo $input_size; ?>' style="float:left"/></td>
+				        <td id="error" class="error"><?php //if($errors['dpassword']) echo $errors['dpassword']; ?></td>
 				    </tr>
 			</table>
-		</div>
+		</div>-->
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
 	<input type="submit" name="Next" value="Next" class="button_next"/>
--
libgit2 0.21.4