Se agrega un objecto para manejar la base de datos (con configuracion). Tambien se...

diff --git a/sistema/conf/AIDB.ini b/sistema/conf/AIDB.ini
new file mode 100644 (file)
index 0000000..71da6b8
--- /dev/null
+++ b/sistema/conf/AIDB.ini
@@ -0,0 +1,11 @@
+; Configuración de la base de datos.
+; $Id$
+
+dsn = "mysql://intranet:intranet@bal747f/intranet"
+
+[opciones]
+persistent      = true
+;optimize       = performance
+;debug          = 0
+;autofree       = false
+;seqname_format = "%s_seq"

diff --git a/sistema/local_lib/AIDB.php b/sistema/local_lib/AIDB.php
new file mode 100644 (file)
index 0000000..82d07c7
--- /dev/null
+++ b/sistema/local_lib/AIDB.php
@@ -0,0 +1,57 @@
+<?php
+// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
+// +--------------------------------------------------------------------+
+// |                      Ministerio de Economía                        |
+// |                  AI (Administrador de Intranet)                    |
+// +--------------------------------------------------------------------+
+// | This file is part of AI.                                           |
+// |                                                                    |
+// | AI 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.                             |
+// |                                                                    |
+// | AI 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 Hooks; if not, write to the Free Software Foundation,   |
+// | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
+// +--------------------------------------------------------------------+
+// | Creado: Wed Jul 2 17:53:43 2003                                    |
+// | Autor:  Leandro Lucarella <llucar@mecon.gov.ar>                    |
+// +--------------------------------------------------------------------+
+//
+// $Id$
+//
+
+// +X2C includes
+require_once 'DB.php';
+// ~X2C
+
+// +X2C Class 503 :AIDB
+/**
+ * Base de datos del Administrador de Intranet.
+ *
+ * @access public
+ */
+class AIDB extends DB {
+    // ~X2C
+
+    // +X2C Operation 506
+    /**
+     * @return &mixed
+     * @access public
+     */
+    function &connect() // ~X2C
+    {
+        $conf = parse_ini_file(dirname(__FILE__) . '/../conf/AIDB.ini', true);
+        return DB::connect($conf['dsn'], $conf['opciones']);
+    }
+    // -X2C
+
+} // -X2C Class :AIDB
+
+?>
\ No newline at end of file

