[Openfirst-cvscommit] SF.net SVN: openfirst: [202] trunk/src
Brought to you by:
xtimg
Menu
▾
▴
[Openfirst-cvscommit] SF.net SVN: openfirst: [202] trunk/src
|
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. |
