diff --git a/.drone.yml b/.drone.yml index 69697ac..6f52ca3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,6 +6,7 @@ steps: - name: weblinks-codeception-tests image: joomlaprojects/docker-images:systemtests commands: + - pwd - composer install - chmod a+x .drone/build.sh - ./.drone/build.sh @@ -18,6 +19,28 @@ steps: - fluxbox > /dev/null 2>&1 & - vendor/bin/robo run:tests + - name: artifacts-codeception-tests + image: cschlosser/drone-ftps + depends_on: [ weblinks-codeception-tests ] + environment: + FTP_USERNAME: + from_secret: ftpusername + FTP_PASSWORD: + from_secret: ftppassword + PLUGIN_HOSTNAME: artifacts.joomla.org:21 + PLUGIN_SRC_DIR: /tests/_output + PLUGIN_DEST_DIR: / + PLUGIN_SECURE: false + PLUGIN_EXCLUDE: ^\.git/$ + commands: + - ls -l /drone/src/tests/_output + - export PLUGIN_DEST_DIR=$PLUGIN_DEST_DIR/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER + - echo https://artifacts.joomla.org/drone$PLUGIN_DEST_DIR + - /bin/upload.sh + when: + status: + - failure + volumes: - name: weblinks_cache host: @@ -25,6 +48,6 @@ volumes: --- kind: signature -hmac: bdbb55e8a838f65e5a832cfca09af95d450cbdc9d733e03f0f528abdebfff47f +hmac: bcc028d5d9601f1f3355862f17dd2434ba86f47634f0737877db534e49c8265b ... diff --git a/.drone/build.sh b/.drone/build.sh index dce1f8d..0b82314 100644 --- a/.drone/build.sh +++ b/.drone/build.sh @@ -22,6 +22,8 @@ cd /tests/www cp jorobo.dist.ini jorobo.ini cp RoboFile.dist.ini RoboFile.ini + + # Build package vendor/bin/robo build --dev diff --git a/codeception.yml b/codeception.yml index 2d07f65..0b5168b 100644 --- a/codeception.yml +++ b/codeception.yml @@ -1,7 +1,7 @@ actor: Tester paths: tests: tests - log: tests/_output + log: /drone/src/tests/_output data: tests/_data helpers: tests/_support settings: diff --git a/src/administrator/components/com_weblinks/Extension/WeblinksComponent.php b/src/administrator/components/com_weblinks/Extension/WeblinksComponent.php deleted file mode 100644 index 1172396..0000000 --- a/src/administrator/components/com_weblinks/Extension/WeblinksComponent.php +++ /dev/null @@ -1,57 +0,0 @@ -element['new'] == 'true'); - $allowEdit = ((string) $this->element['edit'] == 'true'); - $allowClear = ((string) $this->element['clear'] != 'false'); - $allowSelect = ((string) $this->element['select'] != 'false'); - - // Load language - \JFactory::getLanguage()->load('com_weblinks', JPATH_ADMINISTRATOR); - - // The active weblink id field. - $value = (int) $this->value > 0 ? (int) $this->value : ''; - - // Create the modal id. - $modalId = 'Weblink_' . $this->id; - - // Add the modal field script to the document head. - \JHtml::_('jquery.framework'); - \JHtml::_('script', 'system/modal-fields.js', array('version' => 'auto', 'relative' => true)); - - // Script to proxy the select modal function to the modal-fields.js file. - if ($allowSelect) - { - static $scriptSelect = null; - - if (is_null($scriptSelect)) - { - $scriptSelect = array(); - } - - if (!isset($scriptSelect[$this->id])) - { - \JFactory::getDocument()->addScriptDeclaration(" - function jSelectWeblink_" . $this->id . "(id, title, catid, object, url, language) { - window.processModalSelect('Weblink', '" . $this->id . "', id, title, catid, object, url, language); - } - "); - $scriptSelect[$this->id] = true; - } - } - - // Setup variables for display. - $linkWeblinks = 'index.php?option=com_weblinks&view=weblinks&layout=modal&tmpl=component&' . \JSession::getFormToken() . '=1'; - $linkWeblink = 'index.php?option=com_weblinks&view=weblink&layout=modal&tmpl=component&' . \JSession::getFormToken() . '=1'; - $modalTitle = \JText::_('COM_WEBLINKS_CHANGE_WEBLINK'); - - if (isset($this->element['language'])) - { - $linkWeblinks .= '&forcedLanguage=' . $this->element['language']; - $linkWeblink .= '&forcedLanguage=' . $this->element['language']; - $modalTitle .= ' — ' . $this->element['label']; - } - - $urlSelect = $linkWeblinks . '&function=jSelectWeblink_' . $this->id; - $urlEdit = $linkWeblink . '&task=weblink.edit&id=\' + document.getElementById("' . $this->id . '_id").value + \''; - $urlNew = $linkWeblink . '&task=weblink.add'; - - if ($value) - { - $db = \JFactory::getDbo(); - $query = $db->getQuery(true) - ->select($db->quoteName('title')) - ->from($db->quoteName('#__weblinks')) - ->where($db->quoteName('id') . ' = ' . (int) $value); - $db->setQuery($query); - try - { - $title = $db->loadResult(); - } - catch (\RuntimeException $e) - { - \JError::raiseWarning(500, $e->getMessage()); - } - } - $title = empty($title) ? \JText::_('COM_WEBLINKS_SELECT_A_WEBLINK') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8'); - - // The current weblink display field. - $html = ''; - $html .= ''; - - // Select weblink button - if ($allowSelect) - { - $html .= '' - . ' ' . \JText::_('JSELECT') - . ''; - } - // New weblink button - if ($allowNew) - { - $html .= '' - . ' ' . \JText::_('JACTION_CREATE') - . ''; - } - // Edit weblink button - if ($allowEdit) - { - $html .= '' - . ' ' . \JText::_('JACTION_EDIT') - . ''; - } - // Clear weblink button - if ($allowClear) - { - $html .= '' - . '' . \JText::_('JCLEAR') - . ''; - } - $html .= ''; - - // Select weblink modal - if ($allowSelect) - { - $html .= \JHtml::_( - 'bootstrap.renderModal', - 'ModalSelect' . $modalId, - array( - 'title' => $modalTitle, - 'url' => $urlSelect, - 'height' => '400px', - 'width' => '800px', - 'bodyHeight' => '70', - 'modalWidth' => '80', - 'footer' => '', - ) - ); - } - - // New weblink modal - if ($allowNew) - { - $html .= \JHtml::_( - 'bootstrap.renderModal', - 'ModalNew' . $modalId, - array( - 'title' => JText::_('COM_WEBLINKS_NEW_WEBLINK'), - 'backdrop' => 'static', - 'keyboard' => false, - 'closeButton' => false, - 'url' => $urlNew, - 'height' => '400px', - 'width' => '800px', - 'bodyHeight' => '70', - 'modalWidth' => '80', - 'footer' => '' - . '' - . '', - ) - ); - } - - // Edit weblink modal - if ($allowEdit) - { - $html .= \JHtml::_( - 'bootstrap.renderModal', - 'ModalEdit' . $modalId, - array( - 'title' => \JText::_('COM_WEBLINKS_EDIT_WEBLINK'), - 'backdrop' => 'static', - 'keyboard' => false, - 'closeButton' => false, - 'url' => $urlEdit, - 'height' => '400px', - 'width' => '800px', - 'bodyHeight' => '70', - 'modalWidth' => '80', - 'footer' => '' - . '' - . '', - ) - ); - } - // Note: class='required' for client side validation. - $class = $this->required ? ' class="required modal-value"' : ''; - $html .= ''; - return $html; - } - - /** - * Method to get the field label markup. - * - * @return string The field label markup. - * - * @since __DEPLOY_VERSION__ - */ - protected function getLabel() - { - return str_replace($this->id, $this->id . '_id', parent::getLabel()); - } -} diff --git a/src/administrator/components/com_weblinks/Table/WeblinkTable.php b/src/administrator/components/com_weblinks/Table/WeblinkTable.php deleted file mode 100644 index 4e08601..0000000 --- a/src/administrator/components/com_weblinks/Table/WeblinkTable.php +++ /dev/null @@ -1,205 +0,0 @@ -setColumnAlias('published', 'state'); - - if (version_compare(JVERSION, '4.0', '<' ) == 1) - { - \JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); - \JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); - } - } - - /** - * Overload the store method for the Weblinks table. - * - * @param boolean $updateNulls Toggle whether null values should be updated. - * - * @return boolean True on success, false on failure. - * - * @since 1.6 - */ - public function store($updateNulls = false) - { - $date = \JFactory::getDate(); - $user = \JFactory::getUser(); - - $this->modified = $date->toSql(); - - if ($this->id) - { - // Existing item - $this->modified_by = $user->id; - } - else - { - // New weblink. A weblink created and created_by field can be set by the user, - // so we don't touch either of these if they are set. - if (!(int) $this->created) - { - $this->created = $date->toSql(); - } - - if (empty($this->created_by)) - { - $this->created_by = $user->id; - } - } - - // Set publish_up to null date if not set - if (!$this->publish_up) - { - $this->publish_up = $this->getDbo()->getNullDate(); - } - - // Set publish_down to null date if not set - if (!$this->publish_down) - { - $this->publish_down = $this->getDbo()->getNullDate(); - } - - // Verify that the alias is unique - $table = new WeblinkTable($this->getDbo()); - - if ($table->load(array('language' => $this->language, 'alias' => $this->alias, 'catid' => $this->catid)) - && ($table->id != $this->id || $this->id == 0)) - { - $this->setError(\JText::_('COM_WEBLINKS_ERROR_UNIQUE_ALIAS')); - - return false; - } - - // Convert IDN urls to punycode - $this->url = \JStringPunycode::urlToPunycode($this->url); - - return parent::store($updateNulls); - } - - /** - * Overloaded check method to ensure data integrity. - * - * @return boolean True on success. - * - * @since 1.5 - */ - public function check() - { - if (\JFilterInput::checkAttribute(array('href', $this->url))) - { - $this->setError(\JText::_('COM_WEBLINKS_ERR_TABLES_PROVIDE_URL')); - - return false; - } - - // Check for valid name - if (trim($this->title) == '') - { - $this->setError(\JText::_('COM_WEBLINKS_ERR_TABLES_TITLE')); - return false; - } - - // Check for existing name - $db = $this->getDbo(); - - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__weblinks')) - ->where($db->quoteName('title') . ' = ' . $db->quote($this->title)) - ->where($db->quoteName('language') . ' = ' . $db->quote($this->language)) - ->where($db->quoteName('catid') . ' = ' . (int) $this->catid); - $db->setQuery($query); - - $xid = (int) $db->loadResult(); - - if ($xid && $xid != (int) $this->id) - { - $this->setError(\JText::_('COM_WEBLINKS_ERR_TABLES_NAME')); - - return false; - } - - if (empty($this->alias)) - { - $this->alias = $this->title; - } - - $this->alias = \JApplicationHelper::stringURLSafe($this->alias, $this->language); - - if (trim(str_replace('-', '', $this->alias)) == '') - { - $this->alias = \JFactory::getDate()->format("Y-m-d-H-i-s"); - } - - // Check the publish down date is not earlier than publish up. - if ($this->publish_down > $db->getNullDate() && $this->publish_down < $this->publish_up) - { - $this->setError(\JText::_('JGLOBAL_START_PUBLISH_AFTER_FINISH')); - - return false; - } - - /* - * Clean up keywords -- eliminate extra spaces between phrases - * and cr (\r) and lf (\n) characters from string - */ - if (!empty($this->metakey)) - { - // Array of characters to remove - $bad_characters = array("\n", "\r", "\"", "<", ">"); - $after_clean = \JString::str_ireplace($bad_characters, "", $this->metakey); - $keys = explode(',', $after_clean); - $clean_keys = array(); - - foreach ($keys as $key) - { - // Ignore blank keywords - if (trim($key)) - { - $clean_keys[] = trim($key); - } - } - - // Put array back together delimited by ", " - $this->metakey = implode(", ", $clean_keys); - } - - return parent::check(); - } -} diff --git a/src/administrator/components/com_weblinks/View/Weblink/HtmlView.php b/src/administrator/components/com_weblinks/View/Weblink/HtmlView.php deleted file mode 100644 index a91d570..0000000 --- a/src/administrator/components/com_weblinks/View/Weblink/HtmlView.php +++ /dev/null @@ -1,119 +0,0 @@ -state = $this->get('State'); - $this->item = $this->get('Item'); - $this->form = $this->get('Form'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - \JError::raiseError(500, implode("\n", $errors)); - - return false; - } - - // If we are forcing a language in modal (used for associations). - if ($this->getLayout() === 'modal' && $forcedLanguage = \JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd')) - { - // Set the language field to the forcedLanguage and disable changing it. - $this->form->setValue('language', null, $forcedLanguage); - $this->form->setFieldAttribute('language', 'readonly', 'true'); - - // Only allow to select categories with All language or with the forced language. - $this->form->setFieldAttribute('catid', 'language', '*,' . $forcedLanguage); - - // Only allow to select tags with All language or with the forced language. - $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage); - } - - $this->addToolbar(); - - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - \JFactory::getApplication()->input->set('hidemainmenu', true); - - $user = \JFactory::getUser(); - $isNew = ($this->item->id == 0); - $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id')); - - // Since we don't track these assets at the item level, use the category id. - $canDo = \JHelperContent::getActions('com_weblinks', 'category', $this->item->catid); - - \JToolbarHelper::title($isNew ? \JText::_('COM_WEBLINKS_MANAGER_WEBLINK_NEW') : \JText::_('COM_WEBLINKS_MANAGER_WEBLINK_EDIT'), 'link weblinks'); - - // If not checked out, can save the item. - if (!$checkedOut && ($canDo->get('core.edit')||(count($user->getAuthorisedCategories('com_weblinks', 'core.create'))))) - { - \JToolbarHelper::apply('weblink.apply'); - \JToolbarHelper::save('weblink.save'); - } - if (!$checkedOut && (count($user->getAuthorisedCategories('com_weblinks', 'core.create')))) - { - \JToolbarHelper::save2new('weblink.save2new'); - } - // If an existing item, can save to a copy. - if (!$isNew && (count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0)) - { - \JToolbarHelper::save2copy('weblink.save2copy'); - } - if (empty($this->item->id)) - { - \JToolbarHelper::cancel('weblink.cancel'); - } - else - { - if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit')) - { - \JToolbarHelper::versions('com_weblinks.weblink', $this->item->id); - } - - \JToolbarHelper::cancel('weblink.cancel', 'JTOOLBAR_CLOSE'); - } - - \JToolbarHelper::divider(); - \JToolbarHelper::help('JHELP_COMPONENTS_WEBLINKS_LINKS_EDIT'); - } -} diff --git a/src/administrator/components/com_weblinks/View/Weblinks/HtmlView.php b/src/administrator/components/com_weblinks/View/Weblinks/HtmlView.php deleted file mode 100644 index 2c8e73f..0000000 --- a/src/administrator/components/com_weblinks/View/Weblinks/HtmlView.php +++ /dev/null @@ -1,171 +0,0 @@ -state = $this->get('State'); - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); - - // Modal layout doesn't need the submenu. - if ($this->getLayout() !== 'modal') - { - \WeblinksHelper::addSubmenu('weblinks'); - } - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - \JError::raiseError(500, implode("\n", $errors)); - return false; - } - - // We don't need toolbar in the modal layout. - if ($this->getLayout() !== 'modal') - { - $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); - } - else - { - // In article associations modal we need to remove language filter if forcing a language. - // We also need to change the category filter to show show categories with All or the forced language. - if ($forcedLanguage = \JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD')) - { - // If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field. - $languageXml = new \SimpleXMLElement(''); - $this->filterForm->setField($languageXml, 'filter', true); - - // Also, unset the active language filter so the search tools is not open by default with this filter. - unset($this->activeFilters['language']); - - // One last changes needed is to change the category filter to just show categories with All language or with the forced language. - $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter'); - } - } - - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - require_once JPATH_COMPONENT . '/helpers/weblinks.php'; - - $state = $this->get('State'); - $canDo = \JHelperContent::getActions('com_weblinks', 'category', $state->get('filter.category_id')); - $user = \JFactory::getUser(); - - // Get the toolbar object instance - $bar = \JToolbar::getInstance('toolbar'); - - \JToolbarHelper::title(\JText::_('COM_WEBLINKS_MANAGER_WEBLINKS'), 'link weblinks'); - - if (count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0) - { - \JToolbarHelper::addNew('weblink.add'); - } - - if ($canDo->get('core.edit') || $canDo->get('core.edit.own')) - { - \JToolbarHelper::editList('weblink.edit'); - } - - if ($canDo->get('core.edit.state')) - { - \JToolbarHelper::publish('weblinks.publish', 'JTOOLBAR_PUBLISH', true); - \JToolbarHelper::unpublish('weblinks.unpublish', 'JTOOLBAR_UNPUBLISH', true); - - \JToolbarHelper::archiveList('weblinks.archive'); - \JToolbarHelper::checkin('weblinks.checkin'); - } - - if ($state->get('filter.published') == -2 && $canDo->get('core.delete')) - { - \JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'weblinks.delete', 'JTOOLBAR_EMPTY_TRASH'); - } - elseif ($canDo->get('core.edit.state')) - { - \JToolbarHelper::trash('weblinks.trash'); - } - - // Add a batch button - if ($user->authorise('core.create', 'com_weblinks') && $user->authorise('core.edit', 'com_weblinks') - && $user->authorise('core.edit.state', 'com_weblinks')) - { - \JHtml::_('bootstrap.renderModal', 'collapseModal'); - $title = \JText::_('JTOOLBAR_BATCH'); - - // Instantiate a new JLayoutFile instance and render the batch button - $layout = new \JLayoutFile('joomla.toolbar.batch'); - - $dhtml = $layout->render(array('title' => $title)); - $bar->appendButton('Custom', $dhtml, 'batch'); - } - - if ($user->authorise('core.admin', 'com_weblinks') || $user->authorise('core.options', 'com_weblinks')) - { - \JToolbarHelper::preferences('com_weblinks'); - } - - \JToolbarHelper::help('JHELP_COMPONENTS_WEBLINKS_LINKS'); - } - - /** - * Returns an array of fields the table can be sorted by - * - * @return array Array containing the field name to sort by as the key and display text as value - * - * @since 3.0 - */ - protected function getSortFields() - { - return array( - 'a.ordering' => \JText::_('JGRID_HEADING_ORDERING'), - 'a.state' => \JText::_('JSTATUS'), - 'a.title' => \JText::_('JGLOBAL_TITLE'), - 'a.access' => \JText::_('JGRID_HEADING_ACCESS'), - 'a.hits' => \JText::_('JGLOBAL_HITS'), - 'a.language' => \JText::_('JGRID_HEADING_LANGUAGE'), - 'a.id' => \JText::_('JGRID_HEADING_ID') - ); - } -} diff --git a/src/administrator/components/com_weblinks/access.xml b/src/administrator/components/com_weblinks/access.xml index 1622da5..82020e9 100644 --- a/src/administrator/components/com_weblinks/access.xml +++ b/src/administrator/components/com_weblinks/access.xml @@ -1,35 +1,35 @@
- - - - - - - - - + + + + + + + + +
- - - - - + + + + +
- - - - - - + + + + + +
- - - - + + + +
diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml index 53c689e..3ac3597 100644 --- a/src/administrator/components/com_weblinks/config.xml +++ b/src/administrator/components/com_weblinks/config.xml @@ -9,7 +9,6 @@ name="captcha" type="plugins" label="COM_WEBLINKS_FIELD_CAPTCHA_LABEL" - description="COM_WEBLINKS_FIELD_CAPTCHA_DESC" default="" folder="captcha" filter="cmd" @@ -21,9 +20,9 @@ @@ -34,35 +33,32 @@ - + - + @@ -101,7 +96,8 @@ name="float_first" type="list" label="COM_WEBLINKS_FLOAT_FIRST_LABEL" - description="COM_WEBLINKS_FLOAT_FIRST_DESC" + default="none" + validate="options" > @@ -112,7 +108,8 @@ name="float_second" type="list" label="COM_WEBLINKS_FLOAT_SECOND_LABEL" - description="COM_WEBLINKS_FLOAT_SECOND_DESC" + default="none" + validate="options" > @@ -124,18 +121,15 @@ type="spacer" hr="true" /> - - + @@ -148,7 +142,7 @@ name="category_layout" type="componentlayout" label="JGLOBAL_FIELD_LAYOUT_LABEL" - description="JGLOBAL_FIELD_LAYOUT_DESC" + class="form-select" menuitems="true" extension="com_weblinks" view="category" @@ -157,45 +151,42 @@ - + - + - + @@ -209,49 +200,45 @@ - + - + - + - + @@ -263,23 +250,22 @@ - - + + @@ -291,37 +277,36 @@ - + - + - + @@ -333,9 +318,8 @@ @@ -344,10 +328,9 @@ @@ -356,37 +339,34 @@ - + - + - + @@ -404,13 +383,12 @@ - + @@ -422,25 +400,23 @@ - + - + diff --git a/src/administrator/components/com_weblinks/forms/filter_weblinks.xml b/src/administrator/components/com_weblinks/forms/filter_weblinks.xml index 3862039..29b3872 100644 --- a/src/administrator/components/com_weblinks/forms/filter_weblinks.xml +++ b/src/administrator/components/com_weblinks/forms/filter_weblinks.xml @@ -12,7 +12,6 @@ name="published" type="status" label="JOPTION_FILTER_PUBLISHED" - description="JOPTION_FILTER_PUBLISHED_DESC" onchange="this.form.submit();" > @@ -21,7 +20,6 @@ name="category_id" type="category" label="JOPTION_FILTER_CATEGORY" - description="JOPTION_FILTER_CATEGORY_DESC" extension="com_weblinks" onchange="this.form.submit();" > @@ -31,7 +29,6 @@ name="access" type="accesslevel" label="JOPTION_FILTER_ACCESS" - description="JOPTION_FILTER_ACCESS_DESC" onchange="this.form.submit();" > @@ -40,7 +37,6 @@ name="language" type="contentlanguage" label="JOPTION_FILTER_LANGUAGE" - description="JOPTION_FILTER_LANGUAGE_DESC" onchange="this.form.submit();" > @@ -50,7 +46,6 @@ name="tag" type="tag" label="JOPTION_FILTER_TAG" - description="JOPTION_FILTER_TAG_DESC" mode="nested" onchange="this.form.submit();" > @@ -60,7 +55,6 @@ name="level" type="integer" label="JOPTION_FILTER_LEVEL" - description="JOPTION_FILTER_LEVEL_DESC" first="1" last="10" step="1" diff --git a/src/administrator/components/com_weblinks/forms/weblink.xml b/src/administrator/components/com_weblinks/forms/weblink.xml index 5bebeb9..42574b1 100644 --- a/src/administrator/components/com_weblinks/forms/weblink.xml +++ b/src/administrator/components/com_weblinks/forms/weblink.xml @@ -7,7 +7,6 @@ name="id" type="text" label="JGLOBAL_FIELD_ID_LABEL" - description="JGLOBAL_FIELD_ID_DESC" readonly="true" class="readonly" default="0" @@ -17,18 +16,15 @@ name="title" type="text" label="JGLOBAL_TITLE" - description="COM_WEBLINKS_FIELD_TITLE_DESC" - class="input-xxlarge input-large-text" - size="40" required="true" + maxlength="250" /> @@ -36,7 +32,6 @@ name="catid" type="categoryedit" label="JCATEGORY" - description="COM_WEBLINKS_FIELD_CATEGORY_DESC" extension="com_weblinks" addfieldprefix="Joomla\Component\Categories\Administrator\Field" required="true" @@ -47,10 +42,8 @@ name="url" type="url" label="COM_WEBLINKS_FIELD_URL_LABEL" - description="COM_WEBLINKS_FIELD_URL_DESC" - class="span12" filter="url" - size="40" + validate="url" required="true" /> @@ -58,7 +51,6 @@ name="description" type="editor" label="JGLOBAL_DESCRIPTION" - description="COM_WEBLINKS_FIELD_DESCRIPTION_DESC" buttons="true" hide="pagebreak,readmore" filter="JComponentHelper::filterText" @@ -68,21 +60,19 @@ name="hits" type="text" label="JGLOBAL_HITS" - description="COM_WEBLINKS_HITS_DESC" class="readonly" - size="6" readonly="true" filter="unset" + default="0" /> @@ -95,7 +85,6 @@ name="ordering" type="ordering" label="JFIELD_ORDERING_LABEL" - description="JFIELD_ORDERING_DESC" content_type="com_weblinks.weblink" /> @@ -103,15 +92,14 @@ name="access" type="accesslevel" label="JFIELD_ACCESS_LABEL" - description="JFIELD_ACCESS_DESC" - size="1" + filter="UINT" + validate="options" /> @@ -120,7 +108,7 @@ name="tags" type="tag" label="JTAG" - description="JTAG_DESC" + class="advancedSelect" multiple="true" /> @@ -128,18 +116,15 @@ name="version_note" type="text" label="JGLOBAL_FIELD_VERSION_NOTE_LABEL" - description="JGLOBAL_FIELD_VERSION_NOTE_DESC" - size="45" - labelclass="control-label" + maxlength="250" /> @@ -147,26 +132,23 @@ name="created_by" type="user" label="JGLOBAL_FIELD_CREATED_BY_LABEL" - description="JGLOBAL_FIELD_CREATED_BY_Desc" + validate="UserId" /> @@ -177,6 +159,7 @@ class="readonly" readonly="true" filter="unset" + validate="UserId" /> @@ -205,9 +187,8 @@ name="publish_down" type="calendar" label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL" - description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC" - format="%Y-%m-%d %H:%M:%S" - size="22" + translateformat="true" + showtime="true" filter="user_utc" /> @@ -215,9 +196,7 @@ name="version" type="text" label="COM_WEBLINKS_FIELD_VERSION_LABEL" - description="COM_WEBLINKS_FIELD_VERSION_DESC" class="readonly" - size="6" readonly="true" filter="unset" /> @@ -226,7 +205,6 @@ name="metakey" type="textarea" label="JFIELD_META_KEYWORDS_LABEL" - description="JFIELD_META_KEYWORDS_DESC" rows="3" cols="30" /> @@ -235,17 +213,16 @@ name="metadesc" type="textarea" label="JFIELD_META_DESCRIPTION_LABEL" - description="JFIELD_META_DESCRIPTION_DESC" rows="3" cols="30" + maxlength="160" + charcounter="true" /> @@ -261,7 +238,6 @@ name="target" type="list" label="COM_WEBLINKS_FIELD_TARGET_LABEL" - description="COM_WEBLINKS_FIELD_TARGET_DESC" default="" useglobal="true" > @@ -275,7 +251,6 @@ name="width" type="text" label="COM_WEBLINKS_FIELD_WIDTH_LABEL" - description="COM_WEBLINKS_FIELD_WIDTH_DESC" class="validate-numeric" /> @@ -283,17 +258,14 @@ name="height" type="text" label="COM_WEBLINKS_FIELD_HEIGHT_LABEL" - description="COM_WEBLINKS_FIELD_HEIGHT_DESC" class="validate-numeric" /> @@ -312,14 +284,12 @@ name="image_first" type="media" label="COM_WEBLINKS_FIELD_FIRST_LABEL" - description="COM_WEBLINKS_FIELD_FIRST_DESC" /> @@ -331,16 +301,19 @@ name="image_first_alt" type="text" label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL" - description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC" - size="20" + /> + + - @@ -372,16 +343,19 @@ name="image_second_alt" type="text" label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL" - description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC" - size="20" + /> + + @@ -398,7 +372,7 @@ name="robots" type="list" label="JFIELD_METADATA_ROBOTS_LABEL" - description="JFIELD_METADATA_ROBOTS_DESC" + validate="options" > @@ -411,11 +385,6 @@ name="rights" type="text" label="JFIELD_META_RIGHTS_LABEL" - description="JFIELD_META_RIGHTS_DESC" - required="false" - filter="string" - cols="30" - rows="2" /> diff --git a/src/administrator/components/com_weblinks/helpers/html/weblink.php b/src/administrator/components/com_weblinks/helpers/html/weblink.php deleted file mode 100644 index b976745..0000000 --- a/src/administrator/components/com_weblinks/helpers/html/weblink.php +++ /dev/null @@ -1,94 +0,0 @@ - $associated) - { - $associations[$tag] = (int) $associated->id; - } - - // Get the associated weblinks items - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select('c.id, c.title as title') - ->select('l.sef as lang_sef, lang_code') - ->from('#__weblinks as c') - ->select('cat.title as category_title') - ->join('LEFT', '#__categories as cat ON cat.id=c.catid') - ->where('c.id IN (' . implode(',', array_values($associations)) . ')') - ->join('LEFT', '#__languages as l ON c.language=l.lang_code') - ->select('l.image') - ->select('l.title as language_title'); - $db->setQuery($query); - - try - { - $items = $db->loadObjectList('id'); - } - catch (RuntimeException $e) - { - throw new Exception($e->getMessage(), 500, $e); - } - - if ($items) - { - foreach ($items as &$item) - { - $text = strtoupper($item->lang_sef); - $url = JRoute::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id); - - $tooltip = htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '
' . JText::sprintf('JCATEGORY_SPRINTF', $item->category_title); - $classes = 'hasPopover label label-association label-' . $item->lang_sef; - - $item->link = '' - . $text . ''; - } - } - - JHtml::_('bootstrap.popover'); - - $html = JLayoutHelper::render('joomla.content.associations', $items); - } - - return $html; - } -} diff --git a/src/administrator/components/com_weblinks/helpers/weblinks.php b/src/administrator/components/com_weblinks/helpers/weblinks.php index 4fee715..8e19ede 100644 --- a/src/administrator/components/com_weblinks/helpers/weblinks.php +++ b/src/administrator/components/com_weblinks/helpers/weblinks.php @@ -14,153 +14,7 @@ defined('_JEXEC') or die; * * @since 1.6 */ -class WeblinksHelper extends JHelperContent +class WeblinksHelper extends \Joomla\Component\Weblinks\Administrator\Helper\WeblinksHelper { - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - * - * @since 1.6 - */ - public static function addSubmenu($vName = 'weblinks') - { - JHtmlSidebar::addEntry( - JText::_('COM_WEBLINKS_SUBMENU_WEBLINKS'), - 'index.php?option=com_weblinks&view=weblinks', - $vName == 'weblinks' - ); - JHtmlSidebar::addEntry( - JText::_('COM_WEBLINKS_SUBMENU_CATEGORIES'), - 'index.php?option=com_categories&extension=com_weblinks', - $vName == 'categories' - ); - - if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_weblinks')->get('custom_fields_enable', '1')) - { - JHtmlSidebar::addEntry( - JText::_('JGLOBAL_FIELDS'), - 'index.php?option=com_fields&context=com_weblinks.weblink', - $vName == 'fields.fields' - ); - - JHtmlSidebar::addEntry( - JText::_('JGLOBAL_FIELD_GROUPS'), - 'index.php?option=com_fields&view=groups&context=com_weblinks.weblink', - $vName == 'fields.groups' - ); - } - } - - /** - * Adds Count Items for WebLinks Category Manager. - * - * @param stdClass[] &$items The weblinks category objects. - * - * @return stdClass[] The weblinks category objects. - * - * @since 3.6.0 - */ - public static function countItems(&$items) - { - $db = JFactory::getDbo(); - - foreach ($items as $item) - { - $item->count_trashed = 0; - $item->count_archived = 0; - $item->count_unpublished = 0; - $item->count_published = 0; - - $query = $db->getQuery(true) - ->select('state, COUNT(*) AS count') - ->from($db->qn('#__weblinks')) - ->where($db->qn('catid') . ' = ' . (int) $item->id) - ->group('state'); - - $db->setQuery($query); - $weblinks = $db->loadObjectList(); - - foreach ($weblinks as $weblink) - { - if ($weblink->state == 1) - { - $item->count_published = $weblink->count; - } - elseif ($weblink->state == 0) - { - $item->count_unpublished = $weblink->count; - } - elseif ($weblink->state == 2) - { - $item->count_archived = $weblink->count; - } - elseif ($weblink->state == -2) - { - $item->count_trashed = $weblink->count; - } - } - } - - return $items; - } - - /** - * Adds Count Items for Tag Manager. - * - * @param stdClass[] &$items The weblink tag objects - * @param string $extension The name of the active view. - * - * @return stdClass[] - * - * @since 3.7.0 - */ - public static function countTagItems(&$items, $extension) - { - $db = JFactory::getDbo(); - - foreach ($items as $item) - { - $item->count_trashed = 0; - $item->count_archived = 0; - $item->count_unpublished = 0; - $item->count_published = 0; - - $query = $db->getQuery(true); - $query->select('published as state, count(*) AS count') - ->from($db->qn('#__contentitem_tag_map') . 'AS ct ') - ->where('ct.tag_id = ' . (int) $item->id) - ->where('ct.type_alias =' . $db->q($extension)) - ->join('LEFT', $db->qn('#__categories') . ' AS c ON ct.content_item_id=c.id') - ->group('state'); - - $db->setQuery($query); - $weblinks = $db->loadObjectList(); - - foreach ($weblinks as $weblink) - { - if ($weblink->state == 1) - { - $item->count_published = $weblink->count; - } - if ($weblink->state == 0) - { - $item->count_unpublished = $weblink->count; - } - if ($weblink->state == 2) - { - $item->count_archived = $weblink->count; - } - if ($weblink->state == -2) - { - $item->count_trashed = $weblink->count; - } - } - } - - return $items; - } } diff --git a/src/administrator/components/com_weblinks/script.php b/src/administrator/components/com_weblinks/script.php index b43cae4..f4a710b 100644 --- a/src/administrator/components/com_weblinks/script.php +++ b/src/administrator/components/com_weblinks/script.php @@ -9,6 +9,13 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filesystem\Folder; +use Joomla\CMS\Installer\InstallerAdapter; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Table\Table; + /** * Installation class to perform additional changes during install/uninstall/update * @@ -16,6 +23,57 @@ defined('_JEXEC') or die; */ class Com_WeblinksInstallerScript { + /** + * Function called before extension installation/update/removal procedure commences + * + * @param string $type The type of change (install, update or discover_install, not uninstall) + * @param InstallerAdapter $parent The class calling this method + * + * @return boolean True on success + * + * @since 4.0 + */ + public function preflight($type, $parent) + { + $files = [ + '/administrator/components/com_weblinks/helpers/associations.php', + '/administrator/components/com_weblinks/sql/install.sqlsrv.sql', + '/administrator/components/com_weblinks/sql/uninstall.sqlsrv.sql', + '/administrator/language/en-GB/en-GB.com_weblinks.ini', + '/administrator/language/en-GB/en-GB.com_weblinks.sys.ini', + '/components/com_weblinks/helpers/association.php', + '/components/com_weblinks/helpers/category.php', + '/language/en-GB/en-GB.com_weblinks.ini', + '/language/en-GB/en-GB.mod_weblinks.ini', + '/language/en-GB/en-GB.mod_weblinks.sys.ini', + '/language/en-GB/en-GB.pkg_weblinks.sys.ini', + '/modules/mod_weblinks/helper.php', + ]; + + $folders = [ + '/administrator/components/com_weblinks/helpers/html', + '/administrator/components/com_weblinks/sql/updates/sqlsrv', + ]; + + foreach ($files as $file) + { + if (File::exists(JPATH_ROOT . $file)) + { + File::delete(JPATH_ROOT . $file); + } + } + + foreach ($folders as $folder) + { + if (Folder::exists(JPATH_ROOT . $folder)) + { + Folder::delete(JPATH_ROOT . $folder); + } + } + + return true; + } + /** * Function to perform changes during install * @@ -28,27 +86,27 @@ class Com_WeblinksInstallerScript public function install($parent) { // Initialize a new category - /** @type JTableCategory $category */ - $category = JTable::getInstance('Category'); + /** @type Joomla\CMS\Table\Category $category */ + $category = Table::getInstance('Category', 'Joomla\\CMS\\Table\\'); // Check if the Uncategorised category exists before adding it if (!$category->load(array('extension' => 'com_weblinks', 'title' => 'Uncategorised'))) { - $category->extension = 'com_weblinks'; - $category->title = 'Uncategorised'; - $category->description = ''; - $category->published = 1; - $category->access = 1; - $category->params = '{"category_layout":"","image":""}'; - $category->metadata = '{"author":"","robots":""}'; - $category->metadesc = ''; - $category->metakey = ''; - $category->language = '*'; - $category->checked_out_time = JFactory::getDbo()->getNullDate(); - $category->version = 1; - $category->hits = 0; + $category->extension = 'com_weblinks'; + $category->title = 'Uncategorised'; + $category->description = ''; + $category->published = 1; + $category->access = 1; + $category->params = '{"category_layout":"","image":""}'; + $category->metadata = '{"author":"","robots":""}'; + $category->metadesc = ''; + $category->metakey = ''; + $category->language = '*'; + $category->checked_out_time = null; + $category->version = 1; + $category->hits = 0; $category->modified_user_id = 0; - $category->checked_out = 0; + $category->checked_out = null; // Set the location in the tree $category->setLocation(1, 'last-child'); @@ -56,7 +114,7 @@ class Com_WeblinksInstallerScript // Check to make sure our data is valid if (!$category->check()) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_WEBLINKS_ERROR_INSTALL_CATEGORY', $category->getError())); + Factory::getApplication()->enqueueMessage(Text::sprintf('COM_WEBLINKS_ERROR_INSTALL_CATEGORY', $category->getError())); return; } @@ -64,7 +122,7 @@ class Com_WeblinksInstallerScript // Now store the category if (!$category->store(true)) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_WEBLINKS_ERROR_INSTALL_CATEGORY', $category->getError())); + Factory::getApplication()->enqueueMessage(Text::sprintf('COM_WEBLINKS_ERROR_INSTALL_CATEGORY', $category->getError())); return; } @@ -87,14 +145,14 @@ class Com_WeblinksInstallerScript public function postflight($type, $parent) { // Only execute database changes on MySQL databases - $dbName = JFactory::getDbo()->name; + $dbName = Factory::getDbo()->name; if (strpos($dbName, 'mysql') !== false) { - // Add Missing Table Colums if needed + // Add Missing Table Columns if needed $this->addColumnsIfNeeded(); - // Drop the Table Colums if needed + // Drop the Table Columns if needed $this->dropColumnsIfNeeded(); } @@ -112,7 +170,7 @@ class Com_WeblinksInstallerScript private function insertMissingUcmRecords() { // Insert the rows in the #__content_types table if they don't exist already - $db = JFactory::getDbo(); + $db = Factory::getDbo(); // Get the type ID for a Weblink $query = $db->getQuery(true); @@ -153,7 +211,8 @@ class Com_WeblinksInstallerScript . $db->quote('com_weblinks.weblink') . ', ' . $db->quote( '{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"}, - "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', ' + "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' + ) . ', ' . $db->quote('') . ', ' . $db->quote( '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias", @@ -161,7 +220,8 @@ class Com_WeblinksInstallerScript "core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"url", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", - "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}') . ', ' + "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}' + ) . ', ' . $db->quote('WeblinksHelperRoute::getWeblinkRoute') . ', ' . $db->quote( '{"formFile":"administrator\\/components\\/com_weblinks\\/models\\/forms\\/weblink.xml", @@ -170,7 +230,8 @@ class Com_WeblinksInstallerScript "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, - {"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}') + {"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}' + ) ); $db->setQuery($query); @@ -189,7 +250,8 @@ class Com_WeblinksInstallerScript . $db->quote('com_weblinks.category') . ', ' . $db->quote(' {"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"}, - "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', ' + "common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' + ) . ', ' . $db->quote('') . ', ' . $db->quote(' {"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias", @@ -198,7 +260,8 @@ class Com_WeblinksInstallerScript "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, - "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}') . ', ' + "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' + ) . ', ' . $db->quote('WeblinksHelperRoute::getCategoryRoute') . ', ' . $db->quote(' {"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", @@ -209,7 +272,8 @@ class Com_WeblinksInstallerScript "displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id", "displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id", "displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id", - "displayColumn":"title"}]}') + "displayColumn":"title"}]}' + ) ); $db->setQuery($query); @@ -233,7 +297,7 @@ class Com_WeblinksInstallerScript 'approved', ); - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $table = $db->getTableColumns('#__weblinks'); $columns = array_intersect($oldColumns, array_keys($table)); @@ -255,12 +319,12 @@ class Com_WeblinksInstallerScript */ private function addColumnsIfNeeded() { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $table = $db->getTableColumns('#__weblinks'); if (!array_key_exists('version', $table)) { - $sql = 'ALTER TABLE ' . $db->quoteName('#__weblinks') . ' ADD COLUMN ' . $db->quoteName('version') . " int(10) unsigned NOT NULL DEFAULT '1'"; + $sql = 'ALTER TABLE ' . $db->quoteName('#__weblinks') . ' ADD COLUMN ' . $db->quoteName('version') . " int unsigned NOT NULL DEFAULT '1'"; $db->setQuery($sql); $db->execute(); } diff --git a/src/administrator/components/com_weblinks/services/provider.php b/src/administrator/components/com_weblinks/services/provider.php index da71ea9..e46b034 100644 --- a/src/administrator/components/com_weblinks/services/provider.php +++ b/src/administrator/components/com_weblinks/services/provider.php @@ -8,14 +8,19 @@ */ defined('_JEXEC') or die; +use Joomla\CMS\Association\AssociationExtensionInterface; use Joomla\CMS\Categories\CategoryFactoryInterface; +use Joomla\CMS\Component\Router\RouterFactoryInterface; use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface; use Joomla\CMS\Extension\ComponentInterface; use Joomla\CMS\Extension\Service\Provider\CategoryFactory; use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory; use Joomla\CMS\Extension\Service\Provider\MVCFactory; +use Joomla\CMS\Extension\Service\Provider\RouterFactory; +use Joomla\CMS\HTML\Registry; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\Component\Weblinks\Administrator\Extension\WeblinksComponent; +use Joomla\Component\Weblinks\Administrator\Helper\AssociationsHelper; use Joomla\DI\Container; use Joomla\DI\ServiceProviderInterface; @@ -26,30 +31,39 @@ use Joomla\DI\ServiceProviderInterface; */ return new class implements ServiceProviderInterface { - /** - * Registers the service provider with a DI container. - * - * @param Container $container The DI container. - * - * @return void - * - * @since 4.0.0 - */ - public function register(Container $container) - { - $container->registerServiceProvider(new CategoryFactory('\\Joomla\\Component\\Weblinks')); - $container->registerServiceProvider(new MVCFactory('\\Joomla\\Component\\Weblinks')); - $container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Weblinks')); - $container->set( - ComponentInterface::class, - function (Container $container) - { - $component = new WeblinksComponent($container->get(ComponentDispatcherFactoryInterface::class)); - $component->setMVCFactory($container->get(MVCFactoryInterface::class)); - $component->setCategoryFactory($container->get(CategoryFactoryInterface::class)); + /** + * Registers the service provider with a DI container. + * + * @param Container $container The DI container. + * + * @return void + * + * @since 4.0.0 + */ + public function register(Container $container) + { + $container->set(AssociationExtensionInterface::class, new AssociationsHelper); - return $component; - } - ); - } + $componentNamespace = '\\Joomla\\Component\\Weblinks'; + + $container->registerServiceProvider(new CategoryFactory($componentNamespace)); + $container->registerServiceProvider(new MVCFactory($componentNamespace)); + $container->registerServiceProvider(new ComponentDispatcherFactory($componentNamespace)); + $container->registerServiceProvider(new RouterFactory($componentNamespace)); + + $container->set( + ComponentInterface::class, + function (Container $container) { + $component = new WeblinksComponent($container->get(ComponentDispatcherFactoryInterface::class)); + + $component->setRegistry($container->get(Registry::class)); + $component->setMVCFactory($container->get(MVCFactoryInterface::class)); + $component->setCategoryFactory($container->get(CategoryFactoryInterface::class)); + $component->setAssociationExtension($container->get(AssociationExtensionInterface::class)); + $component->setRouterFactory($container->get(RouterFactoryInterface::class)); + + return $component; + } + ); + } }; diff --git a/src/administrator/components/com_weblinks/sql/install.mysql.sql b/src/administrator/components/com_weblinks/sql/install.mysql.sql index a9d3690..aba0c38 100644 --- a/src/administrator/components/com_weblinks/sql/install.mysql.sql +++ b/src/administrator/components/com_weblinks/sql/install.mysql.sql @@ -11,33 +11,33 @@ INSERT INTO `#__content_types` (`type_title`, `type_alias`, `table`, `rules`, `f -- CREATE TABLE IF NOT EXISTS `#__weblinks` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `catid` int(11) NOT NULL DEFAULT 0, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `catid` int NOT NULL DEFAULT 0, `title` varchar(250) NOT NULL DEFAULT '', `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '', `url` varchar(250) NOT NULL DEFAULT '', `description` text NOT NULL, - `hits` int(11) NOT NULL DEFAULT 0, - `state` tinyint(1) NOT NULL DEFAULT 0, - `checked_out` int(11) NOT NULL DEFAULT 0, - `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `ordering` int(11) NOT NULL DEFAULT 0, - `access` int(11) NOT NULL DEFAULT 1, + `hits` int NOT NULL DEFAULT 0, + `state` tinyint NOT NULL DEFAULT 0, + `checked_out` int unsigned, + `checked_out_time` datetime, + `ordering` int NOT NULL DEFAULT 0, + `access` int NOT NULL DEFAULT 1, `params` text NOT NULL, `language` char(7) NOT NULL DEFAULT '', - `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `created_by` int(10) unsigned NOT NULL DEFAULT 0, + `created` datetime NOT NULL, + `created_by` int unsigned NOT NULL DEFAULT 0, `created_by_alias` varchar(255) NOT NULL DEFAULT '', - `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `modified_by` int(10) unsigned NOT NULL DEFAULT 0, + `modified` datetime NOT NULL, + `modified_by` int unsigned NOT NULL DEFAULT 0, `metakey` text NOT NULL, `metadesc` text NOT NULL, `metadata` text NOT NULL, - `featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if link is featured.', + `featured` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Set if link is featured.', `xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.', - `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(10) unsigned NOT NULL DEFAULT 1, + `publish_up` datetime, + `publish_down` datetime, + `version` int unsigned NOT NULL DEFAULT 1, `images` text NOT NULL, PRIMARY KEY (`id`), KEY `idx_access` (`access`), diff --git a/src/administrator/components/com_weblinks/sql/install.postgresql.sql b/src/administrator/components/com_weblinks/sql/install.postgresql.sql index c66da70..4b6be61 100644 --- a/src/administrator/components/com_weblinks/sql/install.postgresql.sql +++ b/src/administrator/components/com_weblinks/sql/install.postgresql.sql @@ -17,24 +17,24 @@ CREATE TABLE "#__weblinks" ( "description" text NOT NULL, "hits" bigint DEFAULT 0 NOT NULL, "state" smallint DEFAULT 0 NOT NULL, - "checked_out" bigint DEFAULT 0 NOT NULL, - "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, + "checked_out" integer, + "checked_out_time" timestamp without time zone, "ordering" bigint DEFAULT 0 NOT NULL, "access" bigint DEFAULT 1 NOT NULL, "params" text NOT NULL, "language" varchar(7) DEFAULT '' NOT NULL, - "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, + "created" timestamp without time zone NOT NULL, "created_by" integer DEFAULT 0 NOT NULL, "created_by_alias" varchar(255) DEFAULT '' NOT NULL, - "modified" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, + "modified" timestamp without time zone NOT NULL, "modified_by" integer DEFAULT 0 NOT NULL, "metakey" text NOT NULL, "metadesc" text NOT NULL, "metadata" text NOT NULL, "featured" smallint DEFAULT 0 NOT NULL, "xreference" varchar(50) NOT NULL, - "publish_up" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, - "publish_down" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, + "publish_up" timestamp without time zone, + "publish_down" timestamp without time zone, "version" bigint DEFAULT 1 NOT NULL, "images" text NOT NULL, PRIMARY KEY ("id") diff --git a/src/administrator/components/com_weblinks/sql/install.sqlsrv.sql b/src/administrator/components/com_weblinks/sql/install.sqlsrv.sql deleted file mode 100644 index ba1196e..0000000 --- a/src/administrator/components/com_weblinks/sql/install.sqlsrv.sql +++ /dev/null @@ -1,84 +0,0 @@ -/****** Insert data into table [#__content_types] for UCM functions ******/ -INSERT [#__content_types] ([type_title], [type_alias], [table], [rules], [field_mappings], [router], [content_history_options]) -SELECT 'Weblink', 'com_weblinks.weblink', '{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}', 'WeblinksHelperRoute::getWeblinkRoute', '{"formFile":"administrator\/components\/com_weblinks\/models\/forms\/weblink.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","featured","images"], "ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"], "convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}' -UNION ALL -SELECT 'Weblinks Category', 'com_weblinks.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'WeblinksHelperRoute::getCategoryRoute', '{"formFile":"administrator\/components\/com_categories\/models\/forms\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'; - -/****** Object: Table [#__weblinks] ******/ -SET QUOTED_IDENTIFIER ON; - -CREATE TABLE [#__weblinks]( - [id] [bigint] IDENTITY(1,1) NOT NULL, - [catid] [int] NOT NULL DEFAULT 0, - [title] [nvarchar](250) NOT NULL DEFAULT '', - [alias] [nvarchar](255) NOT NULL, - [url] [nvarchar](250) NOT NULL DEFAULT '', - [description] [nvarchar](max) NOT NULL, - [hits] [int] NOT NULL DEFAULT 0, - [state] [smallint] NOT NULL DEFAULT 0, - [checked_out] [int] NOT NULL DEFAULT 0, - [checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000', - [ordering] [int] NOT NULL DEFAULT 0, - [access] [int] NOT NULL DEFAULT 1, - [params] [nvarchar](max) NOT NULL, - [language] [nvarchar](7) NOT NULL DEFAULT '', - [created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000', - [created_by] [bigint] NOT NULL DEFAULT 0, - [created_by_alias] [nvarchar](255) NOT NULL DEFAULT '', - [modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000', - [modified_by] [bigint] NOT NULL DEFAULT 0, - [metakey] [nvarchar](max) NOT NULL, - [metadesc] [nvarchar](max) NOT NULL, - [metadata] [nvarchar](max) NOT NULL, - [featured] [tinyint] NOT NULL DEFAULT 0, - [xreference] [nvarchar](50) NOT NULL, - [publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000', - [publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000', - [version] [bigint] NOT NULL DEFAULT 1, - [images] [nvarchar](max) NOT NULL, - CONSTRAINT [PK_#__weblinks_id] PRIMARY KEY CLUSTERED -( - [id] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY]; - -CREATE NONCLUSTERED INDEX [idx_access] ON [#__weblinks] -( - [access] ASC -)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); - -CREATE NONCLUSTERED INDEX [idx_catid] ON [#__weblinks] -( - [catid] ASC -)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); - -CREATE NONCLUSTERED INDEX [idx_checkout] ON [#__weblinks] -( - [checked_out] ASC -)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); - -CREATE NONCLUSTERED INDEX [idx_createdby] ON [#__weblinks] -( - [created_by] ASC -)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); - -CREATE NONCLUSTERED INDEX [idx_featured_catid] ON [#__weblinks] -( - [featured] ASC, - [catid] ASC -)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); - -CREATE NONCLUSTERED INDEX [idx_language] ON [#__weblinks] -( - [language] ASC -)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); - -CREATE NONCLUSTERED INDEX [idx_state] ON [#__weblinks] -( - [state] ASC -)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); - -CREATE NONCLUSTERED INDEX [idx_xreference] ON [#__weblinks] -( - [xreference] ASC -)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); diff --git a/src/administrator/components/com_weblinks/sql/uninstall.sqlsrv.sql b/src/administrator/components/com_weblinks/sql/uninstall.sqlsrv.sql deleted file mode 100644 index 7d86a15..0000000 --- a/src/administrator/components/com_weblinks/sql/uninstall.sqlsrv.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM [#__content_types] WHERE [type_alias] IN ('com_weblinks.weblink', 'com_weblinks.category'); - -DROP TABLE IF EXISTS [#__weblinks]; diff --git a/src/administrator/components/com_weblinks/sql/updates/mysql/4.0.0.sql b/src/administrator/components/com_weblinks/sql/updates/mysql/4.0.0.sql new file mode 100644 index 0000000..c8f3342 --- /dev/null +++ b/src/administrator/components/com_weblinks/sql/updates/mysql/4.0.0.sql @@ -0,0 +1,35 @@ +ALTER TABLE `#__weblinks` MODIFY `created` datetime NOT NULL; +ALTER TABLE `#__weblinks` MODIFY `modified` datetime NOT NULL; + +ALTER TABLE `#__weblinks` MODIFY `publish_up` datetime NULL DEFAULT NULL; +ALTER TABLE `#__weblinks` MODIFY `publish_down` datetime NULL DEFAULT NULL; +ALTER TABLE `#__weblinks` MODIFY `checked_out_time` datetime NULL DEFAULT NULL; + +ALTER TABLE `#__weblinks` MODIFY `checked_out` int unsigned; + +UPDATE `#__weblinks` SET `modified` = `created` WHERE `modified` = '0000-00-00 00:00:00'; + +UPDATE `#__weblinks` SET `publish_up` = NULL WHERE `publish_up` = '0000-00-00 00:00:00'; +UPDATE `#__weblinks` SET `publish_down` = NULL WHERE `publish_down` = '0000-00-00 00:00:00'; +UPDATE `#__weblinks` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00'; + +UPDATE `#__weblinks` SET `checked_out` = null WHERE `checked_out` = 0; + +UPDATE `#__categories` SET `modified_time` = `created_time` WHERE `modified_time` = '0000-00-00 00:00:00' AND `extension` = 'com_weblinks'; + +UPDATE `#__categories` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00' AND `extension` = 'com_weblinks'; + +UPDATE `#__ucm_content` SET `core_modified_time` = `core_created_time` + WHERE `core_type_alias` IN ('com_weblinks.weblink', 'com_weblinks.category') + AND `core_modified_time` = '0000-00-00 00:00:00'; + +UPDATE `#__ucm_content` SET `core_publish_up` = NULL + WHERE `core_type_alias` = 'com_weblinks.weblink' + AND `core_publish_up` = '0000-00-00 00:00:00'; +UPDATE `#__ucm_content` SET `core_publish_down` = NULL + WHERE `core_type_alias` = 'com_weblinks.weblink' + AND `core_publish_down` = '0000-00-00 00:00:00'; + +UPDATE `#__ucm_content` SET `core_checked_out_time` = NULL + WHERE `core_type_alias` IN ('com_weblinks.weblink', 'com_weblinks.category') + AND `core_checked_out_time` = '0000-00-00 00:00:00'; diff --git a/src/administrator/components/com_weblinks/sql/updates/postgresql/4.0.0.sql b/src/administrator/components/com_weblinks/sql/updates/postgresql/4.0.0.sql new file mode 100644 index 0000000..753acf4 --- /dev/null +++ b/src/administrator/components/com_weblinks/sql/updates/postgresql/4.0.0.sql @@ -0,0 +1,42 @@ +ALTER TABLE "#__weblinks" ALTER COLUMN "created" DROP DEFAULT; + +ALTER TABLE "#__weblinks" ALTER COLUMN "modified" DROP DEFAULT; + +ALTER TABLE "#__weblinks" ALTER COLUMN "publish_up" DROP NOT NULL; +ALTER TABLE "#__weblinks" ALTER COLUMN "publish_up" DROP DEFAULT; + +ALTER TABLE "#__weblinks" ALTER COLUMN "publish_down" DROP NOT NULL; +ALTER TABLE "#__weblinks" ALTER COLUMN "publish_down" DROP DEFAULT; + +ALTER TABLE "#__weblinks" ALTER COLUMN "checked_out_time" DROP NOT NULL; +ALTER TABLE "#__weblinks" ALTER COLUMN "checked_out_time" DROP DEFAULT; + +ALTER TABLE "#__weblinks" ALTER COLUMN "checked_out" DROP NOT NULL; +ALTER TABLE "#__weblinks" ALTER COLUMN "checked_out" DROP DEFAULT; + +UPDATE "#__weblinks" SET "modified" = "created" WHERE "modified" = '1970-01-01 00:00:00'; + +UPDATE "#__weblinks" SET "publish_up" = NULL WHERE "publish_up" = '1970-01-01 00:00:00'; +UPDATE "#__weblinks" SET "publish_down" = NULL WHERE "publish_down" = '1970-01-01 00:00:00'; +UPDATE "#__weblinks" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00'; + +UPDATE "#__weblinks" SET "checked_out" = null WHERE "checked_out" = 0; + +UPDATE "#__categories" SET "modified_time" = "created_time" WHERE "modified_time" = '1970-01-01 00:00:00' AND "extension" = 'com_weblinks'; + +UPDATE "#__categories" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00' AND "extension" = 'com_weblinks'; + +UPDATE "#__ucm_content" SET "core_modified_time" = "core_created_time" + WHERE "core_type_alias" IN ('com_weblinks.weblink', 'com_weblinks.category') + AND "core_modified_time" = '1970-01-01 00:00:00'; + +UPDATE "#__ucm_content" SET "core_publish_up" = NULL + WHERE "core_type_alias" = 'com_weblinks.weblink' + AND "core_publish_up" = '1970-01-01 00:00:00'; +UPDATE "#__ucm_content" SET "core_publish_down" = NULL + WHERE "core_type_alias" = 'com_weblinks.weblink' + AND "core_publish_down" = '1970-01-01 00:00:00'; + +UPDATE "#__ucm_content" SET "core_checked_out_time" = NULL + WHERE "core_type_alias" IN ('com_weblinks.weblink', 'com_weblinks.category') + AND "core_checked_out_time" = '1970-01-01 00:00:00'; diff --git a/src/administrator/components/com_weblinks/sql/updates/sqlsrv/3.4.0.sql b/src/administrator/components/com_weblinks/sql/updates/sqlsrv/3.4.0.sql deleted file mode 100644 index 80c2c0b..0000000 --- a/src/administrator/components/com_weblinks/sql/updates/sqlsrv/3.4.0.sql +++ /dev/null @@ -1 +0,0 @@ -# Placeholder file to set the extension database schema version diff --git a/src/administrator/components/com_weblinks/Controller/DisplayController.php b/src/administrator/components/com_weblinks/src/Controller/DisplayController.php similarity index 86% rename from src/administrator/components/com_weblinks/Controller/DisplayController.php rename to src/administrator/components/com_weblinks/src/Controller/DisplayController.php index ed1b7e9..67fcf1f 100644 --- a/src/administrator/components/com_weblinks/Controller/DisplayController.php +++ b/src/administrator/components/com_weblinks/src/Controller/DisplayController.php @@ -37,14 +37,12 @@ class DisplayController extends BaseController * @param array $urlparams An array of safe url parameters and their variable types, * for valid values see {@link JFilterInput::clean()}. * - * @return JControllerLegacy This object to support chaining. + * @return BaseController|boolean This object to support chaining. * * @since 1.5 */ public function display($cacheable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/weblinks.php'; - $view = $this->input->get('view', 'weblinks'); $layout = $this->input->get('layout', 'default'); $id = $this->input->getInt('id'); @@ -53,8 +51,11 @@ class DisplayController extends BaseController if ($view == 'weblink' && $layout == 'edit' && !$this->checkEditId('com_weblinks.edit.weblink', $id)) { // Somehow the person just went to the form - we don't allow that. - $this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); - $this->setMessage($this->getError(), 'error'); + if (!\count($this->app->getMessageQueue())) + { + $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id), 'error'); + } + $this->setRedirect(Route::_('index.php?option=com_weblinks&view=weblinks', false)); return false; diff --git a/src/administrator/components/com_weblinks/Controller/WeblinkController.php b/src/administrator/components/com_weblinks/src/Controller/WeblinkController.php similarity index 73% rename from src/administrator/components/com_weblinks/Controller/WeblinkController.php rename to src/administrator/components/com_weblinks/src/Controller/WeblinkController.php index e5acd0a..a5ce117 100644 --- a/src/administrator/components/com_weblinks/Controller/WeblinkController.php +++ b/src/administrator/components/com_weblinks/src/Controller/WeblinkController.php @@ -11,6 +11,9 @@ namespace Joomla\Component\Weblinks\Administrator\Controller; defined('_JEXEC') or die; +use Joomla\CMS\MVC\Controller\FormController; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Versioning\VersionableControllerTrait; use Joomla\Utilities\ArrayHelper; /** @@ -18,8 +21,10 @@ use Joomla\Utilities\ArrayHelper; * * @since 1.6 */ -class WeblinkController extends \JControllerForm +class WeblinkController extends FormController { + use VersionableControllerTrait; + /** * Method override to check if you can add a new record. * @@ -32,20 +37,14 @@ class WeblinkController extends \JControllerForm protected function allowAdd($data = array()) { $categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int'); - $allow = null; if ($categoryId) { // If the category has been passed in the URL check it. - $allow = \JFactory::getUser()->authorise('core.create', $this->option . '.category.' . $categoryId); + return $this->app->getIdentity()->authorise('core.create', $this->option . '.category.' . $categoryId); } - if ($allow !== null) - { - return $allow; - } - - // In the absense of better information, revert to the component permissions. + // In the absence of better information, revert to the component permissions. return parent::allowAdd($data); } @@ -78,7 +77,7 @@ class WeblinkController extends \JControllerForm return false; } - $user = \JFactory::getUser(); + $user = $this->app->getIdentity(); // Check if can edit own core.edit.own. $canEditOwn = $user->authorise('core.edit.own', $this->option . '.category.' . (int) $item->catid) && $item->created_by == $user->id; @@ -98,13 +97,13 @@ class WeblinkController extends \JControllerForm */ public function batch($model = null) { - \JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN')); + $this->checkToken(); // Set the model - $model = $this->getModel('Weblink', '', array()); + $model = $this->getModel('Weblink', 'Administrator', array()); // Preset the redirect - $this->setRedirect(\JRoute::_('index.php?option=com_weblinks&view=weblinks' . $this->getRedirectToListAppend(), false)); + $this->setRedirect(Route::_('index.php?option=com_weblinks&view=weblinks' . $this->getRedirectToListAppend(), false)); return parent::batch($model); } @@ -112,8 +111,8 @@ class WeblinkController extends \JControllerForm /** * Function that allows child controller access to model data after the data has been saved. * - * @param JModelLegacy $model The data model object. - * @param array $validData The validated data. + * @param \Joomla\CMS\MVC\Model\BaseDatabaseModel $model The data model object. + * @param array $validData The validated data. * * @return void * @@ -125,7 +124,7 @@ class WeblinkController extends \JControllerForm if ($task == 'save') { - $this->setRedirect(\JRoute::_('index.php?option=com_weblinks&view=weblinks', false)); + $this->setRedirect(Route::_('index.php?option=com_weblinks&view=weblinks', false)); } } } diff --git a/src/administrator/components/com_weblinks/Controller/WeblinksController.php b/src/administrator/components/com_weblinks/src/Controller/WeblinksController.php similarity index 100% rename from src/administrator/components/com_weblinks/Controller/WeblinksController.php rename to src/administrator/components/com_weblinks/src/Controller/WeblinksController.php diff --git a/src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php b/src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php new file mode 100644 index 0000000..937cba4 --- /dev/null +++ b/src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php @@ -0,0 +1,138 @@ +getRegistry()->register('weblinksadministrator', new AdministratorService); + $this->getRegistry()->register('weblinkicon', new Icon($container->get(SiteApplication::class))); + } + + /** + * Returns a valid section for the given section. If it is not valid then null + * is returned. + * + * @param string $section The section to get the mapping for + * @param object $item The item + * + * @return string|null The new section + * + * @since 4.0.0 + */ + public function validateSection($section, $item = null) + { + if ($section != 'weblink') + { + // We don't know other sections + return null; + } + + return $section; + } + + /** + * Returns valid contexts + * + * @return array + * + * @since 4.0.0 + */ + public function getContexts(): array + { + Factory::getLanguage()->load('com_weblinks', JPATH_ADMINISTRATOR); + + $contexts = array( + 'com_weblinks.weblink' => Text::_('COM_WEBLINKS'), + ); + + return $contexts; + } + + + /** + * Returns the table for the count items functions for the given section. + * + * @param string $section The section + * + * @return string|null + * + * @since 4.0.0 + */ + protected function getTableNameForSection(string $section = null) + { + return ($section === 'category' ? 'categories' : 'weblinks'); + } + + /** + * Returns the state column for the count items functions for the given section. + * + * @param string $section The section + * + * @return string|null + * + * @since 4.0.0 + */ + protected function getStateColumnForSection(string $section = null) + { + return 'state'; + } +} diff --git a/src/administrator/components/com_weblinks/src/Field/Modal/WeblinkField.php b/src/administrator/components/com_weblinks/src/Field/Modal/WeblinkField.php new file mode 100644 index 0000000..07bf11b --- /dev/null +++ b/src/administrator/components/com_weblinks/src/Field/Modal/WeblinkField.php @@ -0,0 +1,295 @@ +element['new'] == 'true'); + $allowEdit = ((string) $this->element['edit'] == 'true'); + $allowClear = ((string) $this->element['clear'] != 'false'); + $allowSelect = ((string) $this->element['select'] != 'false'); + + // Load language + Factory::getLanguage()->load('com_weblinks', JPATH_ADMINISTRATOR); + + // The active weblink id field. + $value = (int) $this->value > 0 ? (int) $this->value : ''; + + // Create the modal id. + $modalId = 'Weblink_' . $this->id; + + /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */ + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + + // Add the modal field script to the document head. + $wa->useScript('field.modal-fields'); + + // Script to proxy the select modal function to the modal-fields.js file. + if ($allowSelect) + { + static $scriptSelect = null; + + if (is_null($scriptSelect)) + { + $scriptSelect = array(); + } + + if (!isset($scriptSelect[$this->id])) + { + $wa->addInlineScript(" + window.jSelectWeblink_" . $this->id . " = function (id, title, catid, object, url, language) { + window.processModalSelect('Article', '" . $this->id . "', id, title, catid, object, url, language); + }", + [], + ['type' => 'module'] + ); + + Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED'); + + $scriptSelect[$this->id] = true; + } + } + + // Setup variables for display. + $linkWeblinks = 'index.php?option=com_weblinks&view=weblinks&layout=modal&tmpl=component&' . Session::getFormToken() . '=1'; + $linkWeblink = 'index.php?option=com_weblinks&view=weblink&layout=modal&tmpl=component&' . Session::getFormToken() . '=1'; + $modalTitle = Text::_('COM_WEBLINKS_CHANGE_WEBLINK'); + + if (isset($this->element['language'])) + { + $linkWeblinks .= '&forcedLanguage=' . $this->element['language']; + $linkWeblink .= '&forcedLanguage=' . $this->element['language']; + $modalTitle .= ' — ' . $this->element['label']; + } + + $urlSelect = $linkWeblinks . '&function=jSelectWeblink_' . $this->id; + $urlEdit = $linkWeblink . '&task=weblink.edit&id=\' + document.getElementById("' . $this->id . '_id").value + \''; + $urlNew = $linkWeblink . '&task=weblink.add'; + + if ($value) + { + $db = Factory::getDbo(); + $query = $db->getQuery(true) + ->select($db->quoteName('title')) + ->from($db->quoteName('#__weblinks')) + ->where($db->quoteName('id') . ' = :id') + ->bind(':id', $value, ParameterType::INTEGER); + $db->setQuery($query); + + try + { + $title = $db->loadResult(); + } + catch (\RuntimeException $e) + { + Factory::getApplication()->enqueueMessage($e->getMessage(), 'error'); + } + } + + $title = empty($title) ? Text::_('COM_WEBLINKS_SELECT_A_WEBLINK') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8'); + + // The current weblink display field. + $html = ''; + + if ($allowSelect || $allowNew || $allowEdit || $allowClear) + { + $html .= ''; + } + + $html .= ''; + + // Select weblink button + if ($allowSelect) + { + $html .= '' + . ' ' . Text::_('JSELECT') + . ''; + } + + // New weblink button + if ($allowNew) + { + $html .= '' + . ' ' . Text::_('JACTION_CREATE') + . ''; + } + + // Edit weblink button + if ($allowEdit) + { + $html .= '' + . ' ' . Text::_('JACTION_EDIT') + . ''; + } + + // Clear weblink button + if ($allowClear) + { + $html .= '' + . ' ' . Text::_('JCLEAR') + . ''; + } + + if ($allowSelect || $allowNew || $allowEdit || $allowClear) + { + $html .= ''; + } + + // Select weblink modal + if ($allowSelect) + { + $html .= HTMLHelper::_( + 'bootstrap.renderModal', + 'ModalSelect' . $modalId, + array( + 'title' => $modalTitle, + 'url' => $urlSelect, + 'height' => '400px', + 'width' => '800px', + 'bodyHeight' => 70, + 'modalWidth' => 80, + 'footer' => '', + ) + ); + } + + $closeButtonClick = "window.processModalEdit(this, '$this->id', 'add', 'weblink', 'cancel', 'weblink-form'); return false;"; + $saveButtonClick = "window.processModalEdit(this, '$this->id', 'add', 'weblink', 'save', 'weblink-form'); return false;"; + $applyButtonClick = "window.processModalEdit(this, '$this->id', 'add', 'weblink', 'apply', 'weblink-form'); return false;"; + + // New weblink modal + if ($allowNew) + { + $html .= HTMLHelper::_( + 'bootstrap.renderModal', + 'ModalNew' . $modalId, + array( + 'title' => Text::_('COM_WEBLINKS_NEW_WEBLINK'), + 'backdrop' => 'static', + 'keyboard' => false, + 'closeButton' => false, + 'url' => $urlNew, + 'height' => '400px', + 'width' => '800px', + 'bodyHeight' => '70', + 'modalWidth' => '80', + 'footer' => '' + . '' + . '', + ) + ); + } + + // Edit weblink modal + if ($allowEdit) + { + $html .= HTMLHelper::_( + 'bootstrap.renderModal', + 'ModalEdit' . $modalId, + array( + 'title' => Text::_('COM_WEBLINKS_EDIT_WEBLINK'), + 'backdrop' => 'static', + 'keyboard' => false, + 'closeButton' => false, + 'url' => $urlEdit, + 'height' => '400px', + 'width' => '800px', + 'bodyHeight' => '70', + 'modalWidth' => '80', + 'footer' => '' + . '' + . '', + ) + ); + } + + // Note: class='required' for client side validation. + $class = $this->required ? ' class="required modal-value"' : ''; + $html .= ''; + + return $html; + } + + /** + * Method to get the field label markup. + * + * @return string The field label markup. + * + * @since __DEPLOY_VERSION__ + */ + protected function getLabel() + { + return str_replace($this->id, $this->id . '_name', parent::getLabel()); + } +} diff --git a/src/administrator/components/com_weblinks/helpers/associations.php b/src/administrator/components/com_weblinks/src/Helper/AssociationsHelper.php similarity index 70% rename from src/administrator/components/com_weblinks/helpers/associations.php rename to src/administrator/components/com_weblinks/src/Helper/AssociationsHelper.php index 5f64ba8..45d4129 100644 --- a/src/administrator/components/com_weblinks/helpers/associations.php +++ b/src/administrator/components/com_weblinks/src/Helper/AssociationsHelper.php @@ -7,23 +7,26 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Administrator\Helper; + defined('_JEXEC') or die; -use Joomla\Utilities\ArrayHelper; - -JTable::addIncludePath(__DIR__ . '/../tables'); +use Joomla\CMS\Association\AssociationExtensionHelper; +use Joomla\CMS\Language\Associations; +use Joomla\CMS\Table\Table; +use Joomla\Component\Weblinks\Site\Helper\AssociationHelper; /** * Content associations helper. * * @since __DEPLOY_VERSION__ */ -class WeblinksAssociationsHelper extends JAssociationExtensionHelper +class AssociationsHelper extends AssociationExtensionHelper { /** * The extension name * - * @var array $extension + * @var string $extension * * @since __DEPLOY_VERSION__ */ @@ -32,7 +35,7 @@ class WeblinksAssociationsHelper extends JAssociationExtensionHelper /** * Array of item types * - * @var array $itemTypes + * @var array $itemTypes * * @since __DEPLOY_VERSION__ */ @@ -41,12 +44,27 @@ class WeblinksAssociationsHelper extends JAssociationExtensionHelper /** * Has the extension association support * - * @var boolean $associationsSupport + * @var boolean $associationsSupport * * @since __DEPLOY_VERSION__ */ protected $associationsSupport = true; + /** + * Method to get the associations for a given item. + * + * @param integer $id Id of the item + * @param string $view Name of the view + * + * @return array Array of associations for the item + * + * @since 4.0.0 + */ + public function getAssociationsForItem($id = 0, $view = null) + { + return AssociationHelper::getAssociations($id, $view); + } + /** * Get the associated items for an item * @@ -71,7 +89,7 @@ class WeblinksAssociationsHelper extends JAssociationExtensionHelper } // Get the associations. - $associations = JLanguageAssociations::getAssociations( + $associations = Associations::getAssociations( $this->extension, $type['tables']['a'], $context, @@ -90,7 +108,7 @@ class WeblinksAssociationsHelper extends JAssociationExtensionHelper * @param string $typeName The item type * @param int $id The id of item for which we need the associated items * - * @return JTable|null + * @return Table|null * * @since __DEPLOY_VERSION__ */ @@ -106,11 +124,11 @@ class WeblinksAssociationsHelper extends JAssociationExtensionHelper switch ($typeName) { case 'weblink': - $table = JTable::getInstance('Weblink', 'WeblinksTable'); + $table = Table::getInstance('WeblinkTable', 'Joomla\\Component\\Weblinks\\Administrator\\Table\\'); break; case 'category': - $table = JTable::getInstance('Category'); + $table = Table::getInstance('Category', 'Joomla\\CMS\\Table\\'); break; } @@ -147,14 +165,14 @@ class WeblinksAssociationsHelper extends JAssociationExtensionHelper { case 'weblink': - $support['state'] = true; - $support['acl'] = true; - $support['checkout'] = true; - $support['category'] = true; + $support['state'] = true; + $support['acl'] = true; + $support['checkout'] = true; + $support['category'] = true; $support['save2copy'] = true; $tables = array( - 'a' => '#__weblinks' + 'a' => '#__weblinks', ); $title = 'weblink'; @@ -170,10 +188,10 @@ class WeblinksAssociationsHelper extends JAssociationExtensionHelper $support['state'] = true; $support['acl'] = true; $support['checkout'] = true; - $support['level'] = true; + $support['level'] = true; $tables = array( - 'a' => '#__categories' + 'a' => '#__categories', ); $title = 'category'; @@ -186,7 +204,7 @@ class WeblinksAssociationsHelper extends JAssociationExtensionHelper 'support' => $support, 'tables' => $tables, 'joins' => $joins, - 'title' => $title + 'title' => $title, ); } } diff --git a/src/administrator/components/com_weblinks/src/Helper/WeblinksHelper.php b/src/administrator/components/com_weblinks/src/Helper/WeblinksHelper.php new file mode 100644 index 0000000..823b8c7 --- /dev/null +++ b/src/administrator/components/com_weblinks/src/Helper/WeblinksHelper.php @@ -0,0 +1,24 @@ +id)) + if (empty($record->id) || $record->state != -2) { - if ($record->state != -2) - { - return; - } - - if ($record->catid) - { - return \JFactory::getUser()->authorise('core.delete', 'com_weblinks.category.' . (int) $record->catid); - } - - return parent::canDelete($record); + return false; } + + return Factory::getApplication()->getIdentity()->authorise('core.delete', 'com_weblinks.category.' . (int) $record->catid); } /** @@ -86,7 +87,7 @@ class WeblinkModel extends \JModelAdmin { if (!empty($record->catid)) { - return \JFactory::getUser()->authorise('core.edit.state', 'com_weblinks.category.' . (int) $record->catid); + return Factory::getApplication()->getIdentity()->authorise('core.edit.state', 'com_weblinks.category.' . (int) $record->catid); } return parent::canEditState($record); @@ -141,6 +142,12 @@ class WeblinkModel extends \JModelAdmin $form->setFieldAttribute('publish_down', 'filter', 'unset'); } + // Don't allow to change the created_by user if not allowed to access com_users. + if (!Factory::getApplication()->getIdentity()->authorise('core.manage', 'com_users')) + { + $form->setFieldAttribute('created_by', 'filter', 'unset'); + } + return $form; } @@ -153,8 +160,10 @@ class WeblinkModel extends \JModelAdmin */ protected function loadFormData() { + $app = Factory::getApplication(); + // Check the session for previously entered form data. - $data = \JFactory::getApplication()->getUserState('com_weblinks.edit.weblink.data', array()); + $data = $app->getUserState('com_weblinks.edit.weblink.data', array()); if (empty($data)) { @@ -163,7 +172,6 @@ class WeblinkModel extends \JModelAdmin // Prime some default values. if ($this->getState('weblink.id') == 0) { - $app = \JFactory::getApplication(); $data->set('catid', $app->input->get('catid', $app->getUserState('com_weblinks.weblinks.filter.category_id'), 'int')); } } @@ -197,7 +205,7 @@ class WeblinkModel extends \JModelAdmin $item->images = $registry->toArray(); // Load associated web links items - $assoc = \JLanguageAssociations::isEnabled(); + $assoc = Associations::isEnabled(); if ($assoc) { @@ -205,7 +213,7 @@ class WeblinkModel extends \JModelAdmin if ($item->id != null) { - $associations = \JLanguageAssociations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $item->id); + $associations = Associations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $item->id); foreach ($associations as $tag => $association) { @@ -216,7 +224,7 @@ class WeblinkModel extends \JModelAdmin if (!empty($item->id)) { - $item->tags = new \JHelperTags; + $item->tags = new TagsHelper; $item->tags->getTagIds($item->id, 'com_weblinks.weblink'); $item->metadata['tags'] = $item->tags; } @@ -228,7 +236,7 @@ class WeblinkModel extends \JModelAdmin /** * Prepare and sanitise the table data prior to saving. * - * @param JTable $table A reference to a JTable object. + * @param \Joomla\CMS\Table\Table $table A reference to a JTable object. * * @return void * @@ -236,15 +244,15 @@ class WeblinkModel extends \JModelAdmin */ protected function prepareTable($table) { - $date = \JFactory::getDate(); - $user = \JFactory::getUser(); + $date = Factory::getDate(); + $user = Factory::getApplication()->getIdentity(); $table->title = htmlspecialchars_decode($table->title, ENT_QUOTES); - $table->alias = \JApplicationHelper::stringURLSafe($table->alias); + $table->alias = ApplicationHelper::stringURLSafe($table->alias); if (empty($table->alias)) { - $table->alias = \JApplicationHelper::stringURLSafe($table->title); + $table->alias = ApplicationHelper::stringURLSafe($table->title); } if (empty($table->id)) @@ -254,7 +262,7 @@ class WeblinkModel extends \JModelAdmin // Set ordering to the last item if not set if (empty($table->ordering)) { - $db = $this->getDbo(); + $db = $this->getDbo(); $query = $db->getQuery(true) ->select('MAX(ordering)') ->from($db->quoteName('#__weblinks')); @@ -279,7 +287,7 @@ class WeblinkModel extends \JModelAdmin /** * A protected method to get a set of ordering conditions. * - * @param JTable $table A JTable object. + * @param \Joomla\CMS\Table\Table $table A JTable object. * * @return array An array of conditions to add to ordering queries. * @@ -287,7 +295,7 @@ class WeblinkModel extends \JModelAdmin */ protected function getReorderConditions($table) { - $condition = array(); + $condition = array(); $condition[] = 'catid = ' . (int) $table->catid; return $condition; @@ -300,13 +308,11 @@ class WeblinkModel extends \JModelAdmin * * @return boolean True on success. * - * @since 3.1 + * @since 3.1 */ public function save($data) { - $app = \JFactory::getApplication(); - - \JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php'); + $app = Factory::getApplication(); // Cast catid to integer for comparison $catid = (int) $data['catid']; @@ -314,30 +320,30 @@ class WeblinkModel extends \JModelAdmin // Check if New Category exists if ($catid > 0) { - $catid = \CategoriesHelper::validateCategoryId($data['catid'], 'com_weblinks'); + $catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_weblinks'); } // Save New Category if ($catid == 0 && $this->canCreateCategory()) { - $table = array(); - $table['title'] = $data['catid']; + $table = array(); + $table['title'] = $data['catid']; $table['parent_id'] = 1; $table['extension'] = 'com_weblinks'; - $table['language'] = $data['language']; + $table['language'] = $data['language']; $table['published'] = 1; // Create new category and get catid back - $data['catid'] = \CategoriesHelper::createCategory($table); + $data['catid'] = CategoriesHelper::createCategory($table); } // Alter the title for save as copy if ($app->input->get('task') == 'save2copy') { list($name, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']); - $data['title'] = $name; - $data['alias'] = $alias; - $data['state'] = 0; + $data['title'] = $name; + $data['alias'] = $alias; + $data['state'] = 0; } return parent::save($data); @@ -363,10 +369,10 @@ class WeblinkModel extends \JModelAdmin { if ($name == $table->title) { - $name = \JString::increment($name); + $name = StringHelper::increment($name); } - $alias = \JString::increment($alias, 'dash'); + $alias = StringHelper::increment($alias, 'dash'); } return array($name, $alias); @@ -375,7 +381,7 @@ class WeblinkModel extends \JModelAdmin /** * Allows preprocessing of the JForm object. * - * @param JForm $form The form object + * @param \JForm $form The form object * @param array $data The data to be merged into the form object * @param string $group The plugin group to be executed * @@ -391,14 +397,14 @@ class WeblinkModel extends \JModelAdmin } // Association weblinks items - if (\JLanguageAssociations::isEnabled()) + if (Associations::isEnabled()) { - $languages = \JLanguageHelper::getContentLanguages(false, true, null, 'ordering', 'asc'); + $languages = LanguageHelper::getContentLanguages(false, false, null, 'ordering', 'asc'); if (count($languages) > 1) { $addform = new \SimpleXMLElement('
'); - $fields = $addform->addChild('fields'); + $fields = $addform->addChild('fields'); $fields->addAttribute('name', 'associations'); $fieldset = $fields->addChild('fieldset'); $fieldset->addAttribute('name', 'item_associations'); @@ -434,6 +440,6 @@ class WeblinkModel extends \JModelAdmin */ private function canCreateCategory() { - return \JFactory::getUser()->authorise('core.create', 'com_weblinks'); + return Factory::getApplication()->getIdentity()->authorise('core.create', 'com_weblinks'); } } diff --git a/src/administrator/components/com_weblinks/Model/WeblinksModel.php b/src/administrator/components/com_weblinks/src/Model/WeblinksModel.php similarity index 74% rename from src/administrator/components/com_weblinks/Model/WeblinksModel.php rename to src/administrator/components/com_weblinks/src/Model/WeblinksModel.php index 2761fef..b78d2e0 100644 --- a/src/administrator/components/com_weblinks/Model/WeblinksModel.php +++ b/src/administrator/components/com_weblinks/src/Model/WeblinksModel.php @@ -11,8 +11,12 @@ namespace Joomla\Component\Weblinks\Administrator\Model; defined('_JEXEC') or die; -use Joomla\CMS\MVC\Model\ListModel; +use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Associations; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; +use Joomla\CMS\MVC\Model\ListModel; +use Joomla\Database\ParameterType; /** * Methods supporting a list of weblink records. @@ -24,7 +28,7 @@ class WeblinksModel extends ListModel /** * Constructor. * - * @param array $config An optional associative array of configuration settings. + * @param array $config An optional associative array of configuration settings. * @param MVCFactoryInterface $factory The factory. * * @see JControllerLegacy @@ -59,7 +63,7 @@ class WeblinksModel extends ListModel 'level', 'c.level', ); - $assoc = \JLanguageAssociations::isEnabled(); + $assoc = Associations::isEnabled(); if ($assoc) { @@ -83,7 +87,7 @@ class WeblinksModel extends ListModel */ protected function populateState($ordering = 'a.title', $direction = 'asc') { - $app = \JFactory::getApplication(); + $app = Factory::getApplication(); $forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd'); @@ -99,17 +103,8 @@ class WeblinksModel extends ListModel $this->context .= '.' . $forcedLanguage; } - // Load the filter state. - $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string')); - $this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd')); - $this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string')); - $this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd')); - $this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string')); - $this->setState('filter.tag', $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '', 'string')); - $this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd')); - // Load the parameters. - $params = \JComponentHelper::getParams('com_weblinks'); + $params = ComponentHelper::getParams('com_weblinks'); $this->setState('params', $params); // Force a language. @@ -152,16 +147,16 @@ class WeblinksModel extends ListModel /** * Build an SQL query to load the list data. * - * @return JDatabaseQuery + * @return \JDatabaseQuery * * @since 1.6 */ protected function getListQuery() { // Create a new query object. - $db = $this->getDbo(); + $db = $this->getDbo(); $query = $db->getQuery(true); - $user = \JFactory::getUser(); + $user = Factory::getApplication()->getIdentity(); // Select the required fields from the table. $query->select( @@ -191,7 +186,7 @@ class WeblinksModel extends ListModel ->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON ' . $db->qn('c.id') . ' = ' . $db->qn('a.catid')); // Join over the associations. - $assoc = \JLanguageAssociations::isEnabled(); + $assoc = Associations::isEnabled(); if ($assoc) { @@ -204,14 +199,14 @@ class WeblinksModel extends ListModel // Filter by access level. if ($access = $this->getState('filter.access')) { - $query->where($db->quoteName('a.access') . ' = ' . (int) $access); + $query->where($db->quoteName('a.access') . ' = :access') + ->bind(':access', $access, ParameterType::INTEGER); } // Implement View Level Access if (!$user->authorise('core.admin')) { - $groups = implode(',', $user->getAuthorisedViewLevels()); - $query->where($db->quoteName('a.access') . ' IN (' . $groups . ')'); + $query->whereIn($db->quoteName('a.access'), $user->getAuthorisedViewLevels()); } // Filter by published state @@ -219,11 +214,12 @@ class WeblinksModel extends ListModel if (is_numeric($published)) { - $query->where($db->quoteName('a.state') . ' = ' . (int) $published); + $query->where($db->quoteName('a.state') . ' = :state') + ->bind(':state', $published, ParameterType::INTEGER); } elseif ($published === '') { - $query->where('(' . $db->quoteName('a.state') . ' IN (0, 1))'); + $query->whereIn($db->quoteName('a.state'), [0, 1]); } // Filter by category. @@ -231,13 +227,15 @@ class WeblinksModel extends ListModel if (is_numeric($categoryId)) { - $query->where($db->quoteName('a.catid') . ' = ' . (int) $categoryId); + $query->where($db->quoteName('a.catid') . ' = :catid') + ->bind(':catid', $categoryId, ParameterType::INTEGER); } // Filter on the level. if ($level = $this->getState('filter.level')) { - $query->where($db->quoteName('c.level') . ' <= ' . (int) $level); + $query->where($db->quoteName('c.level') . ' <= :level') + ->bind(':level', $level, ParameterType::INTEGER); } // Filter by search in title @@ -247,19 +245,24 @@ class WeblinksModel extends ListModel { if (stripos($search, 'id:') === 0) { - $query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3)); + $search = substr($search, 3); + $query->where($db->quoteName('a.id') . ' = :id') + ->bind(':id', $search, ParameterType::INTEGER); } else { - $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%')); - $query->where('(' . $db->quoteName('a.title') . ' LIKE ' . $search . ' OR ' . $db->quoteName('a.alias') . ' LIKE ' . $search . ')'); + $search = '%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'); + $query->where('(' . $db->quoteName('a.title') . ' LIKE :title OR ' . $db->quoteName('a.alias') . ' LIKE :alias)') + ->bind(':title', $search) + ->bind(':alias', $search); } } // Filter on the language. if ($language = $this->getState('filter.language')) { - $query->where($db->quoteName('a.language') . ' = ' . $db->quote($language)); + $query->where($db->quoteName('a.language') . ' = :language') + ->bind(':language', $language); } $tagId = $this->getState('filter.tag'); @@ -267,7 +270,8 @@ class WeblinksModel extends ListModel // Filter by a single tag. if (is_numeric($tagId)) { - $query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId) + $query->where($db->quoteName('tagmap.tag_id') . ' = :tagId') + ->bind(':tagId', $tagId, ParameterType::INTEGER) ->join( 'LEFT', $db->quoteName('#__contentitem_tag_map', 'tagmap') . ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id') diff --git a/src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php b/src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php new file mode 100644 index 0000000..98c560e --- /dev/null +++ b/src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php @@ -0,0 +1,115 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +namespace Joomla\Component\Weblinks\Administrator\Service\HTML; + +\defined('_JEXEC') or die; + +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Associations; +use Joomla\CMS\Language\LanguageHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; +use Joomla\Database\ParameterType; + +/** + * Weblinks HTML helper class. + * + * @since 1.6 + */ +class AdministratorService +{ + /** + * Get the associated language flags + * + * @param integer $weblinkid The item id to search associations + * + * @return string The language HTML + * + * @throws \Exception + */ + public function association($weblinkid) + { + // Defaults + $html = ''; + + // Get the associations + if ($associations = Associations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $weblinkid)) + { + foreach ($associations as $tag => $associated) + { + $associations[$tag] = (int) $associated->id; + } + + // Get the associated contact items + $db = Factory::getDbo(); + $query = $db->getQuery(true) + ->select( + [ + $db->quoteName('c.id'), + $db->quoteName('c.title', 'title'), + $db->quoteName('l.sef', 'lang_sef'), + $db->quoteName('lang_code'), + $db->quoteName('cat.title', 'category_title'), + $db->quoteName('l.image'), + $db->quoteName('l.title', 'language_title'), + ] + ) + ->from($db->quoteName('#__weblinks', 'c')) + ->join('LEFT', $db->quoteName('#__categories', 'cat'), $db->quoteName('cat.id') . ' = ' . $db->quoteName('c.catid')) + ->join('LEFT', $db->quoteName('#__languages', 'l'), $db->quoteName('c.language') . ' = ' . $db->quoteName('l.lang_code')) + ->whereIn($db->quoteName('c.id'), array_values($associations)) + ->where($db->quoteName('c.id') . ' != :id') + ->bind(':id', $weblinkid, ParameterType::INTEGER); + $db->setQuery($query); + + try + { + $items = $db->loadObjectList('id'); + } + catch (\RuntimeException $e) + { + throw new \Exception($e->getMessage(), 500, $e); + } + + if ($items) + { + $app = Factory::getApplication(); + $languages = LanguageHelper::getContentLanguages(array(0, 1)); + $content_languages = array_column($languages, 'lang_code'); + + foreach ($items as &$item) + { + if (in_array($item->lang_code, $content_languages)) + { + $text = $item->lang_code; + $url = Route::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id); + $tooltip = '' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '
' + . htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') + . '
' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title); + $classes = 'badge bg-secondary'; + + $item->link = '' . $text . '' + . ''; + } + else + { + // Display warning if Content Language is trashed or deleted + $app->enqueueMessage(Text::sprintf('JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING', $item->lang_code), 'warning'); + } + } + } + + $html = LayoutHelper::render('joomla.content.associations', $items); + } + + return $html; + } +} diff --git a/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php b/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php new file mode 100644 index 0000000..35ece5b --- /dev/null +++ b/src/administrator/components/com_weblinks/src/Service/HTML/Icon.php @@ -0,0 +1,172 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +namespace Joomla\Component\Weblinks\Administrator\Service\HTML; + +\defined('_JEXEC') or die; + +use Joomla\CMS\Application\CMSApplication; +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; +use Joomla\Component\Weblinks\Site\Helper\RouteHelper; +use Joomla\Registry\Registry; + +/** + * Weblinks Component HTML Helper + * + * @since 4.0.0 + */ +class Icon +{ + /** + * The application + * + * @var CMSApplication + * + * @since 4.0.0 + */ + private $application; + + /** + * Service constructor + * + * @param CMSApplication $application The application + * + * @since 4.0.0 + */ + public function __construct(CMSApplication $application) + { + $this->application = $application; + } + + /** + * Method to generate a link to the create item page for the given category + * + * @param object $category The category information + * @param Registry $params The item parameters + * @param array $attribs Optional attributes for the link + * + * @return string The HTML markup for the create item link + * + * @since 4.0.0 + */ + public static function create($category, $params, $attribs = array()) + { + $uri = Uri::getInstance(); + + $url = 'index.php?option=com_weblinks&task=weblink.add&return=' . base64_encode($uri) . '&w_id=0&catid=' . $category->id; + + $text = LayoutHelper::render('joomla.content.icons.create', array('params' => $params, 'legacy' => false)); + + // Add the button classes to the attribs array + if (isset($attribs['class'])) + { + $attribs['class'] .= ' btn btn-primary'; + } + else + { + $attribs['class'] = 'btn btn-primary'; + } + + $button = HTMLHelper::_('link', Route::_($url), $text, $attribs); + + $output = '' . $button . ''; + + return $output; + } + + /** + * Display an edit icon for the weblink. + * + * This icon will not display in a popup window, nor if the weblink is trashed. + * Edit access checks must be performed in the calling code. + * + * @param object $weblink The weblink information + * @param Registry $params The item parameters + * @param array $attribs Optional attributes for the link + * @param boolean $legacy True to use legacy images, false to use icomoon based graphic + * + * @return string The HTML for the weblink edit icon. + * + * @since 4.0.0 + */ + public static function edit($weblink, $params, $attribs = array(), $legacy = false) + { + $user = Factory::getApplication()->getIdentity(); + $uri = Uri::getInstance(); + + // Ignore if in a popup window. + if ($params && $params->get('popup')) + { + return ''; + } + + // Ignore if the state is negative (trashed). + if ($weblink->state < 0) + { + return ''; + } + + // Show checked_out icon if the contact is checked out by a different user + if (property_exists($weblink, 'checked_out') + && property_exists($weblink, 'checked_out_time') + && $weblink->checked_out + && $weblink->checked_out !== $user->get('id')) + { + $checkoutUser = Factory::getUser($weblink->checked_out); + $date = HTMLHelper::_('date', $weblink->checked_out_time); + $tooltip = Text::sprintf('COM_WEBLINKS_CHECKED_OUT_BY', $checkoutUser->name) + . '
' . $date; + + $text = LayoutHelper::render('joomla.content.icons.edit_lock', array('contact' => $weblink, 'tooltip' => $tooltip, 'legacy' => $legacy)); + + $attribs['aria-describedby'] = 'editweblink-' . (int) $weblink->id; + $output = HTMLHelper::_('link', '#', $text, $attribs); + + return $output; + } + + $weblinkUrl = RouteHelper::getWeblinkRoute($weblink->slug, $weblink->catid, $weblink->language); + $url = $weblinkUrl . '&task=weblink.edit&w_id=' . $weblink->id . '&return=' . base64_encode($uri); + + if ((int) $weblink->state === 0) + { + $tooltip = Text::_('COM_WEBLINKS_EDIT_UNPUBLISHED_WEBLINK'); + } + else + { + $tooltip = Text::_('COM_WEBLINKS_EDIT_PUBLISHED_WEBLINK'); + } + + $nowDate = strtotime(Factory::getDate()); + $icon = $weblink->state ? 'edit' : 'eye-slash'; + + if (($weblink->publish_up !== null && strtotime($weblink->publish_up) > $nowDate) + || ($weblink->publish_down !== null && strtotime($weblink->publish_down) < $nowDate + && $weblink->publish_down !== Factory::getDbo()->getNullDate())) + { + $icon = 'eye-slash'; + } + + $aria_described = 'editweblink-' . (int) $weblink->id; + + $text = ''; + $text .= Text::_('JGLOBAL_EDIT'); + $text .= ''; + + $attribs['aria-describedby'] = $aria_described; + $output = HTMLHelper::_('link', Route::_($url), $text, $attribs); + + return $output; + } +} diff --git a/src/administrator/components/com_weblinks/src/Table/WeblinkTable.php b/src/administrator/components/com_weblinks/src/Table/WeblinkTable.php new file mode 100644 index 0000000..7e688bb --- /dev/null +++ b/src/administrator/components/com_weblinks/src/Table/WeblinkTable.php @@ -0,0 +1,292 @@ +typeAlias = 'com_weblinks.weblink'; + + parent::__construct('#__weblinks', 'id', $db); + + // Set the published column alias + $this->setColumnAlias('published', 'state'); + } + + /** + * Overload the store method for the Weblinks table. + * + * @param boolean $updateNulls Toggle whether null values should be updated. + * + * @return boolean True on success, false on failure. + * + * @since 1.6 + */ + public function store($updateNulls = true) + { + $date = Factory::getDate()->toSql(); + $user = Factory::getApplication()->getIdentity(); + + $this->modified = $date; + + if ($this->id) + { + // Existing item + $this->modified_by = $user->id; + $this->modified = $date; + } + else + { + // New weblink. A weblink created and created_by field can be set by the user, + // so we don't touch either of these if they are set. + if (!(int) $this->created) + { + $this->created = $date; + } + + if (empty($this->created_by)) + { + $this->created_by = $user->id; + } + + if (!(int) $this->modified) + { + $this->modified = $date; + } + + if (empty($this->modified_by)) + { + $this->modified_by = $user->id; + } + + if (empty($this->hits)) + { + $this->hits = 0; + } + } + + // Set publish_up to null if not set + if (!$this->publish_up) + { + $this->publish_up = null; + } + + // Set publish_down to null if not set + if (!$this->publish_down) + { + $this->publish_down = null; + } + + // Verify that the alias is unique + $table = new WeblinkTable($this->getDbo()); + + if ($table->load(array('language' => $this->language, 'alias' => $this->alias, 'catid' => (int) $this->catid)) + && ($table->id != $this->id || $this->id == 0)) + { + $this->setError(Text::_('COM_WEBLINKS_ERROR_UNIQUE_ALIAS')); + + return false; + } + + // Convert IDN urls to punycode + $this->url = PunycodeHelper::urlToPunycode($this->url); + + return parent::store($updateNulls); + } + + /** + * Overloaded check method to ensure data integrity. + * + * @return boolean True on success. + * + * @since 1.5 + */ + public function check() + { + if (InputFilter::checkAttribute(array('href', $this->url))) + { + $this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_PROVIDE_URL')); + + return false; + } + + // Check for valid name + if (trim($this->title) == '') + { + $this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_TITLE')); + + return false; + } + + // Check for existing name + $db = $this->getDbo(); + + $query = $db->getQuery(true) + ->select($db->quoteName('id')) + ->from($db->quoteName('#__weblinks')) + ->where($db->quoteName('title') . ' = :title') + ->where($db->quoteName('language') . ' = :language') + ->where($db->quoteName('catid') . ' = :catid') + ->bind(':title', $this->title) + ->bind(':language', $this->language) + ->bind(':catid', $this->catid, ParameterType::INTEGER); + $db->setQuery($query); + + $xid = (int) $db->loadResult(); + + if ($xid && $xid != (int) $this->id) + { + $this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_NAME')); + + return false; + } + + if (empty($this->alias)) + { + $this->alias = $this->title; + } + + $this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language); + + if (trim(str_replace('-', '', $this->alias)) == '') + { + $this->alias = Factory::getDate()->format("Y-m-d-H-i-s"); + } + + // Check the publish down date is not earlier than publish up. + if ((int) $this->publish_down > 0 && $this->publish_down < $this->publish_up) + { + $this->setError(Text::_('JGLOBAL_START_PUBLISH_AFTER_FINISH')); + + return false; + } + + /* + * Clean up keywords -- eliminate extra spaces between phrases + * and cr (\r) and lf (\n) characters from string + */ + if (!empty($this->metakey)) + { + // Array of characters to remove + $bad_characters = array("\n", "\r", "\"", "<", ">"); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); + $keys = explode(',', $after_clean); + $clean_keys = array(); + + foreach ($keys as $key) + { + // Ignore blank keywords + if (trim($key)) + { + $clean_keys[] = trim($key); + } + } + + // Put array back together delimited by ", " + $this->metakey = implode(", ", $clean_keys); + } + + /** + * Ensure any new items have compulsory fields set. This is needed for things like + * frontend editing where we don't show all the fields or using some kind of API + */ + if (!$this->id) + { + if (!isset($this->xreference)) + { + $this->xreference = ''; + } + + if (!isset($this->metakey)) + { + $this->metakey = ''; + } + + if (!isset($this->metadesc)) + { + $this->metadesc = ''; + } + + if (!isset($this->images)) + { + $this->images = '{}'; + } + + if (!isset($this->metadata)) + { + $this->metadata = '{}'; + } + + if (!isset($this->params)) + { + $this->params = '{}'; + } + } + + return parent::check(); + } + + /** + * Get the type alias for the history table + * + * @return string The alias as described above + * + * @since 4.0.0 + */ + public function getTypeAlias() + { + return $this->typeAlias; + } +} diff --git a/src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php b/src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php new file mode 100644 index 0000000..bc37f9b --- /dev/null +++ b/src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php @@ -0,0 +1,174 @@ +state = $this->get('State'); + $this->item = $this->get('Item'); + $this->form = $this->get('Form'); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new GenericDataException(implode("\n", $errors), 500); + } + + // If we are forcing a language in modal (used for associations). + if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'cmd')) + { + // Set the language field to the forcedLanguage and disable changing it. + $this->form->setValue('language', null, $forcedLanguage); + $this->form->setFieldAttribute('language', 'readonly', 'true'); + + // Only allow to select categories with All language or with the forced language. + $this->form->setFieldAttribute('catid', 'language', '*,' . $forcedLanguage); + + // Only allow to select tags with All language or with the forced language. + $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage); + } + + $this->addToolbar(); + + parent::display($tpl); + } + + /** + * Add the page title and toolbar. + * + * @return void + * + * @since 1.6 + */ + protected function addToolbar() + { + $app = Factory::getApplication(); + $app->input->set('hidemainmenu', true); + + $user = $app->getIdentity(); + $isNew = ($this->item->id == 0); + $checkedOut = $this->item->checked_out && $this->item->checked_out !== $user->get('id'); + + // Since we don't track these assets at the item level, use the category id. + $canDo = ContentHelper::getActions('com_weblinks', 'category', $this->item->catid); + + ToolbarHelper::title($isNew ? Text::_('COM_WEBLINKS_MANAGER_WEBLINK_NEW') : Text::_('COM_WEBLINKS_MANAGER_WEBLINK_EDIT'), 'link weblinks'); + + // Build the actions for new and existing records. + if ($isNew) + { + // For new records, check the create permission. + if (count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0) + { + ToolbarHelper::apply('weblink.apply'); + + ToolbarHelper::saveGroup( + [ + ['save', 'weblink.save'], + ['save2new', 'weblink.save2new'] + ], + 'btn-success' + ); + } + + ToolbarHelper::cancel('weblink.cancel'); + } + else + { + // Since it's an existing record, check the edit permission, or fall back to edit own if the owner. + $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $user->id); + + $toolbarButtons = []; + + // Can't save the record if it's checked out and editable + if (!$checkedOut && $itemEditable) + { + ToolbarHelper::apply('weblink.apply'); + + $toolbarButtons[] = ['save', 'weblink.save']; + + // We can save this record, but check the create permission to see if we can return to make a new one. + if ($canDo->get('core.create')) + { + $toolbarButtons[] = ['save2new', 'weblink.save2new']; + } + } + + // If checked out, we can still save + if ($canDo->get('core.create')) + { + $toolbarButtons[] = ['save2copy', 'weblink.save2copy']; + } + + ToolbarHelper::saveGroup( + $toolbarButtons, + 'btn-success' + ); + + ToolbarHelper::cancel('weblink.cancel', 'JTOOLBAR_CLOSE'); + + if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) + { + ToolbarHelper::versions('com_weblinks.weblink', $this->item->id); + } + + if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations')) + { + ToolbarHelper::custom('weblink.editAssociations', 'contract', '', 'JTOOLBAR_ASSOCIATIONS', false, false); + } + } + } +} diff --git a/src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php b/src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php new file mode 100644 index 0000000..110370f --- /dev/null +++ b/src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php @@ -0,0 +1,187 @@ +state = $this->get('State'); + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new GenericDataException(implode("\n", $errors), 500); + } + + // We don't need toolbar in the modal layout. + if ($this->getLayout() !== 'modal') + { + $this->addToolbar(); + } + else + { + // In article associations modal we need to remove language filter if forcing a language. + // We also need to change the category filter to show show categories with All or the forced language. + if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) + { + // If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field. + $languageXml = new \SimpleXMLElement(''); + $this->filterForm->setField($languageXml, 'filter', true); + + // Also, unset the active language filter so the search tools is not open by default with this filter. + unset($this->activeFilters['language']); + + // One last changes needed is to change the category filter to just show categories with All language or with the forced language. + $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter'); + } + } + + parent::display($tpl); + } + + /** + * Add the page title and toolbar. + * + * @return void + * + * @since 1.6 + */ + protected function addToolbar() + { + $canDo = ContentHelper::getActions('com_weblinks', 'category', $this->state->get('filter.category_id')); + $user = Factory::getApplication()->getIdentity(); + + // Get the toolbar object instance + $toolbar = Toolbar::getInstance('toolbar'); + + ToolbarHelper::title(Text::_('COM_WEBLINKS_MANAGER_WEBLINKS'), 'link weblinks'); + + if ($canDo->get('core.create') || \count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0) + { + ToolbarHelper::addNew('weblink.add'); + } + + if ($canDo->get('core.edit.state')) + { + $dropdown = $toolbar->dropdownButton('status-group') + ->text('JTOOLBAR_CHANGE_STATUS') + ->toggleSplit(false) + ->icon('icon-ellipsis-h') + ->buttonClass('btn btn-action') + ->listCheck(true); + + $childBar = $dropdown->getChildToolbar(); + + $childBar->publish('weblinks.publish')->listCheck(true); + + $childBar->unpublish('weblinks.unpublish')->listCheck(true); + + $childBar->archive('weblinks.archive')->listCheck(true); + + if ($user->authorise('core.admin')) + { + $childBar->checkin('weblinks.checkin')->listCheck(true); + } + + if ($this->state->get('filter.published') != -2) + { + $childBar->trash('weblinks.trash')->listCheck(true); + } + + // Add a batch button + if ($user->authorise('core.create', 'com_weblinks') + && $user->authorise('core.edit', 'com_weblinks') + && $user->authorise('core.edit.state', 'com_weblinks')) + { + $childBar->popupButton('batch') + ->text('JTOOLBAR_BATCH') + ->selector('collapseModal') + ->listCheck(true); + } + } + + if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) + { + $toolbar->delete('weblinks.delete') + ->text('JTOOLBAR_EMPTY_TRASH') + ->message('JGLOBAL_CONFIRM_DELETE') + ->listCheck(true); + } + + if ($user->authorise('core.admin', 'com_weblinks') || $user->authorise('core.options', 'com_weblinks')) + { + ToolbarHelper::preferences('com_weblinks'); + } + + ToolbarHelper::help('JHELP_COMPONENTS_WEBLINKS_LINKS'); + } +} diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/edit.php b/src/administrator/components/com_weblinks/tmpl/weblink/edit.php index 64e304f..fff3838 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblink/edit.php +++ b/src/administrator/components/com_weblinks/tmpl/weblink/edit.php @@ -9,18 +9,23 @@ defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Associations; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; -JHtml::_('behavior.formvalidator'); -JHtml::_('formbehavior.chosen', 'select', null, array('disable_search_threshold' => 0 )); +HTMLHelper::_('behavior.formvalidator'); -$app = JFactory::getApplication(); +$app = Factory::getApplication(); $input = $app->input; -$assoc = JLanguageAssociations::isEnabled(); +$assoc = Associations::isEnabled(); // Fieldsets to not automatically render by /layouts/joomla/edit/params.php $this->ignore_fieldsets = array('details', 'images', 'item_associations', 'jmetadata'); +$this->useCoreUI = true; // In case of modal $isModal = $input->get('layout') == 'modal' ? true : false; @@ -28,65 +33,83 @@ $layout = $isModal ? 'modal' : 'edit'; $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : ''; ?> - + - + -
- 'details')); ?> +
+ 'details')); ?> - item->id) ? JText::_('COM_WEBLINKS_NEW_WEBLINK', true) : JText::_('COM_WEBLINKS_EDIT_WEBLINK', true)); ?> + item->id) ? Text::_('COM_WEBLINKS_NEW_WEBLINK', true) : Text::_('COM_WEBLINKS_EDIT_WEBLINK', true)); ?>
- form->renderField('url'); ?> - form->renderField('description'); ?> +
+
+ form->renderField('url'); ?> + form->renderField('description'); ?> +
+
- +
- + - + +
+
+
+ +
+ form->renderField('imaJGLOBAL_FIELDSET_IMAGE_OPTIONSges'); ?> + form->getGroup('images') as $field) : ?> + renderField(); ?> + +
+
+
+
+ + + +
-
- form->renderField('images'); ?> - form->getGroup('images') as $field) : ?> - renderField(); ?> - +
+
+ + +
+
+
+
+ + +
+ - - - -
-
- -
-
- -
-
- - - + - - loadTemplate('associations'); ?> - + +
+ + +
+ - +
- + diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/edit_associations.php b/src/administrator/components/com_weblinks/tmpl/weblink/edit_associations.php index 286ec63..731f5d3 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblink/edit_associations.php +++ b/src/administrator/components/com_weblinks/tmpl/weblink/edit_associations.php @@ -9,4 +9,6 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.associations', $this); +use Joomla\CMS\Layout\LayoutHelper; + +echo LayoutHelper::render('joomla.edit.associations', $this); diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/edit_metadata.php b/src/administrator/components/com_weblinks/tmpl/weblink/edit_metadata.php index 572c12d..41ddc3e 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblink/edit_metadata.php +++ b/src/administrator/components/com_weblinks/tmpl/weblink/edit_metadata.php @@ -9,4 +9,6 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.metadata', $this); +use Joomla\CMS\Layout\LayoutHelper; + +echo LayoutHelper::render('joomla.edit.metadata', $this); diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/edit_params.php b/src/administrator/components/com_weblinks/tmpl/weblink/edit_params.php index e4d69a3..26698db 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblink/edit_params.php +++ b/src/administrator/components/com_weblinks/tmpl/weblink/edit_params.php @@ -9,11 +9,13 @@ defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; + $fieldSets = $this->form->getFieldsets('params'); ?> $fieldSet) : ?>
description) && trim($fieldSet->description)) : ?> - ' . $this->escape(JText::_($fieldSet->description)) . '