diff --git a/sistema/local_lib/AIError.php b/sistema/local_lib/AIError.php
index 76ab3746bc6dba8d12ae9c103c53497057e90626..71d4e786af573c526d4823862330efd141e46fbf 100644 (file)
--- a/sistema/local_lib/AIError.php
+++ b/sistema/local_lib/AIError.php
@@ -54,7 +54,7 @@ class AIError extends PEAR_Error {
      * @return void
      * @access public
      */
-    function AIError($codigo, $mensaje = '')// ~X2C
+    function AIError($codigo, $mensaje = '') // ~X2C
     {
         $this->PEAR_Error($mensaje, $codigo);
     }

diff --git a/sistema/local_lib/GrupoSecciones.php b/sistema/local_lib/GrupoSecciones.php
index 1da10fcfbb0a7f7c8d9c4d93eec136bbbf9d8cf8..9f6bfe1e46419458a3777a55ccf578601805867b 100644 (file)
--- a/sistema/local_lib/GrupoSecciones.php
+++ b/sistema/local_lib/GrupoSecciones.php
@@ -118,7 +118,7 @@ class GrupoSecciones {
      * @return void
      * @access public
      */
-    function GrupoSecciones($grupo = 0)// ~X2C
+    function GrupoSecciones($grupo = 0) // ~X2C
     {
         $this->grupo = $grupo;
     }
@@ -131,7 +131,7 @@ class GrupoSecciones {
      * @return PEAR_Error
      * @access public
      */
-    function cargar($db)// ~X2C
+    function cargar($db) // ~X2C
     {
         $grupo = intval($this->grupo);
         if (is_a($db, 'db_result')) {
@@ -186,7 +186,7 @@ class GrupoSecciones {
      * @return PEAR_Error
      * @access public
      */
-    function guardar($db)// ~X2C
+    function guardar($db) // ~X2C
     {
         $grupo = intval($this->grupo);
         $where = '';
@@ -238,7 +238,7 @@ class GrupoSecciones {
      * @return PEAR_Error
      * @access public
      */
-    function borrar($db)// ~X2C
+    function borrar($db) // ~X2C
     {
         $grupo = intval($this->grupo);
         if ($grupo) {
@@ -265,7 +265,7 @@ class GrupoSecciones {
      * @return PEAR_Error
      * @access public
      */
-    function cargarHijos($db)// ~X2C
+    function cargarHijos($db) // ~X2C
     {
         $grupo  = intval($this->grupo);
         $result = $db->query("SELECT * FROM grupo_secciones WHERE grupo_padre = $grupo");
@@ -294,7 +294,7 @@ class GrupoSecciones {
      * @return GrupoSecciones
      * @access public
      */
-    function __clone()// ~X2C
+    function __clone() // ~X2C
     {
         return $this;
     }
@@ -302,4 +302,4 @@ class GrupoSecciones {
 
 } // -X2C Class :GrupoSecciones
 
-?>
+?>
\ No newline at end of file

diff --git a/sistema/local_lib/Servicio.php b/sistema/local_lib/Servicio.php
index d1caa5591a2362ba238490cd720b834262f147ae..229ab237fb0c759f8ecec9e74c25e6fa727f7261 100644 (file)
--- a/sistema/local_lib/Servicio.php
+++ b/sistema/local_lib/Servicio.php
@@ -132,7 +132,7 @@ class Servicio {
      * @return void
      * @access public
      */
-    function Servicio($servicio = 0)// ~X2C
+    function Servicio($servicio = 0) // ~X2C
     {
         $this->servicio = $servicio;
     }
@@ -145,7 +145,7 @@ class Servicio {
      * @return PEAR_Error
      * @access public
      */
-    function cargar($db)// ~X2C
+    function cargar($db) // ~X2C
     {
         $servicio = intval($this->servicio);
         if (is_a($db, 'db_result')) {
@@ -189,7 +189,7 @@ class Servicio {
      * @return PEAR_Error
      * @access public
      */
-    function guardar($db)// ~X2C
+    function guardar($db) // ~X2C
     {
         $servicio = intval($this->servicio);
         $where    = '';
@@ -231,7 +231,7 @@ class Servicio {
      * @return PEAR_Error
      * @access public
      */
-    function borrar($db)// ~X2C
+    function borrar($db) // ~X2C
     {
         $servicio = intval($this->servicio);
         if ($servicio) {
@@ -253,7 +253,7 @@ class Servicio {
      * @return PEAR_Error
      * @access public
      */
-    function cargarHijos($db)// ~X2C
+    function cargarHijos($db) // ~X2C
     {
         $servicio = intval($this->servicio);
         $result   = $db->query("SELECT * FROM servicio WHERE servicio_padre = $servicio");
@@ -282,7 +282,7 @@ class Servicio {
      * @return Servicio
      * @access public
      */
-    function __clone()// ~X2C
+    function __clone() // ~X2C
     {
         return $this;
     }
@@ -290,4 +290,4 @@ class Servicio {
 
 } // -X2C Class :Servicio
 
-?>
+?>
\ No newline at end of file

diff --git a/sistema/local_lib/Sistema.php b/sistema/local_lib/Sistema.php
index 746be87feba429f3f7ef048e26f8069284e9f1e4..5a6f62ec6ae050d76ae838b9bb48cda2217652b4 100644 (file)
--- a/sistema/local_lib/Sistema.php
+++ b/sistema/local_lib/Sistema.php
@@ -83,7 +83,7 @@ class Sistema {
      * @return void
      * @access public
      */
-    function Sistema($sistema = 0)// ~X2C
+    function Sistema($sistema = 0) // ~X2C
     {
         $this->sistema = $sistema;
     }
@@ -96,7 +96,7 @@ class Sistema {
      * @return PEAR_Error
      * @access public
      */
-    function cargar($db)// ~X2C
+    function cargar($db) // ~X2C
     {
         $sistema = intval($this->sistema);
         if (is_a($db, 'db_result')) {
@@ -136,7 +136,7 @@ class Sistema {
      * @return PEAR_Error
      * @access public
      */
-    function guardar($db)// ~X2C
+    function guardar($db) // ~X2C
     {
         $sistema = intval($this->sistema);
         $where    = '';
@@ -174,7 +174,7 @@ class Sistema {
      * @return PEAR_Error
      * @access public
      */
-    function borrar($db)// ~X2C
+    function borrar($db) // ~X2C
     {
         $sistema = intval($this->sistema);
         if ($sistema) {
@@ -194,7 +194,7 @@ class Sistema {
      * @return Sistema
      * @access public
      */
-    function __clone()// ~X2C
+    function __clone() // ~X2C
     {
         return $this;
     }
@@ -202,4 +202,4 @@ class Sistema {
 
 } // -X2C Class :Sistema
 
-?>
+?>
\ No newline at end of file

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 191ec341b744ca8a314a368c64e475e62190994f..5afcf704f658231b5d7f7b31694fa1357b8947c9 100644 (file)
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -56,4 +56,8 @@ $LAYOUT->setCellAttributes(0, 0, array('width' => '1'));
 $LAYOUT->setCellAttributes(0, 1, array('width' => '10'));
 $LAYOUT->setCellContents(0, 1, ' ');
 
+// Siempre uso mi base de datos.
+require_once 'AIDB.php';
+$db =& AIDB::connect();
+
 ?>