/drupal7/sites/all/modules/views_data_export/plugins/views_data_export_plugin_display_export.inc - Diff - Club Drupal - Forge Centrale Marseille

Revision 56aebcb7

Added by Assos Assos about 8 years ago

ID 56aebcb766231046bc7740e7a9e8d75dd2cced3b
Parent 6a93dd76
Child 59e46405

Weekly update of contrib modules

+        }
         // Try and get a batch context if possible.
         $eid = !empty($_GET['eid']) ? $_GET['eid'] :
                 (!empty($this->batched_execution_state->eid) ? $this->batched_execution_state->eid : FALSE);
         if (!empty($_GET['eid']) && !empty($_GET['token']) && drupal_valid_token($_GET['token'], 'views_data_export/' . $_GET['eid'])) {
           $eid = $_GET['eid'];
+        }
         elseif (!empty($this->batched_execution_state->eid)) {
           $eid = $this->batched_execution_state->eid;
+        }
         else {
           $eid = FALSE;
+        }
         if ($eid) {
           $this->batched_execution_state = views_data_export_get($eid);
+        }
-...
         $this->batched_execution_state = views_data_export_new($this->view->name, $this->view->current_display, $this->outputfile_create());
         views_data_export_view_store($this->batched_execution_state->eid, $this->view);
         // Record a usage of our file, so we can identify our exports later.
         file_usage_add(file_load($this->batched_execution_state->fid), 'views_data_export', 'eid', $this->batched_execution_state->eid);
         // We need to build the index right now, before we lose $_GET etc.
         $this->initialize_index();
         //$this->batched_execution_state->fid = $this->outputfile_create();
         // Initialize the progress counter
         $this->batched_execution_state->sandbox['max'] = db_query('SELECT COUNT(*) FROM {' . $this->index_tablename() . '}')->fetchField();
         // Initialize the progress counter.
         if (db_table_exists($this->index_tablename())) {
           $this->batched_execution_state->sandbox['max'] = db_query('SELECT COUNT(*) FROM {' . $this->index_tablename() . '}')->fetchField();
+        }
         // Record the time we started.
         list($usec, $sec) = explode(' ', microtime());
         $this->batched_execution_state->sandbox['started'] = (float) $usec + (float) $sec;
         // Pop something into the session to ensure it stays aorund.
         $_SESSION['views_data_export'][$this->batched_execution_state->eid] = TRUE;
         // Build up our querystring for the final page callback.
         $querystring = array(
           'eid' => $this->batched_execution_state->eid,
           'token' => drupal_get_token('views_data_export/' . $this->batched_execution_state->eid),
           'return-url' => NULL,
         );
-...
             break;
           case VIEWS_DATA_EXPORT_FOOTER:
             // Update the temporary file size, otherwise we would get a problematic
             // "Content-Length: 0" HTTP header, that may break the export download.
             $this->outputfile_update_size();
             $sandbox['finished'] = 1;
             $state->batch_state = VIEWS_DATA_EXPORT_FINISHED;
             break;
-...
       function execute_final() {
         // Should we download the file.
         if (!empty($_GET['download'])) {
           // Clean up our session, if we need to.
           if (isset($_SESSION)) {
             unset($_SESSION['views_data_export'][$this->batched_execution_state->eid]);
             if (empty($_SESSION['views_data_export'])) {
               unset($_SESSION['views_data_export']);
+            }
+          }
           // This next method will exit.
           $this->transfer_file();
+        }
-...
         $query = array(
           'download' => 1,
           'eid' => $this->batched_execution_state->eid,
           'token' => drupal_get_token('views_data_export/' . $this->batched_execution_state->eid),
         );
         return theme('views_data_export_complete_page', array(
-...
+        }
         // Set the headers.
         $this->add_http_headers();
         file_transfer($this->outputfile_path(), array());
         $headers = array(
           'Content-Length' => $this->outputfile_entity()->filesize,
         );
         file_transfer($this->outputfile_path(), $headers);
+      }
       /**
-...
+      }
       /**
        * Get the output file path.
        * Get the output file entity.
        */
       function outputfile_path() {
       public function outputfile_entity() {
         if (empty($this->_output_file)) {
           if (!empty($this->batched_execution_state->fid)) {
             // Return the filename associated with this file.
-...
             return NULL;
+          }
+        }
         return $this->_output_file->uri;
         return $this->_output_file;
+      }
       /**
        * Get the output file path.
        */
       public function outputfile_path() {
         if ($file = $this->outputfile_entity()) {
           return $file->uri;
+        }
+      }
       /**
-...
         // Save the file into the DB.
         $file = $this->file_save_file($path);
         // Make sure the file is marked as temporary.
         // There is no FILE_STATUS_TEMPORARY constant.
         $file->status = 0;
         file_save($file);
         return $file->fid;
+      }
-...
+        }
+      }
       /**
        * Updates the file size in the file entity.
        */
       protected function outputfile_update_size() {
         if ($file = $this->outputfile_entity()) {
           $file->filesize = filesize($file->uri);
           file_save($file);
+        }
+      }
       function abort_export($errors) {
         // Just cause the next batch to do the clean-up
         if (!is_array($errors)) {

Also available in: Unified diff

Project

General

Profile

Club Drupal

Revision 56aebcb7

Added by Assos Assos about 8 years ago