'; ?> + ' . $this->escape(Text::_($fieldSet->description)) . '

'; ?> form->getFieldset($name) as $field) : ?>
diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/modal.php b/src/administrator/components/com_weblinks/tmpl/weblink/modal.php index c598582..0dbf7be 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblink/modal.php +++ b/src/administrator/components/com_weblinks/tmpl/weblink/modal.php @@ -7,13 +7,17 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; -JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom')); + +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; + +HTMLHelper::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom')); // @deprecated 4.0 the function parameter, the inline js and the buttons are not needed since 3.7.0. -$function = JFactory::getApplication()->input->getCmd('function', 'jEditWeblink_' . (int) $this->item->id); +$function = Factory::getApplication()->input->getCmd('function', 'jEditWeblink_' . (int) $this->item->id); // Function to update input title when changed -JFactory::getDocument()->addScriptDeclaration(' +Factory::getDocument()->addScriptDeclaration(' function jEditWeblinkModal() { if (window.parent && document.formvalidator.isValid(document.getElementById("weblink-form"))) { return window.parent.' . $this->escape($function) . '(document.getElementById("jform_title").value); diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/modal_associations.php b/src/administrator/components/com_weblinks/tmpl/weblink/modal_associations.php index 286ec63..731f5d3 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblink/modal_associations.php +++ b/src/administrator/components/com_weblinks/tmpl/weblink/modal_associations.php @@ -9,4 +9,6 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.associations', $this); +use Joomla\CMS\Layout\LayoutHelper; + +echo LayoutHelper::render('joomla.edit.associations', $this); diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/modal_metadata.php b/src/administrator/components/com_weblinks/tmpl/weblink/modal_metadata.php index 56c0e2b..4e80cbb 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblink/modal_metadata.php +++ b/src/administrator/components/com_weblinks/tmpl/weblink/modal_metadata.php @@ -9,4 +9,6 @@ defined('_JEXEC') or die; -echo JLayoutHelper::render('joomla.edit.metadata', $this); +use Joomla\CMS\Layout\LayoutHelper; + +echo LayoutHelper::render('joomla.edit.metadata', $this); diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/modal_params.php b/src/administrator/components/com_weblinks/tmpl/weblink/modal_params.php index 1fa84b6..ce43ba5 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblink/modal_params.php +++ b/src/administrator/components/com_weblinks/tmpl/weblink/modal_params.php @@ -9,11 +9,13 @@ defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; + $fieldSets = $this->form->getFieldsets('params'); ?> $fieldSet) : ?>
description) && trim($fieldSet->description)) : ?> - ' . $this->escape(JText::_($fieldSet->description)) . '

