From e442412dd02c4f362edd3e3d0fac4467802bca62 Mon Sep 17 00:00:00 2001 From: Giovanni Mansillo Date: Wed, 4 Apr 2018 14:21:50 +0200 Subject: [PATCH] 5.1.5 (#92) * Added list and listitem role attributes for frontens lists as required by ARIA accessibility rules * Update README.md * Restored frontend backlink * Minor fixes * Source code adapted in according to JED rules --- README.md | 2 +- admin/controllers/document.php | 9 +++------ .../en-GB/en-GB.com_simplefilemanager.sys.ini | 2 +- .../it-IT/it-IT.com_simplefilemanager.sys.ini | 2 +- script.php | 3 +-- simplefilemanager.xml | 2 +- site/controllers/documentform.php | 11 +++-------- site/language/en-GB/en-GB.com_simplefilemanager.ini | 2 +- site/language/it-IT/it-IT.com_simplefilemanager.ini | 2 +- site/models/document.php | 4 ++-- site/models/documentform.php | 10 +++------- site/views/categories/tmpl/default.php | 3 ++- site/views/categories/tmpl/default_items.php | 5 +++-- site/views/category/tmpl/default.php | 1 + site/views/category/tmpl/default_items.php | 6 +++--- site/views/document/tmpl/default.php | 2 ++ site/views/document/view.html.php | 4 +--- site/views/document/view.raw.php | 4 +--- site/views/documentform/tmpl/default.php | 3 +++ 19 files changed, 34 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 2db7aa4..fb48437 100644 --- a/README.md +++ b/README.md @@ -73,4 +73,4 @@ The code in this project is licensed under the **GNU General Public License v3.0 All bugs, feature requests, pull requests, feedback, etc., are welcome. If you encountered an error, [create an issue](https://github.com/gmansillo/simple/issues/new). -If you liked Simple File Manager or you found it useful for your purposes, you can help me rating it on the Joomla! Extension Directory :heart: +If you liked Simple File Manager or you found it useful for your purposes, you can help me rating it on the Joomla! Extension Directory :heart: \ No newline at end of file diff --git a/admin/controllers/document.php b/admin/controllers/document.php index dfd7c48..caf630a 100644 --- a/admin/controllers/document.php +++ b/admin/controllers/document.php @@ -33,8 +33,6 @@ public function save($key = null, $urlVar = null) { jimport('joomla.filesystem.file'); jimport('joomla.utilities.date'); - define('DS', DIRECTORY_SEPARATOR); - // Load data $input = JFactory::getApplication()->input; $this->form = $input->post->get('jform', null, 'RAW'); @@ -45,8 +43,7 @@ public function save($key = null, $urlVar = null) { $uploadFieldName = $isNew ? "select_file" : "replace_file"; if ($isNew && !$this->files[$uploadFieldName]["size"]) { - JError::raiseError(403, JText::_('COM_SIMPLEFILEMANAGER_NO_FILE_ERROR_MESSAGE')); - return; + throw new Exception(JText::_('COM_SIMPLEFILEMANAGER_NO_FILE_ERROR_MESSAGE'), 403); } // File management @@ -58,7 +55,7 @@ public function save($key = null, $urlVar = null) { // Upload file $file_name = $this->files[$uploadFieldName]["name"]; - $dest = JPATH_COMPONENT_ADMINISTRATOR . DS . "uploads" . DS . uniqid("", true) . DS . JFile::makeSafe(JFile::getName($file_name)); + $dest = JPATH_COMPONENT_ADMINISTRATOR . "/uploads/" . uniqid("", true) . "/". JFile::makeSafe(JFile::getName($file_name)); $upload = JFile::upload($this->files[$uploadFieldName]["tmp_name"], $dest) ? $dest : false; if (!$upload || $this->form["file_name"] == $upload) { @@ -94,7 +91,7 @@ public function save($key = null, $urlVar = null) { $this->form["state"] = 0; } - // Save data back to the $_POST global variable + // Save data back to the POST global variable JFactory::getApplication()->input->post->set('jform', $this->form); parent::save($key, $urlVar); diff --git a/admin/language/en-GB/en-GB.com_simplefilemanager.sys.ini b/admin/language/en-GB/en-GB.com_simplefilemanager.sys.ini index c1a3c17..77d1a70 100755 --- a/admin/language/en-GB/en-GB.com_simplefilemanager.sys.ini +++ b/admin/language/en-GB/en-GB.com_simplefilemanager.sys.ini @@ -3,7 +3,7 @@ COM_SIMPLEFILEMANAGER_MENU = "Simple File Manager" COM_SIMPLEFILEMANAGER_MENU_DOCUMENTS = "Documents" COM_SIMPLEFILEMANAGER_MENU_CATEGORIES = "Categories" COM_SIMPLEFILEMANAGER_PREFLIGHT_VERSION_ERROR = "Cannot install Simple File Manager %s in a Joomla! release prior to %s (current version: %s). Please update Joomla! and retry." -COM_SIMPLEFILEMANAGER_INSTALL_TEXT = "

Awesome!

Now you are ready to create beautiful download centers.
Please remember: you can manage your documents in Components > Simple File Manager > Documents.

Manage documents Rate this extension

" +COM_SIMPLEFILEMANAGER_INSTALL_TEXT = "

Awesome!

Now you are ready to create beautiful download centers.

Manage documents Rate this extension

" [Frontend views] COM_SIMPLEFILEMANAGER_CATEGORIES_VIEW_DEFAULT_DESC = "Shows a list of document categories within a category." diff --git a/admin/language/it-IT/it-IT.com_simplefilemanager.sys.ini b/admin/language/it-IT/it-IT.com_simplefilemanager.sys.ini index b7c77a1..71bcac1 100755 --- a/admin/language/it-IT/it-IT.com_simplefilemanager.sys.ini +++ b/admin/language/it-IT/it-IT.com_simplefilemanager.sys.ini @@ -3,7 +3,7 @@ COM_SIMPLEFILEMANAGER_MENU = "Simple File Manager" COM_SIMPLEFILEMANAGER_MENU_DOCUMENTS = "Documenti" COM_SIMPLEFILEMANAGER_MENU_CATEGORIES = "Categorie" COM_SIMPLEFILEMANAGER_PREFLIGHT_VERSION_ERROR = "Impossibile installare Simple File Manager %s in una versione di Joomla! precedente alla %s (versione attuale: %s). Per favore aggiorna Joomla! e prova nuovamente." -COM_SIMPLEFILEMANAGER_INSTALL_TEXT = "

Fantastico!

Ora sei pronto per creare magnifiche aree download.
Ricorda: puoi gestire i tuoi documenti da Componenti > Simple File Manager > Documenti.

Gestisci documenti > Valuta questa estensione

" +COM_SIMPLEFILEMANAGER_INSTALL_TEXT = "

Fantastico!

Ora sei pronto per creare magnifiche aree download.

Gestisci documenti > Valuta questa estensione

" [Frontend views] COM_SIMPLEFILEMANAGER_CATEGORIES_VIEW_DEFAULT_DESC = "Mostra una lista di categorie di documenti all'interno di una categoria." diff --git a/script.php b/script.php index 43fbee5..f12f110 100755 --- a/script.php +++ b/script.php @@ -24,8 +24,7 @@ function preflight($type, $parent) { // abort if the current Joomla release is older if (version_compare($jversion->getShortVersion(), $minimum_joomla_release, 'lt')) { $errorMessage = sprintf(JText::_('COM_SIMPLEFILEMANAGER_PREFLIGHT_VERSION_ERROR'), $current_simple_version, $minimum_joomla_release, $jversion->getShortVersion()); - Jerror::raiseWarning(null, $errorMessage); - + JFactory::getApplication()->enqueueMessage($errorMessage, 'warning'); return false; } } diff --git a/simplefilemanager.xml b/simplefilemanager.xml index 83d5449..464a2ad 100755 --- a/simplefilemanager.xml +++ b/simplefilemanager.xml @@ -7,7 +7,7 @@ GNU General Public License version 3 or later support@simplefilemanager.eu http://www.simplefilemanager.eu - 5.1.4 + 5.1.5 script.php diff --git a/site/controllers/documentform.php b/site/controllers/documentform.php index 31b4f1d..19ab4b1 100644 --- a/site/controllers/documentform.php +++ b/site/controllers/documentform.php @@ -10,8 +10,6 @@ require_once(JPATH_COMPONENT_ADMINISTRATOR . '/helpers/simplefilemanager.php'); require_once JPATH_COMPONENT . '/controller.php'; -define('DS', DIRECTORY_SEPARATOR); - /** * Simplefilemanager controller class. */ @@ -72,9 +70,7 @@ public function save() { // Validate the posted data. $form = $model->getForm(); if (!$form) { - JError::raiseError(500, $model->getError()); - - return false; + throw new Exception($model->getError(), 500); } // Validate the posted data. @@ -162,8 +158,7 @@ protected function prepareDataBeforeSave(&$data, $files) { if ($files["select_file"]["size"] <= 0) { if ($isNew) { - JError::raiseError(403, JText::_('COM_SIMPLEFILEMANAGER_NO_FILE_ERROR_MESSAGE')); - return; + throw new Exception(JText::_('COM_SIMPLEFILEMANAGER_NO_FILE_ERROR_MESSAGE'), 503); } } else { @@ -176,7 +171,7 @@ protected function prepareDataBeforeSave(&$data, $files) { // TODO: Implement file extension check // File upload $file_name = $files["select_file"]["name"]; - $dest = JPATH_COMPONENT_ADMINISTRATOR . DS . "uploads" . DS . uniqid("", true) . DS . JFile::makeSafe(JFile::getName($file_name)); + $dest = JPATH_COMPONENT_ADMINISTRATOR . "/uploads/" . uniqid("", true) . "/". JFile::makeSafe(JFile::getName($file_name)); $data["file_name"] = JFile::upload($files["select_file"]["tmp_name"], $dest) ? $dest : false; if (!$data["file_name"]) { diff --git a/site/language/en-GB/en-GB.com_simplefilemanager.ini b/site/language/en-GB/en-GB.com_simplefilemanager.ini index ab10eea..881e8d8 100755 --- a/site/language/en-GB/en-GB.com_simplefilemanager.ini +++ b/site/language/en-GB/en-GB.com_simplefilemanager.ini @@ -5,7 +5,7 @@ COM_SIMPLEFILEMANAGER_VISIBILITY_4_GROUP = "Selected groups" COM_SIMPLEFILEMANAGER_VISIBILITY_5_AUTHOR = "Author" [Messages] -COM_SIMPLEFILEMANAGER_CREDITS = "Powered by Simple" +COM_SIMPLEFILEMANAGER_CREDITS = "Powered by Simple" COM_SIMPLEFILEMANAGER_NO_DOCUMENTS = "No document found." COM_SIMPLEFILEMANAGER_ERROR_DOCUMENT_NOT_FOUND = "Document not found." COM_SIMPLEFILEMANAGER_NO_FILE_ERROR_MESSAGE = "You forgot to select a file or there was an issue during file upload." diff --git a/site/language/it-IT/it-IT.com_simplefilemanager.ini b/site/language/it-IT/it-IT.com_simplefilemanager.ini index a217af9..9ce9477 100755 --- a/site/language/it-IT/it-IT.com_simplefilemanager.ini +++ b/site/language/it-IT/it-IT.com_simplefilemanager.ini @@ -5,7 +5,7 @@ COM_SIMPLEFILEMANAGER_VISIBILITY_4_GROUP = "Gruppi selezionati" COM_SIMPLEFILEMANAGER_VISIBILITY_5_AUTHOR = "Autore" [Messages] -COM_SIMPLEFILEMANAGER_CREDITS = "Powered by Simple" +COM_SIMPLEFILEMANAGER_CREDITS = "Powered by Simple" COM_SIMPLEFILEMANAGER_NO_DOCUMENTS = "Nessun documento trovato." COM_SIMPLEFILEMANAGER_ERROR_DOCUMENT_NOT_FOUND = "Documento non trovato." COM_SIMPLEFILEMANAGER_NO_FILE_ERROR_MESSAGE = "Hai dimenticato di selezionare un file o si è verificato un errore durante l'upload." diff --git a/site/models/document.php b/site/models/document.php index 6ba36b6..90a9f7d 100644 --- a/site/models/document.php +++ b/site/models/document.php @@ -124,7 +124,7 @@ public function &getItem($pk = null) { $data = $db->loadObject(); if (empty($data)) { - JError::raiseError(404, JText::_('COM_SIMPLEFILEMANAGER_ERROR_DOCUMENT_NOT_FOUND')); + throw new Exception(JText::_('COM_SIMPLEFILEMANAGER_ERROR_DOCUMENT_NOT_FOUND'), 404); } // Process document icon @@ -132,7 +132,7 @@ public function &getItem($pk = null) { // Check for published state if filter set. if ((is_numeric($published) || is_numeric($archived)) && (($data->state != $published) && ($data->state != $archived))) { - JError::raiseError(404, JText::_('COM_SIMPLEFILEMANAGER_ERROR_DOCUMENT_NOT_FOUND')); + throw new Exception(JText::_('COM_SIMPLEFILEMANAGER_ERROR_DOCUMENT_NOT_FOUND'), 404); } /** diff --git a/site/models/documentform.php b/site/models/documentform.php index 038b9fb..06515fa 100644 --- a/site/models/documentform.php +++ b/site/models/documentform.php @@ -130,9 +130,7 @@ public function save($data) { } if ($authorised !== true) { - JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR')); - - return false; + throw new Exception(JText::_('JERROR_ALERTNOAUTHOR'), 403); } $table = $this->getTable(); @@ -146,9 +144,7 @@ public function save($data) { function delete($data) { $id = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('document.id'); if (JFactory::getUser()->authorise('core.delete', 'com_simplefilemanager') !== true) { - JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR')); - - return false; + throw new Exception(JText::_('JERROR_ALERTNOAUTHOR'), 403); } $table = $this->getTable(); @@ -231,7 +227,7 @@ public function &getData($id = null) { } if (!$canEdit) { - JError::raiseError('500', JText::_('JERROR_ALERTNOAUTHOR')); + throw new Exception(JText::_('JERROR_ALERTNOAUTHOR'), 403); } // Check published state. diff --git a/site/views/categories/tmpl/default.php b/site/views/categories/tmpl/default.php index 8ec372d..83f19e1 100644 --- a/site/views/categories/tmpl/default.php +++ b/site/views/categories/tmpl/default.php @@ -31,9 +31,10 @@ }); });"); ?> -
+
loadTemplate('items'); + echo JText::_('COM_SIMPLEFILEMANAGER_CREDITS'); ?>
diff --git a/site/views/categories/tmpl/default_items.php b/site/views/categories/tmpl/default_items.php index 74109eb..0b364af 100644 --- a/site/views/categories/tmpl/default_items.php +++ b/site/views/categories/tmpl/default_items.php @@ -18,7 +18,7 @@ $class = ' class="last"'; } ?> -
> +
role="listitem">

