Make use of categories and track levels optional

mastervanleeuwen · mastervanleeuwen · commit 159b403beb03 · 2023-01-29T12:00:59.000+01:00
diff --git a/administrator/components/com_jtg/config.xml b/administrator/components/com_jtg/config.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
 	<fieldset name="BASIC" label="COM_JTG_BASIC_CONFIGURATION">
+		<field name="jtg_param_default_cat" type="sql"
+			addfieldpath="/administrator/components/com_jtg/elements" default="10"
+			label="COM_JTG_MENU_DEFAULT_CAT"
+			query="SELECT id, title FROM #__jtg_cats WHERE published=1"
+			key_field="id"
+			value_field="title"
+			translate="true"
+		/>
+		<field name="jtg_param_use_cats" type="radio"
+			addfieldpath="/administrator/components/com_jtg/elements" default="1"
+			label="COM_JTG_MENU_USE_CATS" description="COM_JTG_TT_MENU_USE_CATS">
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
 		<field name="jtg_param_display_jtg_credits" type="radio"
 			addfieldpath="/administrator/components/com_jtg/elements" default="1"
 			label="COM_JTG_MENU_SHOW_JTRACKGALLERY_CREDIT" description="COM_JTG_TT_MENU_SHOW_JTRACKGALLERY_CREDIT">
diff --git a/administrator/components/com_jtg/language/en-GB/en-GB.com_jtg.ini b/administrator/components/com_jtg/language/en-GB/en-GB.com_jtg.ini
@@ -7,8 +7,8 @@ COM_JTG_MENU_DISABLE_MAP_ANIMATED_CURSOR="Disable the map animated cursor"
 COM_JTG_TT_MENU_DISABLE_MAP_ANIMATED_CURSOR="If set to yes, this will disable the map animated cursor when mouse is over the heighcharts."
 COM_JTG_MENU_USE_MAP_AUTOCENTERING="Auto center the map"
 COM_JTG_TT_MENU_USE_MAP_AUTOCENTERING="If set to yes, this will continuously centers the map relatively to the animated cursor"
-COM_JTG_CATS_DEFAULT_MAP="Default Map for this category"
-COM_JTG_MENU_HIDE_TRACKINFO="Hide Track Info section"
+COM_JTG_CATS_DEFAULT_MAP="Default map for this category"
+COM_JTG_MENU_HIDE_TRACKINFO="Hide track info section"
 COM_JTG_TT_MENU_HIDE_TRACKINFO="If set to yes, disable displaying information about track (below charts: length difficuty author, total elevation.... "
 
 COM_JTG_LIST_HIDE_ICON_CATEGORY="Hide category icons"
@@ -26,9 +26,9 @@ COM_JTG_UPLOAD_NOTIFY_UID="User to notify on track upload"
 
 COM_JTG_TRACK_VIEW="Track view"
 COM_JTG_OVERVIEW="Overview map"
-COM_JTG_CHARTLINEC_HEARTBEAT="Heartbeat Line Color"
-COM_JTG_CHARTLINEC_PACE="Pace Line Color"
-COM_JTG_CHARTLINEC_SPEED="Speed Line Color"
+COM_JTG_CHARTLINEC_HEARTBEAT="Heartbeat Line color"
+COM_JTG_CHARTLINEC_PACE="Pace Line color"
+COM_JTG_CHARTLINEC_SPEED="Speed Line color"
 COM_JTG_CONF_ADD_STARTMARKER="Add start/end markers"
 COM_JTG_CONF_ADD_STARTMARKER_DESC="Add start and end markers to each track"
 COM_JTG_USEPACE="Display Pace"
@@ -53,14 +53,19 @@ COM_JTG_TRACK_ORDER_HITS_A="ASC Hits"
 COM_JTG_TRACK_ORDER_HITS_D="DESC Hits"
 COM_JTG_TRACK_ORDER_CATID_A="ASC Category-ID"
 COM_JTG_TRACK_ORDER_CATID_D="DESC Category-ID"