'; ?> + ' . $this->escape(Text::_($fieldSet->description)) . '

'; ?> form->getFieldset($name) as $field) : ?>
diff --git a/src/administrator/components/com_weblinks/tmpl/weblinks/default.php b/src/administrator/components/com_weblinks/tmpl/weblinks/default.php index 21b2a0c..a323967 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblinks/default.php +++ b/src/administrator/components/com_weblinks/tmpl/weblinks/default.php @@ -9,181 +9,190 @@ defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Associations; +use Joomla\CMS\Language\Multilanguage; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; -JHtml::_('bootstrap.tooltip'); -JHtml::_('behavior.multiselect'); -JHtml::_('formbehavior.chosen', 'select'); +/** @var \Joomla\Component\Weblinks\Administrator\View\Weblinks\HtmlView $this */ -$user = JFactory::getUser(); +HTMLHelper::_('behavior.multiselect'); + +$user = Factory::getApplication()->getIdentity(); $userId = $user->get('id'); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -$canOrder = $user->authorise('core.edit.state', 'com_weblinks.category'); $saveOrder = $listOrder == 'a.ordering'; -$assoc = JLanguageAssociations::isEnabled(); +$assoc = Associations::isEnabled(); -if ($saveOrder) +if ($saveOrder && !empty($this->items)) { $saveOrderingUrl = 'index.php?option=com_weblinks&task=weblinks.saveOrderAjax&tmpl=component'; - JHtml::_('sortablelist.sortable', 'weblinkList', 'adminForm', strtolower($listDirn), $saveOrderingUrl); + HTMLHelper::_('draggablelist.draggable'); } ?> -
-
- sidebar)) : ?> -
- sidebar; ?> -
-
- -
- - $this)); ?> -
- items)) : ?> -
- -
- - - - - - - - - - - - - - - - - - - - - - - - items as $i => $item) : ?> - - cat_link = JRoute::_('index.php?option=com_categories&extension=com_weblinks&task=edit&type=other&cid[]=' . $item->catid); ?> - authorise('core.create', 'com_weblinks.category.' . $item->catid); ?> - authorise('core.edit', 'com_weblinks.category.' . $item->catid); ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; ?> - authorise('core.edit.own', 'com_weblinks.category.' . $item->catid) && $item->created_by == $user->id; ?> - authorise('core.edit.state', 'com_weblinks.category.' . $item->catid) && $canCheckin; ?> - - - - - - - - - + + + + + + + + + + + + + + class="js-draggable" data-url="" data-direction="" data-nested="true"> + items as $i => $item) : ?> + + cat_link = Route::_('index.php?option=com_categories&extension=com_weblinks&task=edit&type=other&cid[]=' . $item->catid); ?> + authorise('core.create', 'com_weblinks.category.' . $item->catid); ?> + authorise('core.edit', 'com_weblinks.category.' . $item->catid); ?> + authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || !$item->checked_out; ?> + authorise('core.edit.own', 'com_weblinks.category.' . $item->catid) && $item->created_by == $user->id; ?> + authorise('core.edit.state', 'com_weblinks.category.' . $item->catid) && $canCheckin; ?> + + + + + + + + + + + + + + + + + + - - - + + pagination->getListFooter(); ?> + + + authorise('core.create', 'com_weblinks') + && $user->authorise('core.edit', 'com_weblinks') + && $user->authorise('core.edit.state', 'com_weblinks')) : ?> + Text::_('COM_WEBLINKS_BATCH_OPTIONS'), + 'footer' => $this->loadTemplate('batch_footer') + ], + $this->loadTemplate('batch_body') + ); ?> + + + + + + +
+
-
diff --git a/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_body.php b/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_body.php new file mode 100644 index 0000000..6b5dab6 --- /dev/null +++ b/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_body.php @@ -0,0 +1,46 @@ +state->get('filter.published'); +?> + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ = 0) : ?> +
+
+ 'com_weblinks']); ?> +
+
+ +
+
+ +
+
+
+
diff --git a/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_footer.php b/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_footer.php new file mode 100644 index 0000000..05744dc --- /dev/null +++ b/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_footer.php @@ -0,0 +1,19 @@ + + + diff --git a/src/administrator/components/com_weblinks/tmpl/weblinks/modal.php b/src/administrator/components/com_weblinks/tmpl/weblinks/modal.php index aa5527b..05081f4 100644 --- a/src/administrator/components/com_weblinks/tmpl/weblinks/modal.php +++ b/src/administrator/components/com_weblinks/tmpl/weblinks/modal.php @@ -6,39 +6,41 @@ * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ + defined('_JEXEC') or die; -$app = JFactory::getApplication(); +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Multilanguage; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Session\Session; +use Joomla\Component\Weblinks\Site\Helper\RouteHelper; + +$app = Factory::getApplication(); if ($app->isClient('site')) { - JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); + Session::checkToken('get') or die(Text::_('JINVALID_TOKEN')); } -JLoader::register('WeblinksHelperRoute', JPATH_ROOT . '/components/com_weblinks/helpers/route.php'); -// Include the component HTML helpers. +HTMLHelper::_('behavior.multiselect'); -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); -JHtml::_('behavior.core'); -JHtml::_('behavior.polyfill', array('event'), 'lt IE 9'); -JHtml::_('script', 'com_weblinks/admin-weblinks-modal.js', array('version' => 'auto', 'relative' => true)); -JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom')); -JHtml::_('formbehavior.chosen', 'select'); - -// Special case for the search field tooltip. -$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter'); -JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom')); +$this->document->getWebAssetManager() + ->registerAndUseScript('com_weblinks.admin-weblinks-modal', 'media/com_weblinks/js/admin-weblinks-modal.js', [], ['defer' => true], ['core']); $function = $app->input->getCmd('function', 'jSelectWeblink'); $editor = $app->input->getCmd('editor', ''); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); $onclick = $this->escape($function); +$multilang = Multilanguage::isEnabled(); if (!empty($editor)) { // This view is used also in com_menus. Load the xtd script only if the editor is set! - JFactory::getDocument()->addScriptOptions('xtd-weblinks', array('editor' => $editor)); + $this->document->addScriptOptions('xtd-weblinks', array('editor' => $editor)); $onclick = "jSelectWeblink"; } @@ -52,48 +54,49 @@ $iconStates = array( ?>
-
- $this)); ?> -
+ + + $this)); ?> + items)) : ?>
- +
- +
+ - - - - + + - - - - - - - items as $i => $item) : ?> - language && JLanguageMultilang::isEnabled()) : ?> + language && $multilang) : ?> language); ?> language, 0, 2); ?> @@ -105,31 +108,33 @@ $iconStates = array( - - + + - - @@ -138,10 +143,13 @@ $iconStates = array(
- + + - + + - + + - + + + + + - - - + +
- pagination->getListFooter(); ?> -
+ escape($onclick) . '"' . ' data-id="' . $item->id . '"' . ' data-title="' . $this->escape(addslashes($item->title)) . '"' . ' data-cat-id="' . $this->escape($item->catid) . '"' - . ' data-uri="' . $this->escape(WeblinksHelperRoute::getWeblinkRoute($item->id, $item->catid, $item->language)) . '"' + . ' data-uri="' . $this->escape(RouteHelper::getWeblinkRoute($item->id, $item->catid, $item->language)) . '"' . ' data-language="' . $this->escape($lang) . '"'; ?> > escape($item->title); ?>
- escape($item->category_title); ?> + escape($item->category_title); ?>
- - 		+ + escape($item->access_level); ?> - + + + + + created, Text::_('DATE_FORMAT_LC4')); ?> - created, JText::_('DATE_FORMAT_LC4')); ?> - + id; ?>
+ + pagination->getListFooter(); ?> + - +
diff --git a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_body.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_body.php deleted file mode 100644 index e6ff658..0000000 --- a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_body.php +++ /dev/null @@ -1,40 +0,0 @@ -state->get('filter.published'); -?> - -
-
-
-
- -
-
-
-
- -
-
-
-
- = 0) : ?> -
-
- -
-
- -
-
- -
-
-
-
diff --git a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_footer.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_footer.php deleted file mode 100644 index fb0c758..0000000 --- a/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_footer.php +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/administrator/components/com_weblinks/weblinks.xml b/src/administrator/components/com_weblinks/weblinks.xml index a872b1c..e36615c 100644 --- a/src/administrator/components/com_weblinks/weblinks.xml +++ b/src/administrator/components/com_weblinks/weblinks.xml @@ -10,27 +10,24 @@ ##VERSION## COM_WEBLINKS_XML_DESCRIPTION script.php - Joomla\Component\Weblinks + Joomla\Component\Weblinks sql/install.mysql.sql sql/install.postgresql.sql - sql/install.sqlsrv.sql sql/uninstall.mysql.sql sql/uninstall.postgresql.sql - sql/uninstall.sqlsrv.sql sql/updates/mysql sql/updates/postgresql - sql/updates/sqlsrv @@ -55,6 +52,10 @@ alt="Weblinks/Links">com_weblinks_links com_weblinks_categories + com_weblinks_fields + com_weblinks_field_groups ##BACKEND_COMPONENT_FILES## diff --git a/src/administrator/language/en-GB/com_weblinks.ini b/src/administrator/language/en-GB/com_weblinks.ini index 5c0d9ae..2c450ff 100644 --- a/src/administrator/language/en-GB/com_weblinks.ini +++ b/src/administrator/language/en-GB/com_weblinks.ini @@ -4,130 +4,84 @@ ; Note : All ini files need to be saved as UTF-8 COM_WEBLINKS="Web Links" -COM_WEBLINKS_ACCESS_HEADING="Access" COM_WEBLINKS_BATCH_OPTIONS="Batch process the selected links" COM_WEBLINKS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved links. Otherwise, all actions are applied to the selected links." COM_WEBLINKS_CATEGORIES_DESC="These settings apply for Web Links Categories Options unless they are changed for a specific menu item." COM_WEBLINKS_CATEGORY_DESC="These settings apply for Web Links Category Options unless they are changed for a specific menu item." COM_WEBLINKS_CHANGE_WEBLINK="Select or Change Web Link" -COM_WEBLINKS_COMPONENT_DESC="These settings apply for Web Links unless they are changed for a specific menu item or web link." +COM_WEBLINKS_COMPONENT_DESC="These settings apply for Web Links unless they are changed for a specific menu item or Web Link." COM_WEBLINKS_COMPONENT_LABEL="Web Link" -COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Web Links Component will integrate with other extensions." COM_WEBLINKS_CONFIGURATION="Web Links Manager Options" +COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Web Links Component will integrate with other extensions." COM_WEBLINKS_EDIT_WEBLINK="Edit Web Link" +COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another Web Link from this category has the same alias (remember it may be a trashed item)." COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this category. Please try again." COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL" -COM_WEBLINKS_ERR_TABLES_TITLE="Your web link must contain a title." -COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another web link from this category has the same alias (remember it may be a trashed item)." -COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category." -COM_WEBLINKS_FIELD_CATEGORY_DESC="Choose a category for this Web link." -COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a Web Links category to display." -COM_WEBLINKS_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the web link submit form. You may need to enter required information for your captcha plugin in the Plugin Manager.
If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration." +COM_WEBLINKS_ERR_TABLES_TITLE="Your Web Link must contain a title." +COM_WEBLINKS_FIELDSET_OPTIONS="Options" COM_WEBLINKS_FIELD_CAPTCHA_LABEL="Allow Captcha on Web Link" -COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC="Show or hide the number of Web Links in each Category." COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL="# Web Links" -COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded." -COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_LABEL="Count Clicks" -COM_WEBLINKS_FIELD_CONFIG_DESCRIPTION_DESC="Show or hide the description below." -COM_WEBLINKS_FIELD_CONFIG_HITS_DESC="Show or hide hits." COM_WEBLINKS_FIELD_CONFIG_ICON_DESC="If Icon is chosen above, select an icon to display with the Web Links. If none is selected, the default icon will be used." COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL="Select Icon" -COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC="Show or hide the links description." COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL="Links Description" -COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_DESC="Show or hide other categories." -COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_LABEL="Other Categories" -COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_DESC="Show or hide the Report Bad Link option." -COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_LABEL="Reports" -COM_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded." COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL="Count Clicks" -COM_WEBLINKS_FIELD_DESCRIPTION_DESC="Enter a description for the web link." -COM_WEBLINKS_FIELD_DISPLAY_NUM_DESC="Default number of Web links to list on a page." -COM_WEBLINKS_FIELD_DISPLAY_NUM_LABEL="# of Web links to List" -COM_WEBLINKS_FIELD_FIRST_DESC="The image to be displayed." COM_WEBLINKS_FIELD_FIRST_LABEL="First Image" - -COM_WEBLINKS_FIELD_HEIGHT_DESC="Height of the target popup or modal window. Defaults to 600x500 if one field is left empty." COM_WEBLINKS_FIELD_HEIGHT_LABEL="Height" -COM_WEBLINKS_FIELD_ICON_DESC="Displays a text, an icon or nothing with the Web links. Default is 'Icon'." COM_WEBLINKS_FIELD_ICON_LABEL="Text/Icon/Web Link Only" COM_WEBLINKS_FIELD_ICON_OPTION_ICON="Icon" COM_WEBLINKS_FIELD_ICON_OPTION_TEXT="Text" COM_WEBLINKS_FIELD_ICON_OPTION_WEBLINK="Web Link Only" -COM_WEBLINKS_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images. Replaced with caption text if it is present." +COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC="Decorative Image - no description required" +COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL="No Description" COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL="Alt Text" -COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC="Caption attached to the image." COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL="Caption" - -COM_WEBLINKS_FIELD_LANGUAGE_DESC="Assign a language to this web link." COM_WEBLINKS_FIELD_MODIFIED_DESC="The date and time the link was last modified." -COM_WEBLINKS_FIELD_SECOND_DESC="The second image to be displayed." COM_WEBLINKS_FIELD_SECOND_LABEL="Second Image" -COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC="Select a web links category to display." COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Select a Category" -COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC="Show the tags for a category." COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags" -COM_WEBLINKS_FIELD_SHOW_TAGS_DESC="Show the tags for a web link." COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Show Tags" -COM_WEBLINKS_FIELD_STATE_DESC="Set publication status." -COM_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected." COM_WEBLINKS_FIELD_TARGET_LABEL="Target" -COM_WEBLINKS_FIELD_TITLE_DESC="Web Link must have a title." -COM_WEBLINKS_FIELD_URL_DESC="You must enter a URL. IDN (International) Links are converted to punycode when they are saved." COM_WEBLINKS_FIELD_URL_LABEL="URL" COM_WEBLINKS_FIELD_VALUE_REPORTED="Reported" -COM_WEBLINKS_FIELD_VERSION_DESC="A count of the number of times this web link has been revised." COM_WEBLINKS_FIELD_VERSION_LABEL="Revision" -COM_WEBLINKS_FIELD_WIDTH_DESC="Width of the target popup or modal window. Defaults to 600x500 if one field is left empty." COM_WEBLINKS_FIELD_WIDTH_LABEL="Width" -COM_WEBLINKS_FIELDSET_IMAGES="Images" -COM_WEBLINKS_FIELDSET_OPTIONS="Options" -COM_WEBLINKS_FILTER_CATEGORY="Filter Category" -COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with ID: to search for a web link ID." +COM_WEBLINKS_FILTER_SEARCH_DESC="Search in Web Link title and alias. Prefix with ID: to search for a Web Link ID." COM_WEBLINKS_FILTER_SEARCH_LABEL="Search Web Links" COM_WEBLINKS_FILTER_STATE="Filter State" -COM_WEBLINKS_FLOAT_FIRST_DESC="Controls placement of the first image." COM_WEBLINKS_FLOAT_FIRST_LABEL="First Image Float" -COM_WEBLINKS_FLOAT_SECOND_DESC="Controls placement of the second image." COM_WEBLINKS_FLOAT_SECOND_LABEL="Second Image Float" COM_WEBLINKS_HEADING_ASSOCIATION="Association" -COM_WEBLINKS_HITS_DESC="Number of hits for this web link." COM_WEBLINKS_LEFT="Left" COM_WEBLINKS_LIST_LAYOUT_DESC="These settings apply for Web Links List Layout Options unless they are changed for a specific menu item." COM_WEBLINKS_MANAGER_WEBLINK="Web Links" COM_WEBLINKS_MANAGER_WEBLINKS="Web Links" COM_WEBLINKS_MANAGER_WEBLINK_EDIT="Web Link: Edit" COM_WEBLINKS_MANAGER_WEBLINK_NEW="Web Link: New" -COM_WEBLINKS_N_ITEMS_ARCHIVED="%d web links successfully archived." -COM_WEBLINKS_N_ITEMS_ARCHIVED_1="%d web link successfully archived." -COM_WEBLINKS_N_ITEMS_CHECKED_IN_0="No web link successfully checked in." -COM_WEBLINKS_N_ITEMS_CHECKED_IN_1="%d web link successfully checked in." -COM_WEBLINKS_N_ITEMS_CHECKED_IN_MORE="%d web links successfully checked in." -COM_WEBLINKS_N_ITEMS_DELETED="%d web links successfully deleted." -COM_WEBLINKS_N_ITEMS_DELETED_1="%d web link successfully deleted." -COM_WEBLINKS_N_ITEMS_PUBLISHED="%d web links successfully published." -COM_WEBLINKS_N_ITEMS_PUBLISHED_1="%d web link successfully published." -COM_WEBLINKS_N_ITEMS_TRASHED="%d web links successfully trashed." -COM_WEBLINKS_N_ITEMS_TRASHED_1="%d web link successfully trashed." -COM_WEBLINKS_N_ITEMS_UNPUBLISHED="%d web links successfully unpublished." -COM_WEBLINKS_N_ITEMS_UNPUBLISHED_1="%d web link successfully unpublished." COM_WEBLINKS_NEW_WEBLINK="New Web Link" COM_WEBLINKS_NONE="None" -COM_WEBLINKS_OPTION_FILTER_ACCESS="- Filter Access -" -COM_WEBLINKS_OPTION_FILTER_CATEGORY="- Filter Category -" -COM_WEBLINKS_OPTION_FILTER_PUBLISHED="- Filter State -" +COM_WEBLINKS_N_ITEMS_ARCHIVED="%d Web Links archived." +COM_WEBLINKS_N_ITEMS_ARCHIVED_1="%d Web Link archived." +COM_WEBLINKS_N_ITEMS_CHECKED_IN_0="No Web Link checked in." +COM_WEBLINKS_N_ITEMS_CHECKED_IN_1="%d Web Link checked in." +COM_WEBLINKS_N_ITEMS_CHECKED_IN_MORE="%d Web Links checked in." +COM_WEBLINKS_N_ITEMS_DELETED="%d Web Links deleted." +COM_WEBLINKS_N_ITEMS_DELETED_1="%d Web Link deleted." +COM_WEBLINKS_N_ITEMS_PUBLISHED="%d Web Links published." +COM_WEBLINKS_N_ITEMS_PUBLISHED_1="%d Web Link published." +COM_WEBLINKS_N_ITEMS_TRASHED="%d Web Links trashed." +COM_WEBLINKS_N_ITEMS_TRASHED_1="%d Web Link trashed." +COM_WEBLINKS_N_ITEMS_UNPUBLISHED="%d Web Links unpublished." +COM_WEBLINKS_N_ITEMS_UNPUBLISHED_1="%d Web Link unpublished." COM_WEBLINKS_OPTIONS="Options" -COM_WEBLINKS_ORDER_HEADING="Order" COM_WEBLINKS_RIGHT="Right" -COM_WEBLINKS_SAVE_SUCCESS="Web link successfully saved" -COM_WEBLINKS_SEARCH_IN_TITLE="Search in title" +COM_WEBLINKS_SAVE_SUCCESS="Web link saved" COM_WEBLINKS_SELECT_A_WEBLINK="Select Web Link" -COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no Web links or subcategories." COM_WEBLINKS_SUBMENU_CATEGORIES="Categories" COM_WEBLINKS_SUBMENU_WEBLINKS="Web Links" COM_WEBLINKS_WEBLINKS="Web Links" -COM_WEBLINKS_XML_DESCRIPTION="Component for web links management" -JGLOBAL_NO_ITEM_SELECTED="No web links selected" +COM_WEBLINKS_XML_DESCRIPTION="Component for Web Links management" JGLOBAL_NEWITEMSLAST_DESC="New Web links default to the last position. Ordering can be changed after this Web link is saved." -JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new web links in this category." -JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these web links." +JGLOBAL_NO_ITEM_SELECTED="No Web Links selected" +JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new Web Links in this category." +JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these Web Links." JLIB_RULES_SETTING_NOTES="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless it is overruled by a Global Configuration setting." diff --git a/src/administrator/language/en-GB/com_weblinks.sys.ini b/src/administrator/language/en-GB/com_weblinks.sys.ini index 7375e2e..26b819a 100644 --- a/src/administrator/language/en-GB/com_weblinks.sys.ini +++ b/src/administrator/language/en-GB/com_weblinks.sys.ini @@ -15,11 +15,12 @@ COM_WEBLINKS_CATEGORY_VIEW_DEFAULT_OPTION="Default" COM_WEBLINKS_CATEGORY_VIEW_DEFAULT_TITLE="List Web Links in a Category" COM_WEBLINKS_CONTENT_TYPE_WEBLINK="Web Link" COM_WEBLINKS_CONTENT_TYPE_CATEGORY="Web Links Category" -COM_WEBLINKS_FIELD_SELECT_WEBLINK_DESC="Select the desired Web link from the list." COM_WEBLINKS_FIELD_SELECT_WEBLINK_LABEL="Select Weblink" COM_WEBLINKS_FORM_VIEW_DEFAULT_DESC="Display a form to submit a web link in the Frontend." COM_WEBLINKS_FORM_VIEW_DEFAULT_OPTION="Default" COM_WEBLINKS_FORM_VIEW_DEFAULT_TITLE="Submit a Web Link" +COM_WEBLINKS_FIELDS="Fields" +COM_WEBLINKS_FIELD_GROUPS="Field Groups" COM_WEBLINKS_LINKS="Links" COM_WEBLINKS_TAGS_WEBLINK="Web Link" COM_WEBLINKS_TAGS_CATEGORY="Web Link Category" diff --git a/src/administrator/manifests/packages/pkg_weblinks.xml b/src/administrator/manifests/packages/pkg_weblinks.xml index 35dc053..014680c 100644 --- a/src/administrator/manifests/packages/pkg_weblinks.xml +++ b/src/administrator/manifests/packages/pkg_weblinks.xml @@ -24,7 +24,7 @@ plg_editors-xtd_weblink.zip - en-GB/en-GB.pkg_weblinks.sys.ini + en-GB/pkg_weblinks.sys.ini diff --git a/src/components/com_weblinks/models/forms/weblink.xml b/src/components/com_weblinks/forms/weblink.xml similarity index 55% rename from src/components/com_weblinks/models/forms/weblink.xml rename to src/components/com_weblinks/forms/weblink.xml index 34478a3..cbc601d 100644 --- a/src/components/com_weblinks/models/forms/weblink.xml +++ b/src/components/com_weblinks/forms/weblink.xml @@ -1,13 +1,11 @@
-
+
@@ -23,25 +21,21 @@ name="title" type="text" label="JGLOBAL_TITLE" - description="COM_WEBLINKS_FIELD_TITLE_DESC" required="true" - size="30" /> @@ -64,7 +59,6 @@ name="catid" type="categoryedit" label="JCATEGORY" - description="COM_WEBLINKS_FIELD_CATEGORY_DESC" extension="com_weblinks" required="true" /> @@ -73,18 +67,14 @@ name="url" type="url" label="COM_WEBLINKS_FIELD_URL_LABEL" - description="COM_WEBLINKS_FIELD_URL_DESC" filter="url" required="true" - size="45" /> @@ -93,8 +83,6 @@ name="tags" type="tag" label="JTAG" - description="JTAG_DESC" - class="inputbox" multiple="true" /> @@ -102,22 +90,105 @@ name="version_note" type="text" label="JGLOBAL_FIELD_VERSION_NOTE_LABEL" - description="JGLOBAL_FIELD_VERSION_NOTE_DESC" - class="inputbox" - size="45" - labelclass="control-label" + maxlength="255" />
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
@@ -142,31 +211,21 @@ name="author" type="hidden" label="JAUTHOR" - description="JFIELD_METADATA_AUTHOR_DESC" filter="unset" - size="20" - labelclass="control-label" />
diff --git a/src/components/com_weblinks/helpers/icon.php b/src/components/com_weblinks/helpers/icon.php index 1445ddf..6150446 100644 --- a/src/components/com_weblinks/helpers/icon.php +++ b/src/components/com_weblinks/helpers/icon.php @@ -19,21 +19,14 @@ class JHtmlIcon /** * Create a link to create a new weblink * - * @param mixed $weblink Unused - * @param mixed $params Unused + * @param object $category The category information + * @param \Joomla\Registry\Registry $params The item parameters * * @return string */ - public static function create($weblink, $params) + public static function create($category, $params) { - JHtml::_('bootstrap.tooltip'); - - $uri = JUri::getInstance(); - $url = JRoute::_(WeblinksHelperRoute::getFormRoute(0, base64_encode($uri))); - $text = JHtml::_('image', 'system/new.png', JText::_('JNEW'), null, true); - $button = JHtml::_('link', $url, $text); - - return '' . $button . ''; + return self::getIcon()->create($category, $params); } /** @@ -47,43 +40,16 @@ class JHtmlIcon */ public static function edit($weblink, $params, $attribs = array()) { - $uri = JUri::getInstance(); + return self::getIcon()->edit($weblink, $params, $attribs); + } - if ($params && $params->get('popup')) - { - return; - } - - if ($weblink->state < 0) - { - return; - } - - JHtml::_('bootstrap.tooltip'); - - $url = WeblinksHelperRoute::getFormRoute($weblink->id, base64_encode($uri)); - $icon = $weblink->state ? 'edit.png' : 'edit_unpublished.png'; - $text = JHtml::_('image', 'system/' . $icon, JText::_('JGLOBAL_EDIT'), null, true); - - if ($weblink->state == 0) - { - $overlib = JText::_('JUNPUBLISHED'); - } - else - { - $overlib = JText::_('JPUBLISHED'); - } - - $date = JHtml::_('date', $weblink->created); - $author = $weblink->created_by_alias ? $weblink->created_by_alias : $weblink->author; - - $overlib .= '<br />'; - $overlib .= $date; - $overlib .= '<br />'; - $overlib .= htmlspecialchars($author, ENT_COMPAT, 'UTF-8'); - - $button = JHtml::_('link', JRoute::_($url), $text); - - return '' . $button . ''; + /** + * Creates an icon instance. + * + * @return \Joomla\Component\Weblinks\Administrator\Service\HTML\Icon + */ + private static function getIcon() + { + return (new \Joomla\Component\Weblinks\Administrator\Service\HTML\Icon(Joomla\CMS\Factory::getApplication())); } } diff --git a/src/components/com_weblinks/helpers/route.php b/src/components/com_weblinks/helpers/route.php index f2cbb76..c239da3 100644 --- a/src/components/com_weblinks/helpers/route.php +++ b/src/components/com_weblinks/helpers/route.php @@ -9,263 +9,14 @@ defined('_JEXEC') or die; +use Joomla\Component\Weblinks\Site\Helper\RouteHelper; + /** * Weblinks Component Route Helper. * * @since 1.5 */ -abstract class WeblinksHelperRoute +abstract class WeblinksHelperRoute extends RouteHelper { - protected static $lookup; - protected static $lang_lookup = array(); - - /** - * Get the route of the weblink - * - * @param integer $id Web link ID - * @param integer $catid Category ID - * @param string $language Language - * - * @return string - */ - public static function getWeblinkRoute($id, $catid, $language = 0) - { - $needles = array('weblink' => array((int) $id)); - - // Create the link - $link = 'index.php?option=com_weblinks&view=weblink&id=' . $id; - - if ($catid > 1) - { - $categories = JCategories::getInstance('Weblinks'); - $category = $categories->get($catid); - - if ($category) - { - $needles['category'] = array_reverse($category->getPath()); - $needles['categories'] = $needles['category']; - $link .= '&catid=' . $catid; - } - } - - if ($language && $language != "*" && JLanguageMultilang::isEnabled()) - { - self::buildLanguageLookup(); - - if (isset(self::$lang_lookup[$language])) - { - $link .= '&lang=' . self::$lang_lookup[$language]; - $needles['language'] = $language; - } - } - - if ($item = self::_findItem($needles)) - { - $link .= '&Itemid=' . $item; - } - - return $link; - } - - /** - * Ge the form route - * - * @param integer $id The id of the weblink. - * @param string $return The return page variable. - * - * @return string - */ - public static function getFormRoute($id, $return = null) - { - // Create the link. - if ($id) - { - $link = 'index.php?option=com_weblinks&task=weblink.edit&w_id=' . $id; - } - else - { - $link = 'index.php?option=com_weblinks&task=weblink.add&w_id=0'; - } - - if ($return) - { - $link .= '&return=' . $return; - } - - return $link; - } - - /** - * Get the Category Route - * - * @param JCategoryNode|string|integer $catid JCategoryNode object or category ID - * @param integer $language Language code - * - * @return string - */ - public static function getCategoryRoute($catid, $language = 0) - { - if ($catid instanceof JCategoryNode) - { - $id = $catid->id; - $category = $catid; - } - else - { - $id = (int) $catid; - $category = JCategories::getInstance('Weblinks')->get($id); - } - - if ($id < 1 || !($category instanceof JCategoryNode)) - { - $link = ''; - } - else - { - $needles = array(); - - // Create the link - $link = 'index.php?option=com_weblinks&view=category&id=' . $id; - - $catids = array_reverse($category->getPath()); - $needles['category'] = $catids; - $needles['categories'] = $catids; - - if ($language && $language != "*" && JLanguageMultilang::isEnabled()) - { - self::buildLanguageLookup(); - - if (isset(self::$lang_lookup[$language])) - { - $link .= '&lang=' . self::$lang_lookup[$language]; - $needles['language'] = $language; - } - } - - if ($item = self::_findItem($needles)) - { - $link .= '&Itemid=' . $item; - } - } - - return $link; - } - - /** - * Do a language lookup - * - * @return void - */ - protected static function buildLanguageLookup() - { - if (count(self::$lang_lookup) == 0) - { - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select('a.sef AS sef') - ->select('a.lang_code AS lang_code') - ->from('#__languages AS a'); - - $db->setQuery($query); - $langs = $db->loadObjectList(); - - foreach ($langs as $lang) - { - self::$lang_lookup[$lang->lang_code] = $lang->sef; - } - } - } - - /** - * Find items per given $needles - * - * @param array $needles A given array of needles to find - * - * @return void - */ - protected static function _findItem($needles = null) - { - $app = JFactory::getApplication(); - $menus = $app->getMenu('site'); - $language = isset($needles['language']) ? $needles['language'] : '*'; - - // Prepare the reverse lookup array. - if (!isset(self::$lookup[$language])) - { - self::$lookup[$language] = array(); - - $component = JComponentHelper::getComponent('com_weblinks'); - - $attributes = array('component_id'); - $values = array($component->id); - - if ($language != '*') - { - $attributes[] = 'language'; - $values[] = array($needles['language'], '*'); - } - - $items = $menus->getItems($attributes, $values); - - if ($items) - { - foreach ($items as $item) - { - if (isset($item->query) && isset($item->query['view'])) - { - $view = $item->query['view']; - - if (!isset(self::$lookup[$language][$view])) - { - self::$lookup[$language][$view] = array(); - } - - if (isset($item->query['id'])) - { - /** - * Here it will become a bit tricky - * language != * can override existing entries - * language == * cannot override existing entries - */ - if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*') - { - self::$lookup[$language][$view][$item->query['id']] = $item->id; - } - } - } - } - } - } - - if ($needles) - { - foreach ($needles as $view => $ids) - { - if (isset(self::$lookup[$language][$view])) - { - foreach ($ids as $id) - { - if (isset(self::$lookup[$language][$view][(int) $id])) - { - return self::$lookup[$language][$view][(int) $id]; - } - } - } - } - } - - // Check if the active menuitem matches the requested language - $active = $menus->getActive(); - - if ($active && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled())) - { - return $active->id; - } - - // If not found, return language specific home link - $default = $menus->getDefault($language); - - return !empty($default->id) ? $default->id : null; - } } diff --git a/src/components/com_weblinks/metadata.xml b/src/components/com_weblinks/metadata.xml deleted file mode 100644 index 9205b30..0000000 --- a/src/components/com_weblinks/metadata.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/components/com_weblinks/router.php b/src/components/com_weblinks/router.php deleted file mode 100644 index ee5253d..0000000 --- a/src/components/com_weblinks/router.php +++ /dev/null @@ -1,295 +0,0 @@ -getMenu(); - $params = JComponentHelper::getParams('com_weblinks'); - $advanced = $params->get('sef_advanced_link', 0); - - // We need a menu item. Either the one specified in the query, or the current active one if none specified - if (empty($query['Itemid'])) - { - $menuItem = $menu->getActive(); - } - else - { - $menuItem = $menu->getItem($query['Itemid']); - } - - $mView = (empty($menuItem->query['view'])) ? null : $menuItem->query['view']; - $mId = (empty($menuItem->query['id'])) ? null : $menuItem->query['id']; - - if (isset($query['view'])) - { - $view = $query['view']; - - if (empty($query['Itemid']) || empty($menuItem) || $menuItem->component != 'com_weblinks') - { - $segments[] = $query['view']; - } - - // We need to keep the view for forms since they never have their own menu item - if ($view != 'form') - { - unset($query['view']); - } - } - - // Are we dealing with an weblink that is attached to a menu item? - if (isset($query['view']) && ($mView == $query['view']) and (isset($query['id'])) and ($mId == (int) $query['id'])) - { - unset($query['view']); - unset($query['catid']); - unset($query['id']); - - return $segments; - } - - if (isset($view) and ($view == 'category' or $view == 'weblink')) - { - if ($mId != (int) $query['id'] || $mView != $view) - { - if ($view == 'weblink' && isset($query['catid'])) - { - $catid = $query['catid']; - } - elseif (isset($query['id'])) - { - $catid = $query['id']; - } - - $menuCatid = $mId; - $categories = JCategories::getInstance('Weblinks'); - $category = $categories->get($catid); - - if ($category) - { - // TODO Throw error that the category either not exists or is unpublished - $path = $category->getPath(); - $path = array_reverse($path); - - $array = array(); - - foreach ($path as $id) - { - if ((int) $id == (int) $menuCatid) - { - break; - } - - if ($advanced) - { - list($tmp, $id) = explode(':', $id, 2); - } - - $array[] = $id; - } - - $segments = array_merge($segments, array_reverse($array)); - } - - if ($view == 'weblink') - { - if ($advanced) - { - list($tmp, $id) = explode(':', $query['id'], 2); - } - else - { - $id = $query['id']; - } - - $segments[] = $id; - } - } - - unset($query['id']); - unset($query['catid']); - } - - if (isset($query['layout'])) - { - if (!empty($query['Itemid']) && isset($menuItem->query['layout'])) - { - if ($query['layout'] == $menuItem->query['layout']) - { - unset($query['layout']); - } - } - else - { - if ($query['layout'] == 'default') - { - unset($query['layout']); - } - } - } - - $total = count($segments); - - for ($i = 0; $i < $total; $i++) - { - $segments[$i] = str_replace(':', '-', $segments[$i]); - } - - return $segments; - } - - /** - * Parse the segments of a URL. - * - * @param array &$segments The segments of the URL to parse. - * - * @return array The URL attributes to be used by the application. - * - * @since 3.3 - */ - public function parse(&$segments) - { - $total = count($segments); - $vars = array(); - - for ($i = 0; $i < $total; $i++) - { - $segments[$i] = preg_replace('/-/', ':', $segments[$i], 1); - } - - // Get the active menu item. - $app = JFactory::getApplication(); - $menu = $app->getMenu(); - $item = $menu->getActive(); - $params = JComponentHelper::getParams('com_weblinks'); - $advanced = $params->get('sef_advanced_link', 0); - - // Count route segments - $count = count($segments); - - // Standard routing for weblinks. - if (!isset($item)) - { - $vars['view'] = $segments[0]; - $vars['id'] = $segments[$count - 1]; - - return $vars; - } - - // From the categories view, we can only jump to a category. - $id = (isset($item->query['id']) && $item->query['id'] > 1) ? $item->query['id'] : 'root'; - - $category = JCategories::getInstance('Weblinks')->get($id); - - $categories = $category->getChildren(); - $found = 0; - - foreach ($segments as $segment) - { - foreach ($categories as $category) - { - if (($category->slug == $segment) || ($advanced && $category->alias == str_replace(':', '-', $segment))) - { - $vars['id'] = $category->id; - $vars['view'] = 'category'; - $categories = $category->getChildren(); - $found = 1; - - break; - } - } - - if ($found == 0) - { - if ($advanced) - { - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from('#__weblinks') - ->where($db->quoteName('catid') . ' = ' . (int) $vars['catid']) - ->where($db->quoteName('alias') . ' = ' . $db->quote(str_replace(':', '-', $segment))); - $db->setQuery($query); - $id = $db->loadResult(); - } - else - { - $id = $segment; - } - - $vars['id'] = $id; - $vars['view'] = 'weblink'; - - break; - } - - $found = 0; - } - - return $vars; - } -} - -/** - * Weblinks router functions - * - * @param array &$query An array of URL arguments - * - * @return array The URL arguments to use to assemble the subsequent URL. - * - * Note. These functions are proxies for the new router interface - * for old SEF extensions. - * - * @deprecated 4.0 Use Class based routers instead - */ -function WeblinksBuildRoute(&$query) -{ - $router = new WeblinksRouter; - - return $router->build($query); -} - -/** - * Weblinks router functions - * - * @param array $segments The segments of the URL to parse. - * - * @return array The URL attributes to be used by the application. - * - * Note. These functions are proxies for the new router interface - * for old SEF extensions. - * - * @deprecated 4.0 Use Class based routers instead - */ -function WeblinksParseRoute($segments) -{ - $router = new WeblinksRouter; - - return $router->parse($segments); -} diff --git a/src/components/com_weblinks/controller.php b/src/components/com_weblinks/src/Controller/DisplayController.php similarity index 79% rename from src/components/com_weblinks/controller.php rename to src/components/com_weblinks/src/Controller/DisplayController.php index 7516e40..acb1bec 100644 --- a/src/components/com_weblinks/controller.php +++ b/src/components/com_weblinks/src/Controller/DisplayController.php @@ -7,14 +7,19 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\Controller; + defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\Controller\BaseController; + /** * Weblinks Component Controller * * @since 1.5 */ -class WeblinksController extends JControllerLegacy +class DisplayController extends BaseController { /** * Method to display a view. @@ -23,7 +28,7 @@ class WeblinksController extends JControllerLegacy * @param array $urlparams An array of safe url parameters and their variable types, * for valid values see {@link JFilterInput::clean()}. * - * @return WeblinksController This object to support chaining. + * @return BaseController This object to support chaining. * * @since 1.5 */ @@ -41,7 +46,7 @@ class WeblinksController extends JControllerLegacy $vName = $this->input->get('view', 'categories'); $this->input->set('view', $vName); - if (JFactory::getUser()->id ||($this->input->getMethod() == 'POST' && $vName == 'categories')) + if ($this->app->getIdentity()->id ||($this->input->getMethod() == 'POST' && $vName == 'categories')) { $cacheable = false; } @@ -59,7 +64,7 @@ class WeblinksController extends JControllerLegacy if ($vName == 'form' && !$this->checkEditId('com_weblinks.edit.weblink', $id)) { // Somehow the person just went to the form - we don't allow that. - return JError::raiseError(403, JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); + throw new \Exception(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id), 403); } return parent::display($cacheable, $safeurlparams); diff --git a/src/components/com_weblinks/controllers/weblink.php b/src/components/com_weblinks/src/Controller/WeblinkController.php similarity index 77% rename from src/components/com_weblinks/controllers/weblink.php rename to src/components/com_weblinks/src/Controller/WeblinkController.php index f219eb3..85f0d4f 100644 --- a/src/components/com_weblinks/controllers/weblink.php +++ b/src/components/com_weblinks/src/Controller/WeblinkController.php @@ -7,8 +7,13 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\Controller; + defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\Controller\FormController; +use Joomla\CMS\Uri\Uri; use Joomla\Utilities\ArrayHelper; /** @@ -16,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; * * @since 1.5 */ -class WeblinksControllerWeblink extends JControllerForm +class WeblinkController extends FormController { /** * The URL view item variable. @@ -55,7 +60,11 @@ class WeblinksControllerWeblink extends JControllerForm { // Redirect to the return page. $this->setRedirect($this->getReturnPage()); + + return false; } + + return true; } /** @@ -70,20 +79,14 @@ class WeblinksControllerWeblink extends JControllerForm protected function allowAdd($data = array()) { $categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('id'), 'int'); - $allow = null; if ($categoryId) { // If the category has been passed in the URL check it. - $allow = JFactory::getUser()->authorise('core.create', $this->option . '.category.' . $categoryId); + return $this->app->getIdentity()->authorise('core.create', $this->option . '.category.' . $categoryId); } - if ($allow !== null) - { - return $allow; - } - - // In the absense of better information, revert to the component permissions. + // In the absence of better information, revert to the component permissions. return parent::allowAdd($data); } @@ -100,17 +103,33 @@ class WeblinksControllerWeblink extends JControllerForm protected function allowEdit($data = array(), $key = 'id') { $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - $categoryId = 0; - if ($recordId) + if (!$recordId) { - $categoryId = (int) $this->getModel()->getItem($recordId)->catid; + return false; } + $record = $this->getModel()->getItem($recordId); + $categoryId = (int) $record->catid; + if ($categoryId) { // The category has been set. Check the category permissions. - return JFactory::getUser()->authorise('core.edit', $this->option . '.category.' . $categoryId); + $user = $this->app->getIdentity(); + + // First, check edit permission + if ($user->authorise('core.edit', $this->option . '.category.' . $categoryId)) + { + return true; + } + + // Fallback on edit.own + if ($user->authorise('core.edit.own', $this->option . '.category.' . $categoryId) && $record->created_by == $user->id) + { + return true; + } + + return false; } // Since there is no asset tracking, revert to the component permissions. @@ -162,7 +181,7 @@ class WeblinksControllerWeblink extends JControllerForm * * @since 1.5 */ - public function getModel($name = 'form', $prefix = '', $config = array('ignore_request' => true)) + public function getModel($name = 'form', $prefix = 'Site', $config = array('ignore_request' => true)) { return parent::getModel($name, $prefix, $config); } @@ -207,9 +226,9 @@ class WeblinksControllerWeblink extends JControllerForm { $return = $this->input->get('return', null, 'base64'); - if (empty($return) || !JUri::isInternal(base64_decode($return))) + if (empty($return) || !Uri::isInternal(base64_decode($return))) { - return JUri::base(); + return Uri::base(); } return base64_decode($return); @@ -228,7 +247,7 @@ class WeblinksControllerWeblink extends JControllerForm public function save($key = null, $urlVar = 'w_id') { // Get the application - $app = JFactory::getApplication(); + $app = $this->app; // Get the data from POST $data = $this->input->post->get('jform', array(), 'array'); @@ -253,6 +272,8 @@ class WeblinksControllerWeblink extends JControllerForm * * @return void * + * @throws \Exception + * * @since 1.6 */ public function go() @@ -261,7 +282,7 @@ class WeblinksControllerWeblink extends JControllerForm $id = $this->input->getInt('id'); // Get the model, requiring published items - $modelLink = $this->getModel('Weblink', '', array('ignore_request' => true)); + $modelLink = $this->getModel('Weblink'); $modelLink->setState('filter.published', 1); // Get the item @@ -270,19 +291,19 @@ class WeblinksControllerWeblink extends JControllerForm // Make sure the item was found. if (empty($link)) { - return JError::raiseWarning(404, JText::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND')); + throw new \Exception(Text::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND'), 404); } // Check whether item access level allows access. - $groups = JFactory::getUser()->getAuthorisedViewLevels(); + $groups = $this->app->getIdentity()->getAuthorisedViewLevels(); if (!in_array($link->access, $groups)) { - return JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR')); + throw new \Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403); } // Check whether category access level allows access. - $modelCat = $this->getModel('Category', 'WeblinksModel', array('ignore_request' => true)); + $modelCat = $this->getModel('Category', 'Site', array('ignore_request' => true)); $modelCat->setState('filter.published', 1); // Get the category @@ -291,23 +312,22 @@ class WeblinksControllerWeblink extends JControllerForm // Make sure the category was found. if (empty($category)) { - return JError::raiseWarning(404, JText::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND')); + throw new \Exception(Text::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND'), 404); } // Check whether item access level allows access. if (!in_array($category->access, $groups)) { - return JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR')); + throw new \Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403); } // Redirect to the URL - // @todo: Probably should check for a valid http link if ($link->url) { $modelLink->hit($id); - JFactory::getApplication()->redirect($link->url, 301); + $this->app->redirect($link->url, 301); } - return JError::raiseWarning(404, JText::_('COM_WEBLINKS_ERROR_WEBLINK_URL_INVALID')); + throw new \Exception(Text::_('COM_WEBLINKS_ERROR_WEBLINK_URL_INVALID'), 404); } } diff --git a/src/components/com_weblinks/helpers/association.php b/src/components/com_weblinks/src/Helper/AssociationHelper.php similarity index 54% rename from src/components/com_weblinks/helpers/association.php rename to src/components/com_weblinks/src/Helper/AssociationHelper.php index 88d26c2..279bc37 100644 --- a/src/components/com_weblinks/helpers/association.php +++ b/src/components/com_weblinks/src/Helper/AssociationHelper.php @@ -7,18 +7,20 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\Helper; + defined('_JEXEC') or die; -JLoader::register('WeblinksHelper', JPATH_ADMINISTRATOR . '/components/com_weblinks/helpers/weblinks.php'); -JLoader::register('WeblinksHelperRoute', JPATH_SITE . '/components/com_weblinks/helpers/route.php'); -JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php'); +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Associations; +use Joomla\Component\Categories\Administrator\Helper\CategoryAssociationHelper; /** * Weblinks Component Association Helper * * @since 3.0 */ -abstract class WeblinksHelperAssociation extends CategoryHelperAssociation +abstract class AssociationHelper extends CategoryAssociationHelper { /** * Method to get the associations for a given item @@ -32,21 +34,21 @@ abstract class WeblinksHelperAssociation extends CategoryHelperAssociation */ public static function getAssociations($id = 0, $view = null) { - $jinput = JFactory::getApplication()->input; - $view = is_null($view) ? $jinput->get('view') : $view; - $id = empty($id) ? $jinput->getInt('id') : $id; + $input = Factory::getApplication()->input; + $view = is_null($view) ? $input->get('view') : $view; + $id = empty($id) ? $input->getInt('id') : $id; if ($view === 'weblink') { if ($id) { - $associations = JLanguageAssociations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $id); + $associations = Associations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $id); $return = array(); foreach ($associations as $tag => $item) { - $return[$tag] = WeblinksHelperRoute::getWeblinkRoute($item->id, (int) $item->catid, $item->language); + $return[$tag] = RouteHelper::getWeblinkRoute($item->id, (int) $item->catid, $item->language); } return $return; diff --git a/src/components/com_weblinks/src/Helper/RouteHelper.php b/src/components/com_weblinks/src/Helper/RouteHelper.php new file mode 100644 index 0000000..c85a2a2 --- /dev/null +++ b/src/components/com_weblinks/src/Helper/RouteHelper.php @@ -0,0 +1,115 @@ + 1) + { + $link .= '&catid=' . $catid; + } + + if ($language && $language !== '*' && Multilanguage::isEnabled()) + { + $link .= '&lang=' . $language; + } + + return $link; + } + + /** + * Ge the form route + * + * @param integer $id The id of the weblink. + * @param string $return The return page variable. + * + * @return string + */ + public static function getFormRoute($id, $return = null) + { + // Create the link. + if ($id) + { + $link = 'index.php?option=com_weblinks&task=weblink.edit&w_id=' . $id; + } + else + { + $link = 'index.php?option=com_weblinks&task=weblink.add&w_id=0'; + } + + if ($return) + { + $link .= '&return=' . $return; + } + + return $link; + } + + /** + * Get the Category Route + * + * @param CategoryNode|string|integer $catid JCategoryNode object or category ID + * @param integer $language Language code + * + * @return string + */ + public static function getCategoryRoute($catid, $language = 0) + { + if ($catid instanceof CategoryNode) + { + $id = $catid->id; + } + else + { + $id = (int) $catid; + } + + if ($id < 1) + { + $link = ''; + } + else + { + // Create the link + $link = 'index.php?option=com_weblinks&view=category&id=' . $id; + + if ($language && $language !== '*' && Multilanguage::isEnabled()) + { + $link .= '&lang=' . $language; + } + } + + return $link; + } +} diff --git a/src/components/com_weblinks/models/categories.php b/src/components/com_weblinks/src/Model/CategoriesModel.php similarity index 77% rename from src/components/com_weblinks/models/categories.php rename to src/components/com_weblinks/src/Model/CategoriesModel.php index 0ae095a..a3cc4bf 100644 --- a/src/components/com_weblinks/models/categories.php +++ b/src/components/com_weblinks/src/Model/CategoriesModel.php @@ -7,6 +7,14 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\Model; + +use Joomla\CMS\Categories\Categories; +use Joomla\CMS\Categories\CategoryNode; +use Joomla\CMS\Factory; +use Joomla\CMS\MVC\Model\ListModel; +use Joomla\Registry\Registry; + defined('_JEXEC') or die; /** @@ -14,7 +22,7 @@ defined('_JEXEC') or die; * * @since 1.6 */ -class WeblinksModelCategories extends JModelList +class CategoriesModel extends ListModel { /** * Context string for the model type. This is used to handle uniqueness @@ -31,8 +39,18 @@ class WeblinksModelCategories extends JModelList */ protected $_extension = 'com_weblinks'; + /** + * Parent category + * + * @var CategoryNode|null + */ private $_parent = null; + /** + * Categories data + * + * @var false|array + */ private $_items = null; /** @@ -49,7 +67,7 @@ class WeblinksModelCategories extends JModelList */ protected function populateState($ordering = null, $direction = null) { - $app = JFactory::getApplication(); + $app = Factory::getApplication(); $this->setState('filter.extension', $this->_extension); // Get the parent id if defined. @@ -92,22 +110,16 @@ class WeblinksModelCategories extends JModelList */ public function getItems() { - if (!count($this->_items)) + if ($this->_items === null) { - $app = JFactory::getApplication(); - $menu = $app->getMenu(); - $active = $menu->getActive(); - $params = new JRegistry; + $params = $this->getState('params', new Registry); - if ($active) - { - $params->loadString($active->params); - } - - $options = array(); + $options = array(); + $options['access'] = $this->getState('filter.access'); + $options['published'] = $this->getState('filter.published'); $options['countItems'] = $params->get('show_cat_num_links', 1) || !$params->get('show_empty_categories_cat', 0); - $categories = JCategories::getInstance('Weblinks', $options); - $this->_parent = $categories->get($this->getState('filter.parentId', 'root')); + $categories = Categories::getInstance('Weblinks', $options); + $this->_parent = $categories->get($this->getState('filter.parentId', 'root')); if (is_object($this->_parent)) { diff --git a/src/components/com_weblinks/models/category.php b/src/components/com_weblinks/src/Model/CategoryModel.php similarity index 70% rename from src/components/com_weblinks/models/category.php rename to src/components/com_weblinks/src/Model/CategoryModel.php index 9378226..db4035f 100644 --- a/src/components/com_weblinks/models/category.php +++ b/src/components/com_weblinks/src/Model/CategoryModel.php @@ -7,8 +7,18 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\Model; + defined('_JEXEC') or die; +use Joomla\CMS\Categories\Categories; +use Joomla\CMS\Categories\CategoryNode; +use Joomla\CMS\Factory; +use Joomla\CMS\Helper\TagsHelper; +use Joomla\CMS\Language\Multilanguage; +use Joomla\CMS\MVC\Model\ListModel; +use Joomla\CMS\Table\Table; +use Joomla\Database\ParameterType; use Joomla\Registry\Registry; /** @@ -16,21 +26,41 @@ use Joomla\Registry\Registry; * * @since 1.5 */ -class WeblinksModelCategory extends JModelList +class CategoryModel extends ListModel { /** - * Category items data + * Category item data * - * @var array + * @var CategoryNode|null */ protected $_item = null; - protected $_articles = null; + /** + * Category left of this one + * + * @var CategoryNode|null + */ + protected $_leftsibling = null; - protected $_siblings = null; + /** + * Category right right of this one + * + * @var CategoryNode|null + */ + protected $_rightsibling = null; + /** + * Array of child-categories + * + * @var CategoryNode[]|null + */ protected $_children = null; + /** + * Parent category of the current one + * + * @var CategoryNode|null + */ protected $_parent = null; /** @@ -56,19 +86,6 @@ class WeblinksModelCategory extends JModelList parent::__construct($config); } - /** - * The category that applies. - * - * @var object - */ - protected $_category = null; - - /** - * The list of other weblink categories. - * - * @var array - */ - protected $_categories = null; /** * Method to get a list of items. @@ -85,13 +102,11 @@ class WeblinksModelCategory extends JModelList { if (!isset($this->_params)) { - $params = new Registry; - $params->loadString($item->params); - $item->params = $params; + $item->params = new Registry($item->params); } // Get the tags - $item->tags = new JHelperTags; + $item->tags = new TagsHelper; $item->tags->getItemTags('com_weblinks.weblink', $item->id); } @@ -101,22 +116,22 @@ class WeblinksModelCategory extends JModelList /** * Method to get a JDatabaseQuery object for retrieving the data set from a database. * - * @return JDatabaseQuery A JDatabaseQuery object to retrieve the data set. + * @return \JDatabaseQuery A JDatabaseQuery object to retrieve the data set. * * @since 1.6 */ protected function getListQuery() { - $groups = implode(',', JFactory::getUser()->getAuthorisedViewLevels()); + $viewLevels = Factory::getApplication()->getIdentity()->getAuthorisedViewLevels(); // Create a new query object. - $db = $this->getDbo(); + $db = $this->getDbo(); $query = $db->getQuery(true); // Select required fields from the categories. $query->select($this->getState('list.select', 'a.*')) ->from($db->quoteName('#__weblinks') . ' AS a') - ->where('a.access IN (' . $groups . ')'); + ->whereIn($db->quoteName('a.access'), $viewLevels); // Filter by category. if ($categoryId = $this->getState('category.id')) @@ -125,15 +140,17 @@ class WeblinksModelCategory extends JModelList if ($this->getState('category.group', 0)) { $query->select('c.title AS category_title') - ->where('c.parent_id = ' . (int) $categoryId) + ->where('c.parent_id = :parent_id') + ->bind(':parent_id', $categoryId, ParameterType::INTEGER) ->join('LEFT', '#__categories AS c ON c.id = a.catid') - ->where('c.access IN (' . $groups . ')'); + ->whereIn($db->quoteName('c.access'), $viewLevels); } else { - $query->where('a.catid = ' . (int) $categoryId) + $query->where('a.catid = :catid') + ->bind(':catid', $categoryId, ParameterType::INTEGER) ->join('LEFT', '#__categories AS c ON c.id = a.catid') - ->where('c.access IN (' . $groups . ')'); + ->whereIn($db->quoteName('c.access'), $viewLevels); } // Filter by published category @@ -141,7 +158,8 @@ class WeblinksModelCategory extends JModelList if (is_numeric($cpublished)) { - $query->where('c.published = ' . (int) $cpublished); + $query->where('c.published = :published') + ->bind(':published', $cpublished, ParameterType::INTEGER); } } @@ -156,26 +174,31 @@ class WeblinksModelCategory extends JModelList if (is_numeric($state)) { - $query->where('a.state = ' . (int) $state); + $query->where('a.state = :state') + ->bind(':state', $state, ParameterType::INTEGER); } // Do not show trashed links on the front-end $query->where('a.state != -2'); // Filter by start and end dates. - $nullDate = $db->quote($db->getNullDate()); - $nowDate = $db->quote(JFactory::getDate()->toSql()); - if ($this->getState('filter.publish_date')) { - $query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')') - ->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')'); + $nowDate = Factory::getDate()->toSql(); + $query->where('(' . $db->quoteName('a.publish_up') + . ' IS NULL OR ' . $db->quoteName('a.publish_up') . ' <= :publish_up)' + ) + ->where('(' . $db->quoteName('a.publish_down') + . ' IS NULL OR ' . $db->quoteName('a.publish_down') . ' >= :publish_down)' + ) + ->bind(':publish_up', $nowDate) + ->bind(':publish_down', $nowDate); } // Filter by language if ($this->getState('filter.language')) { - $query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')'); + $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING); } // Filter by search in title @@ -183,10 +206,11 @@ class WeblinksModelCategory extends JModelList if (!empty($search)) { - $search = $db->quote('%' . $db->escape($search, true) . '%'); - $query->where('(a.title LIKE ' . $search . ')'); + $search = '%' . trim($search) . '%'; + $query->where('(a.title LIKE :search)') + ->bind(':search', $search); } - + // If grouping by subcategory, add the subcategory list ordering clause. if ($this->getState('category.group', 0)) { @@ -219,8 +243,10 @@ class WeblinksModelCategory extends JModelList */ protected function populateState($ordering = null, $direction = null) { - $app = JFactory::getApplication(); - $params = JComponentHelper::getParams('com_weblinks'); + $app = Factory::getApplication(); + + $params = $app->getParams(); + $this->setState('params', $params); // List state information $limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint'); @@ -253,9 +279,9 @@ class WeblinksModelCategory extends JModelList $id = $app->input->get('id', 0, 'int'); $this->setState('category.id', $id); - $user = JFactory::getUser(); + $user = $app->getIdentity(); - if ((!$user->authorise('core.edit.state', 'com_weblinks')) && (!$user->authorise('core.edit', 'com_weblinks'))) + if (!$user->authorise('core.edit.state', 'com_weblinks') && !$user->authorise('core.edit', 'com_weblinks')) { // Limit to published for people who can't edit or edit.state. $this->setState('filter.state', 1); @@ -264,10 +290,7 @@ class WeblinksModelCategory extends JModelList $this->setState('filter.publish_date', true); } - $this->setState('filter.language', JLanguageMultilang::isEnabled()); - - // Load the parameters. - $this->setState('params', $params); + $this->setState('filter.language', Multilanguage::isEnabled()); } /** @@ -281,27 +304,19 @@ class WeblinksModelCategory extends JModelList { if (!is_object($this->_item)) { - $app = JFactory::getApplication(); - $menu = $app->getMenu(); - $active = $menu->getActive(); - $params = new Registry; + $params = $this->getState('params', new Registry); - if ($active) - { - $params->loadString($active->params); - } - - $options = array(); + $options = array(); $options['countItems'] = $params->get('show_cat_num_links_cat', 1) || $params->get('show_empty_categories', 0); - $categories = JCategories::getInstance('Weblinks', $options); + $categories = Categories::getInstance('Weblinks', $options); $this->_item = $categories->get($this->getState('category.id', 'root')); if (is_object($this->_item)) { $this->_children = $this->_item->getChildren(); - $this->_parent = false; + $this->_parent = false; if ($this->_item->getParent()) { @@ -309,12 +324,12 @@ class WeblinksModelCategory extends JModelList } $this->_rightsibling = $this->_item->getSibling(); - $this->_leftsibling = $this->_item->getSibling(false); + $this->_leftsibling = $this->_item->getSibling(false); } else { $this->_children = false; - $this->_parent = false; + $this->_parent = false; } } @@ -392,12 +407,12 @@ class WeblinksModelCategory extends JModelList */ public function hit($pk = 0) { - $hitcount = JFactory::getApplication()->input->getInt('hitcount', 1); + $hitcount = Factory::getApplication()->input->getInt('hitcount', 1); if ($hitcount) { - $pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id'); - $table = JTable::getInstance('Category', 'JTable'); + $pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id'); + $table = Table::getInstance('Category', 'Joomla\\CMS\\Table\\'); $table->load($pk); $table->hit($pk); } diff --git a/src/components/com_weblinks/models/form.php b/src/components/com_weblinks/src/Model/FormModel.php similarity index 72% rename from src/components/com_weblinks/models/form.php rename to src/components/com_weblinks/src/Model/FormModel.php index a7ef5f1..1877dbc 100644 --- a/src/components/com_weblinks/models/form.php +++ b/src/components/com_weblinks/src/Model/FormModel.php @@ -7,16 +7,21 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\Model; + defined('_JEXEC') or die; -require_once JPATH_COMPONENT_ADMINISTRATOR . '/models/weblink.php'; +use Joomla\CMS\Factory; +use Joomla\CMS\Table\Table; +use Joomla\CMS\Uri\Uri; +use Joomla\Component\Weblinks\Administrator\Model\WeblinkModel; /** * Weblinks model. * * @since 1.6 */ -class WeblinksModelForm extends WeblinksModelWeblink +class FormModel extends WeblinkModel { /** * Model typeAlias string. Used for version history. @@ -49,7 +54,7 @@ class WeblinksModelForm extends WeblinksModelWeblink */ protected function populateState() { - $app = JFactory::getApplication(); + $app = Factory::getApplication(); // Load state from the request. $pk = $app->input->getInt('w_id'); @@ -63,7 +68,7 @@ class WeblinksModelForm extends WeblinksModelWeblink $return = $app->input->get('return', null, 'base64'); - if (!JUri::isInternal(base64_decode($return))) + if (!Uri::isInternal(base64_decode($return))) { $return = null; } @@ -92,7 +97,7 @@ class WeblinksModelForm extends WeblinksModelWeblink $form = $this->loadForm('com_weblinks.form', 'weblink', array('control' => 'jform', 'load_data' => $loadData)); // Disable the buttons and just allow editor none for not authenticated users - if (JFactory::getUser()->guest) + if (Factory::getApplication()->getIdentity()->guest) { $form->setFieldAttribute('description', 'editor', 'none'); $form->setFieldAttribute('description', 'buttons', 'no'); @@ -100,4 +105,21 @@ class WeblinksModelForm extends WeblinksModelWeblink return $form; } + + /** + * Method to get a table object, load it if necessary. + * + * @param string $name The table name. Optional. + * @param string $prefix The class prefix. Optional. + * @param array $options Configuration array for model. Optional. + * + * @return Table A Table object + * + * @since 4.0.0 + * @throws \Exception + */ + public function getTable($name = 'Weblink', $prefix = 'Administrator', $options = array()) + { + return parent::getTable($name, $prefix, $options); + } } diff --git a/src/components/com_weblinks/models/weblink.php b/src/components/com_weblinks/src/Model/WeblinkModel.php similarity index 65% rename from src/components/com_weblinks/models/weblink.php rename to src/components/com_weblinks/src/Model/WeblinkModel.php index 3c6ce13..809ae33 100644 --- a/src/components/com_weblinks/models/weblink.php +++ b/src/components/com_weblinks/src/Model/WeblinkModel.php @@ -7,20 +7,34 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\Model; + defined('_JEXEC') or die; -use Joomla\Utilities\ArrayHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Helper\TagsHelper; +use Joomla\CMS\Language\Multilanguage; +use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\Model\ItemModel; +use Joomla\CMS\Table\Table; +use Joomla\Database\ParameterType; use Joomla\Registry\Registry; -JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables'); - /** * Weblinks Component Model for a Weblink record * * @since 1.5 */ -class WeblinksModelWeblink extends JModelItem +class WeblinkModel extends ItemModel { + /** + * Store loaded weblink items + * + * @var array + * @since 1.6 + */ + protected $_item = null; + /** * Model context string. * @@ -39,7 +53,7 @@ class WeblinksModelWeblink extends JModelItem */ protected function populateState() { - $app = JFactory::getApplication('site'); + $app = Factory::getApplication(); // Load the object state. $pk = $app->input->getInt('id'); @@ -49,15 +63,15 @@ class WeblinksModelWeblink extends JModelItem $params = $app->getParams(); $this->setState('params', $params); - $user = JFactory::getUser(); + $user = $app->getIdentity(); - if ((!$user->authorise('core.edit.state', 'com_weblinks')) && (!$user->authorise('core.edit', 'com_weblinks'))) + if (!$user->authorise('core.edit.state', 'com_weblinks') && !$user->authorise('core.edit', 'com_weblinks')) { $this->setState('filter.published', 1); $this->setState('filter.archived', 2); } - $this->setState('filter.language', JLanguageMultilang::isEnabled()); + $this->setState('filter.language', Multilanguage::isEnabled()); } /** @@ -69,7 +83,7 @@ class WeblinksModelWeblink extends JModelItem */ public function getItem($pk = null) { - $user = JFactory::getUser(); + $user = Factory::getApplication()->getIdentity(); $pk = (!empty($pk)) ? $pk : (int) $this->getState('weblink.id'); @@ -86,7 +100,8 @@ class WeblinksModelWeblink extends JModelItem $query = $db->getQuery(true) ->select($this->getState('item.select', 'a.*')) ->from('#__weblinks AS a') - ->where('a.id = ' . (int) $pk); + ->where($db->quoteName('a.id') . ' = :id') + ->bind(':id', $pk, ParameterType::INTEGER); // Join on category table. $query->select('c.title AS category_title, c.alias AS category_alias, c.access AS category_access') @@ -100,23 +115,25 @@ class WeblinksModelWeblink extends JModelItem // Filter by language if ($this->getState('filter.language')) { - $query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')'); + $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING); } // Join over the categories to get parent category titles $query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias') ->join('LEFT', '#__categories as parent ON parent.id = c.parent_id'); - if ((!$user->authorise('core.edit.state', 'com_weblinks')) && (!$user->authorise('core.edit', 'com_weblinks'))) + if (!$user->authorise('core.edit.state', 'com_weblinks') && !$user->authorise('core.edit', 'com_weblinks')) { // Filter by start and end dates. - $nullDate = $db->quote($db->getNullDate()); - $date = JFactory::getDate(); - - $nowDate = $db->quote($date->toSql()); - - $query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')') - ->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')'); + $nowDate = Factory::getDate()->toSql(); + $query->where('(' . $db->quoteName('a.publish_up') + . ' IS NULL OR ' . $db->quoteName('a.publish_up') . ' <= :publish_up)' + ) + ->where('(' . $db->quoteName('a.publish_down') + . ' IS NULL OR ' . $db->quoteName('a.publish_down') . ' >= :publish_down)' + ) + ->bind(':publish_up', $nowDate) + ->bind(':publish_down', $nowDate); } // Filter by published state. @@ -125,7 +142,7 @@ class WeblinksModelWeblink extends JModelItem if (is_numeric($published)) { - $query->where('(a.state = ' . (int) $published . ' OR a.state =' . (int) $archived . ')'); + $query->whereIn($db->quoteName('a.state'), [$published, $archived]); } $db->setQuery($query); @@ -134,19 +151,26 @@ class WeblinksModelWeblink extends JModelItem if (empty($data)) { - JError::raiseError(404, JText::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND')); + throw new \Exception(Text::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND'), 404); } // 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_WEBLINKS_ERROR_WEBLINK_NOT_FOUND')); + throw new \Exception(Text::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND'), 404); } // Convert parameter fields to objects. $data->params = new Registry($data->params); $data->metadata = new Registry($data->metadata); + // Some contexts may not use tags data at all, so we allow callers to disable loading tag data + if ($this->getState('load_tags', true)) + { + $data->tags = new TagsHelper; + $data->tags->getItemTags('com_weblinks.weblink', $data->id); + } + // Compute access permissions. if ($access = $this->getState('filter.access')) { @@ -162,7 +186,7 @@ class WeblinksModelWeblink extends JModelItem $this->_item[$pk] = $data; } - catch (Exception $e) + catch (\Exception $e) { $this->setError($e); $this->_item[$pk] = false; @@ -179,13 +203,13 @@ class WeblinksModelWeblink extends JModelItem * @param string $prefix A prefix for the table class name. Optional. * @param array $config Configuration array for model. Optional. * - * @return JTable A database object + * @return Table A database object * * @since 1.6 */ - public function getTable($type = 'Weblink', $prefix = 'WeblinksTable', $config = array()) + public function getTable($type = 'Weblink', $prefix = 'Administrator', $config = array()) { - return JTable::getInstance($type, $prefix, $config); + return parent::getTable($type, $prefix, $config); } /** @@ -202,6 +226,6 @@ class WeblinksModelWeblink extends JModelItem $pk = $this->getState('weblink.id'); } - return $this->getTable('Weblink', 'WeblinksTable')->hit($pk); + return $this->getTable('Weblink')->hit($pk); } } diff --git a/src/components/com_weblinks/helpers/category.php b/src/components/com_weblinks/src/Service/Category.php similarity index 52% rename from src/components/com_weblinks/helpers/category.php rename to src/components/com_weblinks/src/Service/Category.php index e2a27e4..1c8f1c3 100644 --- a/src/components/com_weblinks/helpers/category.php +++ b/src/components/com_weblinks/src/Service/Category.php @@ -3,29 +3,33 @@ * @package Joomla.Site * @subpackage com_weblinks * - * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. + * @copyright (C) 2009 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -defined('_JEXEC') or die; +namespace Joomla\Component\Weblinks\Site\Service; + +\defined('_JEXEC') or die; + +use Joomla\CMS\Categories\Categories; /** - * Weblinks Component Category Tree. + * Weblinks Component Category Tree * * @since 1.6 */ -class WeblinksCategories extends JCategories +class Category extends Categories { /** - * Constructor + * Class constructor * * @param array $options Array of options * - * @since 1.6 + * @since 1.7.0 */ public function __construct($options = array()) { - $options['table'] = '#__weblinks'; + $options['table'] = '#__weblinks'; $options['extension'] = 'com_weblinks'; parent::__construct($options); diff --git a/src/components/com_weblinks/src/Service/Router.php b/src/components/com_weblinks/src/Service/Router.php new file mode 100644 index 0000000..cd6e22c --- /dev/null +++ b/src/components/com_weblinks/src/Service/Router.php @@ -0,0 +1,298 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +namespace Joomla\Component\Weblinks\Site\Service; + +\defined('_JEXEC') or die; + +use Joomla\CMS\Application\SiteApplication; +use Joomla\CMS\Categories\CategoryFactoryInterface; +use Joomla\CMS\Categories\CategoryInterface; +use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Component\Router\RouterView; +use Joomla\CMS\Component\Router\RouterViewConfiguration; +use Joomla\CMS\Component\Router\Rules\MenuRules; +use Joomla\CMS\Component\Router\Rules\NomenuRules; +use Joomla\CMS\Component\Router\Rules\StandardRules; +use Joomla\CMS\Menu\AbstractMenu; +use Joomla\Database\DatabaseInterface; +use Joomla\Database\ParameterType; + +/** + * Routing class from com_weblinks + * + * @since 3.3 + */ +class Router extends RouterView +{ + /** + * Flag to remove IDs + * + * @var boolean + */ + protected $noIDs = false; + + /** + * The category factory + * + * @var CategoryFactoryInterface + * + * @since 4.0.0 + */ + private $categoryFactory; + + /** + * The category cache + * + * @var array + * + * @since 4.0.0 + */ + private $categoryCache = []; + + /** + * The db + * + * @var DatabaseInterface + * + * @since 4.0.0 + */ + private $db; + + /** + * Weblinks Component router constructor + * + * @param SiteApplication $app The application object + * @param AbstractMenu $menu The menu object to work with + * @param CategoryFactoryInterface $categoryFactory The category object + * @param DatabaseInterface $db The database object + */ + public function __construct(SiteApplication $app, AbstractMenu $menu, CategoryFactoryInterface $categoryFactory, DatabaseInterface $db) + { + $this->categoryFactory = $categoryFactory; + $this->db = $db; + + $params = ComponentHelper::getParams('com_weblinks'); + $this->noIDs = (bool) $params->get('sef_ids'); + $categories = new RouterViewConfiguration('categories'); + $categories->setKey('id'); + $this->registerView($categories); + $category = new RouterViewConfiguration('category'); + $category->setKey('id')->setParent($categories, 'catid')->setNestable(); + $this->registerView($category); + $webLink = new RouterViewConfiguration('weblink'); + $webLink->setKey('id')->setParent($category, 'catid'); + $this->registerView($webLink); + $form = new RouterViewConfiguration('form'); + $form->setKey('w_id'); + $this->registerView($form); + + parent::__construct($app, $menu); + + $this->attachRule(new MenuRules($this)); + $this->attachRule(new StandardRules($this)); + $this->attachRule(new NomenuRules($this)); + } + + /** + * Method to get the segment(s) for a category + * + * @param string $id ID of the category to retrieve the segments for + * @param array $query The request that is built right now + * + * @return array|string The segments of this item + */ + public function getCategorySegment($id, $query) + { + $category = $this->getCategories()->get($id); + + if ($category) + { + $path = array_reverse($category->getPath(), true); + $path[0] = '1:root'; + + if ($this->noIDs) + { + foreach ($path as &$segment) + { + list($id, $segment) = explode(':', $segment, 2); + } + } + + return $path; + } + + return array(); + } + + /** + * Method to get the segment(s) for a category + * + * @param string $id ID of the category to retrieve the segments for + * @param array $query The request that is built right now + * + * @return array|string The segments of this item + */ + public function getCategoriesSegment($id, $query) + { + return $this->getCategorySegment($id, $query); + } + + /** + * Method to get the segment(s) for a weblink + * + * @param string $id ID of the weblink to retrieve the segments for + * @param array $query The request that is built right now + * + * @return array|string The segments of this item + */ + public function getWeblinkSegment($id, $query) + { + if (!strpos($id, ':')) + { + $id = (int) $id; + $dbquery = $this->db->getQuery(true); + $dbquery->select($this->db->quoteName('alias')) + ->from($this->db->quoteName('#__weblinks')) + ->where($this->db->quoteName('id') . ' = :id') + ->bind(':id', $id, ParameterType::INTEGER); + $this->db->setQuery($dbquery); + + $id .= ':' . $this->db->loadResult(); + } + + if ($this->noIDs) + { + list($void, $segment) = explode(':', $id, 2); + + return array($void => $segment); + } + + return array((int) $id => $id); + } + + /** + * Method to get the segment(s) for a form + * + * @param string $id ID of the weblink form to retrieve the segments for + * @param array $query The request that is built right now + * + * @return array|string The segments of this item + * + * @since 4.0.0 + */ + public function getFormSegment($id, $query) + { + return $this->getWeblinkSegment($id, $query); + } + + /** + * Method to get the id for a category + * + * @param string $segment Segment to retrieve the ID for + * @param array $query The request that is parsed right now + * + * @return mixed The id of this item or false + */ + public function getCategoryId($segment, $query) + { + if (isset($query['id'])) + { + $category = $this->getCategories(['access' => false])->get($query['id']); + + if ($category) + { + foreach ($category->getChildren() as $child) + { + if ($this->noIDs) + { + if ($child->alias == $segment) + { + return $child->id; + } + } + else + { + if ($child->id == (int) $segment) + { + return $child->id; + } + } + } + } + } + + return false; + } + + /** + * Method to get the segment(s) for a category + * + * @param string $segment Segment to retrieve the ID for + * @param array $query The request that is parsed right now + * + * @return mixed The id of this item or false + */ + public function getCategoriesId($segment, $query) + { + return $this->getCategoryId($segment, $query); + } + + /** + * Method to get the segment(s) for a weblink + * + * @param string $segment Segment of the weblink to retrieve the ID for + * @param array $query The request that is parsed right now + * + * @return mixed The id of this item or false + */ + public function getWeblinkId($segment, $query) + { + if ($this->noIDs) + { + $dbquery = $this->db->getQuery(true); + $dbquery->select($this->db->quoteName('id')) + ->from($this->db->quoteName('#__weblinks')) + ->where( + [ + $this->db->quoteName('alias') . ' = :alias', + $this->db->quoteName('catid') . ' = :catid', + ] + ) + ->bind(':alias', $segment) + ->bind(':catid', $query['id'], ParameterType::INTEGER); + $this->db->setQuery($dbquery); + + return (int) $this->db->loadResult(); + } + + return (int) $segment; + } + + /** + * Method to get categories from cache + * + * @param array $options The options for retrieving categories + * + * @return CategoryInterface The object containing categories + * + * @since 4.0.0 + */ + private function getCategories(array $options = []): CategoryInterface + { + $key = serialize($options); + + if (!isset($this->categoryCache[$key])) + { + $this->categoryCache[$key] = $this->categoryFactory->createCategory($options); + } + + return $this->categoryCache[$key]; + } +} diff --git a/src/components/com_weblinks/src/View/Categories/HtmlView.php b/src/components/com_weblinks/src/View/Categories/HtmlView.php new file mode 100644 index 0000000..8e30794 --- /dev/null +++ b/src/components/com_weblinks/src/View/Categories/HtmlView.php @@ -0,0 +1,34 @@ +items as $item) + { + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; + + if ($item->params->get('count_clicks', $this->params->get('count_clicks', 1)) == 1) + { + $item->link = Route::_('index.php?option=com_weblinks&task=weblink.go&id=' . $item->id); + } + else + { + $item->link = $item->url; + } + + $temp = new Registry; + $temp->loadString($item->params); + $item->params = clone $this->params; + $item->params->merge($temp); + } + + return parent::display($tpl); + } + + /** + * Prepares the document + * + * @return void + */ + protected function prepareDocument() + { + parent::prepareDocument(); + + parent::addFeed(); + + if ($this->menuItemMatchCategory) + { + // If the active menu item is linked directly to the category being displayed, no further process is needed + return; + } + + // Get ID of the category from active menu item + $menu = $this->menu; + + if ($menu && $menu->component == 'com_weblinks' && isset($menu->query['view']) + && in_array($menu->query['view'], ['categories', 'category'])) + { + $id = $menu->query['id']; + } + else + { + $id = 0; + } + + $path = [['title' => $this->category->title, 'link' => '']]; + $category = $this->category->getParent(); + + while ($category !== null && $category->id != $id && $category->id !== 'root') + { + $path[] = ['title' => $category->title, 'link' => RouteHelper::getCategoryRoute($category->id, $category->language)]; + $category = $category->getParent(); + } + + $path = array_reverse($path); + + foreach ($path as $item) + { + $this->pathway->addItem($item['title'], $item['link']); + } + } +} diff --git a/src/components/com_weblinks/views/form/view.html.php b/src/components/com_weblinks/src/View/Form/HtmlView.php similarity index 67% rename from src/components/com_weblinks/views/form/view.html.php rename to src/components/com_weblinks/src/View/Form/HtmlView.php index 437ef72..82844b9 100644 --- a/src/components/com_weblinks/views/form/view.html.php +++ b/src/components/com_weblinks/src/View/Form/HtmlView.php @@ -7,23 +7,58 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\View\Form; + defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\View\GenericDataException; +use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; + /** * HTML Article View class for the Weblinks component * * @since 1.5 */ -class WeblinksViewForm extends JViewLegacy +class HtmlView extends BaseHtmlView { + /** + * @var \Joomla\CMS\Form\Form + * @since 4.0.0 + */ protected $form; + /** + * @var object + * @since 4.0.0 + */ protected $item; + /** + * @var string + * @since 4.0.0 + */ protected $return_page; + /** + * @var string + * @since 4.0.0 + */ + protected $pageclass_sfx; + + /** + * @var \Joomla\Registry\Registry + * @since 4.0.0 + */ protected $state; + /** + * @var \Joomla\Registry\Registry + * @since 4.0.0 + */ + protected $params; + /** * Display the view. * @@ -33,7 +68,7 @@ class WeblinksViewForm extends JViewLegacy */ public function display($tpl = null) { - $user = JFactory::getUser(); + $user = Factory::getApplication()->getIdentity(); // Get model data. $this->state = $this->get('State'); @@ -43,7 +78,7 @@ class WeblinksViewForm extends JViewLegacy if (empty($this->item->id)) { - $authorised = ($user->authorise('core.create', 'com_weblinks') || (count($user->getAuthorisedCategories('com_weblinks', 'core.create')))); + $authorised = $user->authorise('core.create', 'com_weblinks') || count($user->getAuthorisedCategories('com_weblinks', 'core.create')); } else { @@ -52,15 +87,13 @@ class WeblinksViewForm extends JViewLegacy if ($authorised !== true) { - JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR')); - - return false; + throw new \Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403); } if (!empty($this->item)) { // Override the base weblink data with any data in the session. - $temp = (array) JFactory::getApplication()->getUserState('com_weblinks.edit.weblink.data', array()); + $temp = (array) Factory::getApplication()->getUserState('com_weblinks.edit.weblink.data', array()); foreach ($temp as $k => $v) { @@ -73,9 +106,7 @@ class WeblinksViewForm extends JViewLegacy // Check for errors. if (count($errors = $this->get('Errors'))) { - JError::raiseWarning(500, implode("\n", $errors)); - - return false; + throw new GenericDataException(implode("\n", $errors), 500); } // Create a shortcut to the parameters. @@ -88,6 +119,7 @@ class WeblinksViewForm extends JViewLegacy $this->user = $user; $this->_prepareDocument(); + parent::display($tpl); } @@ -98,21 +130,19 @@ class WeblinksViewForm extends JViewLegacy */ protected function _prepareDocument() { - $app = JFactory::getApplication(); - $menus = $app->getMenu(); - $title = null; + $app = Factory::getApplication(); // Because the application sets a default page title, // we need to get it from the menu item itself - $menu = $menus->getActive(); + $menu = $app->getMenu()->getActive(); if (empty($this->item->id)) { - $head = JText::_('COM_WEBLINKS_FORM_SUBMIT_WEBLINK'); + $head = Text::_('COM_WEBLINKS_FORM_SUBMIT_WEBLINK'); } else { - $head = JText::_('COM_WEBLINKS_FORM_EDIT_WEBLINK'); + $head = Text::_('COM_WEBLINKS_FORM_EDIT_WEBLINK'); } if ($menu) @@ -126,16 +156,7 @@ class WeblinksViewForm extends JViewLegacy $title = $this->params->def('page_title', $head); - if ($app->get('sitename_pagetitles', 0) == 1) - { - $title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title); - } - elseif ($app->get('sitename_pagetitles', 0) == 2) - { - $title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename')); - } - - $this->document->setTitle($title); + $this->setDocumentTitle($title); if ($this->params->get('menu-meta_description')) { diff --git a/src/components/com_weblinks/views/weblink/view.html.php b/src/components/com_weblinks/src/View/Weblink/HtmlView.php similarity index 57% rename from src/components/com_weblinks/views/weblink/view.html.php rename to src/components/com_weblinks/src/View/Weblink/HtmlView.php index 045e31d..f524c1b 100644 --- a/src/components/com_weblinks/views/weblink/view.html.php +++ b/src/components/com_weblinks/src/View/Weblink/HtmlView.php @@ -7,6 +7,11 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Component\Weblinks\Site\View\Weblink; + +use Joomla\CMS\Factory; +use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; + defined('_JEXEC') or die; /** @@ -14,12 +19,28 @@ defined('_JEXEC') or die; * * @since __DEPLOY_VERSION__ */ -class WeblinksViewWeblink extends JViewLegacy +class HtmlView extends BaseHtmlView { + /** + * The weblink object + * + * @var \JObject + */ protected $item; + /** + * The page parameters + * + * @var \Joomla\Registry\Registry|null + */ protected $params; + /** + * The item model state + * + * @var \Joomla\Registry\Registry + * @since 1.6 + */ protected $state; /** @@ -33,7 +54,7 @@ class WeblinksViewWeblink extends JViewLegacy */ public function display($tpl = null) { - $dispatcher = JEventDispatcher::getInstance(); + $app = Factory::getApplication(); $this->item = $this->get('Item'); $this->state = $this->get('State'); @@ -42,19 +63,21 @@ class WeblinksViewWeblink extends JViewLegacy // Create a shortcut for $item. $item = $this->item; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; + $offset = $this->state->get('list.offset'); - $dispatcher->trigger('onContentPrepare', array ('com_weblinks.weblink', &$item, &$item->params, $offset)); + $app->triggerEvent('onContentPrepare', array('com_weblinks.weblink', &$item, &$item->params, $offset)); - $item->event = new stdClass; + $item->event = new \stdClass; - $results = $dispatcher->trigger('onContentAfterTitle', array('com_weblinks.weblink', &$item, &$item->params, $offset)); + $results = $app->triggerEvent('onContentAfterTitle', array('com_weblinks.weblink', &$item, &$item->params, $offset)); $item->event->afterDisplayTitle = trim(implode("\n", $results)); - $results = $dispatcher->trigger('onContentBeforeDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset)); + $results = $app->triggerEvent('onContentBeforeDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset)); $item->event->beforeDisplayContent = trim(implode("\n", $results)); - $results = $dispatcher->trigger('onContentAfterDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset)); + $results = $app->triggerEvent('onContentAfterDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset)); $item->event->afterDisplayContent = trim(implode("\n", $results)); parent::display($tpl); diff --git a/src/components/com_weblinks/tmpl/categories/default.php b/src/components/com_weblinks/tmpl/categories/default.php new file mode 100644 index 0000000..c7b77a1 --- /dev/null +++ b/src/components/com_weblinks/tmpl/categories/default.php @@ -0,0 +1,30 @@ +document->getWebAssetManager(); +$wa->getRegistry()->addExtensionRegistryFile('com_categories'); +$wa->usePreset('com_categories.shared-categories-accordion'); + +?> +
+ loadTemplate('items'); + ?> +
diff --git a/src/components/com_weblinks/tmpl/categories/default.xml b/src/components/com_weblinks/tmpl/categories/default.xml new file mode 100644 index 0000000..e267f66 --- /dev/null +++ b/src/components/com_weblinks/tmpl/categories/default.xml @@ -0,0 +1,280 @@ + + + + + + + + + + + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/components/com_weblinks/tmpl/categories/default_items.php b/src/components/com_weblinks/tmpl/categories/default_items.php new file mode 100644 index 0000000..7e53f9b --- /dev/null +++ b/src/components/com_weblinks/tmpl/categories/default_items.php @@ -0,0 +1,67 @@ +maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) : +?> + items[$this->parent->id] as $id => $item) : ?> + params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?> +
+

