Merge branch 'wip-MDL-51985-master' of https://github.com/marinaglanc…

…y/moodle
crazyserver · Dec 3, 2015 · b4153ff · b4153ff
2 parents 38e0faa + 58e5ab1
commit b4153ff
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php
@@ -2196,7 +2196,7 @@ public function update_references_to_storedfile(stored_file $storedfile) {
         $now = time();
         foreach ($rs as $record) {
             $this->update_references($record->id, $now, null,
-                    $storedfile->get_contenthash(), $storedfile->get_filesize(), 0);
+                    $storedfile->get_contenthash(), $storedfile->get_filesize(), 0, $storedfile->get_timemodified());
         }
         $rs->close();
     }
@@ -2414,8 +2414,9 @@ private function get_referencefileid($repositoryid, $reference, $strictness) {
      * @param string $contenthash
      * @param int $filesize
      * @param int $status 0 if ok or 666 if source is missing
+     * @param int $timemodified last time modified of the source, if known
      */
-    public function update_references($referencefileid, $lastsync, $lifetime, $contenthash, $filesize, $status) {
+    public function update_references($referencefileid, $lastsync, $lifetime, $contenthash, $filesize, $status, $timemodified = null) {
         global $DB;
         $referencefileid = clean_param($referencefileid, PARAM_INT);
         $lastsync = clean_param($lastsync, PARAM_INT);
@@ -2425,9 +2426,10 @@ public function update_references($referencefileid, $lastsync, $lifetime, $conte
         $params = array('contenthash' => $contenthash,
                     'filesize' => $filesize,
                     'status' => $status,
-                    'referencefileid' => $referencefileid);
+                    'referencefileid' => $referencefileid,
+                    'timemodified' => $timemodified);
         $DB->execute('UPDATE {files} SET contenthash = :contenthash, filesize = :filesize,
-            status = :status
+            status = :status ' . ($timemodified ? ', timemodified = :timemodified' : '') . '
             WHERE referencefileid = :referencefileid', $params);
         $data = array('id' => $referencefileid, 'lastsync' => $lastsync);
         $DB->update_record('files_reference', (object)$data);

diff --git a/lib/filestorage/stored_file.php b/lib/filestorage/stored_file.php
@@ -961,8 +961,9 @@ public function get_reference_details() {
      * @param null|string $contenthash if set to null contenthash is not changed
      * @param int $filesize new size of the file
      * @param int $status new status of the file (0 means OK, 666 - source missing)
+     * @param int $timemodified last time modified of the source, if known
      */
-    public function set_synchronized($contenthash, $filesize, $status = 0) {
+    public function set_synchronized($contenthash, $filesize, $status = 0, $timemodified = null) {
         if (!$this->is_external_file()) {
             return;
         }
@@ -974,12 +975,15 @@ public function set_synchronized($contenthash, $filesize, $status = 0) {
             $oldcontenthash = $this->file_record->contenthash;
         }
         // this will update all entries in {files} that have the same filereference id
-        $this->fs->update_references($this->file_record->referencefileid, $now, null, $contenthash, $filesize, $status);
+        $this->fs->update_references($this->file_record->referencefileid, $now, null, $contenthash, $filesize, $status, $timemodified);
         // we don't need to call update() for this object, just set the values of changed fields
         $this->file_record->contenthash = $contenthash;
         $this->file_record->filesize = $filesize;
         $this->file_record->status = $status;
         $this->file_record->referencelastsync = $now;
+        if ($timemodified) {
+            $this->file_record->timemodified = $timemodified;
+        }
         if (isset($oldcontenthash)) {
             $this->fs->deleted_file_cleanup($oldcontenthash);
         }

diff --git a/repository/filesystem/lib.php b/repository/filesystem/lib.php
@@ -375,7 +375,8 @@ public function sync_reference(stored_file $file) {
                 $filesize = filesize($filepath);
             }
             $issyncing = false;
-            $file->set_synchronized($contenthash, $filesize);
+            $modified = filemtime($filepath);
+            $file->set_synchronized($contenthash, $filesize, 0, $modified);
         } else {
             $file->set_missingsource();
         }

diff --git a/repository/lib.php b/repository/lib.php
@@ -2752,7 +2752,7 @@ public function sync_reference(stored_file $file) {
                     $params['filename']))) {
                 $file->set_missingsource();
             } else {
-                $file->set_synchronized($storedfile->get_contenthash(), $storedfile->get_filesize());
+                $file->set_synchronized($storedfile->get_contenthash(), $storedfile->get_filesize(), 0, $storedfile->get_timemodified());
             }
             return true;
         }