]> git.llucax.com Git - mecon/intranet.git/commitdiff
Agrego login y corrijo legajos
authorGonzalo Merayo <merayo@gmail.com>
Thu, 7 Aug 2003 20:13:11 +0000 (20:13 +0000)
committerGonzalo Merayo <merayo@gmail.com>
Thu, 7 Aug 2003 20:13:11 +0000 (20:13 +0000)
15 files changed:
doc/intranet.xmi
doc/noticias.xmi
sistema/local_lib/HTML_Copete.php
sistema/local_lib/HTML_DietMarco.php
sistema/local_lib/HTML_Login.php [new file with mode: 0644]
sistema/local_lib/HTML_Noticia.php
sistema/local_lib/HTML_Servicio.php
sistema/local_lib/HTML_Titulares.php
sistema/www/css/login.css [new file with mode: 0644]
sistema/www/images/login_candados.gif [new file with mode: 0644]
sistema/www/login.php [new file with mode: 0644]
sistema/www/logout.php [new file with mode: 0644]
sistema/www/noticias.php
sistema/www/servicios.php
sistema/www/servicios/legajos/legajo.php

index 535a01bcfc29226105c8aa794633f49a6f61a6f7..0ffbba5d99e80778b3c41712b43a614ba8d384f3 100644 (file)
@@ -9,7 +9,7 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="152" documentation="" uniqueid="167" />
+  <docsettings viewid="152" documentation="" uniqueid="174" />
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="153" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Page.php
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="153" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Page.php
@@ -21,11 +21,15 @@ x2c:include:HTML/Page.php
     <UML:Operation stereotype="" package="" xmi.id="158" type="void" abstract="0" documentation="" name="HTML_DietMarco" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="158" type="void" abstract="0" documentation="" name="HTML_DietMarco" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="168" type="void" abstract="0" documentation="" name="addBodyContent" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="content" static="0" scope="200" />
+    </UML:Operation>
    </UML:Class>
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="162" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="163" type="void" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="162" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="163" type="void" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="164" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Table.php
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="164" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Table.php
@@ -35,35 +39,48 @@ x2c:include:HTML/Table.php
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="167" type="void" abstract="0" documentation="" name="toHTML" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="167" type="void" abstract="0" documentation="" name="toHTML" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="170" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
+   </UML:Class>
+   <UML:Class stereotype="" package="sistema/local_lib" xmi.id="171" abstract="0" documentation="" name="HTML_Login" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="172" type="void" abstract="0" documentation="" name="HTML_Login" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="173" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="174" type="void" abstract="0" documentation="" name="toHTML" static="0" scope="200" />
    </UML:Class>
   </umlobjects>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="152" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>
    </UML:Class>
   </umlobjects>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="152" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="77" showattsigs="601" usesdiagramusefillcolour="0" x="199" linecolour="#ff0000" y="99" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="153" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="236" showattsigs="601" usesdiagramusefillcolour="0" x="85" linecolour="#ff0000" y="240" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="56" usefillcolor="1" showattributes="1" xmi.id="154" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="204" showattsigs="601" usesdiagramusefillcolour="0" x="181" linecolour="#ff0000" y="364" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="40" usefillcolor="1" showattributes="1" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="1" width="80" showattsigs="601" usesdiagramusefillcolour="1" x="391" linecolour="none" y="109" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="208" showattsigs="601" usesdiagramusefillcolour="0" x="407" linecolour="#ff0000" y="273" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="56" usefillcolor="1" showattributes="1" xmi.id="165" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="77" showattsigs="601" usesdiagramusefillcolour="0" x="108" linecolour="#ff0000" y="23" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="153" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="236" showattsigs="601" usesdiagramusefillcolour="0" x="15" linecolour="#ff0000" y="120" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="154" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="204" showattsigs="601" usesdiagramusefillcolour="0" x="79" linecolour="#ff0000" y="277" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="56" usefillcolor="1" showattributes="1" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="1" width="80" showattsigs="601" usesdiagramusefillcolour="1" x="352" linecolour="none" y="75" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" height="32" usefillcolor="1" showattributes="1" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="208" showattsigs="601" usesdiagramusefillcolour="0" x="294" linecolour="#ff0000" y="258" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="165" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="132" showattsigs="601" usesdiagramusefillcolour="0" x="519" linecolour="#ff0000" y="259" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="171" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="153" widgetaid="154" documentation="" type="500" >
       <linepath>
     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="153" widgetaid="154" documentation="" type="500" >
       <linepath>
