Se mejora:

- Se sacan todas las bases de datos hardcodeadas.
- Se crea un archivo de configuración para cambiar fácilmente qué conexión usar
  (de no existir se asume un valor por defecto).
- Se agrega un prepend.php (y un .htaccess) que crea una conexión a la DB y
  agrega al include path el directorio lib/ y sistema/local_lib.
- Se corrigen queries que no tenían el nombre de la DB.
Faltaría:
- Hacer que los objetos que usan base de datos la acepten por parámetro.

diff --git a/lib/mecondavdb.php b/lib/mecondavdb.php
deleted file mode 100644 (file)
index 7cb4e98..0000000
--- a/lib/mecondavdb.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Created: Mon Jun 9 17:53:31 2003
-// | Author:  Gonzalo Merayo <gmeray@mecon.gov.ar>
-// +----------------------------------------------------------------------+
-//
-// $Id: bandadb.php 14 2003-07-03 14:24:24Z gmeray $
-// $Author: gmeray $
-// $URL: http://portal.mecon.ar/svn/bandas/sistema/local_lib/bandadb.php $
-// $Date: 2003-07-03 11:24:24 -0300 (Thu, 03 Jul 2003) $
-// $Rev: 14 $
-//
-
-#require_once 'PEAR.php';
-require_once 'DB.php';
-
-PEAR::SetErrorHandling(PEAR_ERROR_TRIGGER);
-
-
-// +X2C Class 121 :BandaDB
-/**
- * @access public
- */
-class MEconDAVDB extends DB {
-  // ~X2C
-
-  // +X2C Operation 122
-  /**
-   * @return void
-   * @access public
-   */
-  function connect() // ~X2C
-  {
-    $conf = include 'configuracion.php';
-    $dsn = $conf['db_type'].'://'.$conf['db_user'].':'.$conf['db_pass'].'@'.$conf['db_host'].'/'.$conf['db_name'];
-    $db = DB::connect($dsn,true);
-    if (DB::isError($db)) {
-      die ($db->getMessage());
-    }
-    return $db;
-  }
-  // -X2C
-
-} // -X2C Class :BandaDB
-?>

diff --git a/lib/noticia.php b/lib/noticia.php
index fc41b8037fabc3cc60d614c3520916ea585e9bcf..182edab5e91b81161cd0296b7a8ed913cdc31ed8 100644 (file)
--- a/lib/noticia.php
+++ b/lib/noticia.php
@@ -2,16 +2,16 @@
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 // |                      Ministerio de Economía                        |
-// |                             Intranet                              |
+// |                             Intranet                               |
 // +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                    |
+// | This file is part of Intranet.                                     |
 // |                                                                    |
-// | Intranet is free software; you can redistribute it and/or modify  |
+// | Intranet is free software; you can redistribute it and/or modify   |
 // | it under the terms of the GNU General Public License as published  |
 // | by the Free Software Foundation; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |
-// | Intranet is distributed in the hope that it will be useful, but   |
+// | Intranet is distributed in the hope that it will be useful, but    |
 // | WITHOUT ANY WARRANTY; without even the implied warranty of         |
 // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   |
 // | General Public License for more details.                           |
@@ -20,16 +20,15 @@
 // | along with Hooks; if not, write to the Free Software Foundation,   |
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+
-// | Creado: Thu Jul 3 14:49:15 2003                                   |
-// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
+// | Creado: Thu Jul 3 14:49:15 2003                                    |
+// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                       |
 // +--------------------------------------------------------------------+
 //
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 //
 
-require_once 'mecondavdb.php';
 require_once 'Date.php';
-
+require_once 'intranetdb.php';
 
 // +X2C Class 161 :noticia
 /**
@@ -54,10 +53,10 @@ class noticia {
     function noticia($noticia) // ~X2C
     {
         $this->noticia = $noticia;
-        $db = MEconDAVDB::Connect();
+        $db = IntranetDB::Connect();
        $query = "SELECT A.headline, A.title, A.abstract, A.article,
                         A.publication_date, S.description, S.section_id
-                 FROM Articles A, Sections S
+                 FROM MEconDAV.Articles A, MEconDAV.Sections S
                  WHERE Article_id = $noticia
                  AND A.section_id = S.section_id";
        $result = $db->query($query);
@@ -158,7 +157,7 @@ class noticia {
     {
         $db = MEconDAVDB::Connect();
         $sql = "SELECT R.link_id, A.headline
-                FROM Relations R, Articles A
+                FROM MEconDAV.Relations R, MEconDAV.Articles A
                 WHERE R.link_id = A.article_id
                 AND   R.article_id = ".$this->noticia;
         $result =& $db->query($sql);
@@ -177,7 +176,7 @@ class noticia {
     function getArchivos() // ~X2C
     {
         $db = MEconDAVDB::Connect();
-        $sql = "SELECT file_for_article_id, caption FROM FilesForArticle WHERE article_id = ".$this->noticia;
+        $sql = "SELECT file_for_article_id, caption FROM MEconDAV.FilesForArticle WHERE article_id = ".$this->noticia;
         $result =& $db->query($sql);
         $archivos = array();
         while($row =& $result->fetchRow())

diff --git a/sistema/conf/db.ini b/sistema/conf/db.ini
new file mode 100644 (file)
index 0000000..bfc5630
--- /dev/null
+++ b/sistema/conf/db.ini
@@ -0,0 +1,11 @@
+; Configuración de la base de datos.
+; $Id$
+
+dsn = "mysql://intranet:c35b9aa6b0758@unix(/var/run/mysqld/mysqld.sock)/intranet"
+
+[opciones]
+persistent = true
+;optimize  = performance
+;debug     = 0
+;autofree  = false
+

diff --git a/sistema/local_lib/HTML_Servicio.php b/sistema/local_lib/HTML_Servicio.php
index ec6110a35aed4b12de6165f57662a41f45555988..a478643d8a3c78b9854a69fe0e81896a51ef14f6 100644 (file)
--- a/sistema/local_lib/HTML_Servicio.php
+++ b/sistema/local_lib/HTML_Servicio.php
@@ -1,17 +1,17 @@
 <?php
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
-// |                      Ministerio de Econom�                        |
-// |                             Intranet                              |
+// |                      Ministerio de Economía                        |
+// |                             Intranet                               |
 // +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                    |
+// | This file is part of Intranet.                                     |
 // |                                                                    |
-// | Intranet is free software; you can redistribute it and/or modify  |
+// | Intranet is free software; you can redistribute it and/or modify   |
 // | it under the terms of the GNU General Public License as published  |
 // | by the Free Software Foundation; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |
-// | Intranet is distributed in the hope that it will be useful, but   |
+// | Intranet is distributed in the hope that it will be useful, but    |
 // | WITHOUT ANY WARRANTY; without even the implied warranty of         |
 // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   |
 // | General Public License for more details.                           |
@@ -21,18 +21,16 @@
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+
 // | Creado: Thu Jul 24 15:27:04 2003                                   |
-// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
+// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                       |
 // +--------------------------------------------------------------------+
 //
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 //
 
-
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/HTML/Link.php';
-require_once 'DB.php';
+require_once 'intranetdb.php';
 require_once 'AI/Servicio.php';
-//  require_once 'AI/DB.php';
 
 // +X2C includes
 require_once 'HTML/Table.php';
@@ -59,10 +57,10 @@ class HTML_Servicio extends HTML_Table {
                                  'cellspacing' => '0',
                                  'cellpadding' => '0',
                                  'bgcolor'     => '#FFFFFF'));
-        $bd = DB::Connect('mysql://intranet:intranet@bal747f/intranet');//FIXME
+        $db = IntranetDB::connect();
         $this->servicio = new AI_Servicio($seccion);
-        $this->servicio->cargar($bd);
-        $this->servicio->cargarHijos($bd, true, AI_SERVICIO_ORDEN_LONG_NOMBRE);
+        $this->servicio->cargar($db);
+        $this->servicio->cargarHijos($db, true, AI_SERVICIO_ORDEN_LONG_NOMBRE);
     }
     // -X2C
 

diff --git a/sistema/local_lib/HTML_Titulares.php b/sistema/local_lib/HTML_Titulares.php
index 1ab83144ca5432361350a73c8f2972f5a31259d8..6d191bcf9766439587cdaa5e0c3616d9becfcc95 100644 (file)
--- a/sistema/local_lib/HTML_Titulares.php
+++ b/sistema/local_lib/HTML_Titulares.php
@@ -2,16 +2,16 @@
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 // |                      Ministerio de Economía                        |
-// |                             Intranet                              |
+// |                             Intranet                               |
 // +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                    |
+// | This file is part of Intranet.                                     |
 // |                                                                    |
-// | Intranet is free software; you can redistribute it and/or modify  |
+// | Intranet is free software; you can redistribute it and/or modify   |
 // | it under the terms of the GNU General Public License as published  |
 // | by the Free Software Foundation; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |
-// | Intranet is distributed in the hope that it will be useful, but   |
+// | Intranet is distributed in the hope that it will be useful, but    |
 // | WITHOUT ANY WARRANTY; without even the implied warranty of         |
 // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   |
 // | General Public License for more details.                           |
@@ -27,9 +27,9 @@
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 //
 
-require_once '../../lib/noticia.php';
-require_once '../local_lib/HTML_Noticia.php';
-require_once '../../lib/mecondavdb.php';
+require_once 'noticia.php';
+require_once 'HTML_Noticia.php';
+require_once 'intranetdb.php';
 require_once 'AI/GrupoSecciones.php';
 
 // +X2C includes
@@ -66,25 +66,24 @@ 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();
+      $db = IntranetDB::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
+                 FROM MEconDAV.Articles, MEconDAV.ArticlePublicationStates
                         WHERE Articles.article_publication_state_id =
                            ArticlePublicationStates.article_publication_state_id
                         AND ArticlePublicationStates.publication_state_id=5 ";
+      $gs = new AI_GrupoSecciones($grupo_secciones);
       if(!is_null($grupo_secciones))
       {
-        $gs = new AI_GrupoSecciones($grupo_secciones);
-       $gs->cargar($db2);
+       $gs->cargar($db);
            if(count($gs->secciones) > 0)
                $query .= ' AND Articles.section_id IN('.implode(',', $gs->secciones).') ';
       }
       else{
-        $censuradas = $db2->getCol('SELECT seccion FROM secciones_censuradas');
+        $censuradas = $gs->getSeccionesOcultasArray($db);
         $query .= ' AND Articles.section_id NOT IN('.implode(',', $censuradas).') ';
         
       }
@@ -99,7 +98,7 @@ class HTML_Titulares extends HTML_Table {
       $result = $db->query($query);
       $this->numero_noticias = $result->numRows();//FIXME no documentado
       if(DB::isError($result))
-         die($result->getMessage("query mal hecho"));
+         trigger_error($result->getMessage('query mal hecho'), E_USER_ERROR);
       $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;
@@ -114,7 +113,7 @@ class HTML_Titulares extends HTML_Table {
          {
          //$n->getIdSeccion();
            $not->setVerMas("noticias?grupo=".
-                           AI_GrupoSecciones::getGrupo($n->getIdSeccion(), $db2));
+                           AI_GrupoSecciones::getGrupo($n->getIdSeccion(), $db));
          }
           if($row[1] == 'NUEVA')
               $not->setNuevo(true);
@@ -143,7 +142,7 @@ class HTML_Titulares extends HTML_Table {
      */
     function getCSS() // ~X2C
     {
-        return "css/noticias.css";
+        return 'css/noticias.css';
     }
     // -X2C
 

