Merge branch 'master' of https://github.com/Thx3r/PluXml into Thx3r-m…

…aster

core/admin/parametres_base.php

@@ -117,8 +117,16 @@
 			<div class="col sml-12 med-7">
 				<?php plxUtils::printSelect('enable_rss',array('1'=>L_YES,'0'=>L_NO), $plxAdmin->aConf['enable_rss']); ?>
 			</div>
-		</div>		
-	</fieldset>
+		</div>
+        <div class="grid">
+            <div class="col sml-12 med-5 label-centered">
+                <label for="id_enable_rss_comment"><?php echo L_CONFIG_BASE_ENABLE_RSS_COMMENT ?>&nbsp;:</label>
+            </div>
+            <div class="col sml-12 med-7">
+                <?php plxUtils::printSelect('enable_rss_comment',array('1'=>L_YES,'0'=>L_NO), $plxAdmin->aConf['enable_rss_comment']); ?>
+            </div>
+        </div>
+    </fieldset>
 	<?php eval($plxAdmin->plxPlugins->callHook('AdminSettingsBase')) # Hook Plugins ?>
 	<?php echo plxToken::getTokenPostMethod() ?>
 

core/lang/de/admin.php

@@ -432,6 +432,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'META Tag "description" - Inhalt (optional)',
 		'L_CONFIG_META_KEYWORDS' => 'META Tag "keywords" - Inhalt (optional)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'RSS-Feeds anzeigen',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'RSS-Feeds für kKommentare anzeigen',
 
 		// parametres_edittpl.php
 

core/lang/en/admin.php

@@ -430,6 +430,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'Content of "description" meta tag (optional)',
 		'L_CONFIG_META_KEYWORDS' => 'Content of "keywords" meta tag (optional)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'Display RSS feeds',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Display RSS feeds for comments',
 
 		// parametres_edittpl.php
 

core/lang/es/admin.php

@@ -427,7 +427,8 @@
 		'L_CONFIG_BASE_UPDATE' => 'Guardar la configuración básica',
 		'L_CONFIG_META_DESCRIPTION' => 'Contenido de la metaetiqueta de description («description», opcional)',
 		'L_CONFIG_META_KEYWORDS' => 'Contenido de la metaetiqueta de palabras clave («keywords», opcional)',
-		'L_CONFIG_BASE_ENABLE_RSS' => 'Mostrar canales RSS',
+		'L_CONFIG_BASE_ENABLE_RSS' => 'Mostrar canales  RSS',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Mostrar canales RSS para comentarios',
 
 		// parametres_edittpl.php
 

core/lang/fr/admin.php

@@ -430,6 +430,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'Contenu de la balise meta "description" du site (optionnel)',
 		'L_CONFIG_META_KEYWORDS' => 'Contenu de la balise meta "keywords" du site (optionnel)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'Afficher les flux RSS',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Afficher les flux RSS des commentaires',
 
 		// parametres_edittpl.php
 

core/lang/it/admin.php

@@ -377,6 +377,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'Contenuto della meta tag "description" del sito (facoltativo)',
 		'L_CONFIG_META_KEYWORDS' => 'Contenuto della meta tag "keywords" del sito (facoltativo)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'Visualizza feed RSS',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Visualizza feed RSS per commenti',
 		'L_CONFIG_EDITTPL_ERROR_NOTHEME' => 'Questo tema non esiste !',
 		'L_CONFIG_EDITTPL_TITLE' => 'Modifica il tema',
 		'L_CONFIG_EDITTPL_SELECT_FILE' => 'Scelta del file da modificare',

core/lang/nl/admin.php

@@ -412,6 +412,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'META-tag "descriptie" van de site (optioneel)',
 		'L_CONFIG_META_KEYWORDS' => 'META-tag "keywords" van de site (optioneel)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'RSS-feeds weergeven',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'RSS-feeds voor commentaar',
 		'L_CONFIG_EDITTPL_ERROR_NOTHEME' => 'Layout bestaat niet !',
 		'L_CONFIG_EDITTPL_TITLE' => 'Layout aanpassen',
 		'L_CONFIG_EDITTPL_SELECT_FILE' => 'Keuze aan te passen bestand :',

