(no commit message)

diff --git a/marco/doc/uml/Marco.xmi b/marco/doc/uml/Marco.xmi
index 6e448e895da39e5e47a0f25ce4572a37a5221b77..00e8029aba23678f101c2a28b5d2b3eeb564e48c 100644 (file)
--- a/marco/doc/uml/Marco.xmi
+++ b/marco/doc/uml/Marco.xmi
@@ -92,7 +92,6 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
     </UML:Operation>
     <UML:Attribute stereotype="" package="" xmi.id="54" value="" type="array(seccion)" abstract="0" documentation="Array de secciones. Contiene la informacion de las secciones del sistema." name="secciones" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="55" value="" type="string" abstract="0" documentation="Nombre del directorio en donde se encuentra el sistema;." name="directorio" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="79" value="" type="array" abstract="0" documentation="Array con la configuracion de las secciones" name="confSecciones" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="85" value="" type="string" abstract="0" documentation="Nombre del menu" name="nombre" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="86" value="" type="string" abstract="0" documentation="Link del menu." name="link" static="0" scope="201" />
    </UML:Class>
@@ -149,7 +148,7 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
      <UML:ConceptWidget usesdiagramfillcolour="0" width="247" showattsigs="601" usesdiagramusefillcolour="0" x="521" linecolour="#ff0000" y="195" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" usefillcolor="1" showattributes="1" xmi.id="12" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="202" showattsigs="601" usesdiagramusefillcolour="0" x="342" linecolour="#ff0000" y="896" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" usefillcolor="1" showattributes="1" xmi.id="18" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="641" showattsigs="601" usesdiagramusefillcolour="0" x="351" linecolour="#ff0000" y="716" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="80" usefillcolor="1" showattributes="1" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="482" showattsigs="601" usesdiagramusefillcolour="0" x="17" linecolour="#ff0000" y="484" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="192" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="482" showattsigs="601" usesdiagramusefillcolour="0" x="17" linecolour="#ff0000" y="484" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="176" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="191" showattsigs="601" usesdiagramusefillcolour="0" x="26" linecolour="#ff0000" y="854" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="96" usefillcolor="1" showattributes="1" xmi.id="15" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="204" showattsigs="601" usesdiagramusefillcolour="0" x="17" linecolour="#ff0000" y="708" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="112" usefillcolor="1" showattributes="1" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="223" showattsigs="601" usesdiagramusefillcolour="0" x="494" linecolour="#ff0000" y="416" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="64" usefillcolor="1" showattributes="1" xmi.id="13" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,9,-1,0,50,0,0,0,0,0" />
@@ -194,14 +193,14 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="3" indexb="1" widgetbid="16" widgetaid="14" documentation="" type="501" >
       <linepath>
-       <startpoint startx="177" starty="676" />
+       <startpoint startx="177" starty="660" />
        <endpoint endx="85" endy="708" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="2" widgetbid="14" widgetaid="16" documentation="" type="501" >
       <linepath>
        <startpoint startx="153" starty="708" />
-       <endpoint endx="338" endy="676" />
+       <endpoint endx="338" endy="660" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="15" widgetaid="16" documentation="" type="500" >
@@ -273,7 +272,6 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
       </listitem>
       <listitem open="0" type="813" id="14" label="Menu" >
        <listitem open="0" type="815" id="82" label="armarArraySecciones" />
-       <listitem open="0" type="814" id="79" label="confSecciones" />
        <listitem open="0" type="814" id="55" label="directorio" />
        <listitem open="0" type="815" id="57" label="generarArchivo" />
        <listitem open="0" type="814" id="86" label="link" />

diff --git a/marco/php/marco/Marco.php b/marco/php/marco/Marco.php
index a720ad8592816709f14c45c492fdbcc1949df3cd..6e4201980812cf81accfdc8a40b302edbd995b62 100644 (file)
--- a/marco/php/marco/Marco.php
+++ b/marco/php/marco/Marco.php
@@ -247,4 +247,4 @@ class Marco {
 
 } // -X2C Class :Marco
 
-?>
+?>
\ No newline at end of file

diff --git a/marco/php/marco/Menu.php b/marco/php/marco/Menu.php
index 6db11372517f875d9ae70c305bf8f5255ac2fa72..a87fc70a3e7a49b6ea6be900fd5b704964771a2a 100644 (file)
--- a/marco/php/marco/Menu.php
+++ b/marco/php/marco/Menu.php
@@ -51,15 +51,6 @@ class Menu {
      */
     var $_directorio;
 
-    /**
-     * Array con la configuracion de las secciones
-     *
-     * @var    array $confSecciones
-     *
-     * @access private
-     */
-    var $_confSecciones;
-
     /**
      * Nombre del menu
      *
@@ -160,7 +151,8 @@ class Menu {
      */
     function _obtenerConfSecciones() // ~X2C
     {
-        $this->_confSecciones = include 'confSecciones.php';
+        $tmp = include 'confSecciones.php';
+        return $tmp;
     }
     // -X2C
 
@@ -186,4 +178,4 @@ class Menu {
 
 } // -X2C Class :Menu
 
-?>
+?>
\ No newline at end of file