diff --git a/README.MD b/README.MD index fb29d59..2db80e1 100755 --- a/README.MD +++ b/README.MD @@ -100,7 +100,7 @@ Phoca Download is download manager for Joomla! CMS. It includes component, modul ## Version (Joomla! 5.x) -5.0.3 +5.0.4 diff --git a/admin/controllers/phocadownloadmanager.php b/admin/controllers/phocadownloadmanager.php index 5eb24db..47ca86f 100644 --- a/admin/controllers/phocadownloadmanager.php +++ b/admin/controllers/phocadownloadmanager.php @@ -67,10 +67,12 @@ function delete($key = null, $urlVar = null) { $cid = Factory::getApplication()->input->get('cid', array(), '', 'array'); $returnUrl = Factory::getApplication()->input->get( 'return-url', null, 'post', 'base64' );//includes field + $manager = Factory::getApplication()->input->get( 'manager', 'file', 'string' ); + if ($cid[0] != '') { - $filePath = PhocaDownloadPath::getPathSet('file'); + $filePath = PhocaDownloadPath::getPathSet($manager); $fileToRemove = $filePath['orig_abs_ds']. $cid[0]; if (File::exists($fileToRemove)) { @@ -79,7 +81,7 @@ function delete($key = null, $urlVar = null) { $query = 'SELECT a.filename' .' FROM #__phocadownload AS a' - .' WHERE a.filename = '.$db->quote($cid[0]) + .' WHERE a.filename = '.$db->quote($cid[0]) . ' OR a.filename_play = '.$db->quote($cid[0]). ' OR a.filename_preview = '.$db->quote($cid[0]) .' ORDER BY a.id'; $db->setQuery($query, 0, 1); $filename = $db->loadObject(); diff --git a/admin/views/phocadownloadmanager/tmpl/default.php b/admin/views/phocadownloadmanager/tmpl/default.php index 5b478ee..eea46f4 100755 --- a/admin/views/phocadownloadmanager/tmpl/default.php +++ b/admin/views/phocadownloadmanager/tmpl/default.php @@ -19,7 +19,7 @@ $r = new PhocaDownloadRenderAdminView(); -if ($this->manager == 'filemultiple') { +//if ($this->manager == 'filemultiple') { Factory::getDocument()->addScriptDeclaration(' @@ -64,7 +64,7 @@ //Joomla.submitform(task); }'); -} +//} echo '
'; @@ -79,6 +79,8 @@ echo '
'. "\n"; echo ''. "\n"; +} else { + echo $r->startForm($this->t['o'], $this->t['task'], 'adminForm', 'adminForm'); } if ($this->manager == 'filemultiple') { @@ -97,6 +99,7 @@ if ($this->manager == 'filemultiple') { echo ''. "\n"; } else { + echo '
'. "\n"; echo ''; } echo ''. "\n"; @@ -147,19 +150,24 @@ echo '' .''; -if ($this->manager == 'filemultiple') { + +// we have now delete function + +//if ($this->manager == 'filemultiple') { echo ''. "\n"; echo ''. "\n"; echo ''. "\n"; echo ''; + echo ''; echo HTMLHelper::_('form.token'); echo $r->endForm(); echo ''; echo '
'; -} ?> +//} +?>
 