diff --git a/sistema/local_lib/Servicios/Agenda.php b/sistema/local_lib/Servicios/Agenda.php
index f2a4bb9fb78052c156b13c98a6fcc6336caac29a..93edb97fa426a34311e6b4995c0f7d30030246aa 100644 (file)
--- a/sistema/local_lib/Servicios/Agenda.php
+++ b/sistema/local_lib/Servicios/Agenda.php
@@ -2,16 +2,16 @@
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 // |                      Ministerio de Economía                        |
-// |                             Intranet                              |
+// |                             Intranet                               |
 // +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                    |
+// | This file is part of Intranet.                                     |
 // |                                                                    |
-// | Intranet is free software; you can redistribute it and/or modify  |
+// | Intranet is free software; you can redistribute it and/or modify   |
 // | it under the terms of the GNU General Public License as published  |
 // | by the Free Software Foundation; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |
-// | Intranet is distributed in the hope that it will be useful, but   |
+// | Intranet is distributed in the hope that it will be useful, but    |
 // | WITHOUT ANY WARRANTY; without even the implied warranty of         |
 // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   |
 // | General Public License for more details.                           |
@@ -27,9 +27,6 @@
 // $Id$
 //
 
-
-
-
 // +X2C Class 174 :Servicios_Agenda
 /**
  * Clase para el manejo de la agenda en la cual se muestran la informacion de los internos de los diferentes edificios.

diff --git a/sistema/local_lib/Servicios/Informes.php b/sistema/local_lib/Servicios/Informes.php
index c0e519bcbc9513d1828e5f45a91b3807a0079205..35446390cd73ac08be12b6beec9f73484f8fadf6 100644 (file)
--- a/sistema/local_lib/Servicios/Informes.php
+++ b/sistema/local_lib/Servicios/Informes.php
@@ -27,7 +27,7 @@
 // $Id: xmi2code.tpl.php 50 2003-08-12 19:00:38Z mmarre $
 //
 
-require_once 'DB.php';
+require_once 'intranetdb.php';
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/HTML/Link.php';
 
@@ -53,8 +53,7 @@ class Servicios_Informes extends HTML_Table {
      */
     function getCSS() // ~X2C
     {
-       $css = '/sistemas/intranet/css/servicios_informes.css';
-       return $css;
+           return '/sistemas/intranet/css/servicios_informes.css';
     }
     // -X2C
 
@@ -65,85 +64,85 @@ class Servicios_Informes extends HTML_Table {
      */
     function toHtml() // ~X2C
     {
-       //Base de Datos
-       $dbh = DB::connect("mysql://mark:mark@intranet-db/MEconDAV");
-
-       //Imágenes
-       $IMG_l296 =& new MECON_HTML_Image('../../images/servicios_informes_l296.gif', '', array('height'=>'1', 'width'=>'296'));
-       $IMG_l24 =& new MECON_HTML_Image('../../images/servicios_informes_l296.gif', '', array('height'=>'1', 'width'=>'24'));
-       $IMG_l320 =& new MECON_HTML_Image('../../images/servicios_informes_l320.gif', '', array('height'=>'24', 'width'=>'320'));
-       $IMG_parl =& new MECON_HTML_Image('../../images/servicios_informes_parl.gif', '-', array('height'=>'24', 'width'=>'24'));
-       
-       //Informes
-       $SECCION = 53;
-       $sql= " SELECT  headline, Articles.article_id, publication_date
-               FROM    Articles, ArticlePublicationStates 
-               WHERE   section_id = $SECCION AND 
-                       Articles.article_publication_state_id=ArticlePublicationStates.article_publication_state_id AND 
-                       ArticlePublicationStates.publication_state_id=5 
-                       ORDER BY publication_date desc, Articles.article_id desc";
-       $informes = $dbh->getAll($sql);
-       
-       $cant_col2 = intval(count($informes)/2);
-       $cant_col1 = count($informes) - $cant_col2;
-       
-       $tabla_out =& new HTML_Table('border="0" cellPadding="0" cellSpacing="0" width="660" align="center"');
-       
-       $tabla_col1 =& new HTML_Table('border="0" cellPadding="0" cellSpacing="0" width="320"'); 
-       for ($i=0; $i<$cant_col1; $i++){
-           $tabla_col1->addRow(array($informes[$i][0]), array('class'=>'servicios_informes_informe', 'colspan'=>'2'));
-           $tabla_col1->addRow(array($IMG_l24->toHtml(), $IMG_l296->toHtml()));
-
-           //Obtener Adjuntos 
-           $sql = "SELECT file_for_article_id, mimetype, filename, caption
-                   FROM FilesForArticle
-                   WHERE article_id = ". $informes[$i][1]. " AND
-                         (oculto <> 1 OR oculto IS NULL)
-                   ORDER BY file_for_article_id ASC";
-           $adjuntos = $dbh->getAll($sql);
-           
-           foreach ($adjuntos as $item){
-               $url = '/sistemas/intranet/servicios/informes/get_file.php';
-               $link_adjunto = new MECON_HTML_Link($url, 
-                                                   $item[3], 
-                                                   array('id'=>$item[0]), 
-                                                   array('target'=>'_blank'));
-               $tabla_col1->addRow(array($IMG_parl->toHtml(), $link_adjunto->toHtml()), array('class'=>'servicios_informes_adjunto'));
-           }
-           
-           $tabla_col1->addRow(array($IMG_l320->toHtml()), array('colspan'=>'2'));
-       }    
-
-       $tabla_col2 =& new HTML_Table('border="0" cellPadding="0" cellSpacing="0" width="320"'); 
-       for ($i=$cant_col1; $i<count($informes); $i++){
-           $tabla_col2->addRow(array($informes[$i][0]), array('class'=>'servicios_informes_informe', 'colspan'=>'2'));
-           $tabla_col2->addRow(array($IMG_l24->toHtml(), $IMG_l296->toHtml()));
-
-           //Obtener Adjuntos 
-           $sql = "SELECT file_for_article_id, mimetype, filename, caption
-                   FROM FilesForArticle
-                   WHERE article_id = ". $informes[$i][1]. " AND
-                         (oculto <> 1 OR oculto IS NULL)                  
-                   ORDER BY file_for_article_id ASC";
-           $adjuntos = $dbh->getAll($sql);
-           
-           foreach ($adjuntos as $item){
-               $url = '/sistemas/intranet/servicios/informes/get_file.php';
-               $link_adjunto = new MECON_HTML_Link($url, 
-                                                   $item[3], 
-                                                   array('id'=>$item[0]), 
-                                                   array('target'=>'_blank'));
-               $tabla_col2->addRow(array($IMG_parl->toHtml(), $link_adjunto->toHtml()), array('class'=>'servicios_informes_adjunto'));
-           }
-
-           $tabla_col2->addRow(array($IMG_l320->toHtml()), array('colspan'=>'2'));
-       }    
-
-       $tabla_out->addRow(array($tabla_col1->toHtml(), $tabla_col2->toHtml()), array('align'=>'center', 'valign'=>'top'));
-
-       return $tabla_out->toHtml();
+        //Base de Datos
+        $dbh = IntranetDB::connect();
+
+        //Imágenes
+        $IMG_l296 =& new MECON_HTML_Image('../../images/servicios_informes_l296.gif', '', array('height'=>'1', 'width'=>'296'));
+        $IMG_l24 =& new MECON_HTML_Image('../../images/servicios_informes_l296.gif', '', array('height'=>'1', 'width'=>'24'));
+        $IMG_l320 =& new MECON_HTML_Image('../../images/servicios_informes_l320.gif', '', array('height'=>'24', 'width'=>'320'));
+        $IMG_parl =& new MECON_HTML_Image('../../images/servicios_informes_parl.gif', '-', array('height'=>'24', 'width'=>'24'));
+
+        //Informes
+        $SECCION = 53;
+        $sql= "        SELECT  headline, Articles.article_id, publication_date
+            FROM       MEconDAV.Articles, MEconDAV.ArticlePublicationStates 
+            WHERE      section_id = $SECCION AND 
+            Articles.article_publication_state_id=ArticlePublicationStates.article_publication_state_id AND 
+            ArticlePublicationStates.publication_state_id=5 
+            ORDER BY publication_date desc, Articles.article_id desc";
+        $informes = $dbh->getAll($sql);
+
+        $cant_col2 = intval(count($informes)/2);
+        $cant_col1 = count($informes) - $cant_col2;
+
+        $tabla_out =& new HTML_Table('border="0" cellPadding="0" cellSpacing="0" width="660" align="center"');
+
+        $tabla_col1 =& new HTML_Table('border="0" cellPadding="0" cellSpacing="0" width="320"'); 
+        for ($i=0; $i<$cant_col1; $i++){
+            $tabla_col1->addRow(array($informes[$i][0]), array('class'=>'servicios_informes_informe', 'colspan'=>'2'));
+            $tabla_col1->addRow(array($IMG_l24->toHtml(), $IMG_l296->toHtml()));
+
+            //Obtener Adjuntos 
+            $sql = "SELECT file_for_article_id, mimetype, filename, caption
+                FROM MEconDAV.FilesForArticle
+                WHERE article_id = ". $informes[$i][1]. " AND
+                (oculto <> 1 OR oculto IS NULL)
+                ORDER BY file_for_article_id ASC";
+            $adjuntos = $dbh->getAll($sql);
+
+            foreach ($adjuntos as $item){
+                $url = '/sistemas/intranet/servicios/informes/get_file.php';
+                $link_adjunto = new MECON_HTML_Link($url, 
+                        $item[3], 
+                        array('id'=>$item[0]), 
+                        array('target'=>'_blank'));
+                $tabla_col1->addRow(array($IMG_parl->toHtml(), $link_adjunto->toHtml()), array('class'=>'servicios_informes_adjunto'));
+            }
+
+            $tabla_col1->addRow(array($IMG_l320->toHtml()), array('colspan'=>'2'));
+        }    
+
+        $tabla_col2 =& new HTML_Table('border="0" cellPadding="0" cellSpacing="0" width="320"'); 
+        for ($i=$cant_col1; $i<count($informes); $i++){
+            $tabla_col2->addRow(array($informes[$i][0]), array('class'=>'servicios_informes_informe', 'colspan'=>'2'));
+            $tabla_col2->addRow(array($IMG_l24->toHtml(), $IMG_l296->toHtml()));
+
+            //Obtener Adjuntos 
+            $sql = "SELECT file_for_article_id, mimetype, filename, caption
+                FROM MEconDAV.FilesForArticle
+                WHERE article_id = ". $informes[$i][1]. " AND
+                (oculto <> 1 OR oculto IS NULL)                   
+                ORDER BY file_for_article_id ASC";
+            $adjuntos = $dbh->getAll($sql);
+
+            foreach ($adjuntos as $item){
+                $url = '/sistemas/intranet/servicios/informes/get_file.php';
+                $link_adjunto = new MECON_HTML_Link($url, 
+                        $item[3], 
+                        array('id'=>$item[0]), 
+                        array('target'=>'_blank'));
+                $tabla_col2->addRow(array($IMG_parl->toHtml(), $link_adjunto->toHtml()), array('class'=>'servicios_informes_adjunto'));
+            }
+
+            $tabla_col2->addRow(array($IMG_l320->toHtml()), array('colspan'=>'2'));
+        }    
+
+        $tabla_out->addRow(array($tabla_col1->toHtml(), $tabla_col2->toHtml()), array('align'=>'center', 'valign'=>'top'));
+
+        return $tabla_out->toHtml();
     }
     // -X2C
 
 } // -X2C Class :Servicios_Informes