+ + escape($item->title); ?> + params->get('show_cat_items_cat') == 1) :?> + +   + numitems; ?> + + + maxLevelcat > 1 && count($item->getChildren()) > 0) : ?> + + +

+ params->get('show_subcat_desc_cat') == 1) : ?> + description) : ?> +
+ description, '', 'com_weblinks.categories'); ?> +
+ + + + maxLevelcat > 1 && count($item->getChildren()) > 0) : ?> + + +
+ + + diff --git a/src/components/com_weblinks/views/category/tmpl/default.php b/src/components/com_weblinks/tmpl/category/default.php similarity index 58% rename from src/components/com_weblinks/views/category/tmpl/default.php rename to src/components/com_weblinks/tmpl/category/default.php index 9329447..a5990da 100644 --- a/src/components/com_weblinks/views/category/tmpl/default.php +++ b/src/components/com_weblinks/tmpl/category/default.php @@ -9,6 +9,12 @@ defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); -$this->subtemplatename = 'items'; -echo JLayoutHelper::render('joomla.content.category_default', $this); +use Joomla\CMS\Layout\LayoutHelper; + +?> +
+ subtemplatename = 'items'; + echo LayoutHelper::render('joomla.content.category_default', $this); + ?> +
\ No newline at end of file diff --git a/src/components/com_weblinks/views/category/tmpl/default.xml b/src/components/com_weblinks/tmpl/category/default.xml similarity index 64% rename from src/components/com_weblinks/views/category/tmpl/default.xml rename to src/components/com_weblinks/tmpl/category/default.xml index 36c68f1..f0a0ec4 100644 --- a/src/components/com_weblinks/views/category/tmpl/default.xml +++ b/src/components/com_weblinks/tmpl/category/default.xml @@ -1,22 +1,21 @@ - + - +
- -
- - - + - - - @@ -84,34 +78,34 @@ - - - @@ -119,88 +113,81 @@
-
- - +
- - - - - - @@ -208,16 +195,16 @@
- - +
diff --git a/src/components/com_weblinks/tmpl/category/default_children.php b/src/components/com_weblinks/tmpl/category/default_children.php new file mode 100644 index 0000000..cb18799 --- /dev/null +++ b/src/components/com_weblinks/tmpl/category/default_children.php @@ -0,0 +1,53 @@ +maxLevel != 0 && count($this->children[$this->category->id]) > 0) : +?> +
    + children[$this->category->id] as $id => $child) : ?> + params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : ?> +
  • +
    + + escape($child->title); ?> + + + params->get('show_cat_items') == 1) : ?> + numitems; ?> + +
    + + params->get('show_subcat_desc') == 1) : ?> + description) : ?> +
    + description, '', 'com_weblinks.category'); ?> +
    + + + + getChildren()) > 0 ) : + $this->children[$child->id] = $child->getChildren(); + $this->category = $child; + $this->maxLevel--; + echo $this->loadTemplate('children'); + $this->category = $child->getParent(); + $this->maxLevel++; + endif; ?> +
    • + + +
+ diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php new file mode 100644 index 0000000..769bd2e --- /dev/null +++ b/src/components/com_weblinks/tmpl/category/default_items.php @@ -0,0 +1,223 @@ +category->params; + +// Get the user object. +$user = Factory::getApplication()->getIdentity(); + +// Check if user is allowed to add/edit based on weblinks permission. +$canEdit = $user->authorise('core.edit', 'com_weblinks.category.' . $this->category->id); +$canEditOwn = $user->authorise('core.edit.own', 'com_weblinks.category.' . $this->category->id); +$canCreate = $user->authorise('core.create', 'com_weblinks.category.' . $this->category->id); + +$listOrder = $this->escape($this->state->get('list.ordering')); +$listDirn = $this->escape($this->state->get('list.direction')); +?> + +
+ + params->get('filter_field')) : ?> +
+ + + + +
+ + params->get('show_pagination_limit')) : ?> +
+ + pagination->getLimitBox(); ?> +
+ + items)) : ?> +
+ + +
+ +
    + items as $i => $item) : ?> + state == 0) : ?> +
  • + +
  • + + + created_by == $userId)) : ?> +
    + params); ?> +
    + + +
    + params->get('icons', 1)) : ?> + + + + params->get('link_icons')) : ?> + + + params->get('link_icons') . '" alt="' . Text::_('COM_WEBLINKS_LINK') . '" />'; ?> + + + + + pageclass_sfx; ?> + link; ?> + params->get('width', 600); ?> + params->get('height', 500); ?> + + state == 0) : ?> + + + + params->get('target', $this->params->get('target'))) + { + case 1: + // Open in a new window + echo '' . + $this->escape($item->title) . ''; + break; + + case 2: + // Open in a popup window + $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . ''; + echo "" . + $this->escape($item->title) . ''; + break; + case 3: + // Open in a modal window + $modalId = 'weblink-item-modal-' . $item->id; + $modalParams['title'] = $this->escape($item->title); + $modalParams['url'] = $link; + $modalParams['height'] = '100%'; + $modalParams['width'] = '100%'; + $modalParams['bodyHeight'] = 70; + $modalParams['modalWidth'] = 80; + echo HTMLHelper::_('bootstrap.renderModal', $modalId, $modalParams); + echo ''; + break; + default: + // Open in parent window + echo '' . + $this->escape($item->title) . ' '; + break; + } + ?> + params->get('show_link_hits', 1)) : ?> +
    + hits); ?> +
    + + + params->get('show_tags', 1) && !empty($item->tags->itemTags)) : ?> +
    + tags->itemTags); ?> +
    + + + params->get('show_link_description')) && ($item->description != '')) : ?> +
    + images); ?> + image_first)) : ?> + + float_first)) : ?> + float_first == 'right' ? 'float-end' : 'float-start'; ?> + + image_first); ?> + image_first_alt) && empty($images->image_first_alt_empty) + ? '' + : 'alt="' . htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8') . '"'; ?> +
    + itemprop="thumbnail" /> + image_first_caption)) : ?> +
    image_first_caption, ENT_COMPAT, 'UTF-8'); ?>
    + +
    + + + image_second)) : ?> + + float_second)) : ?> + float_second == 'right' ? 'float-end' : 'float-start'; ?> + + image_second); ?> + image_second_alt) && empty($images->image_second_alt_empty) + ? '' + : 'alt="' . htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8') . '"'; ?> +
    + itemprop="thumbnail" /> + image_second_caption)) : ?> +
    image_second_caption, ENT_COMPAT, 'UTF-8'); ?>
    + +
    + + + description; ?> + +
    + + +
    + +
    • + +
