openfirst-cvscommit Mailing List for openFIRST (Page 18)
Brought to you by:
xtimg
Menu
▾
▴
openfirst-cvscommit — Notify subscribers of changes to files in CVS.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(41) |
Jun
(210) |
Jul
(39) |
Aug
(153) |
Sep
(147) |
Oct
(173) |
Nov
(81) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(33) |
Feb
(18) |
Mar
|
Apr
(62) |
May
|
Jun
(100) |
Jul
(38) |
Aug
(58) |
Sep
(1) |
Oct
|
Nov
(25) |
Dec
(172) |
| 2005 |
Jan
(31) |
Feb
(12) |
Mar
(67) |
Apr
(92) |
May
(247) |
Jun
(34) |
Jul
(36) |
Aug
(192) |
Sep
(15) |
Oct
(42) |
Nov
(92) |
Dec
(4) |
| 2006 |
Jan
|
Feb
(21) |
Mar
|
Apr
|
May
|
Jun
(53) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(4) |
Apr
(4) |
May
|
Jun
(15) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jamie <ast...@us...> - 2005-08-24 02:32:53
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2701/includes Modified Files: dbase.php Log Message: Added select(), update(), and replace() methods (from MediaWiki), so you don't have to hack together strings. Index: dbase.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/dbase.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dbase.php 30 Jun 2005 02:33:43 -0000 1.6 --- dbase.php 24 Aug 2005 02:32:42 -0000 1.7 *************** *** 451,454 **** --- 451,518 ---- return $value; } + + /** SELECT wrapper. + * Copied from MediaWiki. + * $options does nothing, currently. + */ + function select( $table, $vars, $conds='', $options = array() ) + { + $vars = $this->quoteField( $vars ); + if( is_array( $table ) ) { + $from = ' FROM ' . $this->quoteTable( $table ); + } elseif ($table!='') { + $from = ' FROM ' . $this->quoteTable( $table ); + } else { + $from = ''; + } + + #list( $useIndex, $tailOpts ) = $this->makeSelectOptions( (array)$options ); + $useIndex = $tailOpts = ''; + + $cols = $this->quoteField($vars); + + if( !empty( $conds ) ) { + if ( is_array( $conds ) ) { + $conds = $this->quoteFDPairs( $conds, ' AND ' ); + } + $sql = "SELECT $cols $from $useIndex WHERE $conds $tailOpts"; + } else { + $sql = "SELECT $cols $from $useIndex $tailOpts"; + } + return $this->query( $sql ); + } + + /** UPDATE wrapper, takes a condition array and a SET array. + * Copied from MediaWiki. + * + * @param string $table The table to UPDATE + * @param array $values An array of values to SET + * @param array $conds An array of conditions (WHERE) + * @param array $options Nothing (was an array of UPDATE options, can be one or + * more of IGNORE, LOW_PRIORITY) + */ + function update( $table, $values, $conds, $options = array() ) { + $table = $this->quoteTable( $table ); + #$opts = $this->makeUpdateOptions( $options ); + $opts = ''; + $sql = "UPDATE $opts $table SET " . $this->quoteFDPairs( $values ); + if ( $conds != '*' ) { + $sql .= " WHERE " . $this->quoteFDPairs( $conds, ' AND ' ); + } + return $this->query( $sql ); + } + + /** REPLACE query wrapper. + * Copied from MediaWiki (but removed the fancy stuff). + * + * @param string $table The table to perform it on. + * @param array $values An array of values to use in a SET clause. + */ + function replace( $table, $values ) { + $table = $this->quoteTable( $table ); + + $sql = "REPLACE INTO $table SET ".$this->quoteFDPairs($values); + return $this->query( $sql ); + } } ?> |
|
From: Jamie <ast...@us...> - 2005-08-24 02:31:25
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2356/includes Modified Files: auth.php Log Message: some TODO comments Index: auth.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/auth.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** auth.php 30 Jun 2005 03:27:57 -0000 1.4 --- auth.php 24 Aug 2005 02:31:17 -0000 1.5 *************** *** 27,30 **** --- 27,35 ---- */ // Purpose: Deal with authorization of users. + /** + * @TODO Change $user to $ogUser + * @TODO Create User class + * @TODO Generalize sessioning & authentication and move into classes. + */ require_once('dbase.php'); |
|
From: Jamie <ast...@us...> - 2005-08-23 18:25:37
|
Update of /cvsroot/openfirst/base/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12392/config Removed Files: base.sql Log Message: depreciated --- base.sql DELETED --- |
|
From: Jamie <ast...@us...> - 2005-08-23 18:25:29
|
Update of /cvsroot/openfirst/awards/setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12485/awards/setup Removed Files: setup.mssql setup.mysql Log Message: Obsolete files --- setup.mysql DELETED --- --- setup.mssql DELETED --- |
|
From: Jamie <ast...@us...> - 2005-08-23 18:22:28
|
Update of /cvsroot/openfirst/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11731/modules Modified Files: export.php index.php Log Message: Updates for module system Index: export.php =================================================================== RCS file: /cvsroot/openfirst/modules/export.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** export.php 31 May 2005 22:18:44 -0000 1.4 --- export.php 23 Aug 2005 18:22:19 -0000 1.5 *************** *** 1,91 **** ! <?php ! /* ! * openFIRST.modules - export.php ! * ! * Copyright (C) 2005, ! * 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 ! * ! */ ! require_once("../includes/globals.php"); ! ! $incl = ofirst_dbquery('SELECT * FROM '.ofirst_dbquote_table('config')); ! ! include_once($Header); ! ?><fieldset> ! <legend>Code</legend> ! <dl> ! <?php ! foreach($Modules as $key => $mod) { ! $id = $mod->getID(); ! $name = $mod->getName(); ! $version = $mod->getVersion(); ! $includes = $mod->getIncludes(); ! $adminbar = $mod->getAdminBar(); ! $navbar = $mod->getNavBar(); ! $author = $mod->getAuthor(); ! $maintainer = $mod->getMaintainer(); ! $dir = $mod->getDir(); ! ! $XMLCode = '<module id="'.htmlspecialchars($id).'"> ! <name>'.htmlspecialchars($name).'</name> ! <version>'.htmlspecialchars($version).'</version> ! <author>'.htmlspecialchars($author).'</author> ! '; ! ! if ($maintainer != '') ! $XMLCode .= ' <maintainer>'.htmlspecialchars($maintainer).'</maintainer> ! '; ! ! if (count($includes) > 0) { ! $XMLCode .= ' <includes> ! '; ! foreach($includes as $inc) { ! $XMLCode .= ' <include>'; ! $XMLCode .= htmlspecialchars($inc); ! $XMLCode .= '</include> ! '; ! } ! } ! ! if ($adminbar != '') ! $XMLCode .= ' <adminbar><![CDATA['.$adminbar.']]></adminbar> ! '; ! if ($navbar != '') ! $XMLCode .= ' <navbar><![CDATA['.$navbar.']]></navbar> ! '; ! '</module>'; ! ! if (isset($_REQUEST['save'])) { ! $save_len = file_put_contents("$fBasePath/$dir/openfirst.info.xml", $XMLCode); ! } ! ! ?><dt style="font-weight:bold;"><h2><?php echo htmlentities($name); ?></h2><?php ! if (isset($_REQUEST['save'])) { ! echo htmlentities("$save_len / ".strlen($PHPCode)); ! } ! ?></dt><dd> ! <textarea class="code xml" readonly="readonly" rows="18" cols="75"><?php ! ! echo htmlentities($XMLCode); ! ?></textarea></dd><?php ! } ! ?> ! </dl></fieldset> ! <?php ! include_once($Footer); ! ?> --- 1,93 ---- ! <?php ! /* ! * openFIRST.modules - export.php ! * ! * Copyright (C) 2005, ! * 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 ! * ! */ ! require_once("../includes/globals.php"); ! ! include_once($Header); ! ?> ! <p class="into">This takes module info in the database and generates XML for it. Note that it does ! <strong>not</strong> include table information.</p> ! ! <dl> ! <?php ! foreach($ogModuleManager->getDirs() as $moddir) { ! $mod = $ogModuleManager->addModuleFromDir($moddir); ! ! $id = $mod->getID(); ! $name = $mod->getName(); ! $version = $mod->getVersion(); ! $includes = $mod->getIncludes(); ! $adminbar = $mod->getAdminBar(); ! $navbar = $mod->getNavBar(); ! $author = $mod->getAuthor(); ! $maintainer = $mod->getMaintainer(); ! $dir = $mod->getDir(); ! ! $XMLCode = '<module id="'.htmlspecialchars($id).'"> ! <name>'.htmlspecialchars($name).'</name> ! <version>'.htmlspecialchars($version).'</version> ! <author>'.htmlspecialchars($author).'</author> ! '; ! ! if ($maintainer != '') ! $XMLCode .= ' <maintainer>'.htmlspecialchars($maintainer).'</maintainer> ! '; ! ! if (count($includes) > 0) { ! $XMLCode .= ' <includes> ! '; ! foreach($includes as $inc) { ! $XMLCode .= ' <include>'; ! $XMLCode .= htmlspecialchars($inc); ! $XMLCode .= '</include> ! '; ! } ! } ! ! if ($adminbar != '') ! $XMLCode .= ' <adminbar><![CDATA['.$adminbar.']]></adminbar> ! '; ! if ($navbar != '') ! $XMLCode .= ' <navbar><![CDATA['.$navbar.']]></navbar> ! '; ! $XMLCode .= '</module>'; ! ! if (isset($_REQUEST['save'])) { ! $save_len = file_put_contents("$fBasePath/$dir/openfirst.info.xml", $XMLCode); ! } ! ! ?><dt style="font-weight:bold;"><h2><?php echo htmlentities($name); ?></h2><?php ! if (isset($_REQUEST['save'])) { ! echo htmlentities("$save_len / ".strlen($PHPCode)); ! } ! ?></dt><dd> ! <textarea class="code xml" readonly="readonly" rows="18" cols="75"><?php ! ! echo htmlentities($XMLCode); ! ?></textarea></dd><?php ! } ! ?> ! </dl> ! <?php ! include_once($Footer); ! ?> Index: index.php =================================================================== RCS file: /cvsroot/openfirst/modules/index.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.php 27 May 2005 14:37:40 -0000 1.4 --- index.php 23 Aug 2005 18:22:19 -0000 1.5 *************** *** 1,135 **** ! <?php ! /* ! * openFIRST.modules - index.php ! * ! * Copyright (C) 2005, ! * 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 ! * ! */ ! require_once('../includes/globals.php'); ! require_once('modules.php'); ! ! $files = glob("$fBasePath/*/openfirst.info.xml"); ! ! $oMods = array(); ! ! foreach($files as $file) { ! $oMods[] =& Module::createFromFile($file); ! } ! ! include($Header); ?> ! <table> ! <thead> ! <tr> ! <th>ID</th> ! <th>Name</th> ! <th>Version</th> ! <th>Author</th> ! <th>Maintainer</th> ! <th>Includes</th> ! <th>Navbar</th> ! <th>Adminbar</th> ! <th>Setup script</th> ! <th>Remove script</th> ! <th>Upgrade script</th> ! </tr> ! </thead> ! <tbody> ! <?php foreach($oMods as $mod) { ! echo ' <tr> ! '; ! ! echo ' <td><code class="ID">'; ! echo htmlentities($mod->getID()); ! echo '</code></td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getName()); ! echo '</td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getVersion()); ! echo '</td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getAuthor()); ! echo '</td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getMaintainer()); ! echo '</td> ! '; ! ! echo ' <td>'; ! $incs = $mod->getIncludes(); ! if (count($incs) <= 0) { ! echo '‍'; ! } else { ! echo ' ! <ul> ! '; ! foreach($incs as $inc) { ! echo ' <li><code class="file">'; ! echo htmlentities($inc); ! echo '</code></li> ! '; ! } ! echo ' </ul> ! '; ! } ! echo '</td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getNavBar()); ! echo '</td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getAdminBar()); ! echo '</td> ! '; ! ! echo ' <td><code class="file">'; ! echo htmlentities($mod->getSetupScript()); ! echo '</code></td> ! '; ! ! echo ' <td><code class="file">'; ! echo htmlentities($mod->getRemoveScript()); ! echo '</code></td> ! '; ! ! echo ' <td><code class="file">'; ! echo htmlentities($mod->getUpgradeScript()); ! echo '</code></td> ! '; ! ! echo ' </tr> ! '; ! } ! ?> ! </tbody> ! </table> ! <?php ! include($Footer); ! ?> --- 1,144 ---- ! <?php ! /* ! * openFIRST.modules - index.php ! * ! * Copyright (C) 2005, ! * 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 ! * ! */ ! require_once('../includes/globals.php'); ! require_once('xmlModule.php'); ! ! $files = glob("$fBasePath/*/openfirst.info.xml"); ! ! $oMods = array(); ! ! foreach($files as $file) { ! $oMods[] =& xmlModule::createFromFile($file); ! } ! ! include($Header); ?> ! <p class="intro">Below is a table showing the modules available in this installation. The data is ! loaded from the <tt class="file">openfirst.info.xml</tt> file distrubuted with each module. ! This allows you to test your XML and debug module installation issues.</p> ! <table> ! <thead> ! <tr> ! <th>Dir</th> ! <th>ID</th> ! <th>Name</th> ! <th>Version</th> ! <th>Author</th> ! <th>Maintainer</th> ! <th>Includes</th> ! <th>Navbar</th> ! <th>Adminbar</th> ! <th>Setup script</th> ! <th>Remove script</th> ! <th>Upgrade script</th> ! </tr> ! </thead> ! <tbody> ! <?php foreach($oMods as $mod) { ! echo ' <tr> ! '; ! ! echo ' <th><tt class="file">'; ! echo htmlentities($mod->getDir()); ! echo '</tt></th> ! '; ! ! echo ' <td><code class="ID">'; ! echo htmlentities($mod->getID()); ! echo '</code></td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getName()); ! echo '</td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getVersion()); ! echo '</td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getAuthor()); ! echo '</td> ! '; ! ! echo ' <td>'; ! echo htmlentities($mod->getMaintainer()); ! echo '</td> ! '; ! ! echo ' <td>'; ! $incs = $mod->getIncludes(); ! if (count($incs) <= 0) { ! echo ' '; ! } else { ! echo ' ! <ul> ! '; ! foreach($incs as $inc) { ! echo ' <li><code class="file">'; ! echo htmlentities($inc); ! echo '</code></li> ! '; ! } ! echo ' </ul> ! '; ! } ! echo '</td> ! '; ! ! echo ' <td><pre>'; ! echo htmlentities($mod->getNavBar()); ! echo '</pre></td> ! '; ! ! echo ' <td><pre>'; ! echo htmlentities($mod->getAdminBar()); ! echo '</pre></td> ! '; ! ! echo ' <td><tt class="file">'; ! echo htmlentities($mod->getSetupScript()); ! echo '</tt></td> ! '; ! ! echo ' <td><tt class="file">'; ! echo htmlentities($mod->getRemoveScript()); ! echo '</tt></td> ! '; ! ! echo ' <td><tt class="file">'; ! echo htmlentities($mod->getUpgradeScript()); ! echo '</tt></td> ! '; ! ! echo ' </tr> ! '; ! } ! ?> ! </tbody> ! </table> ! <?php ! include($Footer); ! ?> |
|
From: Jamie <ast...@us...> - 2005-08-23 18:20:20
|
Update of /cvsroot/openfirst/awards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10821/awards Modified Files: openfirst.info.xml Log Message: updates for XML parser Index: openfirst.info.xml =================================================================== RCS file: /cvsroot/openfirst/awards/openfirst.info.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** openfirst.info.xml 30 Jun 2005 01:58:53 -0000 1.6 --- openfirst.info.xml 23 Aug 2005 18:20:11 -0000 1.7 *************** *** 1,2 **** --- 1,3 ---- + <?xml version="1.0"?> <module id="openfirst.awards"> <!-- Info --> *************** *** 8,16 **** <includes> ! <include>awards.php</include> </includes> <!-- Configuration --> ! <!-- 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><![CDATA[ --- 9,17 ---- <includes> ! <include>$fModPath/awards.php</include> </includes> <!-- Configuration --> ! <!-- Either entities or CDATA can be used. Just make sure it's parsed into the literal XHTML. --> <!-- Note the two ways of including BasePath. --> <navbar><![CDATA[ *************** *** 23,30 **** <!-- Database setup --> <db> ! <table id="awards"> <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> --- 24,31 ---- <!-- Database setup --> <db> ! <table name="awards"> <fields> ! <!-- Should be self explainatory --> ! <field name="ID" null="no" autoincrement="yes"><type length="6" unsigned="yes">int</type></field> <field name="AwardName"><type>tinytext</type></field> <field name="Description"><type>text</type></field> *************** *** 37,167 **** </fields> <keys> ! <key name="ID"> ! <cols> ! <col>ID</col> ! </cols> ! <primary /> </key> </keys> </table> ! <table id="firstawards"> ! <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.</col> ! </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 &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; 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; 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; 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> --- 38,172 ---- </fields> <keys> ! <key type="primary"> ! <col>ID</col> </key> </keys> </table> ! <!-- Need to change this to an ID-based system. --> ! <table name="firstawards"> ! <fields><!--The longest is currently 42 chars--> ! <field name="fa_id" null="no" autoincremented="yes"><type>int</type></field> ! <field name="AwardName" null="no"><type>tinytext</type></field> <field name="Description"><type>text</type></field> </fields> ! <keys> ! <key type="primary"> ! <col>fa_id</col> ! </key> ! </keys> ! <rows> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> <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.</col> ! </row> ! <row> <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> ! </row> ! <row> <col name="AwardName">Website Award</col> <col name="Description">This award recognizes excellence in student-designed, build, and managed FIRST team websites.</col> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> ! <col name="AwardName">The Autodesk Inventor ® 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> ! </row> ! <row> <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> ! </row> ! <row> <col name="AwardName">Champion</col> <col name="Description">This award celebrates the team or alliance that wins the Championship.</col> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> <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 & recruiting students to engineering. This team models gracious professionalism on and off the field and is a true inspiration to others</col> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> ! <col name="AwardName">Kleiner Perkins Caufield & 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> ! </row> ! <row> <col name="AwardName">Motorola-Quality</col> <col name="Description">This award celebrates machine robustness in concept and fabrication</col> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> ! <col name="AwardName">Johnson & 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> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! <row> <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> ! </row> ! </rows> </table> </db> |
|
From: Jamie <ast...@us...> - 2005-08-23 18:18:37
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/includes Removed Files: db_setup.php liteModule.php modules.php Log Message: cleaning up (obsolete files) --- liteModule.php DELETED --- --- db_setup.php DELETED --- --- modules.php DELETED --- |
|
From: Jamie <ast...@us...> - 2005-08-23 18:15:57
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9535/includes Modified Files: xmlModule.php Log Message: Partial parser ready Index: xmlModule.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/xmlModule.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xmlModule.php 18 Jul 2005 22:34:33 -0000 1.3 --- xmlModule.php 23 Aug 2005 18:15:46 -0000 1.4 *************** *** 25,29 **** // and handles installation/removal/upgrading ! require_once('db_setup.php'); class xmlModule { --- 25,29 ---- // and handles installation/removal/upgrading ! require_once('dbase.php'); class xmlModule { *************** *** 33,39 **** // XML ! /*private*/ var $mxmlCurTag, $mRootElement; // Specific tags for later. ! /*private*/ var $mIncludesTag, $mDBTag; function xmlModule($File) { --- 33,41 ---- // XML ! /*private*/ var /*$mxmlCurTag, $mRootElement,*/ $mTagStack; // Specific tags for later. ! # /*private*/ var $mIncludesTag, $mDBTag; ! // States ! /*private*/ var $mxmlCurTable, $mxmlCurField, $mxmlCurKey; function xmlModule($File) { *************** *** 44,47 **** --- 46,55 ---- return; } + $this->mxmlCurTag = $this->mRootElement = false; + $this->mTagStack = array(); + $this->mxmlCurTable = false; + $this->mxmlCurField = false; + $this->mxmlCurKey = false; + $hXML = xml_parser_create(); xml_set_object($hXML, $this); *************** *** 49,56 **** 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); --- 57,71 ---- xml_set_character_data_handler($hXML, 'characterData'); ! // This doesn't work ! # xml_parse($hXML, $this->getModuleDTD(), false); //Add predefined entities while ($data = fread($fp, 1024)) { if (!xml_parse($hXML, $data, feof($fp))) { + $errno = xml_get_error_code($hXML); + $error = xml_error_string($errno); + $pos = xml_get_current_byte_index($hXML); + $line = xml_get_current_line_number($hXML); + $col = xml_get_current_column_number($hXML); + trigger_error("XML parse error: ($errno) $error in $File on line $line at column $col"); xml_parser_free($hXML); unset($hXML); *************** *** 61,75 **** xml_parser_free($hXML); unset($hXML); ! ! $this->mIncludes = array(); ! // Handle includes ! if (is_object($this->mIncludesTag)) { ! $IncludeTags = $this->mIncludesTag->Contents; ! foreach($IncludeTags as $tag) { ! if (is_object($tag) && is_a($tag, 'xmlElement')) { ! $this->mIncludes[] = $tag->Contents[0]; ! } ! } ! } if (is_null($this->mMaintainer)) $this->mMaintainer = $this->mAuthor; --- 76,86 ---- xml_parser_free($hXML); unset($hXML); ! // Need to free up space ! unset($this->mxmlCurTag); ! unset($this->mxmlCurTable); ! unset($this->mxmlCurField); ! unset($this->mxmlCurKey); ! unset($this->mRootElement); ! unset($this->mTagStack); if (is_null($this->mMaintainer)) $this->mMaintainer = $this->mAuthor; *************** *** 154,193 **** */ /*public*/ function prepareTables() { ! $mTables =& $this->mTables; ! $mDBTag =& $this->mDBTag; ! ! $mTables = array(); ! foreach($mDBTag->Contents as $tag) { ! if (!(is_object($tag) && is_a($tag, 'xmlElement'))) continue; ! if ($tag->Name != 'TABLE') continue; } } - /* - /*** PRIVATE FUNCTIONS ***/ ! /*private*/ function getModuleDTD() { ! /* global $BasePath, $StylePath; ! $xmlBasePath = str_replace(array('&', '<', '>', '"', '\'' ), ! array('&', '<', '>', '"e;', '''), ! $BasePath ! ); ! $xmlStylePath = str_replace(array('&', '<', '>', '"', '\'' ), ! array('&', '<', '>', '"e;', '''), ! $StylePath ! ); ! return "<!DOCTYPE module [ ! <!ENTITY BasePath \"$xmlBasePath\"> ! <!ENTITY StylePath \"$xmlStylePath\"> ! ]>";*/ return '<!DOCTYPE module [ <!ENTITY BasePath "$BasePath"> - <!ENTITY StylePath "$StylePath"> <!ENTITY fBasePath "$fBasePath"> <!ENTITY fStylePath "$fStylePath"> ]>'; } --- 165,299 ---- */ /*public*/ function prepareTables() { ! $this->mTables = array(); ! foreach($this->mDBTag->Contents as $table) { ! if (!( is_object($table) && is_a($table, 'xmlElement') )) continue; ! if ($table->Name != 'TABLE') continue; ! $name = $table->Attributes['name']; + $this->mTables[$name] = array( 'name' => $name, + 'fields' => array(), + 'keys' => array() + ); + + foreach($table->Contents as $tag) { + switch($tag->Name) { + case 'FIELDS': + $this->mTables[$name]['fields'] = $this->parseFields($tag); + break; + + case 'KEYS': + $this->mTables[$name]['keys'] = $this->parseKeys($tag); + break; + + case 'ROWS': + $this->mTables[$name]['data'] = $this->parseData($tag); + break; + } + } } + // Free up space + $this->mDBTag = false; } /*** PRIVATE FUNCTIONS ***/ ! /*private*/ function parseFields($fieldtag) { ! $rtn = array(); ! foreach($fieldtag->Contents as $tag) { ! if ($tag->Name != 'FIELD') continue; ! $field = array(); ! $field['name'] = $tag->Attributes['name']; ! if (isset($tag->Attributes['null'])) ! $field['null'] = ofConvert2Bool($tag->Attributes['null'], array('null')); ! if (isset($tag->Attributes['autoincrement'])) ! $field['auto'] = ofConvert2Bool($tag->Attributes['autoincrement'], array('autoincrement')); ! ! foreach($tag->Contents as $partstag) { ! switch($partstag->Name) { ! case 'TYPE': ! $field['type'] = $partstag->getTextContents(); ! break; ! ! case 'SET': ! case 'ENUM': ! $field['type'] = $partstag->Name; ! //Parse contents ! $values = array(); ! foreach($partstag->Children as $value) { ! $values[] = $value->getTextContents(); ! } ! $field['values'] = $values; ! break; ! ! case 'DEFAULT': ! $field['default'] = $partstag->getTextContents(); ! break; ! } ! } ! ! $rtn[$field['name']] = $field; ! } ! return $rtn; ! } ! ! /** ! */ ! /*private*/ function parseKeys($keytag) { ! $rtn = array(); ! foreach($keytag->Contents as $tag) { ! if ($tag->Name != 'KEY') continue; ! $key = array(); ! $key['type'] = 'index'; ! if (isset($tag->Attributes['type'])) $key['type'] = $tag->Attributes['type']; ! $key['name'] = $tag->Attributes['name']; ! if ( (strcasecmp($key['type'], 'primary') == 0) || (strcasecmp($key['name'], 'primary') == 0) ) { ! $key['type'] = 'primary'; ! $key['name'] = 'PRIMARY'; ! } else if ( $key['type'] && ! strcasecmp($key['type'], 'primary') && ! strcasecmp($key['type'], 'unique') && ! strcasecmp($key['type'], 'index') ) { ! // invalid key type. Skip this tag ! continue; ! } ! ! $key['cols'] = array(); ! foreach($tag->Contents as $coltag) { ! $key['cols'][] = $coltag->getTextContents(); ! } ! $rtn[$key['name']] = $key; ! } ! return $rtn; ! } ! ! /** ! */ ! /*private*/ function parseData($datatag) { ! $rtn = array(); ! foreach($datatag->Contents as $tag) { ! if ($tag->Name != 'ROW') continue; ! $row = array(); ! foreach($tag->Contents as $coltag) { ! $row[$coltag->Attributes['name']] = $coltag->getTextContents(); ! } ! $rtn[] = $row; ! } ! ! return $rtn; ! } ! ! /*private*/ function getModuleDTD() { return '<!DOCTYPE module [ <!ENTITY BasePath "$BasePath"> <!ENTITY fBasePath "$fBasePath"> + <!ENTITY StylePath "$StylePath"> <!ENTITY fStylePath "$fStylePath"> + <!ENTITY ModPath "$ModPath"> + <!ENTITY fModPath "$fModPath"> + <!ENTITY DirName "$DirName"> + + <!ENTITY null "NULL"> ]>'; } *************** *** 195,199 **** /*** XML PARSER HOOKS ***/ function startElement($parser, $name, $attrs) { ! if (isset($this->mxmlCurTag)) { $this->mxmlCurTag =& $this->mxmlCurTag->addElement($name, $attrs); } else { --- 301,306 ---- /*** XML PARSER HOOKS ***/ function startElement($parser, $name, $attrs) { ! array_push($this->mTagStack, $name); ! if (isset($this->mxmlCurTag) && is_object($this->mxmlCurTag)) { $this->mxmlCurTag =& $this->mxmlCurTag->addElement($name, $attrs); } else { *************** *** 204,211 **** if ($name == 'MODULE') { if (isset($attrs['ID'])) $this->mID = $attrs['ID']; ! } else if ($name == 'SCRIPT') { ! if (!isset($attrs['rel']) || !isset($attrs['src'])) break; ! $type = $attrs['rel']; ! $file = $attrs['src']; if ($type == 'setup') { $this->mSetupScript = $file; --- 311,319 ---- if ($name == 'MODULE') { if (isset($attrs['ID'])) $this->mID = $attrs['ID']; ! } ! else if ($name == 'SCRIPT') { ! if (!isset($attrs['REL']) || !isset($attrs['SRC'])) break; ! $type = $attrs['REL']; ! $file = $attrs['SRC']; if ($type == 'setup') { $this->mSetupScript = $file; *************** *** 216,241 **** } } } function endElement($parser, $name) { if ($name == 'NAME') { ! $this->mName = $this->mxmlCurTag->Contents[0]; } else if ($name == 'VERSION') { ! $this->mVersion = $this->mxmlCurTag->Contents[0]; } else if ($name == 'AUTHOR') { ! $this->mAuthor = $this->mxmlCurTag->Contents[0]; } else if ($name == 'MAINTAINER') { ! $this->mMaintainer = $this->mxmlCurTag->Contents[0]; } else if ($name == 'NAVBAR') { ! $this->mNavBar = $this->mxmlCurTag->Contents[0]; } else if ($name == 'ADMINBAR') { ! $this->mAdminBar = $this->mxmlCurTag->Contents[0]; ! } else if ($name == 'INCLUDES') { ! $this->mIncludesTag =& $this->mxmlCurTag; ! } else if ($name == 'DB') { ! $this->mDBTag =& $this->mxmlCurTag; } $this->mxmlCurTag =& $this->mxmlCurTag->getParent(); } --- 324,413 ---- } } + else if ($name == 'TABLE') { + if (!isset($attrs['NAME'])) { + print_r($attrs); + trigger_error('The table tag must always have a name attribute.', E_USER_ERROR); + } + $this->mxmlCurTable = $attrs['NAME']; + $this->mTables[$this->mxmlCurTable] = + array( 'name' => $this->mxmlCurTable, + 'fields' => array(), + 'keys' => array() + ); + } + else if ($name == 'FIELD' && in_array('TABLE', $this->mTagStack)) { + $field = array(); + $this->mxmlCurField = $field['name'] = $attrs['NAME']; + if (isset($attrs['null'])) + $field['null'] = ofConvert2Bool($attrs['NULL'], array('null')); + if (isset($attrs['autoincrement'])) + $field['auto'] = ofConvert2Bool($attrs['AUTOINCREMENT'], array('autoincrement')); + + $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField] = $field; + } + else if ($name == 'KEY' && $this->mxmlCurTable) { + $key = array(); + $key['type'] = 'index'; + $key['name'] = $key['type'] = false; + if (isset($attrs['TYPE'])) $key['type'] = $attrs['TYPE']; + if (isset($attrs['NAME'])) $this->mxmlCurKey = $key['name'] = $attrs['NAME']; + if ( (strcasecmp($key['type'], 'primary') == 0) || (strcasecmp($key['name'], 'primary') == 0) ) { + $key['type'] = 'primary'; + $this->mxmlCurKey = $key['name'] = 'PRIMARY'; + } + + $key['cols'] = array(); + + $this->mTables[$this->mxmlCurTable]['keys'][$this->mxmlCurKey] = $key; + } + else if ($name == 'TYPE' && $this->mxmlCurField) { + if (isset($attrs['LENGTH'])) + $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['length'] = $attrs['LENGTH']; + if (isset($attrs['UNSIGNED'])) + $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['unsigned'] = ofConvert2Bool($attrs['UNSIGNED']); + } + else if (($name == 'SET' || $name == 'ENUM') && in_array('FIELD', $this->mTagStack)) { + $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['type'] = $name; + $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['values'] = array(); + + } } function endElement($parser, $name) { + $par_name = false; + if (count($this->mTagStack) > 1) + $par_name = $this->mTagStack[count($this->mTagStack)-2]; // One for the zero start, one for second from end if ($name == 'NAME') { ! $this->mName = $this->mxmlCurTag->getTextContents(); } else if ($name == 'VERSION') { ! $this->mVersion = $this->mxmlCurTag->getTextContents(); } else if ($name == 'AUTHOR') { ! $this->mAuthor = $this->mxmlCurTag->getTextContents(); } else if ($name == 'MAINTAINER') { ! $this->mMaintainer = $this->mxmlCurTag->getTextContents(); } else if ($name == 'NAVBAR') { ! $this->mNavBar = $this->mxmlCurTag->getTextContents(); } else if ($name == 'ADMINBAR') { ! $this->mAdminBar = $this->mxmlCurTag->getTextContents(); ! } else if ($name == 'INCLUDE') { ! $this->mIncludes[] = $file = $this->mxmlCurTag->getTextContents(); ! } else if ($name == 'TABLE') { ! $this->mxmlCurTable = false; ! } else if ($name == 'FIELD') { ! $this->mxmlCurField = false; ! } else if ($name == 'KEY') { ! $this->mxmlCurKey = false; ! } else if ($name == 'TYPE' && $this->mxmlCurField) { ! $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['type'] = $this->mxmlCurTag->getTextContents(); ! } else if ($name == 'DEFAULT' && $this->mxmlCurField) { ! $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['default'] = $this->mxmlCurTag->getTextContents(); ! } else if ($name == 'COL' && $this->mxmlCurKey) { ! $this->mTables[$this->mxmlCurTable]['keys'][$this->mxmlCurKey]['cols'][] = $this->mxmlCurTag->getTextContents(); ! } else if ($par_name == 'SET' || $par_name == 'ENUM') { ! $this->mTables[$this->mxmlCurTable]['fields'][$this->mxmlCurField]['values'][] = $this->mxmlCurTag->getTextContents(); } $this->mxmlCurTag =& $this->mxmlCurTag->getParent(); + array_pop($this->mTagStack); } *************** *** 245,248 **** --- 417,426 ---- } + /** + * Used internally when parsing the XML document as + * a cheap DOM substitute + * + * Should not be used elsewhere. + */ class xmlElement { var $Name, $Attributes, $Contents, $parent; *************** *** 256,259 **** --- 434,440 ---- /*public*/ function addCData($Text) { + // the DB XML doesn't care about whitespace. + $Text = trim($Text); + if ($Text == '') return; //Don't bother if it's nothing. if (count($this->Contents) == 0) { $this->Contents[] = $Text; *************** *** 277,280 **** --- 458,469 ---- return $this->parent; } + + /*public*/ function getTextContents() { + $rtn = ''; + foreach($this->Contents as $child) { + if (is_string($child)) $rtn .= $child; + } + return $rtn; + } } |
|
From: Jamie <ast...@us...> - 2005-08-23 18:03:53
|
Update of /cvsroot/openfirst/base/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5703/config Modified Files: openfirst.info.xml Log Message: Updates for new parser Index: openfirst.info.xml =================================================================== RCS file: /cvsroot/openfirst/base/config/openfirst.info.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** openfirst.info.xml 18 Jul 2005 22:34:33 -0000 1.4 --- openfirst.info.xml 23 Aug 2005 18:03:45 -0000 1.5 *************** *** 1,2 **** --- 1,3 ---- + <?xml version="1.0"?> <module id="openfirst.base"> <!-- NOTE: This file defines the basic DB layout when installing or upgrading. *************** *** 5,40 **** <version>CVS</version> <author>The openFIRST Team</author> <!-- Database setup --> <db> ! <table id="config"> <fields> <!-- Empty tags with no attributes serve as flags. Should be self explainatory --> ! <field name="modulename"><type>varchar<length>25</length></type> <not_null /> <default></default></field> ! <field name="dir"><type>varchar<length>25</length></type> <not_null /></field> ! <field name="UpdateDate"><type>datetime</type> <not_null /></field> ! <field name="label"><type>varchar<length>25</length></type></field> ! <field name="Author"><type>tinytext</type></field> ! <field name="Maintainer"><type>tinytext</type><default>null</default></field> ! <field name="version"><type>varchar<length>10</length></type> <not_null /> <default>CVS</default></field> ! <field name="showonmenu"><type>BOOL</type> <not_null /> <default>0</default></field> ! <field name="active"><type>BOOL</type> <not_null /> <default>0</default></field> ! <field name="adminnavigation"><type>text</type></field> ! <field name="modulenavigation"><type>text</type></field> ! <field name="includes"><type>text</type></field> </fields> <keys> ! <key name="dir"> ! <cols> ! <col>dir</col> ! </cols> ! <unique /> </key> </keys> </table> ! <table id="members"> <fields> ! <field name="user"><type>varchar<length>128</length></type><not_null /></field> <field name="firstname"><type>tinytext</type></field> <field name="lastname"><type>tinytext</type></field> --- 6,43 ---- <version>CVS</version> <author>The openFIRST Team</author> + + <includes> + <include>$fBasePath/includes/settings.php</include> + <include>$fBasePath/includes/slug.php</include> + </includes> <!-- Database setup --> <db> ! <table name="config"> <fields> <!-- Empty tags with no attributes serve as flags. Should be self explainatory --> ! <field name="modulename" null="no"><type length="25">varchar</type> <default></default></field> ! <field name="dir" null="no"><type length="25">varchar</type></field> ! <field name="UpdateDate" null="no"><type>datetime</type></field> ! <field name="label" ><type length="25">varchar</type></field> ! <field name="Author" ><type>tinytext</type></field> ! <field name="Maintainer" ><type>tinytext</type></field> ! <field name="version" null="no"><type length="10">varchar</type> <default>CVS</default></field> ! <field name="showonmenu" null="no"><type>BOOL</type> <default>0</default></field> ! <field name="active" null="no"><type>BOOL</type> <default>0</default></field> ! <field name="adminnavigation" ><type>text</type></field> ! <field name="modulenavigation" ><type>text</type></field> ! <field name="includes" ><type>text</type></field> </fields> <keys> ! <key type="primary"> ! <col>dir</col> </key> </keys> </table> ! <table name="members"> <fields> ! <field name="user" null="no"><type length="128">varchar</type></field> <field name="firstname"><type>tinytext</type></field> <field name="lastname"><type>tinytext</type></field> *************** *** 47,51 **** <field name="year"><type>year</type></field> <field name="email"><type>text</type></field> ! <field name="icq"><type>int<length>11</length></type></field> <field name="aim"><type>tinytext</type></field> <field name="msn"><type>tinytext</type></field> --- 50,54 ---- <field name="year"><type>year</type></field> <field name="email"><type>text</type></field> ! <field name="icq"><type length="11">int</type></field> <field name="aim"><type>tinytext</type></field> <field name="msn"><type>tinytext</type></field> *************** *** 56,68 **** <field name="dateregistered"><type>datetime</type></field> <field name="picturelocation"><type>tinytext</type></field> ! <field name="team"><type>int<length>11</length></type></field> <field name="skills"><type>text</type></field> </fields> <keys> ! <key name="user"> ! <cols> ! <col>user</col> ! </cols> ! <unique /> </key> </keys> --- 59,68 ---- <field name="dateregistered"><type>datetime</type></field> <field name="picturelocation"><type>tinytext</type></field> ! <field name="team"><type length="11">int</type></field> <field name="skills"><type>text</type></field> </fields> <keys> ! <key name="user" type="unique"> ! <col>user</col> </key> </keys> |
|
From: Jamie <ast...@us...> - 2005-08-23 18:01:46
|
Update of /cvsroot/openfirst/base/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4710/config Modified Files: install.php Log Message: kinda updated, still lots to do Index: install.php =================================================================== RCS file: /cvsroot/openfirst/base/config/install.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** install.php 26 May 2005 21:00:02 -0000 1.25 --- install.php 23 Aug 2005 18:01:20 -0000 1.26 *************** *** 1,118 **** ! <?php ! /* ! * openFIRST.base - config/install.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: 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 ! // 10 minutes should be sufficient, even for remote database servers ! ! if(isset($user->user) == true && $user->membertype == "administrator") { ! ?> ! ! <h1>Module Installer</h1> ! <p>This utility will create the tables required for certain openFIRST components ! to run.<br /> ! Select the modules you would like to install.<br /> ! <br /> ! <span style="color:red;">Once installed, modules must be enabled from the <a href="modules.php"><strong>Module ! Administrator</strong></a>.</span></p> ! ! <form method="post" action="install.php"> ! <table id="moduleInstall"> ! <colgroup> ! <col /> ! <col /> ! <col class="file" /> ! </colgroup> ! <colgroup> ! <col /> ! </colgroup> ! <thead> ! <tr><th colspan="3">Module Name</th><th>Status</th></tr> ! </thead> ! <tbody> ! <?php ! ! $InstalledModules = $Modules; ! ! $Modules = array(); ! ! $files = glob("$fBasePath/*/openfirst.info.php"); ! if (count($files) < 1) { ! ?> ! <p class="error">You have no modules to install or are misconfigured. You can go to <a href="http://www.openfirst.org/">openFIRST.org</a> ! to download them.</p> ! <?php ! die(include($Footer)); ! } ! ! # Get the meta data ! foreach ($files as $filename) { ! include($filename); ! } ! ! foreach($Modules as $code => $info) { ! $dir = "$fBasePath/$code"; ! $sqlf = "$dir/setup/setup.$DBaseType"; ! $WasInstalled = $IsInstalled = array_key_exists($code, $InstalledModules); ! $InstallFailed = false; ! if(isset($_POST[$code]) == true && $_POST[$code] == "on" && !$IsInstalled) { ! if (ofirst_dbexec_file($sqlf)) { ! $IsInstalled = true; ! } else { ! $InstallFailed = true; ! } ! } ! echo '<tr><td><input type="checkbox" name="'.htmlentities($code).'" '; ! if ($IsInstalled) echo 'checked="checked" '; ! echo '/><label for="'.htmlentities($code).'">'.htmlentities($info['name']).'</label></td> ! <td>('.htmlentities($info['ver']).')'.'</td> ! <td>'.htmlentities($code)."</td>"; ! ! if ($IsInstalled && !$WasInstalled) { ! echo('<td style="background-color: lime; color:black; font-weight:bold;">Module Installation succeeded!</td></tr>'); ! } else if ($InstallFailed) { ! echo('<td style="background-color: red; color:black; font-weight:bold;">Module Installation failed!</td></tr>'); ! } else if ($IsInstalled && $WasInstalled) { ! echo('<td style="background-color: green; color:white;">Module Installed</td></tr>'); ! } else { ! echo('<td style="background-color: gray; color:white;">Module available</td></tr>'); ! } ! } ! ?> ! </table> ! <br /><input type="submit" value="Create Tables" /> ! </form> ! ! <?php } else { ! showlogin(); ! } ! ! include($Footer); ?> --- 1,118 ---- ! <?php ! /* ! * openFIRST.base - config/install.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: 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 ! // 10 minutes should be sufficient, even for remote database servers ! ! if(isset($user->user) == true && $user->membertype == "administrator") { ! ?> ! ! <h1>Module Installer</h1> ! <p>This utility will create the tables required for certain openFIRST components ! to run.<br /> ! Select the modules you would like to install.<br /> ! <br /> ! <span style="color:red;">Once installed, modules must be enabled from the <a href="modules.php"><strong>Module ! Administrator</strong></a>.</span></p> ! ! <p class="error">The file <tt class="file">config/install.php</tt> needs to be updated for the new ! Module system.</p> ! ! <form method="post" action="install.php"> ! <table id="moduleInstall"> ! <colgroup> ! <col /> ! <col /> ! <col class="file" /> ! </colgroup> ! <colgroup> ! <col /> ! </colgroup> ! <thead> ! <tr><th colspan="3">Module Name</th><th>Status</th></tr> ! </thead> ! <tbody> ! <?php ! ! $InstalledModules = $ogModuleManager->getDirs(); ! ! $Modules = array(); ! ! $files = glob("$fBasePath/*/openfirst.info.xml"); ! if (count($files) < 1) { ! ?> ! <p class="error">You have no modules to install or are misconfigured. You can go to <a href="http://www.openfirst.org/">openFIRST.org</a> ! to download them.</p> ! <?php ! include($Footer); ! die(); ! } ! ! # Get the meta data ! foreach($Modules as $code => $info) { ! $dir = "$fBasePath/$code"; ! $sqlf = "$dir/setup/setup.$DBaseType"; ! $WasInstalled = $IsInstalled = array_key_exists($code, $InstalledModules); ! $InstallFailed = false; ! if(isset($_POST[$code]) == true && $_POST[$code] == "on" && !$IsInstalled) { ! if (ofirst_dbexec_file($sqlf)) { ! $IsInstalled = true; ! } else { ! $InstallFailed = true; ! } ! } ! echo '<tr><td><input type="checkbox" name="'.htmlentities($code).'" '; ! if ($IsInstalled) echo 'checked="checked" '; ! echo '/><label for="'.htmlentities($code).'">'.htmlentities($info['name']).'</label></td> ! <td>('.htmlentities($info['ver']).')'.'</td> ! <td>'.htmlentities($code)."</td>"; ! ! if ($IsInstalled && !$WasInstalled) { ! echo('<td style="background-color: lime; color:black; font-weight:bold;">Module Installation succeeded!</td></tr>'); ! } else if ($InstallFailed) { ! echo('<td style="background-color: red; color:black; font-weight:bold;">Module Installation failed!</td></tr>'); ! } else if ($IsInstalled && $WasInstalled) { ! echo('<td style="background-color: green; color:white;">Module Installed</td></tr>'); ! } else { ! echo('<td style="background-color: gray; color:white;">Module available</td></tr>'); ! } ! } ! ?> ! </table> ! <br /><input type="submit" value="Create Tables" /> ! </form> ! ! <?php } else { ! showlogin(); ! } ! ! include($Footer); ?> |
|
From: Jamie <ast...@us...> - 2005-08-23 17:59:56
|
Update of /cvsroot/openfirst/base/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4009/config Modified Files: index.php Log Message: Correcting of bugzilla URL Index: index.php =================================================================== RCS file: /cvsroot/openfirst/base/config/index.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** index.php 30 Jun 2005 03:27:57 -0000 1.14 --- index.php 23 Aug 2005 17:59:45 -0000 1.15 *************** *** 67,71 **** </tr> <tr><th>openFIRST Project Statistics</th><td> ! <script type='application/x-javascript' src='http://bugzilla.openfirst.org/openfirst/bugcrushers.php?style=true'></script> </td></tr> </table> --- 67,71 ---- </tr> <tr><th>openFIRST Project Statistics</th><td> ! <script type='application/x-javascript' src='http://bugzilla.openfirst.org/openfirst/bugcrushers.php?style=js'></script> </td></tr> </table> |
|
From: Jamie <ast...@us...> - 2005-08-23 17:41:32
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32101/includes Modified Files: sitesettings.tpl Log Message: no newline at end Index: sitesettings.tpl =================================================================== RCS file: /cvsroot/openfirst/base/includes/sitesettings.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sitesettings.tpl 30 Jun 2005 02:31:24 -0000 1.3 --- sitesettings.tpl 23 Aug 2005 17:41:24 -0000 1.4 *************** *** 31,33 **** $MailNotify = %MASTERMAIL%; $MailFrom = %BOTMAIL%; ! ?> --- 31,33 ---- $MailNotify = %MASTERMAIL%; $MailFrom = %BOTMAIL%; ! ?> \ No newline at end of file |
|
From: Astronouth7303 <ast...@us...> - 2005-08-22 17:37:05
|
Update of /cvsroot/openfirst/base/includes/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6425/includes/functions Modified Files: debug.php Log Message: Don't reference undefined values in CLI mode Index: debug.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/functions/debug.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** debug.php 30 Jun 2005 03:55:47 -0000 1.5 --- debug.php 22 Aug 2005 17:36:57 -0000 1.6 *************** *** 61,65 **** Error Number: $errno"; ! $specifics = "PHP_SELF: {$_SERVER['PHP_SELF']} HTTP Host: {$_SERVER['HTTP_HOST']}"; --- 61,67 ---- Error Number: $errno"; ! $specifics = "PHP_SELF: {$_SERVER['PHP_SELF']}"; ! if (isset($_SERVER['HTTP_HOST'])) ! $specifics .= " HTTP Host: {$_SERVER['HTTP_HOST']}"; |
|
From: Astronouth7303 <ast...@us...> - 2005-08-22 15:10:27
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3964/includes Modified Files: Module.php Log Message: Added comment about iterating through modules. Index: Module.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/Module.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Module.php 17 Aug 2005 17:27:59 -0000 1.7 --- Module.php 22 Aug 2005 15:10:19 -0000 1.8 *************** *** 29,32 **** --- 29,37 ---- require_once('dbase.php'); + /** + * The correct way to enumerate through the modules is to get the list of + * them via $ogModuleManager->getDirs() and then call + * $ogModuleManager->getModuleFromDir() for each element of that. + */ /** Provides functions for managing modules. |
|
From: Tim G. <xt...@us...> - 2005-08-20 22:31:43
|
Update of /cvsroot/openfirst/www/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1499 Added Files: roadmap.php Log Message: Add a Roadmap --- NEW FILE: roadmap.php --- <h1><img src="/image/news_subscribe.png" alt="" title=""> Roadmap</h1> <h2>Development</h2> <h3>Coordinator: <a href="mailto: ja...@op...">Jamie</a></h3> <ul> <li><b>No target date</b> - Object Oriented design for the Portal Software</li> <li><b>No target date</b> - Greatly enhanced module system with a rich API</li> <li><b>No target date</b> - Introduction of slugs which give a standard and intuitive format for linking to data within each module</li> </ul> <p>More details are available at: <a href="http://endeavour.zapto.org/astro73/blog/new-things-for-openfirst/">New things for openFIRST</a>.</p> <h2>Internationalization</h2> <h3>Coordinator: <a href="mailto: gui...@op...">Guilherme</a></h3> <ul> <li><b>No target date</b> - Implementation of a standard system to allow for translation of pages.</li> <li><b>No target date</b> - Translation of openFIRST Portal System from English to Portugese.</li> </ul> <h2>Validity</h2> <h3>Coordinator: <a href="mailto: da...@op...">Daniel</a></h3> <ul> <li><b>September 5th, 2005</b> - Completion of a new header/footer for the openFIRST Project page which is XHTML 1.1 compliant and is designed to be much more friendly to use.</li> </ul> <h2>Testing</h2> <h3>Coordinator: T.B.D. (Volunteers are needed)</h3> <p>The testing group is fairly self explanatory. The duties of the testing group are not limited to just the modules distributed by the openFIRST project but also include the testing of other efforts.</p> <ul> <li><b>ASAP</b> - Testing coordinator appointed</li> </ul> <h2>Accessibility</h2> <h3>Coordinator: T.B.D. (Volunteers are needed)</h3> <p>The accessibility group is responsible for ensuring that the site, modules, etc. work for those who are faced with disabilities such as blindness, poor vision, and those accessing openFIRST materials through a medium other than a conventional web browser (such as those using a PDA/cell phone browser, screen reader, braile output device, etc.)</p> <ul> <li><b>ASAP</b> - Accessibility coordinator appointed</li> </ul> <h2>Administration</h2> <h3>Coordinator: <a href="mailto: ti...@op...">Tim</a></h3> <ul> <li><b>October, 2005</b> - Improved API for FIRST Blogs</li> <li><b>September, 2005</b> - Auto-discovery of new blogs for FIRST Blogs using an XML feed of user information from Chief Delphi</li> </ul> <h2>Evangelism</h2> <h3>Coordinator: T.B.D. (Volunteers are needed)</h3> <p>The evangelism group is tasked with getting users/volunteers/generally spreading the word about the project</p> <ul> <li><b>ASAP</b> - Evangelism coordinator appointed</li> </ul> <h2>Support</h2> <h3>Coordinator: T.B.D. (Volunteers are needed)</h3> <p>The support group is responsible primarily for supporting the shipped modules using Bugzilla, e-mail, forums, and potentially other means </p> <ul> <li><b>ASAP</b> - Support coordinator appointed</li> </ul> |
|
From: Tim G. <xt...@us...> - 2005-08-20 22:31:42
|
Update of /cvsroot/openfirst/www/htdocs/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1499/doc Modified Files: index.php Log Message: Add a Roadmap Index: index.php =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/doc/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.php 2 Jul 2005 15:18:33 -0000 1.3 --- index.php 20 Aug 2005 22:31:34 -0000 1.4 *************** *** 24,26 **** --- 24,27 ---- <li><a href="/cvs/smartcvs/">SmartCVS Tutorial for access to the openFIRST CVS repository</a> (for SmartCVS version 2)</li> <li><a href="/cvs/smartcvs3/">SmartCVS Tutorial for access to the openFIRST CVS repository</a> (for SmartCVS version 3)</li> + <li><a href="/roadmap.php">Development Roadmap</a> - Contains information about what's planned for when in the future</li> </ul> |
|
From: Tim G. <xt...@us...> - 2005-08-20 15:39:46
|
Update of /cvsroot/openfirst/www/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23738 Modified Files: headers.php Log Message: Use smaller images. Index: headers.php =================================================================== RCS file: /cvsroot/openfirst/www/inc/headers.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** headers.php 20 Jul 2005 23:38:35 -0000 1.20 --- headers.php 20 Aug 2005 15:39:38 -0000 1.21 *************** *** 140,145 **** <img alt="XHTML 1.0" src="/image/powered/xhtml-1.0.png"> <br><img alt="Apache" src="/image/powered/apache.gif"> ! <br><img alt="Microsoft IIS" src="/image/tested/iis.png"> ! <br><img alt="Sambar" src="/image/tested/sambar.png"> <br><img alt="PHP" src="/image/powered/php-power-micro2.png"> <br><img alt="MySQL" src="/image/powered/mysql.gif"> --- 140,145 ---- <img alt="XHTML 1.0" src="/image/powered/xhtml-1.0.png"> <br><img alt="Apache" src="/image/powered/apache.gif"> ! <br><img alt="Microsoft IIS" src="/image/powered/ms-iis.png"> ! <br><img alt="Sambar" src="/image/powered/sambar.png"> <br><img alt="PHP" src="/image/powered/php-power-micro2.png"> <br><img alt="MySQL" src="/image/powered/mysql.gif"> |
|
From: Tim G. <xt...@us...> - 2005-08-20 15:38:35
|
Update of /cvsroot/openfirst/www/htdocs/image/powered In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23617 Added Files: sambar.png ms-iis.png Log Message: Add the small logos that I've had sitting around for a while. --- NEW FILE: ms-iis.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: sambar.png --- (This appears to be a binary file; contents omitted.) |
|
From: Astronouth7303 <ast...@us...> - 2005-08-17 17:28:49
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10625/includes Modified Files: functions.php Log Message: syntax error Index: functions.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** functions.php 17 Aug 2005 16:36:16 -0000 1.6 --- functions.php 17 Aug 2005 17:28:40 -0000 1.7 *************** *** 105,109 **** function ofStripLineComment($commentors, $text) { $rtn = array(); ! $lines = explode(array("\r\n","\n","\r"), $text) foreach($lines as $line) { $parts = explode($commentors, $line, 2); --- 105,109 ---- function ofStripLineComment($commentors, $text) { $rtn = array(); ! $lines = explode(array("\r\n","\n","\r"), $text); foreach($lines as $line) { $parts = explode($commentors, $line, 2); |
|
From: Astronouth7303 <ast...@us...> - 2005-08-17 17:28:08
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10422/includes Modified Files: Module.php Log Message: - Updated calls to replaceVariables(), now ofReplaceVariables() - Added to beginning-of-file comment Index: Module.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/Module.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Module.php 18 Jul 2005 22:34:33 -0000 1.6 --- Module.php 17 Aug 2005 17:27:59 -0000 1.7 *************** *** 24,27 **** --- 24,29 ---- // Purpose: Defines the Module class, which handles data about a module, // and code for the module itself. + // Also defines the ModuleManager class, which handles Module + // instances of installed modules require_once('dbase.php'); *************** *** 121,129 **** $this->mIncludes = explode(',', $mod->includes); foreach($this->mIncludes as $key => $value) { ! $this->mIncludes[$key] = replaceVariables($value, $this->getDir()); } } ! $this->mNavBar = replaceVariables($mod->modulenavigation, $this->getDir()); ! $this->mAdminBar = replaceVariables($mod->adminnavigation.' <a href="http://bugzilla.openfirst.org/">Report Bug</a>', $this->getDir()); $this->mShow = $mod->showonmenu; $this->mActive = $mod->active; --- 123,131 ---- $this->mIncludes = explode(',', $mod->includes); foreach($this->mIncludes as $key => $value) { ! $this->mIncludes[$key] = ofReplaceVariables($value, $this->getDir()); } } ! $this->mNavBar = ofReplaceVariables($mod->modulenavigation, $this->getDir()); ! $this->mAdminBar = ofReplaceVariables($mod->adminnavigation.' <a href="http://bugzilla.openfirst.org/">Report Bug</a>', $this->getDir()); $this->mShow = $mod->showonmenu; $this->mActive = $mod->active; |
|
From: Astronouth7303 <ast...@us...> - 2005-08-17 16:36:25
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29153/includes Modified Files: functions.php Log Message: added ofConvert2Bool() Index: functions.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/functions.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** functions.php 17 Aug 2005 16:07:59 -0000 1.5 --- functions.php 17 Aug 2005 16:36:16 -0000 1.6 *************** *** 112,114 **** --- 112,143 ---- return implode(PHP_EOL, $rtn); } + + /** Converts input to boolean + * returns true on: yes, y, true, 1 + * returns false on: no, n, false, 0 + * returns nothing if neither (return;). + * if a value is in both $moretrue and $morefalse, it is treated as true + * case-insensitive + */ + function ofConvert2Bool($text, $moretrue=array(), $morefalse=array()) { + $yesvals = $moretrue; + $yesvals[] = 'yes'; + $yesvals[] = 'y'; + $yesvals[] = 'true'; + $yesvals[] = '1'; + + $novals = $morefalse; + $novals[] = 'no'; + $novals[] = 'n'; + $novals[] = 'false'; + $novals[] = '0'; + + foreach ($yesvals as $val) { + if (strcasecmp($text, $val) == 0) return true; + } + foreach ($novals as $val) { + if (strcasecmp($text, $val) == 0) return false; + } + return; + } ?> |
|
From: Astronouth7303 <ast...@us...> - 2005-08-17 16:15:27
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24916/includes Modified Files: compatibility.php Log Message: - Added set_include_path(), get_include_path(), and restore_include_path() - Converted line endings to LF (may not commit?) - Removed entity ' Index: compatibility.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/compatibility.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** compatibility.php 27 May 2005 16:07:51 -0000 1.2 --- compatibility.php 17 Aug 2005 16:15:13 -0000 1.3 *************** *** 33,37 **** // 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't even have <a href="http://www.php.net/manual/en/function.glob.php"><code>glob()</code></a>.'); } --- 33,37 ---- // 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\'t even have <a href="http://www.php.net/manual/en/function.glob.php"><code>glob()</code></a>.'); } *************** *** 48,50 **** --- 48,70 ---- } } + + if (!function_exists('set_include_path')) { + function set_include_path($new_include_path) { + $old = get_include_path(); + ini_set('include_path', $new_include_path); + return $old; + } + } + + if (!function_exists('get_include_path')) { + function get_include_path() { + return ini_get('include_path'); + } + } + + if (!function_exists('restore_include_path')) { + function restore_include_path() { + ini_restore('include_path'); + } + } ?> |
|
From: Astronouth7303 <ast...@us...> - 2005-08-17 16:08:08
|
Update of /cvsroot/openfirst/base/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21922/includes Modified Files: functions.php Log Message: - ofStripLineComment() will handle more than one line at a time - replaceVariables() renamed ofReplaceVariables() - added $DirName to ofReplaceVariables() Index: functions.php =================================================================== RCS file: /cvsroot/openfirst/base/includes/functions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** functions.php 30 Jun 2005 01:09:23 -0000 1.4 --- functions.php 17 Aug 2005 16:07:59 -0000 1.5 *************** *** 33,37 **** * $StylePath, $fStylePath, $ModPath, and $fModPath. */ ! function replaceVariables($text, $ModuleDir = false) { if ($ModuleDir === false) { global $CurrentModule; --- 33,37 ---- * $StylePath, $fStylePath, $ModPath, and $fModPath. */ ! function ofReplaceVariables($text, $ModuleDir = false) { if ($ModuleDir === false) { global $CurrentModule; *************** *** 46,50 **** '$fStylePath', '$ModPath', ! '$fModPath' ); --- 46,51 ---- '$fStylePath', '$ModPath', ! '$fModPath', ! '$DirName' ); *************** *** 54,58 **** $fStylePath, "$BasePath/$ModuleDir", ! "$fBasePath/$ModuleDir" ); --- 55,60 ---- $fStylePath, "$BasePath/$ModuleDir", ! "$fBasePath/$ModuleDir", ! "$ModuleDir" ); *************** *** 99,107 **** * Given a string and an array of commentors (in PHP, it would be array('#', '//')), * remove all end-of-line comments. ! * Note that this only works if you feed it one line at a time. */ function ofStripLineComment($commentors, $text) { ! $parts = explode($commentors, $text, 2); ! return $parts[0]; } ?> --- 101,114 ---- * Given a string and an array of commentors (in PHP, it would be array('#', '//')), * remove all end-of-line comments. ! * Now handles multiple lines */ function ofStripLineComment($commentors, $text) { ! $rtn = array(); ! $lines = explode(array("\r\n","\n","\r"), $text) ! foreach($lines as $line) { ! $parts = explode($commentors, $line, 2); ! $rtn[] = $parts[0]; ! } ! return implode(PHP_EOL, $rtn); } ?> |
|
From: <bug...@we...> - 2005-07-21 13:05:18
|
http://bugzilla.openfirst.org/show_bug.cgi?id=252 Summary: [JJ] Add support for Gravatars Product: openFIRST Version: unspecified Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: base AssignedTo: de...@op... ReportedBy: ti...@op... A "Gravatar" is a Globally Recognized Avatar, see: http://www.gravatar.com/ for details. Ideally existing modules which use (or could use) avatars should support this system, e.g. guestbook comments, forum posts, etc. such that people going to multiple team sites carry some personalization with them. Perhaps there could also be a fall back to Chief Delphi icons; if there's a way of looking them up via e-mail address? ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. |
|
From: Tim G. <xt...@us...> - 2005-07-20 23:44:36
|
Update of /cvsroot/openfirst/www/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17730 Modified Files: index.php Log Message: Comment out the founder stuff; it belongs elsewhere, not here. Index: index.php =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/index.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** index.php 10 Jul 2005 22:33:05 -0000 1.7 --- index.php 20 Jul 2005 23:44:26 -0000 1.8 *************** *** 40,43 **** --- 40,44 ---- } + /* ?> <hr> *************** *** 68,69 **** --- 69,73 ---- <br><a href='http://www.archangelrobotics.com/'>Archangel Robotics (Team #1049 from Toronto, Ontario)</a></p></center> </td></tr></table> + <?php + */ + ?> |
7 messages has been excluded from this view by a project administrator.
