openfirst-cvscommit

[<xt...@us...>]

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

Modified Files:
	index.php preview.php sidebar.php 
Log Message:
Fix several outstanding bugs including Bug ID #30, also correct license information (bug report credit: Dan Schilling of 1006), add emoticon information to index.php

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/sidebars/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.php	24 Dec 2003 17:04:27 -0000	1.6
--- index.php	14 Feb 2004 14:51:39 -0000	1.7
***************
*** 16,23 ****
   * 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
--- 16,19 ----
***************
*** 89,93 ****
    if(is_readable("../emoticon/")) {
  ?>
! 
  <?php
    }
--- 85,94 ----
    if(is_readable("../emoticon/")) {
  ?>
!   <tr> 
!     <td>Emoticon</td>
!     <td><a href="preview.php?sidebar=emoticon">Preview</a></td>
!     <td><a href="javascript:window.sidebar.addPanel('Emoticon Sidebar', '<?php echo $home . $basepath . "/sidebars/"; ?>sidebar.php?sidebar=emoticon','')">Add</a></td>
!     <td><a href="sidebar.php?sidebar=emoticon&amp;cdf=true">Add</a></td>
!   </tr>
  <?php
    }
***************
*** 96,100 ****
    <tr> 
      <td>Awards</td>
!     <td><a href="preview.php?sidebar=awards">preview</a></td>
      <td><a href="javascript:window.sidebar.addPanel('Awards Sidebar', '<?php echo $home . $basepath . "/sidebars/"; ?>sidebar.php?sidebar=awards','')">Add</a></td>
      <td><a href="sidebar.php?sidebar=awards&amp;cdf=true">Add</a></td>
--- 97,101 ----
    <tr> 
      <td>Awards</td>
!     <td><a href="preview.php?sidebar=awards">Preview</a></td>
      <td><a href="javascript:window.sidebar.addPanel('Awards Sidebar', '<?php echo $home . $basepath . "/sidebars/"; ?>sidebar.php?sidebar=awards','')">Add</a></td>
      <td><a href="sidebar.php?sidebar=awards&amp;cdf=true">Add</a></td>
***************
*** 105,107 ****
  <?php 
    include_once($footer);
! ?>
\ No newline at end of file
--- 106,108 ----
  <?php 
    include_once($footer);
! ?>

Index: preview.php
===================================================================
RCS file: /cvsroot/openfirst/sidebars/preview.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** preview.php	24 Dec 2003 17:04:27 -0000	1.4
--- preview.php	14 Feb 2004 14:51:39 -0000	1.5
***************
*** 16,23 ****
   * 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
--- 16,19 ----

Index: sidebar.php
===================================================================
RCS file: /cvsroot/openfirst/sidebars/sidebar.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sidebar.php	24 Dec 2003 17:04:27 -0000	1.8
--- sidebar.php	14 Feb 2004 14:51:39 -0000	1.9
***************
*** 16,23 ****
   * 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
--- 16,19 ----
***************
*** 35,38 ****
--- 31,35 ----
  
    if(isset($_GET["sidebar"]) == false) { $_GET["sidebar"] = ""; }
+   if(! isset($_SERVER["REQUEST_URI"])) { $_SERVER["REQUEST_URI"] = "sidebar.php"; }
  
    $sidebar = strtoupper($_GET["sidebar"]);