Merge branch 'release/3.4.0'

administrator/components/com_schuweb_sitemap/controller.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @version     $Id$
+ * @version     sw.build.version
  * @copyright   Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @author      Guillermo Vargas ([email protected])
@@ -22,8 +22,6 @@ class SchuWeb_SitemapController extends JControllerLegacy
     function __construct()
     {
         parent::__construct();
-
-        $this->registerTask('navigator-links', 'navigatorLinks');
     }
 
     /**
@@ -59,74 +57,4 @@ public function display($cachable = false, $urlparams = false)
 
         }
     }
-
-    function navigator()
-    {
-        $document = JFactory::getDocument();
-        $app = JFactory::getApplication('administrator');
-        $jinput = $app->input;
-
-        $id = $jinput->getInt('sitemap', 0);
-        if (!$id) {
-            $id = $this->getDefaultSitemapId();
-        }
-
-        if (!$id) {
-            $app->enqueueMessage(JText::_('SCHUWEB_SITEMAP_Not_Sitemap_Selected'), 'warning');
-            return false;
-        }
-
-        $app->setUserState('com_schuweb_sitemap.edit.sitemap.id', $id);
-
-        $view = $this->getView('sitemap', $document->getType());
-        $model = $this->getModel('Sitemap');
-        $view->setLayout('navigator');
-        $view->setModel($model, true);
-
-        // Push document object into the view.
-        $view->document = &$document;
-
-        $view->navigator();
-    }
-
-    function navigatorLinks()
-    {
-        $document = JFactory::getDocument();
-        $app = JFactory::getApplication('administrator');
-        $jinput = $app->input;
-
-        $id = $jinput->getInt('sitemap', 0);
-        if (!$id) {
-            $id = $this->getDefaultSitemapId();
-        }
-
-        if (!$id) {
-            $app->enqueueMessage(JText::_('SCHUWEB_SITEMAP_Not_Sitemap_Selected'), 'warning');
-            return false;
-        }
-
-        $app->setUserState('com_schuweb_sitemap.edit.sitemap.id', $id);
-
-        $view = $this->getView('sitemap', $document->getType());
-        $model = $this->getModel('Sitemap');
-        $view->setLayout('navigator');
-        $view->setModel($model, true);
-
-        // Push document object into the view.
-        $view->document = &$document;
-
-        $view->navigatorLinks();
-    }
-
-    private function getDefaultSitemapId()
-    {
-        $db = JFactory::getDBO();
-        $query = $db->getQuery(true);
-        $query->select('id');
-        $query->from($db->quoteName('#__schuweb_sitemap'));
-        $query->where('is_default=1');
-        $db->setQuery($query);
-        return $db->loadResult();
-    }
-
 }

administrator/components/com_schuweb_sitemap/controllers/sitemap.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @version     $Id$
+ * @version     sw.build.version
  * @copyright   Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @author      Guillermo Vargas ([email protected])

administrator/components/com_schuweb_sitemap/controllers/sitemaps.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @version     $Id$
+ * @version     sw.build.version
  * @copyright   Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @author      Guillermo Vargas ([email protected])

administrator/components/com_schuweb_sitemap/forms/filter_sitemaps.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form addfieldprefix="Joomla\Component\Newsfeeds\Administrator\Field">
+
+	<fields name="filter">
+
+		<field
+			name="search"
+			type="text"
+			inputmode="search"
+			description="SCHUWEB_SITEMAP_Filter_Search_Desc"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="JSTATUS"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JGRID_HEADING_ACCESS"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+	</fields>
+
+	<fields name="list">
+
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.name ASC"
+			validate="options"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="access_level ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="access_level DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIST_LIMIT"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

administrator/components/com_schuweb_sitemap/helpers/html/schuweb_sitemap.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @version     $Id$
+ * @version     sw.build.version
  * @copyright   Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @author      Guillermo Vargas ([email protected])

administrator/components/com_schuweb_sitemap/helpers/schuweb_sitemap.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @version     $Id$
+ * @version     sw.build.version
  * @copyright   Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @author      Guillermo Vargas ([email protected])
@@ -19,23 +19,6 @@
  */
 class SchuWeb_SitemapHelper
 {
-    /**
-     * Configure the Linkbar.
-     *
-     * @param    string  The name of the active view.
-     */
-    public static function addSubmenu($vName)
-    {
-        JHtmlSidebar::addEntry(
-            JText::_('SCHUWEB_SITEMAP_Submenu_Sitemaps'),
-            'index.php?option=com_schuweb_sitemap',
-            $vName == 'sitemaps'
-        );
-        JHtmlSidebar::addEntry(
-            JText::_('SCHUWEB_SITEMAP_Submenu_Extensions'),
-            'index.php?option=com_plugins&view=plugins&filter_folder=schuweb_sitemap',
-            $vName == 'extensions');
-    }
 	/**
 	 * Returns a list of installed extension, where SchuWeb sitemap has the fitting plugin installed
 	 *

administrator/components/com_schuweb_sitemap/language/cs-CZ/cs-CZ.com_schuweb_sitemap.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; SchuWeb Sitemap component
 ; Guillermo Vargas ([email protected])
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.

administrator/components/com_schuweb_sitemap/language/cs-CZ/cs-CZ.com_schuweb_sitemap.sys.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
 ; GNU General Public License version 2 or later; see LICENSE.txt
 ; Guillermo Vargas ([email protected])
@@ -16,7 +16,7 @@ COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="XML verze"
 COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Zobrazí mapu stránek v XML formátu"
 
 COM_SCHUWEB_SITEMAP_SELECT_A_SITEMAP="Zvolte mapu stránek"
-COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP_BUTTON="Změnit"
+
 COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP="Zvolte mapu stránek ze seznamu"
 
 COM_INSTALLER_TYPE_SCHUWEB_SITEMAP_EXT="Rozšíření SchuWeb Sitemap"

administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; SchuWeb Sitemap component
 ; Sven Schultschik (https://extensions.schultschik.com)
 ; Guillermo Vargas ([email protected])

administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.sys.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
 ; Copyright (C) 2019 - 2020 SchuWebExt Sven Schultschik. All rights reserved.
 ; GNU General Public License version 2 or later; see LICENSE.txt
@@ -17,7 +17,10 @@ COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Display an Site map in XML fo
 
 COM_SCHUWEB_SITEMAP_SELECT_A_SITEMAP="Choose a site map"
 COM_SCHUWEB_SITEMAP_SELECT_A_SITEMAP_DESC="Select the sitemap you want to display with this menu item."
-COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP_BUTTON="Change"
+
 COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP="Select a site map from the list"
 
-COM_INSTALLER_TYPE_SCHUWEB_SITEMAP_EXT="SchuWeb Sitemap Extension"
+COM_INSTALLER_TYPE_SCHUWEB_SITEMAP_EXT="SchuWeb Sitemap Extension"
+
+COM_SCHUWEB_SITEMAP_POSTFLIGHT_PLUGIN_UNINSTALL_ERR="Couldn't uninstall plugin %s. Please uninstall it manually and check our website for an updated version."
+COM_SCHUWEB_SITEMAP_POSTFLIGHT_PLUGIN_UNINSTALL_MANIFEST_ERR="Couldn't read manifest of plugin %s. Please uninstall it manually and check our website for an updated version."

administrator/components/com_schuweb_sitemap/language/es-ES/es-ES.com_schuweb_sitemap.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; SchuWeb Sitemap component
 ; Guillermo Vargas ([email protected])
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.

administrator/components/com_schuweb_sitemap/language/es-ES/es-ES.com_schuweb_sitemap.sys.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
 ; GNU General Public License version 2 or later; see LICENSE.txt
 ; Guillermo Vargas ([email protected])
@@ -16,7 +16,7 @@ COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="Mapa de Sitio XML"
 COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Mustra un mapa de sitio en formato XML"
 
 COM_SCHUWEB_SITEMAP_SELECT_A_SITEMAP="Seleccione un mapa de sitio"
-COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP_BUTTON="Cambiar"
+
 COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP="Seleccionar un mapa de sitio de una lista"
 
 COM_INSTALLER_TYPE_SCHUWEB_SITEMAP_EXT="SchuWeb Sitemap Extension"

administrator/components/com_schuweb_sitemap/language/fa-IR/fa-IR.com_schuweb_sitemap.sys.ini

@@ -20,7 +20,7 @@ COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="نقشه سایت نسخه X
 COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="نمایش نقشه سایت در فرمت XML"
 
 COM_SCHUWEB_SITEMAP_SELECT_A_SITEMAP="انتخاب نقشه سایت"
-COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP_BUTTON="تغییر"
+
 COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP="انتخاب نقشه سایت از لیست"
 
 COM_INSTALLER_TYPE_SCHUWEB_SITEMAP_EXT="افزونه نقشه سایت"

administrator/components/com_schuweb_sitemap/language/nl-NL/nl-NL.com_schuweb_sitemap.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; SchuWeb Sitemap component
 ; Guillermo Vargas ([email protected])
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.

administrator/components/com_schuweb_sitemap/language/nl-NL/nl-NL.com_schuweb_sitemap.sys.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
 ; GNU General Public License version 2 or later; see LICENSE.txt
 ; Guillermo Vargas ([email protected])
@@ -16,7 +16,7 @@ COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="XML sitemap"
 COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Toon een sitemap in XML formaat"
 
 COM_SCHUWEB_SITEMAP_SELECT_A_SITEMAP="Kies een sitemap"
-COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP_BUTTON="Wijzig"
+
 COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP="Selecteer een sitemap uit de lijst"
 
 COM_INSTALLER_TYPE_SCHUWEB_SITEMAP_EXT="SchuWeb Sitemap extensie"

administrator/components/com_schuweb_sitemap/language/ru-RU/ru-RU.com_schuweb_sitemap.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; SchuWeb Sitemap component
 ; Guillermo Vargas ([email protected])
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.

administrator/components/com_schuweb_sitemap/language/ru-RU/ru-RU.com_schuweb_sitemap.sys.ini

@@ -1,4 +1,4 @@
-; $Id$
+; sw.build.version
 ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved.
 ; GNU General Public License version 2 or later; see LICENSE.txt
 ; Guillermo Vargas ([email protected])
@@ -16,7 +16,7 @@ COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="Карта сайта в XML
 COM_SCHUWEB_SITEMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Отображать карту сайта в XML формате"
 
 COM_SCHUWEB_SITEMAP_SELECT_A_SITEMAP="Выберите карту сайта"
-COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP_BUTTON="Изменить"
+
 COM_SCHUWEB_SITEMAP_CHANGE_SITEMAP="Выберите карту сайта из списка"
 
 COM_INSTALLER_TYPE_SCHUWEB_SITEMAP_EXT="SchuWeb Sitemap расширение"