From df9dfc3e7c0ad9665c079a57f37f7eab26be01d0 Mon Sep 17 00:00:00 2001 From: Thomas de Jesus Date: Thu, 9 Mar 2017 09:05:13 -0600 Subject: [PATCH] Update FC_Multimedia.php Multimedia files were not displaying in the file browser in CKEditor. was getting undefined variable filepath --- .../class/FC_Forms/FC_Multimedia.php | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/mod/filecabinet/class/FC_Forms/FC_Multimedia.php b/mod/filecabinet/class/FC_Forms/FC_Multimedia.php index 5e63d8c15..08d2e79da 100644 --- a/mod/filecabinet/class/FC_Forms/FC_Multimedia.php +++ b/mod/filecabinet/class/FC_Forms/FC_Multimedia.php @@ -27,28 +27,33 @@ public function printFolderFiles() if (empty($files)) { return null; } else { - $template->addVariables(array('files' => $files, 'empty' => null)); + $template->addVariables(array('files' => $files, 'empty'=>null)); } return $template->get(); } + public function printFile($id) { - $db = \phpws2\Database::newDB(); - $t = $db->addTable('multimedia'); - $t->addFieldConditional('id', (int) $id); - $row = $db->selectOneRow(); - if (empty($row)) { - return null; - } - $ext = \PHPWS_File::getFileExtension($row['file_name']); - if ($ext == 'mp3') { - $template = 'filters/audio.tpl'; - } else { - $template = 'filters/media.tpl'; - } - - return \PHPWS_Template::process(array('FILE_PATH' => $row['file_directory'] . $row['file_name']), 'filecabinet', $template); + $db = \phpws2\Database::newDB(); + $t = $db->addTable('multimedia'); + $t->addFieldConditional('id', (int)$id); + $row = $db->selectOneRow(); + if (empty($row)) { + return null; + } + $ext = \PHPWS_File::getFileExtension($row['file_name']); + if ($ext == 'mp3') { + $template = 'filters/audio.tpl'; + } else { + $template = 'filters/media.tpl'; + } + + $template = new \phpws2\Template; + $template->setModuleTemplate('filecabinet', 'FC_Forms/multimedia_view.html'); + $template->add('title', $row['title']); + $template->add('filepath', $row['file_directory'] . $row['file_name']); + return $template->get(); } }