diff --git a/administrator/components/com_schuweb_sitemap/controllers/sitemaps.php b/administrator/components/com_schuweb_sitemap/controllers/sitemaps.php index bbdb9f6..d8789f6 100644 --- a/administrator/components/com_schuweb_sitemap/controllers/sitemaps.php +++ b/administrator/components/com_schuweb_sitemap/controllers/sitemaps.php @@ -42,17 +42,16 @@ public function __construct($config = array()) */ function setDefault() { - $app = JFactory::$application; - $input = $app->input; + $input = $this->input; // Check for request forgeries - $input->checkToken() or die('Invalid Token'); + $this->checkToken(); // Get items to publish from the request. $cid = $input->getVar('cid', 0, '', 'array'); $id = @$cid[0]; if (!$id) { - $app->enqueueMessage(JText::_('Select an item to set as default'), 'warning'); + $this->enqueueMessage(JText::_('Select an item to set as default'), 'warning'); } else { @@ -61,7 +60,7 @@ function setDefault() // Publish the items. if (!$model->setDefault($id)) { - $app->enqueueMessage($model->getError(), 'warning'); + $this->enqueueMessage($model->getError(), 'warning'); } } diff --git a/administrator/components/com_schuweb_sitemap/helpers/html/schuweb_sitemap.php b/administrator/components/com_schuweb_sitemap/helpers/html/schuweb_sitemap.php index 830a42c..1ebd711 100644 --- a/administrator/components/com_schuweb_sitemap/helpers/html/schuweb_sitemap.php +++ b/administrator/components/com_schuweb_sitemap/helpers/html/schuweb_sitemap.php @@ -12,8 +12,10 @@ JTable::addIncludePath( JPATH_COMPONENT . '/tables' ); /** - * @package Xmap + * @package Joomla * @subpackage com_schuweb_sitemap + * + * @since 2 */ abstract class JHtmlSchuWeb_Sitemap { @@ -22,6 +24,8 @@ abstract class JHtmlSchuWeb_Sitemap * @param string $name * @param string $value * @param int $j + * @return JHtmlSelect + * @since 2 */ public static function priorities($name, $value = '0.5', $j) { @@ -32,11 +36,14 @@ public static function priorities($name, $value = '0.5', $j) return JHtml::_('select.genericlist', $options, $name, null, 'value', 'text', $value, $name.$j); } - /** - * @param string $name - * @param string $value - * @param int $j - */ + /** + * @param string $name + * @param string $value + * @param int $j + * + * @return JHtmlSelect + * @since 2 + */ public static function changefrequency($name, $value = 'weekly', $j) { // Array of options diff --git a/administrator/components/com_schuweb_sitemap/helpers/schuweb_sitemap.php b/administrator/components/com_schuweb_sitemap/helpers/schuweb_sitemap.php index abfb067..170f6bb 100644 --- a/administrator/components/com_schuweb_sitemap/helpers/schuweb_sitemap.php +++ b/administrator/components/com_schuweb_sitemap/helpers/schuweb_sitemap.php @@ -36,4 +36,27 @@ public static function addSubmenu($vName) '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 + * + * @return mixed + * + * @since __DEPLOY_VERSION__ + */ + public static function getExtensionsList() + { + $db = JFactory::getDbo(); + $query = $db->getQuery(true); + + $query->select('e.*') + ->from($db->quoteName('#__extensions') . 'AS e') + ->join('INNER', '#__extensions AS p ON e.element=p.element and p.enabled=0 and p.type=\'plugin\' and p.folder=\'schuweb_sitemap\'') + ->where('e.type=\'component\' and e.enabled=1'); + + $db->setQuery($query); + $extensions = $db->loadObjectList(); + + return $extensions; + } + } diff --git a/administrator/components/com_schuweb_sitemap/language/cs-CZ/cs-CZ.com_schuweb_sitemap.ini b/administrator/components/com_schuweb_sitemap/language/cs-CZ/cs-CZ.com_schuweb_sitemap.ini index d79ed14..0803280 100644 --- a/administrator/components/com_schuweb_sitemap/language/cs-CZ/cs-CZ.com_schuweb_sitemap.ini +++ b/administrator/components/com_schuweb_sitemap/language/cs-CZ/cs-CZ.com_schuweb_sitemap.ini @@ -1,14 +1,14 @@ ; $Id$ -; Xmap component +; SchuWeb Sitemap component ; Guillermo Vargas (guille@vargas.co.cr) ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. ; GNU General Public License version 2 or later; see LICENSE.txt ; ; Component Instalation strings -SCHUWEB_SITEMAP_INSTALLING_XMAP="Instalace Xmap - Generátoru map stránek pro Joomla!" -SCHUWEB_SITEMAP_UPGRADING_XMAP="Aktualizace Xmap - Generátoru map stránek pro Joomla!" -SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Odinstalace rozšíření pro Xmap" +SCHUWEB_SITEMAP_INSTALLING_SCHUWEB_SITEMAP="Instalace SchuWeb Sitemap - Generátoru map stránek pro Joomla!" +SCHUWEB_SITEMAP_UPGRADING_SCHUWEB_SITEMAP="Aktualizace SchuWeb Sitemap - Generátoru map stránek pro Joomla!" +SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Odinstalace rozšíření pro SchuWeb Sitemap" SCHUWEB_SITEMAP_INSTALLED_EXTENSION_X="Instalace rozšíření %s" SCHUWEB_SITEMAP_NOT_INSTALLED_EXTENSION_X="Nepodařilo se nainstalovat rozšíření pro %s" SCHUWEB_SITEMAP_INSTALL_ERROR_EXTENSION="Chyba při instalaci rozšíření" @@ -46,7 +46,7 @@ SCHUWEB_SITEMAP_NEWS_LINK="News verze" SCHUWEB_SITEMAP_NEWS_LINK_TOOLTIP="Přejít “News” verzi mapy stránek. Použijte toto URL pro Google News." -SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="Byla nalezena následuící rozšíření Xmap, která jsou zakázaná. Je nutné je ručně povolit ve Správci pluginů: %s" +SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="Byla nalezena následuící rozšíření SchuWeb Sitemap, která jsou zakázaná. Je nutné je ručně povolit ve Správci pluginů: %s" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED="%d map stránek bylo zneveřejněno." COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED_1="Mapa stránek byla zneveřejněna." COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_PUBLISHED="%d map stránek bylo zveřejněno." @@ -89,7 +89,7 @@ SCHUWEB_SITEMAP_EXTENSION_AUTHOR_EMAIL="Email autora" SCHUWEB_SITEMAP_EXTENSION_AUTHOR_WEBSITE="Stránky autora" SCHUWEB_SITEMAP_EXTENSION_DESCRIPTION="Popis" -SCHUWEB_SITEMAP_DESC_EXTENSIONS="Seznam instalovaných rozšíření pro Xmap" +SCHUWEB_SITEMAP_DESC_EXTENSIONS="Seznam instalovaných rozšíření pro SchuWeb Sitemap" SCHUWEB_SITEMAP_HEADING_AUTHOR="Autor" SCHUWEB_SITEMAP_HEADING_DATE="Datum" SCHUWEB_SITEMAP_HEADING_FOLDER="Typ" diff --git a/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.ini b/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.ini index 1dcc8f0..134dff8 100755 --- a/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.ini +++ b/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.ini @@ -8,9 +8,9 @@ ; ; Component Instalation strings -SCHUWEB_SITEMAP_INSTALLING_XMAP="Installing Xmap component - The site map generator for Joomla!" -SCHUWEB_SITEMAP_UPGRADING_XMAP="Upgrading Xmap component - The site map generator for Joomla!" -SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Unistalling Xmap's extensions" +SCHUWEB_SITEMAP_INSTALLING_SCHUWEB_SITEMAP = "Installing SchuWeb Sitemap component - The site map generator for Joomla!" +SCHUWEB_SITEMAP_UPGRADING_SCHUWEB_SITEMAP = "Upgrading SchuWeb Sitemap component - The site map generator for Joomla!" +SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Unistalling SchuWeb Sitemap's extensions" SCHUWEB_SITEMAP_INSTALLED_EXTENSION_X="Installing %s extension" SCHUWEB_SITEMAP_NOT_INSTALLED_EXTENSION_X="It was not possible to install the extension for %s" SCHUWEB_SITEMAP_INSTALL_ERROR_EXTENSION="Error installing extension" @@ -51,7 +51,7 @@ SCHUWEB_SITEMAP_NEWS_LINK_TOOLTIP="Go to the “News” version of the s SCHUWEB_SITEMAP_IMAGES_LINK="Images Sitemap" SCHUWEB_SITEMAP_IMAGES_LINK_TOOLTIP="Go to the “Images” version of the sitemap, use this url to submit your sitemap to Google and other search engines." -SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="Xmap have detected that the following extensions can help you to get more content in your site map but they are disabled, you have to manually enable them visiting the extensions manager: %s" +SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="SchuWeb Sitemap have detected that the following extensions can help you to get more content in your site map but they are disabled, you have to manually enable them visiting the extensions manager: %s" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED="%d sitemaps successfully unpublished" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d sitemap successfully unpublished" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_PUBLISHED="%d sitemaps successfully published" @@ -84,7 +84,7 @@ SCHUWEB_SITEMAP_ATTRIBS_NEWS_PUBLICATION_NAME_DESC="This is the name of the news SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_LABEL="Posts keywords" SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_DESC="Comma separated list of keywords to describe your posts. Default to the post's category title." SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_LABEL="Link to author" -SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Include the link to Xmap's home at the bottom of the HTML site map." +SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Include the link to SchuWeb Sitemap's home at the bottom of the HTML site map." SCHUWEB_SITEMAP_CACHE_CONTROL="HTTP Cache-Control" SCHUWEB_SITEMAP_CACHE_CONTROL_CHANGE="Cache active" SCHUWEB_SITEMAP_CACHE_CONTROL_DESC="If the sitemap should be revaildate each time it's called, choose no." @@ -109,7 +109,7 @@ SCHUWEB_SITEMAP_EXTENSION_AUTHOR_EMAIL="Author's Email" SCHUWEB_SITEMAP_EXTENSION_AUTHOR_WEBSITE="Author's website" SCHUWEB_SITEMAP_EXTENSION_DESCRIPTION="Description" -SCHUWEB_SITEMAP_DESC_EXTENSIONS="List of installed Xmap Extensions" +SCHUWEB_SITEMAP_DESC_EXTENSIONS="List of installed SchuWeb Sitemap Extensions" SCHUWEB_SITEMAP_HEADING_AUTHOR="Author" SCHUWEB_SITEMAP_HEADING_DATE="Date" SCHUWEB_SITEMAP_HEADING_FOLDER="Folder" diff --git a/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.sys.ini b/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.sys.ini index 8a845a6..3b4d47d 100644 --- a/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.sys.ini +++ b/administrator/components/com_schuweb_sitemap/language/en-GB/en-GB.com_schuweb_sitemap.sys.ini @@ -20,7 +20,7 @@ COM_SCHUWEB_SITEMAP_SELECT_A_SITEMAP="A site map" 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="Xmap Extension" +COM_INSTALLER_TYPE_SCHUWEB_SITEMAP_EXT="SchuWeb Sitemap Extension" COM_SCHUWEB_SITEMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Sitemap Settings" -COM_SCHUWEB_SITEMAP_INCLUDE_CSS_LABEL="Include Xmap's Style" +COM_SCHUWEB_SITEMAP_INCLUDE_CSS_LABEL="Include SchuWeb Sitemap's Style" COM_SCHUWEB_SITEMAP_INCLUDE_CSS_DESC="Select yes to include the CSS file with the styles for the sitemap" \ No newline at end of file diff --git a/administrator/components/com_schuweb_sitemap/language/es-ES/es-ES.com_schuweb_sitemap.ini b/administrator/components/com_schuweb_sitemap/language/es-ES/es-ES.com_schuweb_sitemap.ini index fb5e4b1..f2baf2c 100644 --- a/administrator/components/com_schuweb_sitemap/language/es-ES/es-ES.com_schuweb_sitemap.ini +++ b/administrator/components/com_schuweb_sitemap/language/es-ES/es-ES.com_schuweb_sitemap.ini @@ -1,14 +1,14 @@ ; $Id$ -; Xmap component +; SchuWeb Sitemap component ; Guillermo Vargas (guille@vargas.co.cr) ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. ; GNU General Public License version 2 or later; see LICENSE.txt ; ; Component Instalation strings -SCHUWEB_SITEMAP_INSTALLING_XMAP="Installing Xmap component - The site map generator for Joomla!" -SCHUWEB_SITEMAP_UPGRADING_XMAP="Upgrading Xmap component - The site map generator for Joomla!" -SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Unistalling Xmap's extensions" +SCHUWEB_SITEMAP_INSTALLING_SCHUWEB_SITEMAP="Installing SchuWeb Sitemap component - The site map generator for Joomla!" +SCHUWEB_SITEMAP_UPGRADING_SCHUWEB_SITEMAP="Upgrading SchuWeb Sitemap component - The site map generator for Joomla!" +SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Unistalling SchuWeb Sitemap's extensions" SCHUWEB_SITEMAP_INSTALLED_EXTENSION_X="Installing %s extension" SCHUWEB_SITEMAP_NOT_INSTALLED_EXTENSION_X="It was not possible to install the extension for %s" @@ -45,7 +45,7 @@ SCHUWEB_SITEMAP_NEWS_LINK_TOOLTIP="Ir a la versión “News” del mapa SCHUWEB_SITEMAP_IMAGES_LINK="Images Sitemap" SCHUWEB_SITEMAP_IMAGES_LINK_TOOLTIP="Ir a la versión “Images” del mapa del sitio, utilice este URL para agregar su mapa de sitio en Google u otros motores de búsqueda." -SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="Xmap ha detectado que las siguientes extensiones podrían ayudarle a agregar mas contenido en su mapa de sitio pero están deshabilitadas. Es necesario que las habilite manualmente visitando el administrador de extensiones: %s" +SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="SchuWeb Sitemap ha detectado que las siguientes extensiones podrían ayudarle a agregar mas contenido en su mapa de sitio pero están deshabilitadas. Es necesario que las habilite manualmente visitando el administrador de extensiones: %s" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED="%d mapas de sitio se han despublicado correctamente" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d mapa de sitio se ha despublicado correctamente" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_PUBLISHED="%d mapas de sitio se han publicado correctamente" @@ -77,7 +77,7 @@ SCHUWEB_SITEMAP_ATTRIBS_NEWS_PUBLICATION_NAME_DESC="Este es el nombre de la publ SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_LABEL="Posts keywords" SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_DESC="Comma separated list of keywords to describe your posts. Default to the post's category title." SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_LABEL="Enlace al autor" -SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Incluir un enlace (link) al sitio de Xmap al pie del site map HTML." +SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Incluir un enlace (link) al sitio de SchuWeb Sitemap al pie del site map HTML." ; Extension edit page SCHUWEB_SITEMAP_PAGE_EDIT_EXTENSION="Editar Extensión" @@ -89,7 +89,7 @@ SCHUWEB_SITEMAP_EXTENSION_AUTHOR_EMAIL="Email del Autor" SCHUWEB_SITEMAP_EXTENSION_AUTHOR_WEBSITE="Sitio WEB del Autor" SCHUWEB_SITEMAP_EXTENSION_DESCRIPTION="Descripción" -SCHUWEB_SITEMAP_DESC_EXTENSIONS="Lista de extensiones para Xmap instaladas" +SCHUWEB_SITEMAP_DESC_EXTENSIONS="Lista de extensiones para SchuWeb Sitemap instaladas" SCHUWEB_SITEMAP_HEADING_AUTHOR="Autor" SCHUWEB_SITEMAP_HEADING_DATE="Fecha" SCHUWEB_SITEMAP_HEADING_FOLDER="Carpeta" diff --git a/administrator/components/com_schuweb_sitemap/language/fa-IR/fa-IR.com_schuweb_sitemap.ini b/administrator/components/com_schuweb_sitemap/language/fa-IR/fa-IR.com_schuweb_sitemap.ini index 2c4c035..44c4b8c 100644 --- a/administrator/components/com_schuweb_sitemap/language/fa-IR/fa-IR.com_schuweb_sitemap.ini +++ b/administrator/components/com_schuweb_sitemap/language/fa-IR/fa-IR.com_schuweb_sitemap.ini @@ -1,5 +1,5 @@ ; @package Joomla 2.5 -; @subpackage Xmap +; @subpackage SchuWeb Sitemap ; @description فارسی - ایران ; @version 2.3.2 ; @date 2013-01-20 @@ -11,8 +11,8 @@ ; Component Instalation strings -SCHUWEB_SITEMAP_INSTALLING_XMAP="در حال نصب کامپوننت نقشه سایت - ایجاد کننده نقشه سایت برای جوملا!" -SCHUWEB_SITEMAP_UPGRADING_XMAP="در حال بروزرسانی کامپوننت نقشه سایت - ایجاد کننده نقشه سایت برای جوملا!" +SCHUWEB_SITEMAP_INSTALLING_SCHUWEB_SITEMAP="در حال نصب کامپوننت نقشه سایت - ایجاد کننده نقشه سایت برای جوملا!" +SCHUWEB_SITEMAP_UPGRADING_SCHUWEB_SITEMAP="در حال بروزرسانی کامپوننت نقشه سایت - ایجاد کننده نقشه سایت برای جوملا!" SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="حذف افزونه های نقشه سایت" SCHUWEB_SITEMAP_INSTALLED_EXTENSION_X="در حال نصب افزونه %s" SCHUWEB_SITEMAP_NOT_INSTALLED_EXTENSION_X="نصب افزونه برای %s امکان پذیر نیست" @@ -84,7 +84,7 @@ SCHUWEB_SITEMAP_ATTRIBS_NEWS_PUBLICATION_NAME_DESC="این نام منتشر ک SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_LABEL="کلمات کلیدی نوشته ها" SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_DESC="لیست کلمات کلیدی جدا شده توسط کاما برای توصیف نوشته های شما. عنوان مجموعه نوشته ها پیشفرض می باشد." SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_LABEL="Link to author" -SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Include the link to Xmap's home at the bottom of the HTML site map." +SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Include the link to SchuWeb Sitemap's home at the bottom of the HTML site map." ; Extension edit page SCHUWEB_SITEMAP_PAGE_EDIT_EXTENSION="ویرایش افزونه" diff --git a/administrator/components/com_schuweb_sitemap/language/nl-NL/nl-NL.com_schuweb_sitemap.ini b/administrator/components/com_schuweb_sitemap/language/nl-NL/nl-NL.com_schuweb_sitemap.ini index 661f05a..2ab23fb 100644 --- a/administrator/components/com_schuweb_sitemap/language/nl-NL/nl-NL.com_schuweb_sitemap.ini +++ b/administrator/components/com_schuweb_sitemap/language/nl-NL/nl-NL.com_schuweb_sitemap.ini @@ -1,14 +1,14 @@ ; $Id$ -; Xmap component +; SchuWeb Sitemap component ; Guillermo Vargas (guille@vargas.co.cr) ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. ; GNU General Public License version 2 or later; see LICENSE.txt ; ; Component Instalation strings -SCHUWEB_SITEMAP_INSTALLING_XMAP="Installeren van Xmap component - De sitemap generator voor Joomla!" -SCHUWEB_SITEMAP_UPGRADING_XMAP="Bijwerken Xmap component - De sitemap generator voor Joomla!" -SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Deïnstalleren Xmap extensies" +SCHUWEB_SITEMAP_INSTALLING_SCHUWEB_SITEMAP="Installeren van SchuWeb Sitemap component - De sitemap generator voor Joomla!" +SCHUWEB_SITEMAP_UPGRADING_SCHUWEB_SITEMAP="Bijwerken SchuWeb Sitemap component - De sitemap generator voor Joomla!" +SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Deïnstalleren SchuWeb Sitemap extensies" SCHUWEB_SITEMAP_INSTALLED_EXTENSION_X="Installeren %s extensie" SCHUWEB_SITEMAP_NOT_INSTALLED_EXTENSION_X="Het was niet mogelijk de extensie voor %s te installeren" SCHUWEB_SITEMAP_INSTALL_ERROR_EXTENSION="Fout bij het installeren van de extensie" @@ -46,7 +46,7 @@ SCHUWEB_SITEMAP_NEWS_LINK="Nieuws sitemap" SCHUWEB_SITEMAP_NEWS_LINK_TOOLTIP="Ga naar de “Nieuws” versie van de sitemap, gebruik deze URL om de sitemap naar Google nieuws te verzenden." -SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="Xmap heeft gemerkt dat de volgende extensies kunnen helpen om meer inhoud op uw site te krijgen, maar ze zijn gedeactiveerd. U moet ze handmatig activeren door te gaan naar extensiebeheer: %s" +SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="SchuWeb Sitemap heeft gemerkt dat de volgende extensies kunnen helpen om meer inhoud op uw site te krijgen, maar ze zijn gedeactiveerd. U moet ze handmatig activeren door te gaan naar extensiebeheer: %s" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED="%d sitemaps succesvol gedepubliceerd" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d sitemap succesvol gedepubliceerd" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_PUBLISHED="%d sitemaps succesvol gepubliceerd" @@ -79,7 +79,7 @@ SCHUWEB_SITEMAP_ATTRIBS_NEWS_PUBLICATION_NAME_DESC="Dit is de naam van de nieuws SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_LABEL="Bericht trefwoorden" SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_DESC="Een door komma's gescheiden lijst van trefwoorden om uw berichten te beschrijven. Standaard de categorie titel van de berichten." SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_LABEL="Link to author" -SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Include the link to Xmap's home at the bottom of the HTML site map." +SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Include the link to SchuWeb Sitemap's home at the bottom of the HTML site map." ; Extension edit page SCHUWEB_SITEMAP_PAGE_EDIT_EXTENSION="Wijzig extensie" @@ -91,7 +91,7 @@ SCHUWEB_SITEMAP_EXTENSION_AUTHOR_EMAIL="E-mailadres van auteur" SCHUWEB_SITEMAP_EXTENSION_AUTHOR_WEBSITE="Website van auteur" SCHUWEB_SITEMAP_EXTENSION_DESCRIPTION="Beschrijving" -SCHUWEB_SITEMAP_DESC_EXTENSIONS="Lijst met geïnstalleerde Xmap extensies" +SCHUWEB_SITEMAP_DESC_EXTENSIONS="Lijst met geïnstalleerde SchuWeb Sitemap extensies" SCHUWEB_SITEMAP_HEADING_AUTHOR="Auteur" SCHUWEB_SITEMAP_HEADING_DATE="Datum" SCHUWEB_SITEMAP_HEADING_FOLDER="Map" diff --git a/administrator/components/com_schuweb_sitemap/language/ru-RU/ru-RU.com_schuweb_sitemap.ini b/administrator/components/com_schuweb_sitemap/language/ru-RU/ru-RU.com_schuweb_sitemap.ini index 63650b9..061d496 100644 --- a/administrator/components/com_schuweb_sitemap/language/ru-RU/ru-RU.com_schuweb_sitemap.ini +++ b/administrator/components/com_schuweb_sitemap/language/ru-RU/ru-RU.com_schuweb_sitemap.ini @@ -1,14 +1,14 @@ ; $Id$ -; Xmap component +; SchuWeb Sitemap component ; Guillermo Vargas (guille@vargas.co.cr) ; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. ; GNU General Public License version 2 or later; see LICENSE.txt ; ; Component Instalation strings -SCHUWEB_SITEMAP_INSTALLING_XMAP="Установка Xmap компонента - создающего карту сайта для Joomla!" -SCHUWEB_SITEMAP_UPGRADING_XMAP="Обновление Xmap компонента - создающего карту сайта для Joomla!" -SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Удаление Xmap расширений" +SCHUWEB_SITEMAP_INSTALLING_SCHUWEB_SITEMAP="Установка SchuWeb Sitemap компонента - создающего карту сайта для Joomla!" +SCHUWEB_SITEMAP_UPGRADING_SCHUWEB_SITEMAP="Обновление SchuWeb Sitemap компонента - создающего карту сайта для Joomla!" +SCHUWEB_SITEMAP_UNISTALLING_SCHUWEB_SITEMAP_EXTENSIONS="Удаление SchuWeb Sitemap расширений" SCHUWEB_SITEMAP_INSTALLED_EXTENSION_X="Установка %s расширения" SCHUWEB_SITEMAP_NOT_INSTALLED_EXTENSION_X="Не удалось установить расширение для %s" SCHUWEB_SITEMAP_INSTALL_ERROR_EXTENSION="При установке расширения возникла ошибка" @@ -46,7 +46,7 @@ SCHUWEB_SITEMAP_NEWS_LINK="Новости Sitemap" SCHUWEB_SITEMAP_NEWS_LINK_TOOLTIP="Зайдите в раздел “Новости”, версия карты сайта, используйте этот адрес для отправки вашей карты на Google News." -SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="Xmap обнаружил, что следующие расширения могут помочь получить больше содержания в карте сайта, но они отключены, вам нужно вручную включить их посетив Менеджер расширений: %s" +SCHUWEB_SITEMAP_MESSAGE_EXTENSIONS_DISABLED="SchuWeb Sitemap обнаружил, что следующие расширения могут помочь получить больше содержания в карте сайта, но они отключены, вам нужно вручную включить их посетив Менеджер расширений: %s" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED="%d карты сайта успешно сняты с публикации" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d карта сайта успешно снята с публикации" COM_SCHUWEB_SITEMAP__SITEMAPS_N_ITEMS_PUBLISHED="%d карты сайта успешно опубликованы" @@ -79,7 +79,7 @@ SCHUWEB_SITEMAP_ATTRIBS_NEWS_PUBLICATION_NAME_DESC="Это название оп SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_LABEL="Keywords сообщений" SCHUWEB_SITEMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_DESC="Разделенный запятыми список ключевых слов, чтобы описать свои сообщения. По умолчанию -- это название поста в категории." SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_LABEL="Link to author" -SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Include the link to Xmap's home at the bottom of the HTML site map." +SCHUWEB_SITEMAP_ATTRIBS_INCLUDE_LINK_DESC="Include the link to SchuWeb Sitemap's home at the bottom of the HTML site map." ; Extension edit page SCHUWEB_SITEMAP_PAGE_EDIT_EXTENSION="Изменить расширение" @@ -91,7 +91,7 @@ SCHUWEB_SITEMAP_EXTENSION_AUTHOR_EMAIL="Email автора" SCHUWEB_SITEMAP_EXTENSION_AUTHOR_WEBSITE="Сайт автора" SCHUWEB_SITEMAP_EXTENSION_DESCRIPTION="Описание" -SCHUWEB_SITEMAP_DESC_EXTENSIONS="Список установленных Xmap расширений" +SCHUWEB_SITEMAP_DESC_EXTENSIONS="Список установленных SchuWeb Sitemap расширений" SCHUWEB_SITEMAP_HEADING_AUTHOR="Автор" SCHUWEB_SITEMAP_HEADING_DATE="Дата" SCHUWEB_SITEMAP_HEADING_FOLDER="Папка" diff --git a/administrator/components/com_schuweb_sitemap/models/sitemap.php b/administrator/components/com_schuweb_sitemap/models/sitemap.php index 87fff47..7292193 100644 --- a/administrator/components/com_schuweb_sitemap/models/sitemap.php +++ b/administrator/components/com_schuweb_sitemap/models/sitemap.php @@ -1,7 +1,7 @@ setState('params', $params); } - /** - * Returns a Table object, always creating it. - * - * @param type The table type to instantiate - * @param string A prefix for the table class name. Optional. - * @param array Configuration array for model. Optional. - * @return XmapTableSitemap A database object - */ + /** + * Returns a Table object, always creating it. + * + * @param string $type The table type to instantiate + * @param string $prefix A prefix for the table class name. Optional. + * @param array $config Configuration array for model. Optional. + * + * @return bool|Table A database object + * @since 2 + */ public function getTable($type = 'Sitemap', $prefix = 'SchuWeb_SitemapTable', $config = array()) { return JTable::getInstance($type, $prefix, $config); } - /** - * Method to get a single record. - * - * @param integer The id of the primary key. - * - * @return mixed Object on success, false on failure. - */ + /** + * Method to get a single record. + * + * @param integer The id of the primary key. + * + * @return mixed Object on success, false on failure. + * @throws Exception + * @since 1 + */ public function getItem($pk = null) { // Initialise variables. $pk = (!empty($pk)) ? $pk : (int)$this->getState('sitemap.id'); - $false = false; // Get a row instance. $table = $this->getTable(); // Attempt to load the row. - $return = $table->load($pk); + $table->load($pk); // Prime required properties. if (empty($table->id)) { - // Prepare data for a new record. + //TODO Prepare data for a new record. } // Convert to the JObject before adding other data. @@ -109,6 +112,17 @@ public function getItem($pk = null) return $item; } + public function getMenus() + { + $db = JFactory::getDbo(); + $query = $db->getQuery(true) + ->select('m.*') + ->from('#__menu_types AS m') + ->order('m.title'); + $db->setQuery($query); + return $db->loadObjectList('menutype'); + } + /** * Method to get the record form. * @@ -255,17 +269,6 @@ function setDefault($id) } } - public function getMenues() - { - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select('m.*') - ->from('#__menu_types AS m') - ->order('m.title'); - $db->setQuery($query); - return $db->loadObjectList('menutype'); - } - /** * Override to avoid warnings * diff --git a/administrator/components/com_schuweb_sitemap/tables/sitemap.php b/administrator/components/com_schuweb_sitemap/tables/sitemap.php index f24b2ca..327d327 100644 --- a/administrator/components/com_schuweb_sitemap/tables/sitemap.php +++ b/administrator/components/com_schuweb_sitemap/tables/sitemap.php @@ -1,9 +1,9 @@ $array['selections_priority'][$i], 'changefreq' => $array['selections_changefreq'][$i], - 'ordering' => $i ); } diff --git a/administrator/components/com_schuweb_sitemap/views/sitemap/tmpl/edit.php b/administrator/components/com_schuweb_sitemap/views/sitemap/tmpl/edit.php index 68e7b62..fe8c867 100644 --- a/administrator/components/com_schuweb_sitemap/views/sitemap/tmpl/edit.php +++ b/administrator/components/com_schuweb_sitemap/views/sitemap/tmpl/edit.php @@ -48,7 +48,7 @@ - loadTemplate('menues'); ?> + loadTemplate('menus'); ?> - @@ -29,13 +26,10 @@ - item->selections as $i => $menu): ?> - - + item->selections as $key => $menu): ?> + - +
-
- - - -
\ No newline at end of file diff --git a/administrator/components/com_schuweb_sitemap/views/sitemap/view.html.php b/administrator/components/com_schuweb_sitemap/views/sitemap/view.html.php index bfeb692..216d658 100644 --- a/administrator/components/com_schuweb_sitemap/views/sitemap/view.html.php +++ b/administrator/components/com_schuweb_sitemap/views/sitemap/view.html.php @@ -36,22 +36,21 @@ function display($tpl = null) $this->item = $this->get('Item'); $this->form = $this->get('Form'); - $version = new JVersion; - // Check for errors. if (count($errors = $this->get('Errors'))) { $app->enqueueMessage(implode("\n", $errors), 'error'); return false; } - JHTML::stylesheet('administrator/components/com_schuweb_sitemap/css/xmap.css'); + //Not deprecated, because we only use the file option + JHTML::stylesheet('administrator/components/com_schuweb_sitemap/css/schuweb_sitemap.css'); // Convert dates from UTC $offset = $app->get('offset'); if (intval($this->item->created)) { $this->item->created = JHtml::date($this->item->created, '%Y-%m-%d %H-%M-%S', $offset); } - $this->handleMenues(); + $this->handleMenus(); $this->_setToolbar(); @@ -59,16 +58,16 @@ function display($tpl = null) $app->input->setVar('hidemainmenu', true); } - protected function handleMenues() + private function handleMenus() { - $menues = $this->get('Menues'); - // remove non existing menutypes from selection + $menus = $this->get('Menus'); + // remove not anymore existing menus (menutypes) from selection foreach ($this->item->selections as $menutype => $options) { - if (!isset($menues[$menutype])) { + if (!isset($menus[$menutype])) { unset($this->item->selections[$menutype]); } } - foreach ($menues as $menu) { + foreach ($menus as $menu) { if (isset($this->item->selections[$menu->menutype])) { $this->item->selections[$menu->menutype]['selected'] = true; $this->item->selections[$menu->menutype]['title'] = $menu->title; @@ -94,8 +93,6 @@ function navigator($tpl = null) $this->state = $this->get('State'); $this->item = $this->get('Item'); - # $menuItems = XmapHelper::getMenuItems($item->selections); - # $extensions = XmapHelper::getExtensions(); // Check for errors. if (count($errors = $this->get('Errors'))) { $app->enqueueMessage(implode("\n", $errors), 'error'); @@ -106,7 +103,6 @@ function navigator($tpl = null) JHTML::stylesheet('mootree.css', 'media/system/css/'); $this->loadTemplate('class'); - $displayer = new XmapNavigatorDisplayer($this->state->params, $this->item); parent::display($tpl); } @@ -140,9 +136,9 @@ function navigatorLinks($tpl = null) $node = new stdClass; $node->uid = "menu-" . $menutype; $node->menutype = $menutype; - $node->ordering = $item->selections->$menutype->ordering; - $node->priority = $item->selections->$menutype->priority; - $node->changefreq = $item->selections->$menutype->changefreq; + $node->ordering = $this->item->selections->$menutype->ordering; + $node->priority = $this->item->selections->$menutype->priority; + $node->changefreq = $this->item->selections->$menutype->changefreq; $node->browserNav = 3; $node->type = 'separator'; if (!$node->name = $nav->getMenuTitle($menutype, @$menu->module)) { diff --git a/administrator/components/com_schuweb_sitemap/views/sitemaps/tmpl/default.php b/administrator/components/com_schuweb_sitemap/views/sitemaps/tmpl/default.php index 5da4135..46d2ce2 100644 --- a/administrator/components/com_schuweb_sitemap/views/sitemaps/tmpl/default.php +++ b/administrator/components/com_schuweb_sitemap/views/sitemaps/tmpl/default.php @@ -45,27 +45,27 @@ - - - - - - @@ -153,11 +153,10 @@
+ state->get('list.direction'), $this->state->get('list.ordering')); ?> + state->get('list.direction'), $this->state->get('list.ordering')); ?> + state->get('list.direction'), $this->state->get('list.ordering')); ?> +
() 		+
+ state->get('list.direction'), $this->state->get('list.ordering')); ?>
- - - - - - + + + + + diff --git a/administrator/components/com_schuweb_sitemap/views/sitemaps/view.html.php b/administrator/components/com_schuweb_sitemap/views/sitemaps/view.html.php index a99ff94..d9e8b93 100644 --- a/administrator/components/com_schuweb_sitemap/views/sitemaps/view.html.php +++ b/administrator/components/com_schuweb_sitemap/views/sitemaps/view.html.php @@ -67,7 +67,7 @@ protected function addToolbar() JToolBarHelper::addNew('sitemap.add'); JToolBarHelper::custom('sitemap.edit', 'edit.png', 'edit_f2.png', 'JTOOLBAR_EDIT', true); - $doc->addStyleDeclaration('.icon-48-sitemap {background-image: url(components/com_schuweb_sitemap/images/sitemap-icon.png);}'); + // $doc->addStyleDeclaration('.icon-48-sitemap {background-image: url(components/com_schuweb_sitemap/images/sitemap-icon.png);}'); JToolBarHelper::title(JText::_('SCHUWEB_SITEMAP_SITEMAPS_TITLE'), 'sitemap.png'); JToolBarHelper::custom('sitemaps.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_Publish', true); JToolBarHelper::custom('sitemaps.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true); @@ -79,7 +79,6 @@ protected function addToolbar() } else { JToolBarHelper::trash('sitemaps.trash', 'JTOOLBAR_TRASH'); } - JToolBarHelper::divider(); if (class_exists('JHtmlSidebar')) { diff --git a/build/builder.xml b/build/builder.xml index cdae63a..aed5216 100644 --- a/build/builder.xml +++ b/build/builder.xml @@ -50,11 +50,17 @@ + + + + + + @@ -79,6 +85,7 @@ + diff --git a/components/com_schuweb_sitemap/assets/css/xmap.css b/components/com_schuweb_sitemap/assets/css/schuweb_sitemap.css similarity index 100% rename from components/com_schuweb_sitemap/assets/css/xmap.css rename to components/com_schuweb_sitemap/assets/css/schuweb_sitemap.css diff --git a/install.script.php b/install.script.php new file mode 100644 index 0000000..e707105 --- /dev/null +++ b/install.script.php @@ -0,0 +1,148 @@ + + * @copyright (c) 2019 extensions.schultschik.com - All rights reserved + * @license GNU General Public License version 3 or later + */ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +/** + * + * @package Joomla.Administrator + * @subpackage com_helloworld + * + * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights + * reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + * + * @since __DEPLOY_VERSION__ + */ +class pkg_schuweb_sitemapInstallerScript +{ + + /** + * Runs right after any installation action is performed on the component. + * + * @param string $type - Type of PostFlight action. Possible values + * are: + * - * install + * - * update + * - * discover_install + * @param \stdClass $parent - Parent object calling object. + * + * @return void + * + * @throws \Exception + * @since __DEPLOY_VERSION__ + */ + public function postflight($type, $parent) + { + if ($type != "install") + { + return; + } + + // Which components are installed? + require_once JPATH_ADMINISTRATOR + . DIRECTORY_SEPARATOR . 'components' + . DIRECTORY_SEPARATOR . 'com_schuweb_sitemap' + . DIRECTORY_SEPARATOR . 'helpers' + . DIRECTORY_SEPARATOR . 'schuweb_sitemap.php'; + + $extensions = SchuWeb_SitemapHelper::getExtensionsList(); + + $db = JFactory::getDbo(); + + // Activate the fitting plugins + foreach ($extensions as $extension) + { + $query = $db->getQuery(true); + + $fields = array( + $db->quoteName('enabled') . '= 1', + ); + + $conditions = array( + $db->quoteName('type') . '=' . $db->quote('plugin'), + $db->quoteName('element') . '=' . $db->quote($extension->element), + ); + + $query->update($db->quoteName('#__extensions')) + ->set($fields) + ->where($conditions); + + + $db->setQuery($query); + + if (!$db->execute()) + { + JFactory::getApplication()->enqueueMessage(JText::_('SCHUWEB_SITEMAP_ACTIVATE_PLUGIN_FAILED'), 'error'); + } + } + + // Get all menus + $query = $db->getQuery(true); + + $query->select($db->quoteName('menutype')) + ->from($db->quoteName('#__menu_types')); + + $db->setQuery($query); + $menus = $db->loadObjectList(); + + // Create a default sitemap with all needed components and all menus + $columns = array( + 'title', + 'alias', + 'attribs', + 'selections', + 'is_default', + 'state', + 'access', + ); + + // {"mainmenu":{"enabled":"1","priority":"0.5","changefreq":"weekly"}} + $selections = array(); + + foreach ($menus as $menu) + { + $selections[$menu->menutype] = array( + "enabled" => 1, + "priority" => 1, + "changefreq" => "weekly", + ); + } + + $attribs = '{"showintro":"1","show_menutitle":"1","classname":"",' + . '"columns":"","exlinks":"img_blue.gif","compress_xml":"1",' + . '"beautify_xml":"1","include_link":"1","xmlLastMod":"1",' + . '"xmlInsertChangeFreq":"1","xmlInsertPriority":"1",' + . '"cacheControl":"1","cacheControlUseChangeFrequency":"1",' + . '"cacheControlMaxAge":"","cacheControlPublic":"1","news_publication_name":""}'; + + $values = array( + $db->quote('Sitemap'), + $db->quote('sitemap'), + $db->quote($attribs), + $db->quote(json_encode($selections)), + 1, + 1, + 1, + ); + + $query = $db->getQuery(true); + + $query->insert($db->quoteName('#__schuweb_sitemap')) + ->columns($db->quoteName($columns)) + ->values(implode(',', $values)); + + // Set the query using our newly populated query object and execute it. + $db->setQuery($query); + $db->execute(); + } + +} diff --git a/pkg_schuweb_sitemap.xml b/pkg_schuweb_sitemap.xml index 673650f..1fc5a91 100644 --- a/pkg_schuweb_sitemap.xml +++ b/pkg_schuweb_sitemap.xml @@ -10,13 +10,14 @@ http://extensions.schultschik.de GNU/GPL The Site Map generator for Joomla! + install.script.php com_schuweb_sitemap_sw.build.version_sw.build.date.zip plg_content_sw.build.version_sw.build.date.zip plg_kunena_sw.build.version_sw.build.date.zip plg_sobipro_sw.build.version_sw.build.date.zip + plg_virtuemart_sw.build.version_sw.build.date.zip diff --git a/plugins/schuweb_sitemap/com_k2/com_k2.php b/plugins/schuweb_sitemap/com_k2/com_k2.php index 50edc79..cc38e9b 100644 --- a/plugins/schuweb_sitemap/com_k2/com_k2.php +++ b/plugins/schuweb_sitemap/com_k2/com_k2.php @@ -2,9 +2,9 @@ /** * @author Martin Herbst - http://www.mherbst.de * @email webmaster@mherbst.de -* @package Xmap +* @package SchuWeb Sitemap * @license GNU/GPL -* @description Xmap plugin for K2 component +* @description SchuWeb Sitemap plugin for K2 component * * Changes: * + 0.51 2009/08/21 Do not show deleted items resp. categories @@ -35,7 +35,7 @@ defined('_JEXEC') or die; -/** Adds support for K2 to Xmap */ +/** Adds support for K2 to SchuWeb Sitemap */ class xmap_com_k2 { static $maxAccess = 0; diff --git a/plugins/schuweb_sitemap/com_k2/language/en-GB/en-GB.plg_xmap_com_k2.sys.ini b/plugins/schuweb_sitemap/com_k2/language/en-GB/en-GB.plg_xmap_com_k2.sys.ini index 6a036cd..0ad0062 100644 --- a/plugins/schuweb_sitemap/com_k2/language/en-GB/en-GB.plg_xmap_com_k2.sys.ini +++ b/plugins/schuweb_sitemap/com_k2/language/en-GB/en-GB.plg_xmap_com_k2.sys.ini @@ -1,2 +1,2 @@ -SCHUWEB_SITEMAP_PLUGIN_K2="Xmap - K2 Plugin" +SCHUWEB_SITEMAP_PLUGIN_K2="SchuWeb Sitemap - K2 Plugin" SCHUWEB_SITEMAP_PLUGIN_K2_DESC="Plugin for K2 component" diff --git a/plugins/schuweb_sitemap/com_k2/language/fa-IR/fa-IR.plg_xmap_com_k2.ini b/plugins/schuweb_sitemap/com_k2/language/fa-IR/fa-IR.plg_xmap_com_k2.ini index cde862c..cbe5ecf 100644 --- a/plugins/schuweb_sitemap/com_k2/language/fa-IR/fa-IR.plg_xmap_com_k2.ini +++ b/plugins/schuweb_sitemap/com_k2/language/fa-IR/fa-IR.plg_xmap_com_k2.ini @@ -1,5 +1,5 @@ ; @package Joomla 2.5 & 3.0 -; @subpackage Xmap - K2 +; @subpackage SchuWeb Sitemap - K2 ; @description فارسی - ایران ; @version 1.2 ; @date 2013-01-31 diff --git a/plugins/schuweb_sitemap/com_k2/language/fa-IR/fa-IR.plg_xmap_com_k2.sys.ini b/plugins/schuweb_sitemap/com_k2/language/fa-IR/fa-IR.plg_xmap_com_k2.sys.ini index f898fad..d7a09ea 100644 --- a/plugins/schuweb_sitemap/com_k2/language/fa-IR/fa-IR.plg_xmap_com_k2.sys.ini +++ b/plugins/schuweb_sitemap/com_k2/language/fa-IR/fa-IR.plg_xmap_com_k2.sys.ini @@ -1,5 +1,5 @@ ; @package Joomla 2.5 & 3.0 -; @subpackage Xmap - K2 +; @subpackage SchuWeb Sitemap - K2 ; @description فارسی - ایران ; @version 1.2 ; @date 2013-01-31 diff --git a/plugins/schuweb_sitemap/com_k2/language/fr-FR/fr-FR.plg_xmap_com_k2.ini b/plugins/schuweb_sitemap/com_k2/language/fr-FR/fr-FR.plg_xmap_com_k2.ini index cf0a02b..38d72d9 100644 --- a/plugins/schuweb_sitemap/com_k2/language/fr-FR/fr-FR.plg_xmap_com_k2.ini +++ b/plugins/schuweb_sitemap/com_k2/language/fr-FR/fr-FR.plg_xmap_com_k2.ini @@ -1,4 +1,4 @@ -; @package Xmap +; @package SchuWeb Sitemap ; @copyright 2007 - 2012 Joomla! Vargas. All rights reserved. ; @subpackage fr-FR.plg_SCHUWEB_SITEMAP_com_zoo.ini ; @description Traduction francophone - fr-FR @@ -10,8 +10,8 @@ ; @note Client Administrator ; @note All ini files need to be saved as UTF-8 - No BOM -SCHUWEB_SITEMAP_PLUGIN_K2="Xmap - Plug-in pour K2" -SCHUWEB_SITEMAP_PLUGIN_K2_DESC="Ce plug-in permet de prendre en charge les catégories et articles de K2 dans les plans de site générés par Xmap." +SCHUWEB_SITEMAP_PLUGIN_K2="SchuWeb Sitemap - Plug-in pour K2" +SCHUWEB_SITEMAP_PLUGIN_K2_DESC="Ce plug-in permet de prendre en charge les catégories et articles de K2 dans les plans de site générés par SchuWeb Sitemap." SCHUWEB_SITEMAP_K2_FOLLOW_SUBCATEGORIES="Sous-catégories" SCHUWEB_SITEMAP_K2_FOLLOW_SUBCATEGORIES_DESC="Sélectionnez si les sous-catégories doivent être listées ou non." SCHUWEB_SITEMAP_K2_SUPRESS_DUPLICATES="Masquer les doublons" diff --git a/plugins/schuweb_sitemap/com_kunena/language/fa-IR.plg_schuweb_sitemap_com_kunena.ini b/plugins/schuweb_sitemap/com_kunena/language/fa-IR.plg_schuweb_sitemap_com_kunena.ini index 1849a1d..a05c4ee 100644 --- a/plugins/schuweb_sitemap/com_kunena/language/fa-IR.plg_schuweb_sitemap_com_kunena.ini +++ b/plugins/schuweb_sitemap/com_kunena/language/fa-IR.plg_schuweb_sitemap_com_kunena.ini @@ -1,5 +1,5 @@ ; @package Joomla 2.5 -; @subpackage Xmap +; @subpackage SchuWeb Sitemap ; @description فارسی - ایران ; @version 2.2.1 ; @date 2012-09-02 diff --git a/plugins/schuweb_sitemap/com_mtree/language/fa-IR.plg_xmap_com_mtree.ini b/plugins/schuweb_sitemap/com_mtree/language/fa-IR.plg_xmap_com_mtree.ini index bf6944e..e45496d 100644 --- a/plugins/schuweb_sitemap/com_mtree/language/fa-IR.plg_xmap_com_mtree.ini +++ b/plugins/schuweb_sitemap/com_mtree/language/fa-IR.plg_xmap_com_mtree.ini @@ -1,5 +1,5 @@ ; @package Joomla 2.5 -; @subpackage Xmap +; @subpackage SchuWeb Sitemap ; @description فارسی - ایران ; @version 2.2.1 ; @date 2012-09-02 diff --git a/plugins/schuweb_sitemap/com_virtuemart/com_virtuemart.php b/plugins/schuweb_sitemap/com_virtuemart/com_virtuemart.php index 275119b..f0b5459 100644 --- a/plugins/schuweb_sitemap/com_virtuemart/com_virtuemart.php +++ b/plugins/schuweb_sitemap/com_virtuemart/com_virtuemart.php @@ -1,17 +1,19 @@ getMenu(); - $link_query = parse_url($parent->link); parse_str(html_entity_decode($link_query['query']), $link_vars); - $catid = intval(JArrayHelper::getValue($link_vars, 'virtuemart_category_id', 0)); - $params['Itemid'] = intval(JArrayHelper::getValue($link_vars, 'Itemid', $parent->id)); + $catid = intval(ArrayHelper::getValue($link_vars, 'virtuemart_category_id', 0)); + $params['Itemid'] = intval(ArrayHelper::getValue($link_vars, 'Itemid', $parent->id)); - $view = JArrayHelper::getValue($link_vars, 'view', ''); + $view = ArrayHelper::getValue($link_vars, 'view', ''); // we currently support only categories if (!in_array($view, array('categories','category'))) @@ -83,17 +90,17 @@ static function getTree($xmap, $parent, &$params) return true; } - $include_products = JArrayHelper::getValue($params, 'include_products', 1); + $include_products = ArrayHelper::getValue($params, 'include_products', 1); $include_products = ( $include_products == 1 - || ( $include_products == 2 && $xmap->view == 'xml') - || ( $include_products == 3 && $xmap->view == 'html')); + || ( $include_products == 2 && $sitemap->view == 'xml') + || ( $include_products == 3 && $sitemap->view == 'html')); $params['include_products'] = $include_products; - $params['include_product_images'] = (JArrayHelper::getValue($params, 'include_product_images', 1) && $xmap->view == 'xml'); - $params['product_image_license_url'] = trim(JArrayHelper::getValue($params, 'product_image_license_url', '')); + $params['include_product_images'] = (ArrayHelper::getValue($params, 'include_product_images', 1) && $sitemap->view == 'xml'); + $params['product_image_license_url'] = trim(ArrayHelper::getValue($params, 'product_image_license_url', '')); - $priority = JArrayHelper::getValue($params, 'cat_priority', $parent->priority); - $changefreq = JArrayHelper::getValue($params, 'cat_changefreq', $parent->changefreq); + $priority = ArrayHelper::getValue($params, 'cat_priority', $parent->priority); + $changefreq = ArrayHelper::getValue($params, 'cat_changefreq', $parent->changefreq); if ($priority == '-1') { @@ -108,8 +115,8 @@ static function getTree($xmap, $parent, &$params) $params['cat_priority'] = $priority; $params['cat_changefreq'] = $changefreq; - $priority = JArrayHelper::getValue($params, 'prod_priority', $parent->priority); - $changefreq = JArrayHelper::getValue($params, 'prod_changefreq', $parent->changefreq); + $priority = ArrayHelper::getValue($params, 'prod_priority', $parent->priority); + $changefreq = ArrayHelper::getValue($params, 'prod_changefreq', $parent->changefreq); if ($priority == '-1') { @@ -124,16 +131,21 @@ static function getTree($xmap, $parent, &$params) $params['prod_priority'] = $priority; $params['prod_changefreq'] = $changefreq; - SCHUWEB_SITEMAP_com_virtuemart::getCategoryTree($xmap, $parent, $params, $catid); + self::getCategoryTree($sitemap, $parent, $params, $catid); return true; } - /** Virtuemart support */ - static function getCategoryTree($xmap, $parent, &$params, $catid=0) + /** Virtuemart support + * @param $sitemap + * @param $parent + * @param $params + * @param int $catid + * + * @since 1.0 + */ + static function getCategoryTree($sitemap, $parent, &$params, $catid=0) { - $database = JFactory::getDBO(); - if (!isset($urlBase)) { $urlBase = JURI::base(); @@ -143,7 +155,7 @@ static function getCategoryTree($xmap, $parent, &$params, $catid=0) $cache = JFactory::getCache('com_virtuemart','callback'); $children = $cache->call( array( 'VirtueMartModelCategory', 'getChildCategoryList' ),$vendorId, $catid ); - $xmap->changeLevel(1); + $sitemap->changeLevel(1); foreach ($children as $row) { @@ -158,13 +170,13 @@ static function getCategoryTree($xmap, $parent, &$params, $catid=0) $node->expandible = true; $node->link = 'index.php?option=com_virtuemart&view=category&virtuemart_category_id=' . $row->virtuemart_category_id . '&Itemid='.$parent->id; - if ($xmap->printNode($node) !== FALSE) + if ($sitemap->printNode($node) !== FALSE) { - SCHUWEB_SITEMAP_com_virtuemart::getCategoryTree($xmap, $parent, $params, $row->virtuemart_category_id); + self::getCategoryTree($sitemap, $parent, $params, $row->virtuemart_category_id); } } - $xmap->changeLevel(-1); + $sitemap->changeLevel(-1); if ($params['include_products'] && $catid != 0) { @@ -175,7 +187,7 @@ static function getCategoryTree($xmap, $parent, &$params, $catid=0) self::$categoryModel->addImages($products,1); } - $xmap->changeLevel(1); + $sitemap->changeLevel(1); foreach ($products as $row) { @@ -208,10 +220,10 @@ static function getCategoryTree($xmap, $parent, &$params, $catid=0) } } - $xmap->printNode($node); + $sitemap->printNode($node); } - $xmap->changeLevel(-1); + $sitemap->changeLevel(-1); } } diff --git a/plugins/schuweb_sitemap/com_virtuemart/com_virtuemart.xml b/plugins/schuweb_sitemap/com_virtuemart/com_virtuemart.xml index e120d85..cdcfda9 100644 --- a/plugins/schuweb_sitemap/com_virtuemart/com_virtuemart.xml +++ b/plugins/schuweb_sitemap/com_virtuemart/com_virtuemart.xml @@ -1,12 +1,11 @@ - - Xmap - Virtuemart Plugin - Guillermo Vargas + + SchuWeb Sitemap - Virtuemart Plugin + Sven Schultschik sw.build.date GNU GPL http://www.gnu.org/copyleft/gpl.html GNU/GPL - guille@vargas.co.cr - joomla.vargas.co.cr + extensions.schultschik.com sw.build.version SCHUWEB_SITEMAP_VM_PLUGIN_DESCRIPTION @@ -27,13 +26,13 @@
- + -
- + @@ -56,7 +55,7 @@ - + @@ -66,7 +65,7 @@ - + @@ -80,7 +79,7 @@ - + diff --git a/plugins/schuweb_sitemap/com_virtuemart/language/cs-CZ.plg_xmap_com_virtuemart.ini b/plugins/schuweb_sitemap/com_virtuemart/language/cs-CZ.plg_schuweb_sitemap_com_virtuemart.ini similarity index 100% rename from plugins/schuweb_sitemap/com_virtuemart/language/cs-CZ.plg_xmap_com_virtuemart.ini rename to plugins/schuweb_sitemap/com_virtuemart/language/cs-CZ.plg_schuweb_sitemap_com_virtuemart.ini diff --git a/plugins/schuweb_sitemap/com_virtuemart/language/en-GB.plg_xmap_com_virtuemart.ini b/plugins/schuweb_sitemap/com_virtuemart/language/en-GB.plg_schuweb_sitemap_com_virtuemart.ini similarity index 100% rename from plugins/schuweb_sitemap/com_virtuemart/language/en-GB.plg_xmap_com_virtuemart.ini rename to plugins/schuweb_sitemap/com_virtuemart/language/en-GB.plg_schuweb_sitemap_com_virtuemart.ini diff --git a/plugins/schuweb_sitemap/com_virtuemart/language/es-ES.plg_xmap_com_virtuemart.ini b/plugins/schuweb_sitemap/com_virtuemart/language/es-ES.plg_schuweb_sitemap_com_virtuemart.ini similarity index 100% rename from plugins/schuweb_sitemap/com_virtuemart/language/es-ES.plg_xmap_com_virtuemart.ini rename to plugins/schuweb_sitemap/com_virtuemart/language/es-ES.plg_schuweb_sitemap_com_virtuemart.ini diff --git a/plugins/schuweb_sitemap/com_virtuemart/language/fa-IR.plg_xmap_com_virtuemart.ini b/plugins/schuweb_sitemap/com_virtuemart/language/fa-IR.plg_schuweb_sitemap_com_virtuemart.ini similarity index 100% rename from plugins/schuweb_sitemap/com_virtuemart/language/fa-IR.plg_xmap_com_virtuemart.ini rename to plugins/schuweb_sitemap/com_virtuemart/language/fa-IR.plg_schuweb_sitemap_com_virtuemart.ini diff --git a/plugins/schuweb_sitemap/com_virtuemart/language/nl-NL.plg_xmap_com_virtuemart.ini b/plugins/schuweb_sitemap/com_virtuemart/language/nl-NL.plg_schuweb_sitemap_com_virtuemart.ini similarity index 100% rename from plugins/schuweb_sitemap/com_virtuemart/language/nl-NL.plg_xmap_com_virtuemart.ini rename to plugins/schuweb_sitemap/com_virtuemart/language/nl-NL.plg_schuweb_sitemap_com_virtuemart.ini diff --git a/plugins/schuweb_sitemap/com_virtuemart/language/ru-RU.plg_xmap_com_virtuemart.ini b/plugins/schuweb_sitemap/com_virtuemart/language/ru-RU.plg_schuweb_sitemap_com_virtuemart.ini similarity index 100% rename from plugins/schuweb_sitemap/com_virtuemart/language/ru-RU.plg_xmap_com_virtuemart.ini rename to plugins/schuweb_sitemap/com_virtuemart/language/ru-RU.plg_schuweb_sitemap_com_virtuemart.ini diff --git a/update/schuweb_sitemap.xml b/update/schuweb_sitemap.xml index fcba377..4bdb75c 100644 --- a/update/schuweb_sitemap.xml +++ b/update/schuweb_sitemap.xml @@ -1,5 +1,24 @@ + + SchuWeb Sitemap + SchuWeb Sitemap - Sitemap Generator for Joomla! + com_schuweb_sitemap + package + 3.1.0 + https://github.com/svanschu/SchuWeb-Sitemap/ + + https://github.com/svanschu/SchuWeb-Sitemap/releases/download/3.1.0/pkg_schuweb_sitemap_3.1.0_20200417.zip + + + stable + + Sven Schultschik + http://www.schultschik.de +
frs
+ + 5.6 + SchuWeb Sitemap SchuWeb Sitemap - Sitemap Generator for Joomla! diff --git a/xmap-update.xml b/xmap-update.xml deleted file mode 100644 index fcba377..0000000 --- a/xmap-update.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - SchuWeb Sitemap - SchuWeb Sitemap - Sitemap Generator for Joomla! - com_schuweb_sitemap - package - 3.0.0 - https://github.com/svanschu/SchuWeb-Sitemap/ - - https://github.com/svanschu/SchuWeb-Sitemap/releases/download/3.0.0/pkg_schuweb_sitemap_3.0.0_20190412.zip - - - stable - - Sven Schultschik - http://www.schultschik.de -
frs
- - 5.6 - - - SchuWeb Sitemap - SchuWeb Sitemap - Sitemap Generator for Joomla! - com_schuweb_sitemap - package - 3.0.0.B4 - https://svanschu.github.io/SchuWeb-Sitemap/ - - https://github.com/svanschu/SchuWeb-Sitemap/releases/download/3.0.0.B4/pkg_schuweb_sitemap_3.0.0.B4_20170620.zip - - - beta - - Sven Schultschik - http://www.schultschik.de -
frs
- - 5.6 - - - SchuWeb Sitemap - SchuWeb Sitemap - Sitemap Generator for Joomla! - com_schuweb_sitemap - package - 3.0.0.B3 - https://svanschu.github.io/SchuWeb-Sitemap/ - - https://github.com/svanschu/SchuWeb-Sitemap/releases/download/3.0.0.B3/pkg_schuweb_sitemap_3.0.0.B3_20170110.zip - - - beta - - Sven Schultschik - http://www.schultschik.de -
frs
- - 5.6 - -