-       <startpoint startx="203" starty="240" />
-       <endpoint endx="237" endy="131" />
+       <startpoint startx="133" starty="120" />
+       <endpoint endx="146" endy="55" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
+      <linepath>
+       <startpoint startx="181" starty="277" />
+       <endpoint endx="372" endy="107" />
       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="2" widgetbid="164" widgetaid="165" documentation="" type="500" >
       <linepath>
       <linepath>
-       <startpoint startx="283" starty="364" />
-       <endpoint endx="417" endy="141" />
+       <startpoint startx="398" starty="258" />
+       <endpoint endx="392" endy="107" />
       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="164" widgetaid="165" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" widgetbid="164" widgetaid="171" documentation="" type="500" >
       <linepath>
       <linepath>
-       <startpoint startx="511" starty="273" />
-       <endpoint endx="444" endy="141" />
+       <startpoint startx="585" starty="259" />
+       <endpoint endx="412" endy="107" />
       </linepath>
      </UML:AssocWidget>
     </associations>
       </linepath>
      </UML:AssocWidget>
     </associations>
@@ -74,14 +91,22 @@ x2c:include:HTML/Table.php
     <listitem open="1" type="801" id="-1" label="Logical View" >
      <listitem open="1" type="813" id="162" label="HTML_Copete" >
       <listitem open="0" type="815" id="163" label="HTML_Copete" />
     <listitem open="1" type="801" id="-1" label="Logical View" >
      <listitem open="1" type="813" id="162" label="HTML_Copete" >
       <listitem open="0" type="815" id="163" label="HTML_Copete" />
+      <listitem open="0" type="815" id="169" label="getCSS" />
      </listitem>
      <listitem open="1" type="813" id="154" label="HTML_DietMarco" >
       <listitem open="0" type="815" id="158" label="HTML_DietMarco" />
      </listitem>
      <listitem open="1" type="813" id="154" label="HTML_DietMarco" >
       <listitem open="0" type="815" id="158" label="HTML_DietMarco" />
+      <listitem open="0" type="815" id="168" label="addBodyContent" />
       <listitem open="0" type="815" id="157" label="addTitle" />
      </listitem>
       <listitem open="0" type="815" id="157" label="addTitle" />
      </listitem>
+     <listitem open="1" type="813" id="171" label="HTML_Login" >
+      <listitem open="0" type="815" id="172" label="HTML_Login" />
+      <listitem open="0" type="815" id="173" label="getCSS" />
+      <listitem open="0" type="815" id="174" label="toHTML" />
+     </listitem>
      <listitem open="1" type="813" id="153" label="HTML_Page" />
      <listitem open="1" type="813" id="165" label="HTML_Servicio" >
       <listitem open="0" type="815" id="166" label="HTML_Servicio" />
      <listitem open="1" type="813" id="153" label="HTML_Page" />
      <listitem open="1" type="813" id="165" label="HTML_Servicio" >
       <listitem open="0" type="815" id="166" label="HTML_Servicio" />
+      <listitem open="0" type="815" id="170" label="getCSS" />
       <listitem open="0" type="815" id="167" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
       <listitem open="0" type="815" id="167" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
index 00ce042d066a9c3e8a89d62866d8d2427c3e2df2..f3056817e76c49624b3af5ba04368ccb6ef2dbc1 100644 (file)
@@ -10,7 +10,7 @@
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="
-" uniqueid="194" />
+" uniqueid="196" />
   <umlobjects>
    <UML:Class stereotype="" package="lib" xmi.id="161" abstract="0" documentation="" name="noticia" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="noticia" static="0" scope="200" >
   <umlobjects>
    <UML:Class stereotype="" package="lib" xmi.id="161" abstract="0" documentation="" name="noticia" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="noticia" static="0" scope="200" >
