diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..1e4fbe4f --- /dev/null +++ b/Makefile @@ -0,0 +1,49 @@ +VERSION = "1.0.0" +VERSION2 = $(shell echo $(VERSION)|sed 's/ /-/g') +ZIPFILE = joxmap-$(VERSION2).zip +PACKAGES = packages + +# Only set DATE if you need to force the date. +# (Otherwise it uses the current date.) +# DATE = "February 19, 2011" + +all: $(ZIPFILE) + +INSTALLS = joxmap_plugin \ + joxmap_component + +NAMES = $(INSTALLS) + +ZIPS = $(NAMES:=.zip) + +ZIPIGNORES = -x "*.git*" -x "*.svn*" + +PWD = $(pwd) + +parts: $(ZIPS) + +COMPONENT_SRC = administrator components media joxmap.xml +PLUGIN_SRC = plugins/joxmap/com_content + + +joxmap_component.zip: $(COMPONENT_SRC) + @echo "-------------------------------------------------------" + @echo "Creating zip file for: $*" + @rm -f $@ + @(zip -r $@ $^ $(ZIPIGNORES)) + +joxmap_plugin.zip: $(PLUGIN_SRC) + @echo "-------------------------------------------------------" + @echo "Creating zip file for: $*" + @rm -f $@ + @cd $^; zip -r ../../../$@ * $(ZIPIGNORES);cd -; + + +$(ZIPFILE): $(ZIPS) + @echo "-------------------------------------------------------" + @echo "Creating extension zip file: $(ZIPFILE)" + @mv $(INSTALLS:=.zip) packages/ + @(cd $(PACKAGES); zip -r ../$@ * $(ZIPIGNORES)) + @echo "-------------------------------------------------------" + @echo "Finished creating package $(ZIPFILE)." + diff --git a/README.md b/README.md new file mode 100644 index 00000000..773f3cfd --- /dev/null +++ b/README.md @@ -0,0 +1,19 @@ +# com_joxmap + + +## News + +This project will be archived + +Please use more accurate https://github.com/svanschu/SchuWeb-Sitemap + +## Credits + +This repo was imported from https://github.com/guilleva/Xmap + +This repo is not more maintained + +It was containing component com_xmap + +The new repo is providing com_joxmap component for Joomla 4.0 + + diff --git a/administrator/components/com_xmap/LICENSE.txt b/administrator/components/com_joxmap/LICENSE.txt similarity index 100% rename from administrator/components/com_xmap/LICENSE.txt rename to administrator/components/com_joxmap/LICENSE.txt diff --git a/administrator/components/com_xmap/models/forms/extension.xml b/administrator/components/com_joxmap/forms/extension.xml similarity index 100% rename from administrator/components/com_xmap/models/forms/extension.xml rename to administrator/components/com_joxmap/forms/extension.xml diff --git a/administrator/components/com_xmap/controllers/index.html b/administrator/components/com_joxmap/forms/index.html similarity index 100% rename from administrator/components/com_xmap/controllers/index.html rename to administrator/components/com_joxmap/forms/index.html diff --git a/administrator/components/com_xmap/models/forms/sitemap.xml b/administrator/components/com_joxmap/forms/sitemap.xml similarity index 85% rename from administrator/components/com_xmap/models/forms/sitemap.xml rename to administrator/components/com_joxmap/forms/sitemap.xml index b26a8392..84bda268 100644 --- a/administrator/components/com_xmap/models/forms/sitemap.xml +++ b/administrator/components/com_joxmap/forms/sitemap.xml @@ -1,7 +1,8 @@ -
- + +
- + default="NOW" + showtime="false" + filter="user_utc" + format="%Y-%m-%d" + />--> - - +
+ - +
+ - - -
- +
+ Yes - Yes -
+ +
-
- + diff --git a/administrator/components/com_xmap/css/index.html b/administrator/components/com_joxmap/index.html similarity index 100% rename from administrator/components/com_xmap/css/index.html rename to administrator/components/com_joxmap/index.html diff --git a/administrator/components/com_joxmap/joxmap.php b/administrator/components/com_joxmap/joxmap.php new file mode 100644 index 00000000..493433b1 --- /dev/null +++ b/administrator/components/com_joxmap/joxmap.php @@ -0,0 +1,26 @@ +bootComponent("com_joxmap") + ->getMVCFactory(); + +$controller = $mvc->createController('SiteMaps'); +$controller->execute(Factory::getApplication()->getInput()->get('task')); +$controller->redirect(); \ No newline at end of file diff --git a/administrator/components/com_xmap/language/cs-CZ/cs-CZ.com_xmap.ini b/administrator/components/com_joxmap/language/cs-CZ/cs-CZ.com_xmap.ini similarity index 90% rename from administrator/components/com_xmap/language/cs-CZ/cs-CZ.com_xmap.ini rename to administrator/components/com_joxmap/language/cs-CZ/cs-CZ.com_xmap.ini index a2ae622a..e1b89747 100644 --- a/administrator/components/com_xmap/language/cs-CZ/cs-CZ.com_xmap.ini +++ b/administrator/components/com_joxmap/language/cs-CZ/cs-CZ.com_xmap.ini @@ -47,14 +47,14 @@ XMAP_NEWS_LINK_TOOLTIP="Přejít “News” verzi mapy stránek. Použij XMAP_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" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d map stránek bylo zneveřejněno." -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="Mapa stránek byla zneveřejněna." -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d map stránek bylo zveřejněno." -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="Mapa stránek byla zveřejněna." -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED="%d map stránek bylo přemístěno do koše." -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED_1="Mapa stránek byla přemístěna do koše." -COM_XMAP_SITEMAPS_N_ITEMS_DELETED="%d map stránek bylo smazáno." -COM_XMAP_SITEMAPS_N_ITEMS_DELETED_1="Mapa stránek byla smazána." +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d map stránek bylo zneveřejněno." +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="Mapa stránek byla zneveřejněna." +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d map stránek bylo zveřejněno." +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="Mapa stránek byla zveřejněna." +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED="%d map stránek bylo přemístěno do koše." +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED_1="Mapa stránek byla přemístěna do koše." +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED="%d map stránek bylo smazáno." +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED_1="Mapa stránek byla smazána." XMAP_FIELDSET_MENUS="Nabídky" XMAP_FIELDSET_OPTIONS="Možnosti" diff --git a/administrator/components/com_joxmap/language/cs-CZ/cs-CZ.com_xmap.sys.ini b/administrator/components/com_joxmap/language/cs-CZ/cs-CZ.com_xmap.sys.ini new file mode 100644 index 00000000..02959b53 --- /dev/null +++ b/administrator/components/com_joxmap/language/cs-CZ/cs-CZ.com_xmap.sys.ini @@ -0,0 +1,26 @@ +; $Id$ +; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. +; GNU General Public License version 2 or later; see LICENSE.txt +; Guillermo Vargas (guille@vargas.co.cr) +; + +COM_JOXMAP="Xmap" +COM_JOXMAP_TITLE="Xmap" + +; +; View and layout titles and descriptions +; +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="HTML verze" +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Zobrazí mapu stránek v HTML formátu" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="XML verze" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Zobrazí mapu stránek v XML formátu" + +COM_JOXMAP_SELECT_AN_SITEMAP="Zvolte mapu stránek" +COM_JOXMAP_SELECT_A_SITEMAP="Mapa stránek" +COM_JOXMAP_CHANGE_SITEMAP_BUTTON="Změnit" +COM_JOXMAP_CHANGE_SITEMAP="Zvolte mapu stránek ze seznamu" + +COM_INSTALLER_TYPE_XMAP_EXT="Rozšíření Xmap" +COM_JOXMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Možnosti mapy stránek" +COM_JOXMAP_INCLUDE_CSS_LABEL="Používat CSS styl komponenty Xmap" +COM_JOXMAP_INCLUDE_CSS_DESC="Pokud je zvoleno Ano, bude použit soubor stylů CSS komponenty XMap" \ No newline at end of file diff --git a/administrator/components/com_xmap/language/en-GB/en-GB.com_xmap.ini b/administrator/components/com_joxmap/language/en-GB/en-GB.com_joxmap.ini old mode 100755 new mode 100644 similarity index 90% rename from administrator/components/com_xmap/language/en-GB/en-GB.com_xmap.ini rename to administrator/components/com_joxmap/language/en-GB/en-GB.com_joxmap.ini index aff15b42..4a39e629 --- a/administrator/components/com_xmap/language/en-GB/en-GB.com_xmap.ini +++ b/administrator/components/com_joxmap/language/en-GB/en-GB.com_joxmap.ini @@ -48,16 +48,17 @@ XMAP_IMAGES_LINK="Images Sitemap" XMAP_IMAGES_LINK_TOOLTIP="Go to the “Images” version of the sitemap, use this url to submit your sitemap to Google and other search engines." XMAP_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" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d sitemaps successfully unpublished" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d sitemap successfully unpublished" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d sitemaps successfully published" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d sitemap successfully published" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED="%d sitemaps successfully published" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d sitemap successfully trashed" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED="%d sitemaps successfully deleted" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED_1="%d sitemap successfully deleted" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d sitemaps successfully unpublished" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d sitemap successfully unpublished" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d sitemaps successfully published" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d sitemap successfully published" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED="%d sitemaps successfully published" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d sitemap successfully trashed" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED="%d sitemaps successfully deleted" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED_1="%d sitemap successfully deleted" XMAP_FIELDSET_MENUS="Menus" +XMAP_FIELDSET_GENERAL="General" XMAP_FIELDSET_OPTIONS="Options" XMAP_FIELDSET_METADATA="Metadata" XMAP_ATTRIBS_SHOW_INTRO_LABEL="Intro text" diff --git a/administrator/components/com_joxmap/language/en-GB/en-GB.com_joxmap.sys.ini b/administrator/components/com_joxmap/language/en-GB/en-GB.com_joxmap.sys.ini new file mode 100644 index 00000000..71415e8b --- /dev/null +++ b/administrator/components/com_joxmap/language/en-GB/en-GB.com_joxmap.sys.ini @@ -0,0 +1,26 @@ +; $Id$ +; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. +; GNU General Public License version 2 or later; see LICENSE.txt +; Guillermo Vargas (guille@vargas.co.cr) +; + +COM_JOXMAP="JoXmap" +COM_JOXMAP_TITLE="JoXmap" + +; +; View and layout titles and descriptions +; +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="HTML Site map" +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Display a Site map in HTML format" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="XML Sitemap" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Display an Site map in XML format" + +COM_JOXMAP_SELECT_AN_SITEMAP="Choose a site map" +COM_JOXMAP_SELECT_A_SITEMAP="A site map" +COM_JOXMAP_CHANGE_SITEMAP_BUTTON="Change" +COM_JOXMAP_CHANGE_SITEMAP="Select a site map from the list" + +COM_INSTALLER_TYPE_XMAP_EXT="Xmap Extension" +COM_JOXMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Sitemap Settings" +COM_JOXMAP_INCLUDE_CSS_LABEL="Include Xmap's Style" +COM_JOXMAP_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_xmap/language/es-ES/es-ES.com_xmap.ini b/administrator/components/com_joxmap/language/es-ES/es-ES.com_xmap.ini similarity index 90% rename from administrator/components/com_xmap/language/es-ES/es-ES.com_xmap.ini rename to administrator/components/com_joxmap/language/es-ES/es-ES.com_xmap.ini index a1684eae..e45f5b8b 100644 --- a/administrator/components/com_xmap/language/es-ES/es-ES.com_xmap.ini +++ b/administrator/components/com_joxmap/language/es-ES/es-ES.com_xmap.ini @@ -46,14 +46,14 @@ XMAP_IMAGES_LINK="Images Sitemap" XMAP_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." XMAP_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" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d mapas de sitio se han despublicado correctamente" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d mapa de sitio se ha despublicado correctamente" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d mapas de sitio se han publicado correctamente" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d mapa de sitio se ha publicado correctamente" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED="%d mapas de sitio enviados a la papelera correctamente" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d mapa de sitio enviado a la papelera correctamente" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED="%d mapas de sitio eliminados correctamente" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED_1="%d mapa de sitio eliminado correctamente" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d mapas de sitio se han despublicado correctamente" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d mapa de sitio se ha despublicado correctamente" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d mapas de sitio se han publicado correctamente" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d mapa de sitio se ha publicado correctamente" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED="%d mapas de sitio enviados a la papelera correctamente" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d mapa de sitio enviado a la papelera correctamente" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED="%d mapas de sitio eliminados correctamente" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED_1="%d mapa de sitio eliminado correctamente" XMAP_FIELDSET_MENUS="Menus" XMAP_FIELDSET_OPTIONS="Opciones" diff --git a/administrator/components/com_joxmap/language/es-ES/es-ES.com_xmap.sys.ini b/administrator/components/com_joxmap/language/es-ES/es-ES.com_xmap.sys.ini new file mode 100755 index 00000000..160cb5cb --- /dev/null +++ b/administrator/components/com_joxmap/language/es-ES/es-ES.com_xmap.sys.ini @@ -0,0 +1,26 @@ +; $Id$ +; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. +; GNU General Public License version 2 or later; see LICENSE.txt +; Guillermo Vargas (guille@vargas.co.cr) +; + +COM_JOXMAP="Xmap" +COM_JOXMAP_TITLE="Xmap" + +; +; View and layout titles and descriptions +; +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="Mapa de Sitio HTML" +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Muestra un mapa de sitio en formato HTML" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="Mapa de Sitio XML" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Mustra un mapa de sitio en formato XML" + +COM_JOXMAP_SELECT_AN_SITEMAP="Seleccione un mapa de sitio" +COM_JOXMAP_SELECT_A_SITEMAP="Un mapa de sitio" +COM_JOXMAP_CHANGE_SITEMAP_BUTTON="Cambiar" +COM_JOXMAP_CHANGE_SITEMAP="Seleccionar un mapa de sitio de una lista" + +COM_INSTALLER_TYPE_XMAP_EXT="Xmap Extension" +COM_JOXMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Sitemap Settings" +COM_JOXMAP_INCLUDE_CSS_LABEL="Include Xmap's Style" +COM_JOXMAP_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_xmap/language/fa-IR/fa-IR.com_xmap.ini b/administrator/components/com_joxmap/language/fa-IR/fa-IR.com_xmap.ini similarity index 91% rename from administrator/components/com_xmap/language/fa-IR/fa-IR.com_xmap.ini rename to administrator/components/com_joxmap/language/fa-IR/fa-IR.com_xmap.ini index f1f3d7be..f5316c1f 100644 --- a/administrator/components/com_xmap/language/fa-IR/fa-IR.com_xmap.ini +++ b/administrator/components/com_joxmap/language/fa-IR/fa-IR.com_xmap.ini @@ -52,14 +52,14 @@ XMAP_NEWS_LINK_TOOLTIP="به نسخه “خبری” نقشه سایت XMAP_IMAGES_LINK="نقشه سایت تصاویر" XMAP_IMAGES_LINK_TOOLTIP="نسخه مخصوص “تصاویر” برای نقشه سایت، این آدرس را جهت ثبت نقشه سایت خود در گوگل و موتورهای جستجوی دیگر استفاده نمایید." XMAP_MESSAGE_EXTENSIONS_DISABLED="کامپوننت نقشه سایت تشخیص داده است که افزونه های زیر می توانند به شما در ایجاد نقشه سایت بهتر از محتوای سایت کمک کنند ولی متاسفانه غیر فعال هستند شما می توانید با رفتن به این آدرس آن ها را فعال کنید مدیریت افزونه ها: %s" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d نقشه سایت با موفقیت از حالت انتشار خارج شدند" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d نقشه سایت با موفقیت از حالت انتشار خارج شد" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d نقشه سایت با موفقیت منتشر شدند" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d نقشه سایت با موفقیت منتشر شد" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED="%d نقشه سایت یا موفقیت منتشر شدند" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d نقشه سایت با موفقیت حذف شد" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED="%d نقشه سایت با موفقیت حذف شدند" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED_1="%d نقشه سایت با موفقیت حذف شد" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d نقشه سایت با موفقیت از حالت انتشار خارج شدند" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d نقشه سایت با موفقیت از حالت انتشار خارج شد" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d نقشه سایت با موفقیت منتشر شدند" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d نقشه سایت با موفقیت منتشر شد" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED="%d نقشه سایت یا موفقیت منتشر شدند" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d نقشه سایت با موفقیت حذف شد" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED="%d نقشه سایت با موفقیت حذف شدند" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED_1="%d نقشه سایت با موفقیت حذف شد" XMAP_FIELDSET_MENUS="منو ها" XMAP_FIELDSET_OPTIONS="تنظیمات" diff --git a/administrator/components/com_joxmap/language/fa-IR/fa-IR.com_xmap.sys.ini b/administrator/components/com_joxmap/language/fa-IR/fa-IR.com_xmap.sys.ini new file mode 100644 index 00000000..9512dc96 --- /dev/null +++ b/administrator/components/com_joxmap/language/fa-IR/fa-IR.com_xmap.sys.ini @@ -0,0 +1,30 @@ +; @package Joomla 2.5 +; @subpackage Xmap +; @description فارسی - ایران +; @version 2.3.2 +; @date 2013-01-20 +; @author محمد حسنی اقتدار +; @copyright http://joomlacode.org/gf/project/farsilanguage +; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL +; @note Client Administrator +; @note All ini files need to be saved as UTF-8 - No BOM + + +COM_JOXMAP="نقشه سایت" +COM_JOXMAP_TITLE="نقشه سایت" + +; View and layout titles and descriptions +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="نفشه سایت نسخه HTML" +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="نمایش نقشه سایت در فرمت HTML" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="نقشه سایت نسخه XML" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="نمایش نقشه سایت در فرمت XML" + +COM_JOXMAP_SELECT_AN_SITEMAP="انتخاب نقشه سایت" +COM_JOXMAP_SELECT_A_SITEMAP="نقشه سایت" +COM_JOXMAP_CHANGE_SITEMAP_BUTTON="تغییر" +COM_JOXMAP_CHANGE_SITEMAP="انتخاب نقشه سایت از لیست" + +COM_INSTALLER_TYPE_XMAP_EXT="افزونه نقشه سایت" +COM_JOXMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="تنظیمات نقشه سایت" +COM_JOXMAP_INCLUDE_CSS_LABEL="اضافه نمودن استایل های نقشه سایت" +COM_JOXMAP_INCLUDE_CSS_DESC="در صورت انتخاب بله، فایل css کامپوننت نقشه سایت هنگام نمایش آن بارگذاری خواهد شد" \ No newline at end of file diff --git a/administrator/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.ini b/administrator/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.ini new file mode 100644 index 00000000..9a57500c --- /dev/null +++ b/administrator/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.ini @@ -0,0 +1,118 @@ +; @package Xmap +; @copyright 2007 - 2012 Joomla! Vargas. All rights reserved. +; @subpackage fr-FR.com_xmap.ini +; @description Traduction francophone - fr-FR +; @version 2.3.0 - 23.10.2012 +; @author Mihàly Marti alias Sarki +; @copyright Joomlatutos.com - www.joomlautos.com +; @license GNU General Public License version 2, or later +; @note Client Administrator +; @note All ini files need to be saved as UTF-8 - No BOM + +; Component Instalation strings +XMAP_INSTALLING_XMAP="Installation du composant Xmap, générateur de plans de site Joomla!" +XMAP_UPGRADING_XMAP="Mise à jour du composant Xmap, générateur de plans de site Joomla!" +XMAP_UNISTALLING_XMAP_EXTENSIONS="Désinstallation de Xmap et ses extensions" +XMAP_INSTALLED_EXTENSION_X="Installation de l'extension %s" +XMAP_NOT_INSTALLED_EXTENSION_X="Il n'est pas possible d'installer l'extension pour %s" +XMAP_INSTALL_ERROR_EXTENSION="Erreur d'installation de l'extension" +XMAP_INSTALL_SUCCESS_EXTENSION="Succès de l'installation de l'extension" + +XMAP_HEADING_XML_STATS="Stat's du plan XML" +XMAP_HEADING_HTML_STATS="Stat's du plan HTML" +XMAP_HEADING_NUM_LINKS="ID Article" +XMAP_HEADING_NUM_HITS="Clics" +XMAP_HEADING_LAST_VISIT="Der. visite" +XMAP_HEADING_SITEMAP="Plan du site" +XMAP_HEADING_DEFAULT="Défaut" +XMAP_HEADING_ID="ID" +XMAP_HEADING_PUBLISHED="Publié" +XMAP_HEADING_ACCESS="Accès" +XMAP_SUBMENU_SITEMAPS="Plans du site" +XMAP_SUBMENU_EXTENSIONS="Extensions" +XMAP_SUBMENU_SETTINGS="Paramètres" +XMAP_TOOLBAR_SET_DEFAULT="Définir par défaut" +XMAP_SITEMAPS_TITLE="Gestion des plans du site" +DATE_MINUTES_AGO="Il y a %d minutes" +DATE_HOURS_MINUTES_AGO="Il y a %d heures et %d minutes" +DATE_DAYS_HOURS_AGO="Il y a %d jours et %d heures" +DATE_NEVER="Jamais" +XMAP_INTROTEXT_LABEL="Texte d'intro" +XMAP_INTROTEXT_DESC="Spécifiez le texte qui sera affiché au-dessus du plan du site" +XMAP_PRIORITY="Priorité" +XMAP_CHANGE_FREQUENCY="Fréquence" +XMAP_PAGE_ADD_SITEMAP="Nouveau plan du site" +XMAP_PAGE_EDIT_SITEMAP="Modifier le plan du site" +XMAP_SITEMAP_DETAILS_FIELDSET="Détails du plan du site" +XMAP_XML_LINK="Plan du site XML" +XMAP_XML_LINK_TOOLTIP="Aller à la version XML du plan du site. Utilisez cette adresse URL pour soumettre votre site aux moteurs de recherche." +XMAP_NEWS_LINK="Nouveau plan" +XMAP_NEWS_LINK_TOOLTIP="Allez à la 'Nouvelle' version du plan du site, utilisez cette adresse URL pour soumettre votre sitemap à Google News." + + +XMAP_MESSAGE_EXTENSIONS_DISABLED="Xmap a détecté que l'extension '%s' peut vous aider à obtenir plus de contenu dans votre plan du site, mais il est désactivé. Vous devez l'activer manuellement dans le gestionnaire d'extensions." +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d plans du site dépubliés avec succès" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d plan du site dépublié avec succès" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d plans du site publiés avec succès" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d plan du site publié avec succès" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED="%d plans du site mises à la corbeille avec succès" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d plan du site mis à la corbeille avec succès" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED="%d plans du site supprimés avec succès" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED_1="%d plan du site supprimé avec succès" + +XMAP_FIELDSET_MENUS="Menus" +XMAP_FIELDSET_OPTIONS="Paramètres" +XMAP_FIELDSET_METADATA="Métadonnées" +XMAP_ATTRIBS_SHOW_INTRO_LABEL="Texte d'introduction" +XMAP_ATTRIBS_SHOW_INTRO_DESC="Spécifiez si le texte d'introduction doit être affiché dans le plan du site HTML." +XMAP_ATTRIBS_SHOW_MENU_TITLE_LABEL="Titre de menu" +XMAP_ATTRIBS_SHOW_MENU_TITLE_DESC="Spécifiez si le titre des menus doit être affiché au dessus du contenu." +XMAP_ATTRIBS_CLASSNAME_LABEL="Nom de classe CSS" +XMAP_ATTRIBS_CLASSNAME_DESC="Nom de la classe CSS à utiliser pour ce plan du site." +XMAP_ATTRIBS_COLUMNS_LABEL="Colonnes" +XMAP_ATTRIBS_COLUMNS_DESC="Spécifiez le nombre de colonnes à afficher dans le plan du site HTML. (Cela n'a d'effet que si le nombre de menus est supérieure à 1)." +XMAP_ATTRIBS_EXTERNAL_LINKS_IMAGE_LABEL="Image des liens externes" +XMAP_ATTRIBS_EXTERNAL_LINKS_IMAGE_DESC="Sélectionnez l'image à utiliser pour les liens externes." +XMAP_ATTRIBS_COMPRESS_XML_LABEL="Compresser le XML" +XMAP_ATTRIBS_COMPRESS_XML_DESC="Spécifiez si le fichier XML du plan du site doit être compressé ou non." +XMAP_ATTRIBS_BEAUTIFY_XML_LABEL="XML embelli" +XMAP_ATTRIBS_BEAUTIFY_XML_DESC="Sélectionnez 'Oui' pour ajouter du style au plan du site XML. Cet affichage n'affecte pas le comportement des moteurs de recherche.
Si le plan du site ne s'affiche pas ou que des erreurs sont visibles, veuillez désactiver cette fonction." +XMAP_FIELDSET_NEWS_OPTIONS="Plan des nouvelles (news)" +XMAP_ATTRIBS_NEWS_PUBLICATION_NAME_LABEL="Nom de publication" +XMAP_ATTRIBS_NEWS_PUBLICATION_NAME_DESC="Nom de publication des nouvelles. Il doit correspondre exactement au nom tel qu'il apparaît sur vos articles dans news.google.com, sans omettre les caractères d'échappement.
Par exemple, si le nom apparaît dans Google news avec des guillemets et contient des parenthèses, vous devez les ajouter dans le nom: “Exemple de nom (description)”" +XMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_LABEL="Mots-clés de messages" +XMAP_ATTRIBS_NEWS_POSTS_KEYWORDS_DESC="Liste des mots clés, séparés par une virgule, pour décrire vos messages. Par défaut, le titre de la catégorie est utilisé." + +XMAP_FILTER_SEARCH_DESC="Filtre de recherche de plan du site" + +; Extension edit page +XMAP_PAGE_EDIT_EXTENSION="Modifier Extension" +XMAP_N_EXTENSIONS_UNPUBLISHED="%s extensions désactivées" +XMAP_N_EXTENSIONS_PUBLISHED="%s extensions activées" +XMAP_EXTENSION_DETAILS="Détails" +XMAP_EXTENSION_AUTHOR="Auteur" +XMAP_EXTENSION_AUTHOR_EMAIL="E-mail de l'auteur" +XMAP_EXTENSION_AUTHOR_WEBSITE="Site de l'auteur" +XMAP_EXTENSION_DESCRIPTION="Descriptif" + +XMAP_DESC_EXTENSIONS="Liste des extensions Xmap installées" +XMAP_HEADING_AUTHOR="Auteur" +XMAP_HEADING_DATE="Date" +XMAP_HEADING_FOLDER="Dossier" +XMAP_HEADING_NUM="Num." +XMAP_HEADING_PLUGIN="Plug-in" +XMAP_HEADING_VERSION="Version" +XMAP_INSTALL="Installer" +XMAP_INSTALL_DIRECTORY="Répertoire d'installation" +XMAP_INSTALL_FROM_DIRECTORY="Installer à partir du répertoire" +XMAP_INSTALL_FROM_URL="Installer à partir de l'URL" +XMAP_INSTALL_NEW_EXTENSION="Installer une nouvelle extension" +XMAP_INSTALL_URL="URL d'installation" +XMAP_PACKAGE_FILE="Fichier d'installation" +XMAP_PLEASE_ENTER_A_URL="Veuillez spécifier l'URL" +XMAP_PLEASE_SELECT_A_DIRECTORY="Veuillez spécifier le répertoire" +XMAP_PLEASE_SELECT_A_FILE_TO_UPLOAD="Veuillez spécifier le fichier à envoyer" +XMAP_UPLOAD_FILE="Envoyer le fichier" +XMAP_UPLOAD_PACKAGE_FILE="Envoyer le fichier d'installation" +XMAP_EXTENSION_MANAGER_TITLE="Gestionnaire d'extensions" +XMAP_EXTENSIONS_TITLE="Extensions" diff --git a/administrator/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.sys.ini b/administrator/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.sys.ini new file mode 100644 index 00000000..8617ae89 --- /dev/null +++ b/administrator/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.sys.ini @@ -0,0 +1,30 @@ +; @package Xmap +; @copyright 2007 - 2012 Joomla! Vargas. All rights reserved. +; @subpackage fr-FR.com_xmap.sys.ini +; @description Traduction francophone - fr-FR +; @version 2.3.0 - 23.10.2012 +; @author Mihàly Marti alias Sarki +; @copyright Joomlatutos.com - www.joomlautos.com +; @license GNU General Public License version 2, or later +; @note Client Administrator +; @note All ini files need to be saved as UTF-8 - No BOM + +COM_JOXMAP="JoXmap - Plans du site" +COM_JOXMAP_XML_DESC="