core/lang/oc/admin.php

@@ -430,6 +430,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'Contengut de la balisa meta « descripcion » del site (opcion)',
 		'L_CONFIG_META_KEYWORDS' => 'Contengut de las balisas meta « keywords » del site (opcion)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'Mostrar los flux RSS',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Mostrar los flux RSS dels comentaris',
 
 		// parametres_edittpl.php
 

core/lang/pl/admin.php

@@ -429,6 +429,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'Zawartość tagu "opisu" strony (opcjonalnie)',
 		'L_CONFIG_META_KEYWORDS' => 'Zawartość tagu "słowa kluczowego" strony (opcjonalnie)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'Wyświetl kanały RSS',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Wyświetl kanały RSS komentarzy',
 
 		// parametres_edittpl.php
 

core/lang/pt/admin.php

@@ -381,6 +381,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'Conteúdo da baliza meta "description" do web-site (opção)',
 		'L_CONFIG_META_KEYWORDS' => 'Conteúdo da baliza meta "keywords" do web-site (opção)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'Exibir feeds RSS',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Exibir feeds RSS comentários',
 		'L_CONFIG_EDITTPL_ERROR_NOTHEME' => 'O tema não existe !',
 		'L_CONFIG_EDITTPL_TITLE' => 'Edição do tema',
 		'L_CONFIG_EDITTPL_SELECT_FILE' => 'Ecolha do ficheiro a editar :',

core/lang/ro/admin.php

@@ -378,6 +378,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'Conţinutul tag-ul meta "descriere" a site-ului (opţional)',
 		'L_CONFIG_META_KEYWORDS' => 'Conţinut de meta tags "cuvinte cheie" Site-ul (opţional)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'Afișați fluxuri RSS',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Afișați fluxuri RSS comentariile',
 		'L_CONFIG_EDITTPL_ERROR_NOTHEME' => 'Aceasta temă nu există!',
 		'L_CONFIG_EDITTPL_TITLE' => 'Editare Tematica',
 		'L_CONFIG_EDITTPL_SELECT_FILE' => 'Selectaţi fişierul pentru a edita :',

core/lang/ru/admin.php

@@ -432,6 +432,7 @@
 		'L_CONFIG_META_DESCRIPTION' => 'Мета-тег описания "Description" (необязательно)',
 		'L_CONFIG_META_KEYWORDS' => 'Мета-тег ключевых слов "Keywords" (необязательно)',
 		'L_CONFIG_BASE_ENABLE_RSS' => 'Отображать RSS-каналы',
+		'L_CONFIG_BASE_ENABLE_RSS_COMMENT' => 'Отображать RSS-каналы комментариев',
 
 		// parametres_edittpl.php
 

core/lib/class.plx.admin.php

