Merge 10307

core/core.php

@@ -425,6 +425,9 @@ class common {
 				case 7:
 					$tempData = $db->get($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5].'.'.$keys[6]);
 					break;
+				case 8:
+					$tempData = $db->get($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5].'.'.$keys[6].'.'.$keys[7]);
+					break;
 			}
 			return $tempData;
 		}
@@ -974,6 +977,10 @@ class common {
 				$db->set($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5],$keys[6]);
 				$db->save();
 				break;
+			case 8:
+				$db->set($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5].'.'.$keys[6],$keys[7] );
+				$db->save();
+				break;
 		}
 		return true;
 	}
@@ -1480,11 +1487,16 @@ class common {
 				}
 			}
 			// Parcourir pageList et rechercher les modules de blog
+			
 			foreach ($pageList as $parentKey => $parent) {
-				//La page a une galerie
+				//La page est un blog
 				if ($this->getData(['page',$parent,'moduleId']) === 'blog' ) {
-					$articleIds = array_keys(helper::arrayCollumn($this->getData(['module',$parent], 'posts'), 'publishedOn', 'SORT_DESC'));
+					//echo "<pre>".$parent;
+					$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $parent, 'posts']), 'publishedOn', 'SORT_DESC'));
+					//var_dump($articleIds);
 					foreach ($articleIds as $key => $article) {
+						//echo $article;
+						//echo "<p>";
 						// Droits les deux groupes
 						$this->setData(['module',  $parent, 'posts', $article,'editConsent', 3]);
 						// Limite de taille 500
@@ -1496,6 +1508,7 @@ class common {
 						// groupe de notification
 						$this->setData(['module',  $parent, 'posts', $article,'commentGroupNotification', 3 ]);
 					}
+
 					// Traitement des commentaires
 					if ( is_array($this->getData(['module',  $parent, 'posts', $article,'comment'])) ) {
 						foreach($this->getData(['module',  $parent, 'posts', $article,'comment']) as $commentId => $comment) {

core/module/install/install.php

@@ -96,9 +96,9 @@ class install extends common {
 				if ($this->getInput('installDefaultData',helper::FILTER_BOOLEAN) === FALSE) {
 					$this->initData('page','fr',true);
 					$this->initData('module','fr',true);
-					$this->setData(['module', 'blog', 'mon-premier-article', 'userId', $userId]);
+					$this->setData(['module', 'blog', 'posts', 'mon-premier-article', 'userId', $userId]);
-					$this->setData(['module', 'blog', 'mon-deuxieme-article', 'userId', $userId]);
+					$this->setData(['module', 'blog', 'posts', 'mon-deuxieme-article', 'userId', $userId]);
-					$this->setData(['module', 'blog', 'mon-troisieme-article', 'userId', $userId]);
+					$this->setData(['module', 'blog', 'posts', 'mon-troisieme-article', 'userId', $userId]);
 				}
 				// Stocker le dossier d'installation
 				$this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]);

module/blog/blog.php

@@ -89,6 +89,54 @@ class blog extends common {
 
 	const BLOG_VERSION = '3.2';
 
+		/**
+	 * Flux RSS
+	 */
+	public function rss() {
+		// Inclure les classes
+		include_once 'module/news/vendor/FeedWriter/Item.php';
+		include_once 'module/news/vendor/FeedWriter/Feed.php';
+		include_once 'module/news/vendor/FeedWriter/RSS2.php';
+		include_once 'module/news/vendor/FeedWriter/InvalidOperationException.php';
+
+		date_default_timezone_set('UTC');
+		$feeds = new \FeedWriter\RSS2();
+
+		// En-tête
+		$feeds->setTitle($this->getData (['page', $this->getUrl(0), 'posts','title']));
+		$feeds->setLink(helper::baseUrl() . $this->getUrl(0));
+		$feeds->setDescription(html_entity_decode(strip_tags($this->getData (['page', $this->getUrl(0), 'metaDescription']))));
+		$feeds->setChannelElement('language', 'fr-FR');
+		$feeds->setDate(time());
+		$feeds->addGenerator();
+		// Corps des articles
+		$articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC');
+		$articleIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'posts']), 'state', 'SORT_DESC');
+		foreach($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
+			if($articlePublishedOn <= time() AND $articleIdsStates[$articleId]) {
+				// Miniature
+				$parts = explode('/',$this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'picture']));
+				$thumb = str_replace ($parts[(count($parts)-1)],'mini_' . $parts[(count($parts)-1)], $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'picture']));
+				// Créer les articles du flux
+				$newsArticle = $feeds->createNewItem();
+				$newsArticle->addElementArray([
+					'title' => strip_tags($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'title']) ),
+					'link' => helper::baseUrl() .$this->getUrl(0) . '/' . $articleId,
+					'description' => html_entity_decode(strip_tags($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'content']))),
+					'addEnclosure' => helper::baseUrl() . self::FILE_DIR . $thumb
+				]);
+				$feeds->addItem($newsArticle);
+			}
+		}
+
+		// Valeurs en sortie
+		$this->addOutput([
+			'display' => self::DISPLAY_RSS,
+			'content' => $feeds->generateFeed(),
+			'view' => 'rss'
+		]);
+	}
+
 	/**
 	 * Édition
 	 */
@@ -319,7 +367,7 @@ class blog extends common {
 			]);
 		} else {
 			// Ids des articles par ordre de publication
-			$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0)]), 'publishedOn', 'SORT_DESC'));
+			$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
 			// Gestion des droits d'accès
 			$filterData=[];
 			foreach ($articleIds as $key => $value) {
@@ -390,6 +438,11 @@ class blog extends common {
 					])
 				];
 			}
+			// Valeurs en sortie
+			$this->addOutput([
+				'title' => 'Configuration du module',
+				'view' => 'config'
+			]);
 		}
 	}