+ + params->get('show_pagination')) : ?> +
+ params->def('show_pagination_results', 1)) : ?> +

+ pagination->getPagesCounter(); ?> +

+ + + pagination->getPagesLinks(); ?> +
+ + + + + + category, $this->category->params); ?> + + +
diff --git a/src/components/com_weblinks/tmpl/form/edit.php b/src/components/com_weblinks/tmpl/form/edit.php new file mode 100644 index 0000000..5170723 --- /dev/null +++ b/src/components/com_weblinks/tmpl/form/edit.php @@ -0,0 +1,99 @@ +params->get('captcha', Factory::getApplication()->get('captcha', '0')); + +foreach (PluginHelper::getPlugin('captcha') as $plugin) +{ + if ($captchaSet === $plugin->name) + { + $captchaEnabled = true; + break; + } +} + +// Create shortcut to parameters. +$params = $this->state->get('params'); +?> +
+ params->get('show_page_heading')) : ?> +
+

+ escape($this->params->get('page_heading')); ?> +

+
+ +
+ + form->renderField('title'); ?> + form->renderField('alias'); ?> + form->renderField('catid'); ?> + form->renderField('url'); ?> + form->renderField('tags'); ?> + + get('save_history', 0)) : ?> + form->renderField('version_note'); ?> + + + user->authorise('core.edit.state', 'com_weblinks.weblink')) : ?> + form->renderField('state'); ?> + + form->renderField('language'); ?> + form->renderField('description'); ?> + + form->renderField('image_first', 'images'); ?> + form->renderField('image_first_alt', 'images'); ?> + form->renderField('image_first_alt_empty', 'images'); ?> + form->renderField('float_first', 'images'); ?> + form->renderField('image_first_caption', 'images'); ?> + + form->renderField('image_second', 'images'); ?> + form->renderField('image_second_alt', 'images'); ?> + form->renderField('image_second_alt_empty', 'images'); ?> + form->renderField('float_second', 'images'); ?> + form->renderField('image_second_caption', 'images'); ?> + + + +
+ form->renderField('captcha'); ?> +
+ + +
+ + + params->get('save_history', 0) && $this->item->id) : ?> + form->getInput('contenthistory'); ?> + +
+ + + + +
+
diff --git a/src/components/com_weblinks/views/form/tmpl/edit.xml b/src/components/com_weblinks/tmpl/form/edit.xml similarity index 100% rename from src/components/com_weblinks/views/form/tmpl/edit.xml rename to src/components/com_weblinks/tmpl/form/edit.xml diff --git a/src/components/com_weblinks/tmpl/weblink/default.php b/src/components/com_weblinks/tmpl/weblink/default.php new file mode 100644 index 0000000..ca40dc6 --- /dev/null +++ b/src/components/com_weblinks/tmpl/weblink/default.php @@ -0,0 +1,111 @@ +item->url); +$user = Factory::getApplication()->getIdentity(); + +$canEdit = $user->authorise('core.edit', 'com_weblinks.category.' . $this->item->catid); + +if (!$canEdit) +{ + $canEditOwn = $user->authorise('core.edit.own', 'com_weblinks.category.' . $this->item->catid); + $canEdit = $canEditOwn && $this->item->created_by == $user->id; +} +?> +
+ +
+

