Dev: remove tmp files of update process

LimeSurvey · Aug 13, 2015 · ba941f0 · ba941f0
1 parent c09a8fa
commit ba941f0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/application/controllers/admin/update.php b/application/controllers/admin/update.php
@@ -270,6 +270,9 @@ function step4()
                             // Should never bug (version.php is checked before))
                             $updateModel->updateVersion($destinationBuild);
                             $updateModel->destroyGlobalSettings();
+                            $updateModel->removeTmpFile('update.zip');
+                            $updateModel->removeTmpFile('comfort_updater_cookie.txt');
+
                             // TODO : aData should contains information about each step
                             return $this->controller->renderPartial('update/updater/steps/_final', array(), false, true);    
                         }

diff --git a/application/models/UpdateForm.php b/application/models/UpdateForm.php
@@ -339,6 +339,28 @@ public function removeDeletedFiles($updateinfos)
         return (object) $return;
     }
 
+    /**
+     * Delete a tmp file
+     * @param string the name of the file to delete in tmp/ directory 
+     * @return obj 
+     */
+    public function removeTmpFile($sTmpFile = 'update.zip')
+    {
+        $sTmpFilePath = $this->tempdir.DIRECTORY_SEPARATOR.$sTmpFile;
+        if ( file_exists( $sTmpFilePath ) )
+        {
+            if( ! @unlink( $sTmpFilePath ) )
+            {
+               $return = array('result'=>FALSE, 'error'=>'cant_remove_update_file', 'message'=>'file : '.$sTmpFilePath);
+               return (object) $return;
+            }
+        }
+
+        $return = array('result' => TRUE);
+        return (object) $return;
+    }
+
+
     /**
      * Update the version file to the destination build version
      * @param INT $destinationBuild the id of the new version