From 664c90890aedd847736d59b18e9ee4284fd4afc1 Mon Sep 17 00:00:00 2001 From: Charl Joseph Mert Date: Wed, 11 Nov 2009 17:17:04 +0200 Subject: [PATCH] Moved downloadTask.php out of the /bin directory to solve IIS6 issues. --- plugins/ktcore/KTBulkActions.php | 2 +- plugins/ktstandard/KTBulkExportPlugin.php | 2 +- presentation/lookAndFeel/knowledgeTree/bulkdownload/downloadTask.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 presentation/lookAndFeel/knowledgeTree/bulkdownload/downloadTask.php diff --git a/plugins/ktcore/KTBulkActions.php b/plugins/ktcore/KTBulkActions.php index 324ac8f..153d2b1 100644 --- a/plugins/ktcore/KTBulkActions.php +++ b/plugins/ktcore/KTBulkActions.php @@ -1156,7 +1156,7 @@ class KTBrowseBulkExportAction extends KTBulkAction { if($useQueue){ $result = parent::do_performaction(); - $url = KTUtil::kt_url() . '/bin/ajaxtasks/downloadTask.php'; + $url = KTUtil::kt_url() . '/presentation/lookAndFeel/knowledgeTree/bulkdownload/downloadTask.php'; $oTemplating =& KTTemplating::getSingleton(); $oTemplate = $oTemplating->loadTemplate('ktcore/action/bulk_download'); diff --git a/plugins/ktstandard/KTBulkExportPlugin.php b/plugins/ktstandard/KTBulkExportPlugin.php index 73576bd..966405a 100644 --- a/plugins/ktstandard/KTBulkExportPlugin.php +++ b/plugins/ktstandard/KTBulkExportPlugin.php @@ -93,7 +93,7 @@ class KTBulkExportAction extends KTFolderAction { if($useQueue){ DownloadQueue::addItem($exportCode, $sCurrentFolderId, $sCurrentFolderId, 'folder'); - $task_url = KTUtil::kt_url() . '/bin/ajaxtasks/downloadTask.php'; + $task_url = KTUtil::kt_url() . '/presentation/lookAndFeel/knowledgeTree/bulkdownload/downloadTask.php'; $oTemplating =& KTTemplating::getSingleton(); $oTemplate = $oTemplating->loadTemplate('ktcore/action/bulk_download'); diff --git a/presentation/lookAndFeel/knowledgeTree/bulkdownload/downloadTask.php b/presentation/lookAndFeel/knowledgeTree/bulkdownload/downloadTask.php new file mode 100644 index 0000000..f1d745a --- /dev/null +++ b/presentation/lookAndFeel/knowledgeTree/bulkdownload/downloadTask.php @@ -0,0 +1,47 @@ +isDownloadAvailable($code); + + if($status === false){ + echo 'wait'; + }else{ + $str = ''; + // display any error messages + if(!empty($status)){ + $str = '
'._kt('The following errors occurred during the download').':
'; + $str .= ''; + foreach ($status as $msg){ + $str .= ''; + } + $str .= '
'.$msg.'
'; + } + echo $str; + } + exit(0); +} + +if($queue->isLocked()){ + exit(0); +} +// Not a ping, process the queue +$queue->processQueue(); + +exit(0); +?> -- libgit2 0.21.4