Xmap - Générateur de plan de site pour Joomla!

Xmap vous permet de créer des plans du site à consulter (HTML), et pour les moteurs de recherche (XML) afin d'améliorer le référencement.

Auteurs : JL TRYOEN and Guillermo Vargas and Jesus Vargas - http://joomla.vargas.co.cr

Traduction FR : Mihàly Marti alias Sarki pour www.joomlatutos.com

" +COM_JOXMAP_TITLE="JoXmap" +DEFAULT="Défaut" +XMAP_FILTER_SEARCH_DESC="Filtre de recherche de plan du site" +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="Plan du site HTML" +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Afficher un plan du site au format HTML" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="Plan du site XML" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Affichez un plan du site au format XML" +COM_JOXMAP_SELECT_AN_SITEMAP="Choisissez un plan du site" +COM_JOXMAP_SELECT_A_SITEMAP="Plan du site" +COM_JOXMAP_CHANGE_SITEMAP_BUTTON="Changement" +COM_JOXMAP_CHANGE_SITEMAP="Sélectionnez un plan du site dans la liste" +XMAP_INSTALLING_XMAP="Installation du composant Xmap, générateur de plans de site pour Joomla!" +XMAP_UPGRADING_XMAP="Mise à jour du composant Xmap, générateur de plans de site pour Joomla!" +XMAP_UNISTALLING_XMAP_EXTENSIONS="Désinstallation de Xmap et ses extensions" +XMAP_INSTALLED_EXTENSION_X="Installation de l'extension %s" +XMAP_NOT_INSTALLED_EXTENSION_X="Impossible d'installer l'extension pour %s" +COM_INSTALLER_TYPE_XMAP_EXT="Extension Xmap" \ No newline at end of file diff --git a/administrator/components/com_xmap/language/nl-NL/nl-NL.com_xmap.ini b/administrator/components/com_joxmap/language/nl-NL/nl-NL.com_xmap.ini similarity index 90% rename from administrator/components/com_xmap/language/nl-NL/nl-NL.com_xmap.ini rename to administrator/components/com_joxmap/language/nl-NL/nl-NL.com_xmap.ini index c79f278a..464d98d6 100644 --- a/administrator/components/com_xmap/language/nl-NL/nl-NL.com_xmap.ini +++ b/administrator/components/com_joxmap/language/nl-NL/nl-NL.com_xmap.ini @@ -47,14 +47,14 @@ XMAP_NEWS_LINK_TOOLTIP="Ga naar de “Nieuws” versie van de sitemap, g XMAP_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" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d sitemaps succesvol gedepubliceerd" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d sitemap succesvol gedepubliceerd" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d sitemaps succesvol gepubliceerd" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d sitemap succesvol gepubliceerd" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED="%d sitemaps succesvol gepubliceerd" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d sitemap succesvol naar trash verplaatst" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED="%d sitemaps succesvol verwijderd" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED_1="%d sitemap succesvol verwijderd" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d sitemaps succesvol gedepubliceerd" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d sitemap succesvol gedepubliceerd" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d sitemaps succesvol gepubliceerd" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d sitemap succesvol gepubliceerd" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED="%d sitemaps succesvol gepubliceerd" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d sitemap succesvol naar trash verplaatst" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED="%d sitemaps succesvol verwijderd" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED_1="%d sitemap succesvol verwijderd" XMAP_FIELDSET_MENUS="Menu's" XMAP_FIELDSET_OPTIONS="Opties" diff --git a/administrator/components/com_joxmap/language/nl-NL/nl-NL.com_xmap.sys.ini b/administrator/components/com_joxmap/language/nl-NL/nl-NL.com_xmap.sys.ini new file mode 100644 index 00000000..2aa54ff1 --- /dev/null +++ b/administrator/components/com_joxmap/language/nl-NL/nl-NL.com_xmap.sys.ini @@ -0,0 +1,26 @@ +; $Id$ +; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. +; GNU General Public License version 2 or later; see LICENSE.txt +; Guillermo Vargas (guille@vargas.co.cr) +; + +COM_JOXMAP="Xmap" +COM_JOXMAP_TITLE="Xmap" + +; +; View and layout titles and descriptions +; +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="HTML Site map" +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Toon een sitemap in HTML formaat" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="XML sitemap" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Toon een sitemap in XML formaat" + +COM_JOXMAP_SELECT_AN_SITEMAP="Kies een sitemap" +COM_JOXMAP_SELECT_A_SITEMAP="Een sitemap" +COM_JOXMAP_CHANGE_SITEMAP_BUTTON="Wijzig" +COM_JOXMAP_CHANGE_SITEMAP="Selecteer een sitemap uit de lijst" + +COM_INSTALLER_TYPE_XMAP_EXT="Xmap extensie" +COM_JOXMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Sitemap instellingen" +COM_JOXMAP_INCLUDE_CSS_LABEL="Xmap's stijl gebruiken" +COM_JOXMAP_INCLUDE_CSS_DESC="Selecteer Ja om het CSS bestand met de stijlen voor de Sitemap te gebruiken" \ No newline at end of file diff --git a/administrator/components/com_xmap/language/ru-RU/ru-RU.com_xmap.ini b/administrator/components/com_joxmap/language/ru-RU/ru-RU.com_xmap.ini similarity index 90% rename from administrator/components/com_xmap/language/ru-RU/ru-RU.com_xmap.ini rename to administrator/components/com_joxmap/language/ru-RU/ru-RU.com_xmap.ini index 826151ba..a6fb1134 100644 --- a/administrator/components/com_xmap/language/ru-RU/ru-RU.com_xmap.ini +++ b/administrator/components/com_joxmap/language/ru-RU/ru-RU.com_xmap.ini @@ -47,14 +47,14 @@ XMAP_NEWS_LINK_TOOLTIP="Зайдите в раздел “Новости&rdq XMAP_MESSAGE_EXTENSIONS_DISABLED="Xmap обнаружил, что следующие расширения могут помочь получить больше содержания в карте сайта, но они отключены, вам нужно вручную включить их посетив Менеджер расширений: %s" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d карты сайта успешно сняты с публикации" -COM_XMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d карта сайта успешно снята с публикации" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d карты сайта успешно опубликованы" -COM_XMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d карта сайта успешно опубликована" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED="%d карты сайта успешно перенесены в корзину" -COM_XMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d карта сайта успешно перенесена в корзину" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED="%d карты сайта успешно удалены" -COM_XMAP_SITEMAPS_N_ITEMS_DELETED_1="%d карта сайта успешно удалена" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED="%d карты сайта успешно сняты с публикации" +COM_JOXMAP_SITEMAPS_N_ITEMS_UNPUBLISHED_1="%d карта сайта успешно снята с публикации" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED="%d карты сайта успешно опубликованы" +COM_JOXMAP_SITEMAPS_N_ITEMS_PUBLISHED_1="%d карта сайта успешно опубликована" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED="%d карты сайта успешно перенесены в корзину" +COM_JOXMAP_SITEMAPS_N_ITEMS_TRASHED_1="%d карта сайта успешно перенесена в корзину" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED="%d карты сайта успешно удалены" +COM_JOXMAP_SITEMAPS_N_ITEMS_DELETED_1="%d карта сайта успешно удалена" XMAP_FIELDSET_MENUS="Меню" XMAP_FIELDSET_OPTIONS="Параметры" diff --git a/administrator/components/com_joxmap/language/ru-RU/ru-RU.com_xmap.sys.ini b/administrator/components/com_joxmap/language/ru-RU/ru-RU.com_xmap.sys.ini new file mode 100644 index 00000000..d2531941 --- /dev/null +++ b/administrator/components/com_joxmap/language/ru-RU/ru-RU.com_xmap.sys.ini @@ -0,0 +1,26 @@ +; $Id$ +; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. +; GNU General Public License version 2 or later; see LICENSE.txt +; Guillermo Vargas (guille@vargas.co.cr) +; + +COM_JOXMAP="Xmap" +COM_JOXMAP_TITLE="Xmap" + +; +; View and layout titles and descriptions +; +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="Карта сайта в HTML" +COM_JOXMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Отображать карту сайта в HTML формате" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="Карта сайта в XML" +COM_JOXMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Отображать карту сайта в XML формате" + +COM_JOXMAP_SELECT_AN_SITEMAP="Выберите карту сайта" +COM_JOXMAP_SELECT_A_SITEMAP="Карта сайта" +COM_JOXMAP_CHANGE_SITEMAP_BUTTON="Изменить" +COM_JOXMAP_CHANGE_SITEMAP="Выберите карту сайта из списка" + +COM_INSTALLER_TYPE_XMAP_EXT="Xmap расширение" +COM_JOXMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Настройки Sitemap" +COM_JOXMAP_INCLUDE_CSS_LABEL="Включить Xmap's стиль" +COM_JOXMAP_INCLUDE_CSS_DESC="Выберите Да, для включения CSS-файла со стилями для sitemap" \ No newline at end of file diff --git a/administrator/components/com_joxmap/services/provider.php b/administrator/components/com_joxmap/services/provider.php new file mode 100644 index 00000000..aeec427f --- /dev/null +++ b/administrator/components/com_joxmap/services/provider.php @@ -0,0 +1,38 @@ +registerServiceProvider(new MVCFactory('\\JLTRY\\Component\\JoXmap')); + $container->registerServiceProvider(new ComponentDispatcherFactory('\\JLTRY\\Component\\JoXmap')); + $container->set( + ComponentInterface::class, + function (Container $container) { + $component = new MVCComponent($container->get(ComponentDispatcherFactoryInterface::class)); + $component->setMVCFactory($container->get(MVCFactoryInterface::class)); + + return $component; + } + ); + } +}; \ No newline at end of file diff --git a/administrator/components/com_xmap/elements/index.html b/administrator/components/com_joxmap/sql/index.html similarity index 100% rename from administrator/components/com_xmap/elements/index.html rename to administrator/components/com_joxmap/sql/index.html diff --git a/administrator/components/com_xmap/install/install.utf8.sql b/administrator/components/com_joxmap/sql/install.mysql.sql similarity index 91% rename from administrator/components/com_xmap/install/install.utf8.sql rename to administrator/components/com_joxmap/sql/install.mysql.sql index f67b7046..f3e359d2 100644 --- a/administrator/components/com_xmap/install/install.utf8.sql +++ b/administrator/components/com_joxmap/sql/install.mysql.sql @@ -1,4 +1,4 @@ -CREATE TABLE IF NOT EXISTS `#__xmap_sitemap` ( +CREATE TABLE IF NOT EXISTS `#__joxmap_sitemap` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(255) DEFAULT NULL, `alias` varchar(255) DEFAULT NULL, @@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS `#__xmap_sitemap` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `#__xmap_items` ( +CREATE TABLE IF NOT EXISTS `#__joxmap_items` ( `uid` varchar(100) NOT NULL, `itemid` int(11) NOT NULL, `view` varchar(10) NOT NULL, diff --git a/administrator/components/com_joxmap/sql/uninstall.mysql.sql b/administrator/components/com_joxmap/sql/uninstall.mysql.sql new file mode 100644 index 00000000..566f95db --- /dev/null +++ b/administrator/components/com_joxmap/sql/uninstall.mysql.sql @@ -0,0 +1,2 @@ +drop table `#__joxmap_items`; +drop table `#__joxmap_sitemap`; \ No newline at end of file diff --git a/administrator/components/com_joxmap/src/Controller/DisplayController.php b/administrator/components/com_joxmap/src/Controller/DisplayController.php new file mode 100644 index 00000000..57a540ea --- /dev/null +++ b/administrator/components/com_joxmap/src/Controller/DisplayController.php @@ -0,0 +1,73 @@ +app->getInput(); + // Set the default view (if not specified) + $vName = $input->getCmd('view', 'SiteMaps'); + $document = Factory::getDocument(); + $vFormat = $document->getType(); + $input->set('view', $vName); + // Get and render the view. + if ($view = $this->getView($vName, $vFormat)) { + // Get the model for the view. + $model = $this->getModel($vName); + + // Push the model into the view (as default). + $view->setModel($model, true); + //$view->setLayout($lName); + + // Push document object into the view. + $view->document = $document; + + $view->display(); + + } + */ + $input = $this->app->getInput(); + // Set the default view (if not specified) + $input->set('view', $input->getCmd('view', 'Sitemaps')); + + // Call parent to display + parent::display($cachable); + } +} \ No newline at end of file diff --git a/administrator/components/com_joxmap/src/Controller/JoXMapController.php b/administrator/components/com_joxmap/src/Controller/JoXMapController.php new file mode 100644 index 00000000..a0757dee --- /dev/null +++ b/administrator/components/com_joxmap/src/Controller/JoXMapController.php @@ -0,0 +1,113 @@ +registerTask('navigator-links', 'navigatorLinks'); + } + + + function navigator() + { + $db = Factory::getDBO(); + $document = Factory::getDocument(); + $app = Factory::getApplication('administrator'); + + $id = XmapHelper::getInt('sitemap', 0); + $link = urldecode(XmapHelper::getVar('link', '')); + $name = XmapHelper::getCmd('e_name', ''); + if (!$id) { + $id = $this->getDefaultSitemapId(); + } + + if (!$id) { + Factory::getApplication()->enqueueMessage(500, Text::_('JOXMAP_NOT_SITEMAP_SELECTED'), 'warning'); + return false; + } + + $app->setUserState('com_joxmap.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->assignRef('document', $document); + + $view->navigator(); + } + + function navigatorLinks() + { + + $db = Factory::getDBO(); + $document = Factory::getDocument(); + $app = Factory::getApplication('administrator'); + + $id = XmapHelper::getInt('sitemap', 0); + $link = urldecode(XmapHelper::getVar('link', '')); + $name = XmapHelper::getCmd('e_name', ''); + if (!$id) { + $id = $this->getDefaultSitemapId(); + } + + if (!$id) { + Factory::getApplication()->enqueueMessage(500, Text::_('Xmap_Not_Sitemap_Selected'), 'warning'); + return false; + } + + $app->setUserState('com_joxmap.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->assignRef('document', $document); + + $view->navigatorLinks(); + } + + private function getDefaultSitemapId() + { + $db = Factory::getDBO(); + $query = $db->getQuery(true); + $query->select('id'); + $query->from($db->quoteName('#__joxmap_sitemap')); + $query->where('is_default=1'); + $db->setQuery($query); + return $db->loadResult(); + } + +} \ No newline at end of file diff --git a/administrator/components/com_joxmap/src/Controller/SitemapController.php b/administrator/components/com_joxmap/src/Controller/SitemapController.php new file mode 100644 index 00000000..0ce9ec3f --- /dev/null +++ b/administrator/components/com_joxmap/src/Controller/SitemapController.php @@ -0,0 +1,43 @@ +authorise('core.edit', 'com_joxmap.sitemap.'.$recordId); + } +} \ No newline at end of file diff --git a/administrator/components/com_joxmap/src/Controller/SitemapsController.php b/administrator/components/com_joxmap/src/Controller/SitemapsController.php new file mode 100644 index 00000000..c9748624 --- /dev/null +++ b/administrator/components/com_joxmap/src/Controller/SitemapsController.php @@ -0,0 +1,97 @@ +registerTask('unpublish', 'publish'); + $this->registerTask('trash', 'publish'); + $this->registerTask('unfeatured', 'featured'); + } + + + /** + * Method to toggle the default sitemap. + * + * @return void + * @since 2.0 + */ + function setDefault() + { + // Check for request forgeries + if (version_compare(Version, '4.0', '<')){ + Factory::getApplication()->input->checkToken() or die('Invalid Token'); + } + + // Get items to publish from the request. + $cid = JoXmapHelper::getVar('cid', 0, '', 'array'); + $id = @$cid[0]; + + if (!$id) { + Factory::getApplication()->enqueueMessage(500, Text::_('Select an item to set as default'), 'warning'); + } + else + { + // Get the model. + $model = $this->getModel(); + + // Publish the items. + if (!$model->setDefault($id)) { + Factory::getApplication()->enqueueMessage(500, $model->getError(), 'warning'); + } + } + + $this->setRedirect('index.php?option=com_joxmap&view=sitemaps'); + } + + /** + * Proxy for getModel. + * + * @param string $name The name of the model. + * @param string $prefix The prefix for the PHP class name. + * + * @return JModel + * @since 2.0 + */ + public function getModel($name = 'Sitemap', $prefix = 'JoXmapModel', $config = array('ignore_request' => true)) + { + $model = parent::getModel($name, $prefix, $config); + + return $model; + } +} \ No newline at end of file diff --git a/administrator/components/com_xmap/helpers/html/index.html b/administrator/components/com_joxmap/src/Controller/index.html similarity index 100% rename from administrator/components/com_xmap/helpers/html/index.html rename to administrator/components/com_joxmap/src/Controller/index.html diff --git a/administrator/components/com_xmap/models/fields/xmapmenus.php b/administrator/components/com_joxmap/src/Field/XmapmenusField.php similarity index 70% rename from administrator/components/com_xmap/models/fields/xmapmenus.php rename to administrator/components/com_joxmap/src/Field/XmapmenusField.php index 54a8adfa..5ed06b25 100644 --- a/administrator/components/com_xmap/models/fields/xmapmenus.php +++ b/administrator/components/com_joxmap/src/Field/XmapmenusField.php @@ -1,23 +1,33 @@ getQuery(true); //$currentMenus = array_keys(get_object_vars($this->value)); @@ -65,10 +75,11 @@ protected function _getOptions() } // Check for a database error. - if ($db->getErrorNum()) { - JError::raiseWarning(500, $db->getErrorMsg()); + if (version_compare(Version::MAJOR_VERSION, '4.0', '<')){ + if ($db->getErrorNum()) { + JError::raiseWarning(500, $db->getErrorMsg()); + } } - $options = array_merge( parent::getOptions(), $options @@ -86,8 +97,8 @@ protected function getInput() $disabled = $this->element['disabled'] == 'true' ? true : false; $readonly = $this->element['readonly'] == 'true' ? true : false; $attributes = ' '; - $type = 'radio'; + if ($v = $this->element['size']) { $attributes .= 'size="' . $v . '" '; } @@ -103,16 +114,16 @@ protected function getInput() $value = $this->value; if (!is_array($value)) { // Convert the selections field to an array. - $registry = new JRegistry; + $registry = new Registry; $registry->loadString($value); $value = $registry->toArray(); } - - $doc = JFactory::getDocument(); - $doc->addScriptDeclaration(" - window.addEvent('domready',function(){ - \$\$('div.xmap-menu-options select').addEvent('mouseover',function(event){xmapMenusSortable.detach();}) - \$\$('div.xmap-menu-options select').addEvent('mouseout',function(event){xmapMenusSortable.attach();}) + $version = new Version; + if (version_compare($version->getShortVersion(), '4.0.0-beta', '<')) { + $doc = Factory::getDocument(); + $doc->addScriptDeclaration("jQuery(document).ready(function($) { + \$('.xmap-menu-options select').mouseover(function(event){xmapMenusSortable.detach();}); + \$('.xmap-menu-options select').mouseout(function(event){xmapMenusSortable.attach();}); var xmapMenusSortable = new Sortables(\$('ul_" . $this->inputId . "'),{ clone:true, revert: true, @@ -124,7 +135,7 @@ protected function getInput() el.setStyle('background','#eee'); } }); - });"); + });"); } if ($disabled || $readonly) { $attributes .= 'disabled="disabled"'; @@ -149,10 +160,10 @@ protected function getInput() $return .= ''; $return .= ''; $return .= ''; $return .= ''; } diff --git a/administrator/components/com_xmap/helpers/index.html b/administrator/components/com_joxmap/src/Field/index.html similarity index 100% rename from administrator/components/com_xmap/helpers/index.html rename to administrator/components/com_joxmap/src/Field/index.html diff --git a/administrator/components/com_xmap/images/index.html b/administrator/components/com_joxmap/src/Field/modal/index.html similarity index 100% rename from administrator/components/com_xmap/images/index.html rename to administrator/components/com_joxmap/src/Field/modal/index.html diff --git a/administrator/components/com_joxmap/src/Field/modal/sitemaps.php b/administrator/components/com_joxmap/src/Field/modal/sitemaps.php new file mode 100644 index 00000000..2ffc5ef1 --- /dev/null +++ b/administrator/components/com_joxmap/src/Field/modal/sitemaps.php @@ -0,0 +1,98 @@ +')) + { + HTMLHelper::_('bootstrap.renderModal', 'moderateModal'); + } else + { + JHTMLHelper::_('behavior.modal', 'a.modal'); + } + + // Get the title of the linked chart + if ($this->value) { + $db->setQuery( + 'SELECT title' . + ' FROM #__joxmap_sitemap' . + ' WHERE id = ' . (int) $this->value + ); + $title = $db->loadResult(); + if (version_compare(Version, '4.0', '<')){ + if ($error = $db->getErrorMsg()) { + Factory::getApplication()->enqueueMessage(500, $error, 'warning'); + } + } + } else { + $title = ''; + } + + if (empty($title)) { + $title = Text::_('COM_JOXMAP_SELECT_AN_SITEMAP'); + } + + $doc->addScriptDeclaration( + "function jSelectSitemap_" . $this->id . "(id, title, object) { + $('" . $this->id . "_id').value = id; + $('" . $this->id . "_name').value = title; + SqueezeBox.close(); + }" + ); + + $link = 'index.php?option=com_joxmap&view=sitemaps&layout=modal&tmpl=component&function=jSelectSitemap_' . $this->id; + if (version_compare(Version, '4.0', '<')){ + JHTMLHelper::_('behavior.modal', 'a.modal'); + } + $html = ''; + $html .= "\n" . ''; + if(version_compare(Version,'3.0.0','ge')) + $html .= ' ' . Text::_('COM_JOXMAP_CHANGE_SITEMAP_BUTTON') . '' . "\n"; + else + $html .= '
' . Text::_('COM_JOXMAP_CHANGE_SITEMAP_BUTTON') . '
' . "\n"; + $html .= ''; + $html .= "\n" . ''; + return $html; + } + +} \ No newline at end of file diff --git a/administrator/components/com_joxmap/src/Helper/HTMLHelperXmap.php b/administrator/components/com_joxmap/src/Helper/HTMLHelperXmap.php new file mode 100644 index 00000000..3eeee1fa --- /dev/null +++ b/administrator/components/com_joxmap/src/Helper/HTMLHelperXmap.php @@ -0,0 +1,57 @@ +getShortVersion(), '3.0.0', '<')) { + JSubMenuHelper::addEntry( + Text::_('Xmap_Submenu_Sitemaps'), + 'index.php?option=com_joxmap', + $vName == 'sitemaps' + ); + JSubMenuHelper::addEntry( + Text::_('Xmap_Submenu_Extensions'), + 'index.php?option=com_plugins&view=plugins&filter[folder]=joxmap', + $vName == 'extensions'); + } else { + SideBar::addEntry( + Text::_('Xmap_Submenu_Sitemaps'), + 'index.php?option=com_joxmap', + $vName == 'sitemaps' + ); + SideBar::addEntry( + Text::_('Xmap_Submenu_Extensions'), + 'index.php?option=com_plugins&view=plugins&filter[folder]=joxmap', + $vName == 'extensions'); + } + } + + public static function getpost() { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + return Factory::getApplication()->input->getArray(array()); + } + else { + return call_user_func_array('XmapHelper::get', ['post']); + } + } + + public static function get(...$params) { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + if ($params[0] == 'post '){ + return Factory::getApplication()->input->getInputForRequestMethod('POST'); + } else { + return call_user_func_array(array(Factory::getApplication()->input, 'get'), $params); + } + } + else { + return call_user_func_array('XmapHelper::get', $params); + } + } + + public static function getVar(...$params) { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + return call_user_func_array(array(Factory::getApplication()->input, 'getVar'), $params); + } + else { + return call_user_func_array('XmapHelper::getVar', $params); + } + } + + + public static function setVar(...$params) { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + call_user_func_array(array(Factory::getApplication()->input, 'setVar'), $params); + } + else { + call_user_func_array('XmapHelper::setVar', $params); + } + } + + public static function getCmd(...$params) { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + return call_user_func_array(array(Factory::getApplication()->input, 'getCmd'), $params); + } + else { + return call_user_func_array('XmapHelper::getCmd', $params); + } + } + + public static function getInt(...$params) { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + $recordId = call_user_func_array(array(Factory::getApplication()->input, 'getInt'), $params); + } + else { + $recordId = (int)call_user_func_array('XmapHelper::getInt', $params); + } + } + + + public static function getBool(...$params) { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + return call_user_func_array(array(Factory::getApplication()->input, 'getBool'), $params); + } + else { + return (int)call_user_func_array('XmapHelper::getBool', $params); + } + } + public static function getWord(...$params) { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + return call_user_func_array(array(Factory::getApplication()->input, 'getWord'), $params); + } + else { + return (int)call_user_func_array('XmapHelper::getWord', $params); + } + } + + public static function getURI() { + if (Version_compare(Version::MAJOR_VERSION, '4.0', 'ge')){ + return JUri::getInstance(); + } + else { + return Factory::getURI(); + } + } + + public static function getShortVersion() { + return implode(".", array_slice(explode(".", Version), 0,3)); + } +} diff --git a/administrator/components/com_xmap/index.html b/administrator/components/com_joxmap/src/Helper/index.html similarity index 100% rename from administrator/components/com_xmap/index.html rename to administrator/components/com_joxmap/src/Helper/index.html diff --git a/administrator/components/com_joxmap/src/Helper/installer.php b/administrator/components/com_joxmap/src/Helper/installer.php new file mode 100644 index 00000000..46eeebf0 --- /dev/null +++ b/administrator/components/com_joxmap/src/Helper/installer.php @@ -0,0 +1,45 @@ +load('com_installer', JPATH_ADMINISTRATOR); + +class JoXmapInstaller extends JInstaller +{ + + public function __construct($basepath, $classprefix=null, $adapterfolder=null) + { + JAdapter::__construct(JPATH_ADMINISTRATOR '/components/com_joxmap', 'JInstaller'); + } + + /** + * Returns a reference to the Xmap Installer object, only creating it + * if it doesn't already exist. + * + * @static + * @return object An installer object + */ + public static function getInstance() + { + static $instance; + + if (!isset($instance)) { + $instance = new JoXmapInstaller(''); + } + return $instance; + } + +} \ No newline at end of file diff --git a/administrator/components/com_xmap/models/sitemap.php b/administrator/components/com_joxmap/src/Model/SitemapModel.php similarity index 60% rename from administrator/components/com_xmap/models/sitemap.php rename to administrator/components/com_joxmap/src/Model/SitemapModel.php index de8754fb..6d6bd6e1 100644 --- a/administrator/components/com_xmap/models/sitemap.php +++ b/administrator/components/com_joxmap/src/Model/SitemapModel.php @@ -1,24 +1,37 @@ _item = 'sitemap'; - $this->_option = 'com_xmap'; + $this->_option = 'com_joxmap'; } /** @@ -39,31 +52,37 @@ public function __construct($config = array()) */ protected function _populateState() { - $app = JFactory::getApplication('administrator'); + $app = Factory::getApplication('administrator'); // Load the User state. - if (!($pk = (int) $app->getUserState('com_xmap.edit.sitemap.id'))) { - $pk = (int) JRequest::getInt('id'); + if (!($pk = (int) $app->getUserState('com_joxmap.edit.sitemap.id'))) { + $pk = Factory::getApplication()->input->getInt('id'); } $this->setState('sitemap.id', $pk); // Load the parameters. - $params = JComponentHelper::getParams('com_xmap'); + $params = ComponentHelper::getParams('com_joxmap'); $this->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 - */ - public function getTable($type = 'Sitemap', $prefix = 'XmapTable', $config = array()) - { - return JTable::getInstance($type, $prefix, $config); - } +/** + * Returns a reference to the 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 Table A database object + * @since 1.6 + */ + public function getTable($type = 'Joxmap', $prefix = 'Administrator', $config = array()) + { + /** @var \Joomla\CMS\MVC\Factory\MVCFactory $mvc */ + $mvc = Factory::getApplication() + ->bootComponent("com_joxmap") + ->getMVCFactory(); + return $mvc->createTable($type, $prefix, $config); + } + /** * Method to get a single record. @@ -74,38 +93,7 @@ public function getTable($type = 'Sitemap', $prefix = 'XmapTable', $config = arr */ 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); - - // Check for a table object error. - if ($return === false && $table->getError()) { - $this->setError($table->getError()); - return $false; - } - - // Prime required properties. - if (empty($table->id)) - { - // Prepare data for a new record. - } - - // Convert to the JObject before adding other data. - $value = $table->getProperties(1); - $value = JArrayHelper::toObject($value, 'JObject'); - - // Convert the params field to an array. - $registry = new JRegistry; - $registry->loadString($table->attribs); - $value->attribs = $registry->toArray(); - - return $value; + return parent::getItem($pk); } /** @@ -119,7 +107,8 @@ public function getItem($pk = null) public function getForm($data = array(), $loadData = true) { // Get the form. - $form = $this->loadForm('com_xmap.sitemap', 'sitemap', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_joxmap.sitemap', 'sitemap', array('control' => 'jform', 'load_data' => $loadData)); + if (empty($form)) { return false; } @@ -136,7 +125,7 @@ public function getForm($data = array(), $loadData = true) protected function loadFormData() { // Check the session for previously entered form data. - $data = JFactory::getApplication()->getUserState('com_xmap.edit.sitemap.data', array()); + $data = Factory::getApplication()->getUserState('com_joxmap.edit.sitemap.data', array()); if (empty($data)) { $data = $this->getItem(); @@ -156,7 +145,6 @@ protected function loadFormData() public function save($data) { // Initialise variables; - $dispatcher = JDispatcher::getInstance(); $table = $this->getTable(); $pk = (!empty($data['id'])) ? $data['id'] : (int)$this->getState('sitemap.id'); $isNew = true; @@ -169,7 +157,7 @@ public function save($data) // Bind the data. if (!$table->bind($data)) { - $this->setError(JText::sprintf('JERROR_TABLE_BIND_FAILED', $table->getError())); + $this->setError(Text::sprintf('JERROR_TABLE_BIND_FAILED', $table->getError())); return false; } @@ -198,19 +186,18 @@ public function save($data) if ($table->is_default) { $query = $this->_db->getQuery(true) - ->update($this->_db->quoteName('#__xmap_sitemap')) + ->update($this->_db->quoteName('#__joxmap_sitemap')) ->set($this->_db->quoteName('is_default').' = 0') ->where($this->_db->quoteName('id').' <> '.$table->id); $this->_db->setQuery($query); - if (!$this->_db->query()) { - $this->setError($table->_db->getErrorMsg()); - return false; + if (!$this->_db->execute()) { + $this->setError($table->_db->getErrorMsg()); } } // Clean the cache. - $cache = JFactory::getCache('com_xmap'); + $cache = Factory::getCache('com_joxmap'); $cache->clean(); $this->setState('sitemap.id', $table->id); @@ -236,21 +223,27 @@ function setDefault($id) { $table = $this->getTable(); if ($table->load($id)) { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true) - ->update($db->quoteName('#__xmap_sitemap')) + ->update($db->quoteName('#__joxmap_sitemap')) ->set($db->quoteName('is_default').' = 0') ->where($db->quoteName('id').' <> '.$table->id); $this->_db->setQuery($query); - if (!$this->_db->query()) { - $this->setError($table->_db->getErrorMsg()); - return false; - } + if (version_compare(Version, '4.0', 'ge')) { + if (!$this->_db->execute()) { + $this->setError($table->_db->getErrorMsg()); + } + } else { + if (!$this->_db->query()) { + $this->setError($table->_db->getErrorMsg()); + return false; + } + } $table->is_default = 1; $table->store(); // Clean the cache. - $cache = JFactory::getCache('com_xmap'); + $cache = Factory::getCache('com_joxmap'); $cache->clean(); return true; } @@ -267,10 +260,10 @@ public function checkout($pk = null) private function getDefaultSitemapId() { - $db = JFactory::getDBO(); + $db = Factory::getDBO(); $query = $db->getQuery(true); $query->select('id'); - $query->from($db->quoteName('#__xmap_sitemap')); + $query->from($db->quoteName('#__joxmap_sitemap')); $query->where('is_default=1'); $db->setQuery($query); return $db->loadResult(); diff --git a/administrator/components/com_xmap/models/sitemaps.php b/administrator/components/com_joxmap/src/Model/SitemapsModel.php similarity index 87% rename from administrator/components/com_xmap/models/sitemaps.php rename to administrator/components/com_joxmap/src/Model/SitemapsModel.php index 3a970612..8663b567 100644 --- a/administrator/components/com_xmap/models/sitemaps.php +++ b/administrator/components/com_joxmap/src/Model/SitemapsModel.php @@ -1,15 +1,21 @@ context .= '.'.$layout; } @@ -116,7 +122,7 @@ protected function getListQuery($resolveFKs = true) 'list.select', 'a.*') ); - $query->from('#__xmap_sitemap AS a'); + $query->from('#__joxmap_sitemap AS a'); // Join over the asset groups. $query->select('ag.title AS access_level'); @@ -159,7 +165,7 @@ public function getExtensionsMessage() $query = $db->getQuery(true); $query->select('e.*'); $query->from($db->quoteName('#__extensions'). 'AS e'); - $query->join('INNER', '#__extensions AS p ON e.element=p.element and p.enabled=0 and p.type=\'plugin\' and p.folder=\'xmap\''); + $query->join('INNER', '#__extensions AS p ON e.element=p.element and p.enabled=0 and p.type=\'plugin\' and p.folder=\'joxmap\''); $query->where('e.type=\'component\' and e.enabled=1'); $db->setQuery($query); @@ -171,7 +177,7 @@ public function getExtensionsMessage() $sep = ', '; } - return JText::sprintf('XMAP_MESSAGE_EXTENSIONS_DISABLED',$extensionsNameList); + return Text::sprintf('XMAP_MESSAGE_EXTENSIONS_DISABLED',$extensionsNameList); } else { return ""; } diff --git a/administrator/components/com_xmap/install/index.html b/administrator/components/com_joxmap/src/Model/index.html similarity index 100% rename from administrator/components/com_xmap/install/index.html rename to administrator/components/com_joxmap/src/Model/index.html diff --git a/administrator/components/com_xmap/tables/sitemap.php b/administrator/components/com_joxmap/src/Table/JoxmapTable.php similarity index 81% rename from administrator/components/com_xmap/tables/sitemap.php rename to administrator/components/com_joxmap/src/Table/JoxmapTable.php index 3593df43..124b15a5 100644 --- a/administrator/components/com_xmap/tables/sitemap.php +++ b/administrator/components/com_joxmap/src/Table/JoxmapTable.php @@ -1,19 +1,29 @@ loadArray($array['attribs']); $array['attribs'] = $registry->toString(); } @@ -128,13 +138,13 @@ function bind($array, $ignore = '') ); } - $registry = new JRegistry(); + $registry = new Registry(); $registry->loadArray($selections); $array['selections'] = $registry->toString(); } if (isset($array['metadata']) && is_array($array['metadata'])) { - $registry = new JRegistry(); + $registry = new Registry(); $registry->loadArray($array['metadata']); $array['metadata'] = $registry->toString(); } @@ -154,17 +164,17 @@ function check() { if (empty($this->title)) { - $this->setError(JText::_('Sitemap must have a title')); + $this->setError(Text::_('Sitemap must have a title')); return false; } if (empty($this->alias)) { $this->alias = $this->title; } - $this->alias = JApplication::stringURLSafe($this->alias); + $this->alias = ApplicationHelper::stringURLSafe($this->alias); if (trim(str_replace('-', '', $this->alias)) == '') { - $datenow = &JFactory::getDate(); + $datenow = &Factory::getDate(); $this->alias = $datenow->format("Y-m-d-H-i-s"); } @@ -180,7 +190,7 @@ function check() */ public function store($updateNulls = false) { - $date = JFactory::getDate(); + $date = Factory::getDate(); if (!$this->id) { $this->created = $date->toSql(); } @@ -204,7 +214,7 @@ public function publish($pks = null, $state = 1, $userId = 0) $k = $this->_tbl_key; // Sanitize input. - JArrayHelper::toInteger($pks); + ArrayHelper::toInteger($pks); $userId = (int) $userId; $state = (int) $state; @@ -215,7 +225,7 @@ public function publish($pks = null, $state = 1, $userId = 0) } // Nothing to set publishing state on, return false. else { - $this->setError(JText::_('No_Rows_Selected')); + $this->setError(Text::_('No_Rows_Selected')); return false; } } @@ -226,17 +236,13 @@ public function publish($pks = null, $state = 1, $userId = 0) // Update the publishing state for rows with the given primary keys. $query = $this->_db->getQuery(true) - ->update($this->_db->quoteName('#__xmap_sitemap')) + ->update($this->_db->quoteName('#__joxmap_sitemap')) ->set($this->_db->quoteName('state').' = '. (int) $state) ->where($where); $this->_db->setQuery($query); - $this->_db->query(); - - // Check for a database error. - if ($this->_db->getErrorNum()) { - $this->setError($this->_db->getErrorMsg()); - return false; + if (!$this->_db->execute()) { + return false; } // If the JTable instance value is in the list of primary keys that were set, set the instance. diff --git a/administrator/components/com_xmap/models/fields/index.html b/administrator/components/com_joxmap/src/Table/index.html similarity index 100% rename from administrator/components/com_xmap/models/fields/index.html rename to administrator/components/com_joxmap/src/Table/index.html diff --git a/administrator/components/com_xmap/views/sitemap/view.html.php b/administrator/components/com_joxmap/src/View/Sitemap/HtmlView.php similarity index 64% rename from administrator/components/com_xmap/views/sitemap/view.html.php rename to administrator/components/com_joxmap/src/View/Sitemap/HtmlView.php index 638d6b30..e242a34e 100644 --- a/administrator/components/com_xmap/views/sitemap/view.html.php +++ b/administrator/components/com_joxmap/src/View/Sitemap/HtmlView.php @@ -1,27 +1,33 @@ state = $this->get('State'); + $app = Factory::getApplication(); $this->item = $this->get('Item'); + if ($this->item) { + $this->state = $this->get('State'); + } $this->form = $this->get('Form'); - - $version = new JVersion; + $this->fieldsets = $this->form ? $this->form->getFieldsets() : null; // Check for errors. if (count($errors = $this->get('Errors'))) { @@ -49,20 +56,17 @@ function display($tpl = null) return false; } - JHTML::stylesheet('administrator/components/com_xmap/css/xmap.css'); + HTMLHelper::stylesheet('media/com_joxmap/css/xmapedit.css'); // Convert dates from UTC $offset = $app->getCfg('offset'); if (intval($this->item->created)) { - $this->item->created = JHtml::date($this->item->created, '%Y-%m-%d %H-%M-%S', $offset); + $this->item->created = HTMLHelper::date($this->item->created, '%Y-%m-%d %H-%M-%S', $offset); } - $this->_setToolbar(); + $this->addToolbar(); - if (version_compare($version->getShortVersion(), '3.0.0', '<')) { - $tpl = 'legacy'; - } + // XmapHelper::setVar('hidemainmenu', true); parent::display($tpl); - JRequest::setVar('hidemainmenu', true); } /** @@ -72,21 +76,22 @@ function display($tpl = null) */ function navigator($tpl = null) { - require_once(JPATH_COMPONENT_SITE . '/helpers/xmap.php'); - $app = JFactory::getApplication(); - $this->state = $this->get('State'); + $app = Factory::getApplication(); $this->item = $this->get('Item'); + if ($this->item) { + $this->state = $this->get('State'); + } - # $menuItems = XmapHelper::getMenuItems($item->selections); - # $extensions = XmapHelper::getExtensions(); + $menuItems = XmapHelper::getMenuItems($item->selections); + $extensions = XmapHelper::getExtensions(); // Check for errors. if (count($errors = $this->get('Errors'))) { JError::raiseError(500, implode("\n", $errors)); return false; } - JHTML::script('mootree.js', 'media/system/js/'); - JHTML::stylesheet('mootree.css', 'media/system/css/'); + HTMLHelper::script('mootree.js', 'media/system/js/'); + HTMLHelper::stylesheet('mootree.css', 'media/system/css/'); $this->loadTemplate('class'); $displayer = new XmapNavigatorDisplayer($state->params, $this->item); @@ -96,11 +101,9 @@ function navigator($tpl = null) function navigatorLinks($tpl = null) { - - require_once(JPATH_COMPONENT_SITE . '/helpers/xmap.php'); - $link = urldecode(JRequest::getVar('link', '')); - $name = JRequest::getCmd('e_name', ''); - $Itemid = JRequest::getInt('Itemid'); + $link = urldecode(XmapHelper::getVar('link', '')); + $name = XmapHelper::getCmd('e_name', ''); + $Itemid = XmapHelper::getInt('Itemid'); $this->item = $this->get('Item'); $this->state = $this->get('State'); @@ -164,7 +167,6 @@ function navigatorLinks($tpl = null) } parent::display('links'); - exit; } /** @@ -172,20 +174,24 @@ function navigatorLinks($tpl = null) * * @access private */ - function _setToolbar() + function addToolbar() { - $user = JFactory::getUser(); + $user = Factory::getUser(); $isNew = ($this->item->id == 0); - JToolBarHelper::title(JText::_('XMAP_PAGE_' . ($isNew ? 'ADD_SITEMAP' : 'EDIT_SITEMAP')), 'article-add.png'); - - JToolBarHelper::apply('sitemap.apply', 'JTOOLBAR_APPLY'); - JToolBarHelper::save('sitemap.save', 'JTOOLBAR_SAVE'); - JToolBarHelper::save2new('sitemap.save2new'); + $title = Text::_('XMAP_PAGE_' . ($isNew ? 'ADD_SITEMAP' : 'EDIT_SITEMAP')); + ToolbarHelper::title($title,'article-add.png'); + ToolBarHelper::apply('sitemap.apply', 'JTOOLBAR_APPLY'); + ToolbarHelper::saveGroup( + [ + ['save', 'sitemap.save'], + ['save2new', 'sitemap.save2new'] + ]); if (!$isNew) { - JToolBarHelper::save2copy('sitemap.save2copy'); + ToolbarHelper::saveGroup( + ['save2copy', 'sitemap.save2copy']); } - JToolBarHelper::cancel('sitemap.cancel', 'JTOOLBAR_CLOSE'); + ToolBarHelper::cancel('sitemap.cancel', 'JTOOLBAR_CLOSE'); } } diff --git a/administrator/components/com_xmap/models/fields/modal/index.html b/administrator/components/com_joxmap/src/View/Sitemap/index.html similarity index 100% rename from administrator/components/com_xmap/models/fields/modal/index.html rename to administrator/components/com_joxmap/src/View/Sitemap/index.html diff --git a/administrator/components/com_joxmap/src/View/Sitemaps/HtmlView.php b/administrator/components/com_joxmap/src/View/Sitemaps/HtmlView.php new file mode 100644 index 00000000..fe181f86 --- /dev/null +++ b/administrator/components/com_joxmap/src/View/Sitemaps/HtmlView.php @@ -0,0 +1,118 @@ +getLayout() !== 'modal') { + XmapHelper::addSubmenu('sitemaps'); + } + + $this->state = $this->get('State'); + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); + + $version = new Version; + + $message = $this->get('ExtensionsMessage'); + if ( $message ) { + Factory::getApplication()->enqueueMessage($message); + } + + // Check for errors. + if ($errors && count($errors = $this->get('Errors'))) { + Factory::getApplication()->enqueueMessage(500, implode("\n", $errors), 'error'); + return false; + } + + // We don't need toolbar in the modal window. + if ($this->getLayout() !== 'modal') { + $this->addToolbar(); + } + + parent::display($tpl); + } + + /** + * Display the toolbar + * + * @access private + */ + protected function addToolbar() + { + $state = $this->get('State'); + $doc = Factory::getDocument(); + $version = new Version; + + ToolBarHelper::addNew('sitemap.add'); + ToolBarHelper::custom('sitemap.edit', 'edit.png', 'edit_f2.png', 'JTOOLBAR_EDIT', true); + + $doc->addStyleDeclaration('.icon-48-sitemap {background-image: url(media/com_joxmap/images/sitemap-icon.png);}'); + ToolBarHelper::title(Text::_('XMAP_SITEMAPS_TITLE'), 'sitemap.png'); + ToolBarHelper::custom('sitemaps.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_Publish', true); + ToolBarHelper::custom('sitemaps.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true); + + if (version_compare($version->getShortVersion(), '3.0.0', '>=')) { + ToolBarHelper::custom('sitemaps.setdefault', 'featured.png', 'featured_f2.png', 'XMAP_TOOLBAR_SET_DEFAULT', true); + } else { + ToolBarHelper::custom('sitemaps.setdefault', 'default.png', 'default_f2.png', 'XMAP_TOOLBAR_SET_DEFAULT', true); + } + if ($state) { + if ($state->get('filter.published') == -2) { + ToolBarHelper::deleteList('', 'sitemaps.delete','JTOOLBAR_DELETE'); + } + else { + ToolBarHelper::trash('sitemaps.trash','JTOOLBAR_TRASH'); + } + } + ToolBarHelper::divider(); + + + if (class_exists('JHtmlSidebar') && $this->state){ + Sidebar::addFilter( + Text::_('JOPTION_SELECT_PUBLISHED'), + 'filter_published', + HTMLHelper::_('select.options', HTMLHelper::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) + ); + + SideBar::addFilter( + Text::_('JOPTION_SELECT_ACCESS'), + 'filter_access', + HTMLHelper::_('select.options', HTMLHelper::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) + ); + + $this->sidebar = SideBar::render(); + } + } +} diff --git a/administrator/components/com_xmap/models/forms/index.html b/administrator/components/com_joxmap/src/View/Sitemaps/index.html similarity index 100% rename from administrator/components/com_xmap/models/forms/index.html rename to administrator/components/com_joxmap/src/View/Sitemaps/index.html diff --git a/administrator/components/com_joxmap/tmpl/sitemap/edit.php b/administrator/components/com_joxmap/tmpl/sitemap/edit.php new file mode 100644 index 00000000..9bb9f9ed --- /dev/null +++ b/administrator/components/com_joxmap/tmpl/sitemap/edit.php @@ -0,0 +1,138 @@ +getTemplate(); + +Text::script('ERROR'); +Text::script('WARNING'); +Text::script('NOTICE'); +Text::script('MESSAGE'); + +/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */ +$wa = $this->document->getWebAssetManager(); +$wa->useScript('keepalive') + ->useScript('form.validate'); + +if ($this->fieldsets) +{ + HTMLHelper::_('bootstrap.framework'); +} + +$xml = $this->form->getXml(); + +?> + + +
+
+ +
+ fieldsets) : ?> + + + + + fieldsets as $name => $fieldSet) : ?> + xpath('//fieldset[@name="' . $name . '"]/fieldset'); + $hasParent = $xml->xpath('//fieldset/fieldset[@name="' . $name . '"]'); + $isGrandchild = $xml->xpath('//fieldset/fieldset/fieldset[@name="' . $name . '"]'); + ?> + + + showon)) : ?> + useScript('showon'); ?> + showon, $this->formControl)) . '\''; ?> + + + label) ? 'XMAP_FIELDSET_' . strtoupper($name) : $fieldSet->label; ?> + + +
+ label); ?> +
+ + + + 1) : ?> +
+
+ + + + + + + + + + + + +
+ label); ?> +
+ + + + + description)) : ?> +
+ + description); ?> +
+ + + + form->renderFieldset($name, $name === 'permissions' ? ['hiddenLabel' => true, 'class' => 'revert-controls'] : []); ?> + + + +
+
+ + + + + + 1) : ?> +
+
+ + + + + + + + + + + form->getInput('is_default'); ?> + + +
diff --git a/administrator/components/com_xmap/models/index.html b/administrator/components/com_joxmap/tmpl/sitemap/index.html similarity index 100% rename from administrator/components/com_xmap/models/index.html rename to administrator/components/com_joxmap/tmpl/sitemap/index.html diff --git a/administrator/components/com_xmap/views/sitemap/tmpl/navigator.php b/administrator/components/com_joxmap/tmpl/sitemap/navigator.php similarity index 73% rename from administrator/components/com_xmap/views/sitemap/tmpl/navigator.php rename to administrator/components/com_joxmap/tmpl/sitemap/navigator.php index 0dbcef00..3bf4dc3f 100644 --- a/administrator/components/com_xmap/views/sitemap/tmpl/navigator.php +++ b/administrator/components/com_joxmap/tmpl/sitemap/navigator.php @@ -1,16 +1,19 @@ addScriptDeclaration(' var tree; var autotext = \'\'; @@ -36,7 +39,7 @@ } window.parent.SqueezeBox.close(); }; - window.addEvent("domready",function(){ + document.addEventListener("DOMContentLoaded", function(event) { tree = new MooTreeControl({ div: \'xmap-nav_tree\', mode: \'files\', @@ -55,7 +58,7 @@ text: \'Home\', open: true }); - tree.root.load(\'index.php?option=com_xmap&task=navigator-links&sitemap='.$this->item->id.'&e_name='.$name.'&tmpl=component\'); + tree.root.load(\'index.php?option=com_joxmap&task=navigator-links&sitemap='.$this->item->id.'&e_name='.$name.'&tmpl=component\'); }); '); ?> @@ -64,27 +67,27 @@
- + - + - + - + - +
- - + +
diff --git a/administrator/components/com_xmap/views/sitemap/tmpl/navigator_class.php b/administrator/components/com_joxmap/tmpl/sitemap/navigator_class.php similarity index 90% rename from administrator/components/com_xmap/views/sitemap/tmpl/navigator_class.php rename to administrator/components/com_joxmap/tmpl/sitemap/navigator_class.php index 61a3b845..030a3d13 100644 --- a/administrator/components/com_xmap/views/sitemap/tmpl/navigator_class.php +++ b/administrator/components/com_joxmap/tmpl/sitemap/navigator_class.php @@ -1,9 +1,12 @@ link,$matches) ) { $option = $matches[1]; } - $Itemid = JRequest::getInt('Itemid'); + $Itemid = XmapHelper::getInt('Itemid'); if (!$option && $Itemid) { $item = $items->getItem($Itemid); $link_query = parse_url( $item->link ); diff --git a/administrator/components/com_joxmap/tmpl/sitemap/navigator_links.php b/administrator/components/com_joxmap/tmpl/sitemap/navigator_links.php new file mode 100644 index 00000000..33131ed8 --- /dev/null +++ b/administrator/components/com_joxmap/tmpl/sitemap/navigator_links.php @@ -0,0 +1,25 @@ + + + +list as $node) { + $load = 'index.php?option=com_joxmap&task=navigator-links&sitemap='.$this->item->id.'&e_name='.$name.(isset($node->id)?'&Itemid='.$node->id:'').(isset($node->link)?'&link='.urlencode($node->link):'').'&tmpl=component'; +?> + expandible?" openicon=\"_open\" icon=\"_closed\" load=\"$load\"":' icon="_doc"'); ?> uid="uid; ?>" link="link); ?>" selectable="selectable?'true':'false'); ?>" /> + + diff --git a/administrator/components/com_xmap/views/sitemaps/tmpl/default.php b/administrator/components/com_joxmap/tmpl/sitemaps/default.php similarity index 56% rename from administrator/components/com_xmap/views/sitemaps/tmpl/default.php rename to administrator/components/com_joxmap/tmpl/sitemaps/default.php index 0c098be3..8270e548 100644 --- a/administrator/components/com_xmap/views/sitemaps/tmpl/default.php +++ b/administrator/components/com_joxmap/tmpl/sitemaps/default.php @@ -1,28 +1,36 @@ items); + +$n = ($this->items) ? count($this->items): 0; $baseUrl = JUri::root(); -$version = new JVersion; +$version = new Version; ?> - + sidebar)): ?>
sidebar; ?> @@ -33,12 +41,12 @@
- +
- - + +
@@ -46,27 +54,27 @@ - + - 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')); ?> - 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')); ?> @@ -80,32 +88,32 @@ items as $i => $item) : - $now = JFactory::getDate()->toUnix(); + $now = Factory::getDate()->toUnix(); if ( !$item->lastvisit_html ) { - $htmlDate = JText::_('Date_Never'); + $htmlDate = Text::_('Date_Never'); }elseif ( $item->lastvisit_html > ($now-3600)) { // Less than one hour - $htmlDate = JText::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_html)/60)); + $htmlDate = Text::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_html)/60)); } elseif ( $item->lastvisit_html > ($now-86400)) { // Less than one day $hours = intval (($now-$item->lastvisit_html)/3600 ); - $htmlDate = JText::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_html)/60); + $htmlDate = Text::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_html)/60); } elseif ( $item->lastvisit_html > ($now-259200)) { // Less than three days $days = intval(($now-$item->lastvisit_html)/86400); - $htmlDate = JText::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_html)/3600)); + $htmlDate = Text::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_html)/3600)); } else { $date = new JDate($item->lastvisit_html); $htmlDate = $date->format('Y-m-d H:i'); } if ( !$item->lastvisit_xml ) { - $xmlDate = JText::_('Date_Never'); + $xmlDate = Text::_('Date_Never'); } elseif ( $item->lastvisit_xml > ($now-3600)) { // Less than one hour - $xmlDate = JText::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_xml)/60)); + $xmlDate = Text::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_xml)/60)); } elseif ( $item->lastvisit_xml > ($now-86400)) { // Less than one day $hours = intval (($now-$item->lastvisit_xml)/3600 ); - $xmlDate = JText::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_xml)/60); + $xmlDate = Text::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_xml)/60); } elseif ( $item->lastvisit_xml > ($now-259200)) { // Less than three days $days = intval(($now-$item->lastvisit_xml)/86400); - $xmlDate = JText::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_xml)/3600)); + $xmlDate = Text::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_xml)/3600)); } else { $date = new JDate($item->lastvisit_xml); $xmlDate = $date->format('Y-m-d H:i'); @@ -114,28 +122,28 @@ ?> - id); ?> + id); ?> - + escape($item->title); ?> is_default == 1) : ?> getShortVersion(), '3.0.0', '>=')): ?> - <?php echo JText::_('Default'); ?> + <?php echo Text::_('Default'); ?> state): ?> - [] - [] - [] + [] + [] + []
(escape($item->alias); ?>) - state, $i, 'sitemaps.'); ?> + state, $i, 'sitemaps.'); ?> escape($item->access_level); ?> @@ -158,6 +166,6 @@ - +
diff --git a/administrator/components/com_xmap/views/sitemaps/tmpl/default_legacy.php b/administrator/components/com_joxmap/tmpl/sitemaps/default_legacy.php similarity index 57% rename from administrator/components/com_xmap/views/sitemaps/tmpl/default_legacy.php rename to administrator/components/com_joxmap/tmpl/sitemaps/default_legacy.php index 44222a29..0a1e079f 100644 --- a/administrator/components/com_xmap/views/sitemaps/tmpl/default_legacy.php +++ b/administrator/components/com_joxmap/tmpl/sitemaps/default_legacy.php @@ -9,39 +9,39 @@ // no direct access defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); -JHtml::_('behavior.tooltip'); +JHTMLHelper::addIncludePath(JPATH_COMPONENT.'/helpers/html'); +JHTMLHelper::_('bootstrap.tooltip'); $n = count($this->items); $baseUrl = JUri::root(); -$version = new JVersion; +$version = new Version; ?> -
+
- + + +
@@ -54,24 +54,24 @@ - 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')); ?> - 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')); ?> @@ -85,32 +85,32 @@ items as $i => $item) : - $now = JFactory::getDate()->toUnix(); + $now = Factory::getDate()->toUnix(); if ( !$item->lastvisit_html ) { - $htmlDate = JText::_('Date_Never'); + $htmlDate = Text::_('Date_Never'); }elseif ( $item->lastvisit_html > ($now-3600)) { // Less than one hour - $htmlDate = JText::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_html)/60)); + $htmlDate = Text::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_html)/60)); } elseif ( $item->lastvisit_html > ($now-86400)) { // Less than one day $hours = intval (($now-$item->lastvisit_html)/3600 ); - $htmlDate = JText::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_html)/60); + $htmlDate = Text::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_html)/60); } elseif ( $item->lastvisit_html > ($now-259200)) { // Less than three days $days = intval(($now-$item->lastvisit_html)/86400); - $htmlDate = JText::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_html)/3600)); + $htmlDate = Text::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_html)/3600)); } else { $date = new JDate($item->lastvisit_html); $htmlDate = $date->format('Y-m-d H:i'); } if ( !$item->lastvisit_xml ) { - $xmlDate = JText::_('Date_Never'); + $xmlDate = Text::_('Date_Never'); } elseif ( $item->lastvisit_xml > ($now-3600)) { // Less than one hour - $xmlDate = JText::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_xml)/60)); + $xmlDate = Text::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_xml)/60)); } elseif ( $item->lastvisit_xml > ($now-86400)) { // Less than one day $hours = intval (($now-$item->lastvisit_xml)/3600 ); - $xmlDate = JText::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_xml)/60); + $xmlDate = Text::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_xml)/60); } elseif ( $item->lastvisit_xml > ($now-259200)) { // Less than three days $days = intval(($now-$item->lastvisit_xml)/86400); - $xmlDate = JText::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_xml)/3600)); + $xmlDate = Text::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_xml)/3600)); } else { $date = new JDate($item->lastvisit_xml); $xmlDate = $date->format('Y-m-d H:i'); @@ -119,28 +119,28 @@ ?> - id); ?> + id); ?> - + escape($item->title); ?> is_default == 1) : ?> getShortVersion(), '3.0.0', '>=')): ?> - <?php echo JText::_('Default'); ?> + <?php echo Text::_('Default'); ?> state): ?> - [] - [] - [] + [] + [] + []
(escape($item->alias); ?>) - state, $i, 'sitemaps.'); ?> + state, $i, 'sitemaps.'); ?> escape($item->access_level); ?> @@ -163,5 +163,5 @@ - + diff --git a/administrator/components/com_xmap/views/sitemaps/tmpl/form.php b/administrator/components/com_joxmap/tmpl/sitemaps/form.php similarity index 100% rename from administrator/components/com_xmap/views/sitemaps/tmpl/form.php rename to administrator/components/com_joxmap/tmpl/sitemaps/form.php diff --git a/administrator/components/com_xmap/tables/index.html b/administrator/components/com_joxmap/tmpl/sitemaps/index.html similarity index 100% rename from administrator/components/com_xmap/tables/index.html rename to administrator/components/com_joxmap/tmpl/sitemaps/index.html diff --git a/administrator/components/com_xmap/views/sitemaps/tmpl/modal.php b/administrator/components/com_joxmap/tmpl/sitemaps/modal.php similarity index 57% rename from administrator/components/com_xmap/views/sitemaps/tmpl/modal.php rename to administrator/components/com_joxmap/tmpl/sitemaps/modal.php index e9c25dd4..9b37ef30 100644 --- a/administrator/components/com_xmap/views/sitemaps/tmpl/modal.php +++ b/administrator/components/com_joxmap/tmpl/sitemaps/modal.php @@ -9,35 +9,35 @@ // no direct access defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); -JHtml::_('behavior.tooltip'); +JHTMLHelper::addIncludePath(JPATH_COMPONENT.'/helpers/html'); +JHTMLHelper::_('bootstrap.tooltip'); -$function = JRequest::getVar('function', 'jSelectSitemap'); +$function = XmapHelper::getVar('function', 'jSelectSitemap'); $n = count($this->items); ?> -
+
- + + +
@@ -47,24 +47,24 @@ - 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')); ?> - 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')); ?> @@ -79,35 +79,35 @@ items as $i => $item) : - $now = JFactory::getDate()->toUnix(); + $now = Factory::getDate()->toUnix(); if ( !$item->lastvisit_html ) { - $htmlDate = JText::_('Date_Never'); + $htmlDate = Text::_('Date_Never'); }elseif ( $item->lastvisit_html > ($now-3600)) { // Less than one hour - $htmlDate = JText::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_html)/60)); + $htmlDate = Text::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_html)/60)); } elseif ( $item->lastvisit_html > ($now-86400)) { // Less than one day $hours = intval (($now-$item->lastvisit_html)/3600 ); - $htmlDate = JText::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_html)/60); + $htmlDate = Text::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_html)/60); } elseif ( $item->lastvisit_html > ($now-259200)) { // Less than three days $days = intval(($now-$item->lastvisit_html)/86400); - $htmlDate = JText::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_html)/3600)); + $htmlDate = Text::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_html)/3600)); } else { $date = new JDate($item->lastvisit_html); - $htmlDate = $date->toFormat('%Y-%m-%d %H:%M'); + $htmlDate = $date->Format('%Y-%m-%d %H:%M'); } if ( !$item->lastvisit_xml ) { - $xmlDate = JText::_('Date_Never'); + $xmlDate = Text::_('Date_Never'); } elseif ( $item->lastvisit_xml > ($now-3600)) { // Less than one hour - $xmlDate = JText::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_xml)/60)); + $xmlDate = Text::sprintf('Date_Minutes_Ago',intval(($now-$item->lastvisit_xml)/60)); } elseif ( $item->lastvisit_xml > ($now-86400)) { // Less than one day $hours = intval (($now-$item->lastvisit_xml)/3600 ); - $xmlDate = JText::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_xml)/60); + $xmlDate = Text::sprintf('Date_Hours_Minutes_Ago',$hours,($now-($hours*3600)-$item->lastvisit_xml)/60); } elseif ( $item->lastvisit_xml > ($now-259200)) { // Less than three days $days = intval(($now-$item->lastvisit_xml)/86400); - $xmlDate = JText::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_xml)/3600)); + $xmlDate = Text::sprintf('Date_Days_Hours_Ago',$days,intval(($now-($days*86400)-$item->lastvisit_xml)/3600)); } else { $date = new JDate($item->lastvisit_xml); - $xmlDate = $date->toFormat('%Y-%m-%d %H:%M'); + $xmlDate = $date->Format('%Y-%m-%d %H:%M'); } ?> @@ -117,7 +117,7 @@ escape($item->title); ?> - state, $i, 'sitemaps.'); ?> + state, $i, 'sitemaps.'); ?> escape($item->access_level); ?> @@ -140,5 +140,5 @@ - + diff --git a/administrator/components/com_xmap/controller.php b/administrator/components/com_xmap/controller.php deleted file mode 100644 index b7745434..00000000 --- a/administrator/components/com_xmap/controller.php +++ /dev/null @@ -1,135 +0,0 @@ -registerTask('navigator-links', 'navigatorLinks'); - } - - /** - * Display the view - */ - public function display($cachable = false, $urlparams = false) - { - require_once JPATH_COMPONENT . '/helpers/xmap.php'; - - // Get the document object. - $document = JFactory::getDocument(); - - // Set the default view name and format from the Request. - $vName = JRequest::getWord('view', 'sitemaps'); - $vFormat = $document->getType(); - $lName = JRequest::getWord('layout', 'default'); - - // Get and render the view. - if ($view = $this->getView($vName, $vFormat)) { - // Get the model for the view. - $model = $this->getModel($vName); - - // Push the model into the view (as default). - $view->setModel($model, true); - $view->setLayout($lName); - - // Push document object into the view. - $view->assignRef('document', $document); - - $view->display(); - - } - } - - function navigator() - { - $db = JFactory::getDBO(); - $document = JFactory::getDocument(); - $app = JFactory::getApplication('administrator'); - - $id = JRequest::getInt('sitemap', 0); - $link = urldecode(JRequest::getVar('link', '')); - $name = JRequest::getCmd('e_name', ''); - if (!$id) { - $id = $this->getDefaultSitemapId(); - } - - if (!$id) { - JError::raiseWarning(500, JText::_('Xmap_Not_Sitemap_Selected')); - return false; - } - - $app->setUserState('com_xmap.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->assignRef('document', $document); - - $view->navigator(); - } - - function navigatorLinks() - { - - $db = JFactory::getDBO(); - $document = JFactory::getDocument(); - $app = JFactory::getApplication('administrator'); - - $id = JRequest::getInt('sitemap', 0); - $link = urldecode(JRequest::getVar('link', '')); - $name = JRequest::getCmd('e_name', ''); - if (!$id) { - $id = $this->getDefaultSitemapId(); - } - - if (!$id) { - JError::raiseWarning(500, JText::_('Xmap_Not_Sitemap_Selected')); - return false; - } - - $app->setUserState('com_xmap.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->assignRef('document', $document); - - $view->navigatorLinks(); - } - - private function getDefaultSitemapId() - { - $db = JFactory::getDBO(); - $query = $db->getQuery(true); - $query->select('id'); - $query->from($db->quoteName('#__xmap_sitemap')); - $query->where('is_default=1'); - $db->setQuery($query); - return $db->loadResult(); - } - -} \ No newline at end of file diff --git a/administrator/components/com_xmap/controllers/sitemap.php b/administrator/components/com_xmap/controllers/sitemap.php deleted file mode 100644 index edf6d406..00000000 --- a/administrator/components/com_xmap/controllers/sitemap.php +++ /dev/null @@ -1,37 +0,0 @@ -authorise('core.edit', 'com_xmap.sitemap.'.$recordId); - } -} \ No newline at end of file diff --git a/administrator/components/com_xmap/controllers/sitemaps.php b/administrator/components/com_xmap/controllers/sitemaps.php deleted file mode 100644 index 74d3a414..00000000 --- a/administrator/components/com_xmap/controllers/sitemaps.php +++ /dev/null @@ -1,84 +0,0 @@ -registerTask('unpublish', 'publish'); - $this->registerTask('trash', 'publish'); - $this->registerTask('unfeatured', 'featured'); - } - - - /** - * Method to toggle the default sitemap. - * - * @return void - * @since 2.0 - */ - function setDefault() - { - // Check for request forgeries - JRequest::checkToken() or die('Invalid Token'); - - // Get items to publish from the request. - $cid = JRequest::getVar('cid', 0, '', 'array'); - $id = @$cid[0]; - - if (!$id) { - JError::raiseWarning(500, JText::_('Select an item to set as default')); - } - else - { - // Get the model. - $model = $this->getModel(); - - // Publish the items. - if (!$model->setDefault($id)) { - JError::raiseWarning(500, $model->getError()); - } - } - - $this->setRedirect('index.php?option=com_xmap&view=sitemaps'); - } - - /** - * Proxy for getModel. - * - * @param string $name The name of the model. - * @param string $prefix The prefix for the PHP class name. - * - * @return JModel - * @since 2.0 - */ - public function getModel($name = 'Sitemap', $prefix = 'XmapModel', $config = array('ignore_request' => true)) - { - $model = parent::getModel($name, $prefix, $config); - - return $model; - } -} \ No newline at end of file diff --git a/administrator/components/com_xmap/helpers/html/xmap.php b/administrator/components/com_xmap/helpers/html/xmap.php deleted file mode 100644 index 92954cf5..00000000 --- a/administrator/components/com_xmap/helpers/html/xmap.php +++ /dev/null @@ -1,52 +0,0 @@ -getShortVersion(), '3.0.0', '<')) { - JSubMenuHelper::addEntry( - JText::_('Xmap_Submenu_Sitemaps'), - 'index.php?option=com_xmap', - $vName == 'sitemaps' - ); - JSubMenuHelper::addEntry( - JText::_('Xmap_Submenu_Extensions'), - 'index.php?option=com_plugins&view=plugins&filter_folder=xmap', - $vName == 'extensions'); - } else { - JHtmlSidebar::addEntry( - JText::_('Xmap_Submenu_Sitemaps'), - 'index.php?option=com_xmap', - $vName == 'sitemaps' - ); - JHtmlSidebar::addEntry( - JText::_('Xmap_Submenu_Extensions'), - 'index.php?option=com_plugins&view=plugins&filter_folder=xmap', - $vName == 'extensions'); - } - } -} diff --git a/administrator/components/com_xmap/install/install.postgresql.sql b/administrator/components/com_xmap/install/install.postgresql.sql deleted file mode 100644 index 298b53fd..00000000 --- a/administrator/components/com_xmap/install/install.postgresql.sql +++ /dev/null @@ -1,34 +0,0 @@ -CREATE TABLE "#__xmap_sitemap" ( - "id" serial NOT NULL, - "title" character varying(255) DEFAULT NULL, - "alias" character varying(255) DEFAULT NULL, - "introtext" text DEFAULT NULL, - "metadesc" text DEFAULT NULL, - "metakey" text DEFAULT NULL, - "attribs" text DEFAULT NULL, - "selections" text DEFAULT NULL, - "excluded_items" text DEFAULT NULL, - "is_default" integer DEFAULT 0, - "state" integer DEFAULT NULL, - "access" integer DEFAULT NULL, - "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, - "count_xml" integer DEFAULT NULL, - "count_html" integer DEFAULT NULL, - "views_xml" integer DEFAULT NULL, - "views_html" integer DEFAULT NULL, - "lastvisit_xml" integer DEFAULT NULL, - "lastvisit_html" integer DEFAULT NULL, - PRIMARY KEY ("id") -); - -CREATE TABLE "#__xmap_items" ( - "uid" character varying(100) NOT NULL, - "itemid" integer NOT NULL, - "view" character varying(10) NOT NULL, - "sitemap_id" integer NOT NULL, - "properties" varchar(300) DEFAULT NULL, - PRIMARY KEY ("uid","itemid","view","sitemap_id") -); - -CREATE INDEX "#__xmap_items_idx_uid" on "#__xmap_items" ("uid", "itemid"); -CREATE INDEX "#__xmap_items_idx_view" on "#__xmap_items" ("view"); diff --git a/administrator/components/com_xmap/install/uninstall.postgresql.sql b/administrator/components/com_xmap/install/uninstall.postgresql.sql deleted file mode 100644 index 00acfd25..00000000 --- a/administrator/components/com_xmap/install/uninstall.postgresql.sql +++ /dev/null @@ -1,2 +0,0 @@ -drop table "#__xmap_items"; -drop table "#__xmap_sitemap"; \ No newline at end of file diff --git a/administrator/components/com_xmap/install/uninstall.utf8.sql b/administrator/components/com_xmap/install/uninstall.utf8.sql deleted file mode 100644 index 69c784e4..00000000 --- a/administrator/components/com_xmap/install/uninstall.utf8.sql +++ /dev/null @@ -1,2 +0,0 @@ -drop table `#__xmap_items`; -drop table `#__xmap_sitemap`; \ No newline at end of file diff --git a/administrator/components/com_xmap/language/cs-CZ/cs-CZ.com_xmap.sys.ini b/administrator/components/com_xmap/language/cs-CZ/cs-CZ.com_xmap.sys.ini deleted file mode 100644 index 5df8b7d0..00000000 --- a/administrator/components/com_xmap/language/cs-CZ/cs-CZ.com_xmap.sys.ini +++ /dev/null @@ -1,26 +0,0 @@ -; $Id$ -; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. -; GNU General Public License version 2 or later; see LICENSE.txt -; Guillermo Vargas (guille@vargas.co.cr) -; - -COM_XMAP="Xmap" -COM_XMAP_TITLE="Xmap" - -; -; View and layout titles and descriptions -; -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="HTML verze" -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Zobrazí mapu stránek v HTML formátu" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="XML verze" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Zobrazí mapu stránek v XML formátu" - -COM_XMAP_SELECT_AN_SITEMAP="Zvolte mapu stránek" -COM_XMAP_SELECT_A_SITEMAP="Mapa stránek" -COM_XMAP_CHANGE_SITEMAP_BUTTON="Změnit" -COM_XMAP_CHANGE_SITEMAP="Zvolte mapu stránek ze seznamu" - -COM_INSTALLER_TYPE_XMAP_EXT="Rozšíření Xmap" -COM_XMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Možnosti mapy stránek" -COM_XMAP_INCLUDE_CSS_LABEL="Používat CSS styl komponenty Xmap" -COM_XMAP_INCLUDE_CSS_DESC="Pokud je zvoleno Ano, bude použit soubor stylů CSS komponenty XMap" \ No newline at end of file diff --git a/administrator/components/com_xmap/language/en-GB/en-GB.com_xmap.sys.ini b/administrator/components/com_xmap/language/en-GB/en-GB.com_xmap.sys.ini deleted file mode 100644 index ac530063..00000000 --- a/administrator/components/com_xmap/language/en-GB/en-GB.com_xmap.sys.ini +++ /dev/null @@ -1,26 +0,0 @@ -; $Id$ -; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. -; GNU General Public License version 2 or later; see LICENSE.txt -; Guillermo Vargas (guille@vargas.co.cr) -; - -COM_XMAP="Xmap" -COM_XMAP_TITLE="Xmap" - -; -; View and layout titles and descriptions -; -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="HTML Site map" -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Display a Site map in HTML format" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="XML Sitemap" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Display an Site map in XML format" - -COM_XMAP_SELECT_AN_SITEMAP="Choose a site map" -COM_XMAP_SELECT_A_SITEMAP="A site map" -COM_XMAP_CHANGE_SITEMAP_BUTTON="Change" -COM_XMAP_CHANGE_SITEMAP="Select a site map from the list" - -COM_INSTALLER_TYPE_XMAP_EXT="Xmap Extension" -COM_XMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Sitemap Settings" -COM_XMAP_INCLUDE_CSS_LABEL="Include Xmap's Style" -COM_XMAP_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_xmap/language/es-ES/es-ES.com_xmap.sys.ini b/administrator/components/com_xmap/language/es-ES/es-ES.com_xmap.sys.ini deleted file mode 100755 index 23f3e85a..00000000 --- a/administrator/components/com_xmap/language/es-ES/es-ES.com_xmap.sys.ini +++ /dev/null @@ -1,26 +0,0 @@ -; $Id$ -; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. -; GNU General Public License version 2 or later; see LICENSE.txt -; Guillermo Vargas (guille@vargas.co.cr) -; - -COM_XMAP="Xmap" -COM_XMAP_TITLE="Xmap" - -; -; View and layout titles and descriptions -; -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="Mapa de Sitio HTML" -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Muestra un mapa de sitio en formato HTML" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="Mapa de Sitio XML" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Mustra un mapa de sitio en formato XML" - -COM_XMAP_SELECT_AN_SITEMAP="Seleccione un mapa de sitio" -COM_XMAP_SELECT_A_SITEMAP="Un mapa de sitio" -COM_XMAP_CHANGE_SITEMAP_BUTTON="Cambiar" -COM_XMAP_CHANGE_SITEMAP="Seleccionar un mapa de sitio de una lista" - -COM_INSTALLER_TYPE_XMAP_EXT="Xmap Extension" -COM_XMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Sitemap Settings" -COM_XMAP_INCLUDE_CSS_LABEL="Include Xmap's Style" -COM_XMAP_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_xmap/language/fa-IR/fa-IR.com_xmap.sys.ini b/administrator/components/com_xmap/language/fa-IR/fa-IR.com_xmap.sys.ini deleted file mode 100644 index 9a9958bd..00000000 --- a/administrator/components/com_xmap/language/fa-IR/fa-IR.com_xmap.sys.ini +++ /dev/null @@ -1,30 +0,0 @@ -; @package Joomla 2.5 -; @subpackage Xmap -; @description فارسی - ایران -; @version 2.3.2 -; @date 2013-01-20 -; @author محمد حسنی اقتدار -; @copyright http://joomlacode.org/gf/project/farsilanguage -; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL -; @note Client Administrator -; @note All ini files need to be saved as UTF-8 - No BOM - - -COM_XMAP="نقشه سایت" -COM_XMAP_TITLE="نقشه سایت" - -; View and layout titles and descriptions -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="نفشه سایت نسخه HTML" -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="نمایش نقشه سایت در فرمت HTML" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="نقشه سایت نسخه XML" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="نمایش نقشه سایت در فرمت XML" - -COM_XMAP_SELECT_AN_SITEMAP="انتخاب نقشه سایت" -COM_XMAP_SELECT_A_SITEMAP="نقشه سایت" -COM_XMAP_CHANGE_SITEMAP_BUTTON="تغییر" -COM_XMAP_CHANGE_SITEMAP="انتخاب نقشه سایت از لیست" - -COM_INSTALLER_TYPE_XMAP_EXT="افزونه نقشه سایت" -COM_XMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="تنظیمات نقشه سایت" -COM_XMAP_INCLUDE_CSS_LABEL="اضافه نمودن استایل های نقشه سایت" -COM_XMAP_INCLUDE_CSS_DESC="در صورت انتخاب بله، فایل css کامپوننت نقشه سایت هنگام نمایش آن بارگذاری خواهد شد" \ No newline at end of file diff --git a/administrator/components/com_xmap/language/nl-NL/nl-NL.com_xmap.sys.ini b/administrator/components/com_xmap/language/nl-NL/nl-NL.com_xmap.sys.ini deleted file mode 100644 index 4acd1285..00000000 --- a/administrator/components/com_xmap/language/nl-NL/nl-NL.com_xmap.sys.ini +++ /dev/null @@ -1,26 +0,0 @@ -; $Id$ -; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. -; GNU General Public License version 2 or later; see LICENSE.txt -; Guillermo Vargas (guille@vargas.co.cr) -; - -COM_XMAP="Xmap" -COM_XMAP_TITLE="Xmap" - -; -; View and layout titles and descriptions -; -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="HTML Site map" -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Toon een sitemap in HTML formaat" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="XML sitemap" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Toon een sitemap in XML formaat" - -COM_XMAP_SELECT_AN_SITEMAP="Kies een sitemap" -COM_XMAP_SELECT_A_SITEMAP="Een sitemap" -COM_XMAP_CHANGE_SITEMAP_BUTTON="Wijzig" -COM_XMAP_CHANGE_SITEMAP="Selecteer een sitemap uit de lijst" - -COM_INSTALLER_TYPE_XMAP_EXT="Xmap extensie" -COM_XMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Sitemap instellingen" -COM_XMAP_INCLUDE_CSS_LABEL="Xmap's stijl gebruiken" -COM_XMAP_INCLUDE_CSS_DESC="Selecteer Ja om het CSS bestand met de stijlen voor de Sitemap te gebruiken" \ No newline at end of file diff --git a/administrator/components/com_xmap/language/ru-RU/ru-RU.com_xmap.sys.ini b/administrator/components/com_xmap/language/ru-RU/ru-RU.com_xmap.sys.ini deleted file mode 100644 index e4a77e91..00000000 --- a/administrator/components/com_xmap/language/ru-RU/ru-RU.com_xmap.sys.ini +++ /dev/null @@ -1,26 +0,0 @@ -; $Id$ -; Copyright (C) 2007 - 2009 Joomla! Vargas. All rights reserved. -; GNU General Public License version 2 or later; see LICENSE.txt -; Guillermo Vargas (guille@vargas.co.cr) -; - -COM_XMAP="Xmap" -COM_XMAP_TITLE="Xmap" - -; -; View and layout titles and descriptions -; -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_TITLE="Карта сайта в HTML" -COM_XMAP_SITEMAP_HTML_VIEW_DEFAULT_DESC="Отображать карту сайта в HTML формате" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_TITLE="Карта сайта в XML" -COM_XMAP_SITEMAP_XML_VIEW_DEFAULT_DESC="Отображать карту сайта в XML формате" - -COM_XMAP_SELECT_AN_SITEMAP="Выберите карту сайта" -COM_XMAP_SELECT_A_SITEMAP="Карта сайта" -COM_XMAP_CHANGE_SITEMAP_BUTTON="Изменить" -COM_XMAP_CHANGE_SITEMAP="Выберите карту сайта из списка" - -COM_INSTALLER_TYPE_XMAP_EXT="Xmap расширение" -COM_XMAP_ATTRIBS_SITEMAP_SETTINGS_LABEL="Настройки Sitemap" -COM_XMAP_INCLUDE_CSS_LABEL="Включить Xmap's стиль" -COM_XMAP_INCLUDE_CSS_DESC="Выберите Да, для включения CSS-файла со стилями для sitemap" \ No newline at end of file diff --git a/administrator/components/com_xmap/manifest.xml b/administrator/components/com_xmap/manifest.xml deleted file mode 100644 index 9e144f5f..00000000 --- a/administrator/components/com_xmap/manifest.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - com_xmap - 2011-04-10 - Guillermo Vargas - This component is released under the GNU/GPL License - guille@vargas.co.cr - http://www.jooxmap.com - 2.3.4 - GNU/GPL - Xmap - Sitemap Generator for Joomla! - - - install/install.utf8.sql - install/install.postgresql.sql - - - - - install/uninstall.utf8.sql - install/uninstall.postgresql.sql - - - - controller.php - displayer.php - index.html - metadata.xml - router.php - xmap.php - assets - controllers - helpers - models - views - - - en-GB.com_xmap.ini - es-ES.com_xmap.ini - fa-IR.com_xmap.ini - cs-CZ.com_xmap.ini - nl-NL.com_xmap.ini - ru-RU.com_xmap.ini - - - images - - - COM_XMAP_TITLE - - xmap.php - controller.php - index.html - LICENSE.txt - css - elements - images - install - helpers - controllers - tables - views - models - - - en-GB/en-GB.com_xmap.ini - en-GB/en-GB.com_xmap.sys.ini - es-ES/es-ES.com_xmap.ini - es-ES/es-ES.com_xmap.sys.ini - fa-IR/fa-IR.com_xmap.ini - fa-IR/fa-IR.com_xmap.sys.ini - cs-CZ/cs-CZ.com_xmap.ini - cs-CZ/cs-CZ.com_xmap.sys.ini - nl-NL/nl-NL.com_xmap.ini - nl-NL/nl-NL.com_xmap.sys.ini - ru-RU/ru-RU.com_xmap.ini - ru-RU/ru-RU.com_xmap.sys.ini - - - images - - - - https://raw.github.com/guilleva/Xmap/master/xmap-update.xml - - diff --git a/administrator/components/com_xmap/models/fields/modal/sitemaps.php b/administrator/components/com_xmap/models/fields/modal/sitemaps.php deleted file mode 100644 index 6c65d8cb..00000000 --- a/administrator/components/com_xmap/models/fields/modal/sitemaps.php +++ /dev/null @@ -1,85 +0,0 @@ -value) { - $db->setQuery( - 'SELECT title' . - ' FROM #__xmap_sitemap' . - ' WHERE id = ' . (int) $this->value - ); - $title = $db->loadResult(); - - if ($error = $db->getErrorMsg()) { - JError::raiseWarning(500, $error); - } - } else { - $title = ''; - } - - if (empty($title)) { - $title = JText::_('COM_XMAP_SELECT_AN_SITEMAP'); - } - - $doc->addScriptDeclaration( - "function jSelectSitemap_" . $this->id . "(id, title, object) { - $('" . $this->id . "_id').value = id; - $('" . $this->id . "_name').value = title; - SqueezeBox.close(); - }" - ); - - $link = 'index.php?option=com_xmap&view=sitemaps&layout=modal&tmpl=component&function=jSelectSitemap_' . $this->id; - - JHTML::_('behavior.modal', 'a.modal'); - $html = ''; - $html .= "\n" . ''; - if(version_compare(JVERSION,'3.0.0','ge')) - $html .= ' ' . JText::_('COM_XMAP_CHANGE_SITEMAP_BUTTON') . '' . "\n"; - else - $html .= '
' . JText::_('COM_XMAP_CHANGE_SITEMAP_BUTTON') . '
' . "\n"; - $html .= ''; - $html .= "\n" . ''; - return $html; - } - -} \ No newline at end of file diff --git a/administrator/components/com_xmap/views/sitemap/tmpl/edit.php b/administrator/components/com_xmap/views/sitemap/tmpl/edit.php deleted file mode 100644 index c3af05d0..00000000 --- a/administrator/components/com_xmap/views/sitemap/tmpl/edit.php +++ /dev/null @@ -1,121 +0,0 @@ - - -
-
- -
-
    -
    • -
    • - form->getFieldsets('attribs'); - foreach ($fieldSets as $name => $fieldSet) : - ?> -
  • label);?>
    • - -