@@ -44,6 +44,7 @@
     <UML:Operation stereotype="" package="" xmi.id="194" type="void" abstract="0" documentation="" name="setVolver" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="link" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="194" type="void" abstract="0" documentation="" name="setVolver" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="link" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="195" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="172" value="" type="noticia" abstract="0" documentation="" name="noticia" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="bool" abstract="0" documentation="" name="completa" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="int" abstract="0" documentation="" name="nuevo" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="172" value="" type="noticia" abstract="0" documentation="" name="noticia" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="bool" abstract="0" documentation="" name="completa" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="int" abstract="0" documentation="" name="nuevo" static="0" scope="200" />
@@ -66,6 +67,7 @@ x2c:include:HTML/Table.php
      <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="int" abstract="0" documentation="" name="grupo_secciones" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="int" abstract="0" documentation="" name="antiguedad" static="0" scope="200" />
     </UML:Operation>
      <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="int" abstract="0" documentation="" name="grupo_secciones" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="int" abstract="0" documentation="" name="antiguedad" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="196" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="188" value="null" type="int" abstract="0" documentation="" name="antiguedad" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="189" value="" type="int" abstract="0" documentation="" name="grupo_secciones" static="0" scope="200" />
    </UML:Class>
     <UML:Attribute stereotype="" package="" xmi.id="188" value="null" type="int" abstract="0" documentation="" name="antiguedad" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="189" value="" type="int" abstract="0" documentation="" name="grupo_secciones" static="0" scope="200" />
    </UML:Class>
@@ -73,30 +75,30 @@ x2c:include:HTML/Table.php
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="160" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="160" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="160" showattsigs="601" usesdiagramusefillcolour="0" x="15" linecolour="#ff0000" y="243" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="144" usefillcolor="1" showattributes="1" xmi.id="161" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="220" showattsigs="601" usesdiagramusefillcolour="0" x="216" linecolour="#ff0000" y="189" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="176" usefillcolor="1" showattributes="1" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="160" showattsigs="601" usesdiagramusefillcolour="0" x="22" linecolour="#ff0000" y="337" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="144" usefillcolor="1" showattributes="1" xmi.id="161" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="220" showattsigs="601" usesdiagramusefillcolour="0" x="220" linecolour="#ff0000" y="163" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="192" usefillcolor="1" showattributes="1" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="80" showattsigs="601" usesdiagramusefillcolour="0" x="477" linecolour="#ff0000" y="47" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="54" linecolour="#ff0000" y="38" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="88" usefillcolor="1" showattributes="1" xmi.id="170" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="80" showattsigs="601" usesdiagramusefillcolour="0" x="477" linecolour="#ff0000" y="47" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="54" linecolour="#ff0000" y="38" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="88" usefillcolor="1" showattributes="1" xmi.id="170" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="416" showattsigs="601" usesdiagramusefillcolour="0" x="265" linecolour="#ff0000" y="400" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="64" usefillcolor="1" showattributes="1" xmi.id="187" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="416" showattsigs="601" usesdiagramusefillcolour="0" x="265" linecolour="#ff0000" y="400" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="80" usefillcolor="1" showattributes="1" xmi.id="187" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
     </widgets>
     <messages/>
     <associations>
     </widgets>
     <messages/>
     <associations>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
       <linepath>
       <linepath>
-       <startpoint startx="326" starty="189" />
-       <endpoint endx="503" endy="79" />
+       <startpoint startx="330" starty="163" />
+       <endpoint endx="477" endy="63" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="162" widgetaid="161" documentation="" type="510" >
       <linepath>
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="162" widgetaid="161" documentation="" type="510" >
       <linepath>
-       <startpoint startx="95" starty="243" />
-       <endpoint endx="216" endy="277" />
+       <startpoint startx="102" starty="337" />
+       <endpoint endx="220" endy="259" />
       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="164" widgetaid="187" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="164" widgetaid="187" documentation="" type="500" >
       <linepath>
        <startpoint startx="473" starty="400" />
       <linepath>
        <startpoint startx="473" starty="400" />
-       <endpoint endx="530" endy="79" />
+       <endpoint endx="517" endy="79" />
       </linepath>
      </UML:AssocWidget>
     </associations>
       </linepath>
      </UML:AssocWidget>
     </associations>
