openfirst-cvscommit Mailing List for openFIRST (Page 2)
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: <xt...@us...> - 2006-07-28 14:54:18
|
Revision: 211 Author: xtimg Date: 2006-07-28 07:54:00 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=211&view=rev Log Message: ----------- Update the contact info a bit. Modified Paths: -------------- trunk/www/www/htdocs/contact.php Modified: trunk/www/www/htdocs/contact.php =================================================================== --- trunk/www/www/htdocs/contact.php 2006-07-04 17:44:53 UTC (rev 210) +++ trunk/www/www/htdocs/contact.php 2006-07-28 14:54:00 UTC (rev 211) @@ -1,21 +1,10 @@ <div id="title"><img alt="" src="http://www.openfirst.org/image/email.png"> Contacts</h1></div> -<p>The best way to contact openFIRST staff is to use the <a href="http://sourceforge.net/mail/?group_id=78233">project mailing lists</a>. +<p>The best way to contact openFIRST staff is to use the <a href="http://sourceforge.net/mail/?group_id=78233">project mailing lists</a>.</p> -</p> +<p>See the <a href="/volunteers/">Volunteers list</a> for contact +information for specific people.</p> - -<p><b>Founding teams:</b></p> -<p>St. Michael's College School Archangel Robotics<br> - <a href="http://www.archangelrobotics.com/">http://www.archangelrobotics.com</a></p> -<p>Port Perry High School Robotics<br> - <a href="http://www.portperryrobotics.ca">http://www.portperryrobotics.ca</a></p> -<p><b>Contributing teams:</b></p> -<p>Sinclair Sprockets Robotics Team<br> - <a href="http://www.sinclairsprockets.com">http://www.sinclairsprockets.com</a></p> -<p>Kinetic Knights<br> - <a href="http://www.kineticknights.com/kineticknights/">http://www.kineticknights.com/kineticknights/</a> - <p><b>Useful links:</b></p> <p>FIRST Canadian Regional<a href="http://www.firstcanadianregional.org"><br> http://www.firstcanadianregional.org</a></p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-07-04 17:45:02
|
Revision: 210 Author: astronouth7303 Date: 2006-07-04 10:44:53 -0700 (Tue, 04 Jul 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=210&view=rev Log Message: ----------- Ooops... Didn't delete old version. Modified Paths: -------------- trunk/src/includes/functions.php Modified: trunk/src/includes/functions.php =================================================================== --- trunk/src/includes/functions.php 2006-07-04 14:07:01 UTC (rev 209) +++ trunk/src/includes/functions.php 2006-07-04 17:44:53 UTC (rev 210) @@ -100,21 +100,6 @@ } } } -function ofFormatSize($size) { - $base = 1024; - - $units = array_reverse($units, true); - reset($units); - while (list($pow, $unit) = each($units)) { - if ($unit === false) continue; - if ($size >= pow($base, $pow)) { - $unitsize = $size/pow($base, $pow); - $unitsize = rtrim($unitsize, '0'); - if (substr($unitsize, -1) == '.') $unitsize = substr($unitsize, 0, -1); - return number_format($unitsize, 2, '.', '').' '.$unit; - } - } -} /** Strip line comment. * Given a string and an array of commentors (in PHP, it would be array('#', '//')), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-07-04 14:07:09
|
Revision: 209 Author: astronouth7303 Date: 2006-07-04 07:07:01 -0700 (Tue, 04 Jul 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=209&view=rev Log Message: ----------- Added __clone() methods, so that PHP5 code doesn't screw it up. Modified Paths: -------------- trunk/src/includes/MSSQLDataBase.php trunk/src/includes/MySQLDataBase.php trunk/src/includes/ODBCDataBase.php trunk/src/includes/dbase.php Modified: trunk/src/includes/MSSQLDataBase.php =================================================================== --- trunk/src/includes/MSSQLDataBase.php 2006-07-04 14:06:05 UTC (rev 208) +++ trunk/src/includes/MSSQLDataBase.php 2006-07-04 14:07:01 UTC (rev 209) @@ -45,6 +45,14 @@ return new MSSQLDataBase(dbMSSQL, $server, $username, $password); } + /** + * Called in PHP5 when you clone an object to re-initialize properties. + * Needed primarily because otherwise error numbers and such would get mixed up. + */ + function __clone() { + $this->connection = mssql_connect($this->server, $this->username, $this->password); + } + /*public*/ function getTypeName() { return 'Microsoft SQL'; } Modified: trunk/src/includes/MySQLDataBase.php =================================================================== --- trunk/src/includes/MySQLDataBase.php 2006-07-04 14:06:05 UTC (rev 208) +++ trunk/src/includes/MySQLDataBase.php 2006-07-04 14:07:01 UTC (rev 209) @@ -50,6 +50,18 @@ return new MySQLDataBase(dbMYSQL, $server, $username, $password, $newlink, $flags); } + /** + * Called in PHP5 when you clone an object to re-initialize properties. + * Needed primarily because otherwise error numbers and such would get mixed up. + */ + function __clone() { + if($this->flags !== false) { + $this->connection = mysql_connect($this->server, $this->username, $this->password, true, $this->flags); + } else { + $this->connection = mysql_connect($this->server, $this->username, $this->password); + } + } + /*public*/ function getTypeName() { return 'MySQL'; } Modified: trunk/src/includes/ODBCDataBase.php =================================================================== --- trunk/src/includes/ODBCDataBase.php 2006-07-04 14:06:05 UTC (rev 208) +++ trunk/src/includes/ODBCDataBase.php 2006-07-04 14:07:01 UTC (rev 209) @@ -48,6 +48,14 @@ return new MySQLDataBase(dbODBC, $server, $username, $password, $newlink); } + /** + * Called in PHP5 when you clone an object to re-initialize properties. + * Needed primarily because otherwise error numbers and such would get mixed up. + */ + function __clone() { + $this->connection = odbc_connect($this->server, $this->username, $this->password, true); + } + /*public*/ function getTypeName() { return 'ODBC'; } Modified: trunk/src/includes/dbase.php =================================================================== --- trunk/src/includes/dbase.php 2006-07-04 14:06:05 UTC (rev 208) +++ trunk/src/includes/dbase.php 2006-07-04 14:07:01 UTC (rev 209) @@ -32,14 +32,14 @@ $ogLastQuery = ''; -function &ofCreateDataBase($type, $server, $password, $newlink = false, $flags = false) { +function &ofCreateDataBase($type, $server, $username, $password, $newlink = false, $flags = false) { $class = "{$type}DataBase"; if (!class_exists($class)) { // This assumption is only for DataBase implementations require_once("{$class}.php"); } //$obj =& $class::factory($server, $password, $newlink, $flags); - $obj =& call_user_func(array($class, 'factory'), $server, $password, $newlink, $flags); + $obj =& call_user_func(array($class, 'factory'), $server, $username, $password, $newlink, $flags); return $obj; } @@ -51,12 +51,17 @@ */ class DataBase { /*private*/ var $type, $connection, $lastquery, $db, $prefix, $overrides; + /*private*/ var $server, $username, $password, $flags; // $newlink isn't needed function DataBase($type = dbUNKNOWN, $server = '', $username = '', $password = '', $newlink = '', $flags = '') { $args = func_get_args(); call_user_func_array(array(&$this, '__construct'), $args); } // Wrapper for database selection. - function __construct($type = dbUNKNOWN, $server = '', $username = '', $password = '', $newlink = '', $flags = '') { + function __construct($type = dbUNKNOWN, $server = false, $username = false, $password = false, $newlink = false, $flags = false) { + $this->server = $server; + $this->username = $username; + $this->password = $password; + $this->flags = $flags; $this->type = $type; global $sqlTablePrefix; $this->prefix = $sqlTablePrefix; @@ -68,7 +73,15 @@ /*static*/ function &factory($server = false, $username = false, $password = false, $newlink = false, $flags = false) { # Override } - + + /** + * Called in PHP5 when you clone an object to re-initialize properties. + */ + function __clone() { + # Override + //$this->connection = __connect__($this->server, $this->username, $this->password, $this->flags); + } + /** Returns the display name for this type of database. */ /*public*/ function getTypeName() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-07-04 14:06:09
|
Revision: 208 Author: astronouth7303 Date: 2006-07-04 07:06:05 -0700 (Tue, 04 Jul 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=208&view=rev Log Message: ----------- Add optional $ogCompress, defaulting to true. Modified Paths: -------------- trunk/src/includes/globals.php Modified: trunk/src/includes/globals.php =================================================================== --- trunk/src/includes/globals.php 2006-07-04 14:04:45 UTC (rev 207) +++ trunk/src/includes/globals.php 2006-07-04 14:06:05 UTC (rev 208) @@ -105,17 +105,6 @@ set_include_path( get_include_path().PATH_SEPARATOR."$configdir/".PATH_SEPARATOR."."); unset($configdir); -// Enable output compression, if zlib is available and no output has been sent -if ( function_exists('ob_gzhandler') && - !ini_get('zlib.output_compression') && - !headers_sent() - ) { - @ob_start('ob_gzhandler'); // If already compressing, shut up. - header('x-of-compressing: yes'); -} else if (!headers_sent()) { - header('x-of-compressing: no'); -} - require_once('functions.php'); // This should been done at the earliest possible time. // Which is now. @@ -136,6 +125,8 @@ $ogMoreHeadItems = array(); $ogMoreStyles = ''; +$ogCompress = true; + if (!defined('OPENFIRST_NO_INSTALLATION')) { $ogSQLTablePrefix = 'ofirst_'; $ogDataBaseType = dbMYSQL; @@ -146,6 +137,18 @@ require_once('sitesettings.php'); } +// Enable output compression, if zlib is available and no output has been sent +if ( !function_exists('ob_gzhandler') && + !ini_get('zlib.output_compression') && + !headers_sent() && + $ogCompress + ) { + @ob_start('ob_gzhandler'); // If already compressing, shut up. + header('x-of-compressing: yes'); +} else if (!headers_sent()) { + header('x-of-compressing: no'); +} + if (!defined('OPENFIRST_NO_INSTALLATION')) { $ogDB = ofCreateDataBase($ogDataBaseType, $ogSQLServer, $ogSQLUser, $ogSQLPassword); if (!defined('OPENFIRST_INSTALLATION_SCRIPT')) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-07-04 14:04:50
|
Revision: 207 Author: astronouth7303 Date: 2006-07-04 07:04:45 -0700 (Tue, 04 Jul 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=207&view=rev Log Message: ----------- Remove trailing 0's/decimal in ofFormatSize(). Modified Paths: -------------- trunk/src/includes/functions.php Modified: trunk/src/includes/functions.php =================================================================== --- trunk/src/includes/functions.php 2006-06-28 21:10:38 UTC (rev 206) +++ trunk/src/includes/functions.php 2006-07-04 14:04:45 UTC (rev 207) @@ -69,21 +69,39 @@ * Uses 1024 definition (1 KB = 1024 B) */ function ofFormatSize($size) { + $base = 1024; ## Set to 1000 if you want SI compliance + $units = array( + 'B', + 'KB', + 'MB', + 'GB', + 'TB', + 'PB', + 'EB', + 'ZB', + 'YB', + 'XB', + false, + 'VB' + ); + + $units = array_reverse($units, true); + reset($units); + while (list($pow, $unit) = each($units)) { + if ($unit === false) continue; + if ($size >= pow($base, $pow)) { + $unitsize = $size/pow($base, $pow); + $unitsize = rtrim($unitsize, '0'); + if (substr($unitsize, -1) == '.') $unitsize = substr($unitsize, 0, -1); + $rv = number_format($unitsize, 2, '.', ''); + $rv = rtrim($rv, '0'); // Remove trailing 0's + $rv = rtrim($rv, '.'); // Remove trailing decimal (if any) + return $rv.' '.$unit; + } + } +} +function ofFormatSize($size) { $base = 1024; - $units = array( - 'B', - 'KB', - 'MB', - 'GB', - 'TB', - 'PB', - 'EB', - 'ZB', - 'YB', - 'XB', - false, - 'VB' - ); $units = array_reverse($units, true); reset($units); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-28 21:10:42
|
Revision: 206 Author: astronouth7303 Date: 2006-06-28 14:10:38 -0700 (Wed, 28 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=206&view=rev Log Message: ----------- Added Editor::splitText() for spellchecker support. Modified Paths: -------------- trunk/src/includes/edit.php Modified: trunk/src/includes/edit.php =================================================================== --- trunk/src/includes/edit.php 2006-06-28 18:00:46 UTC (rev 205) +++ trunk/src/includes/edit.php 2006-06-28 21:10:38 UTC (rev 206) @@ -88,6 +88,24 @@ function parseText($text) { return htmlentities($text); } + + /** + * Splits text into markup and content. + * Returns an array alternating between the two, starting with content. + * This is primarily for spellcheckers. + * + * Example: + * BBCode: "You really, [b]really[/b] don't want to do this!" + * -> array("You really, ", "[b]", "really", "[/b]", " don't want to do this!" + * + * If you were to concatanate all the content returned by this function, the + * result should be very similar to getPlainText() + * + * Returns false if this isn't supported. + */ + function splitText($text) { + return false; + } } #Default This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-28 18:00:53
|
Revision: 205 Author: astronouth7303 Date: 2006-06-28 11:00:46 -0700 (Wed, 28 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=205&view=rev Log Message: ----------- - Found readnews.php! - Modified viewnews() so that $admin is no longer given, but $id is (optionally) Modified Paths: -------------- trunk/src/news/viewnews.php Added Paths: ----------- trunk/src/news/readnews.php Added: trunk/src/news/readnews.php =================================================================== --- trunk/src/news/readnews.php (rev 0) +++ trunk/src/news/readnews.php 2006-06-28 18:00:46 UTC (rev 205) @@ -0,0 +1,24 @@ +<?php +/* + * openFIRST.news - readnews.php + * + * Copyright (C) 2003, + * openFIRST Project + * Original Author: Tim Ginn <tim...@sy...> + * + * Based on the original code from openFIRST. Edited and refined by David Di Biase + * Copyright (C) 2003, Archangel Robotics #1049 * + */ + +include_once("../includes/globals.php"); +$Title = "Read News"; +include_once($ogHeader); + +if(isset($_GET['id'])){ + shownews(1,$_GET['id']); +} else { + shownews(); +} +?> +[ <a href="index.php?show=all">Show All News</a> ] +<?php include_once($ogFooter); ?> Property changes on: trunk/src/news/readnews.php ___________________________________________________________________ Name: of:module + openfirst.news Name: svn:mime-type + text/x-php Name: svn:eol-style + native Modified: trunk/src/news/viewnews.php =================================================================== --- trunk/src/news/viewnews.php 2006-06-23 23:34:24 UTC (rev 204) +++ trunk/src/news/viewnews.php 2006-06-28 18:00:46 UTC (rev 205) @@ -25,11 +25,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - function shownews($limit = 5,$admin=false) { +function shownews($limit = 5, $id=false) { // Get a list of the users able to // be contacted via the feedback form. - global $ogBasePath, $ogDB; - $query = $ogDB->select('news', '*', '', array('order'=>'post_date', 'dir'=>'DESC', 'limit' => $limit)); + global $ogBasePath, $ogDB, $ogUser; + if ($id === false) { + $query = $ogDB->select('news', '*', '', array('order'=>'post_date', 'dir'=>'DESC', 'limit' => $limit)); + } else { + $query = $ogDB->select('news', '*', array('ID' => $id), array('limit' => 1)); + } if ($ogDB->numberOfRows($query) != 0){ @@ -47,7 +51,7 @@ echo($news->news); } echo("<br /><br /><center>[ <a href='{$ogBasePath}/news/comments.php?ID={$news->ID}'>View Comments</a> ]</center></td></tr>"); - if ($admin) { + if ($ogUser->isAdmin()) { #TODO: Add ACL system echo('<tr><td class="sub"><div style="" align="right">Admin options: <a href="'.$ogBasePath.'/news/admin/editnews.php?id='.$news->ID.'"><img alt="Edit story" border=0 src="'.$ogBasePath.'/news/images/newdoc.gif" align=absmiddle>Edit story</a>'); echo('<a href="'.$ogBasePath.'/news/admin/killnews.php?id='.$news->ID.'"><img alt="Delete story" border=0 src="'.$ogBasePath.'/news/images/killdoc.gif" align=absmiddle>Delete story</a></div></td></tr>'); } @@ -61,5 +65,5 @@ echo("<div align=center>[ <b><a href=\"$ogBasePath/news/admin\">Post News</a></b> ]</div>"); } return(0); - } +} ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 23:34:29
|
Revision: 204 Author: astronouth7303 Date: 2006-06-23 16:34:24 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=204&view=rev Log Message: ----------- Added the first Selenium test (or part of one) Added Paths: ----------- trunk/tests/ trunk/tests/selenium/ trunk/tests/selenium/first-admin.html Added: trunk/tests/selenium/first-admin.html =================================================================== --- trunk/tests/selenium/first-admin.html (rev 0) +++ trunk/tests/selenium/first-admin.html 2006-06-23 23:34:24 UTC (rev 204) @@ -0,0 +1,93 @@ +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/devel/</td> + <td></td> +</tr> +<tr> + <td>assertTitle</td> + <td>openFIRST</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=login to configure openFIRST options</td> + <td></td> +</tr> +<tr> + <td>assertTitle</td> + <td>openFIRST</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>login</td> + <td>admin</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>openfirst</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//input[@value='Login']</td> + <td></td> +</tr> +<tr> + <td>assertTitle</td> + <td>openFIRST</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>//div[@id='content']/h1</td> + <td>openFIRST Configuration Area</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Install Modules</td> + <td></td> +</tr> +<tr> + <td>assertTitle</td> + <td>openFIRST</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>awards</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>modules</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>news</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//input[@value='Install Modules']</td> + <td></td> +</tr> +<tr> + <td>assertTitle</td> + <td>openFIRST</td> + <td></td> +</tr> +</tbody></table> +</body> +</html> Property changes on: trunk/tests/selenium/first-admin.html ___________________________________________________________________ Name: svn:mime-type + text/html Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 23:26:50
|
Revision: 203 Author: astronouth7303 Date: 2006-06-23 16:25:50 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=203&view=rev Log Message: ----------- syntax error Modified Paths: -------------- trunk/src/style/footers.php Modified: trunk/src/style/footers.php =================================================================== --- trunk/src/style/footers.php 2006-06-23 23:23:33 UTC (rev 202) +++ trunk/src/style/footers.php 2006-06-23 23:25:50 UTC (rev 203) @@ -1,5 +1,5 @@ <?php -global $ogBasePath, +global $ogBasePath; if(! isset($ogBasePath)){ $ogBasePath = "http://openfirst.sourceforge.net/"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 23:24:41
|
Revision: 202 Author: astronouth7303 Date: 2006-06-23 16:23:33 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=202&view=rev Log Message: ----------- Fixed variable names. Modified Paths: -------------- trunk/src/awards/admin/index.php trunk/src/config/index.php trunk/src/config/install.php trunk/src/includes/Module.php trunk/src/includes/auth.php trunk/src/includes/functions/debug.php trunk/src/includes/skinfunctions.php trunk/src/includes/slug.php trunk/src/index.php trunk/src/modules/export.php trunk/src/modules/extended.php trunk/src/modules/index.php trunk/src/style/footers.php trunk/src/style/headers.php trunk/src/wysiwyg/wysiwyg.php Modified: trunk/src/awards/admin/index.php =================================================================== --- trunk/src/awards/admin/index.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/awards/admin/index.php 2006-06-23 23:23:33 UTC (rev 202) @@ -32,7 +32,8 @@ echo("<p>Award information has been deleted.</p><p>[ <a href='./'>Manage Awards</a> ]</p>"); - die(include_once($footer)); + include_once($footer); + die(); } $DisplayForm = true; $CreateNew = true; @@ -227,9 +228,9 @@ <th>Award Type</th> <td class="left"><table> <tr> - <td><img src="<?php echo($BasePath); ?>/awards/awardsgold.png" alt="Gold"></td> - <td><img src="<?php echo($BasePath); ?>/awards/awardssilver.png" alt="Silver"></td> - <td><img src="<?php echo($BasePath); ?>/awards/awardsbronze.png" alt="Bronze"></td> + <td><img src="<?php echo htmlentities($ogBasePath); ?>/awards/awardsgold.png" alt="Gold"></td> + <td><img src="<?php echo htmlentities($ogBasePath); ?>/awards/awardssilver.png" alt="Silver"></td> + <td><img src="<?php echo htmlentities($ogBasePath); ?>/awards/awardsbronze.png" alt="Bronze"></td> </tr> <tr> <td><div align="center"> @@ -275,7 +276,7 @@ while($awards = $ogDB->fetchObject($query)){ ?> <tr> - <td><img src="<?php echo($BasePath); ?>/awards/awards<?php echo $awards->Image; ?>.png" alt="<?php echo $awards->Image; ?>"></td> + <td><img src="<?php echo htmlentities($ogBasePath); ?>/awards/awards<?php echo $awards->Image; ?>.png" alt="<?php echo $awards->Image; ?>"></td> <td><?php echo $awards->AwardName; ?></td> <td><?php echo $awards->Event; ?></td> <td><?php echo $awards->Date; ?></td> Modified: trunk/src/config/index.php =================================================================== --- trunk/src/config/index.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/config/index.php 2006-06-23 23:23:33 UTC (rev 202) @@ -41,7 +41,7 @@ </table> <?php - if(is_writable("$fBasePath/includes/sitesettings.php") && file_exists("$fBasePath/includes/first.php")) { + if(is_writable("$ogfBasePath/includes/sitesettings.php") && file_exists("$ogfBasePath/includes/first.php")) { echo "<p class='warning'><strong>Warning</strong>: Your <span class='file'>sitesettings.php</span> file is writable by the web user. Also, <span class='file'>first.php</span> is still in existance. After you @@ -52,7 +52,7 @@ configuration. For maximal security, you should also change the filesystem permissions so that <span class='file'>sitesettings.php</span> is not writable by the web user."; - } elseif(is_writable("$fBasePath/includes/sitesettings.php")) { + } elseif(is_writable("$ogfBasePath/includes/sitesettings.php")) { echo "<p class='warning'><strong>Warning</strong>: Your <span class='file'>sitesettings.php</span> file is writable by the web user. For maximal security, you should change the filesystem permissions to correct @@ -101,4 +101,4 @@ </table> <?php include($ogFooter); -?> \ No newline at end of file +?> Modified: trunk/src/config/install.php =================================================================== --- trunk/src/config/install.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/config/install.php 2006-06-23 23:23:33 UTC (rev 202) @@ -51,7 +51,7 @@ $Modules = array(); -$files = glob("$fBasePath/*/openfirst.info.xml"); +$files = glob("$ogfBasePath/*/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> @@ -124,4 +124,4 @@ <?php include($ogFooter); -?> \ No newline at end of file +?> Modified: trunk/src/includes/Module.php =================================================================== --- trunk/src/includes/Module.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/includes/Module.php 2006-06-23 23:23:33 UTC (rev 202) @@ -236,7 +236,7 @@ You can do any manipulation you want to it, however, it is suggested that you use a directory-style setup, and that it is kept sane and logical. function getSlugURI($slug) { - return $BasePath.'/'.$this->dir.'/'.$slug; + return $ogBasePath.'/'.$this->dir.'/'.$slug; } It is recomended that you present the slug, in some form, to the user. At a later date, there may be functions available from the skin to do this. @@ -251,4 +251,4 @@ } require_once('BaseModule.php'); -?> \ No newline at end of file +?> Modified: trunk/src/includes/auth.php =================================================================== --- trunk/src/includes/auth.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/includes/auth.php 2006-06-23 23:23:33 UTC (rev 202) @@ -91,9 +91,9 @@ if($ogPasswordSaveEnabled){ echo " <br /><input type='checkbox' name='savepass' id='savepass' value='1' checked='checked' /><label for='savepass'>Save Password</label>"; } - global $BasePath; + global $ogBasePath; echo "</td></tr> - <tr><td colspan='2'><a href=\"".htmlentities($BasePath)."/members/forgotten.php\">Forgot Password</a></td></tr> + <tr><td colspan='2'><a href=\"".htmlentities($ogBasePath)."/members/forgotten.php\">Forgot Password</a></td></tr> </table>"; // FIXME: Reference to module not in base // Include anything else in the post, so it is forwarded to the actual form @@ -103,4 +103,4 @@ } echo "</form><br /><br />"; } -?> \ No newline at end of file +?> Modified: trunk/src/includes/functions/debug.php =================================================================== --- trunk/src/includes/functions/debug.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/includes/functions/debug.php 2006-06-23 23:23:33 UTC (rev 202) @@ -37,8 +37,8 @@ function ofirst_error_handler($errno, $error, $file, $line, $context) { global $ogDataBaseType, $ogEncryptionType, $ogSiteTitle, $ogVersion, $ogSQLServer, $ogSQLUser, $ogSQLPassword, $ogSQLDatabase, - $ogSQLConnection, $ogPasswordSaveEnabled, $regEnabled, $Server, - $BasePath, $fBasePath, $Home, $StylePath, $fStylePath, $ogHeader, + $ogSQLConnection, $ogPasswordSaveEnabled, $ogRegistraytionEnabled, $ogServer, + $ogBasePath, $ogfBasePath, $ogHome, $ogStylePath, $ogfStylePath, $ogHeader, $ogFooter, $ogMailNotify, $ogMailFrom, $ogDB, $osType, $ogCurrentModule, $ogUser, $lastquery, $usingPHP5; global $NO_ADD_BUG; Modified: trunk/src/includes/skinfunctions.php =================================================================== --- trunk/src/includes/skinfunctions.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/includes/skinfunctions.php 2006-06-23 23:23:33 UTC (rev 202) @@ -30,9 +30,9 @@ * @todo Move implementation to skin */ function slug($slug) { - global $StylePath; + global $ogStylePath; $eslug = htmlentities($slug); - $eimage = htmlentities($StylePath).'/images/slug.gif'; + $eimage = htmlentities($ogStylePath).'/images/slug.gif'; // Image source: http://www.onescience.com/forum/images/slug_125.gif //onclick=\"handleSlugClick(this)\" echo "<span class=\"slug\"><img src=\"{$eimage}\" alt=\"(SLUG)\" title=\"Show slug\" /><span class=\"hide\">{$eslug}</span></span>"; Modified: trunk/src/includes/slug.php =================================================================== --- trunk/src/includes/slug.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/includes/slug.php 2006-06-23 23:23:33 UTC (rev 202) @@ -24,8 +24,8 @@ // Purpose: Defines the functions to handle slugs. /** Returns the URI of a slug. - * Note that it is relative to $BasePath, so you still need to - * prepend $BasePath to it. + * Note that it is relative to $ogBasePath, so you still need to + * prepend $ogBasePath to it. * It also removes an initial slug: in it. */ function ofGetSlugURI($slug) { Modified: trunk/src/index.php =================================================================== --- trunk/src/index.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/index.php 2006-06-23 23:23:33 UTC (rev 202) @@ -61,7 +61,7 @@ if ( count($ogModuleManager->getDirsFromID('openfirst.guestbook')) >= 1) { $qu = $ogDB->query("SELECT guest, date FROM ofirst_guestbook ORDER BY guest LIMIT 5;"); if($ogDB->numberOfRows($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>"); + echo("<table width=200><tr><th>Guestbook</th></tr><tr><td><div>Last records in our <a href=\"$ogBasePath/guestbook\">guestbook</a>: </div>"); while($q = $ogDB->fetch_object($qu)) { echo("<sub><strong><a href='/guestbook/' target='_content'>$q->guest</a></strong><br />$q->date</sub><br />"); } @@ -73,9 +73,9 @@ if ( count($ogModuleManager->getDirsFromID('openfirst.awards')) >= 1) { $qu = $ogDB->query("SELECT AwardName FROM ofirst_awards;"); if($ogDB->numberOfRows($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>"); + echo("<table width=200><tr><th>Awards</th></tr><tr><td><div>Our team has received the following <a href=\"$ogBasePath/awards\">awards</a>: </div>"); while($q = $ogDB->fetchObject($qu)) { - echo("<sub><a href='$BasePath/awards' target='_content'>$q->AwardName</a></sub><br />"); + echo("<sub><a href='$ogBasePath/awards' target='_content'>$q->AwardName</a></sub><br />"); } echo("</td></tr></table><br />"); } @@ -94,7 +94,7 @@ if ($mod->getActive() #&& $mod->getShowOnMenu() ) { - echo '<li><a href="'.htmlentities("$BasePath/$dir").'">'.htmlentities($mod->getName()).'</a></li> + echo '<li><a href="'.htmlentities("$ogBasePath/$dir").'">'.htmlentities($mod->getName()).'</a></li> '; } } @@ -102,7 +102,7 @@ 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("<table width=200><tr><th>Stats</th></tr><tr><td><div>Website <a href=\"$ogBasePath/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 />"); } @@ -117,7 +117,7 @@ } //are there more news? if ( shownews(5,$admin) ){ - echo("<div class=\"right\">[ <b><a href=\"$BasePath/news/index.php?show=all\">More News</a></b> ]</div>"); + echo("<div class=\"right\">[ <b><a href=\"$ogBasePath/news/index.php?show=all\">More News</a></b> ]</div>"); } } echo(" </td></tr></table>"); Modified: trunk/src/modules/export.php =================================================================== --- trunk/src/modules/export.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/modules/export.php 2006-06-23 23:23:33 UTC (rev 202) @@ -73,7 +73,7 @@ $XMLCode .= '</module>'; if (isset($_REQUEST['save'])) { - $save_len = file_put_contents("$fBasePath/$dir/openfirst.info.xml", $XMLCode); + $save_len = file_put_contents("$ogfBasePath/$dir/openfirst.info.xml", $XMLCode); } ?><dt style="font-weight:bold;"><h2><?php echo htmlentities($name); ?></h2><?php Modified: trunk/src/modules/extended.php =================================================================== --- trunk/src/modules/extended.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/modules/extended.php 2006-06-23 23:23:33 UTC (rev 202) @@ -41,7 +41,7 @@ return in_array($x, $files); } -$files = glob("$fBasePath/*/openfirst.info.xml"); +$files = glob("$ogfBasePath/*/openfirst.info.xml"); $files = array_map('mapDirs', $files); if (count($dirs) < 1) { @@ -226,7 +226,7 @@ } echo '<div class="left"> '; -$hbasepath = htmlentities($BasePath); +$hbasepath = htmlentities($ogBasePath); foreach($dirs as $dir) { $mod = xmlModule::createFromDir($dir); @@ -313,4 +313,4 @@ } echo '</div>'; include($ogFooter); -?> \ No newline at end of file +?> Modified: trunk/src/modules/index.php =================================================================== --- trunk/src/modules/index.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/modules/index.php 2006-06-23 23:23:33 UTC (rev 202) @@ -24,7 +24,7 @@ require_once('../includes/globals.php'); require_once('xmlModule.php'); -$files = glob("$fBasePath/*/openfirst.info.xml"); +$files = glob("$ogfBasePath/*/openfirst.info.xml"); $oMods = array(); @@ -55,7 +55,7 @@ </thead> <tbody> <?php -$hbasepath = htmlentities($BasePath); +$hbasepath = htmlentities($ogBasePath); foreach($oMods as $mod) { echo ' <tr> @@ -145,4 +145,4 @@ </table> <?php include($ogFooter); -?> \ No newline at end of file +?> Modified: trunk/src/style/footers.php =================================================================== --- trunk/src/style/footers.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/style/footers.php 2006-06-23 23:23:33 UTC (rev 202) @@ -1,6 +1,7 @@ <?php -if(! isset($BasePath)){ - $BasePath = "http://openfirst.sourceforge.net/"; +global $ogBasePath, +if(! isset($ogBasePath)){ + $ogBasePath = "http://openfirst.sourceforge.net/"; } ?></div> <div id="footer"> @@ -10,11 +11,11 @@ </div> <?php if(isset($user->membertype) && $user->membertype == "administrator"){ - echo "<div id=\"adiminlink\">[ <a href='".htmlentities($BasePath)."/config/index.php'>Administrator Options / Configuration Area</a> ]</div>"; } + echo "<div id=\"adiminlink\">[ <a href='".htmlentities($ogBasePath)."/config/index.php'>Administrator Options / Configuration Area</a> ]</div>"; } ?> <div class="right menu"> <a class="logo" href="http://openfirst.sourceforge.net"> - <img src="<?php echo htmlentities("$StylePath"); ?>/images/poweredby-small.png" alt="Powered by openFIRST" /> + <img src="<?php echo htmlentities("$ogStylePath"); ?>/images/poweredby-small.png" alt="Powered by openFIRST" /> </a> </div> </div> Modified: trunk/src/style/headers.php =================================================================== --- trunk/src/style/headers.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/style/headers.php 2006-06-23 23:23:33 UTC (rev 202) @@ -6,7 +6,7 @@ if(!isset($ogBasePath)){ $ogBasePath = 'http://openfirst.sourceforge.net'; - $StylePath = 'http://openfirst.sourceforge.net/style'; + $ogStylePath = 'http://openfirst.sourceforge.net/style'; $Title = "openFIRST Team"; } else { $headerlinks = array(); @@ -50,9 +50,9 @@ <meta http-equiv="Content-Language" content="en" /> <meta name="copyright" content="© 2006 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" /> - <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($StylePath); ?>/slugs.css" /> - <script type="application/x-javascript" src="<?php echo htmlentities($StylePath); ?>/slugs.js"></script> + <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($ogStylePath); ?>/style.css" /> + <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($ogStylePath); ?>/slugs.css" /> + <script type="application/x-javascript" src="<?php echo htmlentities($ogStylePath); ?>/slugs.js"></script> <?php if (isset($ogMoreHeadItems) && is_array($ogMoreHeadItems)) { foreach($ogMoreHeadItems as $i) { @@ -79,7 +79,7 @@ <th id="topmenu"> <?php if(isset($headers)){ - echo("» <a accesskey='h' href='$Home'><u>H</u>ome</a> | " . $headers); + echo("» <a accesskey='h' href='$ogHome'><u>H</u>ome</a> | " . $headers); }else{ ?> » <a accesskey="h" href="http://openfirst.sourceforge.net"><u>H</u>ome</a> @@ -95,7 +95,7 @@ </th> </tr> <tr> - <td class="nav2" style="background-image: url('<?php echo htmlentities($StylePath); ?>/images/back-light.gif'); "> + <td class="nav2" style="background-image: url('<?php echo htmlentities($ogStylePath); ?>/images/back-light.gif'); "> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> Modified: trunk/src/wysiwyg/wysiwyg.php =================================================================== --- trunk/src/wysiwyg/wysiwyg.php 2006-06-23 22:31:51 UTC (rev 201) +++ trunk/src/wysiwyg/wysiwyg.php 2006-06-23 23:23:33 UTC (rev 202) @@ -41,8 +41,8 @@ // A complete function to create the Javascript command for loading of the WYSIWYG function getEditField($fieldname,$height,$width,$init){ - global $BasePath; - $dir = $BasePath.'/'.$this->module->getDir(); + global $ogBasePath; + $dir = $ogBasePath.'/'.$this->module->getDir(); ob_start(); ?> <script type="text/javascript" language="JavaScript1.3"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 22:31:54
|
Revision: 201 Author: astronouth7303 Date: 2006-06-23 15:31:51 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=201&view=rev Log Message: ----------- Changing `user` to PRIMARY key. Modified Paths: -------------- trunk/src/config/openfirst.info.xml Modified: trunk/src/config/openfirst.info.xml =================================================================== --- trunk/src/config/openfirst.info.xml 2006-06-23 22:31:26 UTC (rev 200) +++ trunk/src/config/openfirst.info.xml 2006-06-23 22:31:51 UTC (rev 201) @@ -61,7 +61,7 @@ <field name="skills"><type>text</type></field> </fields> <keys> - <key name="user" type="unique"> + <key type="primary"> <col>user</col> </key> </keys> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 22:31:32
|
Revision: 200 Author: astronouth7303 Date: 2006-06-23 15:31:26 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=200&view=rev Log Message: ----------- Found bug in key altering, was case sensitive. Now it isn't. Modified Paths: -------------- trunk/src/includes/dbase.php trunk/src/includes/xmlModule.php Modified: trunk/src/includes/dbase.php =================================================================== --- trunk/src/includes/dbase.php 2006-06-23 05:11:49 UTC (rev 199) +++ trunk/src/includes/dbase.php 2006-06-23 22:31:26 UTC (rev 200) @@ -585,9 +585,9 @@ foreach($table->getKeys() as $keyname) { $key = $table->getKey($keyname); $skey = ''; - if ($key->getType() == 'PRIMARY') { + if (strcasecmp($key->getType(), 'PRIMARY') == 0) { $skey = 'PRIMARY KEY'; - } else if ($key->getType() == 'UNIQUE') { + } else if (strcasecmp($key->getType(), 'UNIQUE') == 0) { $skey = 'UNIQUE '.$this->quoteField($key->getName()); } else { $skey = 'INDEX '.$this->quoteField($key->getName()); Modified: trunk/src/includes/xmlModule.php =================================================================== --- trunk/src/includes/xmlModule.php 2006-06-23 05:11:49 UTC (rev 199) +++ trunk/src/includes/xmlModule.php 2006-06-23 22:31:26 UTC (rev 200) @@ -653,7 +653,7 @@ $this->mName = $this->mType = false; if (isset($args[0])) $this->mName = $args[0]; - if (isset($args[1])) $this->mType = $args[1]; + if (isset($args[1])) $this->mType = strtoupper($args[1]); if ( (strcasecmp($this->mType, 'primary') == 0) || (strcasecmp($this->mName, 'primary') == 0) ) { $this->mType = 'PRIMARY'; @@ -823,4 +823,4 @@ } } -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 05:12:06
|
Revision: 199 Author: astronouth7303 Date: 2006-06-22 22:11:49 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=199&view=rev Log Message: ----------- Moving Wysiwyg editor to its own module. Note that it is not ready for anything, as it has major XSS vectors. This is just to simplify code and debugging. Added Paths: ----------- trunk/src/wysiwyg/ trunk/src/wysiwyg/DHTMLEditor Info.txt trunk/src/wysiwyg/css/ trunk/src/wysiwyg/dialog/ trunk/src/wysiwyg/gecko/ trunk/src/wysiwyg/images/ trunk/src/wysiwyg/js/ trunk/src/wysiwyg/modules/ trunk/src/wysiwyg/openfirst.info.xml trunk/src/wysiwyg/wysiwyg.php Removed Paths: ------------- trunk/src/includes/functions/wysiwyg/ trunk/src/includes/functions/wysiwyg.php Deleted: trunk/src/includes/functions/wysiwyg.php =================================================================== --- trunk/src/includes/functions/wysiwyg.php 2006-06-23 05:06:03 UTC (rev 198) +++ trunk/src/includes/functions/wysiwyg.php 2006-06-23 05:11:49 UTC (rev 199) @@ -1,51 +0,0 @@ -<?php -/* - * openFIRST.base - config/functions/wysiwyg.php - * - * Copyright (C) 2003, - * openFIRST Project - * Original Author: David Di Biase<dav...@ea...> and DHTMLEditor Author: Hans-J\xFCrgen Petrich <pe...@tr...> - * - * 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 - * - */ - - // A complete function to create the Javascript command for loading of the WYSIWYG - function make_wysiwyg($fieldname,$height,$width,$init){ - global $basepath; -?> -<SCRIPT TYPE="text/javascript" language="JavaScript1.3"> -<!-- !!!! important comment this !!!! - document.dhtmlEditors_home='<?php echo $basepath; ?>/config/functions/wysiwyg/'; - document.writeln('<'+'SCRIPT LANGUAGE="JavaScript" src="'+document.dhtmlEditors_home+'js/lib.js">'+'<'+'/SCRIPT'+'>'); - document.writeln('<'+'SCRIPT LANGUAGE="JavaScript" src="'+document.dhtmlEditors_home+'modules/button_html.js">'+'<'+'/SCRIPT'+'>'); - -// --> -</SCRIPT> -<textarea id="<?php echo $fieldname; ?>" name="<?php echo $fieldname; ?>" style="width:<?php echo $height; ?>px; height:<?php echo $width; ?>px;"><?php echo $init; ?></textarea> -<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> -<!-- - var myEditor = new dhtmlEditor; - myEditor.registerApiModul(MODUL__toggleEditModeGetApiInfoArray('<?php echo $basepath; ?>/config/functions/wysiwyg/images/newdoc.gif')); - myEditor.make_andReplaceTextarea('<?php echo $fieldname; ?>'); -//--> -</SCRIPT> -<?php - } -?> Copied: trunk/src/wysiwyg/DHTMLEditor Info.txt (from rev 180, trunk/src/includes/functions/wysiwyg/DHTMLEditor Info.txt) =================================================================== --- trunk/src/wysiwyg/DHTMLEditor Info.txt (rev 0) +++ trunk/src/wysiwyg/DHTMLEditor Info.txt 2006-06-23 05:11:49 UTC (rev 199) @@ -0,0 +1,58 @@ +// Copyright 2002,2003 by Hans-J\xFCrgen Petrich - Germany Berlin <pe...@tr...> +// Free for Private use ;-) if not removing or changing the (contents of)lincense.txt and copyrights in the source +// For any kind of commercial usage this script's requires a license +// Please contact pe...@tr... for a license request + +// Special thanks to Hans-J\xFCrgen Petrich for allowing the openFIRST team to include his very powerful +// WYSIWYG editor. We extend our thanks to him on behalf of the USFIRST teams who will be using +// this source in the development of their site. + +// USAGE REQUEST FROM DAVID DI BIASE TO HANS PETRICH + +Hi David, + +>> Would you allow us to use your source code and implement it into our +>> open-source project to distribute to students? + +Yes (i'm proud that the Editor may help you with your great project) + +Best Greetings from Germany(Munich) to you and all your Developers + +Hans-J\xFCrgen Petrich + +----- Original Message ----- +From: "David M.Di Biase" <dav...@ea...> +To: <pe...@tr...> +Sent: Tuesday, August 19, 2003 11:42 PM +Subject: DHTMLEditor Use in Open-Source Project + +>> Hi, +>> +>> I am e-mailing you in regards to your DHTMLEditor open-source WYSIWYG. I +>> am apart of the openFIRST development team (http://www.openfirst.org). +>> We are a sourceforge.net listed open-source development group that is +>> coding a complete portal system for teams of a robotics competition (the +>> USFIRST Robotics Competition: http://www.usfirst.org). +>> +>> Our source code will be released in a few weeks to over 600 teams in +>> this robotics competition. The uses of our source are completely +>> non-commercial and completely educational. +>> +>> Our team needed a solution for a WYSIWYG that is compatible with our +>> system and works well when tested over different OS's and browsers. We +>> found that DHTMLEditor worked best in our testing. +>> +>> Would you allow us to use your source code and implement it into our +>> open-source project to distribute to students? All your source will be +>> kept in tact, with the license agreement and credit, following a link +>> within the source. +>> +>> Great work btw, we hope that you will allow us to put it to use in our +>> system. +>> +>> Thanks, +>> +>> David Di Biase +>> The openFIRST Development Team +>> +>> \ No newline at end of file Copied: trunk/src/wysiwyg/css (from rev 180, trunk/src/includes/functions/wysiwyg/css) Copied: trunk/src/wysiwyg/dialog (from rev 180, trunk/src/includes/functions/wysiwyg/dialog) Copied: trunk/src/wysiwyg/gecko (from rev 180, trunk/src/includes/functions/wysiwyg/gecko) Copied: trunk/src/wysiwyg/images (from rev 180, trunk/src/includes/functions/wysiwyg/images) Copied: trunk/src/wysiwyg/js (from rev 180, trunk/src/includes/functions/wysiwyg/js) Copied: trunk/src/wysiwyg/modules (from rev 180, trunk/src/includes/functions/wysiwyg/modules) Added: trunk/src/wysiwyg/openfirst.info.xml =================================================================== --- trunk/src/wysiwyg/openfirst.info.xml (rev 0) +++ trunk/src/wysiwyg/openfirst.info.xml 2006-06-23 05:11:49 UTC (rev 199) @@ -0,0 +1,13 @@ +<?xml version="1.0" ?> +<module xmlns="http://openfirst.org/xml/module/1.0" id="openfirst.wysiwyg"> + <!-- Info --> + <!-- This is not used, except as meta data --> + <name>WYSIWYG</name> + <version>Devel</version> + <author>David Di Biase</author> + <maintainer>Jamie Bliss</maintainer> + + <includes> + <include>$fModPath/wysiwyg.php</include> + </includes> +</module> Property changes on: trunk/src/wysiwyg/openfirst.info.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + LF Copied: trunk/src/wysiwyg/wysiwyg.php (from rev 180, trunk/src/includes/functions/wysiwyg.php) =================================================================== --- trunk/src/wysiwyg/wysiwyg.php (rev 0) +++ trunk/src/wysiwyg/wysiwyg.php 2006-06-23 05:11:49 UTC (rev 199) @@ -0,0 +1,81 @@ +<?php +/* + * openFIRST.wysiwyg - wysiwyg.php + * + * Copyright (C) 2003, + * openFIRST Project + * Original Author: David Di Biase<dav...@ea...> and DHTMLEditor Author: Hans-J\xFCrgen Petrich <pe...@tr...> + * + * 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 + * + */ + +class WysiwygModule extends Module { + function &getEditorObject() { + return new WysiwygEditor(&$this); + } +} + + +class WysiwygEditor extends Editor { + var $module; + /*private*/ function WysiwygEditor(&$module) { + $this->module =& $module; + } + + // A complete function to create the Javascript command for loading of the WYSIWYG + function getEditField($fieldname,$height,$width,$init){ + global $BasePath; + $dir = $BasePath.'/'.$this->module->getDir(); + ob_start(); +?> +<script type="text/javascript" language="JavaScript1.3"> +//<!-- !!!! important comment this !!!! + document.writeln('<'+'script language="JavaScript" type="text/javascript" src="<?php echo htmlentities($dir); ?>/js/lib.js">'+'<'+'/script'+'>'); + document.writeln('<'+'script language="JavaScript" type="text/javascript" src="<?php echo htmlentities($dir); ?>/modules/button_html.js">'+'<'+'/script'+'>'); +// --> +</script> +<textarea id="<?php echo htmlentities($fieldname); ?>" name="<?php echo htmlentities($fieldname); ?>" style="width:<?php echo htmlentities($width); ?>; height:<?php echo htmlentities($height); ?>;"><?php echo htmlentities($init); ?></textarea> +<script language="JavaScript" type="text/javascript"> +//<!-- + var myEditor = new dhtmlEditor; + myEditor.registerApiModul(MODUL__toggleEditModeGetApiInfoArray('<?php echo $dir; ?>/images/newdoc.gif')); + myEditor.make_andReplaceTextarea('<?php echo htmlentities($fieldname); ?>'); +//--> +</script> +<?php + $text = ob_get_clean(); + return $text; + } + + function getPlainText($text) { + return strip_tags($text); + } + + function parseText($text) { + #FIXME: XSS VECTOR! + return $text; + } +} + +$wysiwygmod =& new WysiwygModule(basename(dirname(__FILE__))); +$ogModuleManager->addModuleFromObject($wysiwygmod); +unset($wysiwygmod); +?> + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 05:06:08
|
Revision: 198 Author: astronouth7303 Date: 2006-06-22 22:06:03 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=198&view=rev Log Message: ----------- moved E_STRICT handling to earlier in the function. Modified Paths: -------------- trunk/src/includes/functions/debug.php Modified: trunk/src/includes/functions/debug.php =================================================================== --- trunk/src/includes/functions/debug.php 2006-06-23 05:04:28 UTC (rev 197) +++ trunk/src/includes/functions/debug.php 2006-06-23 05:06:03 UTC (rev 198) @@ -42,6 +42,8 @@ $ogFooter, $ogMailNotify, $ogMailFrom, $ogDB, $osType, $ogCurrentModule, $ogUser, $lastquery, $usingPHP5; global $NO_ADD_BUG; + if ($usingPHP5 && $errno == 2048) + return; // Don't handle E_STRICT $dberrno = $ogDB->errorNumber(); $dberror = $ogDB->errorString(); @@ -53,8 +55,6 @@ } } - if ($usingPHP5 && $errno == 2048) - return; // Don't handle E_STRICT $svn = explode(' ', trim(<<<ENDOFVERSION \$Id$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 05:04:35
|
Revision: 197 Author: astronouth7303 Date: 2006-06-22 22:04:28 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=197&view=rev Log Message: ----------- -htmlentities() -updated config vars -removed slug style experiments Modified Paths: -------------- trunk/src/style/footers.php trunk/src/style/headers.php trunk/src/style/slugs.css Modified: trunk/src/style/footers.php =================================================================== --- trunk/src/style/footers.php 2006-06-23 05:00:55 UTC (rev 196) +++ trunk/src/style/footers.php 2006-06-23 05:04:28 UTC (rev 197) @@ -6,7 +6,7 @@ <div id="footer"> <hr /> <div id="copyright" class="menu center"> - © Copyright 2002-2003 by <?php echo $Title; ?>. All rights reserved. + © Copyright 2002-2003 by <?php echo $ogSiteTitle; ?>. All rights reserved. </div> <?php if(isset($user->membertype) && $user->membertype == "administrator"){ Modified: trunk/src/style/headers.php =================================================================== --- trunk/src/style/headers.php 2006-06-23 05:00:55 UTC (rev 196) +++ trunk/src/style/headers.php 2006-06-23 05:04:28 UTC (rev 197) @@ -1,11 +1,11 @@ <?php header('content-type: text/html; charset=utf-8'); -global $BasePath, $ogModuleManager, $ogMoreStyles, $Home, $ogCurrentModule; -global $Title, $ogSiteTitle, $ogMoreHeadItems, $usersonline, $ogUser, $StylePath; +global $ogBasePath, $ogModuleManager, $ogMoreStyles, $ogHome, $ogCurrentModule; +global $Title, $ogSiteTitle, $ogMoreHeadItems, $usersonline, $ogUser, $ogStylePath; -if(! isset($BasePath)){ - $BasePath = 'http://openfirst.sourceforge.net'; +if(!isset($ogBasePath)){ + $ogBasePath = 'http://openfirst.sourceforge.net'; $StylePath = 'http://openfirst.sourceforge.net/style'; $Title = "openFIRST Team"; } else { @@ -16,13 +16,13 @@ if ($module->getActive() && $module->getShowOnMenu()) { if (is_object($ogCurrentModule) && $ogCurrentModule->getDir() == $dir){ $CurrentModule =& $thisModule; - $headerlinks[] = ' » <a class="menu selected" href="'.htmlentities("$BasePath/$dir").'">'.htmlentities($module->getName()).'</a> + $headerlinks[] = ' » <a class="menu selected" href="'.htmlentities("$ogBasePath/$dir").'">'.htmlentities($module->getName()).'</a> '; $adminnav = $module->getAdminBar(); $subnav = $module->getNavBar(); } else { - $headerlinks[] .= ' » <a class="menu" href="'.htmlentities("$BasePath/$dir").'">'.htmlentities($module->getName()).'</a> + $headerlinks[] .= ' » <a class="menu" href="'.htmlentities("$ogBasePath/$dir").'">'.htmlentities($module->getName()).'</a> '; } } @@ -31,6 +31,8 @@ $headers = implode(' |', $headerlinks); unset($headerlinks); + echo '<'.'?xml version="1.0" encoding="utf-8" ?'.'> +'; } ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> @@ -44,10 +46,9 @@ echo htmlentities($rtitle); unset($rtitle); ?></title> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Language" content="en" /> - <meta name="copyright" content="© 2003 openFIRST http://openfirst.sf.net." /> - <meta name="author" content="openFIRST - http://openfirst.sf.net" /> + <meta name="copyright" content="© 2006 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" /> <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($StylePath); ?>/slugs.css" /> @@ -71,7 +72,7 @@ <table class="nav1"> <tr id="toplogo"> <td> - <img src="<?php echo htmlentities($StylePath); ?>/images/openfirst.png" alt="openFIRST Portal System" /> + <img src="<?php echo htmlentities($ogStylePath); ?>/images/openfirst.png" alt="openFIRST Portal System" /> </td> </tr> <tr> @@ -119,9 +120,9 @@ // Check if messenger module has activated usersonline option then echo value if(isset($usersonline)){ - echo $usersonline; + echo htmlentities($usersonline); } else { - echo "Welcome to the <b>$ogSiteTitle</b> website!"; + echo "Welcome to the <b>".htmlentities($ogSiteTitle)."</b> website!"; } ?> @@ -148,8 +149,8 @@ </table><div id="content"> <?php -if ($BasePath == 'http://openfirst.sourceforge.net') { - unset($BasePath); +if ($ogBasePath == 'http://openfirst.sourceforge.net') { + unset($ogBasePath); } -?> \ No newline at end of file +?> Modified: trunk/src/style/slugs.css =================================================================== --- trunk/src/style/slugs.css 2006-06-23 05:00:55 UTC (rev 196) +++ trunk/src/style/slugs.css 2006-06-23 05:04:28 UTC (rev 197) @@ -1,14 +1,15 @@ .slug { +/* border: 1px solid red; /*debug*/ /* float: left;*/ margin: .2em; overflow: visible; position: relative; - vertical-align: top; + vertical-align: middle; height: 15px; /* change with image */ line-height: 15px; /* change with image */ } .slug > * { - vertical-align: top; + vertical-align: middle; } .slug > img { cursor: pointer; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 05:00:59
|
Revision: 196 Author: astronouth7303 Date: 2006-06-22 22:00:55 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=196&view=rev Log Message: ----------- -Updated config vars -rssfeed.php depreciated Modified Paths: -------------- trunk/src/news/rssfeed.php trunk/src/news/viewnews.php Modified: trunk/src/news/rssfeed.php =================================================================== --- trunk/src/news/rssfeed.php 2006-06-23 04:57:11 UTC (rev 195) +++ trunk/src/news/rssfeed.php 2006-06-23 05:00:55 UTC (rev 196) @@ -25,8 +25,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - include_once("../includes/globals.php"); - include_once($ogHeader); +include_once("../includes/globals.php"); +include_once($ogHeader); + +#FIXME: Turn this into Javascript. Something this simple doesn't need reloads. ?> <h2>RSS Feed Option</h2> <p>Stay up-to-date with the latest information released directly from our teams<br> @@ -34,7 +36,7 @@ RSS technology then please view the <a href="http://blogs.law.harvard.edu/tech/rss">RSS 2.0 Specification</a> to learn more.</p> <?php - if(isset($_POST['get'])){ +if(isset($_POST['get'])){ if(isset($_POST['all'])){ $numhead = "all"; @@ -42,7 +44,7 @@ $numhead = $_POST['headlines']; } - $link = $server.$basepath."/news/rss/rss.php?headlines=".$numhead."&rss=".$_POST['version']; + $link = $ogServer.$ogBasePath."/news/rss/rss.php?headlines=".$numhead; ?> <table width="500" align="center" cellpadding="0"> @@ -70,14 +72,6 @@ <input name="all" type="checkbox" id="all2" value="all"> All</td> </tr> - <tr> - <td><div align="right">RSS Version:</div></td> - <td><select name="version" id="version"> - <option>0.91</option> - <option selected>1.0</option> - <option>2.0</option> - </select></td> - </tr> <tr> <td><div align="right"></div></td> <td><input name="get" type="submit" id="get" value="Get RSS Link"></td> Modified: trunk/src/news/viewnews.php =================================================================== --- trunk/src/news/viewnews.php 2006-06-23 04:57:11 UTC (rev 195) +++ trunk/src/news/viewnews.php 2006-06-23 05:00:55 UTC (rev 196) @@ -28,8 +28,8 @@ function shownews($limit = 5,$admin=false) { // Get a list of the users able to // be contacted via the feedback form. - global $BasePath, $ogDB; - $query = $ogDB->select('news', '*', '', array('ORDER BY' => '`post_date` DESC', 'limit' => $limit)); + global $ogBasePath, $ogDB; + $query = $ogDB->select('news', '*', '', array('order'=>'post_date', 'dir'=>'DESC', 'limit' => $limit)); if ($ogDB->numberOfRows($query) != 0){ @@ -46,10 +46,10 @@ }else{ echo($news->news); } - echo("<br /><br /><center>[ <a href='{$BasePath}/news/comments.php?ID={$news->ID}'>View Comments</a> ]</center></td></tr>"); + echo("<br /><br /><center>[ <a href='{$ogBasePath}/news/comments.php?ID={$news->ID}'>View Comments</a> ]</center></td></tr>"); if ($admin) { - echo('<tr><td class="sub"><div style="" align="right">Admin options: <a href="'.$BasePath.'/news/admin/editnews.php?id='.$news->ID.'"><img alt="Edit story" border=0 src="'.$BasePath.'/news/images/newdoc.gif" align=absmiddle>Edit story</a>'); - echo('<a href="'.$BasePath.'/news/admin/killnews.php?id='.$news->ID.'"><img alt="Delete story" border=0 src="'.$BasePath.'/news/images/killdoc.gif" align=absmiddle>Delete story</a></div></td></tr>'); + echo('<tr><td class="sub"><div style="" align="right">Admin options: <a href="'.$ogBasePath.'/news/admin/editnews.php?id='.$news->ID.'"><img alt="Edit story" border=0 src="'.$ogBasePath.'/news/images/newdoc.gif" align=absmiddle>Edit story</a>'); + echo('<a href="'.$ogBasePath.'/news/admin/killnews.php?id='.$news->ID.'"><img alt="Delete story" border=0 src="'.$ogBasePath.'/news/images/killdoc.gif" align=absmiddle>Delete story</a></div></td></tr>'); } echo("</table><br />"); } @@ -58,7 +58,7 @@ echo("There is not yet any news.<br /><br />"); } if($admin){ - echo("<div align=center>[ <b><a href=\"$BasePath/news/admin\">Post News</a></b> ]</div>"); + echo("<div align=center>[ <b><a href=\"$ogBasePath/news/admin\">Post News</a></b> ]</div>"); } return(0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 04:57:15
|
Revision: 195 Author: astronouth7303 Date: 2006-06-22 21:57:11 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=195&view=rev Log Message: ----------- -more htmlentities() -checks before trying to set headers -updated config vars -use wrapper instead of raw SQL Modified Paths: -------------- trunk/src/includes/globals.php Modified: trunk/src/includes/globals.php =================================================================== --- trunk/src/includes/globals.php 2006-06-23 04:55:23 UTC (rev 194) +++ trunk/src/includes/globals.php 2006-06-23 04:57:11 UTC (rev 195) @@ -41,7 +41,7 @@ $path = "../../config/first.php"; } $path = htmlentities($path); - die( "You'll have to <a href=\"$path\">set openFIRST up</a> first!" ); + die( "You'll have to <a href=\"".htmlentities($path)."\">set openFIRST up</a> first!" ); } if (defined('OPENFIRST_NO_INSTALLATION')) { @@ -112,7 +112,7 @@ ) { @ob_start('ob_gzhandler'); // If already compressing, shut up. header('x-of-compressing: yes'); -} else { +} else if (!headers_sent()) { header('x-of-compressing: no'); } @@ -166,13 +166,13 @@ // Determine what module the user is viewing if (!defined('OPENFIRST_NO_INSTALLATION')) { - $curmodule = str_replace($BasePath, '', $_SERVER['SCRIPT_NAME']); + $curmodule = str_replace($ogBasePath, '', $_SERVER['SCRIPT_NAME']); $curmodule = substr($curmodule, 1, strpos($curmodule, '/', 2) - 1); } if (!defined('OPENFIRST_NO_INSTALLATION')) { // Include the functions using glob(); - foreach (glob("$fBasePath/includes/functions/*.php") as $filename) { + foreach (glob("$ogfBasePath/includes/functions/*.php") as $filename) { include_once($filename); } } @@ -186,8 +186,7 @@ 2. I'd rather iterate through the array once */ $ogModuleManager = new ModuleManager; - $res = $ogDB->query('SELECT '.$ogDB->quoteField('dir'). - ' FROM '.$ogDB->quoteTable('config')); + $res = $ogDB->select('config', array('dir')); if($ogDB->errorNumber() != 0) { trigger_error('Error while listing modules!', E_USER_ERROR); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 04:55:29
|
Revision: 194 Author: astronouth7303 Date: 2006-06-22 21:55:23 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=194&view=rev Log Message: ----------- - Updated config variable references - Added ofSymbol() so that HTML entities can be inserted without needing to refer to UTF-8 (although it is currently not working right). Modified Paths: -------------- trunk/src/includes/functions.php Modified: trunk/src/includes/functions.php =================================================================== --- trunk/src/includes/functions.php 2006-06-23 04:52:32 UTC (rev 193) +++ trunk/src/includes/functions.php 2006-06-23 04:55:23 UTC (rev 194) @@ -34,11 +34,12 @@ */ function ofReplaceVariables($text, $ModuleDir = false) { if ($ModuleDir === false) { - global $CurrentModule; - if (is_object($CurrentModule)) $ModuleDir == $CurrentModule->getDir(); + global $ogCurrentModule; + if (is_object($ogCurrentModule)) + $ModuleDir == $ogCurrentModule->getDir(); } - global $BasePath, $fBasePath, $StylePath, $fStylePath; + global $ogBasePath, $ogfBasePath, $ogStylePath, $ogfStylePath; $find = array('$BasePath', '$fBasePath', @@ -49,12 +50,12 @@ '$DirName' ); - $replace = array($BasePath, - $fBasePath, - $StylePath, - $fStylePath, - "$BasePath/$ModuleDir", - "$fBasePath/$ModuleDir", + $replace = array($ogBasePath, + $ogfBasePath, + $ogStylePath, + $ogfStylePath, + "$ogBasePath/$ModuleDir", + "$ogfBasePath/$ModuleDir", "$ModuleDir" ); @@ -249,4 +250,18 @@ } } } + +/** + * Given an HTML entity, returns the appropriate text in the current encoding. + * Currently, that's UTF-8. Returns false if it is unable to translate. + */ +function ofSymbol($entity) { + $ent = "&{$entity};"; + $trans = html_entity_decode($ent); + if ($ent != $trans) { + return $trans; + } else { + return false; + } +} ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 04:52:36
|
Revision: 193 Author: astronouth7303 Date: 2006-06-22 21:52:32 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=193&view=rev Log Message: ----------- Added og to the rest of the configuration variables. Modified Paths: -------------- trunk/src/includes/sitesettings.tpl Modified: trunk/src/includes/sitesettings.tpl =================================================================== --- trunk/src/includes/sitesettings.tpl 2006-06-23 04:50:42 UTC (rev 192) +++ trunk/src/includes/sitesettings.tpl 2006-06-23 04:52:32 UTC (rev 193) @@ -1,4 +1,4 @@ -<?php +<?php // vim:filetype=php /* * openFIRST base configuration file * This file has been automatically generated by first.php. @@ -21,15 +21,15 @@ $ogSQLTablePrefix = 'ofirst_'; $ogPasswordSaveEnabled = !(%COOKIE%); - $regEnabled = %REG%; - $Server = %SERVER%; - $BasePath = %BASEPATH%; - $fBasePath = %FBASEPATH%; - $Home = %HOME%; - $StylePath = "$BasePath/style"; - $fStylePath = "$fBasePath/style"; + $ogRegistraytionEnabled = %REG%; + $ogServer = %SERVER%; + $ogBasePath = %BASEPATH%; + $ogfBasePath = %FBASEPATH%; + $ogHome = %HOME%; + $ogStylePath = "$ogBasePath/style"; + $ogfStylePath = "$ogfBasePath/style"; $ogHeader = %HEADER%; $ogFooter = %FOOTER%; $ogMailNotify = %MASTERMAIL%; $ogMailFrom = %BOTMAIL%; -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 04:50:45
|
Revision: 192 Author: astronouth7303 Date: 2006-06-22 21:50:42 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=192&view=rev Log Message: ----------- Added the 'dir' option to select() Modified Paths: -------------- trunk/src/includes/dbase.php Modified: trunk/src/includes/dbase.php =================================================================== --- trunk/src/includes/dbase.php 2006-06-23 04:49:53 UTC (rev 191) +++ trunk/src/includes/dbase.php 2006-06-23 04:50:42 UTC (rev 192) @@ -275,10 +275,13 @@ $tailOpts .= " ORDER BY {$options['ORDER BY']}"; } else if ( isset( $options['order'] ) ) { $tailOpts .= " ORDER BY ".$this->quoteField($options['order']); + if (isset( $options['dir'] )) { + $tailOpts .= ' '.$options['dir']; + } } if ( isset( $options['LIMIT'] ) ) { $tailOpts .= " LIMIT {$options['LIMIT']}"; - } + } if ( is_numeric( array_search( 'FOR UPDATE', $options ) ) ) { $tailOpts .= ' FOR UPDATE'; @@ -298,7 +301,7 @@ /** SELECT wrapper. * Copied from MediaWiki. - * $options is feed to DataBase::makeSelectOptions() + * $options is fed to DataBase::makeSelectOptions() */ function select( $table, $vars, $conds='', $options = array() ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 04:49:57
|
Revision: 191 Author: astronouth7303 Date: 2006-06-22 21:49:53 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=191&view=rev Log Message: ----------- Added small comment. Modified Paths: -------------- trunk/src/config/modules.php Modified: trunk/src/config/modules.php =================================================================== --- trunk/src/config/modules.php 2006-06-23 01:58:25 UTC (rev 190) +++ trunk/src/config/modules.php 2006-06-23 04:49:53 UTC (rev 191) @@ -69,7 +69,7 @@ <?php // Get module information and output values $mods = $ogModuleManager->getDirs(); - // Make sure that module exists (bug #124) + // Make sure that modules exists (bug #124) if (count($mods) == 0) { echo "<p class='error'>Please install modules before administrating them! [ <a href='install.php'>Install Component</a> ]</p>"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 01:58:29
|
Revision: 190 Author: astronouth7303 Date: 2006-06-22 18:58:25 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=190&view=rev Log Message: ----------- Changing link target back to what it was. See bug #271. Modified Paths: -------------- trunk/src/news/rss/rss.php Modified: trunk/src/news/rss/rss.php =================================================================== --- trunk/src/news/rss/rss.php 2006-06-23 01:28:43 UTC (rev 189) +++ trunk/src/news/rss/rss.php 2006-06-23 01:58:25 UTC (rev 190) @@ -80,7 +80,7 @@ $query = $ogDB->select('news', '*', false, array('order' => 'post_date', 'dir' => 'DESC', 'LIMIT' => $limit)); while($news = $ogDB->fetchObject($query)){ - $about = $link = $ogServer.$ogBasePath.'/news/viewnews.php?ID='.$news->ID; + $about = $link = $ogServer.$ogBasePath.'/news/readnews.php?ID='.$news->ID; $title = strip_tags($news->title); $description = html_entity_decode(strip_tags($news->news)); $subject = (string) ''; // optional DC value This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 01:28:48
|
Revision: 189 Author: astronouth7303 Date: 2006-06-22 18:28:43 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=189&view=rev Log Message: ----------- - Removing VIM modeline - ported to 2.0 Modified Paths: -------------- trunk/src/news/rss/class.RSSBuilder.inc.php trunk/src/news/rss/rss.php Modified: trunk/src/news/rss/class.RSSBuilder.inc.php =================================================================== --- trunk/src/news/rss/class.RSSBuilder.inc.php 2006-06-23 00:23:10 UTC (rev 188) +++ trunk/src/news/rss/class.RSSBuilder.inc.php 2006-06-23 01:28:43 UTC (rev 189) @@ -1,5 +1,4 @@ <?php -/* vim: set expandtab tabstop=4 shiftwidth=4: */ //+----------------------------------------------------------------------+ //| WAMP (XP-SP1/1.3.27/4.0.12/4.3.2) | //+----------------------------------------------------------------------+ @@ -1339,9 +1338,9 @@ if (!isset($this->output)) { $this->createOutput($version); } // end if - header ('content-type: text/xml'); + header('content-type: text/xml'); header('Content-Disposition: inline; filename=rss_' . str_replace(' ','',$this->title) . '.xml'); - $this->output = '<?xml version="1.0" encoding="' . $this->encoding . '"?>' . "\n" . + $this->output = '<'.'?xml version="1.0" encoding="' . $this->encoding . '"?'.'>' . "\n" . '<!-- RSS generated by Flaimo.com RSS Builder [' . date('Y-m-d H:i:s') .'] --> ' . $this->output; echo $this->output; } // end function @@ -1357,7 +1356,7 @@ if (!isset($this->output)) { $this->createOutput($version); } // end if - return (string) '<?xml version="1.0" encoding="' . $this->encoding . '"?>' . "\n" . + return (string) '<'.'?xml version="1.0" encoding="' . $this->encoding . '"?'.'>' . "\n" . '<!-- RSS generated by Flaimo.com RSS Builder [' . date('Y-m-d H:i:s') .'] --> ' . $this->output; } // end function /**#@-*/ @@ -1736,4 +1735,4 @@ } // end function /**#@-*/ } // end class RSSItem -?> \ No newline at end of file +?> Modified: trunk/src/news/rss/rss.php =================================================================== --- trunk/src/news/rss/rss.php 2006-06-23 00:23:10 UTC (rev 188) +++ trunk/src/news/rss/rss.php 2006-06-23 01:28:43 UTC (rev 189) @@ -26,74 +26,68 @@ * */ - if(isset($_GET['headlines'])&&$_GET['headlines']!=""){ - if($_GET['headlines'] == "all"){ - $limit = 9999999; - }else{ - $limit = $_GET['headlines']; - } - } else { - $limit = 5; - } +if(isset($_GET['headlines']) && $_GET['headlines'] != ""){ + if($_GET['headlines'] == "all") { + $limit = 9999999; + } else { + $limit = (int)$_GET['headlines']; + } +} else { + $limit = 5; +} - include_once("../../config/globals.php"); +require_once("../../includes/globals.php"); - ob_start(); - session_start(); - - // Include system RSSBuilder Class - include_once("class.RSSBuilder.inc.php"); +ob_start(); +// Include system RSSBuilder Class +include_once("class.RSSBuilder.inc.php"); - // Create the object - remember, not all attibutes are supported - // by every rss version. just hand over an empty string if you - // don't need a specific attribute +// Create the object - remember, not all attibutes are supported +// by every rss version. just hand over an empty string if you +// don't need a specific attribute - $encoding =(string) 'ISO-8859-1'; - $about = (string) $home; - $title = (string) $title." News"; - $description = (string) 'This is the '.$title.' News RSS Feed'; - $image_link = (string) ''; - $category = (string) ''; // (only rss 2.0) - $cache = (string) 60; // in minutes (only rss 2.0) - $rssfile = new RSSBuilder($encoding, $about, $title, $description, $image_link, $category, $cache); +$encoding = (string) 'utf-8'; +$about = (string) $ogHome; +$title = (string) $ogSiteTitle." News"; +$description = (string) 'This is the '.$ogSiteTitle.' News RSS Feed'; +$image_link = (string) ''; +$category = (string) ''; // (only rss 2.0) +$cache = (string) 60; // in minutes (only rss 2.0) +$rssfile = new RSSBuilder($encoding, $about, $title, $description, $image_link, $category, $cache); - // If you want you can add additional Public Core data to the basic rss file - // (if rss version supports it) - - $publisher = (string) $title; // person, an organization, or a service - $creator = (string) ''; // person, an organization, or a service - $date = (string) date('Y-m-d\TH:i:sO'); - $language = (string) 'en'; - $rights = (string) 'Copyright \xA9 2003 '.$title.' ('.$server.$basepath.')'; - $coverage = (string) ''; // spatial location , temporal period or jurisdiction - $contributor = (string) ''; // person, an organization, or a service - $rssfile->addDCdata($publisher, $creator, $date, $language, $rights, $coverage, $contributor); +// If you want you can add additional Public Core data to the basic rss file +// (if rss version supports it) - // If you want you can add additional Syndication data to the basic - // rss file (if rss version supports it) +$publisher = (string) $ogSiteTitle; // person, an organization, or a service +$creator = (string) ''; // person, an organization, or a service +$date = (string) date('Y-m-d\TH:i:sO'); +$language = (string) 'en'; +$rights = (string) 'Copyright '.ofSymbol('copy').' 2003 '.$ogSiteTitle.' ('.$ogServer.$ogBasePath.')'; +$coverage = (string) ''; // spatial location , temporal period or jurisdiction +$contributor = (string) ''; // person, an organization, or a service +$rssfile->addDCdata($publisher, $creator, $date, $language, $rights, $coverage, $contributor); - $period = (string) 'daily'; // hourly / daily / weekly / ... - $frequency = (int) 5; // every X hours/days/... - $base = (string) date('Y-m-d\TH:i:sO'); - $rssfile->addSYdata($period, $frequency, $base); +// If you want you can add additional Syndication data to the basic +// rss file (if rss version supports it) - // Data for a single RSS item +$period = (string) 'daily'; // hourly / daily / weekly / ... +$frequency = (int) 5; // every X hours/days/... +$base = (string) date('r'); +$rssfile->addSYdata($period, $frequency, $base); - $query = ofirst_dbquery("SELECT * FROM ofirst_news ORDER BY `date` LIMIT $limit"); - while($news = ofirst_dbfetch_object($query)){ +// Data for a single RSS item + +$query = $ogDB->select('news', '*', false, array('order' => 'post_date', 'dir' => 'DESC', 'LIMIT' => $limit)); +while($news = $ogDB->fetchObject($query)){ - $about = $link = $server.$basepath.'/news/readnews.php?ID='.$news->ID; + $about = $link = $ogServer.$ogBasePath.'/news/viewnews.php?ID='.$news->ID; $title = strip_tags($news->title); - if (function_exists('html_entity_decode')){ - $description = html_entity_decode(strip_tags($news->news)); - } else { - $description = str_replace(' ',' ',strip_tags($news->news)); - } + $description = html_entity_decode(strip_tags($news->news)); $subject = (string) ''; // optional DC value - $timestamp=strtotime($news->date); - if ($timestamp!=-1){ - $date = (string) date('Y-m-d\TH:i:sO',$timestamp); - } +/* $timestamp=strtotime($news->post_date); + if ($timestamp!=-1){*/ + $date = (string)date('r', $news->post_date); +/* }*/ $author = (string) $news->poster; // author of item $comments = (string) ''; // url to comment page rss 2.0 value $image = (string) $news->image; // optional mod_im value for dispaying a different pic for every item @@ -105,13 +99,8 @@ // If you don't want to directly output the content, but instead work with the string (for example write it to a cache file) use // $rssfile->getRSSOutput($version); - if(isset($_GET['rss'])){ - $version = $_GET['rss']; - } else { - $version = "2.0"; - } - $rssfile->outputRSS($version); - - ob_end_flush(); +$version = "2.0"; +$rssfile->outputRSS($version); +ob_end_flush(); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ast...@us...> - 2006-06-23 00:23:15
|
Revision: 188 Author: astronouth7303 Date: 2006-06-22 17:23:10 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=188&view=rev Log Message: ----------- changing width and height to CSS values. Modified Paths: -------------- trunk/src/includes/edit.php Modified: trunk/src/includes/edit.php =================================================================== --- trunk/src/includes/edit.php 2006-06-22 22:58:11 UTC (rev 187) +++ trunk/src/includes/edit.php 2006-06-23 00:23:10 UTC (rev 188) @@ -61,9 +61,11 @@ /** Returns the HTML to paste on a page. * The return should not be modified in any way, * else you may break the software. + * @param $height string A CSS value of height + * @param $width string A CSS value of width */ function getEditField($fieldname,$height,$width,$init) { - return '<textarea name="'.htmlentities($fieldname).'" cols="'.htmlentities($width).'" rows="'.htmlentities($height).'">'. + return '<textarea name="'.htmlentities($fieldname).'" style="width:'.htmlentities($width).'; height:'.htmlentities($height).';">'. htmlentities($init). '</textarea>'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <xt...@us...> - 2006-06-22 22:58:16
|
Revision: 187 Author: xtimg Date: 2006-06-22 15:58:11 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=187&view=rev Log Message: ----------- Add Playground links. This presents a close to bug #268 Modified Paths: -------------- trunk/www/playground/index.html Modified: trunk/www/playground/index.html =================================================================== --- trunk/www/playground/index.html 2006-06-22 22:57:16 UTC (rev 186) +++ trunk/www/playground/index.html 2006-06-22 22:58:11 UTC (rev 187) @@ -1,12 +1,29 @@ -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> <title>openFIRST Playground</title> + <meta http-equiv="Content-Type" content="txt/html; charset=ISO-8859-1" /> </head> <body> <h1>openFIRST Playground</h1> - <img src="/img/playground.jpg" alt="Playground"> - <p>This is the future location of the openFIRST Playground server. For -more information see <a href="http://bugzilla.openfirst.org/show_bug.cgi?id=268">Bug -#268</a>.</p> + <div><img src="/img/playground.jpg" alt="Playground" style="float: left;" /></div> + + <p>This is the home of the openFIRST Playground server. It provides a location for developers and patch writers +to reproduce bugs which people encounter and for users to test out the bleeding edge version of the <a +href="http://www.openfirst.org/">openFIRST +Portal System</a>. Playground is updated from Subversion every fifteen minutes and local developer changes to +files which exist in subversion are also reverted on this schedule. To gain developer access to the Playground +server contact Tim at openfirst.org.</p> + + <p>The default username for logging in is <b>admin</b> and the default password is <b>openfirst</b>.</p> + + <div style="clear: left;"> + <h2>Installations located here</h2> + <ul> + <li><a href="devel/">Devel</a> - Updated automatically from the bleeding edge of Subversion; uses the MySQL +database system.</li> + </ul> + </div> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
7 messages has been excluded from this view by a project administrator.
![http://www.openfirst.org/image/email.png">](http://www.openfirst.org/image/email.png">){kind=link}