diff --git a/admin/views/phocadownloadmanager/tmpl/default_file.php b/admin/views/phocadownloadmanager/tmpl/default_file.php index df2adb8..2d1bd3c 100755 --- a/admin/views/phocadownloadmanager/tmpl/default_file.php +++ b/admin/views/phocadownloadmanager/tmpl/default_file.php @@ -16,27 +16,28 @@ $group = PhocaDownloadSettings::getManagerGroup($this->manager); + +$checked = HTMLHelper::_('grid.id', $this->filei + count($this->folders), $this->files[$this->filei]->path_with_name_relative_no ); +$deleteCode = ''; + if ($this->manager == 'filemultiple') { - $checked = HTMLHelper::_('grid.id', $this->filei + count($this->folders), $this->files[$this->filei]->path_with_name_relative_no ); + $icon = PhocaDownloadFile::getMimeTypeIcon($this->_tmp_file->name); //$fileNameEncode = urlencode($this->_tmp_file->path_with_name_relative_no); //$deleteCode = ''; - $deleteCode = ''; - - - echo '' .' '. $checked .'' .' ' - . $icon .'' + . $icon .'' .' ' .'
' - .'
' . $this->_tmp_file->name . '
' + .'
' . $this->_tmp_file->name . '
' .'
' . $deleteCode . '
' + .'
' . '' .''; @@ -48,30 +49,42 @@ if (($group['i'] == 1) && ($ext == 'png' || $ext == 'jpg' || $ext == 'gif' || $ext == 'jpeg') ) { echo '' - .'' + .'
'.$checked.'
' .'' .'' . HTMLHelper::_( 'image', str_replace( '../', '', $this->_tmp_file->path_without_name_relative), Text::_('COM_PHOCADOWNLOAD_INSERT'), array('title' => Text::_('COM_PHOCADOWNLOAD_INSERT_ICON'), 'class' => 'pd-file-image')) .'' - .' ' + .'' + .'
' + .'
' .'' . $this->_tmp_file->name .'' + .'
' + .'
' . $deleteCode . '
' + .'
' + .'' .''; } else { echo '' - .'' + .'
'.$checked.'
' .'' .'' . HTMLHelper::_( 'image', $this->t['i'].'icon-file.png', '', Text::_('COM_PHOCADOWNLOAD_INSERT_FILENAME')) .'' - .' ' + .'' + .'
' + .'
' .'' . $this->_tmp_file->name .'' + .'
' + .'
' . $deleteCode . '
' + .'
' + .'' .''; } diff --git a/admin/views/phocadownloadmanager/view.html.php b/admin/views/phocadownloadmanager/view.html.php index 0f523e2..1ff6e54 100755 --- a/admin/views/phocadownloadmanager/view.html.php +++ b/admin/views/phocadownloadmanager/view.html.php @@ -138,7 +138,7 @@ public function display($tpl = null) { .$this->session->getName().'='.$this->session->getId().'&' . Session::getFormToken().'=1&tab=multipleupload&manager='.PhocaDownloadUtils::filterValue($this->manager, 'alphanumeric').'&field='.PhocaDownloadUtils::filterValue($this->field, 'alphanumeric2').'&folder='. PhocaDownloadUtils::filterValue($this->currentFolder, 'folderpath'); $mU->reload = Uri::base().'index.php?option=com_phocadownload&view=phocadownloadmanager' - .str_replace('&', '&', PhocaDownloadUtils::filterValue($group['c'], 'text')).'&' + .str_replace('&', '&', $group['c']).'&' .$this->session->getName().'='.$this->session->getId().'&' . Session::getFormToken().'=1&tab=multipleupload&' .'manager='.PhocaDownloadUtils::filterValue($this->manager, 'alphanumeric').'&field='.PhocaDownloadUtils::filterValue($this->field, 'alphanumeric2').'&folder='. PhocaDownloadUtils::filterValue($this->currentFolder, 'folderpath'); diff --git a/checksum.json b/checksum.json index 6ae6b72..2ed1b22 100644 --- a/checksum.json +++ b/checksum.json @@ -1 +1 @@ -{"com_phocadownload_v5.0.0Beta.zip":{"key":"com_phocadownload_v5.0.0Beta.zip","extname":"com_phocadownload","version":"5.0.0Beta","checksum":"60224eaec714795c831ccf2145be6272561bf62cb831a5f28ce2b738d894e3d9d24c2e3805e2d769e36d50cdb21ead28572a76f80de58271a2ad31cd9915c43d"},"com_phocadownload_v4.0.7.zip":{"key":"com_phocadownload_v4.0.7.zip","extname":"com_phocadownload","version":"4.0.7","checksum":"85092b0c0de78f23abb348f1083bd6de10e46f0cecfa50aa984fd84a67a9a2255cd6fcc30467b75a3ea545d81959520a9d11d86299c5f0a306ace8821d8c8e50"},"com_phocadownload_v5.0.0Beta2.zip":{"key":"com_phocadownload_v5.0.0Beta2.zip","extname":"com_phocadownload","version":"5.0.0Beta2","checksum":"833044110c7d55ca3fb245611868ba985c5ff4eae8b06355be4aef08072f9a76a3f8ff14af5c7fdbbebcb201dd7ddb48df6b54714f805393ff2bf8b629c560cd"},"com_phocadownload_v4.0.8.zip":{"key":"com_phocadownload_v4.0.8.zip","extname":"com_phocadownload","version":"4.0.8","checksum":"64fef93f6b61078f5c0e6596c02d6f30d0164a9eb849b112663619c53953ccb424977a00bbfb80e1648370e52c39640902f462ce214c24337d1c8a1cd73f8e56"},"com_phocadownload_v5.0.0Beta3.zip":{"key":"com_phocadownload_v5.0.0Beta3.zip","extname":"com_phocadownload","version":"5.0.0Beta3","checksum":"7dc10421dac2b7d282ca7bbca8bf84f6edf8c181969658b854e921205b434bf13c7b100c6b95146107134d2c3c3c7b7699d6514c36122a403e134ce7b8bfe1d9"},"com_phocadownload_v4.0.9.zip":{"key":"com_phocadownload_v4.0.9.zip","extname":"com_phocadownload","version":"4.0.9","checksum":"505a376b9508fcde09202ef2541d3a01da2cc596de9a0464f0acf5f35fe8fa00fc3348ccfffa03f56e5ba17f9bb5c7e91661816d5a1a4fdd58403a8dce4d2d49"},"com_phocadownload_v5.0.0Beta4.zip":{"key":"com_phocadownload_v5.0.0Beta4.zip","extname":"com_phocadownload","version":"5.0.0Beta4","checksum":"47b180bd30190f062658f5db7cabe7e4d6cda9a087ae154c91a109b14c4edfd9699c9dc40265725f0f466cc014e7590625a1f36807faf395befe06e361c3daab"},"com_phocadownload_v5.0.0Beta5.zip":{"key":"com_phocadownload_v5.0.0Beta5.zip","extname":"com_phocadownload","version":"5.0.0Beta5","checksum":"f64596ead1ef5edeca9360fd30d0ad005b008d7c12b059aeeef63e0e85c98303ca37ea090137e17442a4bb426d52c554aac391396ce03607cf027c4d0bf61cd8"},"com_phocadownload_v5.0.0Beta6.zip":{"key":"com_phocadownload_v5.0.0Beta6.zip","extname":"com_phocadownload","version":"5.0.0Beta6","checksum":"613bff446c16ddb3348a087f7ca34dd9f9d6280200b5a6a839f05375d14d115d6ee7b30486bea9d0938d19d6252503cd1767e504f0f4688d24d9114b7675e3b7"},"com_phocadownload_v4.0.10Beta.zip":{"key":"com_phocadownload_v4.0.10Beta.zip","extname":"com_phocadownload","version":"4.0.10Beta","checksum":"1049b5b2b9cd00d5ac5fa9ff1d00380c2fec8abdd33100205023c0c8d05746c157b140351f5f28ca2ad2a58a585a86384335388cea94d09dc58fe9f5aeca3e19"},"com_phocadownload_v5.0.0Beta7.zip":{"key":"com_phocadownload_v5.0.0Beta7.zip","extname":"com_phocadownload","version":"5.0.0Beta7","checksum":"bb7c0a28286b520d3d6896065d64dab11a2fecdd45050b1bb50b6867614bccab08f73cf5dba6c91228b36d0c5abaa11fbe8f23cbebad3c22661e38d00553e40c"},"com_phocadownload_v5.0.0.zip":{"key":"com_phocadownload_v5.0.0.zip","extname":"com_phocadownload","version":"5.0.0","checksum":"7495f79d9bb0711aa03f1f48ad835472451b2829070a94ed0b844df924ca26573c9d8bca34e9cdc9703168ac1f0b93b8a0529f814ecc4f8eb4c1f5de67b4553d"},"com_phocadownload_v5.0.1.zip":{"key":"com_phocadownload_v5.0.1.zip","extname":"com_phocadownload","version":"5.0.1","checksum":"db3921291c66ae5a2969eda7ec5cdb31c4453953928581282614efec15b30b7f55343bbb2163d34778279264e68f31b9946fc300522ca0dec58477ff000dcc7c"},"com_phocadownload_v5.0.2.zip":{"key":"com_phocadownload_v5.0.2.zip","extname":"com_phocadownload","version":"5.0.2","checksum":"ff00e0114a1f2fa83f0f3699bb2e23bee2011d9fb38aa690f20b0d6e07bb0cf7def82e33ea6ac3038bee635befad0cf7cdf80d20d6f2a6de41e20a693869e95a"},"com_phocadownload_v5.0.3.zip":{"key":"com_phocadownload_v5.0.3.zip","extname":"com_phocadownload","version":"5.0.3","checksum":"8d9af7089d335c0caba5c3ff99f146908c893af8d91bdceb5a0f2583bb946cb222e66de89a6cc7bb35ae27adccbfadff180a3bfb7ca11841294fe13901070554"}} \ No newline at end of file +{"com_phocadownload_v5.0.0Beta.zip":{"key":"com_phocadownload_v5.0.0Beta.zip","extname":"com_phocadownload","version":"5.0.0Beta","checksum":"60224eaec714795c831ccf2145be6272561bf62cb831a5f28ce2b738d894e3d9d24c2e3805e2d769e36d50cdb21ead28572a76f80de58271a2ad31cd9915c43d"},"com_phocadownload_v4.0.7.zip":{"key":"com_phocadownload_v4.0.7.zip","extname":"com_phocadownload","version":"4.0.7","checksum":"85092b0c0de78f23abb348f1083bd6de10e46f0cecfa50aa984fd84a67a9a2255cd6fcc30467b75a3ea545d81959520a9d11d86299c5f0a306ace8821d8c8e50"},"com_phocadownload_v5.0.0Beta2.zip":{"key":"com_phocadownload_v5.0.0Beta2.zip","extname":"com_phocadownload","version":"5.0.0Beta2","checksum":"833044110c7d55ca3fb245611868ba985c5ff4eae8b06355be4aef08072f9a76a3f8ff14af5c7fdbbebcb201dd7ddb48df6b54714f805393ff2bf8b629c560cd"},"com_phocadownload_v4.0.8.zip":{"key":"com_phocadownload_v4.0.8.zip","extname":"com_phocadownload","version":"4.0.8","checksum":"64fef93f6b61078f5c0e6596c02d6f30d0164a9eb849b112663619c53953ccb424977a00bbfb80e1648370e52c39640902f462ce214c24337d1c8a1cd73f8e56"},"com_phocadownload_v5.0.0Beta3.zip":{"key":"com_phocadownload_v5.0.0Beta3.zip","extname":"com_phocadownload","version":"5.0.0Beta3","checksum":"7dc10421dac2b7d282ca7bbca8bf84f6edf8c181969658b854e921205b434bf13c7b100c6b95146107134d2c3c3c7b7699d6514c36122a403e134ce7b8bfe1d9"},"com_phocadownload_v4.0.9.zip":{"key":"com_phocadownload_v4.0.9.zip","extname":"com_phocadownload","version":"4.0.9","checksum":"505a376b9508fcde09202ef2541d3a01da2cc596de9a0464f0acf5f35fe8fa00fc3348ccfffa03f56e5ba17f9bb5c7e91661816d5a1a4fdd58403a8dce4d2d49"},"com_phocadownload_v5.0.0Beta4.zip":{"key":"com_phocadownload_v5.0.0Beta4.zip","extname":"com_phocadownload","version":"5.0.0Beta4","checksum":"47b180bd30190f062658f5db7cabe7e4d6cda9a087ae154c91a109b14c4edfd9699c9dc40265725f0f466cc014e7590625a1f36807faf395befe06e361c3daab"},"com_phocadownload_v5.0.0Beta5.zip":{"key":"com_phocadownload_v5.0.0Beta5.zip","extname":"com_phocadownload","version":"5.0.0Beta5","checksum":"f64596ead1ef5edeca9360fd30d0ad005b008d7c12b059aeeef63e0e85c98303ca37ea090137e17442a4bb426d52c554aac391396ce03607cf027c4d0bf61cd8"},"com_phocadownload_v5.0.0Beta6.zip":{"key":"com_phocadownload_v5.0.0Beta6.zip","extname":"com_phocadownload","version":"5.0.0Beta6","checksum":"613bff446c16ddb3348a087f7ca34dd9f9d6280200b5a6a839f05375d14d115d6ee7b30486bea9d0938d19d6252503cd1767e504f0f4688d24d9114b7675e3b7"},"com_phocadownload_v4.0.10Beta.zip":{"key":"com_phocadownload_v4.0.10Beta.zip","extname":"com_phocadownload","version":"4.0.10Beta","checksum":"1049b5b2b9cd00d5ac5fa9ff1d00380c2fec8abdd33100205023c0c8d05746c157b140351f5f28ca2ad2a58a585a86384335388cea94d09dc58fe9f5aeca3e19"},"com_phocadownload_v5.0.0Beta7.zip":{"key":"com_phocadownload_v5.0.0Beta7.zip","extname":"com_phocadownload","version":"5.0.0Beta7","checksum":"bb7c0a28286b520d3d6896065d64dab11a2fecdd45050b1bb50b6867614bccab08f73cf5dba6c91228b36d0c5abaa11fbe8f23cbebad3c22661e38d00553e40c"},"com_phocadownload_v5.0.0.zip":{"key":"com_phocadownload_v5.0.0.zip","extname":"com_phocadownload","version":"5.0.0","checksum":"7495f79d9bb0711aa03f1f48ad835472451b2829070a94ed0b844df924ca26573c9d8bca34e9cdc9703168ac1f0b93b8a0529f814ecc4f8eb4c1f5de67b4553d"},"com_phocadownload_v5.0.1.zip":{"key":"com_phocadownload_v5.0.1.zip","extname":"com_phocadownload","version":"5.0.1","checksum":"db3921291c66ae5a2969eda7ec5cdb31c4453953928581282614efec15b30b7f55343bbb2163d34778279264e68f31b9946fc300522ca0dec58477ff000dcc7c"},"com_phocadownload_v5.0.2.zip":{"key":"com_phocadownload_v5.0.2.zip","extname":"com_phocadownload","version":"5.0.2","checksum":"ff00e0114a1f2fa83f0f3699bb2e23bee2011d9fb38aa690f20b0d6e07bb0cf7def82e33ea6ac3038bee635befad0cf7cdf80d20d6f2a6de41e20a693869e95a"},"com_phocadownload_v5.0.3.zip":{"key":"com_phocadownload_v5.0.3.zip","extname":"com_phocadownload","version":"5.0.3","checksum":"8d9af7089d335c0caba5c3ff99f146908c893af8d91bdceb5a0f2583bb946cb222e66de89a6cc7bb35ae27adccbfadff180a3bfb7ca11841294fe13901070554"},"com_phocadownload_v5.0.4.zip":{"key":"com_phocadownload_v5.0.4.zip","extname":"com_phocadownload","version":"5.0.4","checksum":"1a1f97f53d8aa4f3d11bebd43ff407555976eee52f4ef08c9232fc00d73aac3d1356b5ae721b7d283c5956e4c102eeae0d0eb22f926d8f7491d9c8cd61cce4a0"}} \ No newline at end of file diff --git a/manifest.xml b/manifest.xml index 154a72d..c59d3be 100755 --- a/manifest.xml +++ b/manifest.xml @@ -44,12 +44,12 @@ com_phocadownload component - 5.0.3 - http://www.phoca.cz/version/index.php?phocadownload=5.0.3 + 5.0.4 + http://www.phoca.cz/version/index.php?phocadownload=5.0.4 - https://github.com/PhocaCz/PhocaDownload/releases/download/5.0.3/com_phocadownload_v5.0.3.zip + https://github.com/PhocaCz/PhocaDownload/releases/download/5.0.4/com_phocadownload_v5.0.4.zip - 8d9af7089d335c0caba5c3ff99f146908c893af8d91bdceb5a0f2583bb946cb222e66de89a6cc7bb35ae27adccbfadff180a3bfb7ca11841294fe13901070554 + 1a1f97f53d8aa4f3d11bebd43ff407555976eee52f4ef08c9232fc00d73aac3d1356b5ae721b7d283c5956e4c102eeae0d0eb22f926d8f7491d9c8cd61cce4a0 stable diff --git a/phocadownload-release-news.png b/phocadownload-release-news.png index c48c1ca..10daf9a 100644 Binary files a/phocadownload-release-news.png and b/phocadownload-release-news.png differ diff --git a/phocadownload-release-news.svg b/phocadownload-release-news.svg index 09616a2..8743a0b 100644 --- a/phocadownload-release-news.svg +++ b/phocadownload-release-news.svg @@ -21,7 +21,7 @@ WWW.PHOCA.CZ/NEWS - Phoca Downloadversion 5.0.3 + Phoca Downloadversion 5.0.4 has been released diff --git a/phocadownload-release.png b/phocadownload-release.png index d6209dc..2f5f355 100755 Binary files a/phocadownload-release.png and b/phocadownload-release.png differ diff --git a/phocadownload-release.svg b/phocadownload-release.svg index 4d75754..cee977d 100644 --- a/phocadownload-release.svg +++ b/phocadownload-release.svg @@ -132,7 +132,7 @@ x="255.99997" y="242.20009" id="tspan1992" - style="font-size:34.6667px;text-align:center;text-anchor:middle">version 5.0.3 + style="font-size:34.6667px;text-align:center;text-anchor:middle">version 5.0.4 com_phocadownload Jan Pavelka (www.phoca.cz) - 20/06/2024 + 21/06/2024 https://www.phoca.cz Jan Pavelka GNU/GPL - 5.0.3 + 5.0.4 COM_PHOCADOWNLOAD_XML_DESCRIPTION script.php PhocaDownload