- -
-
-
-
-
- form->getLabel('title'); ?> -
- form->getInput('title'); ?> -
-
-
- form->getLabel('alias'); ?> -
- form->getInput('alias'); ?> -
-
-
- form->getLabel('state'); ?> -
- form->getInput('state'); ?> -
-
-
- form->getLabel('access'); ?> -
- form->getInput('access'); ?> -
-
-
-
- form->getLabel('introtext'); ?>
-
-
- form->getInput('introtext'); ?> -
-
-
-
-
- -
-
- form->getInput('selections'); ?> -
-
- form->getFieldsets('attribs'); - foreach ($fieldSets as $name => $fieldSet) : - ?> -
- description) && trim($fieldSet->description)) : - echo '

' . $this->escape(JText::_($fieldSet->description)) . '

'; - endif; - - foreach ($this->form->getFieldset($name) as $field) : - ?> -
- label; ?> -
- input; ?> -
-
- -
- -
-
-
- - - form->getInput('is_default'); ?> - -
-
diff --git a/administrator/components/com_xmap/views/sitemap/tmpl/edit_legacy.php b/administrator/components/com_xmap/views/sitemap/tmpl/edit_legacy.php deleted file mode 100644 index 5661b3fc..00000000 --- a/administrator/components/com_xmap/views/sitemap/tmpl/edit_legacy.php +++ /dev/null @@ -1,87 +0,0 @@ - - - -
- -
-
- form->getLabel('id'); ?> - form->getInput('id'); ?> - - form->getLabel('title'); ?> - form->getInput('title'); ?> - - form->getLabel('alias'); ?> - form->getInput('alias'); ?> - - form->getLabel('state'); ?> - form->getInput('state'); ?> - - form->getLabel('access'); ?> - form->getInput('access'); ?> - -
- form->getLabel('introtext'); ?>
-
- form->getInput('introtext'); ?> -
-
- -
- item->id, array('useCookie' => 1)); ?> - - form->getInput('selections'); ?> - form->getFieldsets('attribs'); - foreach ($fieldSets as $name => $fieldSet) : - echo JHtml::_('sliders.panel', JText::_($fieldSet->label), $name . '-options'); - if (isset($fieldSet->description) && trim($fieldSet->description)) : - echo '

