X-Git-Url: https://git.llucax.com/mecon/intranet.git/blobdiff_plain/e59d3170b36e5b9ccc19afcb1565faf4dcb40463..ea683eb1325a87b0cd05dce0426def25af8f1dd0:/sistema/local_lib/HTML_Titulares.php?ds=sidebyside

diff --git a/sistema/local_lib/HTML_Titulares.php b/sistema/local_lib/HTML_Titulares.php
index 03d53a0..1ab8314 100644
--- a/sistema/local_lib/HTML_Titulares.php
+++ b/sistema/local_lib/HTML_Titulares.php
@@ -66,23 +66,29 @@ class HTML_Titulares extends HTML_Table {
     function HTML_Titulares($grupo_secciones = null, $antiguedad = null) // ~X2C
     {
       parent::HTML_Table(array('width'=>'600', 'border'=>'0', 'cellspacing'=>'0', 'cellpadding' => '0'));
+      $db2 = DB::Connect('mysql://intranet:intranet@bal747f/intranet');//FIXME
       $db = MEconDAVDB::Connect();
       $hoy = new Date();
       $fecha_nuevo  = $hoy->format('%Y-%m-%d');
       $query = "SELECT Articles.article_id,
                         IF(Articles.publication_date > '$fecha_nuevo', 'NUEVA', null)
                  FROM Articles, ArticlePublicationStates
-		 WHERE Articles.article_publication_state_id =
-		        ArticlePublicationStates.article_publication_state_id
-		 AND ArticlePublicationStates.publication_state_id=5 ";
+  	  	         WHERE Articles.article_publication_state_id =
+		            ArticlePublicationStates.article_publication_state_id
+        		 AND ArticlePublicationStates.publication_state_id=5 ";
       if(!is_null($grupo_secciones))
       {
-        $db2 = DB::Connect('mysql://intranet:intranet@bal747f/intranet');//FIXME
         $gs = new AI_GrupoSecciones($grupo_secciones);
-	$gs->cargar($db2);
-	if(count($gs->secciones) > 0)
-  	    $query .= 'AND Articles.section_id IN('.implode(',', $gs->secciones).') ';
+    	$gs->cargar($db2);
+	    if(count($gs->secciones) > 0)
+  	        $query .= ' AND Articles.section_id IN('.implode(',', $gs->secciones).') ';
       }
+      else{
+        $censuradas = $db2->getCol('SELECT seccion FROM secciones_censuradas');
+        $query .= ' AND Articles.section_id NOT IN('.implode(',', $censuradas).') ';
+        
+      }
+      
       if(!is_null($antiguedad))
       {
         $hoy->subtractSeconds(60*60*24*$antiguedad);
@@ -94,8 +100,8 @@ class HTML_Titulares extends HTML_Table {
       $this->numero_noticias = $result->numRows();//FIXME no documentado
       if(DB::isError($result))
          die($result->getMessage("query mal hecho"));
-      $ht1 = new HTML_Table(array('width'=>'300', 'border'=>'0', 'cellspacing'=>'0', 'cellpadding' => '0'));
-      $ht2 = new HTML_Table(array('width'=>'300', 'border'=>'0', 'cellspacing'=>'0', 'cellpadding' => '0'));
+      $ht1 = new HTML_Table(array('width'=>'280', 'border'=>'0', 'cellspacing'=>'0', 'cellpadding' => '0'));
+      $ht2 = new HTML_Table(array('width'=>'280', 'border'=>'0', 'cellspacing'=>'0', 'cellpadding' => '0'));
       $impar = true;
       while($row = $result->fetchRow())
       {
@@ -107,7 +113,8 @@ class HTML_Titulares extends HTML_Table {
 	  if(is_null($grupo_secciones))
 	  {
 	  //$n->getIdSeccion();
-  	    $not->setVerMas("noticias?grupo=TODO");//TODO
+  	    $not->setVerMas("noticias?grupo=".
+	                    AI_GrupoSecciones::getGrupo($n->getIdSeccion(), $db2));
 	  }
           if($row[1] == 'NUEVA')
               $not->setNuevo(true);