Se agregan svn:keywords y se quita el '.php' de varios links.

[mecon/intranet.git] / sistema / local_lib / HTML_Servicio.php

diff --git a/sistema/local_lib/HTML_Servicio.php b/sistema/local_lib/HTML_Servicio.php
index ec6110a35aed4b12de6165f57662a41f45555988..233f349d666b15075e0c14452ea50fea7d24821d 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 $
+// $Id$
 //
 
-
 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
 
@@ -74,9 +72,9 @@ class HTML_Servicio extends HTML_Table {
     function toHTML() // ~X2C
     {
        if($this->servicio->link == '')
-           $this->servicio->link = 'servicios.php?servicios='.$this->servicio->servicio;
+           $this->servicio->link = '?servicios='.$this->servicio->servicio;
         elseif($this->servicio->necesita_logueo)
-            $this->servicio->link = 'login.php?redirect='.$this->servicio->servicio;
+            $this->servicio->link = 'login?redirect='.$this->servicio->servicio;
        $l = new MECON_HTML_Link($this->servicio->link, $this->servicio->nombre, array(),
                             array('class' => 'servicio_titulo_tabla'));
         //$this->addRow(array('&nbsp;&nbsp;&nbsp;'.$l->toHTML()),//Volvera...
@@ -110,9 +108,9 @@ class HTML_Servicio extends HTML_Table {
         foreach($this->servicio->getHijos() as $s)
        {
            if($s->link == '')
-               $s->link = 'servicios.php?servicios='.$s->servicio;
+               $s->link = '?servicios='.$s->servicio;
            elseif($s->necesita_logueo)
-               $s->link = 'login.php?redirect='.$s->servicio;
+               $s->link = 'login?redirect='.$s->servicio;
         $link = new MECON_HTML_Link($s->link, $s->nombre,
             array(), 
             array('class' => 'servicio_tabla'));
@@ -156,7 +154,7 @@ class HTML_Servicio extends HTML_Table {
      */
     function getCSS() // ~X2C
     {
-        return "css/servicio.css";
+        return 'css/servicio.css';
     }
     // -X2C