@@ -108,6 +110,7 @@ x2c:include:HTML/Table.php
      <listitem open="1" type="813" id="162" label="HTML_Noticia" >
       <listitem open="0" type="815" id="167" label="HTML_Noticia" />
       <listitem open="0" type="814" id="184" label="completa" />
      <listitem open="1" type="813" id="162" label="HTML_Noticia" >
       <listitem open="0" type="815" id="167" label="HTML_Noticia" />
       <listitem open="0" type="814" id="184" label="completa" />
+      <listitem open="0" type="815" id="195" label="getCSS" />
       <listitem open="0" type="814" id="172" label="noticia" />
       <listitem open="0" type="814" id="185" label="nuevo" />
       <listitem open="0" type="815" id="175" label="setCompleta" />
       <listitem open="0" type="814" id="172" label="noticia" />
       <listitem open="0" type="814" id="185" label="nuevo" />
       <listitem open="0" type="815" id="175" label="setCompleta" />
@@ -121,6 +124,7 @@ x2c:include:HTML/Table.php
      <listitem open="1" type="813" id="187" label="HTML_Titulares" >
       <listitem open="0" type="815" id="190" label="HTML_Titulares" />
       <listitem open="0" type="814" id="188" label="antiguedad" />
      <listitem open="1" type="813" id="187" label="HTML_Titulares" >
       <listitem open="0" type="815" id="190" label="HTML_Titulares" />
       <listitem open="0" type="814" id="188" label="antiguedad" />
+      <listitem open="0" type="815" id="196" label="getCSS" />
       <listitem open="0" type="814" id="189" label="grupo_secciones" />
      </listitem>
      <listitem open="0" type="807" id="160" label="class diagram" />
       <listitem open="0" type="814" id="189" label="grupo_secciones" />
      </listitem>
      <listitem open="0" type="807" id="160" label="class diagram" />