-COM_JTG_CHANGELOG_PAGE="ChangeLog"
-COM_JTG_MENU_ELEVATION_FILTER_MIN_ASCENT="Minimum Ascent elevation filter"
+COM_JTG_CHANGELOG_PAGE="Change log"
+COM_JTG_MENU_ELEVATION_FILTER_MIN_ASCENT="Minimum ascent elevation filter"
 COM_JTG_TT_MENU_ELEVATION_FILTER_MIN_ASCENT="All ascent and descent lower than this Minimun ascent will not be considered in the total ascent and descent. This is used to filter elevation. Use 0 to desactivate filtering."
 COM_JTG_MENU_OFFER_DL_ORIGINAL="Offer Original"
 COM_JTG_TT_MENU_OFFER_DL_ORIGINAL="Specify if authorised users can download GPX tracks"
 
 COM_JTG_MAX_TRKPT_DISPLAY="Max number of points to display per track"
 COM_JTG_MAX_TRKPT_DISPLAY2="(0 for no limit)"
+COM_JTG_MENU_DEFAULT_CAT="Default category"
+COM_JTG_MENU_USE_CATS="Use categories"
+COM_JTG_TT_MENU_USE_CATS="Categories are used distinguish different types of tracks on the overview map and in the track lists"
+COM_JTG_USE_LEVEL="Use level"
+COM_JTG_TT_USE_LEVEL="Show difficulty level for tracks"
 COM_JTG_MENU_SHOW_JTRACKGALLERY_CREDIT="Show J!TrackGallery credit"
 COM_JTG_TT_MENU_SHOW_JTRACKGALLERY_CREDIT="By default, a J!TrackGallery credit is shown below maps. You are free to suppress J!TrackGallery credit display."
 COM_JTG_UPLOAD_FAILED="Upload failed"
@@ -78,7 +83,7 @@ COM_JTG_REDIRECT_TO_IMPORT_NO="Only upload tracks, import later in J!TrackGaller
 COM_JTG_LEVELCONF_HELP="<b>Important note:</b> difficulty level correspond to COM_JTG_LEVEL_x (x = 1 to 5). Corresponding translation can be found and modified in language file (administrator com_jtg.ini). <br />The present config menu aims at giving a simple modification of level translation without manipulating language files. This will however override language file translation which is not suitable for multiple language website. <br /><br /> if you intend to set up a multiple language file, do not use this config tab, prefer language file override by providing translation in com_jtg_additional.ini located under /images/jtrackgallery"
 COM_JTG_ERROR_FOUND="One or more bad file(s) are found. Check given error message(s) below."
 COM_JTG_PRESELECTION_DESCRIPTION="This line is used to pre select values which will apply to all tracks. First choose preselected values, and then modify if necessary track values. <br /><b>Important:</b> when modifying one preselection for one select, for every tracks and the corresponding selects, previous values will be erased and overrided."
-COM_JTG_MENU_DISABLE_TERRAINS="Disable Terrains Description"
+COM_JTG_MENU_DISABLE_TERRAINS="Disable terrains description"
 COM_JTG_COMMENT="Post comment"
 COM_JTG_COMMENT_DESC="These users can post comments on tracks"
 COM_JTG_DELETE_COMMENT="Delete comment"
@@ -179,7 +184,7 @@ COM_JTG_INFOLIZ="License"
 COM_JTG_INFORM_AUTOR="E-mail author"
 COM_JTG_INFOSUP="Support Forum"
 COM_JTG_INSTALLED="installed"
-COM_JTG_INTEGRATION="Profile Integration"
+COM_JTG_INTEGRATION="Profile integration"
 COM_JTG_INTERN_COMMENTS="J!TrackGallery commenting system"
 
 COM_JTG_JCOMMENTS="JComments"
@@ -279,7 +284,7 @@ COM_JTG_PARENT="Parent Category"
 COM_JTG_PRESELECTION="Preselection"
 COM_JTG_PREVIEW="Preview"
 COM_JTG_PRIVATE="Private"
-COM_JTG_PROFILEEXT="Profile Extension"
+COM_JTG_PROFILEEXT="Profile extension"
 COM_JTG_PROJECT_PAGE="Project page"
 COM_JTG_PUBLIC="everybody"
 COM_JTG_REFRESH_DATAS="Recalculate 'Calculated values'"