' . $this->escape(JText::_($fieldSet->description)) . '

'; - endif; - ?> -
-
    - form->getFieldset($name) as $field) : ?> -
  • - label; ?> - input; ?> -
    • - -
-
- - - -
- - - form->getInput('is_default'); ?> - -
-
diff --git a/administrator/components/com_xmap/views/sitemap/tmpl/navigator_links.php b/administrator/components/com_xmap/views/sitemap/tmpl/navigator_links.php deleted file mode 100644 index b626b4f6..00000000 --- a/administrator/components/com_xmap/views/sitemap/tmpl/navigator_links.php +++ /dev/null @@ -1,22 +0,0 @@ - - - -list as $node) { - $load = 'index.php?option=com_xmap&task=navigator-links&sitemap='.$this->item->id.'&e_name='.$name.(isset($node->id)?'&Itemid='.$node->id:'').(isset($node->link)?'&link='.urlencode($node->link):'').'&tmpl=component'; -?> - expandible?" openicon=\"_open\" icon=\"_closed\" load=\"$load\"":' icon="_doc"'); ?> uid="uid; ?>" link="link); ?>" selectable="selectable?'true':'false'); ?>" /> - - diff --git a/administrator/components/com_xmap/views/sitemaps/view.html.php b/administrator/components/com_xmap/views/sitemaps/view.html.php deleted file mode 100644 index 99bbc84e..00000000 --- a/administrator/components/com_xmap/views/sitemaps/view.html.php +++ /dev/null @@ -1,118 +0,0 @@ -getLayout() !== 'modal') { - XmapHelper::addSubmenu('sitemaps'); - } - - $this->state = $this->get('State'); - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - - $version = new JVersion; - - $message = $this->get('ExtensionsMessage'); - if ( $message ) { - JFactory::getApplication()->enqueueMessage($message); - } - - // 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 window. - if ($this->getLayout() !== 'modal') { - if (version_compare($version->getShortVersion(), '3.0.0', '<')) { - $tpl = 'legacy'; - } - $this->addToolbar(); - } - - parent::display($tpl); - } - - /** - * Display the toolbar - * - * @access private - */ - protected function addToolbar() - { - $state = $this->get('State'); - $doc = JFactory::getDocument(); - $version = new JVersion; - - 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_xmap/images/sitemap-icon.png);}'); - JToolBarHelper::title(JText::_('XMAP_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); - - if (version_compare($version->getShortVersion(), '3.0.0', '>=')) { - JToolBarHelper::custom('sitemaps.setdefault', 'featured.png', 'featured_f2.png', 'XMAP_TOOLBAR_SET_DEFAULT', true); - } else { - JToolBarHelper::custom('sitemaps.setdefault', 'default.png', 'default_f2.png', 'XMAP_TOOLBAR_SET_DEFAULT', true); - } - if ($state->get('filter.published') == -2) { - JToolBarHelper::deleteList('', 'sitemaps.delete','JTOOLBAR_DELETE'); - } - else { - JToolBarHelper::trash('sitemaps.trash','JTOOLBAR_TRASH'); - } - JToolBarHelper::divider(); - - - if (class_exists('JHtmlSidebar')){ - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - $this->sidebar = JHtmlSidebar::render(); - } - } -} diff --git a/administrator/components/com_xmap/xmap.php b/administrator/components/com_xmap/xmap.php deleted file mode 100644 index a65914af..00000000 --- a/administrator/components/com_xmap/xmap.php +++ /dev/null @@ -1,32 +0,0 @@ -execute(JFactory::getApplication()->input->get('task')); -$controller->redirect(); \ No newline at end of file diff --git a/administrator/manifests/packages/pkg_xmap.xml b/administrator/manifests/packages/pkg_xmap.xml deleted file mode 100644 index fe3aee85..00000000 --- a/administrator/manifests/packages/pkg_xmap.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - Xmap Package - xmap - 2.3.3 - http://www.jooxmap.com - Joomla! Vargas - http://www.jooxmap.com - The Site Map generator for Joomla! - - com_xmap.zip - plg_com_content.zip - plg_com_kunena.zip - plg_com_sobipro.zip - plg_com_mtree.zip - plg_com_virtuemart.zip - plg_com_weblinks.zip - plg_com_k2.zip - - diff --git a/administrator/components/com_xmap/views/index.html b/components/com_joxmap/assets/index.html similarity index 100% rename from administrator/components/com_xmap/views/index.html rename to components/com_joxmap/assets/index.html diff --git a/components/com_xmap/assets/xsl/gss.xsl b/components/com_joxmap/assets/xsl/gss.xsl similarity index 100% rename from components/com_xmap/assets/xsl/gss.xsl rename to components/com_joxmap/assets/xsl/gss.xsl diff --git a/components/com_xmap/assets/xsl/gssadmin.xsl b/components/com_joxmap/assets/xsl/gssadmin.xsl similarity index 100% rename from components/com_xmap/assets/xsl/gssadmin.xsl rename to components/com_joxmap/assets/xsl/gssadmin.xsl diff --git a/administrator/components/com_xmap/views/sitemap/index.html b/components/com_joxmap/assets/xsl/index.html similarity index 100% rename from administrator/components/com_xmap/views/sitemap/index.html rename to components/com_joxmap/assets/xsl/index.html diff --git a/administrator/components/com_xmap/views/sitemap/tmpl/index.html b/components/com_joxmap/index.html similarity index 100% rename from administrator/components/com_xmap/views/sitemap/tmpl/index.html rename to components/com_joxmap/index.html diff --git a/components/com_joxmap/joxmap.php b/components/com_joxmap/joxmap.php new file mode 100644 index 00000000..dd1d6cd7 --- /dev/null +++ b/components/com_joxmap/joxmap.php @@ -0,0 +1,22 @@ +bootComponent("com_joxmap") + ->getMVCFactory(); + +$controller = $mvc->createController('SiteMap'); +$controller->execute(Factory::getApplication()->getInput()->get('task')); +$controller->redirect(); diff --git a/components/com_xmap/language/cs-CZ.com_xmap.ini b/components/com_joxmap/language/cs-CZ.com_xmap.ini similarity index 100% rename from components/com_xmap/language/cs-CZ.com_xmap.ini rename to components/com_joxmap/language/cs-CZ.com_xmap.ini diff --git a/components/com_joxmap/language/en-GB/en-GB.com_joxmap.ini b/components/com_joxmap/language/en-GB/en-GB.com_joxmap.ini new file mode 100644 index 00000000..725827bd --- /dev/null +++ b/components/com_joxmap/language/en-GB/en-GB.com_joxmap.ini @@ -0,0 +1,16 @@ +COM_JOXMAP_ERROR_SITEMAP_NOT_FOUND="The requested sitemap does not exits" +COM_JOXMAP_SHOW_AS_EXTERN_ALT="Link opens new window" + +; Warning, the following strings are used on a XLS file. Be careful to enter only XML compatible characters. Eg. use "&" instead of "&" +COM_JOXMAP_LOGIN_AS_ADMIN_EDIT_SITEMAP="If you want to make changes to this sitemap, login with a "Super User" account in the frontend and then come back to this page." +COM_JOXMAP_XML_SITEMAP_HELP="This is your XML sitemap. You can submit the url displayed bellow to the search engines. You can also change the priority or change frequency for each item on the sitemap. If you need any help please read our documentation or post your questions in our forum" +COM_JOXMAP_XML_SITEMAP_URL="Sitemap URL" +COM_JOXMAP_TITLE="Title" +COM_JOXMAP_URL="URL" +COM_JOXMAP_LASTMOD="Last modification date" +COM_JOXMAP_CHANGEFREQ="Change freq." +COM_JOXMAP_PRIORITY="Priority" +COM_JOXMAP_DISPLAY_TITLE="Show titles" +COM_JOXMAP_DISPLAY_EXCLUDED_ITEMS="Show excluded items" +COM_JOXMAP_NUMBER_OF_URLS="Number of URLs in this Sitemap" +COM_JOXMAP_XML_FILE="XML Sitemap File" \ No newline at end of file diff --git a/components/com_xmap/language/es-ES.com_xmap.ini b/components/com_joxmap/language/es-ES.com_xmap.ini similarity index 100% rename from components/com_xmap/language/es-ES.com_xmap.ini rename to components/com_joxmap/language/es-ES.com_xmap.ini diff --git a/components/com_xmap/language/fa-IR.com_xmap.ini b/components/com_joxmap/language/fa-IR.com_xmap.ini similarity index 100% rename from components/com_xmap/language/fa-IR.com_xmap.ini rename to components/com_joxmap/language/fa-IR.com_xmap.ini diff --git a/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.ini b/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.ini new file mode 100644 index 00000000..ac097665 --- /dev/null +++ b/components/com_joxmap/language/fr-FR/fr-FR.com_joxmap.ini @@ -0,0 +1,27 @@ +; @package Xmap +; @copyright 2007 - 2012 Joomla! Vargas. All rights reserved. +; @subpackage fr-FR.com_xmap.ini +; @description Traduction francophone - fr-FR +; @version 2.3.0 - 23.10.2012 +; @author Mihàly Marti alias Sarki +; @copyright Joomlatutos.com - www.joomlautos.com +; @license GNU General Public License version 2, or later +; @note Client frontend +; @note All ini files need to be saved as UTF-8 - No BOM + +COM_JOXMAP_ERROR_SITEMAP_NOT_FOUND="Le plan du site demandé n'existe pas" +COM_JOXMAP_SHOW_AS_EXTERN_ALT="Lien dans une nouvelle fenêtre" + +; Warning, the following strings are used on a XLS file. Be careful to enter only XML compatible characters. Eg. use "&" instead of "&" +COM_JOXMAP_LOGIN_AS_ADMIN_EDIT_SITEMAP="Si vous souhaitez apporter des modifications à ce plan du site, connectez-vous au site avec un compte "Super Utilisateur" et revenez sur cette page." +COM_JOXMAP_XML_SITEMAP_HELP="Ceci est le plan du site XML. Vous pouvez soumettre l'URL affichée ci-dessous aux moteurs de recherche.
Vous pouvez modifier la priorité ou la fréquence de modification pour chaque élément du plan du site.
Si vous avez besoin d'aide, veuillez consulter notre documentation ou poster vos questions dans notre forum." +COM_JOXMAP_XML_SITEMAP_URL="URL du plan de site" +COM_JOXMAP_TITLE="Titre" +COM_JOXMAP_URL="URL" +COM_JOXMAP_LASTMOD="Date de dernière modification" +COM_JOXMAP_CHANGEFREQ="Fréquence de changement" +COM_JOXMAP_PRIORITY="Priorité" +COM_JOXMAP_DISPLAY_TITLE="Afficher les titres" +COM_JOXMAP_DISPLAY_EXCLUDED_ITEMS="Afficher les éléments exclus" +COM_JOXMAP_NUMBER_OF_URLS="Nombre d' URLs dans ce plan du site" +COM_JOXMAP_XML_FILE="Plan du Site XML" \ No newline at end of file diff --git a/components/com_xmap/language/nl-NL.com_xmap.ini b/components/com_joxmap/language/nl-NL.com_xmap.ini similarity index 100% rename from components/com_xmap/language/nl-NL.com_xmap.ini rename to components/com_joxmap/language/nl-NL.com_xmap.ini diff --git a/components/com_xmap/language/ru-RU.com_xmap.ini b/components/com_joxmap/language/ru-RU.com_xmap.ini similarity index 100% rename from components/com_xmap/language/ru-RU.com_xmap.ini rename to components/com_joxmap/language/ru-RU.com_xmap.ini diff --git a/components/com_xmap/metadata.xml b/components/com_joxmap/metadata.xml similarity index 100% rename from components/com_xmap/metadata.xml rename to components/com_joxmap/metadata.xml diff --git a/components/com_xmap/router.php b/components/com_joxmap/services/Router.php similarity index 91% rename from components/com_xmap/router.php rename to components/com_joxmap/services/Router.php index 8736a02f..8635b9d5 100644 --- a/components/com_xmap/router.php +++ b/components/com_joxmap/services/Router.php @@ -1,11 +1,16 @@ getMenu(); if (empty($query['Itemid'])) { @@ -167,7 +172,7 @@ function XmapParseRoute($segments) $vars = array(); //G et the active menu item. - $app = JFactory::getApplication(); + $app = Factory::getApplication(); $menu = $app->getMenu(); $item = $menu->getActive(); diff --git a/components/com_xmap/controllers/ajax.json.php b/components/com_joxmap/src/Controller/AjaxJson.php similarity index 63% rename from components/com_xmap/controllers/ajax.json.php rename to components/com_joxmap/src/Controller/AjaxJson.php index 944db8ce..8a20b1b5 100755 --- a/components/com_xmap/controllers/ajax.json.php +++ b/components/com_joxmap/src/Controller/AjaxJson.php @@ -1,11 +1,15 @@ get('id'))); - $result = new JRegistry('_default'); - $sitemapId = JREquest::getInt('id'); + $user = Factory::getUser(); + $groups = array_keys(UserHelper::getUserGroups($user->get('id'))); + $result = new Registry('_default'); + $sitemapId = XmapHelper::getInt('id'); if (!$user->authorise('core.edit', 'com_xmap.sitemap.'.$sitemapId)) { $result->setValue('result', 'KO'); @@ -38,9 +42,9 @@ public function editElement() } else { $model = $this->getModel('sitemap'); if ($model->getItem()) { - $action = JRequest::getCmd('action', ''); - $uid = JRequest::getCmd('uid', ''); - $itemid = JRequest::getInt('itemid', ''); + $action = XmapHelper::getCmd('action', ''); + $uid = XmapHelper::getCmd('uid', ''); + $itemid = XmapHelper::getInt('itemid', ''); switch ($action) { case 'toggleElement': if ($uid && $itemid) { @@ -48,9 +52,9 @@ public function editElement() } break; case 'changeProperty': - $uid = JRequest::getCmd('uid', ''); - $property = JRequest::getCmd('property', ''); - $value = JRequest::getCmd('value', ''); + $uid = XmapHelper::getCmd('uid', ''); + $property = XmapHelper::getCmd('property', ''); + $value = XmapHelper::getCmd('value', ''); if ($uid && $itemid && $uid && $property) { $state = $model->chageItemPropery($uid, $itemid, 'xml', $property, $value); } diff --git a/components/com_xmap/controller.php b/components/com_joxmap/src/Controller/DisplayController.php similarity index 62% rename from components/com_xmap/controller.php rename to components/com_joxmap/src/Controller/DisplayController.php index 42c47879..a4ca99fc 100644 --- a/components/com_xmap/controller.php +++ b/components/com_joxmap/src/Controller/DisplayController.php @@ -1,16 +1,23 @@ get('id') || !in_array($viewName, array('html', 'xml')) || $viewLayout == 'xsl') { $cachable = false; } if ($viewName) { - $document = JFactory::getDocument(); + $document = Factory::getDocument(); $viewType = $document->getType(); $view = $this->getView($viewName, $viewType, '', array('base_path' => $this->basePath, 'layout' => $viewLayout)); $sitemapmodel = $this->getModel('Sitemap'); diff --git a/components/com_xmap/displayer.php b/components/com_joxmap/src/Controller/JoXmapDisplayer.php similarity index 84% rename from components/com_xmap/displayer.php rename to components/com_joxmap/src/Controller/JoXmapDisplayer.php index 62b7a994..b8783b04 100644 --- a/components/com_xmap/displayer.php +++ b/components/com_joxmap/src/Controller/JoXmapDisplayer.php @@ -1,15 +1,28 @@ get('id'))); - $date = new JDate(); + $user = Factory::getUser(); + $groups = array_keys(UserHelper::getUserGroups($user->get('id'))); + $date = new Date(); $this->userLevels = (array)$user->getAuthorisedViewLevels(); // Deprecated: should use userLevels from now on @@ -66,7 +77,7 @@ public function printSitemap() { foreach ($this->jview->items as $menutype => &$items) { - $node = new stdclass(); + $node = new \stdclass(); $node->uid = "menu-".$menutype; $node->menutype = $menutype; @@ -95,13 +106,13 @@ public function setJView($view) public function getMenuTitle($menutype,$module='mod_menu') { - $app = JFactory::getApplication(); - $db = JFactory::getDbo(); + $app = Factory::getApplication(); + $db = Factory::getDbo(); $title = $extra = ''; // Filter by language if ($app->getLanguageFilter()) { - $extra = ' AND language in ('.$db->quote(JFactory::getLanguage()->getTag()).','.$db->quote('*').')'; + $extra = ' AND language in ('.$db->quote(Factory::getLanguage()->getTag()).','.$db->quote('*').')'; } $db->setQuery( @@ -130,12 +141,12 @@ protected function printMenuTree($menu,&$items) { $this->changeLevel(1); - $router = JSite::getRouter(); + //$router = XmapHelper::getRouter("site");//JSite::getRouter(); foreach ( $items as $i => $item ) { // Add each menu entry to the root tree. $excludeExternal = false; - $node = new stdclass; + $node = new \stdclass; $node->id = $item->id; $node->uid = $item->uid; @@ -158,12 +169,11 @@ protected function printMenuTree($menu,&$items) if ($node->home == 1) { // Correct the URL for the home page. - $node->link = JURI::base(); + $node->link = Uri::base(); } switch ($item->type) { case 'separator': - case 'heading': $node->browserNav=3; break; case 'url': @@ -179,8 +189,8 @@ protected function printMenuTree($menu,&$items) $node->link = 'index.php?Itemid='.$item->params->get('aliasoptions'); break; default: - if ($router->getMode() == JROUTER_MODE_SEF) { - $node->link = 'index.php?Itemid='.$node->id; + if (XmapHelper::isAppSef()) { + $node->link = 'index.php?Itemid='.$node->id; } elseif (!$node->home) { $node->link .= '&Itemid='.$node->id; @@ -222,7 +232,7 @@ public function &getExcludedItems() { static $_excluded_items; if (!isset($_excluded_items)) { $_excluded_items = array(); - $registry = new JRegistry('_default'); + $registry = new Registry('_default'); $registry->loadString($this->sitemap->excluded_items); $_excluded_items = $registry->toArray(); } diff --git a/administrator/components/com_xmap/views/sitemaps/index.html b/components/com_joxmap/src/Controller/index.html old mode 100644 new mode 100755 similarity index 100% rename from administrator/components/com_xmap/views/sitemaps/index.html rename to components/com_joxmap/src/Controller/index.html diff --git a/components/com_xmap/helpers/xmap.php b/components/com_joxmap/src/Helper/XmapHelper.php similarity index 66% rename from components/com_xmap/helpers/xmap.php rename to components/com_joxmap/src/Helper/XmapHelper.php index afd16143..1d6a7e8e 100644 --- a/components/com_xmap/helpers/xmap.php +++ b/components/com_joxmap/src/Helper/XmapHelper.php @@ -1,15 +1,27 @@ $menuOptions) { @@ -52,7 +64,7 @@ public static function &getMenuItems($selections) // Filter by language if ($app->getLanguageFilter()) { - $query->where('n.language in ('.$db->quote(JFactory::getLanguage()->getTag()).','.$db->quote('*').')'); + $query->where('n.language in ('.$db->quote(Factory::getLanguage()->getTag()).','.$db->quote('*').')'); } // Get the list of menu items. @@ -61,21 +73,24 @@ public static function &getMenuItems($selections) $list[$menutype] = array(); // Check for a database error. + if (version_compare(JVERSION, '4.0', '<')){ + if ($db->getErrorNum()) { JError::raiseWarning(021, $db->getErrorMsg()); return array(); } + } // Set some values to make nested HTML rendering easier. foreach ($tmpList as $id => $item) { $item->items = array(); - $params = new JRegistry($item->params); + $params = new Registry($item->params); $item->uid = 'itemid'.$item->id; if (preg_match('#^/?index.php.*option=(com_[^&]+)#', $item->link, $matches)) { $item->option = $matches[1]; - $componentParams = clone(JComponentHelper::getParams($item->option)); + $componentParams = clone(ComponentHelper::getParams($item->option)); $componentParams->merge($params); //$params->merge($componentParams); $params = $componentParams; @@ -115,14 +130,14 @@ public static function &getExtensions() if ($list != null) { return $list; } - $db = JFactory::getDBO(); + $db = Factory::getDBO(); $list = array(); // Get the menu items as a tree. $query = $db->getQuery(true); $query->select('*'); $query->from('#__extensions AS n'); - $query->where('n.folder = \'xmap\''); + $query->where('n.folder = \'joxmap\''); $query->where('n.enabled = 1'); // Get the list of menu items. @@ -132,7 +147,7 @@ public static function &getExtensions() foreach ($extensions as $element => $extension) { if (file_exists(JPATH_PLUGINS . '/' . $extension->folder . '/' . $element. '/'. $element . '.php')) { require_once(JPATH_PLUGINS . '/' . $extension->folder . '/' . $element. '/'. $element . '.php'); - $params = new JRegistry($extension->params); + $params = new Registry($extension->params); $extension->params = $params->toArray(); $list[$element] = $extension; } @@ -164,7 +179,7 @@ public static function prepareMenuItem($item) static function getImages($text,$max) { if (!isset($urlBase)) { - $urlBase = JURI::base(); + $urlBase = Uri::base(); $urlBaseLen = strlen($urlBase); } @@ -231,4 +246,99 @@ static function getPagebreaks($text,$baseLink) } return $subnodes; } + + public static function getpost() { + if (version_compare(JVERSION, '4.0', 'ge')){ + return Factory::getApplication()->input->getArray(array()); + } + else { + return call_user_func_array('JRequest::get', ['post']); + } + } + + public static function get(...$params) { + if (version_compare(JVERSION, '4.0', 'ge')){ + if ($params[0] == 'post '){ + return Factory::getApplication()->input->getInputForRequestMethod('POST'); + } else { + return call_user_func_array(array(Factory::getApplication()->input, 'get'), $params); + } + } + else { + return call_user_func_array('JRequest::get', $params); + } + } + + public static function getVar(...$params) { + if (version_compare(JVERSION, '4.0', 'ge')){ + return call_user_func_array(array(Factory::getApplication()->input, 'getVar'), $params); + } + else { + return call_user_func_array('JRequest::getVar', $params); + } + } + + + public static function setVar(...$params) { + if (version_compare(JVERSION, '4.0', 'ge')){ + call_user_func_array(array(Factory::getApplication()->input, 'setVar'), $params); + } + else { + call_user_func_array('JRequest::setVar', $params); + } + } + + public static function getCmd(...$params) { + if (version_compare(JVERSION, '4.0', 'ge')){ + return call_user_func_array(array(Factory::getApplication()->input, 'getCmd'), $params); + } + else { + return call_user_func_array('JRequest::getCmd', $params); + } + } + + public static function getInt(...$params) { + if (version_compare(JVERSION, '4.0', 'ge')){ + $recordId = call_user_func_array(array(Factory::getApplication()->input, 'getInt'), $params); + } + else { + $recordId = (int)call_user_func_array('JRequest::getInt', $params); + } + } + + + public static function getBool(...$params) { + if (version_compare(JVERSION, '4.0', 'ge')){ + return call_user_func_array(array(Factory::getApplication()->input, 'getBool'), $params); + } + else { + return (int)call_user_func_array('JRequest::getBool', $params); + } + } + public static function getWord(...$params) { + if (version_compare(JVERSION, '4.0', 'ge')){ + return call_user_func_array(array(Factory::getApplication()->input, 'getWord'), $params); + } + else { + return (int)call_user_func_array('JRequest::getWord', $params); + } + } + + public static function getURI() { + return Uri::getInstance(); + } + + public static function getRouter() { + $app = SiteApplication::getInstance('site'); + return $app->getRouter(); + } + + public static function isAppSef() { + if (version_compare(JVERSION, '4.0', 'ge')){ + return Factory::getApplication()->get('sef', 1); + } else { + return $router->getMode() == JROUTER_MODE_SEF; + } + } + } diff --git a/administrator/components/com_xmap/views/sitemaps/tmpl/index.html b/components/com_joxmap/src/Helper/index.html similarity index 100% rename from administrator/components/com_xmap/views/sitemaps/tmpl/index.html rename to components/com_joxmap/src/Helper/index.html diff --git a/components/com_xmap/models/sitemap.php b/components/com_joxmap/src/Model/SitemapModel.php similarity index 71% rename from components/com_xmap/models/sitemap.php rename to components/com_joxmap/src/Model/SitemapModel.php index f387f242..f0b6bd7e 100644 --- a/components/com_xmap/models/sitemap.php +++ b/components/com_joxmap/src/Model/SitemapModel.php @@ -1,26 +1,38 @@ getDbo(); - $query = $db->getQuery(true); - $query->select('id')->from('#__xmap_sitemap')->where('is_default=1'); - $db->setQuery($query); - $pk = $db->loadResult(); - } - + $pk = Factory::getApplication()->input->getInt('id'); $this->setState('sitemap.id', $pk); - $offset = JRequest::getInt('limitstart'); + $offset = XmapHelper::getInt('limitstart'); $this->setState('list.offset', $offset); // Load the parameters. @@ -80,6 +82,14 @@ public function &getItem($pk = null) $db = $this->getDbo(); $pk = (!empty($pk)) ? $pk : (int) $this->getState('sitemap.id'); + // If not sitemap specified, select the default one + if (!$pk) { + $query = $db->getQuery(true); + $query->select('id')->from('#__joxmap_sitemap')->where('is_default=1'); + $db->setQuery($query); + $pk = $db->loadResult(); + } + if ($this->_item === null) { $this->_item = array(); } @@ -89,7 +99,7 @@ public function &getItem($pk = null) $query = $db->getQuery(true); $query->select($this->getState('item.select', 'a.*')); - $query->from('#__xmap_sitemap AS a'); + $query->from('#__joxmap_sitemap AS a'); $query->where('a.id = ' . (int) $pk); @@ -101,7 +111,7 @@ public function &getItem($pk = null) // Filter by access level. if ($access = $this->getState('filter.access')) { - $user = JFactory::getUser(); + $user = Factory::getUser(); $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } @@ -110,27 +120,27 @@ public function &getItem($pk = null) $data = $this->_db->loadObject(); - if ($error = $this->_db->getErrorMsg()) { - throw new Exception($error); - } + // if ($error = $this->_db->getErrorMsg()) { + // throw new Exception($error); + // } if (empty($data)) { - throw new Exception(JText::_('COM_XMAP_ERROR_SITEMAP_NOT_FOUND')); + throw new \Exception(Text::_('COM_JOXMAP_ERROR_SITEMAP_NOT_FOUND')); } // Check for published state if filter set. if (is_numeric($published) && $data->state != $published) { - throw new Exception(JText::_('COM_XMAP_ERROR_SITEMAP_NOT_FOUND')); + throw new Exception(JText::_('COM_JOXMAP_ERROR_SITEMAP_NOT_FOUND')); } // Convert parameter fields to objects. - $registry = new JRegistry('_default'); + $registry = new Registry('_default'); $registry->loadString($data->attribs); $data->params = clone $this->getState('params'); $data->params->merge($registry); // Convert the selections field to an array. - $registry = new JRegistry('_default'); + $registry = new Registry('_default'); $registry->loadString($data->selections); $data->selections = $registry->toArray(); @@ -140,7 +150,7 @@ public function &getItem($pk = null) $data->params->set('access-view', true); } else { // If no access filter is set, the layout takes some responsibility for display of limited information. - $user = &JFactory::getUser(); + $user = &Factory::getUser(); $groups = $user->authorisedLevels(); $data->params->set('access-view', in_array($data->access, $groups)); @@ -182,21 +192,31 @@ public function hit($count) // Initialize variables. $pk = (int) $this->getState('sitemap.id'); - $view = JRequest::getCmd('view', 'html'); + $view = XmapHelper::getCmd('view', 'html'); if ($view != 'xml' && $view != 'html') { return false; } $this->_db->setQuery( - 'UPDATE #__xmap_sitemap' . - ' SET views_' . $view . ' = views_' . $view . ' + 1, count_' . $view . ' = ' . $count . ', lastvisit_' . $view . ' = ' . JFactory::getDate()->toUnix() . + 'UPDATE #__joxmap_sitemap' . + ' SET views_' . $view . ' = views_' . $view . ' + 1, count_' . $view . ' = ' . $count . ', lastvisit_' . $view . ' = ' . Factory::getDate()->toUnix() . ' WHERE id = ' . (int) $pk ); + if (version_compare(JVERSION, '4.0', 'ge')){ + if (!$this->_db->execute()) { + $this->setError($this->_db->getErrorMsg()); + return false; + } + } else { if (!$this->_db->query()) { $this->setError($this->_db->getErrorMsg()); return false; } + } + + + return true; } @@ -204,15 +224,15 @@ public function hit($count) public function getSitemapItems($view=null) { if (!isset($view)) { - $view = JRequest::getCmd('view'); + $view =XmapHelper::getCmd('view'); } - $db = JFactory::getDBO(); + $db = Factory::getDBO(); $pk = (int) $this->getState('sitemap.id'); if (self::$items !== NULL && isset(self::$items[$view])) { return; } - $query = "select * from #__xmap_items where view='$view' and sitemap_id=" . $pk; + $query = "select * from #__joxmap_items where view='$view' and sitemap_id=" . $pk; $db->setQuery($query); $rows = $db->loadObjectList(); self::$items[$view] = array(); @@ -233,7 +253,7 @@ public function getSitemapItems($view=null) function chageItemPropery($uid, $itemid, $view, $property, $value) { $items = $this->getSitemapItems($view); - $db = JFactory::getDBO(); + $db = Factory::getDBO(); $pk = (int) $this->getState('sitemap.id'); $isNew = false; @@ -248,22 +268,27 @@ function chageItemPropery($uid, $itemid, $view, $property, $value) $sep = ';'; } if (!$isNew) { - $query = 'UPDATE #__xmap_items SET properties=\'' . $db->escape($properties) . "' where uid='" . $db->escape($uid) . "' and itemid=$itemid and view='$view' and sitemap_id=" . $pk; + $query = 'UPDATE #__joxmap_items SET properties=\'' . $db->escape($properties) . "' where uid='" . $db->escape($uid) . "' and itemid=$itemid and view='$view' and sitemap_id=" . $pk; } else { - $query = 'INSERT #__xmap_items (uid,itemid,view,sitemap_id,properties) values ( \'' . $db->escape($uid) . "',$itemid,'$view',$pk,'" . $db->escape($properties) . "')"; + $query = 'INSERT #__joxmap_items (uid,itemid,view,sitemap_id,properties) values ( \'' . $db->escape($uid) . "',$itemid,'$view',$pk,'" . $db->escape($properties) . "')"; } $db->setQuery($query); //echo $db->getQuery();exit; - if ($db->query()) { - return true; - } else { - return false; - } + if (version_compare(JVERSION, '4.0', 'ge')){ + if ($db->execute()) { + return true; + } + } else { + if ($db->query()) { + return true; + } + } + return false; } function toggleItem($uid, $itemid) { - $app = JFactory::getApplication('site'); + $app = Factory::getApplication('site'); $sitemap = $this->getItem(); $displayer = new XmapDisplayer($app->getParams(), $sitemap); @@ -284,14 +309,18 @@ function toggleItem($uid, $itemid) $state = 1; } - $registry = new JRegistry('_default'); + $registry = new Registry('_default'); $registry->loadArray($excludedItems); $str = $registry->toString(); - $db = JFactory::getDBO(); - $query = "UPDATE #__xmap_sitemap set excluded_items='" . $db->escape($str) . "' where id=" . $sitemap->id; + $db = Factory::getDBO(); + $query = "UPDATE #__joxmap_sitemap set excluded_items='" . $db->escape($str) . "' where id=" . $sitemap->id; $db->setQuery($query); - $db->query(); + if (version_compare(JVERSION, '4.0', 'ge')){ + $db->execute(); + } else { + $db->query(); + } return $state; } diff --git a/components/com_xmap/assets/css/index.html b/components/com_joxmap/src/Model/index.html similarity index 100% rename from components/com_xmap/assets/css/index.html rename to components/com_joxmap/src/Model/index.html diff --git a/components/com_xmap/views/html/view.html.php b/components/com_joxmap/src/View/Html/HtmlView.php similarity index 73% rename from components/com_xmap/views/html/view.html.php rename to components/com_joxmap/src/View/Html/HtmlView.php index c4cc89b1..fc10c147 100644 --- a/components/com_xmap/views/html/view.html.php +++ b/components/com_joxmap/src/View/Html/HtmlView.php @@ -1,31 +1,34 @@ app = JFactory::getApplication(); - $this->user = JFactory::getUser(); - $doc = JFactory::getDocument(); + $this->app = Factory::getApplication(); + $this->user = Factory::getUser(); + $doc = Factory::getDocument(); // Get view related request variables. - $this->print = JRequest::getBool('print'); + $this->print = XmapHelper::getBool('print'); // Get model data. $this->state = $this->get('State'); $this->item = $this->get('Item'); $this->items = $this->get('Items'); - $this->canEdit = JFactory::getUser()->authorise('core.admin', 'com_xmap'); + $this->canEdit = Factory::getUser()->authorise('core.admin', 'com_xmap'); // Check for errors. if (count($errors = $this->get('Errors'))) { @@ -64,7 +67,7 @@ function display($tpl = null) $params = &$this->state->params; $offset = $this->state->get('page.offset'); if ($params->get('include_css', 0)){ - $doc->addStyleSheet(JURI::root().'components/com_xmap/assets/css/xmap.css'); + $doc->addStyleSheet(Uri::root().'components/com_xmap/assets/css/xmap.css'); } // If a guest user, they may be able to log in to view the full article @@ -72,7 +75,7 @@ function display($tpl = null) if (!$this->item->params->get('access-view')) { if ($user->get('guest')) { // Redirect to login - $uri = JFactory::getURI(); + $uri = XmapHelper::getURI(); $app->redirect( 'index.php?option=com_users&view=login&return=' . base64_encode($uri), JText::_('Xmap_Error_Login_to_view_sitemap') @@ -91,7 +94,7 @@ function display($tpl = null) // Load the class used to display the sitemap $this->loadTemplate('class'); - $this->displayer = new XmapHtmlDisplayer($params, $this->item); + $this->displayer = new JoXmapHtmlDisplayer($params, $this->item); $this->displayer->setJView($this); $this->displayer->canEdit = $this->canEdit; @@ -108,7 +111,7 @@ function display($tpl = null) */ protected function _prepareDocument() { - $app = JFactory::getApplication(); + $app = Factory::getApplication(); $pathway = $app->getPathway(); $menus = $app->getMenu(); $title = null; @@ -127,8 +130,8 @@ protected function _prepareDocument() $title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename')); } // set meta description and keywords from menu item's params - $params = new JRegistry(); - $params->loadString($menu->params); + $params = new Registry(); + $params->loadString($menu->getParams()); $this->document->setDescription($params->get('menu-meta_description')); $this->document->setMetadata('keywords', $params->get('menu-meta_keywords')); } diff --git a/components/com_xmap/assets/images/index.html b/components/com_joxmap/src/View/Html/index.html similarity index 100% rename from components/com_xmap/assets/images/index.html rename to components/com_joxmap/src/View/Html/index.html diff --git a/components/com_xmap/views/xml/view.html.php b/components/com_joxmap/src/View/Xml/HtmlView.php similarity index 69% rename from components/com_xmap/views/xml/view.html.php rename to components/com_joxmap/src/View/Xml/HtmlView.php index 803351e8..6ab9ef47 100644 --- a/components/com_xmap/views/xml/view.html.php +++ b/components/com_joxmap/src/View/Xml/HtmlView.php @@ -1,22 +1,25 @@ user = JFactory::getUser(); - $isNewsSitemap = JRequest::getInt('news',0); - $this->isImages = JRequest::getInt('images',0); + $app = Factory::getApplication(); + $this->user = Factory::getUser(); + $isNewsSitemap = XmapHelper::getInt('news',0); + $this->isImages = XmapHelper::getInt('images',0); $model = $this->getModel('Sitemap'); $this->setModel($model); @@ -55,7 +58,7 @@ function display($tpl = null) $this->item = $this->get('Item'); $this->state = $this->get('State'); - $this->canEdit = JFactory::getUser()->authorise('core.admin', 'com_xmap'); + $this->canEdit = Factory::getUser()->authorise('core.admin', 'com_xmap'); // For now, news sitemaps are not editable $this->canEdit = $this->canEdit && !$isNewsSitemap; @@ -71,7 +74,11 @@ function display($tpl = null) // Check for errors. if (count($errors = $this->get('Errors'))) { + if (version_compare(JVERSION, '4.0', 'ge')){ + Factory::getApplication()->enqueueMessage(implode("\n", $errors), 'warning'); + } else { JError::raiseWarning(500, implode("\n", $errors)); + } return false; } @@ -87,14 +94,14 @@ function display($tpl = null) if (!$this->item->params->get('access-view')) { if ($this->user->get('guest')) { // Redirect to login - $uri = JFactory::getURI(); + $uri = Factory::getURI(); $app->redirect( 'index.php?option=com_users&view=login&return=' . base64_encode($uri), JText::_('Xmap_Error_Login_to_view_sitemap') ); return; } else { - JError::raiseWarning(403, JText::_('Xmap_Error_Not_auth')); + JError::raiseWarning(403, Text::_('Xmap_Error_Not_auth')); return; } } @@ -106,7 +113,7 @@ function display($tpl = null) // Load the class used to display the sitemap $this->loadTemplate('class'); - $this->displayer = new XmapXmlDisplayer($params, $this->item); + $this->displayer = new JoXmapXmlDisplayer($params, $this->item); $this->displayer->setJView($this); @@ -127,9 +134,17 @@ function display($tpl = null) if ($doCompression) { $data = ob_get_contents(); - JResponse::setBody($data); + if (version_compare(JVERSION, '4.0', 'ge')){ + $app->setBody($data); + } else { + JResponse::setBody($data); + } @ob_end_clean(); - echo JResponse::toString(true); + if (version_compare(JVERSION, '4.0', 'ge')){ + echo $app->toString(true); + } else { + echo JResponse::toString(true); + } } $this->recreateBuffering(); exit; diff --git a/components/com_xmap/assets/index.html b/components/com_joxmap/src/View/Xml/index.html similarity index 100% rename from components/com_xmap/assets/index.html rename to components/com_joxmap/src/View/Xml/index.html diff --git a/components/com_xmap/views/html/tmpl/default.php b/components/com_joxmap/tmpl/html/default.php similarity index 86% rename from components/com_xmap/views/html/tmpl/default.php rename to components/com_joxmap/tmpl/html/default.php index 51b416b3..ac4e68ce 100644 --- a/components/com_xmap/views/html/tmpl/default.php +++ b/components/com_joxmap/tmpl/html/default.php @@ -1,9 +1,12 @@ item->params; if ($this->displayer->canEdit) { - $live_site = JURI::root(); + $live_site = Uri::root(); JHTML::_('behavior.framework', true); $ajaxurl = "{$live_site}index.php?option=com_xmap&format=json&task=ajax.editElement&action=toggleElement&".JSession::getFormToken().'=1'; @@ -24,7 +27,7 @@ //$css .= "\n.".$this->item->classname .' li {float:left;}'; $js = " - window.addEvent('domready',function (){ + document.addEventListener('DOMContentLoaded', function(event) { $$('.xmapexcl').each(function(el){ el.onclick = function(){ if (this && this.rel) { @@ -55,7 +58,7 @@ } }"; - $doc = JFactory::getDocument(); + $doc = Factory::getDocument(); $doc->addStyleDeclaration ($css); $doc->addScriptDeclaration ($js); } @@ -96,7 +99,7 @@ loadTemplate('items'); ?> get('include_link', 1) ) : ?> -
Powered by Xmap
+
Powered by JoXmap
  diff --git a/components/com_joxmap/tmpl/html/default.xml b/components/com_joxmap/tmpl/html/default.xml new file mode 100644 index 00000000..8f141f52 --- /dev/null +++ b/components/com_joxmap/tmpl/html/default.xml @@ -0,0 +1,39 @@ + + + + + + + + +
