[Openfirst-cvscommit] base/includes db_setup.php,1.2,1.3 globals.php,1.6,1.7 modules.php,1.7,1.8

[Astronouth7303 <ast...@us...>]

Update of /cvsroot/openfirst/base/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11512/includes

Modified Files:
	db_setup.php globals.php modules.php 
Log Message:
Seperating dirs from IDs.

Index: db_setup.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/db_setup.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** db_setup.php	26 May 2005 21:00:03 -0000	1.2
--- db_setup.php	31 May 2005 22:16:58 -0000	1.3
***************
*** 25,28 ****
--- 25,29 ----
    //          includes both setup and modification of said tables.
  require_once('dbase.php');
+ require_once('modules.php');
  
  /** Gets an array of tables.
***************
*** 39,47 ****
   */
  class Table {
!   var $mName;
    
    /** Constructor
     */
!   function Table($Name) {
      #
    }
--- 40,60 ----
   */
  class Table {
!   var $mName, $mFields, $mRecords;
    
    /** Constructor
     */
!   function Table() {
!     $this->mName = '';
!     $this->mFields = array();
!     $this->mRecords = array();
!   }
!   
!   /*static*/ function createFromXML($tag) {
!     if (!(is_object($tag) && is_a($tag, 'xmlElement'))) return false;
!     if ($tag->Name != 'TABLE') return false;
!       
!   }
!   
!   /*static*/ function createFromDB($Name) {
      #
    }

Index: globals.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/globals.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** globals.php	27 May 2005 16:33:03 -0000	1.6
--- globals.php	31 May 2005 22:16:58 -0000	1.7
***************
*** 115,121 ****
         
         // If the module has requested to be shown on the menu then add it
!        if ( (bool) $module->showonmenu == true) {
           // If it is the current module then color the item
!          if ($curmodule == $modulename){
             $CurrentModule =& $thisModule;
             $headers .= "  &raquo; <a class='menu selected' href='$BasePath/$dir'>".htmlentities($name)."</a> |
--- 115,121 ----
         
         // If the module has requested to be shown on the menu then add it
!        if ($showonmenu) {
           // If it is the current module then color the item
!          if ($curmodule == $dir){
             $CurrentModule =& $thisModule;
             $headers .= "  &raquo; <a class='menu selected' href='$BasePath/$dir'>".htmlentities($name)."</a> |

Index: modules.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/modules.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** modules.php	27 May 2005 14:36:31 -0000	1.7
--- modules.php	31 May 2005 22:16:58 -0000	1.8
***************
*** 144,147 ****
--- 144,161 ----
    }
    
+   /*** PUBLIC FUNCTIONS ***/
+   /*public*/ function prepareTables() {
+     $mTables =& $this->mTables;
+     $mDBTag =& $this->mDBTag;
+     
+     $mTables = array();
+     
+     foreach($mDBTag->Contents as $tag) {
+       if (!(is_object($tag) && is_a($tag, 'xmlElement'))) continue;
+       if ($tag->Name != 'TABLE') continue;
+       
+     }
+   }
+   
    /*** PRIVATE FUNCTIONS ***/
    /*private*/ function getModuleDTD() {