@@ -297,8 +302,8 @@ COM_JTG_SEPARATOR_DEC="."
 COM_JTG_SEPARATOR_THS=","
 COM_JTG_SERVICE_PROVIDER="<!--TODO Check-->COM_JTG_SERVICE_PROVIDER"
 COM_JTG_SHOWCHARTS="Show Elevation- and<br />Speed Graph Settings?"
-COM_JTG_USE_ACCESS_LEVEL="Use Track access level"
-COM_JTG_STANDARDMAP="Standard Map"
+COM_JTG_USE_ACCESS_LEVEL="Use track access level"
+COM_JTG_STANDARDMAP="Standard map"
 COM_JTG_STATE_LATEST="jtg is up to date, no update necessary."
 COM_JTG_STATE="Status"
 COM_JTG_SUPPORT="Support"
diff --git a/administrator/components/com_jtg/language/es-ES/es-ES.com_jtg.ini b/administrator/components/com_jtg/language/es-ES/es-ES.com_jtg.ini
@@ -53,6 +53,11 @@ COM_JTG_TT_MENU_OFFER_DL_ORIGINAL="Specify if authorised users can download GPX
 
 COM_JTG_MAX_TRKPT_DISPLAY="Max number of point to display per track"
 COM_JTG_MAX_TRKPT_DISPLAY2="(0 for no limit)"
+COM_JTG_MENU_DEFAULT_CAT="Default category"
+COM_JTG_MENU_USE_CATS="Use categories"
+COM_JTG_TT_MENU_USE_CATS="Categories are used distinguish different types of tracks on the overview map and in the track lists"
+COM_JTG_USE_LEVEL="Use level"
+COM_JTG_TT_USE_LEVEL="Show difficulty level for tracks"
 COM_JTG_MENU_SHOW_JTRACKGALLERY_CREDIT="Show J!TrackGallery credit"
 COM_JTG_TT_MENU_SHOW_JTRACKGALLERY_CREDIT="By default, a J!TrackGallery credit is shown below maps. You are free to suppress J!TrackGallery credit display."
 COM_JTG_UPLOAD_FAILED="Upload failed!"
diff --git a/administrator/components/com_jtg/language/fr-FR/fr-FR.com_jtg.ini b/administrator/components/com_jtg/language/fr-FR/fr-FR.com_jtg.ini
@@ -59,6 +59,11 @@ COM_JTG_TT_MENU_OFFER_DL_ORIGINAL="Indiquez si les utilisateurs autorisés peuve
 
 COM_JTG_MAX_TRKPT_DISPLAY="Nombre maximal de point affichés par trace"
 COM_JTG_MAX_TRKPT_DISPLAY2="(0 pour supprimer cette limite)"
+COM_JTG_MENU_DEFAULT_CAT="Catégorie par défaut"
+COM_JTG_MENU_USE_CATS="Utiliser catégories"
+COM_JTG_TT_MENU_USE_CATS="Catégories sont utilisés pour organiser les traces dans le vue génerale et le liste de traces"
+COM_JTG_USE_LEVEL="Afficher niveau"
+COM_JTG_TT_USE_LEVEL="Afficher le niveau de difficulté des traces"
 COM_JTG_MENU_SHOW_JTRACKGALLERY_CREDIT="Afficher propulsé par J!TrackGallery"
 COM_JTG_TT_MENU_SHOW_JTRACKGALLERY_CREDIT="Par défaut, J!TrackGallery affiche un lien vers le site jtrackgallery.net. Vous pouvez supprimer l'affichage de ce lien."
 COM_JTG_UPLOAD_FAILED="Le Téléversement a échoué!"
diff --git a/administrator/components/com_jtg/language/it-IT/it-IT.com_jtg.ini b/administrator/components/com_jtg/language/it-IT/it-IT.com_jtg.ini
@@ -59,6 +59,11 @@ COM_JTG_TT_MENU_OFFER_DL_ORIGINAL="Specifica se gli utenti autorizzati possono s
 
 COM_JTG_MAX_TRKPT_DISPLAY="Max numero di punti da visualizzare per traccia"
 COM_JTG_MAX_TRKPT_DISPLAY2="(0 nessun limite)"
