openfirst-cvscommit — Notify subscribers of changes to files in CVS.

[Openfirst-cvscommit] awards openfirst.info.xml,NONE,1.1 index.php,1.15,1.16 openfirst.info.php,1.3,NONE

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

Update of /cvsroot/openfirst/awards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25926/awards

Modified Files:
	index.php 
Added Files:
	openfirst.info.xml 
Removed Files:
	openfirst.info.php 
Log Message:
radical changes, with more to come

--- NEW FILE: openfirst.info.xml ---
<module id="openfirst.awards">
 <!-- Info -->
 <!-- This is not used, accept as meta data -->
 <name>Awards</name>
 <version>CVS</version>
 <author>David Di Biase</author>
 <maintainer>Jamie Bliss</maintainer>
 
 <!-- Configuration -->
 <includes>
  <!-- Each one of these is a file -->
  <include>foo.php</include>
  <include>bar.php</include>
 </includes>
 <!-- Either entities or CDATA can be used. Just make sure it's parsed into the literal HTML. -->
 <!-- Note the two ways of including BasePath. -->
 <navbar>
  &lt;a href="&BasePath;/awards/"&gt;View Awards&lt;/a&gt;
 </navbar>
 <adminbar><![CDATA[
  <a href="$BasePath/awards/admin/">Manage Awards</a>
 ]]></adminbar>
 
 <!-- Database setup -->
 <db>
  <table id="awards">
   <type>MyISAM</type>
   <fields>
    <!-- Empty tags with no attributes serve as flags. Should be self explainatory -->
    <field name="ID"><type>int<length>6</length><unsigned /></type><not_null /><auto_increment /></field>
    <field name="AwardName"><type>tinytext</type></field>
    <field name="Description"><type>text</type></field>
    <field name="Event"><type>tinytext</type></field>
    <field name="Date"><type>date</type><default>&null;</default></field>
    <field name="Recipient"><type>tinytext</type></field>
    <field name="Image"><type>tinytext</type></field>
    <field name="Description"><type>TEXT</type></field>
    <field name="FIRSTAward"><type>BOOL</type></field>
   </fields>
   <keys>
    <key name="ID">
     <cols>
      <col>ID</col>
     </cols>
     <primary />
    </key>
   </key>
  </table>
  <table id="firstawards"></table>
   <fields>
    <field name="AwardName"><type>tinytext</type></field>
    <field name="Description"><type>text</type></field>
   </fields>
   <records>
    <record>
     <col name="AwardName">Chairman's Award</col>
     <col name="Description">The FIRST Robotics Competition is about much more than the mechanics of building a robot or winning a competitive event. It is about the impact FIRST has on those who participate in the program and the impact of FIRST on the community at large. The FIRST mission is to change the way America's young people regard science and technology and to inspire an appreciation for the real-life rewards and career opportunities in these fields.</col>
    </record>
    <record>
     <col name="AwardName">Regional Finalists</col>
     <col name="Description">This award celebrates the team or alliance that makes it to the final match of the competition.</col>
    </record>
    <record>
     <col name="AwardName">Leadership in Control</col>
     <col name="Description">This award celebrates an innovative control system or application of control components to provide unique machine functions.</col>
    </record>
    <record>
     <col name="AwardName">Regional Finalist</col>
     <col name="Description">This award celebrates the team or alliance that makes it to the final match of the competition.
    </record>
    <record>
     <col name="AwardName">Rookie All-Star</col>
     <col name="Description">This award celebrates the rookie team exemplifying a young but strong partnership effort, as well as implementing the mission of FIRST to inspire students to learn more about science and technology.</col>
    </record>
    <record>
     <col name="AwardName">Website Award</col>
     <col name="Description">This award recognizes excellence in student-designed, build, and managed FIRST team websites.</col>
    </record>
    <record>
     <col name="AwardName">Xerox - Creativity</col>
     <col name="Description">The award celebrates creative design, use of a component, or a creative or unique strategy of play.</col>
    </record>
    <record>
     <col name="AwardName">The Allaire Medal - Leadership Exemplified</col>
     <col name="Description">The Allaire Medal recognizes leadership exemplified, and is awarded to an individual student on the winning Chairman's Award team.  Named in honor of Paul A. Allaire, a long-serving FIRST Chairman of the Board, the Allaire Medal is given to the student who has demonstrated outstanding leadership on his/her FIRST team, within his/her school and community, and whose personal character best embodies the spirit of FIRST.</col>
    </record>
    <record>
     <col name="AwardName">Woodie Flowers Awards</col>
     <col name="Description">The Woodie Flwers Award celebrates effective communication in the art and science of engineering and design.  Dr. William Murphy and Small Parts, Inc. began this prestigious award in 1996.  For the 2004 season, this award is being enhanced to honor more exemplary communicators in the FIRST community.  Following Dr. Murphy's lead, FIRST Whishes to bring more attention to these FIRST heroes.</col>
    </record>
    <record>
     <col name="AwardName">The Autodesk Inventor &amp;reg; Award</col>
     <col name="Description">Presented by Autodesk, Inc., this award recognizes the team that best understands, communicates, and documents the distinct phases of the design process from concept to completion.</col>
    </record>
    <record>
     <col name="AwardName">The Autodesk Visualization Award</col>
     <col name="Description">Presented by Autodesk, Inc. this award recognizes excellence in student animation that clearly and creatively illustrates the spirit of the FIRST Robtoics Compettion.</col>
    </record>
    <record>
     <col name="AwardName">Champion</col>
     <col name="Description">This award celebrates the team or alliance that wins the Championship.</col>
    </record>
    <record>
     <col name="AwardName">Championship Finalist</col>
     <col name="Description">This award celebrates the team or alliance that makes it to the final match of the Championship.</col>
    </record>
    <record>
     <col name="AwardName">Division Finalist</col>
     <col name="Description">This award celebrates the team or alliance that wins the final match in their division at the Championship.</col>
    </record>
    <record>
     <col name="AwardName">Rookie Inspiration</col>
     <col name="Description">Award celebrates a rookie team for outstanding effort as a FIRST team in a community outreach &amp;amp; recruiting students to engineering. This team models gracious professionalism on and off the field and is a true inspiration to others</col>
    </record>
    <record>
     <col name="AwardName">Woodie Flowers Finalist Award</col>
     <col name="Description">Awarded to an outstanding engineer or teacher participating in each of the robotics Regional Competions. Students choose and write about a person on their  team who best demonstrates excellence in teaching science, math, and creative design. These Regional winners will receive consideration for the Championship Woodie Flowers Award.</col>
    </record>
    <record>
     <col name="AwardName">Judges' Award</col>
     <col name="Description">During the couse of the competition, the judging panel may encounter a team whose unique efforts, performance, or dyanmics merit recognition.</col>
    </record>
    <record>
     <col name="AwardName">Kleiner Perkins Caufield &amp;amp; Byers-Entrepreneurship</col>
     <col name="Description">Celebrates the Entrepreneurial Spirit. This award reconizes a team, which since its inception has developed the framework fer a comprehensive business plan in order to scope, manage, and obtain team objectives. This team displays entrepreneurial enthusiam and the vital business skills for a self-sustaining program.</col>
    </record>
    <record>
     <col name="AwardName">Motorola-Quality</col>
     <col name="Description">This award celebrates machine robustness in concept and fabrication</col>
    </record>
    <record>
     <col name="AwardName">Regional Champion</col>
     <col name="Description">This award celebrates the team or alliance that makes it to the final match of the competition.</col>
    </record>
    <record>
     <col name="AwardName">General Motors-Industrial Design</col>
     <col name="Description">the award celebrates form and function in an efficiently designed machine that effectively achieves the game challenge.</col>
    </record>
    <record>
     <col name="AwardName">Highest Rookie Seed</col>
     <col name="Description">this award celebrates the highest-seeded rookie team at the conclusion of the qualifying rounds</col>
    </record>
    <record>
     <col name="AwardName">Imagery</col>
     <col name="Description">This award celebrates attractiveness in engineering and outstanding visual aesthetic integration from the machine to team appearance</col>
    </record>
    <record>
     <col name="AwardName">Johnson &amp;amp; Johnson-Sportsman</col>
     <col name="Description">This award celebrates outstanding sportsmanship and continues gracious professionalism in the heat of competition, both on and  off the playing field</col>
    </record>
    <record>
     <col name="AwardName">Delphi-'driving Tomorrow's Techology'</col>
     <col name="Description">Celebrates an elegant and advantageous machine featue. Reconizes any aspect of engeering elegance including , but not limited to: design,wiring methods, material seection, programming techniques, and unique machine attributes. The criteria for this award are based on the teams ability to concisely verbally describe , as well as demonstrate, this chosen machine feature</col>
    </record>
    <record>
     <col name="AwardName">Engeering Inspiration</col>
     <col name="Description">Award celebrates a team's outstanding success in advancing respect and appreciation for engeering and engineers, both within their school, as well as their community . Criteria include: the extent and effectiveness of the team's efforts to recruit students to engineering , the extent and effectiveof the team's community outreach efforts, and the measurable success of those efforts. this is the second highest team award FIRST bestows</col>
    </record>
    <record>
     <col name="AwardName">Autodesk Visualization Award</col>
     <col name="Description">Reconizes student animation that 'clearly and creatively' shows the spirt of FIRST Robotics Competition.Autodesk will award excellence in content,creativity,and mastery af multimedia</col>
    </record>
    <record>
     <col name="AwardName">Daimler Chrysler-Team Spirit</col>
     <col name="Description">This award celebrates extraordinary enthusiasm and spirit through an exceptional partnership and teamwork.</col>
    </record>
   </records>
  </table>
 </db>
</module>

--- openfirst.info.php DELETED ---

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/awards/index.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** index.php	12 Apr 2004 20:48:19 -0000	1.15
--- index.php	26 May 2005 21:00:31 -0000	1.16
***************
*** 22,34 ****
   *
   */
!   include_once("../config/globals.php");
!   include_once($header);
  
    // Query database for award information
!   $query = ofirst_dbquery("SELECT * FROM ofirst_awards WHERE FIRSTAward='1' ORDER BY Date DESC");
    $amount = ofirst_dbnum_rows($query);
  ?>
  <h1>Team Awards</h1>
! <p>This team has won <strong><?php echo $amount; ?></strong> <a href='http://www.usfirst.org/'>FIRST</a> award(s).</p>
  <?php
    // If more then one award is present then show the values
--- 22,42 ----
   *
   */
!   include_once("../includes/globals.php");
!   include_once($Header);
  
    // Query database for award information
!   $query = ofirst_dbquery('SELECT * FROM '.
!                           ofirst_dbquote_table('awards').
!                           ' WHERE '.
!                           ofirst_dbquote_name('FIRSTAward').
!                           '='.
!                           ofirst_dbquote_data(1).
!                           ' ORDER BY '.
!                           ofirst_dbquote_name('Date').
!                           ' DESC');
    $amount = ofirst_dbnum_rows($query);
  ?>
  <h1>Team Awards</h1>
! <p>This team has won <b><?php echo $amount; ?></b> <a href='http://www.usfirst.org/'>FIRST</a> award(s).</p>
  <?php
    // If more then one award is present then show the values
***************
*** 94,96 ****
  <?php
    }
!   include_once($footer); ?>
--- 102,104 ----
  <?php
    }
!   include_once($Footer); ?>

[Openfirst-cvscommit] base/includes/functions debug.php,1.1,1.2

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

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

Modified Files:
	debug.php 
Log Message:
radical changes, with more to come

Index: debug.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/functions/debug.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** debug.php	25 May 2005 21:44:29 -0000	1.1
--- debug.php	26 May 2005 21:00:03 -0000	1.2
***************
*** 35,40 ****
    // Handles errors by displaying a message and contacting openFIRST
    //   developers for assistance.