+ escape($this->item->title); ?> +

+
+ +
+
+
+ item, $this->item->params); ?> +
+
+
+ + + + item->event->afterDisplayTitle; ?> + + + item->event->beforeDisplayContent; ?> + +
+
+ +
+ + params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> +
+ item->tags->itemTags); ?> +
+ + +
+ item->images); ?> + image_first)) : ?> + + float_first)) : ?> + float_first == 'right' ? 'float-end' : 'float-start'; ?> + + image_first); ?> + image_first_alt) && empty($images->image_first_alt_empty) + ? '' + : 'alt="' . htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8') . '"'; ?> +
+ itemprop="thumbnail" /> + image_first_caption)) : ?> +
image_first_caption, ENT_COMPAT, 'UTF-8'); ?>
+ +
+ + + image_second)) : ?> + + float_second)) : ?> + float_second == 'right' ? 'float-end' : 'float-start'; ?> + + image_second); ?> + image_second_alt) && empty($images->image_second_alt_empty) + ? '' + : 'alt="' . htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8') . '"'; ?> +
+ itemprop="thumbnail" /> + image_second_caption)) : ?> +
image_second_caption, ENT_COMPAT, 'UTF-8'); ?>
+ +
+ + + item->description)) : ?> + item->description; ?> + + +
+ +
+ + item->event->afterDisplayContent; ?> +
diff --git a/src/components/com_weblinks/views/weblink/tmpl/default.xml b/src/components/com_weblinks/tmpl/weblink/default.xml similarity index 82% rename from src/components/com_weblinks/views/weblink/tmpl/default.xml rename to src/components/com_weblinks/tmpl/weblink/default.xml index a22e772..c5aab87 100644 --- a/src/components/com_weblinks/views/weblink/tmpl/default.xml +++ b/src/components/com_weblinks/tmpl/weblink/default.xml @@ -12,7 +12,7 @@
diff --git a/src/components/com_weblinks/views/categories/tmpl/default.php b/src/components/com_weblinks/views/categories/tmpl/default.php deleted file mode 100644 index 06aa428..0000000 --- a/src/components/com_weblinks/views/categories/tmpl/default.php +++ /dev/null @@ -1,31 +0,0 @@ -addScriptDeclaration(" -jQuery(function($) { - $('.categories-list').find('[id^=category-btn-]').each(function(index, btn) { - var btn = $(btn); - btn.on('click', function() { - btn.find('span').toggleClass('icon-plus'); - btn.find('span').toggleClass('icon-minus'); - }); - }); -});"); -?> -
- loadTemplate('items'); - ?> -
diff --git a/src/components/com_weblinks/views/categories/tmpl/default.xml b/src/components/com_weblinks/views/categories/tmpl/default.xml deleted file mode 100644 index 6a290c8..0000000 --- a/src/components/com_weblinks/views/categories/tmpl/default.xml +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - -
- -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - diff --git a/src/components/com_weblinks/views/categories/tmpl/default_items.php b/src/components/com_weblinks/views/categories/tmpl/default_items.php deleted file mode 100644 index a702eca..0000000 --- a/src/components/com_weblinks/views/categories/tmpl/default_items.php +++ /dev/null @@ -1,64 +0,0 @@ -items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) : -?> - items[$this->parent->id] as $id => $item) : ?> - params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : - if (!isset($this->items[$this->parent->id][$id + 1])) - { - $class = ' class="last"'; - } - ?> -
> - -

- - escape($item->title); ?> - params->get('show_cat_num_links_cat') == 1) :?> - - numitems; ?> - - - getChildren()) > 0 && $this->maxLevelcat > 1) : ?> - - -

- params->get('show_subcat_desc_cat') == 1) :?> - description) : ?> -
- description, '', 'com_weblinks.categories'); ?> -
- - - - getChildren()) > 0 && $this->maxLevelcat > 1) :?> -
- items[$item->id] = $item->getChildren(); - $this->parent = $item; - $this->maxLevelcat--; - echo $this->loadTemplate('items'); - $this->parent = $item->getParent(); - $this->maxLevelcat++; - ?> -
- -
- - - diff --git a/src/components/com_weblinks/views/categories/view.html.php b/src/components/com_weblinks/views/categories/view.html.php deleted file mode 100644 index 2531105..0000000 --- a/src/components/com_weblinks/views/categories/view.html.php +++ /dev/null @@ -1,83 +0,0 @@ -get('State'); - $items = $this->get('Items'); - $parent = $this->get('Parent'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseWarning(500, implode("\n", $errors)); - return false; - } - - if ($items === false) - { - return JError::raiseError(404, JText::_('JGLOBAL_CATEGORY_NOT_FOUND')); - } - - if ($parent == false) - { - return JError::raiseError(404, JText::_('JGLOBAL_CATEGORY_NOT_FOUND')); - } - - $params = &$state->params; - - $items = array($parent->id => $items); - - // Escape strings for HTML output - $this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx')); - - $this->maxLevelcat = $params->get('maxLevelcat', -1); - $this->params = &$params; - $this->parent = &$parent; - $this->items = &$items; - - return parent::display($tpl); - } -} diff --git a/src/components/com_weblinks/views/category/metadata.xml b/src/components/com_weblinks/views/category/metadata.xml deleted file mode 100644 index 33a5cfd..0000000 --- a/src/components/com_weblinks/views/category/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/components/com_weblinks/views/category/tmpl/default_children.php b/src/components/com_weblinks/views/category/tmpl/default_children.php deleted file mode 100644 index efac70a..0000000 --- a/src/components/com_weblinks/views/category/tmpl/default_children.php +++ /dev/null @@ -1,57 +0,0 @@ -children[$this->category->id]) > 0 && $this->maxLevel != 0) : -?> -
    -children[$this->category->id] as $id => $child) : ?> - params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : - if (!isset($this->children[$this->category->id][$id + 1])) - { - $class = ' class="last"'; - } - ?> - > - - - escape($child->title); ?> - - - params->get('show_subcat_desc') == 1) :?> - description) : ?> -
    - description, '', 'com_weblinks.category'); ?> -
    - - - - params->get('show_cat_num_links') == 1) :?> -
    -
    -
    numitems; ?>
    -
    - - - getChildren()) > 0 ) : - $this->children[$child->id] = $child->getChildren(); - $this->category = $child; - $this->maxLevel--; - echo $this->loadTemplate('children'); - $this->category = $child->getParent(); - $this->maxLevel++; - endif; ?> - - - -
-item->params; - -// Get the user object. -$user = JFactory::getUser(); - -// Check if user is allowed to add/edit based on weblinks permissinos. -$canEdit = $user->authorise('core.edit', 'com_weblinks.category.' . $this->category->id); -$canCreate = $user->authorise('core.create', 'com_weblinks'); -$canEditState = $user->authorise('core.edit.state', 'com_weblinks'); - -$n = count($this->items); -$listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -?> - -items)) : ?> -

- - -
- params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) : ?> -
- params->get('filter_field') != 'hide') : ?> -
- - -
- - - params->get('show_pagination_limit')) : ?> -
- - pagination->getLimitBox(); ?> -
- -
- -
    - items as $i => $item) : ?> - access, $this->user->getAuthorisedViewLevels())) : ?> - items[$i]->state == 0) : ?> -
  • - -
  • - - params->get('show_link_hits', 1)) : ?> - - hits); ?> - - - - - - - - - -
    - params->get('icons', 1) == 0) : ?> - - params->get('icons', 1) == 1) : ?> - params->get('link_icons')) : ?> - - - params->get('link_icons') . '" alt="' . JText::_('COM_WEBLINKS_LINK') . '" />'; ?> - - - - pageclass_sfx; ?> - link; ?> - params->get('width'); ?> - params->get('height'); ?> - - - - - items[$i]->state == 0) : ?> - - - - params->get('target', $this->params->get('target'))) - { - case 1: - // Open in a new window - echo '' . - $this->escape($item->title) . ''; - break; - - case 2: - // Open in a popup window - $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . ''; - echo "" . - $this->escape($item->title) . ''; - break; - case 3: - // Open in a modal window - JHtml::_('behavior.modal', 'a.modal'); - echo '' . - $this->escape($item->title) . ' '; - break; - - default: - // Open in parent window - echo '' . - $this->escape($item->title) . ' '; - break; - } - ?> -
    - tags->getItemTags('com_weblinks.weblink', $item->id); ?> - params->get('show_tags', 1)) : ?> - item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> - item->tagLayout->render($tagsData); ?> - - params->get('show_link_description')) and ($item->description != '')) : ?> - images); ?> - image_first) and !empty($images->image_first)) : ?> - float_first)) ? $this->params->get('float_first') : $images->float_first; ?> -
    image_first_caption) : ?> - image_first_caption) . '"'; ?> - - src="image_first); ?>" alt="image_first_alt); ?>"/>
    - - image_second) and !empty($images->image_second)) : ?> - float_second)) ? $this->params->get('float_second') : $images->float_second; ?> -
    image_second_caption) : ?> - image_second_caption) . '"'; ?> - - src="image_second); ?>" alt="image_second_alt); ?>"/>
    - - description; ?> - -
    • - - -
- - - params->get('show_pagination')) : ?> - - -
- diff --git a/src/components/com_weblinks/views/category/view.html.php b/src/components/com_weblinks/views/category/view.html.php deleted file mode 100644 index 78fe1fc..0000000 --- a/src/components/com_weblinks/views/category/view.html.php +++ /dev/null @@ -1,105 +0,0 @@ -items as $item) - { - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - - if ($item->params->get('count_clicks', $this->params->get('count_clicks', 1)) == 1) - { - $item->link = JRoute::_('index.php?option=com_weblinks&task=weblink.go&id=' . $item->id); - } - else - { - $item->link = $item->url; - } - - $temp = new JRegistry; - $temp->loadString($item->params); - $item->params = clone($this->params); - $item->params->merge($temp); - } - - return parent::display($tpl); - } - - /** - * Prepares the document - * - * @return void - */ - protected function prepareDocument() - { - parent::prepareDocument(); - - $app = JFactory::getApplication(); - $menus = $app->getMenu(); - $pathway = $app->getPathway(); - $title = null; - - // Because the application sets a default page title, - // we need to get it from the menu item itself - $menu = $menus->getActive(); - - if ($menu) - { - $this->params->def('page_heading', $this->params->get('page_title', $menu->title)); - } - else - { - $this->params->def('page_heading', JText::_('COM_WEBLINKS_DEFAULT_PAGE_TITLE')); - } - - $id = (int) @$menu->query['id']; - - if ($menu && ($menu->query['option'] != 'com_weblinks' || $id != $this->category->id)) - { - $this->params->set('page_subheading', $this->category->title); - $path = array(array('title' => $this->category->title, 'link' => '')); - $category = $this->category->getParent(); - - while (($menu->query['option'] != 'com_weblinks' || $id != $category->id) && $category->id > 1) - { - $path[] = array('title' => $category->title, 'link' => WeblinksHelperRoute::getCategoryRoute($category->id)); - $category = $category->getParent(); - } - - $path = array_reverse($path); - - foreach ($path as $item) - { - $pathway->addItem($item['title'], $item['link']); - } - } - - parent::addFeed(); - } -} diff --git a/src/components/com_weblinks/views/form/metadata.xml b/src/components/com_weblinks/views/form/metadata.xml deleted file mode 100644 index a8bbd4e..0000000 --- a/src/components/com_weblinks/views/form/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/components/com_weblinks/views/form/tmpl/edit.php b/src/components/com_weblinks/views/form/tmpl/edit.php deleted file mode 100644 index c878f25..0000000 --- a/src/components/com_weblinks/views/form/tmpl/edit.php +++ /dev/null @@ -1,97 +0,0 @@ -params->get('captcha', JFactory::getApplication()->get('captcha', '0')); - -foreach (JPluginHelper::getPlugin('captcha') as $plugin) -{ - if ($captchaSet === $plugin->name) - { - $captchaEnabled = true; - break; - } -} - -// Create shortcut to parameters. -$params = $this->state->get('params'); -?> - - -
- params->get('show_page_heading')) : ?> -

- escape($this->params->get('page_heading')); ?> -

- -
- - form->renderField('title'); ?> - form->renderField('alias'); ?> - form->renderField('catid'); ?> - form->renderField('url'); ?> - form->renderField('tags'); ?> - - get('save_history', 0)) : ?> - form->renderField('version_note'); ?> - - - user->authorise('core.edit.state', 'com_weblinks.weblink')) : ?> - form->renderField('state'); ?> - - form->renderField('language'); ?> - form->renderField('description'); ?> - -
- - -
- form->renderField('captcha'); ?> -
- - -
-
- -
-
- -
- get('save_history', 0)) : ?> -
- form->getInput('contenthistory'); ?> -
- -
- - - - -
-
diff --git a/src/components/com_weblinks/views/weblink/tmpl/default.php b/src/components/com_weblinks/views/weblink/tmpl/default.php deleted file mode 100644 index f90f781..0000000 --- a/src/components/com_weblinks/views/weblink/tmpl/default.php +++ /dev/null @@ -1,34 +0,0 @@ -item->url); - -?> -
- -
-

- escape($this->item->title); ?> -