+COM_JTG_MENU_DEFAULT_CAT="Categoria predefinita"
+COM_JTG_MENU_USE_CATS="Usa le categorie"
+COM_JTG_TT_MENU_USE_CATS="Le categorie sono utilizzate per distinguere diversi tipi di tracce sulla mappa panoramica e negli elenchi delle tracce"
+COM_JTG_USE_LEVEL="Mostra il livello"
+COM_JTG_TT_USE_LEVEL="Mostra il livello di difficoltà per le tracce"
 COM_JTG_MENU_SHOW_JTRACKGALLERY_CREDIT="Mostra i credits di J!TrackGallery"
 COM_JTG_TT_MENU_SHOW_JTRACKGALLERY_CREDIT="Di default, il credit di J!TrackGallery sarà visualizzato sotto la mappa. Sei libero di togliere la visualizzazione del credit di J!TrackGallery."
 COM_JTG_UPLOAD_FAILED="Caricamento fallito!"
diff --git a/administrator/components/com_jtg/language/nl-NL/nl-NL.com_jtg.ini b/administrator/components/com_jtg/language/nl-NL/nl-NL.com_jtg.ini
@@ -1,4 +1,4 @@
-COM_JTG_TT_INTRO_TEXT_OVERVIEW="Tekst bij overzichtskaart"
+iOM_JTG_TT_INTRO_TEXT_OVERVIEW="Tekst bij overzichtskaart"
 COM_JTG_TT_INTRO_TEXT_OVERVIEW_DESCRIPTION="Deze tekst wordt op de pagina met de overzichtskaart weergegeven"
 
 COM_JTG_CAT="Categorie"
@@ -61,10 +61,15 @@ COM_JTG_TT_MENU_OFFER_DL_ORIGINAL="Het originele bestand kan gedownload worden."
 
 COM_JTG_MAX_TRKPT_DISPLAY="Max aantal punten dat getoond wordt per track"
 COM_JTG_MAX_TRKPT_DISPLAY2="(0 betekent geen limiet)"
+COM_JTG_MENU_DEFAULT_CAT="Default categorie"
+COM_JTG_MENU_USE_CATS="Gebruik categorieën"
+COM_JTG_TT_MENU_USE_CATS="Gebruik categorieen om GPS-tracks te groeperen in de overzichtskaart en -lijst"
+COM_JTG_USE_LEVEL="Toon niveau"
+COM_JTG_TT_USE_LEVEL="Toon moeilijkheidsgraad voor tracks"
 COM_JTG_MENU_SHOW_JTRACKGALLERY_CREDIT="Toon J!TrackGallery-link"
 COM_JTG_TT_MENU_SHOW_JTRACKGALLERY_CREDIT="Toon verwijzing naar de J!TrackGallery website op elke pagina."
 COM_JTG_UPLOAD_FAILED="Upload mislukt!"
-COM_JTG_FILE_DELETE_FAILED="Verwijderen van het bestand %s is niet gelukt";
+COM_JTG_FILE_DELETE_FAILED="Verwijderen van het bestand %s is niet gelukt"
 COM_JTG_UPLOAD="Upload"
 COM_JTG_TT_ERR_FILEEXIST="Bestandsnaam al in gebruik; er wordt een nieuwe unique naam aangemaakt voor dit bestand"
 COM_JTG_MAX_IMAGES="Maximaal aantal foto's per track"
diff --git a/administrator/components/com_jtg/language/pl-PL/pl-PL.com_jtg.ini b/administrator/components/com_jtg/language/pl-PL/pl-PL.com_jtg.ini
@@ -59,6 +59,11 @@ COM_JTG_TT_MENU_OFFER_DL_ORIGINAL="Określ, czy upoważnieni użytkownicy mogą
 
 COM_JTG_MAX_TRKPT_DISPLAY="Max number of point to display per track"
 COM_JTG_MAX_TRKPT_DISPLAY2="(0 for no limit)"
