[Openfirst-cvscommit] base/config first.php,1.51,1.52 footers.php,1.11,1.12 globals.tpl,1.7,1.8 head
Brought to you by:
xtimg
From: Astronouth7303 <ast...@us...> - 2005-03-14 00:50:13
|
Update of /cvsroot/openfirst/base/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19317/config Modified Files: first.php footers.php globals.tpl headers.php Log Message: -Corrected usage of $home -Added $server Index: footers.php =================================================================== RCS file: /cvsroot/openfirst/base/config/footers.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** footers.php 13 Mar 2005 19:23:09 -0000 1.11 --- footers.php 14 Mar 2005 00:50:00 -0000 1.12 *************** *** 18,25 **** <div> <div align="right"><a href= ! "http://openfirst.sourceforge.net"><img src="<?php echo("$home$basepath/images/"); ?>poweredby-small.png" width="177" height="30" border="0" alt="Powered by openFIRST Software - http://openfirst.sourceforge.net"></a><a href= "http://validator.w3.org/check?uri=http%3A//openfirst.sourceforge.net/"> ! <img src="<?php echo("$home$basepath/images/"); ?>w3c401.png" alt="Valid HTML 4.01" width="88" height="31" border="0"></a> </div> </div> --- 18,25 ---- <div> <div align="right"><a href= ! "http://openfirst.sourceforge.net"><img src="<?php echo("$basepath"); ?>/images/poweredby-small.png" width="177" height="30" border="0" alt="Powered by openFIRST Software - http://openfirst.sourceforge.net"></a><a href= "http://validator.w3.org/check?uri=http%3A//openfirst.sourceforge.net/"> ! <img src="<?php echo("$basepath"); ?>/images/w3c401.png" alt="Valid HTML 4.01" width="88" height="31" border="0"></a> </div> </div> Index: first.php =================================================================== RCS file: /cvsroot/openfirst/base/config/first.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** first.php 13 Mar 2005 19:06:34 -0000 1.51 --- first.php 14 Mar 2005 00:50:00 -0000 1.52 *************** *** 81,84 **** --- 81,85 ---- '%MASTERMAIL%', '%BOTMAIL%', + '%SERVER', '%BASEPATH%', '%FBASEPATH%'); *************** *** 100,103 **** --- 101,105 ---- GetVarValue($_POST['mailnotify']), GetVarValue($_POST['mailfrom']), + GetVarValue($_POST['server']), GetVarValue($_POST['basepath']), GetVarValue($_POST['fbasepath'])); *************** *** 263,267 **** to your main page) <em>Note:</em> Do not place a slash after the link ie. http://www.yoursite.com</font></td> ! <td> <input type="text" name="home" value="<?php echo htmlentities("http://$server"); ?>" ></td> </tr> <tr> --- 265,269 ---- to your main page) <em>Note:</em> Do not place a slash after the link ie. http://www.yoursite.com</font></td> ! <td> <input type="text" name="home" value="http://<?php echo htmlentities("$server$basepath"); ?>" ></td> </tr> <tr> *************** *** 276,279 **** --- 278,287 ---- </tr> <tr> + <td>The server name of the openFIRST software<br> <font size="1">ie. example: + <strong>http://openfirst.sourceforge.net</strong>/openfirst) this should + never have an ending slash, and must contain protocol name.</font></td> + <td><input type="text" name="server" value="http://<?php echo htmlentities($server); ?>"></td> + </tr> + <tr> <td>The base path to the openFIRST software<br> <font size="1">ie. example: http://openfirst.sourceforge.net<strong>/openfirst</strong>) this should Index: globals.tpl =================================================================== RCS file: /cvsroot/openfirst/base/config/globals.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** globals.tpl 13 Mar 2005 22:55:44 -0000 1.7 --- globals.tpl 14 Mar 2005 00:50:00 -0000 1.8 *************** *** 39,42 **** --- 39,43 ---- $mailnotify = %MASTERMAIL%; $mailfrom = %BOTMAIL%; + $server = %SERVER%; $basepath = %BASEPATH%; $fbasepath = %FBASEPATH%; Index: headers.php =================================================================== RCS file: /cvsroot/openfirst/base/config/headers.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** headers.php 13 Mar 2005 19:09:16 -0000 1.20 --- headers.php 14 Mar 2005 00:50:00 -0000 1.21 *************** *** 1,5 **** <?php if(! isset($basepath)){ ! $basepath = "http://openfirst.sourceforge.net/"; $title = "openFIRST Team"; } --- 1,5 ---- <?php if(! isset($basepath)){ ! $basepath = 'http://openfirst.sourceforge.net'; $title = "openFIRST Team"; } *************** *** 48,56 **** <table width="100%" border="0" cellspacing="0" cellpadding="6"> <tr> ! <td> <img src="<?php echo("$home$basepath/images/"); ?>openfirst.png" alt="openFIRST Portal System"> </td> </tr> <tr> ! <th id="topmenu" style="background-image: url('<?php echo("$home$basepath"); ?>/images/back.gif');"> <?php if(ISSET($headers)){ --- 48,56 ---- <table width="100%" border="0" cellspacing="0" cellpadding="6"> <tr> ! <td> <img src="<?php echo("$basepath"); ?>/images/openfirst.png" alt="openFIRST Portal System"> </td> </tr> <tr> ! <th id="topmenu" style="background-image: url('<?php echo("$basepath"); ?>/images/back.gif');"> <?php if(ISSET($headers)){ *************** *** 71,75 **** </tr> <tr> ! <td style="background-image: url('<?php echo("$basepath/images/"); ?>back-light.gif'); "> <table width="100%" border="0" cellspacing="0" cellpadding="0"> --- 71,75 ---- </tr> <tr> ! <td style="background-image: url('<?php echo("$basepath"); ?>/images/back-light.gif'); "> <table width="100%" border="0" cellspacing="0" cellpadding="0"> *************** *** 99,103 **** echo $usersonline; } else { ! echo "Welcome to the <b>".$title."</b> website!"; } --- 99,103 ---- echo $usersonline; } else { ! echo "Welcome to the <b>$title</b> website!"; } *************** *** 111,115 **** if (isset($user->user)){ ! if(isset($adminnav) == true && $user->membertype == "administrator"){ ?> --- 111,115 ---- if (isset($user->user)){ ! if(isset($adminnav) && (strcasecmp($user->membertype, 'administrator') == 0)) { ?> *************** *** 130,134 **** <?php ! if ($basepath == "http://openfirst.sourceforge.net/") { unset($basepath); } --- 130,134 ---- <?php ! if ($basepath == 'http://openfirst.sourceforge.net') { unset($basepath); } |