@@ -55,4 +55,5 @@

- + + diff --git a/site/views/category/tmpl/default.php b/site/views/category/tmpl/default.php index a3c3eb5..169ff06 100644 --- a/site/views/category/tmpl/default.php +++ b/site/views/category/tmpl/default.php @@ -11,3 +11,4 @@ $this->subtemplatename = 'items'; echo JLayoutHelper::render('joomla.content.category_default', $this); +echo JText::_('COM_SIMPLEFILEMANAGER_CREDITS'); \ No newline at end of file diff --git a/site/views/category/tmpl/default_items.php b/site/views/category/tmpl/default_items.php index 1e75b16..0f13ffc 100644 --- a/site/views/category/tmpl/default_items.php +++ b/site/views/category/tmpl/default_items.php @@ -90,14 +90,14 @@ function tableOrdering(order, dir, task) }; -
\ No newline at end of file diff --git a/site/views/document/view.html.php b/site/views/document/view.html.php index 054f99c..0304188 100644 --- a/site/views/document/view.html.php +++ b/site/views/document/view.html.php @@ -113,9 +113,7 @@ public function display($tpl = null) { // Check for errors. if (count($errors = $this->get('Errors'))) { - JError::raiseWarning(500, implode("\n", $errors)); - - return false; + throw new Exception(implode("\n", $errors), 500); } // Check if access is not public diff --git a/site/views/document/view.raw.php b/site/views/document/view.raw.php index 4f7d5f6..c1f670e 100644 --- a/site/views/document/view.raw.php +++ b/site/views/document/view.raw.php @@ -48,9 +48,7 @@ public function display($tpl = null) { // Check for errors. if (count($errors = $this->get('Errors'))) { - JError::raiseWarning(500, implode("\n", $errors)); - - return false; + throw new Exception(implode("\n", $errors), 500); } JFactory::getDocument()->setMimeEncoding('application/octet-stream', true); diff --git a/site/views/documentform/tmpl/default.php b/site/views/documentform/tmpl/default.php index dde1bbd..6fdd70b 100644 --- a/site/views/documentform/tmpl/default.php +++ b/site/views/documentform/tmpl/default.php @@ -72,4 +72,7 @@ class="form-validate" + + +