From f89f3701dfd6c3e240b7cf792e3c151927ec9724 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 29 Feb 2012 23:42:40 +0100 Subject: [PATCH] renamed the function to modify mtime of files to touch. --- lib/connector/sabre/node.php | 12 ++++-------- lib/filestorage/local.php | 17 ++++++++++------- lib/filesystem.php | 4 ++-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index b8b675c1203..41acb48dfb6 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -97,12 +97,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr * in the second parameter or to now if the second param is empty. * Even if the modification time is set to a custom value the access time is set to now. */ - public function setLastModifiedTime($mtime) { - OC_Filesystem::setFileMtime($this->path, $mtime); - } - - public function endsWith( $str, $sub ) { - return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub ); + public function touch($mtime) { + OC_Filesystem::touch($this->path, $mtime); } /** @@ -123,8 +119,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } } else { - if( $this->endsWith( $propertyName, "modificationTime")) { - $this->setLastModifiedTime($propertyValue); + if( strcmp( $propertyName, "lastmodified")) { + $this->touch($propertyValue); } else { if(!array_key_exists( $propertyName, $existing )){ $query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' ); diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index a94098bb7c1..71eccb5d1e0 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -70,13 +70,16 @@ class OC_Filestorage_Local extends OC_Filestorage{ public function fileatime($path){ return fileatime($this->datadir.$path); } - - public function setFileMtime($path, $mtime){ - // sets the modification time of the file to the given value. If mtime is nil the current time is set. - // note that the access time of the file always changes to the current time. - return touch($this->datadir.$path, $mtime); - } - + public function touch($path, $mtime){ + // sets the modification time of the file to the given value. + // If mtime is nil the current time is set. + // note that the access time of the file always changes to the current time. + if( touch( $this->datadir.$path, $mtime ) ) { + clearstatcache( true, $this->datadir.$path ); + } + + return touch($this->datadir.$path, $mtime); + } public function file_get_contents($path){ return file_get_contents($this->datadir.$path); } diff --git a/lib/filesystem.php b/lib/filesystem.php index e92dc7d7366..986dfea64f6 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -369,8 +369,8 @@ class OC_Filesystem{ static public function fileatime($path){ return self::basicOperation('fileatime',$path); } - static public function setFileMtime($path, $mtime){ - return self::$defaultInstance->setFileMtime($path, $mtime); + static public function touch($path, $mtime){ + return self::$defaultInstance->touch($path, $mtime); } static public function file_get_contents($path){ return self::basicOperation('file_get_contents',$path,array('read'));