+ +
+ + + + + +
+ + + + +
+ + diff --git a/components/com_joxmap/tmpl/html/default_class.php b/components/com_joxmap/tmpl/html/default_class.php new file mode 100644 index 00000000..f9a1940a --- /dev/null +++ b/components/com_joxmap/tmpl/html/default_class.php @@ -0,0 +1,183 @@ +view = 'html'; + parent::__construct($config, $sitemap); + $this->_parent_children=array(); + $this->_last_child=array(); + $this->live_site = substr_replace(Uri::root(), "", -1, 1); + + $user = Factory::getUser(); + } + + function setJView($view) + { + parent::setJView($view); + + $columns = $this->sitemap->params->get('columns',0); + if( $columns > 1 ) { // calculate column widths + $total = count($view->items); + $columns = $total < $columns? $total : $columns; + $this->_width = (100 / $columns) - 1; + $this->sitemap->params->set('columns',$columns); + } + } + + /** + * Prints one node of the sitemap + * + * + * @param object $node + * @return boolean + */ + function printNode( &$node ) + { + + $out = ''; + + if ($this->isExcluded($node->id,$node->uid) && !$this->canEdit) { + return FALSE; + } + + // To avoid duplicate children in the same parent + if ( !empty($this->_parent_children[$this->level][$node->uid]) ) { + return FALSE; + } + + //var_dump($this->_parent_children[$this->level]); + $this->_parent_children[$this->level][$node->uid] = true; + + $out .= $this->_closeItem; + $out .= $this->_openList; + $this->_openList = ""; + + $out .= '
  • '; + + if( !isset($node->browserNav) ) + $node->browserNav = 0; + + if ($node->browserNav != 3) { + $link = Route::_($node->link, true, @$node->secure); + } + + $node->name = htmlspecialchars($node->name); + switch( $node->browserNav ) { + case 1: // open url in new window + $ext_image = ''; + if ( $this->sitemap->params->get('exlinks') ) { + $ext_image = ' ' . JText::_('COM_JOXMAP_SHOW_AS_EXTERN_ALT') . ''; + } + $out .= ''. $node->name . $ext_image .''; + break; + + case 2: // open url in javascript popup window + $ext_image = ''; + if( $this->sitemap->params->get('exlinks') ) { + $ext_image = ' ' . JText::_('COM_JOXMAP_SHOW_AS_EXTERN_ALT') . ''; + } + $out .= '". $node->name . $ext_image.""; + break; + + case 3: // no link + $out .= ''. $node->name .''; + break; + + default: // open url in parent window + $out .= ''. $node->name .''; + break; + } + + $this->_closeItem = "
    • \n"; + $this->_childs[$this->level]++; + echo $out; + + if ($this->canEdit) { + if ( $this->isExcluded($node->id,$node->uid) ) { + $img = 'v'; + $class= 'xmapexclon'; + } else { + $img = 'x'; + $class= 'xmapexcloff'; + } + echo ' '.$img.''; + } + $this->count++; + + $this->_last_child[$this->level] = $node->uid; + + return TRUE; + } + + /** + * Moves sitemap level up or down + */ + function changeLevel( $level ) { + if ( $level > 0 ) { + # We do not print start ul here to avoid empty list, it's printed at the first child + $this->level += $level; + $this->_childs[$this->level]=0; + $this->_openList = "\n
      level."\">\n"; + $this->_closeItem = ''; + + // If we are moving up, then lets clean the children of this level + // because for sure this is a new set of links + if ( empty ($this->_last_child[$this->level-1]) || empty ($this->_parent_children[$this->level]['parent']) || $this->_parent_children[$this->level]['parent'] != $this->_last_child[$this->level-1] ) { + $this->_parent_children[$this->level]=array(); + $this->_parent_children[$this->level]['parent'] = @$this->_last_child[$this->level-1]; + } + } else { + if ($this->_childs[$this->level]){ + echo $this->_closeItem."
    \n"; + } + $this->_closeItem =''; + $this->_openList = ''; + $this->level += $level; + } + } + + function startMenu(&$menu) { + if( $this->sitemap->params->get('columns') > 1 ) // use columns + echo '
    '; + if( $this->sitemap->params->get('show_menutitle') ) // show menu titles + echo '

    '.$menu->name.'

    '; + } + + function endMenu(&$menu) { + $sitemap=&$this->sitemap; + $this->_closeItem=''; + if( $sitemap->params->get('columns')> 1 ) { + echo "
    \n"; + } + } +} diff --git a/components/com_xmap/views/html/tmpl/default_class.php b/components/com_joxmap/tmpl/html/default_class.xml similarity index 100% rename from components/com_xmap/views/html/tmpl/default_class.php rename to components/com_joxmap/tmpl/html/default_class.xml diff --git a/components/com_xmap/views/html/tmpl/default_items.php b/components/com_joxmap/tmpl/html/default_items.php similarity index 100% rename from components/com_xmap/views/html/tmpl/default_items.php rename to components/com_joxmap/tmpl/html/default_items.php diff --git a/components/com_xmap/views/xml/tmpl/default_items.php b/components/com_joxmap/tmpl/html/default_items.xml similarity index 74% rename from components/com_xmap/views/xml/tmpl/default_items.php rename to components/com_joxmap/tmpl/html/default_items.xml index 5827fc76..e7298070 100644 --- a/components/com_xmap/views/xml/tmpl/default_items.php +++ b/components/com_joxmap/tmpl/html/default_items.xml @@ -1,13 +1,13 @@ state->get('params'); diff --git a/components/com_xmap/assets/xsl/index.html b/components/com_joxmap/tmpl/html/index.html similarity index 100% rename from components/com_xmap/assets/xsl/index.html rename to components/com_joxmap/tmpl/html/index.html diff --git a/components/com_xmap/views/xml/tmpl/default.php b/components/com_joxmap/tmpl/xml/default.php similarity index 51% rename from components/com_xmap/views/xml/tmpl/default.php rename to components/com_joxmap/tmpl/xml/default.php index c2d57b70..ce9fecc7 100644 --- a/components/com_xmap/views/xml/tmpl/default.php +++ b/components/com_joxmap/tmpl/xml/default.php @@ -1,27 +1,32 @@ item->params; -$live_site = substr_replace(JURI::root(), "", -1, 1); +$live_site = substr_replace(Uri::root(), "", -1, 1); header('Content-type: text/xml; charset=utf-8'); echo '',"\n"; if (($this->item->params->get('beautify_xml', 1) == 1) && !$this->displayer->isNews) { - $params = '&filter_showtitle='.JRequest::getBool('filter_showtitle',0); - $params .= '&filter_showexcluded='.JRequest::getBool('filter_showexcluded',0); - $params .= (JRequest::getCmd('lang')?'&lang='.JRequest::getCmd('lang'):''); - echo 'item->id.($this->isImages?'&images=1':'').$params.'"?>'."\n"; + $params = '&filter_showtitle='.XmapHelper::getBool('filter_showtitle',0); + $params .= '&filter_showexcluded='.XmapHelper::getBool('filter_showexcluded',0); + $params .= (XmapHelper::getCmd('lang')?'&lang='.XmapHelper::getCmd('lang'):''); + echo 'item->id.($this->isImages?'&images=1':'').$params.'"?>'."\n"; } ?> displayer->isImages? ' xmlns:image="http://www.google.com/schemas/sitemap-image/1.1"':''); ?>displayer->isNews? ' xmlns:news="http://www.google.com/schemas/sitemap-news/0.9"':''); ?>> diff --git a/components/com_joxmap/tmpl/xml/default.xml b/components/com_joxmap/tmpl/xml/default.xml new file mode 100644 index 00000000..9e0ef30c --- /dev/null +++ b/components/com_joxmap/tmpl/xml/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/components/com_xmap/views/xml/tmpl/default_class.php b/components/com_joxmap/tmpl/xml/default_class.php similarity index 86% rename from components/com_xmap/views/xml/tmpl/default_class.php rename to components/com_joxmap/tmpl/xml/default_class.php index d9d51637..91e8cd6e 100644 --- a/components/com_xmap/views/xml/tmpl/default_class.php +++ b/components/com_joxmap/tmpl/xml/default_class.php @@ -1,16 +1,26 @@ uids = array(); - $this->defaultLanguage = strtolower(JFactory::getLanguage()->getTag()); + $this->defaultLanguage = strtolower(Factory::getLanguage()->getTag()); if (preg_match('/^([a-z]+)-.*/',$this->defaultLanguage,$matches) && !in_array($this->defaultLanguage, array(' zh-cn',' zh-tw')) ) { $this->defaultLanguage = $matches[1]; } - $this->showTitle = JRequest::getBool('filter_showtitle', 0); - $this->showExcluded = JRequest::getBool('filter_showexcluded', 0); + $this->showTitle = XmapHelper::getBool('filter_showtitle', 0); + $this->showExcluded = XmapHelper::getBool('filter_showexcluded', 0); - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $this->nullDate = $db->getNullDate(); } @@ -63,7 +73,7 @@ function __construct($config, $sitemap) * * @param stdclass $node */ - function printNode($node) + function printNode(&$node) { $node->isExcluded = false; if ($this->isExcluded($node->id,$node->uid)) { @@ -83,7 +93,7 @@ function printNode($node) } // Get the item's URL - $link = JRoute::_($node->link, true, @$node->secure == 0 ? (JFactory::getURI()->isSSL() ? 1 : -1) : $node->secure); + $link = Route::_($node->link, true, @$node->secure == 0 ? (XmapHelper::getURI()->isSSL() ? 1 : -1) : $node->secure); if (!isset($node->browserNav)) $node->browserNav = 0; @@ -120,7 +130,7 @@ function printNode($node) $modified = time(); } if ($modified && !is_numeric($modified)){ - $date = new JDate($modified); + $date = new Date($modified); $modified = $date->toUnix(); } if ($modified) { @@ -216,7 +226,7 @@ function changeLevel($level) * @param stdclass $menu The menu node item * @return boolean */ - function startMenu($menu) + function startMenu(&$menu) { return true; } @@ -227,7 +237,7 @@ function startMenu($menu) * @param stdclass $menu The menu node item * @return boolean */ - function endMenu($menu) + function endMenu(&$menu) { return true; } diff --git a/components/com_joxmap/tmpl/xml/default_items.php b/components/com_joxmap/tmpl/xml/default_items.php new file mode 100644 index 00000000..7ceb684a --- /dev/null +++ b/components/com_joxmap/tmpl/xml/default_items.php @@ -0,0 +1,19 @@ +state->get('params'); + +// Use the class defined in default_class.php to print the sitemap +$this->displayer->printSitemap(); \ No newline at end of file diff --git a/components/com_xmap/views/xml/tmpl/default_xsl.php b/components/com_joxmap/tmpl/xml/default_xsl.php similarity index 86% rename from components/com_xmap/views/xml/tmpl/default_xsl.php rename to components/com_joxmap/tmpl/xml/default_xsl.php index 84bc6df2..4c81cc70 100644 --- a/components/com_xmap/views/xml/tmpl/default_xsl.php +++ b/components/com_joxmap/tmpl/xml/default_xsl.php @@ -1,19 +1,27 @@ canEdit && JRequest::getBool('filter_showtitle', 0); -$showExcluded = $this->canEdit && JRequest::getBool('filter_showexcluded', 0); +$showTitle = $this->canEdit && XmapHelper::getBool('filter_showtitle', 0); +$showExcluded = $this->canEdit && XmapHelper::getBool('filter_showexcluded', 0); echo '',"\n"; ?> @@ -23,9 +31,9 @@ -<?php echo JText::_('COM_XMAP_XML_FILE'); ?> - - +<?php echo Text::_('COM_JOXMAP_XML_FILE'); ?> + +