modified move function

Author: ms217

server/lib/classes/system.inc.php

@@ -934,18 +934,12 @@ function copy($file1, $file2) {
 		return copy($file1, $file2);
 	}
 
-        function move($file1, $file2) {
-		if(file_exists($file1) || is_link($file1) && is_dir(realpath(dirname($file2)))) {
-			if(copy($file1, $file2)) {
-				return unlink($file1);
-			} else {
-				$app->log("move failed: couldn't move file/link " .$file1. " to " .$file2, LOGLEVEL_DEBUG);
-				return false;
-			}
-		} else {
-			$app->log("move failed: source " .$file1. " doesn't exist.", LOGLEVEL_DEBUG);
-			return false;
+	function move($file1, $file2) {
+		$result = $this->copy($file1, $file2);
+		if($result) {
+			$result &= $this->unlink($file1);
 		}
+		return $result;
         }
 
 	function touch($file, $allow_symlink = false){