+COM_JTG_MENU_DEFAULT_CAT="Default category"
+COM_JTG_MENU_USE_CATS="Use categories"
+COM_JTG_TT_MENU_USE_CATS="Categories are used distinguish different types of tracks on the overview map and in the track lists"
+COM_JTG_USE_LEVEL="Use level"
+COM_JTG_TT_USE_LEVEL="Show difficulty level for tracks"
 COM_JTG_MENU_SHOW_JTRACKGALLERY_CREDIT="Show J!TrackGallery credit"
 COM_JTG_TT_MENU_SHOW_JTRACKGALLERY_CREDIT="By default, a J!TrackGallery credit is shown below maps. You are free to suppress J!TrackGallery credit display."
 COM_JTG_UPLOAD_FAILED="Upload failed!"
diff --git a/administrator/components/com_jtg/language/ru-RU/ru-RU.com_jtg.ini b/administrator/components/com_jtg/language/ru-RU/ru-RU.com_jtg.ini
@@ -58,6 +58,11 @@ COM_JTG_TT_MENU_OFFER_DL_ORIGINAL="Укажите, могут ли автори
 
 COM_JTG_MAX_TRKPT_DISPLAY="Максимальное количество точек для отображения на треке"
 COM_JTG_MAX_TRKPT_DISPLAY2="(0 - без ограничений)"
+COM_JTG_MENU_DEFAULT_CAT="Категория по умолчанию"
+COM_JTG_MENU_USE_CATS="Используйте категории"
+COM_JTG_TT_MENU_USE_CATS="Категории используются для различения различных типов треков на обзорной карте и в списках треков"
+COM_JTG_USE_LEVEL="Показать уровень"
+COM_JTG_TT_USE_LEVEL="Показать уровень сложности треков"
 COM_JTG_MENU_SHOW_JTRACKGALLERY_CREDIT="Показать J!TrackGallery"
 COM_JTG_TT_MENU_SHOW_JTRACKGALLERY_CREDIT="По умолчанию надпись J!TrackGallery отображается под картами. Вы можете отключить отображение J!TrackGallery"
 COM_JTG_UPLOAD_FAILED="Загрузка не удалась!"
