FIX Comments list sorting #419 (#420)

Author: haruka-7

Diff for: core/admin/comments.php

@@ -87,19 +87,19 @@
 	$h2 = '<h2>'.L_COMMENTS_ALL_LIST.'</h2>';
 }
 elseif($comSel=='online') {
-	$comSelMotif = '/^[0-9]{4}.(.*).xml$/';
+	$comSelMotif = '/^\d{4}.(.*).xml$/';
 	$_SESSION['selCom'] = 'online';
 	$nbComPagination=$plxAdmin->nbComments('online');
 	$h2 = '<h2>'.L_COMMENTS_ONLINE_LIST.'</h2>';
 }
 elseif($comSel=='offline') {
-	$comSelMotif = '/^_[0-9]{4}.(.*).xml$/';
+	$comSelMotif = '/^_\d{4}.(.*).xml$/';
 	$_SESSION['selCom'] = 'offline';
 	$nbComPagination=$plxAdmin->nbComments('offline');
 	$h2 = '<h2>'.L_COMMENTS_OFFLINE_LIST.'</h2>';
 }
 elseif($comSel=='all') { // all
-	$comSelMotif = '/^[[:punct:]]?[0-9]{4}.(.*).xml$/';
+	$comSelMotif = '/^[[:punct:]]?\d{4}.(.*).xml$/';
 	$_SESSION['selCom'] = 'all';
 	$nbComPagination=$plxAdmin->nbComments('all');
 	$h2 = '<h2>'.L_COMMENTS_ALL_LIST.'</h2>';

Diff for: core/lib/class.plx.motor.php

@@ -829,28 +829,29 @@ public function parentChildSort_r($idField, $parentField, $els, $parentID = 0, &
 	 * @param	start	commencement
 	 * @param	limite	nombre de commentaires à retourner
 	 * @param	publi	before, after ou all => on récupère tous les fichiers (date) ?
-	 * @return	null
-	 * @author	Florent MONTHEL, Stephane F
+	 * @return	bool	true if there is comments else false
+	 * @author	Florent MONTHEL, Stephane F, Pedro "P3ter" CADETE
 	 **/
 	public function getCommentaires($motif,$ordre='sort',$start=0,$limite=false,$publi='before') {
 
 		# On récupère les fichiers des commentaires
 		$aFiles = $this->plxGlob_coms->query($motif,'com',$ordre,$start,$limite,$publi);
 		if($aFiles) { # On a des fichiers
-			foreach($aFiles as $k=>$v)
+			foreach($aFiles as $k=>$v) {
 				$array[$k] = $this->parseCommentaire(PLX_ROOT.$this->aConf['racine_commentaires'].$v);
+			}
 
 			# hiérarchisation et indentation des commentaires seulement sur les écrans requis
-			if( !(defined('plxAdmin::PLX_ADMIN') OR defined('plxFeed::PLX_FEED')) OR preg_match('#comment_new#',basename($_SERVER['SCRIPT_NAME']))) {
+			if (!preg_match('#comments#',basename($_SERVER['SCRIPT_NAME']))) {
 				$array = $this->parentChildSort_r('index', 'parent', $array);
 			}
 
 			# On stocke les enregistrements dans un objet plxRecord
 			$this->plxRecord_coms = new plxRecord($array);
 
-			return true;
 		}
-		else return false;
+
+		return !empty($aFiles);
 	}
 
 	/**

Diff for: readme/CHANGELOG

@@ -7,6 +7,7 @@ FIX Headline and Tags toggles always closed in article edition #382 (sudwebdesig
 FIX Error when adding or modifying a user #393 (P3ter)
 FIX Alternative to PHPMailer with sendmail #401 (bazooka07)
 FIX Used of an extern URL as a static page #403 (bazooka07)
+FIX Comments list sorting #419 (P3ter)
 
 ## PLUXML 5.8.2 (2020/02/09) ##
 [+] #371 Check PluXml update using javascript if "curl" or "file_get_contents" can not be used (bazooka07)