index 78b3c8c44045422008eba949667f07b85df3ac76..7b149d1cddb12553bb59833f21d4bafb31b4124b 100644 (file)
@@ -49,8 +49,7 @@ class HTML_Copete extends HTML_Table {
      */
     function HTML_Copete($seccion) // ~X2C
     {
      */
     function HTML_Copete($seccion) // ~X2C
     {
-    echo '<link rel="stylesheet" href="css/copete.css">';
-    echo '<map name="intranet">
+    $mapa = '<map name="intranet">
             <area shape="rect" coords="14,0,209,54" href="#" alt="Intranet" title="Intranet" > 
             <area shape="rect" coords="605,17,629,41" href="#" alt="Mapa de Intranet" title="Mapa de Intranet" > 
             <area shape="rect" coords="645,17,669,41" href="#" alt="Cambio de Clave" title="Cambio de Clave" > 
             <area shape="rect" coords="14,0,209,54" href="#" alt="Intranet" title="Intranet" > 
             <area shape="rect" coords="605,17,629,41" href="#" alt="Mapa de Intranet" title="Mapa de Intranet" > 
             <area shape="rect" coords="645,17,669,41" href="#" alt="Cambio de Clave" title="Cambio de Clave" > 
@@ -69,13 +68,13 @@ parent::HTML_Table(array('width'  => '760',
     $anchos = array('12', '25', '712', '11');
     $fila = array();
     foreach($anchos as $a)
     $anchos = array('12', '25', '712', '11');
     $fila = array();
     foreach($anchos as $a)
-      $fila[] = '<img src="images/blanco.gif" width="'.$a.'" height="1">';
+      $fila[] = '<img src="'.PATH_RAIZ.'"images/blanco.gif" width="'.$a.'" height="1">';
     $this->addRow($fila);
     $img_seccion = 'images/copete_'.$seccion.'.jpg';
     $this->addRow($fila);
     $img_seccion = 'images/copete_'.$seccion.'.jpg';
-    $this->addRow(array('<img src="'.$img_seccion.'" width="760" height="66" border="0" usemap="#intranet">'), array('colspan' => '4'));
+    $this->addRow(array('<img src="'.PATH_RAIZ.$img_seccion.'" width="760" height="66" border="0" usemap="#intranet">'.$mapa), array('colspan' => '4'));
     $fila = array();
     $fila = array();
-    $fila[] = '<img src="images/copete_inicio.gif" height="30" border="0">';
-    $fila[] = '<img src="images/copete_flecha_azul.gif" height="30" border="0">';
+    $fila[] = '<img src="'.PATH_RAIZ.'images/copete_inicio.gif" height="30" border="0">';
+    $fila[] = '<img src="'.PATH_RAIZ.'images/copete_flecha_azul.gif" height="30" border="0">';
     switch($seccion)
     {
       case 'noticias': $fila[] = 'Enlaces &uacute;tiles:
     switch($seccion)
     {
       case 'noticias': $fila[] = 'Enlaces &uacute;tiles:
@@ -100,10 +99,21 @@ parent::HTML_Table(array('width'  => '760',
      case 'sistemas': $fila[] = '<span class="copete_titulo_uno">Sistemas</span>';
              break;
     }
      case 'sistemas': $fila[] = '<span class="copete_titulo_uno">Sistemas</span>';
              break;
     }
-    $fila[] = '<img src="images/copete_fin.gif" height="30" border="0">';
+    $fila[] = '<img src="'.PATH_RAIZ.'images/copete_fin.gif" height="30" border="0">';
     $this->addRow($fila, array('class' => 'copete_titulo_vinculos'));        
     }
     // -X2C
 
     $this->addRow($fila, array('class' => 'copete_titulo_vinculos'));        
     }
     // -X2C
 
+    // +X2C Operation 169
+    /**
+     * @return void
+     * @access public
+     */
+    function getCSS() // ~X2C
+    {
+        return "css/copete.css";
+    }
+    // -X2C
+
 } // -X2C Class :HTML_Copete
 ?>
 } // -X2C Class :HTML_Copete
 ?>
index fd11a0a97106a294471aa9ecf96a411707485618..52940577847fb78913870f7315a02a856e116cbc 100644 (file)
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 //
 
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 //
 
+session_start();//FIXME esto va en algun otro lado...
+
+define('PATH_RAIZ','/sistemas/intranet/');
+
 require_once 'HTML_Copete.php';
 
 // +X2C includes
 require_once 'HTML_Copete.php';
 
 // +X2C includes
@@ -75,5 +79,20 @@ class HTML_DietMarco extends HTML_Page {
     }
     // -X2C
 
     }
     // -X2C
 
+    // +X2C Operation 168
+    /**
+     * @param  int $content 
+     *
+     * @return void
+     * @access public
+     */
+    function addBodyContent($content) // ~X2C
+    {
+        if(method_exists($content, 'getcss'))
+           $this->addStyleSheet($content->getCSS());
+        parent::addBodyContent($content);
+    }
+    // -X2C
+
 } // -X2C Class :HTML_DietMarco
 } // -X2C Class :HTML_DietMarco