diff --git a/administrator/components/com_jtg/models/files.php b/administrator/components/com_jtg/models/files.php
@@ -867,7 +867,13 @@ function saveFiles()
 			if ( $import !== null )
 			{
 				$catid = $input->get('catid_' . $i, null, 'array');
-				$catid = $catid ? implode(',', $catid) : '';
+				if ($catid) {
+					$catid = $catid ? implode(',', $catid) : '';
+				}
+				else {
+					$params = JComponentHelper::getParams('com_jtg');
+					$catid = $params->get('jtg_param_default_cat');
+				}
 				$level = $input->get('level_' . $i, 0, 'integer');
 				$title = $db->quote($input->get('title_' . $i, '', 'string'));
 				$terrain = $input->get('terrain_' . $i, null, 'array');
diff --git a/administrator/components/com_jtg/sql/install.sql b/administrator/components/com_jtg/sql/install.sql
@@ -57,15 +57,16 @@ CREATE TABLE IF NOT EXISTS `#__jtg_config` (
   `gallery` varchar(10) NOT NULL DEFAULT 'straight',
   `gallery_code` varchar(200) NOT NULL DEFAULT '',
   `showcharts` tinyint(1) unsigned zerofill DEFAULT '2',
+  `uselevel` tinyint(1) unsigned zerofill DEFAULT '1',
   `level` text,
   `maxTrkptDisplay` int(11) NOT NULL DEFAULT '1200'
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 
 
 TRUNCATE `#__jtg_config`;
 
-INSERT  IGNORE INTO `#__jtg_config`(`id`, `unit`, `type`, `max_size`, `max_geoim_height`, `max_thumb_height`, `terms`, `terms_id`, `map_height`, `map_width`, `charts_width`, `charts_height`, `charts_linec`, `charts_linec_pace`, `charts_linec_speed`, `charts_linec_heartbeat`, `charts_bg`, `profile`, `template`, `inform_autor`, `captcha`, `ordering`, `comments`, `access`, `approach`, `routingiconset`, `usevote`, `max_images`, `gallery`, `gallery_code`, `showcharts`, `level`, `maxTrkptDisplay`) VALUES
-(1, 'kilometer', 'jpg,jpeg,png,gif', 1500, 400, 210, 0, 0, '500px', '100%', '100%', '180px', '33FF66', 'FFCC33', '66CCFF', 'FF99CC', 'FFFFFF', '0', 'default', 1, 0, 'DESC', 0, 0, 'no', 'real', 1, 10, 'highslide', '{gallery}%folder%{/gallery}', 2, 'COM_JTG_LEVEL_1\r\nCOM_JTG_LEVEL_2\r\nCOM_JTG_LEVEL_3\r\nCOM_JTG_LEVEL_4\r\nCOM_JTG_LEVEL_5', 6000);
+INSERT  IGNORE INTO `#__jtg_config`(`id`, `unit`, `type`, `max_size`, `max_geoim_height`, `max_thumb_height`, `terms`, `terms_id`, `map_height`, `map_width`, `charts_width`, `charts_height`, `charts_linec`, `charts_linec_pace`, `charts_linec_speed`, `charts_linec_heartbeat`, `charts_bg`, `profile`, `template`, `inform_autor`, `captcha`, `ordering`, `comments`, `access`, `approach`, `routingiconset`, `usevote`, `max_images`, `gallery`, `gallery_code`, `showcharts`, `uselevel`, `level`, `maxTrkptDisplay`) VALUES
+(1, 'kilometer', 'jpg,jpeg,png,gif', 1500, 400, 210, 0, 0, '500px', '100%', '100%', '180px', '33FF66', 'FFCC33', '66CCFF', 'FF99CC', 'FFFFFF', '0', 'default', 1, 0, 'DESC', 0, 0, 'no', 'real', 1, 10, 'highslide', '{gallery}%folder%{/gallery}', 2, 1, 'COM_JTG_LEVEL_1\r\nCOM_JTG_LEVEL_2\r\nCOM_JTG_LEVEL_3\r\nCOM_JTG_LEVEL_4\r\nCOM_JTG_LEVEL_5', 6000);
 
 CREATE TABLE IF NOT EXISTS `#__jtg_files` (
 	`id` int(10) NOT NULL AUTO_INCREMENT,
diff --git a/administrator/components/com_jtg/sql/upgrade/0.9.35.sql b/administrator/components/com_jtg/sql/upgrade/0.9.35.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__jtg_config`
+ADD `uselevel` tinyint(1) unsigned zerofill DEFAULT '1';
diff --git a/administrator/components/com_jtg/views/config/tmpl/default.php b/administrator/components/com_jtg/views/config/tmpl/default.php
@@ -199,6 +199,13 @@ class="adminForm">
 	?>
 	<table class="admintable">
 		<tbody>
+			<tr>
+				<td>
+					<?php echo '<span class="hasTip" title="' . JText::_('COM_JTG_TT_TITLE') . '::'
+					. JText::_('COM_JTG_TT_USE_LEVEL') . '">' . JText::_('COM_JTG_USE_LEVEL') . '</span>'; ?>
+				 </td>
+				<td><?php echo $this->lists['uselevel']; ?></td>
+			</tr>
 			<tr>
 				<td>
 					<?php echo '<span class="hasTip" title="' . JText::_('COM_JTG_TT_TITLE')
diff --git a/administrator/components/com_jtg/views/config/view.html.php b/administrator/components/com_jtg/views/config/view.html.php
@@ -158,6 +158,7 @@ public function display($tpl = null)
 		$lists['inform']			= JHtml::_('select.genericlist', $inform, 'inform_autor', 'size="1"', 'id', 'text', $config->inform_autor);
 		$lists['captcha']			= JHtml::_('select.genericlist', $inform, 'captcha', 'size="1"', 'id', 'text', $config->captcha);
 		$lists['usevote']			= JHtml::_('select.genericlist', $inform, 'usevote', 'size="1"', 'id', 'text', $config->usevote);
+		$lists['uselevel']		= JHtml::_('select.genericlist', $inform, 'uselevel', 'size="1"', 'id', 'text', $config->uselevel);
 		$lists['order']				= JHtml::_('select.genericlist', $order, 'ordering', 'size="1"', 'order', 'text', $config->ordering);
 		$lists['comments']			= JHtml::_('select.genericlist', $comments, 'comments', 'size="1"', 'id', 'text', $config->comments);
 		$lists['access']			= JHtml::_('select.genericlist', $inform, 'access', 'size="1"', 'id', 'text', $config->access);
diff --git a/components/com_jtg/helpers/layout.php b/components/com_jtg/helpers/layout.php
@@ -87,11 +87,13 @@ static public function navigation()
 		$navi .= '<div class="navi-part"><a href="' .
 				JRoute::_("index.php?option=com_jtg&view=jtg&introtext=1".$geoloc) .
 				'">' . JText::_('COM_JTG_OVERVIEW') . '</a></div>';
-		$navi .= '<div class="navi-part"><a href="' .
+		if (JComponentHelper::getParams("com_jtg")->get('jtg_param_use_cats'))
+		{
+			$navi .= '<div class="navi-part"><a href="' .
 				JRoute::_("index.php?option=com_jtg&view=cats&layout=default") . '">' . JText::_('COM_JTG_CATS') . '</a></div>';
+		}
 		$navi .= '<div class="navi-part"><a href="' .
 				JRoute::_("index.php?option=com_jtg&view=files&layout=list") . '">' . JText::_('COM_JTG_TRACKS') . '</a></div>';
-		$cfg = JtgHelper::getConfig();
 
 		$user = JFactory::getUser();
 		if ($user->get('id'))
diff --git a/components/com_jtg/models/files.php b/components/com_jtg/models/files.php
@@ -58,9 +58,11 @@ public function __construct($config = array()) {
 		    	$config['filter_fields'] = array(
 		    	    'search',
 		    	    'mindist',
-		    	    'maxdist',
-		    	    'trackcat',
-		    	    'tracklevel');
+		    	    'maxdist');
+				$params = JComponentHelper::getParams('com_jtg');
+				if ($params->get('jtg_param_use_cat')) $config['filter_fields'][]='trackcat';
+				$cfg = JtgHelper::getConfig();
+				if ($cfg->uselevel) $config['filter_fields'][] = 'tracklevel';
 	    	}
 	 		parent::__construct($config);
 	}
diff --git a/components/com_jtg/models/track.php b/components/com_jtg/models/track.php
@@ -199,7 +199,13 @@ function saveFile ()
 		// Get the post data
 		$input = JFactory::getApplication()->input;
 		$catid = $input->get('catid', null, 'array');
-		$catid = $catid ? implode(',', $catid) : '';
+		if ($catid) {
+			$catid = $catid ? implode(',', $catid) : '';
+		}
+		else {
+			$params = JComponentHelper::getParams('com_jtg');
+			$catid = $params->get('jtg_param_default_cat');
+		}
 		$level = $input->get('level', 0, 'integer');
 		$title = $input->get('title', '', 'string');
 		$terrain = $input->get('terrain', null, 'array');
@@ -763,8 +769,11 @@ function updateFile ($id)
 			}
 		}
 
+		$setcatid = '';
+		if ($catid) $setcatid = "\n catid='" . $catid . "',"; // When categories are not used, the form does not contain this field
+
 		$query = "UPDATE #__jtg_files SET" .
-				"\n catid='" . $catid . "'," .
+				$setcatid.
 				"\n title=" . $title . "," .
 				"\n terrain='" . $terrain . "'," .
 				"\n description='" . $desc . "'," .
diff --git a/components/com_jtg/views/files/tmpl/list.php b/components/com_jtg/views/files/tmpl/list.php
diff --git a/components/com_jtg/views/track/tmpl/default.php b/components/com_jtg/views/track/tmpl/default.php
diff --git a/components/com_jtg/views/track/tmpl/form.php b/components/com_jtg/views/track/tmpl/form.php
diff --git a/installuninstallscript.php b/installuninstallscript.php
diff --git a/modules/mod_jtrackgallery_latest/language/it-IT/it-IT.mod_jtrackgallery_latest.ini b/modules/mod_jtrackgallery_latest/language/it-IT/it-IT.mod_jtrackgallery_latest.ini
