logicampus-cvs

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28416/services/classmgr

Modified Files:
	restoreBackup.lcp 
Log Message:
Properly cleanup the tempdir after a successfull restore.


Index: restoreBackup.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/restoreBackup.lcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** restoreBackup.lcp	2 Mar 2008 21:59:00 -0000	1.2
--- restoreBackup.lcp	2 Mar 2008 22:05:08 -0000	1.3
***************
*** 65,69 ****
  			$this->presentor = 'errorMessage';
  			$t['message'] ="This file does not seem to be a proper backup file. (cannot find learningobjects.xml)"; 
! 			$this->cleanupDir();
  			return false;
  		}
--- 65,69 ----
  			$this->presentor = 'errorMessage';
  			$t['message'] ="This file does not seem to be a proper backup file. (cannot find learningobjects.xml)"; 
! 			$this->cleanupDir($tempdir);
  			return false;
  		}
***************
*** 126,130 ****
  			$this->presentor = 'errorMessage';
  			$t['message'] ="This file does not seem to be a proper backup file. (cannot find learningobjects.xml)"; 
! 			$this->cleanupDir();
  			return false;
  		}
--- 126,130 ----
  			$this->presentor = 'errorMessage';
  			$t['message'] ="This file does not seem to be a proper backup file. (cannot find learningobjects.xml)"; 
! 			$this->cleanupDir($tempdir);
  			return false;
  		}
***************
*** 169,179 ****
  			$lessonObj->lessonSeq = new Lc_LessonSequence(-1,$classId);
  			$lessonObj->lessonSeq->items = $seqItems;
! //debug($seqItems);
! 			
! $lessonObj->save();
  		}
  
! 		$this->cleanupDir();
! exit();
  	}
  
--- 169,176 ----
  			$lessonObj->lessonSeq = new Lc_LessonSequence(-1,$classId);
  			$lessonObj->lessonSeq->items = $seqItems;
! 			$lessonObj->save();
  		}
  
! 		$this->cleanupDir($tempdir);
  	}
  
***************
*** 181,186 ****
  	 * Erase /tmp/campus* and the session varaible "restore_dir"
  	 */
! 	function cleanupDir() {
! 		$tempdir = $u->sessionvars['restore_dir'];
  		unset($u->sessionvars['restore_dir']);
  		unlink($tempdir.'/learningobjects.xml');
--- 178,183 ----
  	 * Erase /tmp/campus* and the session varaible "restore_dir"
  	 */
! 	function cleanupDir($tempdir) {
! //		$tempdir = $u->sessionvars['restore_dir'];
  		unset($u->sessionvars['restore_dir']);
  		unlink($tempdir.'/learningobjects.xml');