-?>
\ No newline at end of file
+?>
diff --git a/sistema/local_lib/HTML_Login.php b/sistema/local_lib/HTML_Login.php
new file mode 100644 (file)
index 0000000..d92a5e5
--- /dev/null
@@ -0,0 +1,100 @@
+<?php
+// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
+// +--------------------------------------------------------------------+
+// |                      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 Hooks; if not, write to the Free Software Foundation,   |
+// | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
+// +--------------------------------------------------------------------+
+// | Creado: Mon Aug 4 17:33:07 2003                                   |
+// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
+// +--------------------------------------------------------------------+
+//
+// $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
+//
+
+
+require_once 'HTML/Image.php';
+
+// +X2C includes
+require_once 'HTML/Table.php';
+// ~X2C
+
+// +X2C Class 171 :HTML_Login
+/**
+ * @access public
+ */
+class HTML_Login extends HTML_Table {
+    // ~X2C
+
+    // +X2C Operation 172
+    /**
+     * @return void
+     * @access public
+     */
+    function HTML_Login() // ~X2C
+    {
+      parent::HTML_Table(array('bgColor'     => '#FFFFFF',
+                               'border'      => 1,
+                              'borderColor' => '#003060',
+                              'cellPadding' => 0,
+                              'cellSpacing' => 0,
+                              'width'       => 600));
+    }
+    // -X2C
+
+    // +X2C Operation 173
+    /**
+     * @return void
+     * @access public
+     */
+    function getCSS() // ~X2C
+    {
+        return "css/login.css";
+    }
+    // -X2C
+
+    // +X2C Operation 174
+    /**
+     * @return void
+     * @access public
+     */
+    function toHTML() // ~X2C
+    {
+      $int = new HTML_Table(array('border'      => 0,
+                                  'cellPadding' => 0,
+                                 'cellSpacing' => 2,
+                                 'width'       => '100%'));
+      $img = new HTML_Image('images/login_candados.gif');
+      $int->addRow(array($img->toHTML().'Usuarios',
+                         $img->toHTML().'Usuario:',
+                        '<INPUT maxLength=50 name=usuario size=10>',
+                        $img->toHTML().'Contraseña:',
+                        '<INPUT maxLength=50 name=password size=10 type=password>'.
+                        '<INPUT value="'.$_GET['redirect'].'" name=redirect type=hidden>',
+                        '<INPUT name = Submit type=submit value=Enviar>'));
+      $int->updateColAttributes(0, array('class'   => 'titulo_tabla',
+                                         'bgColor' => '#003366'));
+      $int->updateColAttributes(1, array('class'   => 'titulo'));
+      $int->updateColAttributes(3, array('class'   => 'titulo'));
+      $this->addRow(array($int));
+      return '<FORM ACTION = "login.php" METHOD = "POST">'.parent::toHTML().'</FORM>';
+    }
+    // -X2C
+
+} // -X2C Class :HTML_Login
+?>
index 87ce96fa932a047f04cb4155df54bce680ec2a68..59ddc843c0ed67d5a88b7a6ef15dbe73a337a704 100644 (file)
@@ -121,7 +121,6 @@ class HTML_Noticia extends HTML_Table {
        $params = array('width'      => '280',
                        'border'     =>'0',
                        'cellPadding'=>'0');
        $params = array('width'      => '280',
                        'border'     =>'0',
                        'cellPadding'=>'0');
-        echo '<link rel="stylesheet" href="css/noticias.css">';
        parent::HTML_Table($params);
     }
     // -X2C
        parent::HTML_Table($params);
     }
     // -X2C
@@ -192,5 +191,16 @@ class HTML_Noticia extends HTML_Table {
     }
     // -X2C
 
     }
     // -X2C
 
+    // +X2C Operation 195
+    /**
+     * @return void
+     * @access public
+     */
+    function getCSS() // ~X2C
+    {
+        return "css/noticias.css";
+    }
+    // -X2C
+
 } // -X2C Class :HTML_Noticia
 ?>
 } // -X2C Class :HTML_Noticia
 ?>