@@ -11,7 +11,7 @@
 
 class plxAdmin extends plxMotor {
 
-	public $update_link = PLX_URL_REPO; // overwritten by self::checmMaj()
+	public $update_link = PLX_URL_REPO; // overwritten by self::checkMaj()
 
 	/**
 	 * Méthode qui se charger de créer le Singleton plxAdmin

core/lib/class.plx.motor.php

@@ -395,7 +395,6 @@ public function getConfiguration($filename) {
 		$this->aConf['custom_admincss_file'] = plxUtils::getValue($this->aConf['custom_admincss_file']);
 		$this->aConf['medias'] = isset($this->aConf['medias']) ? $this->aConf['medias'] : 'data/images/';
 		if(!defined('PLX_PLUGINS')) define('PLX_PLUGINS', PLX_ROOT.$this->aConf['racine_plugins']);
-
 	}
 
 	/**

core/lib/class.plx.show.php

@@ -1331,7 +1331,7 @@ public function comFeed($type = 'rss', $article = '', $format = '<a href="#feedU
         if (eval ($this->plxMotor->plxPlugins->callHook('plxShowComFeed')))
             return;
 
-        if ($this->plxMotor->aConf ['enable_rss']) {
+        if ($this->plxMotor->aConf ['enable_rss_comment']) {
             if ($article != '' and is_numeric($article)) { # Fil Rss des commentaires d'un article
                 $result = str_replace('#feedUrl', $this->plxMotor->urlRewrite('feed.php?rss/commentaires/article' . $article), $format);
                 $result = str_replace('#feedTitle', L_COMFEED_RSS_ARTICLE, $result);

index.php

@@ -95,5 +95,4 @@
 
 # Restitution écran
 echo $output;
-exit;
-?>
+exit;

install.php

@@ -81,6 +81,7 @@
 				'mod_com'=>0,
 				'mod_art'=>0,
 				'enable_rss'=>1,
+				'enable_rss_comment'=>1,
 				'capcha'=>1,
 				'lostpassword'=>1,
 				'style'=>'defaut',

readme/CHANGELOG

@@ -1,5 +1,6 @@
 ## PLUXML 5.8.6 (yyyy/mm/dd) ##
 [+] Update PHPMailer 6.2.0 : security fixes and PHP 8.0 compatibility (P3ter)
+[+] Distinct article and comment rss feeds configuration #521 (thx3r)
 FIX Missing thumbnail in first article #518 (bazooka07)
 FIX Error when editing .htaccess when Apache is not installed (P3ter)
 FIX 404 Error when accessing /blog with url rewriting (bazooka07)

themes/defaut/footer.php

@@ -14,8 +14,10 @@
 			<ul class="menu">
 				<?php  if($plxShow->plxMotor->aConf['enable_rss']) { ?>
 				<li><a href="<?php $plxShow->urlRewrite('feed.php?rss') ?>" title="<?php $plxShow->lang('ARTICLES_RSS_FEEDS'); ?>"><?php $plxShow->lang('ARTICLES'); ?></a></li>
-				<li><a href="<?php $plxShow->urlRewrite('feed.php?rss/commentaires'); ?>" title="<?php $plxShow->lang('COMMENTS_RSS_FEEDS') ?>"><?php $plxShow->lang('COMMENTS'); ?></a></li>
 				<?php } ?>
+                <?php if($plxShow->plxMotor->aConf['enable_rss_comment']) { ?>
+                    <li><a href="<?php $plxShow->urlRewrite('feed.php?rss/commentaires'); ?>" title="<?php $plxShow->lang('COMMENTS_RSS_FEEDS') ?>"><?php $plxShow->lang('COMMENTS'); ?></a></li>
+                <?php  } ?>
 				<li><a href="<?php $plxShow->urlRewrite('#top') ?>" title="<?php $plxShow->lang('GOTO_TOP') ?>"><?php $plxShow->lang('TOP') ?></a></li>
 			</ul>
 		</div>

update/update_5.8.6.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Classe de mise a jour pour PluXml version 5.8
+ *
+ * @package PLX
+ * @author Pedro "P3ter" CADETE
+ **/
+class update_5_8_6 extends plxUpdate
+{
+
+    # mise à jour fichier parametres.xml (récupération du mot de passe)
+    public function step1()
+    {
+        echo L_UPDATE_UPDATE_PARAMETERS_FILE . "<br />";
+
+        $new_parameters = array();
+        $new_parameters['enable_rss_comment'] = '1';
+        $this->updateParameters($new_parameters);
+
+        return true;
+    }
+}

update/versions.php

@@ -34,5 +34,6 @@
 	'5.8.2' => '',
 	'5.8.3' => '',
 	'5.8.4' => '',
-	'5.8.5' => ''
+	'5.8.5' => '',
+	'5.8.6' => 'update_5.8.6.php'
 );