!   function ofirst_error_handler($errno,$error,$file,$line) {
!     global $dbasetype, $ostype, $sqlserver, $currentmodule, $user, $mailnotify, $mailfrom, $lastquery;
      global $NO_ADD_BUG;
      $dberrno = ofirst_dberrno();
--- 35,43 ----
    // Handles errors by displaying a message and contacting openFIRST
    //   developers for assistance.
!   function ofirst_error_handler($errno,$error,$file,$line,$context) {
!     global $DBaseType, $Encryption, $Title, $Version, $sqlServer, $sqlUser, $sqlPassword, $sqlDatabase,
!            $sqlConnection, $PassSaveDisabled, $regEnabled, $Server, $BasePath, $fBasePath, $Home,
!            $StylePath, $fStylePath, $Header, $Footer, $MailNotify, $MailFrom;
!     global $osType, $currentmodule, $user, $lastquery;
      global $NO_ADD_BUG;
      $dberrno = ofirst_dberrno();
***************
*** 42,63 ****
  
      if(! function_exists("md5_file")) {
!       $checksum = "md5_file not supported by PHP version."; 
      } else {
!       $checksum = md5_file($_SERVER["PATH_TRANSLATED"]);
      }
  
      $details = "MD5: $checksum
! Database Type: $dbasetype
! Operating System: $ostype
! SQL Server: $sqlserver
  Current Module: $currentmodule
  Error Number: $errno";
      
      $specifics = "PHP_SELF: {$_SERVER['PHP_SELF']}
! HTTP Host: {$_SERVER['HTTP_HOST']}
! HTTP Referer: {$_SERVER['HTTP_REFERER']}
! Translated Path: {$_SERVER['PATH_TRANSLATED']}
! User (if exists): {$user->user}
! User Access Level: {$user->membertype}
  Error Description: {$error} in {$file} on line {$line}";
      if ($dberrno != 0) {
--- 45,77 ----
  
      if(! function_exists("md5_file")) {
!       $checksum = "na"; 
      } else {
!       if (isset($_SERVER['SCRIPT_FILENAME'])) {
!         $checksum = md5_file($_SERVER['SCRIPT_FILENAME']);
!       }
      }
  
      $details = "MD5: $checksum
! Database Type: $DBaseType
! Operating System: $osType
! SQL Server: $sqlServer
  Current Module: $currentmodule
  Error Number: $errno";
      
      $specifics = "PHP_SELF: {$_SERVER['PHP_SELF']}
! HTTP Host: {$_SERVER['HTTP_HOST']}";
! 
! if (isset($_SERVER['HTTP_REFERER'])) {
!     $specifics .= "
! HTTP Referer: {$_SERVER['HTTP_REFERER']}";
! }
!     $specifics .= "
! Translated Path: {$_SERVER['SCRIPT_FILENAME']}";
! if (isset($user) ) {
!     $specifics .= "
! User: {$user->user}
! User Access Level: {$user->membertype}";
! }
!     $specifics .= "
  Error Description: {$error} in {$file} on line {$line}";
      if ($dberrno != 0) {
***************
*** 70,74 ****
  if ($NO_ADD_BUG)
  {
- //  if ($errno == 2) return;
    echo "<br /><div class=\"error\"><h2>Error:</h2><dl>";
    echo "<dt>Details:</dt><dd><pre>";
--- 84,87 ----

[Openfirst-cvscommit] base/config first.php,1.60,1.61 index.php,1.11,1.12 install.php,1.24,1.25 modules.php,1.8,1.9 version.php,1.9,1.10

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

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

Modified Files:
	first.php index.php install.php modules.php version.php 
Log Message:
radical changes, with more to come

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** first.php	17 May 2005 01:55:57 -0000	1.60
--- first.php	26 May 2005 21:00:02 -0000	1.61
***************
*** 65,71 ****
     // They have submitted the form, write a new globals.php file and test
     // options.
!    $ConfigFile = 'sitesettings.php';
!    if ( (file_exists("./$ConfigFile") && is_writable("./$ConfigFile")) || is_writable('./') ) {
!      $file = file_get_contents('./sitesettings.tpl');
       $cookielogins = ((isset($_POST["cookielogins"]) && $_POST["cookielogins"]=="yes") ? true : false);
       $allowreg = ((isset($_POST["allowreg"]) && $_POST["allowreg"]=="yes") ? true : false);
--- 65,72 ----
     // They have submitted the form, write a new globals.php file and test
     // options.
!    $fbasepath = realpath($_POST['fbasepath']);
!    $ConfigFile = "$fbasepath/includes/sitesettings.php";
!    if ( (file_exists($ConfigFile) && is_writable($ConfigFile)) || is_writable(dirname($ConfigFile) ) {
!      $file = file_get_contents('../includes/sitesettings.tpl');
       $cookielogins = ((isset($_POST["cookielogins"]) && $_POST["cookielogins"]=="yes") ? true : false);
       $allowreg = ((isset($_POST["allowreg"]) && $_POST["allowreg"]=="yes") ? true : false);
***************
*** 107,118 ****
                        GetVarValue($_POST['server']),
                        GetVarValue($_POST['basepath']),
!                       GetVarValue($_POST['fbasepath']));
       
       $file = str_replace($find, $replace, $file);
!      $hfile = fopen("./$ConfigFile",'w'); fwrite($hfile, $file); fclose($hfile);
       
!      include_once("../config/globals.php");
!      include_once("$header");
!      echo("<h1>openFIRST Software Configured</h1>
       <p>If this page does not display errors elsewhere, then your openFIRST has now been successfully
  configured.  If there are errors, check your configuration options and try again.  You may now
--- 108,119 ----
                        GetVarValue($_POST['server']),
                        GetVarValue($_POST['basepath']),
!                       GetVarValue($fbasepath));
       
       $file = str_replace($find, $replace, $file);
!      $hfile = fopen("$ConfigFile",'w'); fwrite($hfile, $file); fclose($hfile);
       
!      include_once("../includes/globals.php");
!      include_once($header);
!      echo("<div class=\"success\"><h1>openFIRST Software Configured</h1>
       <p>If this page does not display errors elsewhere, then your openFIRST has now been successfully
  configured.  If there are errors, check your configuration options and try again.  You may now
***************
*** 122,133 ****
  the password for that account has been changed, or the MySQL settings are incorrect.</p>");
       showlogin();
!      die(include_once("$footer"));
     } else {
       echo '<p class="error"><span class="file">'.htmlentities($ConfigFile).'</span> is not writable</p>
  ';
!      if(is_readable("config/headers.php")) {
!        include_once("config/headers.php");
       } else {
!        include_once("../config/headers.php");
       }
       echo("<h1 class=\"error\">System Configuration Error</h1>
--- 123,134 ----
  the password for that account has been changed, or the MySQL settings are incorrect.</p>");
       showlogin();
!      die(include_once($footer));
     } else {
       echo '<p class="error"><span class="file">'.htmlentities($ConfigFile).'</span> is not writable</p>
  ';
!      if(is_readable("style/headers.php")) {
!        include_once("style/headers.php");
       } else {
!        include_once("../style/headers.php");
       }
       echo("<h1 class=\"error\">System Configuration Error</h1>
***************
*** 143,150 ****
     
  // Do form
!    if(is_readable("config/headers.php")) {
!      include_once("config/headers.php");
     } else {
!      include_once("../config/headers.php");
     }
  
--- 144,151 ----
     
  // Do form
!    if(is_readable("style/headers.php")) {
!      include_once("style/headers.php");
     } else {
!      include_once("../style/headers.php");
     }
  
***************
*** 240,256 ****
      <dd>
       <label for="header">Header file</label>
!      <input type="text" name="header" value="<?php echo htmlentities($fbasepath); ?>/config/headers.php" />
      </dd>
      <dt>This should be a full system path, eg,
!      <code class="file">c:\inetpub\wwwroot\openfirst\config\header.php</code> or 
!      <code class="file">/home/site/public_html/openfirst/config/headers.php</code>
      </dt>
      <dd>
       <label for="footer">Footer file</label>
!      <input type="text" name="footer" value="<?php echo htmlentities($fbasepath); ?>/config/footers.php" />
      </dd>
      <dt>This should be a full system path, eg,
!      <code class="file">c:\inetpub\wwwroot\openfirst\config\footers.php</code> or 
!      <code class="file">/home/site/public_html/openfirst/config/footers.php</code>
      </dt>
      <dd>
--- 241,257 ----
      <dd>
       <label for="header">Header file</label>
!      <input type="text" name="header" value="<?php echo htmlentities(realpath("$fbasepath/style/headers.php")); ?>" />
      </dd>
      <dt>This should be a full system path, eg,
!      <code class="file">c:\inetpub\wwwroot\openfirst\style\header.php</code> or 
!      <code class="file">/home/site/public_html/openfirst/style/headers.php</code>
      </dt>
      <dd>
       <label for="footer">Footer file</label>
!      <input type="text" name="footer" value="<?php echo htmlentities(realpath("$fbasepath/style/footers.php")); ?>" />
      </dd>
      <dt>This should be a full system path, eg,
!      <code class="file">c:\inetpub\wwwroot\openfirst\style\footers.php</code> or 
!      <code class="file">/home/site/public_html/openfirst/style/footers.php</code>
      </dt>
      <dd>
***************
*** 259,263 ****
       <span class="warning">Must not have a trailing slash and must include a protocol.</span>
      </dd>
!     <dt>eg, <code class="url"><strong>http://openfirst.sourceforge.net</strong>/openfirst</code></dt>
      <dd>
       <label for="basepath">URL base path</label>
--- 260,264 ----
       <span class="warning">Must not have a trailing slash and must include a protocol.</span>
      </dd>
!     <dt>eg, <code class="url"><b>http://openfirst.sourceforge.net</b>/openfirst</code></dt>
      <dd>
       <label for="basepath">URL base path</label>
***************
*** 265,269 ****
       <span class="warning">Must not have a trailing slash.</span>
      </dd>
!     <dt>ie. example: <code class="url">http://openfirst.sourceforge.net<strong>/openfirst</strong></code>) this should
       always have a beginning slash but no ending slash. (If openFIRST is in the root directory, then leave blank.)
      </dt>
--- 266,270 ----
       <span class="warning">Must not have a trailing slash.</span>
      </dd>
!     <dt>ie. example: <code class="url">http://openfirst.sourceforge.net<b>/openfirst</b></code>) this should
       always have a beginning slash but no ending slash. (If openFIRST is in the root directory, then leave blank.)
      </dt>
***************
*** 326,333 ****
  <?php
   }
!  if(is_readable("config/footers.php")) {
!    include_once("config/footers.php");
   } else {
!    include_once("../config/footers.php");
   }
  ?>
--- 327,334 ----
  <?php
   }
!  if(is_readable("style/footers.php")) {
!    include_once("style/footers.php");
   } else {
!    include_once("../style/footers.php");
   }
  ?>

Index: install.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/install.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** install.php	17 May 2005 01:55:58 -0000	1.24
--- install.php	26 May 2005 21:00:02 -0000	1.25
***************
*** 28,33 ****
  // Purpose: set up OpenFIRST modules
  
!   include("../config/globals.php");
!   include($header);
  
    ini_set("max_execution_time", 600); // Bypass problem of timeouts when many modules are installed
--- 28,33 ----
  // Purpose: set up OpenFIRST modules
  
!   include("../includes/globals.php");
!   include($Header);
  
    ini_set("max_execution_time", 600); // Bypass problem of timeouts when many modules are installed
***************
*** 61,65 ****
  <?php
  
! $files = glob("$fbasepath/*/openfirst.info.php");
  if (count($files) < 1) {
     ?>
--- 61,69 ----
  <?php
  
! $InstalledModules = $Modules;
! 
! $Modules = array();
! 
! $files = glob("$fBasePath/*/openfirst.info.php");
  if (count($files) < 1) {
     ?>
***************
*** 67,75 ****
     to download them.</p>
    <?php
!   die(include($footer));
  }
  
- $InstalledModules = $Modules;
- 
  # Get the meta data
  foreach ($files as $filename) {
--- 71,77 ----
     to download them.</p>
    <?php
!   die(include($Footer));
  }
  
  # Get the meta data
  foreach ($files as $filename) {
***************
*** 78,83 ****
  
  foreach($Modules as $code => $info) {
!   $dir = "$fbasepath/$code";
!   $sqlf = "$dir/setup/setup.$dbasetype";
    $WasInstalled = $IsInstalled = array_key_exists($code, $InstalledModules);
    $InstallFailed = false;
--- 80,85 ----
  
  foreach($Modules as $code => $info) {
!   $dir = "$fBasePath/$code";
!   $sqlf = "$dir/setup/setup.$DBaseType";
    $WasInstalled = $IsInstalled = array_key_exists($code, $InstalledModules);
    $InstallFailed = false;
***************
*** 114,116 ****
  }
  
!  include($footer); ?>
--- 116,118 ----
  }
  
!  include($Footer); ?>

Index: version.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/version.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** version.php	13 Mar 2005 20:45:39 -0000	1.9
--- version.php	26 May 2005 21:00:02 -0000	1.10
***************
*** 28,33 ****
  // Purpose: set up OpenFIRST modules
  
!   include("../config/globals.php");
!   include($header);
  
   if(isset($user->user) == true && $user->membertype == "administrator") {
--- 28,33 ----
  // Purpose: set up OpenFIRST modules
  
!   include("../includes/globals.php");
!   include($Header);
  
   if(isset($user->user) == true && $user->membertype == "administrator") {
***************
*** 67,94 ****
  <h1>Version Information</h1>
  
! <p>The version as displayed on your pages is <?php echo $title . " " . $version; ?></p>
  
  <table>
!  <tr><th>Status</th><th>File</th><th>Module</th><th>Description</th><th>Link</th></tr>
  <?php
! if(function_exists("glob")) {
!   foreach (rglob("..", "*") as $filename) {
!     if(is_file($filename) && ! is_link($filename)) {
!       $mod = str_replace("../", "", $filename);
!       $mod = substr($mod, 0, strpos($mod, "/", 2));
!       $fil = str_replace("../$mod/", "", $filename);
!       if(is_readable($filename) && function_exists("md5_file")) { 
!         @include(str_replace(" ", "%20", "http://update.openfirst.org/versions.php?showgood=f&md5=" . md5_file($filename) . "&module=$mod&file=$fil")); 
!       }
!       unset($filename);
!     }
!   }
! } else {
!   echo("<p>The version information requires the <strong>glob</strong> function, which your version
! of PHP does not have.  In the future there will be version for systems without
! <strong>glob</strong> functionality, but at the moment only a <strong>glob</strong>
! version is provided.</p>");
  }
  ?>
  </table>
  
--- 67,83 ----
  <h1>Version Information</h1>
  
! <p>The version as displayed on your pages is <?php echo htmlentities("$Title $Version"); ?></p>
  
  <table>
!  <thead>
!   <tr><th>Status</th><th>File</th><th>Module</th><th>Description</th><th>Link</th></tr>
!  </thead>
!  <tbody>
  <?php
! foreach($Modules as $code=>$info) {
!   @include('http://update.openfirst.org/versions.php?version=2&module='.urlencode($code).'&ver='.urlencode($info['ver'])); 
  }
  ?>
+  </tbody>
  </table>
  
***************
*** 97,99 ****
  }
  
!  include($footer); ?>
--- 86,88 ----
  }
  
!  include($Footer); ?>

Index: modules.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/modules.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** modules.php	1 Aug 2004 19:25:34 -0000	1.8
--- modules.php	26 May 2005 21:00:02 -0000	1.9
***************
*** 28,33 ****
  // Purpose: configure OpenFIRST modules, including their position on menus
  
!   include("../config/globals.php");
!   include($header);
  
    // Check if user is actually an admin
--- 28,33 ----
  // Purpose: configure OpenFIRST modules, including their position on menus
  
!   include("../includes/globals.php");
!   include($Header);
  
    // Check if user is actually an admin
***************
*** 54,58 ****
        // Successful creation response and die with footers.
        echo "<p>Module information has been updated, thank you. [ <a href='modules.php'>Modules</a> ]</p>";
!       die(include($footer));
  
      }
--- 54,58 ----
        // Successful creation response and die with footers.
        echo "<p>Module information has been updated, thank you. [ <a href='modules.php'>Modules</a> ]</p>";
!       die(include($Footer));
  
      }
***************
*** 100,102 ****
      showlogin();
    }
!   include($footer); ?>
--- 100,102 ----
      showlogin();
    }
!   include($Footer); ?>

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** index.php	7 Aug 2004 02:07:52 -0000	1.11
--- index.php	26 May 2005 21:00:02 -0000	1.12
***************
*** 28,33 ****
    // Purpose: Provide a control center for configuration activities.
  
!  include("./globals.php");
!  include($header);
   if(isset($user->user) == true && $user->membertype == "administrator") {
  ?>
--- 28,33 ----
    // Purpose: Provide a control center for configuration activities.
  
!  include("../includes/globals.php");
!  include($Header);
   if(isset($user->user) == true && $user->membertype == "administrator") {
  ?>
***************
*** 41,48 ****
  
  <?php
!   if(is_writable("./globals.php") && file_exists("./first.php")) {
!     echo("<p><strong>Warning: </strong> Your globals.php file is writable by the web user.  Also, first.php is still in existance.  After you have setup the openFIRST web portal system, it is safe to remove first.php.  Removing first.php prevents the accidental reset of configuration information and prevents external users from altering your configuration.  For maximal security, you should also change the filesystem permissions so that globals.php is not writable by the web user.");
!   } elseif(is_writable("./globals.php")) {
!     echo("<p><strong>Warning: </strong> Your globals.php file is writable by the web user.  For maximal security, you should change the filesystem permissions to correct this.</p>");
    }
  ?>
--- 41,48 ----
  
  <?php
!   if(is_writable("$fBasePath/includes/globals.php") && file_exists("$fBasePath/includes/first.php")) {
!     echo("<p><strong>Warning</strong>: Your globals.php file is writable by the web user.  Also, first.php is still in existance.  After you have setup the openFIRST web portal system, it is safe to remove first.php.  Removing first.php prevents the accidental reset of configuration information and prevents external users from altering your configuration.  For maximal security, you should also change the filesystem permissions so that globals.php is not writable by the web user.");
!   } elseif(is_writable("$fBasePath/includes/globals.php")) {
!     echo("<p><strong>Warning</strong>: Your globals.php file is writable by the web user.  For maximal security, you should change the filesystem permissions to correct this.</p>");
    }
  ?>
***************
*** 92,96 ****
     showlogin();
   }
!  include($footer);
  ?>
  </p>
--- 92,96 ----
     showlogin();
   }
!  include($Footer);
  ?>
  </p>

[Openfirst-cvscommit] base/includes compatibility.php,NONE,1.1 modules.php,NONE,1.1 auth.php,1.1,1.2 db_setup.php,1.1,1.2 dbase.php,1.1,1.2 globals.php,1.1,1.2 sitesettings.tpl,1.1,1.2

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

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

Modified Files:
	auth.php db_setup.php dbase.php globals.php sitesettings.tpl 
Added Files:
	compatibility.php modules.php 
Log Message:
radical changes, with more to come

Index: sitesettings.tpl
===================================================================
RCS file: /cvsroot/openfirst/base/includes/sitesettings.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sitesettings.tpl	25 May 2005 21:44:29 -0000	1.1
--- sitesettings.tpl	26 May 2005 21:00:03 -0000	1.2
***************
*** 8,35 ****
   *  database, in the ofirst_config table.
   */
!  $dbasetype = %DBTYPE%;
  
!  $encryption = %ENCRYPT%;
  
!  $title = %TITLE%;
!  $version = %VER%;
!  $sqlserver = %DBSERVER%;
!  $sqluser = %DBUSER%;
!  $sqlpassword = %DBPASS%;
!  $sqldatabase = %DBNAME%;
  
!  $sqlconnection = ofirst_dbconnect("$sqlserver","$sqluser","$sqlpassword");
!  ofirst_select_db($sqldatabase);
!  
!  $pass_save_disabled=%COOKIE%;
!  $regenabled=%REG%;
!  $home = %HOME%;
!  $header = %HEADER%;
!  $footer = %FOOTER%;
!  $mailnotify = %MASTERMAIL%;
!  $mailfrom = %BOTMAIL%;
!  $server = %SERVER%;
!  $basepath = %BASEPATH%;
!  $fbasepath = %FBASEPATH%;
   
  ?>
--- 8,36 ----
   *  database, in the ofirst_config table.
   */
!  $DBaseType = %DBTYPE%;
  
!  $Encryption = %ENCRYPT%;
  
!  $Title = %TITLE%;
!  $Version = %VER%;
!  $sqlServer = %DBSERVER%;
!  $sqlUser = %DBUSER%;
!  $sqlPassword = %DBPASS%;
!  $sqlDatabase = %DBNAME%;
  
!  $sqlConnection = ofirst_dbconnect($sqlServer, $sqlUser, $sqlPassword);
!  ofirst_select_db($sqlDatabase);
   
+  $PassSaveDisabled = %COOKIE%;
+  $regEnabled = %REG%;
+  $Server = %SERVER%;
+  $BasePath = %BASEPATH%;
+  $fBasePath = %FBASEPATH%;
+  $Home = %HOME%;
+  $StylePath = "$BasePath/style";
+  $fStylePath = "$fBasePath/style";
+  $Header = %HEADER%;
+  $Footer = %FOOTER%;
+  $MailNotify = %MASTERMAIL%;
+  $MailFrom = %BOTMAIL%;
  ?>

Index: auth.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/auth.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** auth.php	25 May 2005 21:44:29 -0000	1.1
--- auth.php	26 May 2005 21:00:03 -0000	1.2
***************
*** 87,92 ****
        echo "&nbsp;<br /><input type=checkbox name=savepass id=savepass value=1 checked /><label for=savepass>Save Password</label>";
      }
    echo "</td></tr>
!   <tr><td colspan='2'><a href=\"".$GLOBALS["basepath"]."/members/forgotten.php\">Forgot Password</a></td></tr>
  </table>";
    
--- 87,93 ----
        echo "&nbsp;<br /><input type=checkbox name=savepass id=savepass value=1 checked /><label for=savepass>Save Password</label>";
      }
+   global $BasePath;
    echo "</td></tr>
!   <tr><td colspan='2'><a href=\"".htmlentities($BasePath)."/members/forgotten.php\">Forgot Password</a></td></tr>
  </table>";
    
***************
*** 157,161 ****
            session_register("authcode");
            mt_srand(microtime() * 1000000);
!           $_SESSION["authcode"] = (microtime()|mt_rand(1,mt_getrandmax())).substr($_SERVER["REMOTE_HOST"],0,40);
            $aquery = ofirst_dbquery("UPDATE ofirst_members SET authcode='" . $_SESSION["authcode"] . "' WHERE user='" . $_POST["login"] . "';");
            if(!isset($pass_save_disabled)){
--- 158,162 ----
            session_register("authcode");
            mt_srand(microtime() * 1000000);
!           $_SESSION["authcode"] = (microtime()|mt_rand(1,mt_getrandmax())).$_SERVER['REMOTE_ADDR'];
            $aquery = ofirst_dbquery("UPDATE ofirst_members SET authcode='" . $_SESSION["authcode"] . "' WHERE user='" . $_POST["login"] . "';");
            if(!isset($pass_save_disabled)){

--- NEW FILE: compatibility.php ---
<?php
/*
 *  openFIRST.base - includes/compatibility.php
 *
 * Copyright (C) 2003,
 *  openFIRST Project
 *  Original Author: Jamie Bliss <ja...@op...>
 *
 * This program 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.
 *
 * This program 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.
 * This program 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 this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 *
 */

// Purpose: Provides functions and constants not available in certain versions of PHP.

if (!defined('PATH_SEPARATOR')) {
  switch ($ostype) {
  case osWINDOWS:
    define('PATH_SEPARATOR', ';');
    break;
  
  case osUNIX:
    define('PATH_SEPARATOR', ':');
    break;
  }
}
?>

Index: globals.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/globals.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** globals.php	25 May 2005 22:45:12 -0000	1.1
--- globals.php	26 May 2005 21:00:03 -0000	1.2
***************
*** 1,5 ****
  <?php
  /*
!  *  openFIRST.base - config/globals.php
   *
   * Copyright (C) 2003,
--- 1,5 ----
  <?php
  /*
!  *  openFIRST.base - includes/globals.php
   *
   * Copyright (C) 2003,
***************
*** 43,57 ****
  }
  
  if (substr(PHP_OS, 0, 3) == 'WIN') {
!   $ostype = 'windows';
  } else {
!   $ostype = 'unix';
  }
  
! if ($ostype == 'windows') {
!   set_include_path( get_include_path().";$configdir/;.");
! } else {
!   set_include_path( get_include_path().":$configdir/:.");
! }
  unset($configdir);
  
--- 43,60 ----
  }
  
+ define('osUNKNOWN', -1);
+ define('osUNIX', 0);
+ define('osWINDOWS', 1);
+ #Add more operating systems here
+ 
  if (substr(PHP_OS, 0, 3) == 'WIN') {
!   $osType = osWINDOWS;
  } else {
!   $osType = osUNIX;
  }
  
! require_once('compatibility.php');
! 
! set_include_path( get_include_path().PATH_SEPARATOR."$configdir/".PATH_SEPARATOR.".");
  unset($configdir);
  
***************
*** 61,64 ****
--- 64,71 ----
  require_once('sitesettings.php');
  
+ if (!isset($sqlTablePrefix)) {
+   $sqlTablePrefix = 'ofirst_';
+ }
+ 
  if(function_exists("ofirst_dbconnect") == false) {
    die("Your version of PHP has not been compiled with SQL support, therefore the openFIRST web portal system cannot run on this system.  Please contact your system administrator to request SQL support for your version of PHP.");
***************
*** 73,82 ****
  
  // Determine what module the user is viewing
!  $currentmodule = str_replace($basepath, '', $_SERVER['SCRIPT_NAME']);
   $currentmodule = substr($currentmodule, 1, strpos($currentmodule, '/', 2) - 1);
  
-  session_start();
   // Include the functions using glob();
!  foreach (glob("$fbasepath/config/functions/*.php") as $filename) {
     include_once($filename);
   }
--- 80,88 ----
  
  // Determine what module the user is viewing
!  $currentmodule = str_replace($BasePath, '', $_SERVER['SCRIPT_NAME']);
   $currentmodule = substr($currentmodule, 1, strpos($currentmodule, '/', 2) - 1);
  
   // Include the functions using glob();
!  foreach (glob("$fBasePath/includes/functions/*.php") as $filename) {
     include_once($filename);
   }
***************
*** 89,93 ****
   
   function AddModule($code, $name, $version, $includes, $adminnav, $modulenav, $active, $show) {
!    global $Modules;
     $Modules[$code] = array(
         'name'   => $name,
--- 95,99 ----
   
   function AddModule($code, $name, $version, $includes, $adminnav, $modulenav, $active, $show) {
!    global $Modules, $BasePath;
     $Modules[$code] = array(
         'name'   => $name,
***************
*** 96,99 ****
--- 102,107 ----
         'admin'  => $adminnav,
         'nav'    => $modulenav,
+ #       'admin'  => str_ireplace('$BasePath', $BasePath, $adminnav),
+ #       'nav'    => str_ireplace('$BasePath', $BasePath, $modulenav),
         'active' => (bool)$active,
         'show'   => (bool)$show
***************
*** 125,133 ****
              // Loop through the inclist and add them according to their paths
              foreach($inclist As $inc){
!               include_once("$fbasepath/$module->modulename/$inc");
              }
            } else {
              // If there is only 1 include available then use this line to include it instead
!             include_once("$fbasepath/$module->modulename/$module->includes");
            }
          }
--- 133,141 ----
              // Loop through the inclist and add them according to their paths
              foreach($inclist As $inc){
!               include_once("$fBasePath/$module->modulename/$inc");
              }
            } else {
              // If there is only 1 include available then use this line to include it instead
!             include_once("$fBasePath/$module->modulename/$module->includes");
            }
          }
***************
*** 137,150 ****
            // If it is the current module then color the item
            if ($currentmodule == $module->modulename){
!             $headers .= " &#187; <a class='menu selected' href='$basepath/$module->modulename'>".ucwords($module->modulename)."</a> |
  ";
  
              // Declare important variables so that headers can pick them up and preview them
  
!             $adminnav = str_replace("\$basepath", $basepath, $module->adminnavigation) . " <a href='http://bugzilla.openfirst.org'>Report Bug</a>";
!             $subnav = str_replace("\$basepath", $basepath, $module->modulenavigation);
  
            } else {
!             $headers .= " &#187; <a class='menu' href='$basepath/$module->modulename'>".ucwords($module->modulename)."</a> |
  ";
            }
--- 145,158 ----
            // If it is the current module then color the item
            if ($currentmodule == $module->modulename){
!             $headers .= " &#187; <a class='menu selected' href='$BasePath/$module->modulename'>".ucwords($module->modulename)."</a> |
  ";
  
              // Declare important variables so that headers can pick them up and preview them
  
!             $adminnav = str_ireplace('$BasePath', $BasePath, $module->adminnavigation) . " <a href='http://bugzilla.openfirst.org'>Report Bug</a>";
!             $subnav = str_ireplace('$BasePath', $BasePath, $module->modulenavigation);
  
            } else {
!             $headers .= " &#187; <a class='menu' href='$BasePath/$module->modulename'>".ucwords($module->modulename)."</a> |
  ";
            }

--- NEW FILE: modules.php ---
<?php
/*
 *  openFIRST.base - includes/mdoules.php
 *
 * Copyright (C) 2003,
 *  openFIRST Project
 *  Original Author: Jamie Bliss <ja...@op...>
 *
 * This program 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.
 *
 * This program 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 this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 *
 */
  // Purpose: Defines the Module class, which loads metadata about a module
  //          and handles installation/removal/upgrading

require_once('db_setup.php');

class Module {
  /*private*/ var $mName, $mCode, $mVersion, $mAuthor, $mMaintainer;
  /*private*/ var $mIncludes, $mNavBar, $mAdminBar, $mTables;
  
  // XML
  /*private*/ var $mxmlCurTag, $mRootElement;
  
  function Module($File) {
    $hXML = false;
    if (!($fp = @fopen($File, 'r'))) {
      return;
    }
    $hXML = xml_parser_create();
    xml_set_object($hXML, $this);
    xml_set_element_handler($hXML, 'startElement', 'endElement');
    xml_set_character_data_handler($hXML, 'characterData');
    
    xml_parse($hXML, $this->getModuleDTD(), false); #Add predefined entities
    
    while ($data = fread($fp, 1024)) {
      if (!xml_parse($hXML, $data, feof($fp))) {
        xml_parser_free($hXML);
        unset($hXML);
        return;
      }
    }
    
    xml_parser_free($hXML);
    unset($hXML);
  }
  
  /*** STATIC FUNCTIONS ***/
  
  /** Creates a Module object from a directory in the oF directory.
   */
  /*static*/ function createFromDir($Dir) {
    global $fBasePath;
    return new Module("$fBasePath/$Dir/openfirst.info.xml");
  }

  /** Creates a Module object from an absolute directory.
   */
  /*static*/ function createFromAbsDir($Dir) {
    return new Module("$Dir/openfirst.info.xml");
  }

  /** Creates a Module object from a specifc file.
   */
  /*static*/ function createFromFile($File) {
    return new Module($File);
  }
  
  /*** PRIVATE FUNCTIONS ***/
  /*private*/ function getModuleDTD() {
/*    global $BasePath, $StylePath;
    $xmlBasePath = str_replace(array('&',     '<',    '>',    '"',       '\''    ),
                               array('&amp;', '&lt;', '&gt;', '&quote;', '&apos;'),
                               $BasePath
                              );
    
    $xmlStylePath = str_replace(array('&',     '<',    '>',    '"',       '\''    ),
                                array('&amp;', '&lt;', '&gt;', '&quote;', '&apos;'),
                                $StylePath
                               );
    
    return "<!DOCTYPE module [
  <!ENTITY BasePath \"$xmlBasePath\">
  <!ENTITY StylePath \"$xmlStylePath\">
]>";*/
    return '<!DOCTYPE module [
  <!ENTITY BasePath "$BasePath">
  <!ENTITY StylePath "$StylePath">
]>';
  }
  
  /*** XML PARSER HOOKS ***/
  function startElement($parser, $name, $attrs) {
    if (isset($this->mxmlCurTag)) {
      $this->mxmlCurTag =& $this->mxmlCurTag->addElement($name, $attrs);
      $this->mRootElement =& $this->mxmlCurTag;
    } else {
      $ClassName = $xmlClassNames[''];
      $this->mxmlCurTag =& new xmlElement($name, $attrs, $this);
    }
  }
  
  function endElement($parser, $name) {
    $this->mxmlCurTag =& $this->mxmlCurTag->getParent();
  }
  
  function characterData($parser, $data) {
    $this->mxmlCurTag =& $this->mxmlCurTag->addCData($data);
  }
}

class xmlElement {
  var $Name, $Attributes, $Contents, $parent;
  
  /*public*/ function Element($Name, $Attributes, &$ParentElement=null) {
    $this->Name = $Name;
    $this->Attributes = $Attributes;
    $this->Contents = array();
    $this->parent =& $ParentElement;
  }
  
  /*public*/ function addCData($Text) {
    return $this->Contents[] = $Text;
  }
  
  /*public*/ function &addElement($Name, $Attrs) {
    global $xmlClassNames;                                            	
    $ClassName = $xmlClassNames['Element'];
    return $this->Contents[] =& new $ClassName($Name, $Attrs, &$this);
  }
  
  /*public*/ function &getParent() {
    return $this->parent;
  }
}

?>

Index: dbase.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/dbase.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dbase.php	25 May 2005 21:44:29 -0000	1.1
--- dbase.php	26 May 2005 21:00:03 -0000	1.2
***************
*** 1,5 ****
  <?php
  /*
!  *  openFIRST.base - config/dbase.php
   *
   * Copyright (C) 2003,
--- 1,5 ----
  <?php
  /*
!  *  openFIRST.base - includes/dbase.php
   *
   * Copyright (C) 2003,
***************
*** 27,31 ****
    //          different versions.
    $lastquery = '';
!   if(isset($dbasetype) == false) { $dbasetype = "mysql"; }
  
  
--- 27,31 ----
    //          different versions.
    $lastquery = '';
!   if(isset($DBaseType) == false) { $DBaseType = "mysql"; }
  
  
***************
*** 41,46 ****
    function ofirst_dbconnect($server = "", $username = "", $password = "",
                              $newlink = "", $intclientflags = "") {
!     global $dbasetype, $connectdsn;
!     if($dbasetype == "mysql") {
        if(function_exists("mysql_connect") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
--- 41,46 ----
    function ofirst_dbconnect($server = "", $username = "", $password = "",
                              $newlink = "", $intclientflags = "") {
!     global $DBaseType, $connectdsn;
!     if($DBaseType == "mysql") {
        if(function_exists("mysql_connect") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
***************
*** 53,62 ****
          return(mysql_connect($server, $username, $password));
        }
!     } elseif ($dbasetype == "mssql") {
        if(function_exists("mssql_connect") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
        return(mssql_connect($server, $username, $password));
!     } elseif ($dbasetype == "odbc") {
        if(function_exists("odbc_connect") == false) {
          die("ODBC support is not available in your version of PHP.  To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
--- 53,62 ----
          return(mysql_connect($server, $username, $password));
        }
!     } elseif ($DBaseType == "mssql") {
        if(function_exists("mssql_connect") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
        return(mssql_connect($server, $username, $password));
!     } elseif ($DBaseType == "odbc") {
        if(function_exists("odbc_connect") == false) {
          die("ODBC support is not available in your version of PHP.  To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
***************
*** 72,77 ****
  
    function ofirst_select_db($databasename, $linkidentifier = "") {
!     global $dbasetype, $connectdsn;
!     if($dbasetype == "mysql") {
        if(function_exists("mysql_select_db") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
--- 72,77 ----
  
    function ofirst_select_db($databasename, $linkidentifier = "") {
!     global $DBaseType, $connectdsn;
!     if($DBaseType == "mysql") {
        if(function_exists("mysql_select_db") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
***************
*** 82,86 ****
          return(mysql_select_db($databasename));
        }
!     } elseif ($dbasetype == "mssql") {
        if(function_exists("mssql_select_db") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
--- 82,86 ----
          return(mysql_select_db($databasename));
        }
!     } elseif ($DBaseType == "mssql") {
        if(function_exists("mssql_select_db") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
***************
*** 97,102 ****
  
    function ofirst_dberrno($linkidentifier = "") {
!     global $dbasetype;
!     if($dbasetype == "mysql") {
        if(function_exists("mysql_errno") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
--- 97,102 ----
  
    function ofirst_dberrno($linkidentifier = "") {
!     global $DBaseType;
!     if($DBaseType == "mysql") {
        if(function_exists("mysql_errno") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
***************
*** 107,116 ****
          return(mysql_errno());
        }
!     } elseif ($dbasetype == "mssql") {
        if(function_exists("mssql_connect") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
        return(0);
!     } elseif ($dbasetype == "odbc") {
        if(function_exists("odbc_error") == false) {
          die("ODBC support is not enabled in your version of PHP.  To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
--- 107,116 ----
          return(mysql_errno());
        }
!     } elseif ($DBaseType == "mssql") {
        if(function_exists("mssql_connect") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
        return(0);
!     } elseif ($DBaseType == "odbc") {
        if(function_exists("odbc_error") == false) {
          die("ODBC support is not enabled in your version of PHP.  To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
***************
*** 126,131 ****
  
    function ofirst_dberror($linkidentifier = "") {
!     global $dbasetype;
!     if($dbasetype == "mysql") {
        if(function_exists("mysql_error") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
--- 126,131 ----
  
    function ofirst_dberror($linkidentifier = "") {
!     global $DBaseType;
!     if($DBaseType == "mysql") {
        if(function_exists("mysql_error") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
***************
*** 136,145 ****
          return(mysql_error());
        }
!     } elseif ($dbasetype == "mssql") {
        if(function_exists("mssql_connect") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
        return(0);
!     } elseif ($dbasetype == "odbc") {
        if(function_exists("odbc_errormsg") == false) {
          die("ODBC support is not available in your version of PHP.  To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
--- 136,145 ----
          return(mysql_error());
        }
!     } elseif ($DBaseType == "mssql") {
        if(function_exists("mssql_connect") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
        return(0);
!     } elseif ($DBaseType == "odbc") {
        if(function_exists("odbc_errormsg") == false) {
          die("ODBC support is not available in your version of PHP.  To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
***************
*** 155,162 ****
  
    function ofirst_dbquery($string, $linkidentifier = "", $batchsize = "") {
!     global $dbasetype, $sqlconnection, $lastquery;
      
      $lastquery = "\$string = \"$string\", \$linkidentifier = \"$linkidentifier\", \$batchsize = \"$batchsize\"";
!     if($dbasetype == "mysql") {
        if(function_exists("mysql_query") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
--- 155,162 ----
  
    function ofirst_dbquery($string, $linkidentifier = "", $batchsize = "") {
!     global $DBaseType, $sqlconnection, $lastquery;
      
      $lastquery = "\$string = \"$string\", \$linkidentifier = \"$linkidentifier\", \$batchsize = \"$batchsize\"";
!     if($DBaseType == "mysql") {
        if(function_exists("mysql_query") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
***************
*** 167,171 ****
          return(mysql_query($string));
        }
!     } elseif($dbasetype == "mssql") {
        if(function_exists("mssql_query") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
--- 167,171 ----
          return(mysql_query($string));
        }
!     } elseif($DBaseType == "mssql") {
        if(function_exists("mssql_query") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
***************
*** 178,182 ****
          return(mssql_query($string));
        }
!     } elseif ($dbasetype == "odbc") {
        if(function_exists("odbc_exec") == false) {
          die("ODBC support is not available in your version of PHP.  To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
--- 178,182 ----
          return(mssql_query($string));
        }
!     } elseif ($DBaseType == "odbc") {
        if(function_exists("odbc_exec") == false) {
          die("ODBC support is not available in your version of PHP.  To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
***************
*** 189,204 ****
  
    function ofirst_dbfetch_object($resource, $rownumber = "") {
!     global $dbasetype;
!     if($dbasetype == "mysql") {
        if(function_exists("mysql_fetch_object") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
        }
        return(mysql_fetch_object($resource));
!     } elseif($dbasetype == "mssql") {
        if(function_exists("mssql_fetch_object") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
        return(mssql_fetch_object($resource));
!     } elseif($dbasetype == "odbc") {
        if(function_exists("odbc_fetch_object") == false) {
          die("ODBC support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
--- 189,204 ----
  
    function ofirst_dbfetch_object($resource, $rownumber = "") {
!     global $DBaseType;
!     if($DBaseType == "mysql") {
        if(function_exists("mysql_fetch_object") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
        }
        return(mysql_fetch_object($resource));
!     } elseif($DBaseType == "mssql") {
        if(function_exists("mssql_fetch_object") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
        }
        return(mssql_fetch_object($resource));
!     } elseif($DBaseType == "odbc") {
        if(function_exists("odbc_fetch_object") == false) {
          die("ODBC support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
***************
*** 216,221 ****
  
    function ofirst_dbnum_rows($resource) {
!     global $dbasetype;
!     if($dbasetype == "mysql") {
        if(function_exists("mysql_num_rows") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
--- 216,221 ----
  
    function ofirst_dbnum_rows($resource) {
!     global $DBaseType;
!     if($DBaseType == "mysql") {
        if(function_exists("mysql_num_rows") == false) {
          die("MySQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable MySQL support, or choose another database type."); 
***************
*** 223,227 ****
        if (!is_resource($resource)) return -1;
        return(mysql_num_rows($resource));
!     } elseif($dbasetype == "mssql") {
        if(function_exists("mssql_num_rows") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
--- 223,227 ----
        if (!is_resource($resource)) return -1;
        return(mysql_num_rows($resource));
!     } elseif($DBaseType == "mssql") {
        if(function_exists("mssql_num_rows") == false) {
          die("Microsoft SQL support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable Microsoft SQL support, or choose another database type."); 
***************
*** 229,233 ****
        if (!is_resource($resource)) return -1;
        return(mssql_num_rows($resource));
!     } elseif($dbasetype == "odbc") {
        if(function_exists("odbc_num_rows") == false) {
          die("ODBC support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
--- 229,233 ----
        if (!is_resource($resource)) return -1;
        return(mssql_num_rows($resource));
!     } elseif($DBaseType == "odbc") {
        if(function_exists("odbc_num_rows") == false) {
          die("ODBC support is not available in your version of PHP. To use the openFIRST Web Portal Software, please either enable ODBC support, or choose another database type.");
***************
*** 244,255 ****
    
    function ofirst_dbname_version() {
!     global $dbasetype;
!     if($dbasetype == "mysql") { 
        $v = ofirst_dbfetch_object(ofirst_dbquery("SELECT VERSION() AS mysql_version"));
        return "MySQL $v->mysql_version";
!     } elseif($dbasetype == "mssql") {
        $v = ofirst_dbquery("SELECT @@VERSION");
        return "Microsoft SQL Server $v <br><strong>Warning:</strong> unconfirmed";
!     } elseif($dbasetype == "odbc") {
        return "ODBC";
      } else {
--- 244,255 ----
    
    function ofirst_dbname_version() {
!     global $DBaseType;
!     if($DBaseType == "mysql") { 
        $v = ofirst_dbfetch_object(ofirst_dbquery("SELECT VERSION() AS mysql_version"));
        return "MySQL $v->mysql_version";
!     } elseif($DBaseType == "mssql") {
        $v = ofirst_dbquery("SELECT @@VERSION");
        return "Microsoft SQL Server $v <br><strong>Warning:</strong> unconfirmed";
!     } elseif($DBaseType == "odbc") {
        return "ODBC";
      } else {
***************
*** 259,271 ****
  
    function ofirst_dbsize() {
!     global $dbasetype, $sqldatabase;
!     if($dbasetype == "mysql") { 
        $dbsize = 0;
!       $dq = ofirst_dbquery("SHOW TABLE STATUS FROM $sqldatabase");
        while($d = ofirst_dbfetch_object($dq)) {
          $dbsize += $d->Data_length + $d->Index_length;
        }
        return (int) (($dbsize + 0.5) / 1024 * 10) / 10 . " KB";
!     } elseif($dbasetype == "mssql") {
        $s = ofirst_dbfetch_object(ofirst_dbquery("SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize FROM sysfiles"));
        return (int) (( $s->dbsize + 0.5) / 1024 * 10) / 10 . " KB";
--- 259,271 ----
  
    function ofirst_dbsize() {
!     global $DBaseType, $sqlDatabase;
!     if($DBaseType == "mysql") { 
        $dbsize = 0;
!       $dq = ofirst_dbquery("SHOW TABLE STATUS FROM $sqlDatabase");
        while($d = ofirst_dbfetch_object($dq)) {
          $dbsize += $d->Data_length + $d->Index_length;
        }
        return (int) (($dbsize + 0.5) / 1024 * 10) / 10 . " KB";
!     } elseif($DBaseType == "mssql") {
        $s = ofirst_dbfetch_object(ofirst_dbquery("SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize FROM sysfiles"));
        return (int) (( $s->dbsize + 0.5) / 1024 * 10) / 10 . " KB";
***************
*** 278,285 ****
    function ofirst_dbcheck($linkidentifier = "") {
      #TODO: Write me!
!     global $dbasetype;
!     if($dbasetype == "mysql") {
!     } elseif($dbasetype == "mssql") {
!     } elseif($dbasetype == "odbc") {
      }
      exit(0);
--- 278,285 ----
    function ofirst_dbcheck($linkidentifier = "") {
      #TODO: Write me!
!     global $DBaseType;
!     if($DBaseType == "mysql") {
!     } elseif($DBaseType == "mssql") {
!     } elseif($DBaseType == "odbc") {
      }
      exit(0);
***************
*** 366,371 ****
    
    function ofirst_dbescape($text) {
!     global $dbasetype;
!     if($dbasetype == "mysql") {
        return mysql_real_escape_string($text);
      # MS SQL and ODBC don't have specific escaping functions.
--- 366,371 ----
    
    function ofirst_dbescape($text) {
!     global $DBaseType;
!     if($DBaseType == "mysql") {
        return mysql_real_escape_string($text);
      # MS SQL and ODBC don't have specific escaping functions.
***************
*** 377,388 ****
    }
  
!   #Used for quoting field, table, and DB names
    function ofirst_dbquote_name($name) {
!     return '`'.ofirst_dbescape($name).'`';
    }
    
    #Used for quoting data
    function ofirst_dbquote_data($data) {
!     return "'".ofirst_dbescape($data)."'";
    }
  ?>
--- 377,441 ----
    }
  
!   /** SQL escaping and quoting.
!    * These functions escape various kinds of literals.
!    * If an array is passed, it is assumed to be a list 
!    * of things to be passed and is merged.
!    */
!   
!   #Used for quoting field and DB names
    function ofirst_dbquote_name($name) {
!     if (is_array($name)) {
!       $value = '';
!       foreach ($name as $text) {
!         $value .= ofirst_dbquote_name($text).',';
!       }
!       $value = substr($text, 0, -1);
!       return $value;
!     } else {
!       return '`'.ofirst_dbescape($name).'`';
!     }
!   }
!   
!   #Used for quoting table names. Includes table prefix.
!   function ofirst_dbquote_table($name) {
!     global $sqlTablePrefix;
!     if (is_array($name)) {
!       $value = '';
!       foreach ($name as $text) {
!         $value .= ofirst_dbquote_table($text).',';
!       }
!       $value = substr($text, 0, -1);
!       return $value;
!     } else {
!       return ofirst_dbquote_name("$sqlTablePrefix$name");
!     }
    }
    
    #Used for quoting data
    function ofirst_dbquote_data($data) {
!     if (is_array($name)) {
!       $value = '';
!       foreach ($name as $text) {
!         $value .= ofirst_dbquote_data($text).',';
!       }
!       $value = substr($text, 0, -1);
!       return $value;
!     } else {
!       return "'".ofirst_dbescape($data)."'";
!   }
!   
!   #Used to quote field-data pairs in the form of `field`='data'
!   #passed like:
!   #  array( 'field' => 'data' )
!   function ofirst_dbquote_fd_pairs($pairs) {
!     $value = '';
!     foreach ($pairs as $field => $data) {
!       $value .= ofirst_dbquote_name($field);
!       $value .= '=';
!       $value .= ofirst_dbquote_data($data);
!       $value .= ',';
!     }
!     $value = substr($text, 0, -1);
!     return $value;
    }
  ?>

Index: db_setup.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/db_setup.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** db_setup.php	25 May 2005 21:44:29 -0000	1.1
--- db_setup.php	26 May 2005 21:00:03 -0000	1.2
***************
*** 26,90 ****
  require_once('dbase.php');
  
- /** An array of valid SQL types
-  * This won't be used for checking
-  */
- $sqlValidTypes = array(
- /* After each type, there may be a list of options:
-  *  length - can have the form TYPE(###)
-  *  need length - must have the form TYPE(###)
-  *  length&digits - can have the form TYPE(###, ###)
-  *  length&bits - can have the form TYPE(###, ###)
-  *  length or digits - can have the form TYPE(###) or TYPE(###, ###)
-  * 
-  * Any options not in this list refer to literal attributes
-  */
- # These are from phpMyAdmin
- 'VARCHAR', #need length, national, binary
- 'TINYINT', #length, unsigned, zerofill
- 'TEXT', #length
- 'DATE',
- 'SMALLINT', #length, unsigned, zerofill
- 'MEDIUMINT', #length, unsigned, zerofill
- 
- 'INT', #length, unsigned, zerofill
- 'BIGINT', #length, unsigned, zerofill
- 'FLOAT', #need length, unsigned, zerofill OR
-          #length&digits, unsigned, zerofill
- 'DOUBLE', #length&bits, unsigned, zerofill
- 'DECIMAL', #length or digits, unsigned, zerofill
- 'DATETIME',
- 
- 'TIMESTAMP', #length(14,12,8,6)
- 'TIME',
- 'YEAR', #length(2,4)
- 'CHAR', #need length, national, binary, ascii, unicode OR
-         #(none)
- 'TINYBLOB',
- 'TINYTEXT',
- 
- 'BLOB', #length
- 'MEDIUMBLOB',
- 'MEDIUMTEXT',
- 'LONGBLOB',
- 'LONGTEXT',
- 'ENUM',#list of values
- 
- 'SET',#list of values
- 
- # These are additional types from the MySQL manual
- 'BIT', #length
- 'BOOL',
- 'BOOLEAN',
- 'INTEGER', #length, unsigned, zerofill
- 'DOUBLE PRECISION', #length&digits, unsigned, zerofill
- 'REAL', #length&digits, unsigned, zerofill
- 'DEC', #length or digits, unsigned, zerofill
- 'NUMERIC', #length or digits, unsigned, zerofill
- 'FIXED', #length or digits, unsigned, zerofill
- 'DATE',
- 'BINARY', #need length
- 'VARBINARY', #need length
- );
- 
  /** Gets an array of tables.
   * Uses the current DB connection. The key is the name, the content
--- 26,29 ----
***************
*** 97,101 ****
  /** The class representing a table.
   * This is a wrapper for a SQL table. It allows access to fields,
!  * keys, etc. Note that it does not handle records, just structure.
   */
  class Table {
--- 36,40 ----
  /** The class representing a table.
   * This is a wrapper for a SQL table. It allows access to fields,
!  * keys, etc. THIS SHOULD NOT BE USED FOR QUERIES!
   */
  class Table {
***************
*** 138,141 ****
--- 77,87 ----
  }
  
+ /**
+  * Only stores meta-data about a table. Does not
+  * manipulate it.
+  */
+ class liteTable {
+ }
+ 
  /*** SQL Statements ***/
  /*

[Openfirst-cvscommit] base index.php,1.10,1.11

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

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

Modified Files:
	index.php 
Log Message:
radical changes, with more to come

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/base/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** index.php	25 May 2005 20:21:52 -0000	1.10
--- index.php	26 May 2005 21:00:03 -0000	1.11
***************
*** 29,34 ****
   // Purpose: provide a basic starting point for the OpenFIRST web portal.
  
!  include("config/globals.php");
!  include($header);
  
   $count = 0;
--- 29,34 ----
   // Purpose: provide a basic starting point for the OpenFIRST web portal.
  
!  include("includes/globals.php");
!  include($Header);
  
   $count = 0;
***************
*** 44,48 ****
  
   echo("<tr valign=top>");
!  echo("<th>Welcome to $title Web Site!</th>");
   echo("<td rowspan=3 valign=top>");
  
--- 44,48 ----
  
   echo("<tr valign=top>");
!  echo("<th>Welcome to $Title Web Site!</th>");
   echo("<td rowspan=3 valign=top>");
  
***************
*** 60,64 ****
     $qu = ofirst_dbquery("SELECT guest, date FROM ofirst_guestbook ORDER BY guest LIMIT 5;");
     if(ofirst_dbnum_rows($qu)!=0){
!      echo("<table width=200><tr><th>Guestbook</th></tr><tr><td><div>Last records in our <a href=\"$basepath/guestbook\">guestbook</a>: </div>");
       while($q = ofirst_dbfetch_object($qu)) {
         echo("<sub><strong><a href='/guestbook/' target='_content'>$q->guest</a></strong><br />$q->date</sub><br />");
--- 60,64 ----
     $qu = ofirst_dbquery("SELECT guest, date FROM ofirst_guestbook ORDER BY guest LIMIT 5;");
     if(ofirst_dbnum_rows($qu)!=0){
!      echo("<table width=200><tr><th>Guestbook</th></tr><tr><td><div>Last records in our <a href=\"$BasePath/guestbook\">guestbook</a>: </div>");
       while($q = ofirst_dbfetch_object($qu)) {
         echo("<sub><strong><a href='/guestbook/' target='_content'>$q->guest</a></strong><br />$q->date</sub><br />");
***************
*** 70,76 ****
    $qu = ofirst_dbquery("SELECT AwardName FROM ofirst_awards;");
    if(ofirst_dbnum_rows($qu)!=0){
!     echo("<table width=200><tr><th>Awards</th></tr><tr><td><div>Our team has received the following <a href=\"$basepath/awards\">awards</a>: </div>");
      while($q = ofirst_dbfetch_object($qu)) {
!       echo("<sub><a href='$basepath/awards' target='_content'>$q->AwardName</a></sub><br />");
      }
      echo("</td></tr></table><br />");
--- 70,76 ----
    $qu = ofirst_dbquery("SELECT AwardName FROM ofirst_awards;");
    if(ofirst_dbnum_rows($qu)!=0){
!     echo("<table width=200><tr><th>Awards</th></tr><tr><td><div>Our team has received the following <a href=\"$BasePath/awards\">awards</a>: </div>");
      while($q = ofirst_dbfetch_object($qu)) {
!       echo("<sub><a href='$BasePath/awards' target='_content'>$q->AwardName</a></sub><br />");
      }
      echo("</td></tr></table><br />");
***************
*** 90,94 ****
         #&& $info['show']
        ) {
!      echo '<li><a href="'.htmlentities("$basepath/$code").'">'.htmlentities($info['name']).'</a></li>
  ';
     }
--- 90,94 ----
         #&& $info['show']
        ) {
!      echo '<li><a href="'.htmlentities("$BasePath/$code").'">'.htmlentities($info['name']).'</a></li>
  ';
     }
***************
*** 98,102 ****
   echo '</td></tr></table><br />';
   if(function_exists("get_visitors")) {
!    echo("<table width=200><tr><th>Stats</th></tr><tr><td><div>Website <a href=\"$basepath/logger/stats.php\">usage statistics</a>: </div>");
     echo("<sub><strong>".get_totalpages()." pages served to ".get_visitors()." visitors</strong></sub>");
     echo("</td></tr></table><br />");
--- 98,102 ----
   echo '</td></tr></table><br />';
   if(function_exists("get_visitors")) {
!    echo("<table width=200><tr><th>Stats</th></tr><tr><td><div>Website <a href=\"$BasePath/logger/stats.php\">usage statistics</a>: </div>");
     echo("<sub><strong>".get_totalpages()." pages served to ".get_visitors()." visitors</strong></sub>");
     echo("</td></tr></table><br />");
***************
*** 114,122 ****
     //are there more news?
     if(ofirst_dbnum_rows(ofirst_dbquery("SELECT * FROM ofirst_news"))>5){
!      echo("<div align=right>[ <b><a href=\"$basepath/news/index.php?show=all\">More News</a></b> ]</div>");
     }
   }
   echo(" &nbsp;</td></tr></table>");
  
!  include($footer);
  ?>
--- 114,122 ----
     //are there more news?
     if(ofirst_dbnum_rows(ofirst_dbquery("SELECT * FROM ofirst_news"))>5){
!      echo("<div class=\"right\">[ <b><a href=\"$BasePath/news/index.php?show=all\">More News</a></b> ]</div>");
     }
   }
   echo(" &nbsp;</td></tr></table>");
  
!  include($Footer);
  ?>

[Openfirst-cvscommit] base/style headers.php,1.1,1.2 style.css,1.1,1.2

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

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

Modified Files:
	headers.php style.css 
Log Message:
radical changes, with more to come

Index: style.css
===================================================================
RCS file: /cvsroot/openfirst/base/style/style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** style.css	25 May 2005 21:44:38 -0000	1.1
--- style.css	26 May 2005 21:00:03 -0000	1.2
***************
*** 80,84 ****
  #topmenu, caption {
    text-align: left;
!   background-image: url(../images/back.gif);
    color: #cecece;
    font-size: 12px;
--- 80,84 ----
  #topmenu, caption {
    text-align: left;
!   background-image: url(images/back.gif);
    color: #cecece;
    font-size: 12px;
***************
*** 199,203 ****
    background-color: #999999;
    color: #333333;
!   background-image: url(../images/back-light.gif);
  }
  
--- 199,203 ----
    background-color: #999999;
    color: #333333;
!   background-image: url(images/back-light.gif);
  }
  
***************
*** 205,209 ****
    background-color: #999999;
    color: #333333;
!   background-image: url(../images/back-lighter.gif);
  }
  
--- 205,209 ----
    background-color: #999999;
    color: #333333;
!   background-image: url(images/back-lighter.gif);
  }
  
***************
*** 271,275 ****
  
  #copyright {
!   background=image: url(../images/back-light.gif);
  }
  
--- 271,275 ----
  
  #copyright {
!   background=image: url(images/back-light.gif);
  }
  

Index: headers.php
===================================================================
RCS file: /cvsroot/openfirst/base/style/headers.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** headers.php	25 May 2005 21:44:38 -0000	1.1
--- headers.php	26 May 2005 21:00:03 -0000	1.2
***************
*** 4,12 ****
    $title = "openFIRST Team";
  }
! ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
!         "http://www.w3.org/TR/html4/loose.dtd">
  <html>
   <head>
!   <title><?php echo htmlentities($title); ?></title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
    <meta http-equiv="Content-Language" content="en-CA" />
--- 4,11 ----
    $title = "openFIRST Team";
  }
! ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
   <head>
!   <title><?php echo htmlentities($Title); ?></title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
    <meta http-equiv="Content-Language" content="en-CA" />
***************
*** 14,18 ****
    <meta name="author" content="OpenFIRST - http://openfirst.sf.net" />
    <meta name="generator" content="OpenFIRST - http://openfirst.sf.net" />
!   <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($basepath); ?>/config/style.css">
   </head>
    <body>
--- 13,17 ----
    <meta name="author" content="OpenFIRST - http://openfirst.sf.net" />
    <meta name="generator" content="OpenFIRST - http://openfirst.sf.net" />
!   <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($StylePath); ?>/style.css">
   </head>
    <body>
***************
*** 21,25 ****
    <tr id="toplogo">
      <td>
!      <img src="<?php echo htmlentities($basepath); ?>/images/openfirst.png" alt="openFIRST Portal System" />
      </td>
    </tr>
--- 20,24 ----
    <tr id="toplogo">
      <td>
!      <img src="<?php echo htmlentities($BasePath); ?>/style/images/openfirst.png" alt="openFIRST Portal System" />
      </td>
    </tr>
***************
*** 28,32 ****
        <?php
            if(ISSET($headers)){
!           echo("&#187; <a accesskey='h' href='$home'><u>H</u>ome</a> | " . $headers);
                }else{
          ?>
--- 27,31 ----
        <?php
            if(ISSET($headers)){
!           echo("&#187; <a accesskey='h' href='$Home'><u>H</u>ome</a> | " . $headers);
                }else{
          ?>
***************
*** 44,48 ****
    </tr>
    <tr>
!     <td class="nav2" style="background-image: url('<?php echo htmlentities($basepath); ?>/images/back-light.gif'); ">
        <table width="100%" border="0" cellspacing="0"
            cellpadding="0">
--- 43,47 ----
    </tr>
    <tr>
!     <td class="nav2" style="background-image: url('<?php echo htmlentities($StylePath); ?>/images/back-light.gif'); ">
        <table width="100%" border="0" cellspacing="0"
            cellpadding="0">
***************
*** 71,75 ****
      echo $usersonline;
    } else {
!     echo "Welcome to the <b>$title</b> website!";
    }
  
--- 70,74 ----
      echo $usersonline;
    } else {
!     echo "Welcome to the <b>$Title</b> website!";
    }
  
***************
*** 81,90 ****
  <?php
  
!   if (isset($user->user)){
      if(isset($adminnav) && (strcasecmp($user->membertype, 'administrator') == 0)) {
  
  ?>
    <tr>
!     <td id="adminmenu" background="<?php echo("$basepath/images/"); ?>back-admin.png"><b>Admin Options -</b>
            <?php
        // Print admin navigation bar
--- 80,89 ----
  <?php
  
!   if (isset($user) && isset($user->user)){
      if(isset($adminnav) && (strcasecmp($user->membertype, 'administrator') == 0)) {
  
  ?>
    <tr>
!     <td id="adminmenu" background="<?php echo($StylePath); ?>/images/back-admin.png"><b>Admin Options -</b>
            <?php
        // Print admin navigation bar

[Openfirst-cvscommit] base/includes globals.php,NONE,1.1

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

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

Added Files:
	globals.php 
Log Message:
wrong directory

--- NEW FILE: globals.php ---
<?php
/*
 *  openFIRST.base - config/globals.php
 *
 * Copyright (C) 2003,
 *  openFIRST Project
 *  Original Author: Tim Ginn <tim...@po...>
 *
 * This program 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.
 *
 * This program 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.
 * This program 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 this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 *
 */

// Purpose: Initialize the openFIRST system.

$configdir = dirname(__FILE__);
if( !file_exists( "$configdir/sitesettings.php" ) ) {
  $path = "#";
  if(file_exists("../config/first.php")) {
    $path = "../config/first.php";
  } elseif(file_exists("config/first.php")) {
    $path = "config/first.php";
  } elseif(file_exists("../../config/first.php")) {
    $path = "../../config/first.php";
  }
  $path = htmlentities($path);
  die( "You'll have to <a href=\"$path\">set openFIRST up</a> first!" );
}

if (substr(PHP_OS, 0, 3) == 'WIN') {
  $ostype = 'windows';
} else {
  $ostype = 'unix';
}

if ($ostype == 'windows') {
  set_include_path( get_include_path().";$configdir/;.");
} else {
  set_include_path( get_include_path().":$configdir/:.");
}
unset($configdir);

require_once('dbase.php');
require_once('auth.php');

require_once('sitesettings.php');

if(function_exists("ofirst_dbconnect") == false) {
  die("Your version of PHP has not been compiled with SQL support, therefore the openFIRST web portal system cannot run on this system.  Please contact your system administrator to request SQL support for your version of PHP.");
}

// We use glob enough, that we should either write a substitute, or just refuse to work
if(!function_exists('glob')) {
  die('You really should upgrade PHP, seeing as you don&apos;t even have <a href="http://us2.php.net/manual/en/function.glob.php"><code>glob()</code></a>.');
}

InitUser();

// Determine what module the user is viewing
 $currentmodule = str_replace($basepath, '', $_SERVER['SCRIPT_NAME']);
 $currentmodule = substr($currentmodule, 1, strpos($currentmodule, '/', 2) - 1);

 session_start();
 // Include the functions using glob();
 foreach (glob("$fbasepath/config/functions/*.php") as $filename) {
   include_once($filename);
 }

 $headers = '';

 $incl = ofirst_dbquery('SELECT * FROM ofirst_config');
 
 $Modules = array();
 
 function AddModule($code, $name, $version, $includes, $adminnav, $modulenav, $active, $show) {
   global $Modules;
   $Modules[$code] = array(
       'name'   => $name,
       'ver'    => $version,
       'inc'    => $includes,
       'admin'  => $adminnav,
       'nav'    => $modulenav,
       'active' => (bool)$active,
       'show'   => (bool)$show
     );
 }

 // If there is no error then run the module add feature
 if(ofirst_dberrno() == 0) {
              // Begin to loop through modules from the databaes
   while($module = ofirst_dbfetch_object($incl)) {
     AddModule($module->modulename,
               $module->label,
               $module->version,
               explode(',', $module->includes),
               $module->adminnavigation,
               $module->modulenavigation, 
               $module->active,
               $module->showonmenu
              );
     // Check if the value is try, if it is then run an include
     if($module->active == true) {
       // Check if there are includes that need to be included
       if(!( $module->includes == '')){
         // If the list is not empty then explode the value and put it into inclist
         $inclist = explode(',',$module->includes);
         // This is to remove an error that you have if you don't check if there are more then 2
         if(count($inclist) >= 2){

            // Loop through the inclist and add them according to their paths
            foreach($inclist As $inc){
              include_once("$fbasepath/$module->modulename/$inc");
            }
          } else {
            // If there is only 1 include available then use this line to include it instead
            include_once("$fbasepath/$module->modulename/$module->includes");
          }
        }

        // 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 ($currentmodule == $module->modulename){
            $headers .= " &#187; <a class='menu selected' href='$basepath/$module->modulename'>".ucwords($module->modulename)."</a> |
";

            // Declare important variables so that headers can pick them up and preview them

            $adminnav = str_replace("\$basepath", $basepath, $module->adminnavigation) . " <a href='http://bugzilla.openfirst.org'>Report Bug</a>";
            $subnav = str_replace("\$basepath", $basepath, $module->modulenavigation);

          } else {
            $headers .= " &#187; <a class='menu' href='$basepath/$module->modulename'>".ucwords($module->modulename)."</a> |
";
          }
        }
      }
    }
  }

  if (!preg_match('/\A[a-zA-Z0-9]+\z/',session_id())) {
    session_regenerate_id();
  }

session_write_close();
?>

[Openfirst-cvscommit] base/config globals.php,1.15,NONE

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

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

Removed Files:
	globals.php 
Log Message:
wrong directory

--- globals.php DELETED ---

[Openfirst-cvscommit] base/config globals.php,1.14,1.15

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

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

Added Files:
	globals.php 
Log Message:
Globals.php got lost in shuffle

--- NEW FILE: globals.php ---
<?php
/*
 *  openFIRST.base - config/globals.php
 *
 * Copyright (C) 2003,
 *  openFIRST Project
 *  Original Author: Tim Ginn <tim...@po...>
 *
 * This program 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.
 *
 * This program 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.
 * This program 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 this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 *
 */

// Purpose: Initialize the openFIRST system.

$configdir = dirname(__FILE__);
if( !file_exists( "$configdir/sitesettings.php" ) ) {
  $path = "#";
  if(file_exists("../config/first.php")) {
    $path = "../config/first.php";
  } elseif(file_exists("config/first.php")) {
    $path = "config/first.php";
  } elseif(file_exists("../../config/first.php")) {
    $path = "../../config/first.php";
  }
  $path = htmlentities($path);
  die( "You'll have to <a href=\"$path\">set openFIRST up</a> first!" );
}

if (substr(PHP_OS, 0, 3) == 'WIN') {
  $ostype = 'windows';
} else {
  $ostype = 'unix';
}

if ($ostype == 'windows') {
  set_include_path( get_include_path().";$configdir/;.");
} else {
  set_include_path( get_include_path().":$configdir/:.");
}
unset($configdir);

require_once('dbase.php');
require_once('auth.php');

require_once('sitesettings.php');

if(function_exists("ofirst_dbconnect") == false) {
  die("Your version of PHP has not been compiled with SQL support, therefore the openFIRST web portal system cannot run on this system.  Please contact your system administrator to request SQL support for your version of PHP.");
}

// We use glob enough, that we should either write a substitute, or just refuse to work
if(!function_exists('glob')) {
  die('You really should upgrade PHP, seeing as you don&apos;t even have <a href="http://us2.php.net/manual/en/function.glob.php"><code>glob()</code></a>.');
}

InitUser();

// Determine what module the user is viewing
 $currentmodule = str_replace($basepath, '', $_SERVER['SCRIPT_NAME']);
 $currentmodule = substr($currentmodule, 1, strpos($currentmodule, '/', 2) - 1);

 session_start();
 // Include the functions using glob();
 foreach (glob("$fbasepath/config/functions/*.php") as $filename) {
   include_once($filename);
 }

 $headers = '';

 $incl = ofirst_dbquery('SELECT * FROM ofirst_config');
 
 $Modules = array();
 
 function AddModule($code, $name, $version, $includes, $adminnav, $modulenav, $active, $show) {
   global $Modules;
   $Modules[$code] = array(
       'name'   => $name,
       'ver'    => $version,
       'inc'    => $includes,
       'admin'  => $adminnav,
       'nav'    => $modulenav,
       'active' => (bool)$active,
       'show'   => (bool)$show
     );
 }

 // If there is no error then run the module add feature
 if(ofirst_dberrno() == 0) {
              // Begin to loop through modules from the databaes
   while($module = ofirst_dbfetch_object($incl)) {
     AddModule($module->modulename,
               $module->label,
               $module->version,
               explode(',', $module->includes),
               $module->adminnavigation,
               $module->modulenavigation, 
               $module->active,
               $module->showonmenu
              );
     // Check if the value is try, if it is then run an include
     if($module->active == true) {
       // Check if there are includes that need to be included
       if(!( $module->includes == '')){
         // If the list is not empty then explode the value and put it into inclist
         $inclist = explode(',',$module->includes);
         // This is to remove an error that you have if you don't check if there are more then 2
         if(count($inclist) >= 2){

            // Loop through the inclist and add them according to their paths
            foreach($inclist As $inc){
              include_once("$fbasepath/$module->modulename/$inc");
            }
          } else {
            // If there is only 1 include available then use this line to include it instead
            include_once("$fbasepath/$module->modulename/$module->includes");
          }
        }

        // 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 ($currentmodule == $module->modulename){
            $headers .= " &#187; <a class='menu selected' href='$basepath/$module->modulename'>".ucwords($module->modulename)."</a> |
";

            // Declare important variables so that headers can pick them up and preview them

            $adminnav = str_replace("\$basepath", $basepath, $module->adminnavigation) . " <a href='http://bugzilla.openfirst.org'>Report Bug</a>";
            $subnav = str_replace("\$basepath", $basepath, $module->modulenavigation);

          } else {
            $headers .= " &#187; <a class='menu' href='$basepath/$module->modulename'>".ucwords($module->modulename)."</a> |
";
          }
        }
      }
    }
  }

  if (!preg_match('/\A[a-zA-Z0-9]+\z/',session_id())) {
    session_regenerate_id();
  }

session_write_close();
?>

[Openfirst-cvscommit] base/config .cvsignore,1.2,1.3 auth.php,1.18,NONE db_setup.php,1.1,NONE dbase.php,1.28,NONE footers.php,1.14,NONE globals.php,1.13,NONE headers.php,1.27,NONE sitesettings.tpl,1.1,NONE style.css,1.6,NONE

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

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

Modified Files:
	.cvsignore 
Removed Files:
	auth.php db_setup.php dbase.php footers.php globals.php 
	headers.php sitesettings.tpl style.css 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- sitesettings.tpl DELETED ---

--- auth.php DELETED ---

--- globals.php DELETED ---

--- headers.php DELETED ---

--- footers.php DELETED ---

--- dbase.php DELETED ---

Index: .cvsignore
===================================================================
RCS file: /cvsroot/openfirst/base/config/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** .cvsignore	14 May 2005 22:25:56 -0000	1.2
--- .cvsignore	25 May 2005 21:44:29 -0000	1.3
***************
*** 1,2 ****
! Globals.php
! sitesettings.php
\ No newline at end of file
--- 1 ----
! sitesettings.php

--- db_setup.php DELETED ---

--- style.css DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/modules behavior_css.js,1.1,NONE behavior_menu_invisible.js,1.1,NONE behavior_remove_phptags.js,1.1,NONE behavior_remove_xmltags.js,1.1,NONE button_about.js,1.1,NONE button_hr.gif,1.1,NONE button_hr.js,1.2,NONE button_html.htm,1.1,NONE button_html.js,1.1,NONE button_image.js,1.1,NONE button_imagemap.js,1.1,NONE button_log.js,1.1,NONE button_table_properties.html,1.1,NONE button_table_properties.js,1.1,NONE button_table_properties_gecko.html,1.1,NONE grid_small.js,1.1,NONE listbox_paragraph.js,1.1,NONE listbox_styleclass.js,1.1,NONE listbox_template.js,1.1,NONE listbox_template_example.html,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/modules

Removed Files:
	behavior_css.js behavior_menu_invisible.js 
	behavior_remove_phptags.js behavior_remove_xmltags.js 
	button_about.js button_hr.gif button_hr.js button_html.htm 
	button_html.js button_image.js button_imagemap.js 
	button_log.js button_table_properties.html 
	button_table_properties.js button_table_properties_gecko.html 
	grid_small.js listbox_paragraph.js listbox_styleclass.js 
	listbox_template.js listbox_template_example.html 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- button_hr.js DELETED ---

--- grid_small.js DELETED ---

--- listbox_styleclass.js DELETED ---

--- button_table_properties.html DELETED ---

--- behavior_remove_phptags.js DELETED ---

--- button_html.js DELETED ---

--- behavior_remove_xmltags.js DELETED ---

--- button_image.js DELETED ---

--- button_about.js DELETED ---

--- listbox_paragraph.js DELETED ---

--- button_html.htm DELETED ---

--- button_imagemap.js DELETED ---

--- button_table_properties_gecko.html DELETED ---

--- listbox_template.js DELETED ---

--- behavior_css.js DELETED ---

--- button_log.js DELETED ---

--- button_hr.gif DELETED ---

--- listbox_template_example.html DELETED ---

--- behavior_menu_invisible.js DELETED ---

--- button_table_properties.js DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/js dhtmled.js,1.1,NONE lib.js,1.1,NONE lib2.js,1.1,NONE lib_ms.js,1.2,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/js
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/js

Removed Files:
	dhtmled.js lib.js lib2.js lib_ms.js 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- dhtmled.js DELETED ---

--- lib.js DELETED ---

--- lib_ms.js DELETED ---

--- lib2.js DELETED ---

[Openfirst-cvscommit] base/images back-admin.png,1.1,NONE back-light.gif,1.1,NONE back-lighter.gif,1.1,NONE back.gif,1.1,NONE developers-small.gif,1.1,NONE help.gif,1.1,NONE large.gif,1.1,NONE mmc.gif,1.1,NONE oflogo.gif,1.1,NONE openfirst-small.png,1.4,NONE openfirst.png,1.4,NONE poweredby-small.png,1.4,NONE poweredby.png,1.4,NONE small-warning-green.gif,1.1,NONE small-warning.gif,1.1,NONE verytinyfirst.gif,1.1,NONE w3c401.png,1.3,NONE warning.gif,1.1,NONE web.gif,1.1,NONE

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

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

Removed Files:
	back-admin.png back-light.gif back-lighter.gif back.gif 
	developers-small.gif help.gif large.gif mmc.gif oflogo.gif 
	openfirst-small.png openfirst.png poweredby-small.png 
	poweredby.png small-warning-green.gif small-warning.gif 
	verytinyfirst.gif w3c401.png warning.gif web.gif 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- oflogo.gif DELETED ---

--- back-admin.png DELETED ---

--- w3c401.png DELETED ---

--- back-lighter.gif DELETED ---

--- mmc.gif DELETED ---

--- small-warning.gif DELETED ---

--- help.gif DELETED ---

--- back.gif DELETED ---

--- developers-small.gif DELETED ---

--- large.gif DELETED ---

--- warning.gif DELETED ---

--- poweredby.png DELETED ---

--- small-warning-green.gif DELETED ---

--- openfirst.png DELETED ---

--- poweredby-small.png DELETED ---

--- back-light.gif DELETED ---

--- openfirst-small.png DELETED ---

--- web.gif DELETED ---

--- verytinyfirst.gif DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/modules/imagemap arr.gif,1.1,NONE genMove.js,1.1,NONE index.php,1.1,NONE msmove.js,1.1,NONE trans.gif,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/modules/imagemap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/modules/imagemap

Removed Files:
	arr.gif genMove.js index.php msmove.js trans.gif 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- arr.gif DELETED ---

--- genMove.js DELETED ---

--- msmove.js DELETED ---

--- index.php DELETED ---

--- trans.gif DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/gecko/uti colors.htm,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/gecko/uti
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/gecko/uti

Removed Files:
	colors.htm 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- colors.htm DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/images absmode.gif,1.1,NONE abspos.gif,1.1,NONE additem.gif,1.1,NONE bgcolor.gif,1.1,NONE bold.gif,1.1,NONE borders.gif,1.1,NONE break.gif,1.1,NONE bullist.gif,1.1,NONE center.gif,1.1,NONE copy.gif,1.1,NONE cut.gif,1.1,NONE deindent.gif,1.1,NONE delcell.gif,1.1,NONE delcol.gif,1.1,NONE delete.gif,1.1,NONE delrow.gif,1.1,NONE details.gif,1.1,NONE dms.gif,1.1,NONE email.gif,1.1,NONE end.gif,1.1,NONE fgcolor.gif,1.1,NONE find.gif,1.1,NONE fullscrn.gif,1.1,NONE help.gif,1.1,NONE image.gif,1.1,NONE immap.gif,1.1,NONE inindent.gif,1.1,NONE inscell.gif,1.1,NONE inscol.gif,1.1,NONE insrow.gif,1.1,NONE instable.gif,1.1,NONE italic.gif,1.1,NONE left.gif,1.1,NONE link.gif,1.1,NONE linkadv.gif,1.1,NONE lock.gif,1.1,NONE mrgcell.gif,1.1,NONE newdoc.gif,1.1,NONE newproj.gif,1.1,NONE numlist.gif,1.1,NONE open.gif,1.1,NONE paste.gif,1.1,NONE print.gif,1.1,NONE project.gif,1.1,NONE props.gif,1.1,NONE reddot.gif,1.1,NONE redo.gif,1.1,NONE right.gif,1.1,NONE save.gif,1.1,NONE saveall.gif,1.1,NONE saveas.gif,1.1,NONE snapgrid.gif,1.1,NONE source.gif,1.1,NONE spltcell.gif,1.1,NONE start.gif,1.1,NONE target.gif,1.1,NONE tasklist.gif,1.1,NONE tblprop.gif,1.1,NONE under.gif,1.1,NONE undo.gif,1.1,NONE zb_b.gif,1.1,NONE zb_o.gif,1.1,NONE zb_y.gif,1.1,NONE zf_b.gif,1.1,NONE zf_o.gif,1.1,NONE zf_y.gif,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/images

Removed Files:
	absmode.gif abspos.gif additem.gif bgcolor.gif bold.gif 
	borders.gif break.gif bullist.gif center.gif copy.gif cut.gif 
	deindent.gif delcell.gif delcol.gif delete.gif delrow.gif 
	details.gif dms.gif email.gif end.gif fgcolor.gif find.gif 
	fullscrn.gif help.gif image.gif immap.gif inindent.gif 
	inscell.gif inscol.gif insrow.gif instable.gif italic.gif 
	left.gif link.gif linkadv.gif lock.gif mrgcell.gif newdoc.gif 
	newproj.gif numlist.gif open.gif paste.gif print.gif 
	project.gif props.gif reddot.gif redo.gif right.gif save.gif 
	saveall.gif saveas.gif snapgrid.gif source.gif spltcell.gif 
	start.gif target.gif tasklist.gif tblprop.gif under.gif 
	undo.gif zb_b.gif zb_o.gif zb_y.gif zf_b.gif zf_o.gif zf_y.gif 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- end.gif DELETED ---

--- start.gif DELETED ---

--- newdoc.gif DELETED ---

--- zf_y.gif DELETED ---

--- redo.gif DELETED ---

--- copy.gif DELETED ---

--- saveas.gif DELETED ---

--- numlist.gif DELETED ---

--- target.gif DELETED ---

--- insrow.gif DELETED ---

--- delcol.gif DELETED ---

--- dms.gif DELETED ---

--- snapgrid.gif DELETED ---

--- source.gif DELETED ---

--- right.gif DELETED ---

--- details.gif DELETED ---

--- under.gif DELETED ---

--- delrow.gif DELETED ---

--- deindent.gif DELETED ---

--- zb_y.gif DELETED ---

--- inscell.gif DELETED ---

--- inscol.gif DELETED ---

--- spltcell.gif DELETED ---

--- left.gif DELETED ---

--- props.gif DELETED ---

--- find.gif DELETED ---

--- delete.gif DELETED ---

--- bold.gif DELETED ---

--- immap.gif DELETED ---

--- delcell.gif DELETED ---

--- zb_b.gif DELETED ---

--- abspos.gif DELETED ---

--- image.gif DELETED ---

--- instable.gif DELETED ---

--- undo.gif DELETED ---

--- cut.gif DELETED ---

--- reddot.gif DELETED ---

--- bgcolor.gif DELETED ---

--- tasklist.gif DELETED ---

--- break.gif DELETED ---

--- absmode.gif DELETED ---

--- saveall.gif DELETED ---

--- italic.gif DELETED ---

--- email.gif DELETED ---

--- fgcolor.gif DELETED ---

--- project.gif DELETED ---

--- fullscrn.gif DELETED ---

--- tblprop.gif DELETED ---

--- zf_b.gif DELETED ---

--- linkadv.gif DELETED ---

--- newproj.gif DELETED ---

--- zb_o.gif DELETED ---

--- center.gif DELETED ---

--- print.gif DELETED ---

--- bullist.gif DELETED ---

--- mrgcell.gif DELETED ---

--- open.gif DELETED ---

--- additem.gif DELETED ---

--- link.gif DELETED ---

--- help.gif DELETED ---

--- save.gif DELETED ---

--- lock.gif DELETED ---

--- zf_o.gif DELETED ---

--- inindent.gif DELETED ---

--- paste.gif DELETED ---

--- borders.gif DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/gecko/dev/Midas Demo-Dateien backcolor.gif,1.1,NONE bold.gif,1.1,NONE colors.htm,1.1,NONE copy.gif,1.1,NONE cut.gif,1.1,NONE forecolor.gif,1.1,NONE indent.gif,1.1,NONE italic.gif,1.1,NONE justifycenter.gif,1.1,NONE justifyleft.gif,1.1,NONE justifyright.gif,1.1,NONE link.gif,1.1,NONE orderedlist.gif,1.1,NONE outdent.gif,1.1,NONE paste.gif,1.1,NONE redo.gif,1.1,NONE table.gif,1.1,NONE underline.gif,1.1,NONE undo.gif,1.1,NONE unorderedlist.gif,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/gecko/dev/Midas Demo-Dateien
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/gecko/dev/Midas Demo-Dateien

Removed Files:
	backcolor.gif bold.gif colors.htm copy.gif cut.gif 
	forecolor.gif indent.gif italic.gif justifycenter.gif 
	justifyleft.gif justifyright.gif link.gif orderedlist.gif 
	outdent.gif paste.gif redo.gif table.gif underline.gif 
	undo.gif unorderedlist.gif 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- unorderedlist.gif DELETED ---

--- backcolor.gif DELETED ---

--- underline.gif DELETED ---

--- redo.gif DELETED ---

--- undo.gif DELETED ---

--- cut.gif DELETED ---

--- outdent.gif DELETED ---

--- colors.htm DELETED ---

--- justifyright.gif DELETED ---

--- indent.gif DELETED ---

--- justifycenter.gif DELETED ---

--- link.gif DELETED ---

--- bold.gif DELETED ---

--- italic.gif DELETED ---

--- copy.gif DELETED ---

--- orderedlist.gif DELETED ---

--- table.gif DELETED ---

--- justifyleft.gif DELETED ---

--- paste.gif DELETED ---

--- forecolor.gif DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/gecko/dev/Converting an app using document_designMode from IE to Midas-Dateien persistent-style.css,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/gecko/dev/Converting an app using document_designMode from IE to Midas-Dateien
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/gecko/dev/Converting an app using document_designMode from IE to Midas-Dateien

Removed Files:
	persistent-style.css 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- persistent-style.css DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/gecko/gfx .DS_Store,1.1,NONE backcolor.gif,1.1,NONE bold.gif,1.1,NONE colors.htm,1.1,NONE copy.gif,1.1,NONE cut.gif,1.1,NONE forecolor.gif,1.1,NONE indent.gif,1.1,NONE italic.gif,1.1,NONE justifycenter.gif,1.1,NONE justifyleft.gif,1.1,NONE justifyright.gif,1.1,NONE link.gif,1.1,NONE orderedlist.gif,1.1,NONE outdent.gif,1.1,NONE paste.gif,1.1,NONE redo.gif,1.1,NONE source.gif,1.1,NONE table.gif,1.1,NONE underline.gif,1.1,NONE undo.gif,1.1,NONE unorderedlist.gif,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/gecko/gfx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/gecko/gfx

Removed Files:
	.DS_Store backcolor.gif bold.gif colors.htm copy.gif cut.gif 
	forecolor.gif indent.gif italic.gif justifycenter.gif 
	justifyleft.gif justifyright.gif link.gif orderedlist.gif 
	outdent.gif paste.gif redo.gif source.gif table.gif 
	underline.gif undo.gif unorderedlist.gif 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- backcolor.gif DELETED ---

--- undo.gif DELETED ---

--- cut.gif DELETED ---

--- outdent.gif DELETED ---

--- indent.gif DELETED ---

--- justifycenter.gif DELETED ---

--- justifyleft.gif DELETED ---

--- italic.gif DELETED ---

--- copy.gif DELETED ---

--- source.gif DELETED ---

--- unorderedlist.gif DELETED ---

--- underline.gif DELETED ---

--- redo.gif DELETED ---

--- colors.htm DELETED ---

--- justifyright.gif DELETED ---

--- link.gif DELETED ---

--- bold.gif DELETED ---

--- .DS_Store DELETED ---

--- orderedlist.gif DELETED ---

--- table.gif DELETED ---

--- paste.gif DELETED ---

--- forecolor.gif DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/dialog instable.htm,1.1,NONE selcolor.htm,1.1,NONE setlink.htm,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/dialog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/dialog

Removed Files:
	instable.htm selcolor.htm setlink.htm 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- setlink.htm DELETED ---

--- selcolor.htm DELETED ---

--- instable.htm DELETED ---

[Openfirst-cvscommit] base/includes/functions/wysiwyg/modules/imagemap arr.gif,NONE,1.1 genMove.js,NONE,1.1 index.php,NONE,1.1 msmove.js,NONE,1.1 trans.gif,NONE,1.1

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

Update of /cvsroot/openfirst/base/includes/functions/wysiwyg/modules/imagemap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/includes/functions/wysiwyg/modules/imagemap

Added Files:
	arr.gif genMove.js index.php msmove.js trans.gif 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- NEW FILE: arr.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: genMove.js ---
///////////////////////////////////////////////////////////////////////
//     This script was designed by Erik Arvidsson for WebFX          //
//                                                                   //
//     For more info and examples see: http://webfx.eae.net          //
//     or send mail to er...@ea...                                  //
//                                                                   //
//     Feel free to use this code as lomg as this disclaimer is      //
//     intact.                                                       //
///////////////////////////////////////////////////////////////////////

var checkZIndex = true;

var dragobject = null;
var tx;
var ty;

var ie5 = document.all != null && document.getElementsByTagName != null;

function getReal(el) {
	temp = el;

	while ((temp != null) && (temp.tagName != "BODY")) {
		if ((temp.className == "moveme") || (temp.className == "handle")){
			el = temp;
			return el;
		}
		temp = temp.parentElement;
	}
	return el;
}


function moveme_onmousedown() {
	el = getReal(window.event.srcElement)
	
	if (el.className == "moveme" || el.className == "handle") {
		if (el.className == "handle") {
			tmp = el.getAttribute("handlefor");
			if (tmp == null) {
				dragobject = null;
				return;
			}
			else
				dragobject = eval(tmp);
		}
		else 
			dragobject = el;
		
		if (checkZIndex) makeOnTop(dragobject);
		
		ty = window.event.clientY - getTopPos(dragobject);
		tx = window.event.clientX - getLeftPos(dragobject);
		
		window.event.returnValue = false;
		window.event.cancelBubble = true;
	}
	else {
		dragobject = null;
	}
}

function moveme_onmouseup() {
	if(dragobject) {
		dragobject = null;
	}
}

function moveme_onmousemove() {
	if (dragobject) {
		if (window.event.clientX >= 0 && window.event.clientY >= 0) {
			dragobject.style.left = window.event.clientX - tx;
			dragobject.style.top = window.event.clientY - ty;
		}
		window.event.returnValue = false;
		window.event.cancelBubble = true;
	}
}

function getLeftPos(el) {
	if (ie5) {
		if (el.currentStyle.left == "auto")
			return 0;
		else
			return parseInt(el.currentStyle.left);
	}
	else {
		return el.style.pixelLeft;
	}
}

function getTopPos(el) {
	if (ie5) {
		if (el.currentStyle.top == "auto")
			return 0;
		else
			return parseInt(el.currentStyle.top);
	}
	else {
		return el.style.pixelTop;
	}
}

function makeOnTop(el) {
	var daiz;
	var max = 0;
	var da = document.all;
	
	for (var i=0; i<da.length; i++) {
		daiz = da[i].style.zIndex;
		if (daiz != "" && daiz > max)
			max = daiz;
	}
	
	el.style.zIndex = max + 1;
}

if (document.all) { //This only works in IE4 or better
	document.onmousedown = moveme_onmousedown;
	document.onmouseup = moveme_onmouseup;
	document.onmousemove = moveme_onmousemove;
}

document.write("<style>");
document.write(".moveme		{cursor: move;}");
document.write(".handle		{cursor: move;}");
document.write("</style>");
--- NEW FILE: msmove.js ---
var CurentMAP='';
var activeElements = new Array();
var activeElementCount = 0;
var lTop, lLeft;
var doMove = true;
var doResize = false;

function toggleMoveResize(e) {
  if (doMove) {
    doMove = false;
    doResize = true;
    //e.value = "Resizing, Click to Move";
  } else {
    doMove = true;
    doResize = false;
    //e.value = "Moving, Click to Resize";
  }
}

function mousedown() {
	//_imgOnMouseOver();
  var mp;

  mp = findMoveable(window.event.srcElement);
  
  //if (!window.event.altKey) {
  if (true) {
	 for (i=0; i<activeElementCount; i++) {
	 
        if (activeElements[i] != mp) {
		try
			{
				if(mp.tagName.toLowerCase()=='div')
					{
						activeElements[i].style.borderWidth = "1px";
					}
			}
		catch(e){}
			
          
          //createmapf['delete'].disabled=true;

        }
     }
     if (mp) {
       activeElements[0] = mp;
   	   CurentMAP=activeElements[0];
	   _setFormFromMap();
       activeElementCount = 1;
    	_areas_doborder1px4all()

       mp.style.borderWidth = "2px";
		createmapf['delete'].disabled=false;

	   
     } else {
       activeElementCount = 0;
     }
  } else {
  	alert('int er');
     if (mp) {
       if (mp.style.borderWidth != "2px") {
         activeElements[activeElementCount] = mp;
         activeElementCount++;
         mp.style.borderWidth = "2px";
	   	 CurentMAP=activeElements[0];
		 _setFormFromMap();
		 
       }
     }
  }

  //window.status = activeElementCount;

  lLeft = window.event.x;
  lTop = window.event.y;
}

document.onmousedown = mousedown;

function doResizeit(Mx,My,activeElement_)
	{
		var pr_	=	(parseInt(activeElement_.style.width)/2);
		//if (pr_>50) pr_=50;
		//alert(activeElement_);
      if	(
	  			parseInt(Mx) >= parseInt(activeElement_.style.left)+parseInt(activeElement_.style.width)-(pr_) || 
	  			parseInt(My) >= parseInt(activeElement_.style.top)+parseInt(activeElement_.style.height)-10 
		   	)
	  	{
			return true;
		}
	 return false;
	}
	
function ___MmosOvrr(activeElement_)
	{
		if (doResizeit(event.x,event.y,activeElement_))
			{
				activeElement_.style.cursor	=	'nw-resize';;
			}
		else
			{
				activeElement_.style.cursor	=	'move';;
			}
	}
function mousemove() {
  var i, dLeft, dTop;
    sx = window.event.x;
    sy = window.event.y;

	//_imgOnMouseOver();
	
    for (i=0; i<activeElementCount; i++) {
      //if (doMove)

	var mapid=SAL__get_parsedimgmap_i(activeElements[i].id);


	  if (doResizeit(sx,sy,activeElements[i]))
	  	{
			
			activeElements[i].style.cursor	=	'nw-resize';
		}
	else
		{
			activeElements[i].style.cursor	=	'move';
		}
	}
	

  if (window.event.button == 1) {
	//_imgOnMouseOver();
    dLeft = sx - lLeft;
    dTop = sy - lTop;

    for (i=0; i<activeElementCount; i++) {
      //if (doMove)
	var mapid=SAL__get_parsedimgmap_i(activeElements[i].id);
      if (doResizeit(sx,sy,activeElements[i]))
	  	{
			resizeElement(activeElements[i], dLeft, dTop);
			
		}
	  else
	  	{
			moveElement(activeElements[i], dLeft, dTop);
		}
			createmapf.mex.value=parseInt(document.getElementById('divmap'+mapid).style.width)
			createmapf.mey.value==	parseInt(document.getElementById('divmap'+mapid).style.height)
			createmapf.msx.value=parseInt(document.getElementById('divmap'+mapid).style.left)
			createmapf.msy.value=parseInt(document.getElementById('divmap'+mapid).style.top)

    }

    lLeft = sx;
    lTop = sy;
	

    return false;
  }

}

function moveElement(mp, dLeft, dTop) {
    var e
    e = mp;
    e.style.posTop += dTop;
    e.style.posLeft += dLeft;
}

function resizeElement(mp, dLeft, dTop) {
    var e;
    e = mp;
    e.style.posHeight += dTop;
    e.style.posWidth += dLeft;
}

function findMoveable(e) {
  if (!e.tagName || e.tagName.toLowerCase() != "div")
    return null;

  if (e.moveable == 'true')
    return e;


  return findMoveable(e.parentElement);
}

function findDefinedMoveable(e) {
  if ((e.moveable == 'true') || (e.moveable == 'false'))
    return e;

  if (e.tagName == "BODY")
    return null;

  return findDefinedMoveable(e.parentElement);
}

function rfalse() {
  return false;
}


function _imgmapkeydowhdl()
	{
		try
			{
				if (window.event.keyCode == 8 || window.event.keyCode == 46 )
					{
						_deleteMap_();
						return;
					}
				else
					{
						if (CurentMAP && CurentMAP.style && CurentMAP.style.visibility == 'visible')
							{
								var _step = 1;
								
								if (window.event.ctrlKey)
									{
										_step = 5;
									}
								
								if (window.event.shiftKey)
									{
										if (window.event.keyCode ==37)
											{
												CurentMAP.style.width = parseInt(CurentMAP.style.width)-_step;
												
												return;
											}
										if (window.event.keyCode ==39)
											{
												CurentMAP.style.width = parseInt(CurentMAP.style.width)+_step;
												return;
											}
										if (window.event.keyCode ==38)
											{
												CurentMAP.style.height= parseInt(CurentMAP.style.height)-_step;
												return;
											}
										if (window.event.keyCode ==40)
											{
												CurentMAP.style.height = parseInt(CurentMAP.style.height)+_step;
												return;
											}
									}
								else
									{
										if (window.event.keyCode ==37)
											{
												CurentMAP.style.left = parseInt(CurentMAP.style.left)-_step;
												
												return;
											}
										if (window.event.keyCode ==39)
											{
												CurentMAP.style.left = parseInt(CurentMAP.style.left)+_step;
												return;
											}
										if (window.event.keyCode ==38)
											{
												CurentMAP.style.top = parseInt(CurentMAP.style.top)-_step;
												return;
											}
										if (window.event.keyCode ==40)
											{
												CurentMAP.style.top = parseInt(CurentMAP.style.top)+_step;
												return;
											}
									}
							}
					}
			} catch(e){;}
	}

function SAL__get_parsedimgmap_i(rawname)
	{
		return rawname.replace(/divmap/,'');
	}
	

function SAL__set___map_info()
	{
		var mapname=opener_oldMapName;
		for (var i=0; i<opener_DOM.all.length; i++)
			{
				if (opener_oldMapName.length > 0 && opener_DOM.all(i).tagName.toLowerCase() == 'map' && opener_DOM.all(i).getAttribute('name') == mapname)
					{
						for (var ia=1;opener_DOM.all(i+ia) && opener_DOM.all(i+ia).tagName.toLowerCase() == 'area' && ia < maxMaps ;ia++)
							{
								var _target	=	opener_DOM.all(i+ia).getAttribute('target');	
								var _href	=	opener_DOM.all(i+ia).getAttribute('href');	
								var _alt	=	opener_DOM.all(i+ia).getAttribute('alt');	
								var _coords	=	opener_DOM.all(i+ia).getAttribute('coords');	
								if (_coords.length >0)
									{
										var _coordsA	=	Array();
										_coords			=	_coords.replace(/ /,'');
										_coords			=	_coords.replace(/	/,'');
										_coordsA		=	_coords.split(",");
										if (_coordsA.length==4)
											{
												document.getElementById('divmap'+ia).SALMAP_href=	_href;
												document.getElementById('divmap'+ia).SALMAP_alt=		_alt;
												document.getElementById('divmap'+ia).SALMAP_target=	_target;
												
												document.getElementById('divmap'+ia).style.left=	parseInt(_coordsA[0]);
												document.getElementById('divmap'+ia).style.top=	parseInt(_coordsA[1]);
												document.getElementById('divmap'+ia).style.width=	parseInt(_coordsA[2]-_coordsA[0]);
												document.getElementById('divmap'+ia).style.visibility=	'visible';
												document.getElementById('divmap'+ia).style.height=	parseInt(_coordsA[3]-_coordsA[1]);
												//alert();
												
											}
									}
							}
						break;
						

					}
			}
		if (!document.____SAL_interval_imgmap_htmleditor_____ || document.____SAL_interval_imgmap_htmleditor_____=='undefined')
			{
				//document.____SAL_interval_imgmap_htmleditor_____	=	window.setInterval("_editMap_()",500);
			}
			

	}

function SAL___remove_____map(mapname)
	{
		
		for (var i=0; i<opener_DOM.all.length; i++)
			{
				if (opener_oldMapName.length > 0 && opener_DOM.all[i].tagName.toLowerCase() == 'map' && opener_DOM.all[i].getAttribute('name') == mapname)
					{
						try
							{
								opener_DOM.all[i].removeNode(true);
								
							}
						catch(e){alert('cant remove old map');}
						

					}
			}
	}

function SAL___set_htdmled_imap(mapinfo)
	{
		// OPENER ABFRAGEN!!!
		//DECMD_IMAGEMAP_RANGE abfragen
		if (!mapinfo) 
			{
				alert('FIXME');
				return;
			}

		// Neue map adden //
		var succ=0;
		try
			{
				if (mapinfo['map_source'] && mapinfo['map_source'].length)
					{
						var map_el,area_;
						map_el	=	opener_DOM.createElement("map");
						opener_oItem.insertAdjacentElement('afterEnd',map_el);
						
						map_el.setAttribute('name','__tmpmapname__');
						map_el.insertAdjacentHTML('afterBegin', mapinfo['map_source'])
					}
				succ=1;
			
			}
		catch(e){alert("Internal error[mmap]");}


	
		if (succ==1)		
			{
				if (mapinfo['map_name'] && mapinfo['map_name'] && mapinfo['map_name'].length)
					{
						//alert(opener.DECMD_IMAGEMAP_RANGE_ITEM.useMap);
						opener_oItem.setAttribute('useMap','#'+mapinfo['map_name']);
						opener_oItem.setAttribute('border','0');
					}
				else
					{
						opener_oItem.removeAttribute('useMap');
					}

				SAL___remove_____map(opener_oldMapName);	
				
				
				if (mapinfo['map_name'] && mapinfo['map_name'] && mapinfo['map_name'].length)
					{
						map_el.setAttribute('name',mapinfo['map_name']);
					}
					
				window.dialogArguments['dhtmlobj'].Refresh();
				window.dialogArguments['dhtmlobj'].style.display='none';
				window.dialogArguments['dhtmlobj'].style.display='block';
				window.dialogArguments['dhtmlobj'].Refresh();
				//window.dialogArguments["opener"].SAL_chng_S_mode();
				//window.dialogArguments["opener"].SAL_chng_S_mode();
			}
		else
			{
				alert('internal error 656');
			}
		self.close();
	}

function _imgOnClick_()
	{
		if (_createMap_())
			{
				createmapf['delete'].disabled=false;
				return true;
			}
		return false;
		
	}
	
	
function _getFreeMapId()
	{
		for(var i=0;i<maxMaps;i++) 
			{
				if (document.getElementById('divmap'+i).style.visibility == 'hidden')
					{
						return i;
					}
			}
		return '';
	}
	
function _setFormFromMap()
	{
		createmapf.href.value=	CurentMAP.SALMAP_href 		
		createmapf.alt.value=CurentMAP.SALMAP_alt		
		createmapf.target.value=CurentMAP.SALMAP_target 	

		createmapf.msx.value=	parseInt(CurentMAP.style.left)	
		createmapf.msy.value=   parseInt(CurentMAP.style.top)
		createmapf.mex.value=	parseInt(CurentMAP.style.width)
		createmapf.mey.value=	parseInt(CurentMAP.style.height)

		createmapf.mapid.value=	parseInt(SAL__get_parsedimgmap_i(CurentMAP.id))
		
		

		
	}
function _editMap_()
	{
//		alert();
		if (!CurentMAP) return;
		//alert(activeElements[0].style.visibility);
		CurentMAP.SALMAP_href 		= createmapf.href.value;
		CurentMAP.SALMAP_alt		= createmapf.alt.value;
		CurentMAP.SALMAP_target 	= createmapf.target.value;

		return true;
		;
	}
	
function _areas_doborder1px4all()
	{
		for(var i=0;i<maxMaps;i++)
			{
					
				if (document.getElementById('divmap'+i).style.visibility == "visible")
					{
						document.getElementById('divmap'+i).style.borderWidth ="1px";
					}
			}
	}
function _createMap_()
	{
		var MapId	=	_getFreeMapId();
		if (MapId.length <=0) 
			{
				alert('no free Area available');
				return false;
			}
		document.getElementById('divmap'+MapId).style.left = event.x;
		document.getElementById('divmap'+MapId).style.top = event.y;
		document.getElementById('divmap'+MapId).style.width = 50;
		document.getElementById('divmap'+MapId).style.height = 50;

		document.getElementById('divmap'+MapId).SALMAP_href 	= '';
		document.getElementById('divmap'+MapId).SALMAP_alt		= '';
		document.getElementById('divmap'+MapId).SALMAP_target 	= '';
		CurentMAP	=	document.getElementById('divmap'+MapId);
		_areas_doborder1px4all();
		document.getElementById('divmap'+MapId).style.borderWidth 	= '2px';
		document.getElementById('divmap'+MapId).style.visibility = 'visible';
		_setFormFromMap();
		return true;

	}

function _generate_source_()
	{
		var map_source	=	'';
		var img_atr		=	'';
		for(var i=0;i<maxMaps ;i++) 
			{
				if (document.getElementById('divmap'+i).style.visibility == 'visible')
					{
						map_source	+=	'<area shape=RECT alt="'+document.getElementById('divmap'+i).SALMAP_alt+'" coords="'+parseInt(document.getElementById('divmap'+i).style.left)+','+parseInt(document.getElementById('divmap'+i).style.top)+','+(parseInt(document.getElementById('divmap'+i).style.left)+parseInt(document.getElementById('divmap'+i).style.width))+','+(parseInt(document.getElementById('divmap'+i).style.top)+parseInt(document.getElementById('divmap'+i).style.height))+'" target="'+document.getElementById('divmap'+i).SALMAP_target+'" href="'+document.getElementById('divmap'+i).SALMAP_href+'">';						
					}
			}
		if (map_source.length>0)
			{
				var name	=	_makeMapName();
				img_atr	=	 ' usemap="#'+name+'"'
				//map_source	=	'<map name="'+name+'">'+"\n"+map_source+'</map>';
			}
		//return '<img src="'+Limg_tl+'" alt="" border="0"'+img_atr+'>'+map_source;
		var ret	=	Array();
		ret['map_source']	=	map_source;
		ret['map_name']		=	name;
		return ret;
	}	
	
function _makeMapName()
	{	
		if (opener_oldMapName && opener_oldMapName.length)
			{
				return opener_oldMapName;
			}
		var zeit = new Date();
		return "Smap"+Date.UTC(zeit.getYear(),zeit.getMonth(),zeit.getDay(),zeit.getHours(),zeit.getMinutes(),zeit.getSeconds());
	}

function _deleteMap_()
	{
		if (createmapf['delete'].disabled == true) return;
		createmapf['delete'].disabled=true;
		CurentMAP.style.visibility=	'hidden';
		CurentMAP.SALMAP_href=	'';
		CurentMAP.SALMAP_alt=		'';
		CurentMAP.SALMAP_target=	'';
		CurentMAP.style.left=	''
		CurentMAP.style.top=	''
		CurentMAP.style.width=	''
		CurentMAP.style.height=	''
		return;
	
	}
	
function _mapCleanUpDirtyMapRefs()
	{
		var mapname=opener_oldMapName;
		var toDelMaps		=	new Array;
		var usedMapNames	=	new Array;
		
		for (var i=0; i<opener_DOM.all.length; i++)
			{
				if (opener_DOM.all(i).tagName.toLowerCase() == 'img' && opener_DOM.all(i).getAttribute('useMap') && opener_DOM.all(i).getAttribute('useMap').length > 0)
					{
						var _mapname	=	opener_DOM.all(i).getAttribute('useMap').replace(/#/,'');
						_mapname		=	_mapname.toLowerCase();
						usedMapNames[_mapname]	=	1;
					}
			}
		
		for (var i=0; i<opener_DOM.all.length; i++)
			{
				if (opener_DOM.all(i).tagName.toLowerCase() == 'map')
					{
						if ( opener_DOM.all(i).getAttribute('name') == '' )
							{
								//KICK & DELETE
								toDelMaps[toDelMaps.length]=opener_DOM.all(i);
								continue;
							}
							

						var _mapname	=	opener_DOM.all(i).getAttribute('name');
						_mapname		=	_mapname.toLowerCase();
						if ( usedMapNames[_mapname] != 1)
							{
								//KICK
								toDelMaps[toDelMaps.length]=opener_DOM.all(i);
								usedMapNames[_mapname]++;
							}
						usedMapNames[_mapname]=0;
					}
			}
		
		var _mapname;
		var _err	=	' - cleaned';
		for(var i=0;i<toDelMaps.length;i++)
			{
				//alert(toDelMaps[i].getAttribute('name'));
				if (toDelMaps[i])
					{
						try
							{
								//alert('del')
								toDelMaps[i].removeNode(true);	
							}
						catch(e)
							{
								//alert('err')
								_err	=	'';
							}
					}
			}

		if (toDelMaps.length>0) alert('NOTE: dirty HTML code dedected'+_err);
		return true;
	}


document.onmousemove = mousemove;
//document.onselectstart = rfalse;


--- NEW FILE: index.php ---
<? include ("../../../../../../std.inc.php3");?>
<? 	__salomon__check__login(); ?>

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
	<title>Salomon Image Map Editor</title>
<? SAL__include_std_js_scripts();?>
<? __salomon__include__css(); ?>
<!-- <script src="genMove.js" type="text/javascript"></script> -->
<script src="msmove.js" type="text/javascript"></script>
<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
maxMaps	=	100;



if (!window.dialogArguments)
	{
		window.dialogArguments = Array;
		window.dialogArguments['opener'] = opener;
	}
opener_DOM		=	window.dialogArguments['dhtmlobj'].DOM;
opener_oSel 	= 	opener_DOM.selection;
opener_oRange	=	opener_oSel.createRange()
opener_oItem	=	opener_oRange.item(opener_oRange.length-1);
opener_oldMapName	=	opener_oItem.getAttribute('usemap');
opener_oldMapName	=	opener_oldMapName.replace(/#/,'');
Limg_tl		=	opener_oItem.src;
Limg_tlW	=	opener_oItem.getAttribute('width');
Limg_tlH	=	opener_oItem.getAttribute('height');

_mapCleanUpDirtyMapRefs();
</SCRIPT>	
</head>

<body bottommargin="0" leftmargin="0" marginheight="0" marginwidth="0" rightmargin="0" topmargin="0" onload="SAL__set___map_info()">
<? #__salomon__include__body(); ?>
<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
var eimgatr='';
if (Limg_tlH)
	{
		eimgatr	=	' height='+Limg_tlH+' ';
	}
if (Limg_tlW)
	{
		eimgatr	+=	' width='+Limg_tlW+' ';
	}
document.write('<img src="'+Limg_tl+'" '+eimgatr+' alt="" border="0" onclick="_imgOnClick_();" style="cursor:crosshair;">');
</SCRIPT>
<br><br>

<table>
	<tr>
		<td><strong>Map-Area Properties</strong></td>	
	</tr>
	<tr>
		<td nowrap>
			<table cellpadding="0" cellspacing="0" border="1" bordercolor="#808080"><tr><td>
			<form name="createmapf">
				<table cellpadding="0" cellspacing="2">
					<tr valign="top">
						<td>Hyperlink (href)</td>
						<td><input onfocus="document.onselectstart = '';document.onmousemove=''" onkeyup="_editMap_();" onblur="document.onselectstart = rfalse;document.onmousemove=mousemove;_editMap_()"  type="text" name="href" value="" size="50"></td>
					</tr>
					<tr valign="top">
						<td>Alt Text (alt)</td>
						<td><input onfocus="document.onselectstart = '';document.onmousemove=''" onkeyup="_editMap_()" onblur="document.onselectstart = rfalse;document.onmousemove=mousemove;_editMap_()" type="text" name="alt" value="" size="50"></td>
					</tr>

					<tr valign="top">
						<td><a href="#" onclick="SAL_CHVIS_mod('advmappr')" title="Click here for Advanced Properties">Advanced</a></td>
						<td></td>
					</tr>
					<tr valign="top" style="display:none;" id="advmappr">
						<td>Target</td>
						<td><input onfocus="document.onselectstart = '';document.onmousemove=''" onkeyup="_editMap_()" onblur="document.onselectstart = rfalse;document.onmousemove=mousemove;_editMap_()" type="text" name="target" value="" size="10">
						_self _parent _top _blank
						</td>
					</tr>
					
			
				</table>
				<span style="display:none;">Map X:<input   type="text" name="msx" value="" size="3"><br></span>
				<span style="display:none;">Map Y:<input  type="text" name="msy" value="" size="3"><br></span>
				<span style="display:none;">Map Width X:<input  type="text" name="mex" value="50" size="3"><br></span>
				<span style="display:none;">Map Heigh Y:<input  type="text" name="mey" value="50" size="3"><br></span>
				<span style="display:none;">Map Number: <input type="text" name="mapid" value="" size="3"><br></span>
				<br><input style="display:none; disabled type="button" name="create" value="Create" >
				&nbsp;<input disabled type="button" name="delete" value="Delete Area" onclick="_deleteMap_()">&nbsp;&nbsp;&nbsp;&nbsp;
				<!-- <input type="button"  value="Make" onclick="alert(_generate_source_())"> -->
				<input type="button"  value="Save Image Map" onclick="_editMap_();SAL___set_htdmled_imap(_generate_source_())">
				<input style="display:none;" disabled type="button" name="edit" value="Edit" onclick="_editMap_()">
			</form>
			</td></tr></table>
			<br>
			<strong><a onclick="SAL_CHVIS_mod('helpsp')" href="#" title="Click here for Help">Quick-Help</a></strong><br>
			<span id=helpsp style="display:none;">
			- You can add a Map-Area by a LEFT-MOUSE-CLICK on a free Area at the Image<br>
			- You can edit a Map-Area by a LEFT-MOUSE-CLICK on the Map-Area (red-marked), then you have to fill out the form<br>
			- You can delete a Map-Area by a LEFT-MOUSE-CLICK on the Map-Area (red-marked), then you have to click the DELETE button<br>
			- You can finetune a Map-Area by the curser keys<br>
			- You can move and resize a Map-Area via DRAG and DROP<br>
			- When you finished you have to click "Save Image Map"
			</span>

		</td>	
	</tr>
</table>

<br><br>

<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
for(var i=0;i<maxMaps;i++)
	{

		var _Estyle	=	' visibility:hidden; ';
		document.writeln('<div onkeyDown="_imgmapkeydowhdl()" onmousemove="___MmosOvrr(this);mousemove()" moveable=true  id="divmap'+i+'" style="position:absolute; left:0px; top:0px; width:0px; height:0px; z-index:'+(i+1)+'; '+_Estyle+' border: 1px solid Red; background-image: url(trans.gif);"><!-- <font color="Red"><strong>&nbsp;'+i+'</strong></font> --></div>');
		document.getElementById('divmap'+i).SALMAP_href=	'';
 		document.getElementById('divmap'+i).SALMAP_alt=		'';
		document.getElementById('divmap'+i).SALMAP_target=	'';
	}

</SCRIPT>

<? page_close();?>
</body>
</html>

--- NEW FILE: trans.gif ---
(This appears to be a binary file; contents omitted.)

[Openfirst-cvscommit] base/config/functions/wysiwyg/gecko/dev .DS_Store,1.1,NONE Converting an app using document_designMode from IE to Midas.htm,1.1,NONE Midas Demo.htm,1.1,NONE Midas Specification.htm,1.1,NONE Text Color.htm,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/gecko/dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/gecko/dev

Removed Files:
	.DS_Store 
	Converting an app using document_designMode from IE to Midas.htm 
	Midas Demo.htm Midas Specification.htm Text Color.htm 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- Midas Specification.htm DELETED ---

--- .DS_Store DELETED ---

--- Converting an app using document_designMode from IE to Midas.htm DELETED ---

--- Text Color.htm DELETED ---

--- Midas Demo.htm DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg/gecko/js .DS_Store,1.1,NONE .dhtmleditorgecko.js.swp,1.1,NONE lib.js,1.2,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg/gecko/js
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg/gecko/js

Removed Files:
	.DS_Store .dhtmleditorgecko.js.swp lib.js 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- .DS_Store DELETED ---

--- .dhtmleditorgecko.js.swp DELETED ---

--- lib.js DELETED ---

[Openfirst-cvscommit] base/config/functions/wysiwyg DHTMLEditor Info.txt,1.1,NONE

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

Update of /cvsroot/openfirst/base/config/functions/wysiwyg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions/wysiwyg

Removed Files:
	DHTMLEditor Info.txt 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- DHTMLEditor Info.txt DELETED ---

[Openfirst-cvscommit] base/config/functions browserid.php,1.4,NONE debug.php,1.12,NONE forms.php,1.2,NONE mail.php,1.6,NONE wysiwyg.php,1.5,NONE

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

Update of /cvsroot/openfirst/base/config/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151/config/functions

Removed Files:
	browserid.php debug.php forms.php mail.php wysiwyg.php 
Log Message:
-Adding /style and /includes directories
-Moving /images to /style/images
-Moving appropriate files out of config
-Updating ignore files

--- wysiwyg.php DELETED ---

--- mail.php DELETED ---

--- browserid.php DELETED ---

--- forms.php DELETED ---

--- debug.php DELETED ---