-
- - item->event->afterDisplayTitle; ?> - - item->event->beforeDisplayContent; ?> -
- - item->description; ?> -
- - item->event->afterDisplayContent; ?> -
diff --git a/src/components/com_weblinks/weblinks.php b/src/components/com_weblinks/weblinks.php deleted file mode 100644 index e025468..0000000 --- a/src/components/com_weblinks/weblinks.php +++ /dev/null @@ -1,16 +0,0 @@ -execute(JFactory::getApplication()->input->get('task')); -$controller->redirect(); diff --git a/src/language/de-DE/com_weblinks.ini b/src/language/de-DE/com_weblinks.ini index 5e12d27..6f9902b 100644 --- a/src/language/de-DE/com_weblinks.ini +++ b/src/language/de-DE/com_weblinks.ini @@ -19,20 +19,16 @@ COM_WEBLINKS_ERR_TABLES_NAME="Es existiert bereits ein Weblink mit diesem Namen COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Bitte eine gültige URL eingeben." COM_WEBLINKS_ERR_TABLES_TITLE="Ein Weblink muss einen Titel haben." COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Ein anderer Weblink in dieser Kategorie hat denselben Alias (ggf. ist er im Papierkorb)!" -COM_WEBLINKS_FIELD_ALIAS_DESC="Der Alias ist nun für interne Zwecke notwendig. Wird das Feld leer gelassen, dann wird Joomla! einen Standardwert aus dem Titel generieren. Der Alias muss eindeutig für jeden Weblink innerhalb der gleichen Kategorie sein!" COM_WEBLINKS_FIELD_CATEGORY_DESC="Eine Kategorie für den Weblink auswählen" COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Die Weblink-Kategorie, die angezeigt werden soll, auswählen." COM_WEBLINKS_FIELD_CAPTCHA_DESC="Das Captcha auswählen, das im Weblinkeinreichungsformular verwendet wird. Möglicherweise müssen in den Plugins die erforderlichen Informationen für das Captcha-Plugin hinterlegen werden.
Wenn „Standard verwenden“ ausgewählt ist, muss in der Konfiguration ein Captcha-Plugin ausgewählt sein." COM_WEBLINKS_FIELD_CAPTCHA_LABEL="Captcha beim Einreichen erlauben" -COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC="Ein- oder Ausblenden der Anzahl von Weblinks je Kategorie" COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL="# Weblinks" COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_DESC="Falls „Ja“ ausgewählt wurde, wird die Anzahl an Klicks pro Link gespeichert." COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_LABEL="Anzahl Klicks" COM_WEBLINKS_FIELD_CONFIG_DESCRIPTION_DESC="Anzeigen oder Verbergen der Beschreibung unten" -COM_WEBLINKS_FIELD_CONFIG_HITS_DESC="Anzeigen oder Verbergen der Klicks" COM_WEBLINKS_FIELD_CONFIG_ICON_DESC="Wenn oben „Icon“ ausgewählt wurde, kann allen Weblinks ein gemeinsames Icon zugeordnet werden. Falls kein Icon ausgewählt wurde, wird das Standard-Icon (Weltkugel) angezeigt." COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL="Icon auswählen" -COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC="Anzeigen oder Verbergen der Linkbeschreibung." COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL="Linksbeschreibung" COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_DESC="Anzeigen oder Verbergen andere Kategorien" COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_LABEL="Andere Kategorien" @@ -62,9 +58,7 @@ COM_WEBLINKS_FIELD_SECOND_DESC="Das Bild, das als zweites angezeigt werden soll. COM_WEBLINKS_FIELD_SECOND_LABEL="Zweites Bild" COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC="Eine Weblink-Kategorie zum Anzeigen auswählen" COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Kategorie auswählen" -COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC="Tags für die Kategorie anzeigen." COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Tags anzeigen" -COM_WEBLINKS_FIELD_SHOW_TAGS_DESC="Tags für den Weblink anzeigen." COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Tags anzeigen" COM_WEBLINKS_FIELD_STATE_DESC="Status der Veröffentlichung." COM_WEBLINKS_FIELD_TARGET_DESC="Zielfenster, wenn auf den Link geklickt wird." @@ -115,7 +109,6 @@ COM_WEBLINKS_ORDER_HEADING="Reihenfolge" COM_WEBLINKS_RIGHT="Rechts" COM_WEBLINKS_SAVE_SUCCESS="Der Weblink wurde gespeichert!" COM_WEBLINKS_SEARCH_IN_TITLE="Im Titel suchen" -COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC="Falls „Anzeigen“ ausgewählt wurde, werden auch leere Kategorien angezeigt. Eine Kategorie gilt als leer, wenn sie weder Weblinks noch Unterkategorien enthält." COM_WEBLINKS_SUBMENU_CATEGORIES="Kategorien" COM_WEBLINKS_SUBMENU_WEBLINKS="Weblinks" COM_WEBLINKS_XML_DESCRIPTION="Komponenten zum Verwalten von Weblinks." diff --git a/src/language/en-GB/com_weblinks.ini b/src/language/en-GB/com_weblinks.ini index 1f7f720..be8c54d 100644 --- a/src/language/en-GB/com_weblinks.ini +++ b/src/language/en-GB/com_weblinks.ini @@ -3,36 +3,42 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_WEBLINKS_CAPTCHA_LABEL="Captcha" COM_WEBLINKS_CAPTCHA_DESC="Please complete the security check." -COM_WEBLINKS_CONTENT_TYPE_WEBLINK="Web Link" +COM_WEBLINKS_CAPTCHA_LABEL="Captcha" COM_WEBLINKS_CONTENT_TYPE_CATEGORY="Web Links Category" +COM_WEBLINKS_CONTENT_TYPE_WEBLINK="Web Link" COM_WEBLINKS_DEFAULT_PAGE_TITLE="Web Links" COM_WEBLINKS_EDIT="Edit Web link" -COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this category. Please try again." -COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL" -COM_WEBLINKS_ERR_TABLES_TITLE="Your Web Link must contain a title." -COM_WEBLINKS_ERROR_CATEGORY_NOT_FOUND="Web Link category not found." +COM_WEBLINKS_EDIT_PUBLISHED_WEBLINK="Published Weblink" +COM_WEBLINKS_EDIT_UNPUBLISHED_WEBLINK="Unpublished Weblink" COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another Web Link from this category has the same alias (remember it may be a trashed item)." COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND="Web Link not found." COM_WEBLINKS_ERROR_WEBLINK_URL_INVALID="Invalid Web link URL." -COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category." -COM_WEBLINKS_FIELD_CATEGORY_DESC="You must select a Category." -COM_WEBLINKS_FIELD_DESCRIPTION_DESC="Enter a description for your Web link." +COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this category. Please try again." +COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL" +COM_WEBLINKS_ERR_TABLES_TITLE="Your Web Link must contain a title." +COM_WEBLINKS_FIELD_CAPTION_LABEL="Caption First Image" +COM_WEBLINKS_FIELD_FIRST_LABEL="First Image" +COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC="Decorative Image - no description required" +COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL="No Description" +COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL="Alt Text" +COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL="Caption" +COM_WEBLINKS_FIELD_SECOND_LABEL="Second Image" +COM_WEBLINKS_FIELD_URL_LABEL="URL" COM_WEBLINKS_FILTER_LABEL="Filter Field" COM_WEBLINKS_FILTER_SEARCH_DESC="Web Links filter search" -COM_WEBLINKS_FIELD_TITLE_DESC="Your Web Link must have a Title." -COM_WEBLINKS_FIELD_URL_DESC="You must enter a URL." -COM_WEBLINKS_FIELD_URL_LABEL="URL" +COM_WEBLINKS_FLOAT_FIRST_LABEL="First Image Float" +COM_WEBLINKS_FLOAT_SECOND_LABEL="Second Image Float" COM_WEBLINKS_FORM_CREATE_WEBLINK="Submit a Web Link" -COM_WEBLINKS_GRID_TITLE="Title" -COM_WEBLINKS_LINK="Web Link" -COM_WEBLINKS_NAME="Name" -COM_WEBLINKS_NO_WEBLINKS="There are no Web Links in this category." -COM_WEBLINKS_NUM="# of links:" -COM_WEBLINKS_NUM_ITEMS="Links in categories" COM_WEBLINKS_FORM_EDIT_WEBLINK="Edit a Web Link" COM_WEBLINKS_FORM_SUBMIT_WEBLINK="Submit a Web Link" +COM_WEBLINKS_LEFT="Left" +COM_WEBLINKS_LINK="Web Link" +COM_WEBLINKS_NO_WEBLINKS="There are no Web Links in this category." +COM_WEBLINKS_NONE="None" +COM_WEBLINKS_NUM="# of links:" +COM_WEBLINKS_NUM_ITEMS="Links in categories" +COM_WEBLINKS_RIGHT="Right" COM_WEBLINKS_SAVE_SUCCESS="Web link successfully saved." COM_WEBLINKS_SUBMIT_SAVE_SUCCESS="Web Link successfully submitted." COM_WEBLINKS_WEB_LINKS="Web Links" diff --git a/src/language/en-GB/mod_weblinks.ini b/src/language/en-GB/mod_weblinks.ini index 6749b21..17cc698 100644 --- a/src/language/en-GB/mod_weblinks.ini +++ b/src/language/en-GB/mod_weblinks.ini @@ -5,29 +5,17 @@ MOD_WEBLINKS="Web Links" MOD_WEBLINKS_FIELD_CATEGORY_DESC="Choose the Web Links category to display." -MOD_WEBLINKS_FIELD_GROUPBY_DESC="If set to yes, web links will be grouped by subcategories." MOD_WEBLINKS_FIELD_GROUPBY_LABEL="Group By Subcategories" -MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_DESC="If set to yes, will show groups titles (valid only if grouping)." MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_LABEL="Show Group Title" -MOD_WEBLINKS_FIELD_GROUPBYORDERING_DESC="Ordering for the subcategories (valid only if grouping)." MOD_WEBLINKS_FIELD_GROUPBYORDERING_LABEL="Group Ordering" -MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_DESC="Direction for the subcategories (valid only if grouping)." MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_LABEL="Group Ordering Direction" -MOD_WEBLINKS_FIELD_COLUMNS_DESC="When grouping by subcategories, split into # columns." MOD_WEBLINKS_FIELD_COLUMNS_LABEL="Columns" -MOD_WEBLINKS_FIELD_COUNT_DESC="Number of Web Links to display." MOD_WEBLINKS_FIELD_COUNT_LABEL="Count" -MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded." MOD_WEBLINKS_FIELD_COUNTCLICKS_LABEL="Count Clicks" -MOD_WEBLINKS_FIELD_DESCRIPTION_DESC="Display Web Link description." MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL="Description" -MOD_WEBLINKS_FIELD_FOLLOW_DESC="Robots index - allow to follow or not." MOD_WEBLINKS_FIELD_FOLLOW_LABEL="Follow/No Follow" -MOD_WEBLINKS_FIELD_HITS_DESC="Show hits." MOD_WEBLINKS_FIELD_HITS_LABEL="Hits" -MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC="Set the ordering direction." MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL="Direction" -MOD_WEBLINKS_FIELD_ORDERING_DESC="Ordering for the Web Links." MOD_WEBLINKS_FIELD_ORDERING_LABEL="Ordering" MOD_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected." MOD_WEBLINKS_FIELD_TARGET_LABEL="Target Window" @@ -38,4 +26,4 @@ MOD_WEBLINKS_FIELD_VALUE_HITS="Hits" MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW="No follow" MOD_WEBLINKS_FIELD_VALUE_ORDER="Order" MOD_WEBLINKS_HITS="Hits" -MOD_WEBLINKS_XML_DESCRIPTION="This modules displays web links from a category defined in the Web Links component." +MOD_WEBLINKS_XML_DESCRIPTION="This modules displays web links from a category defined in the Web Links component." \ No newline at end of file diff --git a/src/media/com_weblinks/js/admin-weblinks-modal.js b/src/media/com_weblinks/js/admin-weblinks-modal.js index 35f7133..66fe802 100644 --- a/src/media/com_weblinks/js/admin-weblinks-modal.js +++ b/src/media/com_weblinks/js/admin-weblinks-modal.js @@ -14,8 +14,8 @@ var hreflang = '', editor, tag; if (!Joomla.getOptions('xtd-weblinks')) { - // Something went wrong! - window.parent.jModalClose(); + // Something went wrong + window.parent.Joomla.Modal.getCurrent().close(); return false; } @@ -28,14 +28,8 @@ tag = '' + title + ''; - /** Use the API, if editor supports it **/ - if (window.Joomla && window.Joomla.editors && Joomla.editors.instances && Joomla.editors.instances.hasOwnProperty(editor)) { - Joomla.editors.instances[editor].replaceSelection(tag) - } else { - window.parent.jInsertEditorText(tag, editor); - } - - window.parent.jModalClose(); + window.parent.Joomla.editors.instances[editor].replaceSelection(tag); + window.parent.Joomla.Modal.getCurrent().close(); }; document.addEventListener('DOMContentLoaded', function(){ diff --git a/src/modules/mod_weblinks/mod_weblinks.php b/src/modules/mod_weblinks/mod_weblinks.php index 7050b38..3da3d4a 100644 --- a/src/modules/mod_weblinks/mod_weblinks.php +++ b/src/modules/mod_weblinks/mod_weblinks.php @@ -9,16 +9,16 @@ defined('_JEXEC') or die; -// Include the weblinks functions only once -require_once __DIR__ . '/helper.php'; +use Joomla\CMS\Helper\ModuleHelper; +use Joomla\Module\Weblinks\Site\Helper\WeblinksHelper; -$list = ModWeblinksHelper::getList($params); +$list = WeblinksHelper::getList($params, $app); -if (!count($list)) +if (empty($list)) { return; } $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx')); -require JModuleHelper::getLayoutPath('mod_weblinks', $params->get('layout', 'default')); +require ModuleHelper::getLayoutPath('mod_weblinks', $params->get('layout', 'default')); diff --git a/src/modules/mod_weblinks/mod_weblinks.xml b/src/modules/mod_weblinks/mod_weblinks.xml index 4cffd6b..68283c3 100644 --- a/src/modules/mod_weblinks/mod_weblinks.xml +++ b/src/modules/mod_weblinks/mod_weblinks.xml @@ -9,6 +9,7 @@ www.joomla.org ##VERSION## MOD_WEBLINKS_XML_DESCRIPTION + Joomla\Module\Weblinks ##MODULE_FILES## mod_weblinks.php @@ -24,7 +25,6 @@ name="catid" type="category" label="JCATEGORY" - description="MOD_WEBLINKS_FIELD_CATEGORY_DESC" extension="com_weblinks" required="true" /> @@ -33,32 +33,29 @@ name="groupby" type="radio" label="MOD_WEBLINKS_FIELD_GROUPBY_LABEL" - description="MOD_WEBLINKS_FIELD_GROUPBY_DESC" - class="btn-group btn-group-yesno" + layout="joomla.form.field.radio.switcher" default="0" > - + - - + + @@ -70,7 +67,6 @@ name="groupby_direction" type="list" label="MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_LABEL" - description="MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_DESC" default="asc" showon="groupby:1" > @@ -82,7 +78,6 @@ name="groupby_columns" type="list" label="MOD_WEBLINKS_FIELD_COLUMNS_LABEL" - description="MOD_WEBLINKS_FIELD_COLUMNS_DESC" default="3" > @@ -96,7 +91,6 @@ name="count" type="text" label="MOD_WEBLINKS_FIELD_COUNT_LABEL" - description="MOD_WEBLINKS_FIELD_COUNT_DESC" default="5" /> @@ -104,7 +98,6 @@ name="ordering" type="list" label="MOD_WEBLINKS_FIELD_ORDERING_LABEL" - description="MOD_WEBLINKS_FIELD_ORDERING_DESC" default="title" > @@ -116,7 +109,6 @@ name="direction" type="list" label="MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL" - description="MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC" default="asc" > @@ -127,8 +119,7 @@ name="follow" type="list" label="MOD_WEBLINKS_FIELD_FOLLOW_LABEL" - description="MOD_WEBLINKS_FIELD_FOLLOW_DESC" - default="0" + default="follow" > @@ -138,37 +129,33 @@ name="description" type="radio" label="MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL" - description="MOD_WEBLINKS_FIELD_DESCRIPTION_DESC" - class="btn-group btn-group-yesno" + layout="joomla.form.field.radio.switcher" default="0" > - - + + - - + + - - - + +
@@ -177,22 +164,23 @@ name="layout" type="modulelayout" label="JFIELD_ALT_LAYOUT_LABEL" - description="JFIELD_ALT_MODULE_LAYOUT_DESC" + class="form-select" + validate="moduleLayout" /> + @@ -203,7 +191,6 @@ name="cache_time" type="text" label="COM_MODULES_FIELD_CACHE_TIME_LABEL" - description="COM_MODULES_FIELD_CACHE_TIME_DESC" default="900" /> diff --git a/src/modules/mod_weblinks/helper.php b/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php similarity index 70% rename from src/modules/mod_weblinks/helper.php rename to src/modules/mod_weblinks/src/Helper/WeblinksHelper.php index 78a27ce..91be7b1 100644 --- a/src/modules/mod_weblinks/helper.php +++ b/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php @@ -7,36 +7,40 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +namespace Joomla\Module\Weblinks\Site\Helper; + defined('_JEXEC') or die; -require_once JPATH_SITE . '/components/com_weblinks/helpers/route.php'; -require_once JPATH_SITE . '/components/com_weblinks/helpers/category.php'; - -JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_weblinks/models', 'WeblinksModel'); +use Joomla\CMS\Application\CMSApplicationInterface; +use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Router\Route; +use Joomla\Registry\Registry; /** * Helper for mod_weblinks * * @since 1.5 */ -class ModWeblinksHelper +class WeblinksHelper { /** - * Show online member names + * Retrieve list of weblinks * - * @param mixed &$params The parameters set in the administrator backend + * @param Registry $params The module parameters + * @param CMSApplicationInterface $app The application * * @return mixed Null if no weblinks based on input parameters else an array containing all the weblinks. * * @since 1.5 **/ - public static function getList(&$params) + public static function getList($params, $app) { - // Get an instance of the generic articles model - $model = JModelLegacy::getInstance('Category', 'WeblinksModel', array('ignore_request' => true)); + // @var \Joomla\Component\Weblinks\Site\Model\CategoryModel $model + + $model = $app->bootComponent('com_weblinks')->getMVCFactory() + ->createModel('Category', 'Site', ['ignore_request' => true]); // Set application parameters in model - $app = JFactory::getApplication(); $appParams = $app->getParams(); $model->setState('params', $appParams); @@ -48,27 +52,27 @@ class ModWeblinksHelper $model->setState('filter.publish_date', true); // Access filter - $access = !JComponentHelper::getParams('com_weblinks')->get('show_noauth'); + $access = !ComponentHelper::getParams('com_weblinks')->get('show_noauth'); $model->setState('filter.access', $access); $ordering = $params->get('ordering', 'ordering'); $model->setState('list.ordering', $ordering == 'order' ? 'ordering' : $ordering); $model->setState('list.direction', $params->get('direction', 'asc')); - $catid = (int) $params->get('catid', 0); + $catid = (int) $params->get('catid', 0); $model->setState('category.id', $catid); $model->setState('category.group', $params->get('groupby', 0)); $model->setState('category.ordering', $params->get('groupby_ordering', 'c.lft')); $model->setState('category.direction', $params->get('groupby_direction', 'ASC')); // Create query object - $db = JFactory::getDbo(); + $db = $model->getDbo(); $query = $db->getQuery(true); $case_when1 = ' CASE WHEN '; $case_when1 .= $query->charLength('a.alias', '!=', '0'); $case_when1 .= ' THEN '; - $a_id = $query->castAsChar('a.id'); + $a_id = $query->castAs('CHAR', 'a.id'); $case_when1 .= $query->concatenate(array($a_id, 'a.alias'), ':'); $case_when1 .= ' ELSE '; $case_when1 .= $a_id . ' END as slug'; @@ -76,14 +80,14 @@ class ModWeblinksHelper $case_when2 = ' CASE WHEN '; $case_when2 .= $query->charLength('c.alias', '!=', '0'); $case_when2 .= ' THEN '; - $c_id = $query->castAsChar('c.id'); + $c_id = $query->castAs('CHAR', 'c.id'); $case_when2 .= $query->concatenate(array($c_id, 'c.alias'), ':'); $case_when2 .= ' ELSE '; $case_when2 .= $c_id . ' END as catslug'; $model->setState( 'list.select', - 'a.*, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ',' . 'DATE_FORMAT(a.created, "%Y-%m-%d") AS created' + 'a.*, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ', a.created' ); $model->setState('filter.c.published', 1); @@ -99,7 +103,7 @@ class ModWeblinksHelper { if ($item->params->get('count_clicks', $params->get('count_clicks')) == 1) { - $item->link = JRoute::_('index.php?option=com_weblinks&task=weblink.go&catid=' . $item->catslug . '&id=' . $item->slug); + $item->link = Route::_('index.php?option=com_weblinks&task=weblink.go&catid=' . $item->catslug . '&id=' . $item->slug); } else { diff --git a/src/modules/mod_weblinks/tmpl/default.php b/src/modules/mod_weblinks/tmpl/default.php index 58c095d..8831c97 100644 --- a/src/modules/mod_weblinks/tmpl/default.php +++ b/src/modules/mod_weblinks/tmpl/default.php @@ -8,110 +8,139 @@ */ defined('_JEXEC') or die; + +use Joomla\CMS\HTML\HTMLHelper; ?> get('groupby', 0)) : ?> - + get('groupby_columns', 3); ?> $l->catid, 'title' => $l->category_title); ?> $cat) : ?> - + catid == $cat['catid']) : ?> - 1) : ?> - + 1) :?> +
- -
+ +
- get('groupby_showtitle', 1)) : ?> -

- - - 1) : ?> + get('groupby_showtitle', 1)) :?> + + ; +
    + +
  • +
    + link; ?> + params->get('target', $params->get('target'))) + { + case 1: + // Open in a new window + echo '' . + htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; + break; + case 2: + // Open in a popup window + $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . ''; + echo "" . + htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; + break; + case 3: + // Open in a modal window + $modalId = 'weblink-item-modal-' . $item->id; + $modalParams['title'] = htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8'); + $modalParams['url'] = $link; + $modalParams['height'] = '100%'; + $modalParams['width'] = '100%'; + $modalParams['bodyHeight'] = 70; + $modalParams['modalWidth'] = 80; + echo HTMLHelper::_('bootstrap.renderModal', $modalId, $modalParams); + echo ''; + break; + default: + // Open in parent window + echo '' . + htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; + break; + } + ?> +
    + get('description', 0) ? '
    ' . $item->description . '
    ' : '';?> + get('hits', 0)) : ?> +
    + hits . ' ' . Text::_('MOD_WEBLINKS_HITS'); ?> +
    + +
    • + +
+ 1) :?>
- +
-
    - -
  • - link; ?> - params->get('target', 3)) - { - case 1: - // Open in a new window - echo '' . - htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; - break; - - case 2: - // Open in a popup window - echo "" . - htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; - break; - - default: - // Open in parent window - echo '' . - htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; - break; - } - ?> - - get('description', 0)) : ?> - description); ?> - - - get('hits', 0)) : ?> - hits . ' ' . JText::_('MOD_WEBLINKS_HITS') . ')'; ?> - -
    • +
      + +
    • +
      + link; ?> + params->get('target', $params->get('target'))) + { + case 1: + // Open in a new window + echo '' . + htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; + break; + case 2: + // Open in a popup window + $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . ''; + echo "" . + htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; + break; + case 3: + // Open in a modal window + $modalId = 'weblink-item-modal-' . $item->id; + $modalParams['title'] = htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8'); + $modalParams['url'] = $link; + $modalParams['height'] = '100%'; + $modalParams['width'] = '100%'; + $modalParams['bodyHeight'] = 70; + $modalParams['modalWidth'] = 80; + echo HTMLHelper::_('bootstrap.renderModal', $modalId, $modalParams); + echo ''; + break; + default: + // Open in parent window + echo '' . + htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''; + break; + } + ?> +
      + get('description', 0) ? '
      ' . $item->description . '
      ' : '';?> + get('hits', 0)) : ?> +
      + hits . ' ' . Text::_('MOD_WEBLINKS_HITS'); ?> +
      + +
    diff --git a/src/plugins/editors-xtd/weblink/weblink.php b/src/plugins/editors-xtd/weblink/weblink.php index 67b6291..2d6f54c 100644 --- a/src/plugins/editors-xtd/weblink/weblink.php +++ b/src/plugins/editors-xtd/weblink/weblink.php @@ -9,13 +9,26 @@ defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Object\CMSObject; +use Joomla\CMS\Plugin\CMSPlugin; +use Joomla\CMS\Session\Session; + /** * Editor Web Link button * * @since __DEPLOY_VERSION__ */ -class PlgButtonWeblink extends JPlugin +class PlgButtonWeblink extends CMSPlugin { + /** + * Application object + * + * @var \Joomla\CMS\Application\CMSApplicationInterface + * @since 4.0.0 + */ + protected $app; + /** * Load the language file on instantiation. * @@ -35,7 +48,7 @@ class PlgButtonWeblink extends JPlugin */ public function onDisplay($name) { - $user = JFactory::getUser(); + $user = $this->app->getIdentity(); if ($user->authorise('core.create', 'com_weblinks') || $user->authorise('core.edit', 'com_weblinks') @@ -43,15 +56,24 @@ class PlgButtonWeblink extends JPlugin { // The URL for the weblinks list $link = 'index.php?option=com_weblinks&view=weblinks&layout=modal&tmpl=component&' - . JSession::getFormToken() . '=1&editor=' . $name; + . Session::getFormToken() . '=1&editor=' . $name; - $button = new JObject; + $button = new CMSObject; $button->modal = true; - $button->class = 'btn'; $button->link = $link; - $button->text = JText::_('PLG_EDITORS-XTD_WEBLINK_BUTTON_WEBLINK'); - $button->name = 'link'; - $button->options = "{handler: 'iframe', size: {x: 800, y: 500}}"; + $button->text = Text::_('PLG_EDITORS-XTD_WEBLINK_BUTTON_WEBLINK'); + $button->name = $this->_type . '_' . $this->_name; + $button->icon = 'globe'; + $button->iconSVG = ' + + '; + + $button->options = [ + 'height' => '300px', + 'width' => '800px', + 'bodyHeight' => '70', + 'modalWidth' => '80', + ]; return $button; } diff --git a/src/plugins/finder/weblinks/weblinks.php b/src/plugins/finder/weblinks/weblinks.php index 8dc5306..51c116e 100644 --- a/src/plugins/finder/weblinks/weblinks.php +++ b/src/plugins/finder/weblinks/weblinks.php @@ -9,17 +9,19 @@ defined('JPATH_BASE') or die; +use Joomla\CMS\Component\ComponentHelper; +use Joomla\Component\Finder\Administrator\Indexer\Adapter; +use Joomla\Component\Finder\Administrator\Indexer\Helper; +use Joomla\Component\Finder\Administrator\Indexer\Indexer; +use Joomla\Component\Weblinks\Site\Helper\RouteHelper; use Joomla\Registry\Registry; -// Load the base adapter. -JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'); - /** * Smart Search adapter for Joomla Web Links. * * @since 2.5 */ -class PlgFinderWeblinks extends FinderIndexerAdapter +class PlgFinderWeblinks extends Adapter { /** * The plugin identifier. @@ -139,7 +141,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter public function onFinderAfterSave($context, $row, $isNew) { // We only want to handle web links here. We need to handle front end and back end editing. - if ($context == 'com_weblinks.weblink' || $context == 'com_weblinks.form' ) + if ($context == 'com_weblinks.weblink' || $context == 'com_weblinks.form') { // Check if the access levels are different. if (!$isNew && $this->old_access != $row->access) @@ -245,7 +247,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter protected function index(FinderIndexerResult $item, $format = 'html') { // Check if the extension is enabled - if (JComponentHelper::isEnabled($this->extension) == false) + if (ComponentHelper::isEnabled($this->extension) == false) { return; } @@ -263,8 +265,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter // Build the necessary route and path information. $item->url = $this->getURL($item->id, $this->extension, $this->layout); - $item->route = WeblinksHelperRoute::getWeblinkRoute($item->slug, $item->catslug, $item->language); - $item->path = FinderIndexerHelper::getContentPath($item->route); + $item->route = RouteHelper::getWeblinkRoute($item->slug, $item->catslug, $item->language); /* * Add the meta-data processing instructions based on the newsfeeds @@ -274,12 +275,12 @@ class PlgFinderWeblinks extends FinderIndexerAdapter $item->metaauthor = $item->metadata->get('author'); // Handle the link to the meta-data. - $item->addInstruction(FinderIndexer::META_CONTEXT, 'link'); - $item->addInstruction(FinderIndexer::META_CONTEXT, 'metakey'); - $item->addInstruction(FinderIndexer::META_CONTEXT, 'metadesc'); - $item->addInstruction(FinderIndexer::META_CONTEXT, 'metaauthor'); - $item->addInstruction(FinderIndexer::META_CONTEXT, 'author'); - $item->addInstruction(FinderIndexer::META_CONTEXT, 'created_by_alias'); + $item->addInstruction(Indexer::META_CONTEXT, 'link'); + $item->addInstruction(Indexer::META_CONTEXT, 'metakey'); + $item->addInstruction(Indexer::META_CONTEXT, 'metadesc'); + $item->addInstruction(Indexer::META_CONTEXT, 'metaauthor'); + $item->addInstruction(Indexer::META_CONTEXT, 'author'); + $item->addInstruction(Indexer::META_CONTEXT, 'created_by_alias'); // Add the type taxonomy data. $item->addTaxonomy('Type', 'Web Link'); @@ -291,7 +292,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter $item->addTaxonomy('Language', $item->language); // Get content extras. - FinderIndexerHelper::getContentExtras($item); + Helper::getContentExtras($item); // Index the item. $this->indexer->index($item); @@ -306,9 +307,6 @@ class PlgFinderWeblinks extends FinderIndexerAdapter */ protected function setup() { - // Load dependent classes. - require_once JPATH_SITE . '/components/com_weblinks/helpers/route.php'; - return true; } @@ -323,7 +321,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter */ protected function getListQuery($query = null) { - $db = JFactory::getDbo(); + $db = $this->db; // Check if we can use the supplied SQL query. $query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true) @@ -338,7 +336,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter $case_when_item_alias = ' CASE WHEN '; $case_when_item_alias .= $query->charLength('a.alias', '!=', '0'); $case_when_item_alias .= ' THEN '; - $a_id = $query->castAsChar('a.id'); + $a_id = $query->castAs('CHAR', 'a.id'); $case_when_item_alias .= $query->concatenate(array($a_id, 'a.alias'), ':'); $case_when_item_alias .= ' ELSE '; $case_when_item_alias .= $a_id . ' END as slug'; @@ -347,7 +345,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter $case_when_category_alias = ' CASE WHEN '; $case_when_category_alias .= $query->charLength('c.alias', '!=', '0'); $case_when_category_alias .= ' THEN '; - $c_id = $query->castAsChar('c.id'); + $c_id = $query->castAs('CHAR', 'c.id'); $case_when_category_alias .= $query->concatenate(array($c_id, 'c.alias'), ':'); $case_when_category_alias .= ' ELSE '; $case_when_category_alias .= $c_id . ' END as catslug'; diff --git a/src/plugins/search/weblinks/weblinks.php b/src/plugins/search/weblinks/weblinks.php index 9231b2f..018aa3d 100644 --- a/src/plugins/search/weblinks/weblinks.php +++ b/src/plugins/search/weblinks/weblinks.php @@ -9,15 +9,34 @@ defined('_JEXEC') or die; -require_once JPATH_SITE . '/components/com_weblinks/helpers/route.php'; +use Joomla\CMS\Language\Multilanguage; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Plugin\CMSPlugin; +use Joomla\Component\Weblinks\Site\Helper\RouteHelper; /** * Weblinks search plugin. * * @since 1.6 */ -class PlgSearchWeblinks extends JPlugin +class PlgSearchWeblinks extends CMSPlugin { + /** + * Application object + * + * @var \Joomla\CMS\Application\CMSApplicationInterface + * @since 4.0.0 + */ + protected $app; + + /** + * Database Driver Instance + * + * @var \Joomla\Database\DatabaseDriver + * @since 4.0.0 + */ + protected $db; + /** * Load the language file on instantiation. * @@ -59,8 +78,8 @@ class PlgSearchWeblinks extends JPlugin */ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null) { - $db = JFactory::getDbo(); - $groups = implode(',', JFactory::getUser()->getAuthorisedViewLevels()); + $db = $this->db; + $groups = implode(',', $this->app->getIdentity()->getAuthorisedViewLevels()); $searchText = $text; @@ -99,7 +118,7 @@ class PlgSearchWeblinks extends JPlugin return array(); } - $searchWeblinks = JText::_('PLG_SEARCH_WEBLINKS'); + $searchWeblinks = Text::_('PLG_SEARCH_WEBLINKS'); switch ($phrase) { @@ -161,7 +180,7 @@ class PlgSearchWeblinks extends JPlugin $case_when = ' CASE WHEN '; $case_when .= $query->charLength('a.alias', '!=', '0'); $case_when .= ' THEN '; - $a_id = $query->castAsChar('a.id'); + $a_id = $query->castAs('CHAR', 'a.id'); $case_when .= $query->concatenate(array($a_id, 'a.alias'), ':'); $case_when .= ' ELSE '; $case_when .= $a_id . ' END as slug'; @@ -169,23 +188,23 @@ class PlgSearchWeblinks extends JPlugin $case_when1 = ' CASE WHEN '; $case_when1 .= $query->charLength('c.alias', '!=', '0'); $case_when1 .= ' THEN '; - $c_id = $query->castAsChar('c.id'); + $c_id = $query->castAs('CHAR', 'c.id'); $case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':'); $case_when1 .= ' ELSE '; $case_when1 .= $c_id . ' END as catslug'; $query->select('a.title AS title, a.created AS created, a.url, a.description AS text, ' . $case_when . "," . $case_when1) - ->select($query->concatenate(array($db->quote($searchWeblinks), 'c.title'), " / ") . ' AS section') - ->select('\'1\' AS browsernav') - ->from('#__weblinks AS a') - ->join('INNER', '#__categories as c ON c.id = a.catid') - ->where('(' . $where . ') AND a.state IN (' . implode(',', $state) . ') AND c.published = 1 AND c.access IN (' . $groups . ')') - ->order($order); + ->select($query->concatenate(array($db->quote($searchWeblinks), 'c.title'), " / ") . ' AS section') + ->select('\'1\' AS browsernav') + ->from('#__weblinks AS a') + ->join('INNER', '#__categories as c ON c.id = a.catid') + ->where('(' . $where . ') AND a.state IN (' . implode(',', $state) . ') AND c.published = 1 AND c.access IN (' . $groups . ')') + ->order($order); // Filter by language. - if (JFactory::getApplication()->isClient('site') && JLanguageMultilang::isEnabled()) + if ($this->app->isClient('site') && Multilanguage::isEnabled()) { - $tag = JFactory::getLanguage()->getTag(); + $tag = $this->app->getLanguage()->getTag(); $query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')') ->where('c.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')'); } @@ -199,7 +218,7 @@ class PlgSearchWeblinks extends JPlugin { foreach ($rows as $key => $row) { - $rows[$key]->href = WeblinksHelperRoute::getWeblinkRoute($row->slug, $row->catslug); + $rows[$key]->href = RouteHelper::getWeblinkRoute($row->slug, $row->catslug); } foreach ($rows as $weblink) diff --git a/src/plugins/search/weblinks/weblinks.xml b/src/plugins/search/weblinks/weblinks.xml index 47a3cc7..dd16c4f 100644 --- a/src/plugins/search/weblinks/weblinks.xml +++ b/src/plugins/search/weblinks/weblinks.xml @@ -32,7 +32,7 @@ type="radio" label="JFIELD_PLG_SEARCH_ALL_LABEL" description="JFIELD_PLG_SEARCH_ALL_DESC" - class="btn-group btn-group-yesno" + layout="joomla.form.field.radio.switcher" default="0" > @@ -44,7 +44,7 @@ type="radio" label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL" description="JFIELD_PLG_SEARCH_ARCHIVED_DESC" - class="btn-group btn-group-yesno" + layout="joomla.form.field.radio.switcher" default="0" > diff --git a/src/plugins/system/weblinks/weblinks.php b/src/plugins/system/weblinks/weblinks.php index ef3f33a..76ffde5 100644 --- a/src/plugins/system/weblinks/weblinks.php +++ b/src/plugins/system/weblinks/weblinks.php @@ -9,13 +9,25 @@ defined('_JEXEC') or die; +use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Plugin\CMSPlugin; + /** * System plugin for Joomla Web Links. * * @since __DEPLOY_VERSION__ */ -class PlgSystemWeblinks extends JPlugin +class PlgSystemWeblinks extends CMSPlugin { + /** + * Database Driver Instance + * + * @var \Joomla\Database\DatabaseDriver + * @since 4.0.0 + */ + protected $db; + /** * Load the language file on instantiation. * @@ -51,17 +63,16 @@ class PlgSystemWeblinks extends JPlugin return array(); } - if (!JComponentHelper::isEnabled('com_weblinks')) + if (!ComponentHelper::isEnabled('com_weblinks')) { return array(); } - $db = JFactory::getDbo(); - $query = $db->getQuery(true) + $query = $this->db->getQuery(true) ->select('COUNT(id) AS count_links') ->from('#__weblinks') ->where('state = 1'); - $webLinks = $db->setQuery($query)->loadResult(); + $webLinks = $this->db->setQuery($query)->loadResult(); if (!$webLinks) { @@ -69,7 +80,7 @@ class PlgSystemWeblinks extends JPlugin } return array(array( - 'title' => JText::_('PLG_SYSTEM_WEBLINKS_STATISTICS'), + 'title' => Text::_('PLG_SYSTEM_WEBLINKS_STATISTICS'), 'icon' => 'out-2', 'data' => $webLinks ));