-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/Servicios/Legajos/Estudios.php b/sistema/local_lib/Servicios/Legajos/Estudios.php
index 51f14e682e6b5e4316dd3fe0fab1f1a9aa02b6dd..8024202d9f3dac147c36c2972dbf082184ec3f90 100644 (file)
--- a/sistema/local_lib/Servicios/Legajos/Estudios.php
+++ b/sistema/local_lib/Servicios/Legajos/Estudios.php
@@ -2,16 +2,16 @@
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 // |                      Ministerio de Economía                        |
-// |                             Intranet                              |
+// |                             Intranet                               |
 // +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                    |
+// | This file is part of Intranet.                                     |
 // |                                                                    |
-// | Intranet is free software; you can redistribute it and/or modify  |
+// | Intranet is free software; you can redistribute it and/or modify   |
 // | it under the terms of the GNU General Public License as published  |
 // | by the Free Software Foundation; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |
-// | Intranet is distributed in the hope that it will be useful, but   |
+// | Intranet is distributed in the hope that it will be useful, but    |
 // | WITHOUT ANY WARRANTY; without even the implied warranty of         |
 // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   |
 // | General Public License for more details.                           |
@@ -20,8 +20,8 @@
 // | along with Hooks; if not, write to the Free Software Foundation,   |
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+
-// | Creado: Mon Jul 7 17:22:10 2003                                   |
-// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
+// | Creado: Mon Jul 7 17:22:10 2003                                    |
+// | Autor:  Matías Sklar <msklar@mecon.gov.ar>                         |
 // +--------------------------------------------------------------------+
 //
 // $Id: Intranet_Legajos_Estudios.php 23 2003-07-15 18:56:42Z msklar $
@@ -32,6 +32,7 @@
 // +X2C includes
 require_once 'DB.php';
 // ~X2C
+require_once 'intranetdb.php';
 
 // +X2C Class 163 :Servicios_Legajos_Estudios
 /**
@@ -39,6 +40,7 @@ require_once 'DB.php';
  *
  * @access public
  */