index 51a2cce1d20ae0b4c9c73094747a5f10a4881eea..28b8fbd282152b1efe7b86aba9c03ceda6694aed 100644 (file)
@@ -74,9 +74,10 @@ class HTML_Servicio extends HTML_Table {
      */
     function toHTML() // ~X2C
     {
      */
     function toHTML() // ~X2C
     {
-        echo '<link rel="stylesheet" href="css/servicio.css">';
        if($this->servicio->link == '')
            $this->servicio->link = 'servicios.php?servicios='.$this->servicio->servicio;
        if($this->servicio->link == '')
            $this->servicio->link = 'servicios.php?servicios='.$this->servicio->servicio;
+        elseif($this->servicio->necesita_logueo)
+            $this->servicio->link = 'login.php?redirect='.$this->servicio->servicio;
        $l = new HTML_Link($this->servicio->link, $this->servicio->nombre, array(),
                             array('class' => 'servicio_titulo_tabla'));
         $this->addRow(array('&nbsp;&nbsp;&nbsp;'.$l->toHTML()),
        $l = new HTML_Link($this->servicio->link, $this->servicio->nombre, array(),
                             array('class' => 'servicio_titulo_tabla'));
         $this->addRow(array('&nbsp;&nbsp;&nbsp;'.$l->toHTML()),
@@ -108,6 +109,8 @@ class HTML_Servicio extends HTML_Table {
        {
            if($s->link == '')
                $s->link = 'servicios.php?servicios='.$s->servicio;
        {
            if($s->link == '')
                $s->link = 'servicios.php?servicios='.$s->servicio;
+           elseif($s->necesita_logueo)
+               $s->link = 'login.php?redirect='.$s->servicio;
             if($par)
            {
                 $int->setCellContents(0, 3, new HTML_Link($s->link, $s->nombre,
             if($par)
            {
                 $int->setCellContents(0, 3, new HTML_Link($s->link, $s->nombre,
@@ -139,5 +142,16 @@ class HTML_Servicio extends HTML_Table {
     }
     // -X2C
 
     }
     // -X2C
 
+    // +X2C Operation 170
+    /**
+     * @return void
+     * @access public
+     */
+    function getCSS() // ~X2C
+    {
+        return "css/servicio.css";
+    }
+    // -X2C
+
 } // -X2C Class :HTML_Servicio
 ?>
 } // -X2C Class :HTML_Servicio
 ?>
index 12542b1336ac2af16b1c90395f622475b49a83ce..9e4597bad002e1547d63e739e52db88df518cf37 100644 (file)
@@ -122,5 +122,16 @@ class HTML_Titulares extends HTML_Table {
     }
     // -X2C
 
     }
     // -X2C
 
+    // +X2C Operation 196
+    /**
+     * @return void
+     * @access public
+     */
+    function getCSS() // ~X2C
+    {
+        return "css/noticias.css";
+    }
+    // -X2C
+
 } // -X2C Class :HTML_Titulares
 ?>
 } // -X2C Class :HTML_Titulares
 ?>
diff --git a/sistema/www/css/login.css b/sistema/www/css/login.css
new file mode 100644 (file)
index 0000000..62396a6
--- /dev/null
@@ -0,0 +1,6 @@
+.titulo_tabla {\r
+       BACKGROUND-POSITION-X: left; COLOR: #ffffff; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 11pt; FONT-STYLE: normal; FONT-WEIGHT: bold; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
+}\r
+.titulo {\r
+       BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 9pt; FONT-STYLE: normal; FONT-WEIGHT: bold; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: top\r
+}\r
diff --git a/sistema/www/images/login_candados.gif b/sistema/www/images/login_candados.gif
new file mode 100644 (file)
index 0000000..c5770cd
Binary files /dev/null and b/sistema/www/images/login_candados.gif differ
diff --git a/sistema/www/login.php b/sistema/www/login.php
new file mode 100644 (file)
index 0000000..fb025ff
--- /dev/null
@@ -0,0 +1,70 @@
+<?
+  require_once '../local_lib/HTML_DietMarco.php';
+  require_once '../local_lib/HTML_Login.php';
+  require_once 'DB.php';
+
+  if(isset($_POST['usuario']))
+  {
+    $userid = $_POST['usuario'];
+    $ds = @ldap_connect( "ldapdist.mecon.ar" )
+    or $ds = @ldap_connect( "ldapmaster.mecon.ar" );
+
+    if (! $ds) {
+    //error connecting - return false
+      echo "Error conectando!\n";
+    }
+    list( $uid, $domain ) = split( "@", $userid );
+
+    $r = @ldap_bind($ds, "uid=$uid,ou=Personas,o=$domain,o=gov.ar", $_POST['password']);
+    if ($r) {
+      $sr = @ldap_search($ds, "ou=Personas,o=$domain,o=gov.ar", "uid=$uid");
+      $info = @ldap_get_entries($ds, $sr);
+    }
+    ldap_close($ds);
+
+    if (!isset($sr)) {
+    //error reading / authenticating  - return false
+      echo "Error leyendo!\n";
+    }
+    else
+    {
+      $_SESSION['usuario'] = $_POST['usuario'];
+      $_SESSION['documento'] =  $info[0]['uidnumber'][0];
+    }
+  }else{
+    if(!isset($_SESSION['usuario']))
+    {
+      $m = new HTML_DietMarco('servicios');
+      $m->addTitle('Servicios');
+    
+      $login = new HTML_Login();
+      $t = new HTML_Table(array('width'       => 760,
+                                'align'       => 'center',
+                               'cellspacing' => 0,
+                                'cellpadding' => 0,
+                               'border'      => 0,
+                               'valign'      => 'middle',
+                               'height'      => 200));
+      $t->addRow(array($login));
+      $m->addStyleSheet($login->getCSS());
+      $m->addBodyContent($t);
+      $m->display();
+    }
+  }
+
+  if(isset($_SESSION['usuario']) && (isset($_POST['redirect']) || isset($_GET['redirect'])))
+  {
+    $db = DB::Connect('mysql://intranet:intranet@bal747f/intranet');
+    $query = "SELECT link
+              FROM servicio
+             WHERE servicio = ";
+    if(isset($_POST['redirect']))
+      $query .= $_POST['redirect'];
+    else
+      $query .= $_GET['redirect'];
+    $link = $db->getOne($query);
+    header('location: '.$link);
+  }
+   
+?>
diff --git a/sistema/www/logout.php b/sistema/www/logout.php
new file mode 100644 (file)
index 0000000..0aaf7b5
--- /dev/null
@@ -0,0 +1,5 @@
+<?
+session_start();
+session_destroy();
+header('location: noticias.php');
+?>
index 7a58a1c73e2de62df91a5020361d5cd78e332278..e4a24f3e1b20457edd0ba7ff9548cd715ee4fa6c 100644 (file)
@@ -32,6 +32,8 @@
 
   $titulares = new HTML_Titulares($grupo, $dias);
   $noticias->addRow(array($arbol,$titulares));
 
   $titulares = new HTML_Titulares($grupo, $dias);
   $noticias->addRow(array($arbol,$titulares));
+  $m->addStyleSheet($arbol->getCSS());
+  $m->addStyleSheet($titulares->getCSS());
   $noticias->updateCellAttributes(0, 0, array('valign'=>'top', 'width'=>'160'));
   $noticias->updateCellAttributes(0, 1, array('valign'=>'top', 'width'=>'600'));
 
   $noticias->updateCellAttributes(0, 0, array('valign'=>'top', 'width'=>'160'));
   $noticias->updateCellAttributes(0, 1, array('valign'=>'top', 'width'=>'600'));
 
index 33ec2526c4e38b7c1640c7aaaeff5c05a8fb47ed..3268be91f2156c08406fa3cebb7095b06b991bef 100644 (file)
@@ -32,6 +32,7 @@
        $impar = true;
       }
   }
        $impar = true;
       }
   }
+  $m->addStyleSheet($sh->getCSS());
   $tabla =& new HTML_Table(array('width' => 760,
                                  'cellspacing' => 10));
   $tabla->addRow(array($col_impar, $col_par), array('valign'=>'top'));
   $tabla =& new HTML_Table(array('width' => 760,
                                  'cellspacing' => 10));
   $tabla->addRow(array($col_impar, $col_par), array('valign'=>'top'));
index de5fda0116c2f70ba7ca5056d377fc4fc3e18573..2600d7687dedbde6dad88a8980baf61f84bdf5d5 100755 (executable)
@@ -10,10 +10,11 @@ require_once 'MECON/HTML/Arbol.php';
 require_once '../../../local_lib/HTML_DietMarco.php';
 
 
 require_once '../../../local_lib/HTML_DietMarco.php';
 
 
-if(isset($_GET['nrodoc']))
+/*if(isset($_GET['nrodoc']))
        $nrodoc = $_GET['nrodoc'];
 else
        $nrodoc = $_GET['nrodoc'];
 else
-       $nrodoc = 0;
+       $nrodoc = 0;*/
+$nrodoc = $_SESSION['documento'];
 
 
 $m = new HTML_DietMarco('servicios');
 
 
 $m = new HTML_DietMarco('servicios');
@@ -25,7 +26,7 @@ foreach (array('Personales','Domicilio','Cobertura','Estudios','Antiguedad','Lab
 {
        $aa = array(
                                'titulo'=>$a,
 {
        $aa = array(
                                'titulo'=>$a,
-                               'link'=>'./legajo.php?nrodoc='.$nrodoc.'&mostrar='.strtolower($a)
+                               'link'=>'./legajo.php?mostrar='.strtolower($a)
                );
        array_push($arbol_valores,$aa);
 }
                );
        array_push($arbol_valores,$aa);
 }