Changeset 339 for trunk

Timestamp:

03/30/10 23:49:32 (11 years ago)

Author:

sander

Message:

Fix state updates for virus scan

File:

• trunk/server/www/app/models/request.php (modified) (4 diffs)

trunk/server/www/app/models/request.php

@@ -71 +71 @@
                 $this->Preprocessor->callback('validateFile');
                 $this->Preprocessor->callback('saveField', 'state', self::STATE_QUEUED);
-                $this->Preprocessor->errback('saveField', 'state', self::STATE_PREPROCESSOR_FAILED);
+                $this->Preprocessor->errback('preprocessorError');
         }
 
@@ -404 +404 @@
                         $this->data['Request']['state_info'] = $result;
                         $this->data['Request']['expire'] = date('Y-m-d H:i:s');
+                        $this->save();
+
                         $this->log('Clamd scanned ' . $path . ' (Request ID: ' . $this->id . '): FOUND ' . $result, LOG_DEBUG);
                         return false;
@@ -416 +418 @@
                         $this->data['Request']['state_info'] = $result;
                         $this->data['Request']['expire'] = date('Y-m-d H:i:s');
+                        $this->save();
 
                         $this->log('Clamd error scanning ' . $path . ' (Request ID: ' . $this->id . '): ' . $result);
@@ -493 +496 @@
                 return true;
         }
+
+        public function preprocessorError()
+        {
+                $state = $this->field('state');
+                if ($state == self::STATE_PREPROCESSOR_QUEUED) {
+                        $this->saveField('state', self::STATE_PREPROCESSOR_FAILED);
+                }
+        }
 }