+// XXX - Pregunta llucar: POR QUE CATSO HEREDA DE DB???
 class Servicios_Legajos_Estudios extends DB {
     /**
      * @var    int $agente
@@ -64,16 +66,15 @@ class Servicios_Legajos_Estudios extends DB {
     function Servicios_Legajos_Estudios($agente) // ~X2C
     {
         $this->agente = $agente;
-        $dsn = 'mysql://intranet:intranet@intranet-db/novedades';
-        $db = DB::connect($dsn);
+        $db = IntranetDB::connect();
         if (DB::isError($db)) 
-            die ($db->getMessage("No pudo conectarse a la base"));
+            trigger_error($db->getMessage('No pudo conectarse a la base'), E_USER_ERROR);
         $sql = "SELECT * 
-                FROM web005
+                FROM novedades.web005
                 WHERE documento = $agente";
         $result = $db->query($sql);
         if (DB::isError($result))
-            die ($result->getMessage("Query mal hecho"));
+            trigger_error($result->getMessage('Query mal hecho'), E_USER_ERROR);
 
         for ($fila = 0; $fila < $result->numRows(); $fila++) {
             $this->datos[$fila] = $result->fetchRow(DB_FETCHMODE_ASSOC);
@@ -93,4 +94,4 @@ class Servicios_Legajos_Estudios extends DB {
     // -X2C
 
 } // -X2C Class :Servicios_Legajos_Estudios
-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php b/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
index eedd9b31b63776781922b710d63a6fe0e609f393..ea1ef93b2c636c84e33efc11b6e39db776c37f68 100644 (file)
--- a/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
+++ b/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
@@ -2,16 +2,16 @@
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 // |                      Ministerio de Economía                        |
-// |                             Intranet                              |
+// |                             Intranet                               |
 // +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                    |
+// | This file is part of Intranet.                                     |
 // |                                                                    |
-// | Intranet is free software; you can redistribute it and/or modify  |
+// | Intranet is free software; you can redistribute it and/or modify   |
 // | it under the terms of the GNU General Public License as published  |
 // | by the Free Software Foundation; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |
-// | Intranet is distributed in the hope that it will be useful, but   |
+// | Intranet is distributed in the hope that it will be useful, but    |
 // | WITHOUT ANY WARRANTY; without even the implied warranty of         |
 // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   |
 // | General Public License for more details.                           |
@@ -20,18 +20,17 @@
 // | along with Hooks; if not, write to the Free Software Foundation,   |
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+
-// | Creado: Mon Jul 7 17:22:10 2003                                   |
-// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
+// | Creado: Mon Jul 7 17:22:10 2003                                    |
+// | Autor:  Matías Sklar <msklar@mecon.gov.ar>                         |
 // +--------------------------------------------------------------------+
 //
 // $Id: Intranet_Legajos_ExperienciaLaboral.php 23 2003-07-15 18:56:42Z msklar $
 //
 
-
-
 // +X2C includes
 require_once 'DB.php';
 // ~X2C
+require_once 'intranetdb.php';
 
 // +X2C Class 155 :Servicios_Legajos_ExperienciaLaboral
 /**
@@ -39,6 +38,7 @@ require_once 'DB.php';
  *
  * @access public
  */
+// XXX - Pregunta llucar: POR QUE CATSO HEREDA DE DB???
 class Servicios_Legajos_ExperienciaLaboral extends DB {
     /**
      * @var    int $agente
@@ -70,28 +70,27 @@ class Servicios_Legajos_ExperienciaLaboral extends DB {
     function Servicios_Legajos_ExperienciaLaboral($agente) // ~X2C
     {
         $this->agente = $agente;
-        $dsn = 'mysql://intranet:intranet@intranet-db/novedades';
-        $db = DB::connect($dsn);
+        $db = IntranetDB::connect();
         if (DB::isError($db)) 
-            die ($db->getMessage("No pudo conectarse a la base"));
+            trigger_error($db->getMessage('No pudo conectarse a la base'), E_USER_ERROR);
         $sql = "SELECT * 
-                FROM web032
+                FROM novedades.web032
                 WHERE nrodoc = $agente
                 ORDER BY desde";
         $result_exp = $db->query($sql);
         if (DB::isError($result_exp))
-            die ($result_exp->getMessage("Query mal hecho"));
+            trigger_error($result_exp->getMessage('Query mal hecho'), E_USER_ERROR);
 
         for ($fila = 0; $fila < $result_exp->numRows(); $fila++) {
             $this->experiencia[$fila] = $result_exp->fetchRow(DB_FETCHMODE_ASSOC);
         }
 
         $sql = "SELECT *
-                FROM web031
+                FROM novedades.web031
                 WHERE nrodoc = $agente";
         $result_ant = $db->query($sql);
         if (DB::isError($result_ant))
-            die ($result_ant->getMessage("Query mal hecho"));
+            trigger_error($result_ant->getMessage('Query mal hecho'), E_USER_ERROR);
 
         if ($result_ant->numRows() > 0) {
             $this->antiguedad = $result_ant->fetchRow(DB_FETCHMODE_ASSOC);
@@ -123,4 +122,4 @@ class Servicios_Legajos_ExperienciaLaboral extends DB {
     // -X2C
 
 } // -X2C Class :Servicios_Legajos_ExperienciaLaboral
-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/Servicios/Legajos/Familiares.php b/sistema/local_lib/Servicios/Legajos/Familiares.php
index 782dddf433640f080f8fa85b038ac2ba179045fe..1e2bceab1f9af49bdf616c5652c2fcff20aac9a6 100644 (file)
--- a/sistema/local_lib/Servicios/Legajos/Familiares.php
+++ b/sistema/local_lib/Servicios/Legajos/Familiares.php
@@ -2,16 +2,16 @@
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 // |                      Ministerio de Economía                        |
-// |                             Intranet                              |
+// |                             Intranet                               |
 // +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                    |
+// | This file is part of Intranet.                                     |
 // |                                                                    |
-// | Intranet is free software; you can redistribute it and/or modify  |
+// | Intranet is free software; you can redistribute it and/or modify   |
 // | it under the terms of the GNU General Public License as published  |
 // | by the Free Software Foundation; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |
-// | Intranet is distributed in the hope that it will be useful, but   |
+// | Intranet is distributed in the hope that it will be useful, but    |
 // | WITHOUT ANY WARRANTY; without even the implied warranty of         |
 // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   |
 // | General Public License for more details.                           |
@@ -20,23 +20,23 @@
 // | along with Hooks; if not, write to the Free Software Foundation,   |
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+
-// | Creado: Mon Jul 7 17:22:10 2003                                   |
-// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
+// | Creado: Mon Jul 7 17:22:10 2003                                    |
+// | Autor:  Matías Sklar <msklar@mecon.gov.ar>                         |
 // +--------------------------------------------------------------------+
 //
 // $Id: Intranet_Legajos_Familiares.php 23 2003-07-15 18:56:42Z msklar $
 //
 
-
-
 // +X2C includes
 require_once 'DB.php';
 // ~X2C
+require_once 'intranetdb.php';
 
 // +X2C Class 154 :Servicios_Legajos_Familiares
 /**
  * @access public
  */
+// XXX - Pregunta llucar: POR QUE CATSO HEREDA DE DB???
 class Servicios_Legajos_Familiares extends DB {
     /**
      * @var    int $agente
@@ -62,16 +62,15 @@ class Servicios_Legajos_Familiares extends DB {
     function Servicios_Legajos_Familiares($agente) // ~X2C
     {
         $this->agente = $agente;
-        $dsn = 'mysql://intranet:intranet@intranet-db/novedades';
-        $db = DB::connect($dsn);
+        $db = IntranetDB::connect();
         if (DB::isError($db)) 
-            die ($db->getMessage("No pudo conectarse a la base"));
+            trigger_error($db->getMessage('No pudo conectarse a la base'), E_USER_ERROR);
         $sql = "SELECT * 
-                FROM web004
+                FROM novedades.web004
                 WHERE documento = $agente";
         $result = $db->query($sql);
         if (DB::isError($result))
-            die ($result->getMessage("Query mal hecho"));
+            trigger_error($result->getMessage('Query mal hecho'), E_USER_ERROR);
 
         for ($fila = 0; $fila < $result->numRows(); $fila++) {
             $this->datos[$fila] = $result->fetchRow(DB_FETCHMODE_ASSOC);
@@ -90,7 +89,7 @@ class Servicios_Legajos_Familiares extends DB {
         $fila = 0;
         if(is_array($this->datos)) {
             foreach (array_keys($this->datos) as $key) {
-                if($this->datos[$key]['parentesco']=="H") {
+                if($this->datos[$key]['parentesco']=='H') {
                  $aux[$fila]['nombre'] = $this->datos[$key]['nombre'];
                  $aux[$fila]['tipo_doc'] = $this->datos[$key]['tipodoc'];
                  $aux[$fila]['nro_doc'] = $this->datos[$key]['nrodoc'];
@@ -130,4 +129,4 @@ class Servicios_Legajos_Familiares extends DB {
     // -X2C
 
 } // -X2C Class :Servicios_Legajos_Familiares
-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/configuracion.php b/sistema/local_lib/configuracion.php
deleted file mode 100644 (file)
index 5a31be1..0000000
--- a/sistema/local_lib/configuracion.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Created: thu apr 15 15:22:58 ART 2003
-// | Author:  Martin Marrese <mmarre@mecon.gov.ar>
-// +----------------------------------------------------------------------+
-//
-// $Id: configuracion.php 2 2003-06-24 16:54:23Z gmeray $
-// $Author: gmeray $
-// $URL: http://portal.mecon.ar/svn/bandas/sistema/lib/configuracion.php $
-// $Date: 2003-06-24 13:54:23 -0300 (Tue, 24 Jun 2003) $
-// $Rev: 2 $
-//  
-    return array (
-            'titulo_sistema'    => 'Intranet',
-            'pie_sistema'       => 'Ministerio de Economia',
-            'db_type'           => 'mysql',
-            'db_user'           => 'intranet',
-            'db_pass'           => 'intranet',
-            'db_host'           => 'bal747f',
-            'db_name'           => 'intranet',
-    );
-
-?>

diff --git a/sistema/local_lib/intranetdb.php b/sistema/local_lib/intranetdb.php
index f47978c915af694a5a8b7ec44555e8d6373d59b3..02c08e4cf3508c518b0341c3b5bf851ec686ae81 100644 (file)
--- a/sistema/local_lib/intranetdb.php
+++ b/sistema/local_lib/intranetdb.php
@@ -1,57 +1,53 @@
 <?php
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Created: Mon Jun 9 17:53:31 2003
-// | Author:  Gonzalo Merayo <gmeray@mecon.gov.ar>
-// +----------------------------------------------------------------------+
+// -------------------------------------------------------------------
+//                      Ministerio de Economía                        
+//                             Intranet                               
+// -------------------------------------------------------------------
+// This file is part of Intranet.                                     
+//                                                                    
+// Intranet is free software; you can redistribute it and/or modify   
+// it under the terms of the GNU General Public License as published  
+// by the Free Software Foundation; either version 2 of the License,  
+// or (at your option) any later version.                             
+//                                                                    
+// Intranet is distributed in the hope that it will be useful, but          
+// WITHOUT ANY WARRANTY; without even the implied warranty of         
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   
+// General Public License for more details.                           
+//                                                                    
+// You should have received a copy of the GNU General Public License  
+// along with Intrane; if not, write to the Free Software Foundation,   
+// Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      
+// -------------------------------------------------------------------
+// Created: Mon Jun 9 17:53:31 2003
+// Author:  Gonzalo Merayo <gmeray@mecon.gov.ar>
+// -------------------------------------------------------------------
 //
-// $Id: bandadb.php 12 2003-06-24 16:54:23Z gmeray $
-// $Author: gmeray $
-// $URL: http://portal.mecon.ar/svn/bandas/sistema/lib/bandadb.php $
-// $Date: 2003-06-24 13:54:23 -0300 (Tue, 24 Jun 2003) $
-// $Rev: 12 $
+// $Id$
 //
 
-#require_once 'PEAR.php';
 require_once 'DB.php';
 
-
-
-// +X2C Class 121 :BandaDB
 /**
  * @access public
  */
 class IntranetDB extends DB {
-  // ~X2C
 
-  // +X2C Operation 122
-  /**
-   * @return void
-   * @access public
-   */
-  function connect() // ~X2C
-  {
-    $conf = include 'configuracion.php';
-    $dsn = $conf['db_type'].'://'.$conf['db_user'].':'.$conf['db_pass'].'@'.$conf['db_host'].'/'.$conf['db_name'];
-    $db = DB::connect($dsn,true);
-    if (DB::isError($db)) {
-      die ($db->getMessage());
+    /**
+     * @return void
+     * @access public
+     */
+    function connect()
+    {
+        $config = @parse_ini_file(dirname(__FILE__).'/../conf/db.ini');
+        $dsn = @$config['dsn'] ? $config['dsn'] : 'mysql://intranet:c35b9aa6b0758@unix(/var/run/mysqld/mysql.sock)/intranet';
+        $db = DB::connect($dsn, isset($config['persistent']) ? $config['persistent'] : true);
+        if (DB::isError($db)) {
+            trigger_error($db->getMessage(), E_USER_ERROR);
+        }
+        return $db;
     }
-    return $db;
-  }
-  // -X2C
 
-} // -X2C Class :BandaDB
+}
 ?>

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
new file mode 100644 (file)
index 0000000..b6b1bee
--- /dev/null
+++ b/sistema/local_lib/prepend.php
@@ -0,0 +1,11 @@
+<?php
+// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
+
+require_once 'MECON/general.php';
+prepend_include_path('/var/www/sistemas/intranet/sistema/local_lib:/var/www/sistemas/intranet/lib');
+
+// Realizo la conexion con la base de datos
+require_once 'intranetdb.php';
+$DB  =& IntranetDB::connect();
+
+?>

diff --git a/sistema/www/.htaccess b/sistema/www/.htaccess
new file mode 100644 (file)
index 0000000..47bb508
--- /dev/null
+++ b/sistema/www/.htaccess
@@ -0,0 +1 @@
+php_value auto_prepend_file "/var/www/sistemas/intranet/sistema/local_lib/prepend.php"

diff --git a/sistema/www/attach.php b/sistema/www/attach.php
index aca38e184c394427e3c6c309549329cd3a99fa2e..e736846203b510cc5a0c66ff606e07dbab69b1e6 100644 (file)
--- a/sistema/www/attach.php
+++ b/sistema/www/attach.php
@@ -4,13 +4,12 @@
   No esta terminado por que mientras obtenga los datos de la vieja herramienta
     no puedo leer directamente del directorio donde esta guardado
 */
-require_once '../../lib/mecondavdb.php';
+require_once 'intranetdb.php';
 
-$db = MEconDAVDB::Connect();
 $sql = "SELECT mimetype, filename, size
-        FROM FilesForArticle
+        FROM MEconDAV.FilesForArticle
         WHERE file_for_article_id = ".$_GET['numero'];
-$row = $db->getRow($sql);
+$row = $DB->getRow($sql);
 $mime = $row[0];
 $filename = $row[1];
 $size = $row[2];
@@ -20,5 +19,6 @@ header('Location Content-Disposition= attachment; filename='.$filename);
 header('Location Pragma=no-cache');
 header('Location Expires=0');
 header('Location Content-Length='.$size);
+
 ?>
 

diff --git a/sistema/www/login.php b/sistema/www/login.php
index 5430c5dbccd2dd494d1401c8294feb243c5365a8..2a3ae8b7d5b25cb621c019a900a1dd5781956631 100644 (file)
--- a/sistema/www/login.php
+++ b/sistema/www/login.php
@@ -1,14 +1,13 @@
 <?
-  require_once '../local_lib/HTML_DietMarco.php';
-  require_once '../local_lib/HTML_Login.php';
-  require_once 'DB.php';
+  require_once 'HTML_DietMarco.php';
+  require_once 'HTML_Login.php';
   require_once 'MECON/Usuario.php'; //Agregado MANAZAR
 
   if(isset($_POST['usuario']))
   {
     $userid = $_POST['usuario'];
-    $ds = @ldap_connect( "ldapdist.mecon.ar" )
-    or $ds = @ldap_connect( "ldapmaster.mecon.ar" );
+    $ds = @ldap_connect( 'ldapdist.mecon.ar' )
+    or $ds = @ldap_connect( 'ldapmaster.mecon.ar' );
 
     if (! $ds) {
     //error connecting - return false
@@ -89,11 +88,10 @@
        (isset($_POST['redirect']) || isset($_GET['redirect'])))
   {
     @ $redirect = $_GET['redirect'].$_POST['redirect'];
-    $db = DB::Connect('mysql://intranet:intranet@bal747f/intranet');
     $query = "SELECT link
               FROM servicio
               WHERE servicio = $redirect";
-    $link = $db->getOne($query);
+    $link = $DB->getOne($query);
     if(PEAR::isError($link))
       header('location: '.$redirect);
     else

diff --git a/sistema/www/noticias.php b/sistema/www/noticias.php
index 607b7a862012506694802faece5f09c9306b44fc..9158e07addb5abf63e010446d3a3f12122776450 100644 (file)
--- a/sistema/www/noticias.php
+++ b/sistema/www/noticias.php
@@ -1,60 +1,58 @@
 <?
-  require_once '../local_lib/HTML_DietMarco.php';
-  require_once '../local_lib/intranetdb.php';
-  require_once 'MECON/HTML/ArbolDB.php';
-  require_once '../local_lib/HTML_Titulares.php';
-  require_once '../local_lib/HTML_Mensaje.php';
 
-  $m = new HTML_DietMarco('noticias', 'Noticias');
-//  $m->addTitle('Noticias');
-  
-  $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
-  if(isset($_GET['grupo']))
-  {
-      $grupo = $_GET['grupo'];
-      $dias = null;
-  }
-  else
-  {
-      $grupo = null;
-      $dias = 7;
-  }
-  //Esto va a cambiar...
-  $db = IntranetDB::connect();
-  $dbdata = array(
-               'db' => $db,
-                'tabla' => 'grupo_secciones',
-               'id' => 'grupo',
-               'id_activo' => $grupo,
-               'nombre' => 'nombre',
-               'habilitado' => 'habilitado',
-               'id_padre' => 'grupo_padre',
-               'order' => '',
-               'prepend_link' => 'noticias.php?grupo=');
-  $arbol = new MECON_HTML_ArbolDB($dbdata, 'NOTICIAS');
-  $titulares = new HTML_Titulares($grupo, $dias);
-  if($titulares->numero_noticias > 1){
+require_once 'MECON/HTML/ArbolDB.php';
+require_once 'HTML_DietMarco.php';
+require_once 'HTML_Titulares.php';
+require_once 'HTML_Mensaje.php';
+
+$marco = new HTML_DietMarco('noticias', 'Noticias');
+
+$noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
+if(isset($_GET['grupo']))
+{
+    $grupo = $_GET['grupo'];
+    $dias = null;
+}
+else
+{
+    $grupo = null;
+    $dias = 7;
+}
+//Esto va a cambiar...
+$dbdata = array(
+    'db' => $DB,
+    'tabla' => 'intranet.grupo_secciones',
+    'id' => 'grupo',
+    'id_activo' => $grupo,
+    'nombre' => 'nombre',
+    'habilitado' => 'habilitado',
+    'id_padre' => 'grupo_padre',
+    'order' => '',
+    'prepend_link' => 'noticias.php?grupo=');
+$arbol = new MECON_HTML_ArbolDB($dbdata, 'NOTICIAS');
+$titulares = new HTML_Titulares($grupo, $dias);
+if($titulares->numero_noticias > 1){
     $noticias->addRow(array($arbol,$titulares));
-    $m->addStyleSheet($titulares->getCSS());
+    $marco->addStyleSheet($titulares->getCSS());
     $noticias->updateCellAttributes(0, 1, array('valign'=>'top', 'width'=>'600'));
-  }elseif($titulares->numero_noticias == 1){
+}elseif($titulares->numero_noticias == 1){
     $noticia = new HTML_Noticia($titulares->primera_noticia);
     $noticia->setVolver('noticias.php');
     $noticia->setCompleta(true);
     $noticias->addRow(array($arbol,$noticia));
-    $m->addStyleSheet($noticia->getCSS());
+    $marco->addStyleSheet($noticia->getCSS());
     $noticias->updateCellAttributes(0, 1, array('valign'=>'top', 'width'=>'600'));
-  }else//No hay ninguna
-  {
+}else//No hay ninguna
+{
     $mensaje = new HTML_Mensaje('alerta', 'No hay Noticias en esta Seccion', 300);
     $noticias->addRow(array($arbol,$mensaje));
-    $m->addStyleSheet($mensaje->getCSS());
+    $marco->addStyleSheet($mensaje->getCSS());
     $noticias->updateCellAttributes(0, 1, array('valign'=>'middle', 'align'=>'center','width'=>'600'));
-  }
+}
 
-  $m->addStyleSheet($arbol->getCSS());
-  $noticias->updateCellAttributes(0, 0, array('valign'=>'top', 'width'=>'160'));
+$marco->addStyleSheet($arbol->getCSS());
+$noticias->updateCellAttributes(0, 0, array('valign'=>'top', 'width'=>'160'));
 
-  $m->addBodyContent($noticias);
-  $m->display();
+$marco->addBodyContent($noticias);
+$marco->display();
 ?>

diff --git a/sistema/www/servicios.php b/sistema/www/servicios.php
index 8285219711ea5ff32b771aefa655cbb6c13f9f54..740a9312388c9c093c962299865427dc452f332c 100644 (file)
--- a/sistema/www/servicios.php
+++ b/sistema/www/servicios.php
@@ -1,22 +1,19 @@
 <?
-  require_once '../local_lib/HTML_DietMarco.php';
-  require_once '../local_lib/HTML_Servicio.php';
+  require_once 'HTML_DietMarco.php';
+  require_once 'HTML_Servicio.php';
+  require_once 'intranetdb.php';
   require_once 'AI/Servicio.php';
-//  require_once 'AI/DB.php';
-  require_once 'DB.php';
  
   $n_serv = 0;
   if(isset($_GET['servicios']))
       $n_serv = $_GET['servicios'];
   $serv = new AI_Servicio($n_serv);
   $nombre_corto = 'Servicios';
-  //$bd = AI_DB::Connect();
-  $bd = DB::Connect('mysql://intranet:intranet@bal747f/intranet');
   if($n_serv != 0)
   {
     $link = $_SERVER["SCRIPT_NAME"];
 
-    $row = $bd->getRow("SELECT nombre, servicio_padre
+    $row = $DB->getRow("SELECT nombre, servicio_padre
                         FROM servicio
                         WHERE servicio = $n_serv");
     $padre = $row[1];
@@ -29,7 +26,7 @@
     {
       while($padre != 0)
       {
-        $row = $bd->getRow("SELECT nombre, servicio_padre
+        $row = $DB->getRow("SELECT nombre, servicio_padre
                             FROM servicio
                             WHERE servicio = $padre");
        $i++;
@@ -47,10 +44,9 @@
     }
   }else
     $nombre = 'Servicios';//Nombre por default
-  $m = new HTML_DietMarco('servicios', $nombre);
-//  $m->addTitle('Servicios');
-  $serv->cargar($bd);
-  $serv->cargarHijos($bd, true, AI_SERVICIO_ORDEN_LONG_HIJOS);
+  $marco = new HTML_DietMarco('servicios', $nombre);
+  $serv->cargar($DB);
+  $serv->cargarHijos($DB, true, AI_SERVICIO_ORDEN_LONG_HIJOS);
   $col_par = '';
   $col_impar = '';
   $impar = true;
@@ -79,11 +75,11 @@
         }
       }
   }
-  $m->addStyleSheet($sh->getCSS());
+  $marco->addStyleSheet($sh->getCSS());
   $tabla =& new HTML_Table(array('width' => 760,
                                  'cellspacing' => 10));
   $tabla->addRow(array($col_impar, $col_par), array('valign'=>'top'));
-  $m->addBodyContent($tabla);
+  $marco->addBodyContent($tabla);
 
-  $m->display();
+  $marco->display();
 ?>

diff --git a/sistema/www/servicios/agenda/agenda1.php b/sistema/www/servicios/agenda/agenda1.php
index c86f270bbfc808d6c500081433703489512688a5..891b98a65f67667a4582d03f545a438b9f4bac98 100644 (file)
--- a/sistema/www/servicios/agenda/agenda1.php
+++ b/sistema/www/servicios/agenda/agenda1.php
@@ -25,20 +25,13 @@ $Id$
 -----------------------------------------------------------------------------*/
 
 //REQUIRE ONCE {{{
-require_once '../../../local_lib/Servicios/Agenda.php';
+require_once 'Servicios/Agenda.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Tabla.php';
-require_once '../../../local_lib/HTML_DietMarco.php';
+require_once 'HTML_DietMarco.php';
 require_once 'MECON/HTML/QuickForm.php';
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/HTML/Link.php';
-require_once 'DB.php';
-//}}}
-//CREO LA CONEXION A LA BASE DE DATOS {{{
-$DB = DB::connect("mysql://intranet:intranet@intranet-db/agenda",true);
-if (DB::isError($DB)) {
-    die ($DB->getMessage());
-}
 //}}}
 //CREO LOS OBJETOS NECESARIOS {{{
 $TABLAFORM = new MECON_HTML_Tabla ('width="500"', 'claro');

diff --git a/sistema/www/servicios/agenda/agenda2.php b/sistema/www/servicios/agenda/agenda2.php
index 5b6110d3459f2a61856b32d903306c4caefb9b06..08cde33f658b44170d0465054192893e19dc0e13 100644 (file)
--- a/sistema/www/servicios/agenda/agenda2.php
+++ b/sistema/www/servicios/agenda/agenda2.php
@@ -24,19 +24,12 @@ Autor:  Martin Marrese <mmarre@mecon.gov.ar>
 $Id$
 -----------------------------------------------------------------------------*/
 //REQUIRE ONCE {{{
-require_once '../../../local_lib/Servicios/Agenda.php';
+require_once 'Servicios/Agenda.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Tabla.php';
-require_once '../../../local_lib/HTML_DietMarco.php';
+require_once 'HTML_DietMarco.php';
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/HTML/Link.php';
-require_once 'DB.php';
-//}}}
-//CREO LA CONEXION A LA BASE DE DATOS {{{
-$DB = DB::connect("mysql://intranet:intranet@intranet-db/agenda",true);
-if (DB::isError($DB)) {
-    die ($DB->getMessage());
-}
 //}}}
 //CREO LOS OBJETOS NECESARIOS {{{
 $MARCO     = new HTML_DietMarco('servicios', 'Servicios');

diff --git a/sistema/www/servicios/bandas/accesos.php b/sistema/www/servicios/bandas/accesos.php
index 660551148418055f51ff180960687da10cba4ae5..9754ab87721a6f97bbdfbda6b365e7e2f3640e78 100644 (file)
--- a/sistema/www/servicios/bandas/accesos.php
+++ b/sistema/www/servicios/bandas/accesos.php
@@ -12,17 +12,11 @@ if(!isset($_SESSION['documento']))
        die ('El usuario no se encuentra logueado en la Intranet');
 }
 
-//CREO LA CONEXION A LA BASE DE DATOS
-$dbh = DB::connect("mysql://intranet:intranet@bal747f/bandas",true);
-if (DB::isError($dbh)) {
-    die ($DB->getMessage());
-}
-
 $nrodoc = $_SESSION['documento'];
 $fecha = $_GET['fecha'];
 
 //CREO LOS OBJETOS NECESARIOS
-$agente =& new BandasNovedades_AgenteBanda($nrodoc,new date($fecha),$dbh);
+$agente =& new BandasNovedades_AgenteBanda($nrodoc,new date($fecha),$DB);
 $pagina =& new HTML_Page(array(        'doctype'=>'HTML 4.01 Transitional',
                                                                'charset'=>'iso-8859-1'));
 $pagina->updateAttributes(array('onload'=>'javascript:window.print()'));

diff --git a/sistema/www/servicios/bandas/banda_agente.php b/sistema/www/servicios/bandas/banda_agente.php
index 8131c36cc43490f6947a8621777dd9552a68898e..509d6329c24e45f2ef110ecbf2f60a864f5e6ee4 100644 (file)
--- a/sistema/www/servicios/bandas/banda_agente.php
+++ b/sistema/www/servicios/bandas/banda_agente.php
@@ -1,6 +1,6 @@
 <?
-require_once '../../../local_lib/HTML_DietMarco.php';
-require_once '../../../local_lib/HTML_Mensaje.php';
+require_once 'HTML_DietMarco.php';
+require_once 'HTML_Mensaje.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/HTML/Link.php';
@@ -17,12 +17,6 @@ if(!isset($_SESSION['documento']) or !isset($_POST['fecha']))
        header('Location: ../../servicios.php');
 }
 
-//CREO LA CONEXION A LA BASE DE DATOS
-$dbh = DB::connect("mysql://intranet:intranet@bal747f/bandas",true);
-if (DB::isError($dbh)) {
-    die ($DB->getMessage());
-}
-
 //Seteo las variables generales
 $nrodoc = $_SESSION['documento'];
 setlocale (LC_ALL, 'es_AR');
@@ -35,7 +29,7 @@ $m =& new HTML_DietMarco('servicios','Bandas Horarias');
 //$m->addTitle('Bandas Horarias');
 $m->addStyleSheet('../../css/servicios_bandas.css');
 
-$agente =& new BandasNovedades_AgenteBanda($nrodoc,new date($fecha),$dbh);
+$agente =& new BandasNovedades_AgenteBanda($nrodoc,new date($fecha),$DB);
 
 if(!$agente->buscarAgente($nrodoc))
 {
@@ -43,7 +37,7 @@ if(!$agente->buscarAgente($nrodoc))
        $m->addStyleSheet($HTML_Mensaje->getCSS());
        $m->addBodyContent($HTML_Mensaje);
        $m->display();
-       die;
+       exit;
 }
 
 
@@ -54,7 +48,7 @@ if(preg_match('/^CON/',$agente->getTipo()))
        $m->addStyleSheet($HTML_Mensaje->getCSS());
        $m->addBodyContent($HTML_Mensaje);
        $m->display();
-       die;
+       exit;
 }
 
 
@@ -140,7 +134,7 @@ $t->addRow(array('&nbsp;'),array('colspan'=>'3'));
 /* Agrego las tablas de referencia al cuerpo */
 $row = array();
 
-if(BandasNovedades_AgenteBanda::tieneCredencial($dbh,$_SESSION['documento'],new Date($fecha)))
+if(BandasNovedades_AgenteBanda::tieneCredencial($DB,$_SESSION['documento'],new Date($fecha)))
 {
        /* Armo la tabla con la gilla horaria*/
        $tabla_info =& new BandasNovedades_HTML_TablaInfoMes($agente,'nov_dia.php','oscuro');
@@ -204,10 +198,10 @@ if($MES_ACTUAL->getmonth()==$FECHA_PEDIDA->getmonth() && $MES_ACTUAL->getyear()=
 {
        $sql = "Select fecha from FechaActualizacion where tipoActualizacion='DIARIO'
                        order by fecha desc limit 1";
-       $result = $dbh->query($sql);
+       $result = $DB->query($sql);
 
        if (DB::isError($result))
-               die ($result->getMessage("Query mal hecho"));
+               trigger_error($result->getMessage("Query mal hecho"), E_USER_ERROR);
 
        $FECHA_ACTUALIZACION=$result->fetchRow(DB_FETCHMODE_ASSOC);
 

diff --git a/sistema/www/servicios/bandas/index.php b/sistema/www/servicios/bandas/index.php
index 058e460af5a7dbdcb99a0b45b1d14212d5434148..95ebc97864661779740cdfbf3e41bba00d34b6d9 100644 (file)
--- a/sistema/www/servicios/bandas/index.php
+++ b/sistema/www/servicios/bandas/index.php
@@ -26,14 +26,13 @@ $Id: agenda1.php 64 2003-08-21 18:48:28Z mmarre $
 
 //REQUIRE ONCE {{{
 require_once 'HTML/Table.php';
-require_once '../../../local_lib/HTML_DietMarco.php';
-require_once '../../../local_lib/HTML_Mensaje.php';
+require_once 'HTML_DietMarco.php';
+require_once 'HTML_Mensaje.php';
 require_once 'BandasNovedades/Buscador.php';
 require_once 'MECON/HTML/Tabla.php';
 require_once 'MECON/HTML/QuickForm.php';
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/Agente.php';
-require_once 'DB.php';
 //}}}
 
 //CHEQUEO QUE EL USUARIO YA ESTÉ LOGUEADO {{{
@@ -43,12 +42,6 @@ if(!isset($_SESSION['documento']))
 }
 //}}}
 
-//CREO LA CONEXION A LA BASE DE DATOS {{{
-$DB = DB::connect("mysql://intranet:intranet@bal747f/bandas",true);
-if (DB::isError($DB)) {
-    die ($DB->getMessage());
-}
-//}}}
 //{{{ INSTANCIO EL MARCO
 $MARCO =& new HTML_DietMarco('servicios','Bandas Horarias');
 //}}}

diff --git a/sistema/www/servicios/bandas/nov_dia.php b/sistema/www/servicios/bandas/nov_dia.php
index 65ea075f68c91665ffae38c53942240f5a3bf9f5..1782a6b1e071848dc6239c18dd9468740b2804c0 100644 (file)
--- a/sistema/www/servicios/bandas/nov_dia.php
+++ b/sistema/www/servicios/bandas/nov_dia.php
@@ -12,17 +12,11 @@ if(!isset($_SESSION['documento']))
        die ('El usuario no se encuentra logueado en la Intranet');
 }
 
-//CREO LA CONEXION A LA BASE DE DATOS
-$dbh = DB::connect("mysql://intranet:intranet@bal747f/bandas",true);
-if (DB::isError($dbh)) {
-    die ($DB->getMessage());
-}
-
 $nrodoc = $_SESSION['documento'];
 $fecha = $_GET['fecha'];
 
 $novedad =& new MECON_NovedadesDia($nrodoc,new date($fecha));
-$agente =& new BandasNovedades_AgenteBanda($nrodoc,new date($fecha),$dbh);
+$agente =& new BandasNovedades_AgenteBanda($nrodoc,new date($fecha),$DB);
 $IMG =& new MECON_HTML_Image('../../images/servicios_flecha_naranja.gif');
 $tabla =& new MECON_HTML_Tabla(array('width'=>'200'),'medio');
 

diff --git a/sistema/www/servicios/bandas/salidas_autorizadas.php b/sistema/www/servicios/bandas/salidas_autorizadas.php
index ce0e6b7d874a4bddffb3f9997489e01474e05e4f..d74cfd9a2db52d0c0eccfe8a6ca96c55d5a800e3 100644 (file)
--- a/sistema/www/servicios/bandas/salidas_autorizadas.php
+++ b/sistema/www/servicios/bandas/salidas_autorizadas.php
@@ -12,17 +12,11 @@ if(!isset($_SESSION['documento']))
        die ('El usuario no se encuentra logueado en la Intranet');
 }
 
-//Creo la conexión a la base de datos
-$dbh = DB::connect("mysql://intranet:intranet@intranet-db/novedades",true);
-if (DB::isError($dbh)) {
-    die ($DB->getMessage());
-}
-
 $nrodoc = $_SESSION['documento'];
 $fecha = $_GET['fecha'];
 
 //Creo los objetos necesarios
-$agente =& new BandasNovedades_Agente($dbh,$nrodoc);
+$agente =& new BandasNovedades_Agente($DB,$nrodoc);
 $pagina =& new HTML_Page(array(        'doctype'=>'HTML 4.01 Transitional',
                                                                'charset'=>'iso-8859-1'));
 $tabla =& new MECON_HTML_Tabla(array('width'=>'400'),'medio');

diff --git a/sistema/www/servicios/brigada/brigada.php b/sistema/www/servicios/brigada/brigada.php
index 048982e54426faf7e7cc7d82ca2c1e3ade7c8cdf..d1d5b63f64cd20144bbec704f2976b3dcfefed31 100644 (file)
--- a/sistema/www/servicios/brigada/brigada.php
+++ b/sistema/www/servicios/brigada/brigada.php
@@ -12,16 +12,8 @@ require_once 'BRIGADA/Piso.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Link.php';
 require_once 'MECON/HTML/Tabla.php';
-require_once '../../../local_lib/HTML_DietMarco.php';
+require_once 'HTML_DietMarco.php';
 require_once 'MECON/HTML/Image.php';
-require_once 'DB.php';
-
-
-//Conexión a la BD
-$dbh = DB::connect("mysql://intranet:intranet@intranet-db/BRIGADA", true);
-if (DB::isError($dbh)) {
-    die ($dbh->getMessage());
-}
 
 //Marco de servicios en intranet
 $MARCO     = new HTML_DietMarco('servicios', 'Evacuación ante Emergencias');
@@ -30,7 +22,7 @@ $MARCO->addStyleSheet('../../css/servicios_brigada.css');
 
 
 //Listado de edificios
-$edificios = BRIGADA_Edificio::obtenerEdificios($dbh);
+$edificios = BRIGADA_Edificio::obtenerEdificios($DB);
 $filas_edificios = array_chunk($edificios, 3, TRUE);
 
 $TABLA_Edificios =& new MECON_HTML_Tabla('width="600"', 'oscuro'); 
@@ -67,7 +59,7 @@ $MARCO->addBodyContent($TABLA_Edificios);
 
 if (isset($_GET['Edif'])){
     //Mostrar los pisos del edificio pedido
-    $pisos = BRIGADA_Piso::obtenerPisos($dbh, $_GET['Edif']);
+    $pisos = BRIGADA_Piso::obtenerPisos($DB, $_GET['Edif']);
     $filas_pisos = array_chunk($pisos, 8, TRUE);
     $attrs = 'comun align="center"';
     
@@ -107,7 +99,7 @@ if (isset($_GET['Edif'])){
 
 if (isset($_GET['Piso'])){
     //Mostrar el listado de brigadistas
-    $brigadistas = BRIGADA_Brigadista::obtenerBrigadistas($dbh, $_GET['Edif'], $_GET['Piso']);
+    $brigadistas = BRIGADA_Brigadista::obtenerBrigadistas($DB, $_GET['Edif'], $_GET['Piso']);
 
     $TABLA_Brigadistas =& new MECON_HTML_Tabla('width="600"', 'oscuro'); 
     $TABLA_Brigadistas->addRow(array('Datos de los brigadistas'), 'cabecera colspan="4"'); 

diff --git a/sistema/www/servicios/codep/codep_codigo.php b/sistema/www/servicios/codep/codep_codigo.php
index cdb62e6f2c066f6f2343eb0b8d550b754e2471d0..06404c8742c05470f488d92c1856c5931c38daaa 100644 (file)
--- a/sistema/www/servicios/codep/codep_codigo.php
+++ b/sistema/www/servicios/codep/codep_codigo.php
@@ -9,24 +9,16 @@ Myrna Degano <mdegan@mecon.gov.ar>
 require_once 'MECON/Dependencia.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Tabla.php';
-require_once '../../../local_lib/HTML_DietMarco.php';
+require_once 'HTML_DietMarco.php';
 require_once 'MECON/HTML/QuickFormSimple.php';
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/HTML/Link.php';
-require_once 'DB.php';
-
-//Conexión a la BD
-$dbh = DB::connect("mysql://intranet:intranet@intranet-db/CODEP", true);
-if (DB::isError($dbh)) {
-    die ($dbh->getMessage());
-}
-
 
 //Imágenes
 $IMG_Ayuda =& new MECON_HTML_Image('../../images/servicios_ayuda.gif', 'Ayuda');
 $IMG_Lupa =& new MECON_HTML_Image('../../images/servicios_lupa.gif', 'Buscar');
 $IMG_Zip =& new MECON_HTML_Image('../../images/servicios_zip.gif', 'Download');
-$IMG_Viñeta =& new MECON_HTML_Image('../../images/servicios_flecha_naranja.gif', '>>');
+$IMG_Vineta =& new MECON_HTML_Image('../../images/servicios_flecha_naranja.gif', '>>');
 
 
 //Links
@@ -122,12 +114,12 @@ $TABLA_Pie->addRow(array($IMG_Zip->toHtml().$LINK_Download->toHtml()),
 
 if (isset($_POST['codep'])){
     //Resultado de la Búsqueda
-    $resultado = MECON_Dependencia::buscarPorCodigo($dbh, $_POST['codep']);
+    $resultado = MECON_Dependencia::buscarPorCodigo($DB, $_POST['codep']);
 
     if ($resultado->numRows()>0){
        //Mostrar resultados
        $TABLA_Resultados =& new MECON_HTML_Tabla ('width="500" align="center"', 'medio');
-       $TABLA_Resultados->addRow(array($IMG_Viñeta->toHtml().'Resultados de la búsqueda por código de dependencia'),
+       $TABLA_Resultados->addRow(array($IMG_Vineta->toHtml().'Resultados de la búsqueda por código de dependencia'),
                                    array('cabecera'=>'1', 'colspan'=>'3'));
        $TABLA_Resultados->addRow(array('CODEP', 'COMDOC', 'Dependencia'),
                                    array('titulo'=>'1', 'height'=>'25', 'align'=>'left'));

diff --git a/sistema/www/servicios/codep/codep_nombre.php b/sistema/www/servicios/codep/codep_nombre.php
index 7c292e7fffea4490555fe8cef9b6d15e34fc2627..f95a526e81f4030e308d602ebf30b0177dd060f6 100644 (file)
--- a/sistema/www/servicios/codep/codep_nombre.php
+++ b/sistema/www/servicios/codep/codep_nombre.php
@@ -9,24 +9,16 @@ Myrna Degano <mdegan@mecon.gov.ar>
 require_once 'MECON/Dependencia.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Tabla.php';
-require_once '../../../local_lib/HTML_DietMarco.php';
+require_once 'HTML_DietMarco.php';
 require_once 'MECON/HTML/QuickFormSimple.php';
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/HTML/Link.php';
-require_once 'DB.php';
-
-//Conexión a la BD
-$dbh = DB::connect("mysql://intranet:intranet@intranet-db/CODEP", true);
-if (DB::isError($dbh)) {
-    die ($dbh->getMessage());
-}
-
 
 //Imágenes
 $IMG_Ayuda =& new MECON_HTML_Image('../../images/servicios_ayuda.gif', 'Ayuda');
 $IMG_Lupa =& new MECON_HTML_Image('../../images/servicios_lupa.gif', 'Buscar');
 $IMG_Zip =& new MECON_HTML_Image('../../images/servicios_zip.gif', 'Download');
-$IMG_Viñeta =& new MECON_HTML_Image('../../images/servicios_flecha_naranja.gif', '>>');
+$IMG_Vineta =& new MECON_HTML_Image('../../images/servicios_flecha_naranja.gif', '>>');
 
 
 //Links
@@ -103,12 +95,12 @@ $TABLA_Pie->addRow(array($IMG_Zip->toHtml().$LINK_Download->toHtml()),
 
 if (isset($_POST['clave'])){
     //Resultado de la Búsqueda
-    $resultado = MECON_Dependencia::buscarPorNombre($dbh, $_POST['clave']);
+    $resultado = MECON_Dependencia::buscarPorNombre($DB, $_POST['clave']);
 
     if ($resultado->numRows()>0){
        //Mostrar resultados
        $TABLA_Resultados =& new MECON_HTML_Tabla ('width="500" align="center"', 'medio');
-       $TABLA_Resultados->addRow(array($IMG_Viñeta->toHtml().'Resultados de la búsqueda por palabra clave'),
+       $TABLA_Resultados->addRow(array($IMG_Vineta->toHtml().'Resultados de la búsqueda por palabra clave'),
                                    array('cabecera'=>'1', 'colspan'=>'3'));
        $TABLA_Resultados->addRow(array('CODEP', 'COMDOC', 'Dependencia'),
                                    array('titulo'=>'1', 'height'=>'25', 'align'=>'left'));

diff --git a/sistema/www/servicios/infoleg/pedido.php b/sistema/www/servicios/infoleg/pedido.php
index ab00f9fd9b4a40a25c82694c3b68d5abd62f5954..85146bbeed1fb6d4b12a86d5e3bf849887fa6bf0 100644 (file)
--- a/sistema/www/servicios/infoleg/pedido.php
+++ b/sistema/www/servicios/infoleg/pedido.php
@@ -13,31 +13,23 @@ require_once 'INFOLEG/Pedido.php';
 
 require_once 'MECON/HTML/Tabla.php';
 require_once 'HTML/Table.php';
-require_once '../../../local_lib/HTML_DietMarco.php';
-require_once '../../../local_lib/HTML_Mensaje.php';
+require_once 'HTML_DietMarco.php';
+require_once 'HTML_Mensaje.php';
 require_once 'MECON/HTML/QuickFormSimple.php';
 require_once 'MECON/HTML/Image.php';
-require_once 'DB.php';
 
 if(!isset($_SESSION['documento'])){
        header('Location: ../../servicios.php');
        exit;
 }
 
-//Conexión a la BD
-//CAMBIAR POR INTRANET-DB
-$dbh = DB::connect("mysql://intranet:intranet@localhost/CDI", true);
-if (DB::isError($dbh)) {
-    die ($dbh->getMessage());
-}
-
 //Usuario que realiza el pedido
 $nrodoc = $_SESSION['documento'];
 $user = $_SESSION['usuario'];
-$solicitante =& new INFOLEG_Solicitante($dbh, $nrodoc, $user);
+$solicitante =& new INFOLEG_Solicitante($DB, $nrodoc, $user);
 
 //Imágenes
-$IMG_Viñeta =& new MECON_HTML_Image('../../images/servicios_flecha_naranja.gif', '>>');
+$IMG_Vineta =& new MECON_HTML_Image('../../images/servicios_flecha_naranja.gif', '>>');
 $IMG_OK =& new MECON_HTML_Image('../../images/servicios_ok.gif', 'ok');
 $IMG_Error =& new MECON_HTML_Image('/MECON/images/general_no_autorizado.gif', 'X');
 
@@ -47,7 +39,7 @@ $MARCO     = new HTML_DietMarco('servicios', 'Pedidos a Infoleg');
 
 if (! isset($_POST['pedido'])){
 
-    if (! INFOLEG_Operador::oprDisponibleIntranet($dbh)){
+    if (! INFOLEG_Operador::oprDisponibleIntranet($DB)){
        //No hay operador disponible para atender el pedido => mensaje de error
        
        $MSG =& new HTML_Mensaje ('error', 'No hay operadores asignados para atender su pedido', 490); 
@@ -173,12 +165,12 @@ EOT;
 
        //Tabla Pedido
        $TABLA =& new MECON_HTML_Tabla(array('width'=>'600', 'align'=>'center'), 'medio');
-        $TABLA->addRow( array($IMG_Viñeta->toHtml().'Datos Personales')); 
+        $TABLA->addRow( array($IMG_Vineta->toHtml().'Datos Personales')); 
         $TABLA->addRow( array('Nombre', $input_nombre->toHtml(), 'Apellido', '', $input_apellido->toHtml())); 
         $TABLA->addRow( array('Documento', $select_tipodoc->tohtml().' '.$nrodoc.$input_nrodoc->toHtml(), 'Institución', '', $input_institucion->toHtml())); 
         $TABLA->addRow( array('Domicilio', $input_domicilio->toHtml(), 'Piso', $input_piso->toHtml(), 'Oficina', $input_oficina->toHtml(), 'Interno', $input_interno->toHtml())); 
         $TABLA->addRow( array('E-mail', $input_email->toHtml(), 'Fax', $input_fax->toHtml(), 'Teléfono', $input_telefono->toHtml())); 
-        $TABLA->addRow( array($IMG_Viñeta->toHtml().'Pedido')); 
+        $TABLA->addRow( array($IMG_Vineta->toHtml().'Pedido')); 
         $TABLA->addRow( array($textarea_pedido->toHtml())); 
         $TABLA->addRow( array($submit->toHtml())); 
 
@@ -232,8 +224,8 @@ else{
        
        //Pedido Formulado
        $solicitante->_actualizarDatos($_POST);
-       $operador_asignado = INFOLEG_Operador::obtenerOprIntranet($dbh);
-       INFOLEG_Pedido::alta($dbh, $_POST['tipodoc'], $_POST['nrodoc'], 
+       $operador_asignado = INFOLEG_Operador::obtenerOprIntranet($DB);
+       INFOLEG_Pedido::alta($DB, $_POST['tipodoc'], $_POST['nrodoc'], 
                            $operador_asignado, $_POST['pedido']);
     
        $MSG =& new HTML_Mensaje ('ok', 'Su pedido ha sido registrado', 300); 

diff --git a/sistema/www/servicios/informes/get_file.php b/sistema/www/servicios/informes/get_file.php
index 031bcaaa6565aeb64c71d3550970aec0654e9d32..6753af93fa21864148b8e64355e0b84b009d2925 100755 (executable)
--- a/sistema/www/servicios/informes/get_file.php
+++ b/sistema/www/servicios/informes/get_file.php
@@ -9,19 +9,11 @@ informes sin utilizar MEconDAV
 Myrna Degano <mdegan@mecon.gov.ar>
 ------------------------------------------------------------------------------*/
 
-require_once 'DB.php';
-
-//Conexión a la BD
-$dbh = DB::connect("mysql://mark:mark@intranet-db/MEconDAV");
-if (DB::isError($dbh)) {
-    die ($dbh->getMessage());
-}
-
 //Obtener Datos del Adjunto 
 $sql = "SELECT mimetype, filename, size
-        FROM FilesForArticle
+        FROM MEconDAV.FilesForArticle
         WHERE file_for_article_id = ". $_GET['id'];
-$datos = $dbh->getAll($sql);
+$datos = $DB->getAll($sql);
 
 $mime = $datos[0][0];
 $filename = $datos[0][1];
@@ -38,4 +30,4 @@ header("Expires: 0");
 header("Content-Length: ".$filesize);
 
 readfile ($dir);
-?>
\ No newline at end of file
+?>

diff --git a/sistema/www/servicios/novedades/detalle.php b/sistema/www/servicios/novedades/detalle.php
index 2ee20449766ccbf39cefa404381dd3001802f5f5..33d5cf808f183f76350d1f742287f6e94d4d78f7 100644 (file)
--- a/sistema/www/servicios/novedades/detalle.php
+++ b/sistema/www/servicios/novedades/detalle.php
@@ -8,15 +8,8 @@ Myrna Degano <mdegan@mecon.gov.ar>
 
 require_once 'HTML/Page.php';
 require_once 'MECON/HTML/Tabla.php';
-require_once 'DB.php';
 require_once 'BandasNovedades/Agente.php';
 
-//Conexión a la BD
-$dbh = DB::connect("mysql://intranet:intranet@intranet-db/novedades", true);
-if (DB::isError($dbh)) {
-    die ($dbh->getMessage());
-}
-
 $PAGE    =& new HTML_Page(array ('doctype'  => 'HTML 4.01 Transitional',
                                         'charset'  => 'iso-8859-1',
                                         'lineend'  => 'unix',
@@ -25,7 +18,7 @@ $PAGE    =& new HTML_Page(array ('doctype'  => 'HTML 4.01 Transitional',
                                         'simple'   => 'true'));
 
 
-$agente =& new BandasNovedades_Agente($dbh, $_GET['nrodoc']);
+$agente =& new BandasNovedades_Agente($DB, $_GET['nrodoc']);
 $novedad = $agente->obtenerDetalle ($_GET['anio'], $_GET['codnov']);
 
 

diff --git a/sistema/www/servicios/novedades/novedades.php b/sistema/www/servicios/novedades/novedades.php
index 2ac8d94aac79997e76c94fa3a6a18d830f7ad5a1..e5f81694a62a1d0277dd4c4ba852e8e3943cc8da 100644 (file)
--- a/sistema/www/servicios/novedades/novedades.php
+++ b/sistema/www/servicios/novedades/novedades.php
@@ -9,12 +9,11 @@ Myrna Degano <mdegan@mecon.gov.ar>
 require_once 'BandasNovedades/Agente.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Tabla.php';
-require_once '../../../local_lib/HTML_DietMarco.php';
-require_once '../../../local_lib/HTML_Mensaje.php';
+require_once 'HTML_DietMarco.php';
+require_once 'HTML_Mensaje.php';
 require_once 'MECON/HTML/QuickFormSimple.php';
 require_once 'MECON/HTML/Image.php';
 require_once 'MECON/HTML/Link.php';
-require_once 'DB.php';
 
 if(!isset($_SESSION['documento'])){
        header('Location: ../../servicios.php');
@@ -22,12 +21,6 @@ if(!isset($_SESSION['documento'])){
 }
 $nrodoc = $_SESSION['documento'];
 
-//Conexión a la BD
-$dbh = DB::connect("mysql://intranet:intranet@intranet-db/novedades", true);
-if (DB::isError($dbh)) {
-    die ($dbh->getMessage());
-}
-
 //Marco de servicios en intranet
 $MARCO     = new HTML_DietMarco('servicios', 'Novedades de Personal');
 //$MARCO->addTitle('Novedades de Personal');
@@ -35,7 +28,7 @@ $MARCO->addStyleSheet('../../css/servicios_novedades.css');
 
 
 //Datos del agente
-$agente =& new BandasNovedades_Agente($dbh, $nrodoc);
+$agente =& new BandasNovedades_Agente($DB, $nrodoc);
 
 
 if (substr($agente->getTipo(), 0, 3) == 'CON'){

diff --git a/sistema/www/sistemas.php b/sistema/www/sistemas.php
index 40c6bcea512d65e3a323e565f06b646a35536e12..aa741634545ac6d23b9bbafa60733989689da204 100644 (file)
--- a/sistema/www/sistemas.php
+++ b/sistema/www/sistemas.php
@@ -1,13 +1,13 @@
 <?php
 // vim: set binary expandtab ts=4 shiftwidth=4 textwidth=80:
 // $Id$
-require_once '../local_lib/HTML_DietMarco.php';
+require_once 'HTML_DietMarco.php';
 if(!isset($_SESSION['usuario']))
 {
-  header('location: login?redirect=sistemas');
-  exit;
+    header('location: login?redirect=sistemas');
+    exit;
 }
-require_once '../local_lib/intranetdb.php';
+require_once 'intranetdb.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Link.php';
 require_once 'MECON/HTML/Image.php';
@@ -51,12 +51,11 @@ $img->updateAttributes(array('width' => 190));
 $fila[] = $img;
 $t->addRow($fila);
 
-$db = IntranetDB::connect();
-$sistemas = AI_Sistema::getSistemas($db);
+$sistemas = AI_Sistema::getSistemas($DB);
 
 // Me fijo que sistemas puede ver este usuario.
 require_once 'SAMURAI/Perm.php';
-$perm = new SAMURAI_Perm($_SESSION['usuario'], 0, $db);
+$perm = new SAMURAI_Perm($_SESSION['usuario'], 0, $DB);
 foreach ($sistemas as $i => $s) {
     // Si no tiene permisos para el sistema, lo saco de la lista.
     $perm->setSistema($s->sistema);

diff --git a/sistema/www/una_noticia.php b/sistema/www/una_noticia.php
index bb9ac0c57c84a304cdd6b614e3e98add02b5b954..ca2e19bad9936f9606f8f21d4cf2fc9fdfecd070 100644 (file)
--- a/sistema/www/una_noticia.php
+++ b/sistema/www/una_noticia.php
@@ -1,21 +1,18 @@
 <?
-  require_once '../local_lib/HTML_DietMarco.php';
-  require_once '../local_lib/intranetdb.php';
+  require_once 'HTML_DietMarco.php';
   require_once 'MECON/HTML/ArbolDB.php';
-  require_once '../../lib/noticia.php';
-  require_once '../local_lib/HTML_Noticia.php';
+  require_once 'noticia.php';
+  require_once 'HTML_Noticia.php';
   require_once 'AI/GrupoSecciones.php';
   
   $m = new HTML_DietMarco('noticias', 'Noticias');
   $noticias = new HTML_Table(array('width' => '760', 'border' => '0'));
   
-  $db = IntranetDB::connect();
-  $db2 = DB::Connect('mysql://intranet:intranet@bal747f/intranet');//FIXME
   $n = new noticia($_GET['numero']);
-  $grupo = AI_GrupoSecciones::getGrupo($n->getIdSeccion(), $db2);
+  $grupo = AI_GrupoSecciones::getGrupo($n->getIdSeccion(), $DB);
   $dbdata = array(
-               'db' => $db,
-                'tabla' => 'grupo_secciones',
+               'db' => $DB,
+                'tabla' => 'intranet.grupo_secciones',
                'id' => 'grupo',
                'id_activo' => $grupo,
                'habilitado' => 'habilitado',
@@ -28,7 +25,7 @@
   $noticia = new HTML_Noticia($n);
   $noticia->setVolver('noticias.php');
   $noticia->setVolver("noticias?grupo=".
-                           AI_GrupoSecciones::getGrupo($n->getIdSeccion(), $db2));
+                           AI_GrupoSecciones::getGrupo($n->getIdSeccion(), $DB));
   $noticia->setCompleta(true);
   $noticias->addRow(array($arbol,$noticia));
   $m->addStyleSheet($arbol->getCSS());