openfirst-cvscommit Mailing List for openFIRST (Page 65)

Brought to you by: xtimg

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

Flat | Threaded

<< < 1 .. 63 64 65 66 67 .. 99 > >> (Page 65 of 99)

[Openfirst-cvscommit] base/config/functions debug.php,1.1,1.2

From: <xt...@us...> - 2003-12-22 16:55:38

Update of /cvsroot/openfirst/base/config/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv19535

Modified Files:
	debug.php 
Log Message:
Modify debug message style to be more efficient and include MD5 checksums of files.

Index: debug.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/functions/debug.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** debug.php	22 Dec 2003 15:29:27 -0000	1.1
--- debug.php	22 Dec 2003 16:55:35 -0000	1.2
***************
*** 36,43 ****
    function ofirst_error_handler($errno,$error,$file,$line) {
      global $dbasetype, $ostype, $sqlserver, $currentmodule, $user, $mailnotify, $mailfrom;
!     mail("ope...@li..., $mailnotify", "openFIRST Error", "PHP_SELF: " . $_SERVER["PHP_SELF"] . "
  HTTP Host: " . $_SERVER["HTTP_HOST"] . "
  HTTP Referer: " . $_SERVER["HTTP_REFERER"] . "
  Translated Path: " . $_SERVER["PATH_TRANSLATED"] . "
  Datebase Type: $dbasetype
  Operating System: $ostype
--- 36,45 ----
    function ofirst_error_handler($errno,$error,$file,$line) {
      global $dbasetype, $ostype, $sqlserver, $currentmodule, $user, $mailnotify, $mailfrom;
!     mail("ope...@li..., $mailnotify", "$currentmodule module - openFIRST Error",
! "PHP_SELF: " . $_SERVER["PHP_SELF"] . "
  HTTP Host: " . $_SERVER["HTTP_HOST"] . "
  HTTP Referer: " . $_SERVER["HTTP_REFERER"] . "
  Translated Path: " . $_SERVER["PATH_TRANSLATED"] . "
+ MD5: " . md5_file($_SERVER["PATH_TRANSLATED"]) . "
  Datebase Type: $dbasetype
  Operating System: $ostype

[Openfirst-cvscommit] guestbook sign.php,1.9,1.10

From: <xt...@us...> - 2003-12-22 16:43:14

Update of /cvsroot/openfirst/guestbook
In directory sc8-pr-cvs1:/tmp/cvs-serv17456

Modified Files:
	sign.php 
Log Message:
Add debugging of  to ensure that warnings are no longer given if a guestbook user is not currently a logged in member of the web site.

Index: sign.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/sign.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sign.php	13 Oct 2003 17:55:29 -0000	1.9
--- sign.php	22 Dec 2003 16:43:11 -0000	1.10
***************
*** 49,88 ****
      <tr> 
        <td width="25%"><img src="person.png" alt="Name: " /> Name </td>
!       <td width="75%"><input type="text" name="guest" style="width: 300px;" value="<?php echo($user->firstname . ' ' . $user->lastname); ?>" /></td>
      </tr>
      <tr> 
        <td><img src="email.png" alt="E-mail Address: " /> E-mail Address </td>
!       <td><input type="text" name="email" style="width: 300px;"  value="<?php echo($user->email); ?>" /></td>
      </tr>
      <tr> 
        <td><img src="icq.png" alt="ICQ UIN: " /> ICQ UIN </td>
!       <td><input type="text" name="icq" style="width: 300px;" value="<?php echo($user->icq); ?>" /></td>
      </tr>
      <tr> 
        <td><img src="aim.png" alt="AIM Screen name: " /> AIM Screen Name </td>
!       <td><input type="text" name="aim" style="width: 300px;" value="<?php echo($user->aim); ?>" /></td>
      </tr>
      <tr> 
        <td><img src="msmsgs.png" alt="MSN Messenger Address: " /> MSN Messenger 
          Address </td>
!       <td><input type="text" name="msn" style="width: 300px;" value="<?php echo($user->msn); ?>" /></td>
      </tr>
      <tr> 
        <td><img src="yahoo.png" alt="Yahoo! Messenger Address: " /> Yahoo! Messenger 
          Address </td>
!       <td><input type="text" name="yim" style="width: 300px;" value="<?php echo($user->yim); ?>" /></td>
      </tr>
      <tr> 
        <td><img src="irc.png" alt="IRC: " /> IRC Address </td>
!       <td><input type="text" name="irc" style="width: 300px;" value="<?php echo($user->irc); ?>" /></td>
      </tr>
      <tr> 
        <td><img src="webpage.png" alt="Web Page" /> Web Page Address (include the 
          http://) </td>
!       <td><input type="text" name="webpage" style="width: 300px;" value="<?php echo($user->homepage); ?>" /></td>
      </tr>
      <tr> 
        <td><img src="world.png" alt="Location: "/> Location </td>
!       <td><input type="text" name="location" style="width: 300px;" value="<?php echo($user->location); ?>" /></td>
      </tr>
      <tr> 
--- 49,88 ----
      <tr> 
        <td width="25%"><img src="person.png" alt="Name: " /> Name </td>
!       <td width="75%"><input type="text" name="guest" style="width: 300px;" value="<?php if(isset($user->user) { echo($user->firstname . ' ' . $user->lastname); } ?>" /></td>
      </tr>
      <tr> 
        <td><img src="email.png" alt="E-mail Address: " /> E-mail Address </td>
!       <td><input type="text" name="email" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->email); } ?>" /></td>
      </tr>
      <tr> 
        <td><img src="icq.png" alt="ICQ UIN: " /> ICQ UIN </td>
!       <td><input type="text" name="icq" style="width: 300px;" value="<?php  if(isset($user->user)) { echo($user->icq); } ?>" /></td>
      </tr>
      <tr> 
        <td><img src="aim.png" alt="AIM Screen name: " /> AIM Screen Name </td>
!       <td><input type="text" name="aim" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->aim); } ?>" /></td>
      </tr>
      <tr> 
        <td><img src="msmsgs.png" alt="MSN Messenger Address: " /> MSN Messenger 
          Address </td>
!       <td><input type="text" name="msn" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->msn); } ?>" /></td>
      </tr>
      <tr> 
        <td><img src="yahoo.png" alt="Yahoo! Messenger Address: " /> Yahoo! Messenger 
          Address </td>
!       <td><input type="text" name="yim" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->yim); } ?>" /></td>
      </tr>
      <tr> 
        <td><img src="irc.png" alt="IRC: " /> IRC Address </td>
!       <td><input type="text" name="irc" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->irc); } ?>" /></td>
      </tr>
      <tr> 
        <td><img src="webpage.png" alt="Web Page" /> Web Page Address (include the 
          http://) </td>
!       <td><input type="text" name="webpage" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->homepage); } ?>" /></td>
      </tr>
      <tr> 
        <td><img src="world.png" alt="Location: "/> Location </td>
!       <td><input type="text" name="location" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->location); } ?>" /></td>
      </tr>
      <tr> 
***************
*** 90,93 ****
--- 90,94 ----
        <td> 
          <?php
+   if(! isset($user->signature)) { $user->signature = ""; }
    if (function_exists("make_wysiwyg")) {
      make_wysiwyg("comment",400,300,"$user->signature");

[Openfirst-cvscommit] guestbook emoticons.php,1.6,1.7

From: <xt...@us...> - 2003-12-22 16:37:05

Update of /cvsroot/openfirst/guestbook
In directory sc8-pr-cvs1:/tmp/cvs-serv16238

Modified Files:
	emoticons.php 
Log Message:
Eliminate warning due to previous omission of quotes.

Index: emoticons.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/emoticons.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** emoticons.php	13 Oct 2003 17:55:29 -0000	1.6
--- emoticons.php	22 Dec 2003 16:37:01 -0000	1.7
***************
*** 37,41 ****
  <br /><a href="<?php echo($home); ?>">Return to main page</a> <a href="sign.php">Sign Guest  Book</a> <a href="./">View Guest Book</a></p>
  <?php
!   if(function_exists(emoticon_preview)) {
      emoticon_preview();
    } else {
--- 37,41 ----
  <br /><a href="<?php echo($home); ?>">Return to main page</a> <a href="sign.php">Sign Guest  Book</a> <a href="./">View Guest Book</a></p>
  <?php
!   if(function_exists("emoticon_preview")) {
      emoticon_preview();
    } else {
***************
*** 44,46 ****
  
     include_once("$footer");
! ?>
\ No newline at end of file
--- 44,46 ----
  
     include_once("$footer");
! ?>

[Openfirst-cvscommit] sidebars sidebar.php,1.6,1.7

From: <xt...@us...> - 2003-12-22 16:33:36

Update of /cvsroot/openfirst/sidebars
In directory sc8-pr-cvs1:/tmp/cvs-serv15468

Modified Files:
	sidebar.php 
Log Message:
Fix error given with additional debugging added.

Index: sidebar.php
===================================================================
RCS file: /cvsroot/openfirst/sidebars/sidebar.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sidebar.php	23 Oct 2003 14:09:46 -0000	1.6
--- sidebar.php	22 Dec 2003 16:33:32 -0000	1.7
***************
*** 38,42 ****
    $sidebar = strtoupper($_GET["sidebar"]);
  
!   if($_GET["cdf"] == true) {
      echo("<?xml version=\"1.0\"?>
             <channel base=\"$home$basepath\" href=\"/sidebars/sidebar.php?sidebar=$sidebar\"
--- 38,42 ----
    $sidebar = strtoupper($_GET["sidebar"]);
  
!   if(isset($_GET["cdf"]) && $_GET["cdf"] == true) {
      echo("<?xml version=\"1.0\"?>
             <channel base=\"$home$basepath\" href=\"/sidebars/sidebar.php?sidebar=$sidebar\"

[Openfirst-cvscommit] messenger messenger.php,1.9,1.10

From: <xt...@us...> - 2003-12-22 16:13:38

Update of /cvsroot/openfirst/messenger
In directory sc8-pr-cvs1:/tmp/cvs-serv12086

Modified Files:
	messenger.php 
Log Message:
Fix errors that messenger.php gives when it is part of a program called directly from the shell, as opposed to through a web server.

Index: messenger.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/messenger.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** messenger.php	28 Sep 2003 13:54:24 -0000	1.9
--- messenger.php	22 Dec 2003 16:13:35 -0000	1.10
***************
*** 28,34 ****
  
    // Declare information to be used in all messenger files
!   $IP = $_SERVER['REMOTE_ADDR'];
!   $SCRIPT = $_SERVER['PHP_SELF'];
!   $TIME = time();
  
    // Check if a record for the persons IP is made if not then create it or else update current record info
--- 28,44 ----
  
    // Declare information to be used in all messenger files
! 
!     /*
!      *  If there isn't a remote address set, then this script is
!      *  being called from the shell, rather than through a web server
!      *  and therefore is operating on the local host.
!      */
!     if(isset($_SERVER['REMOTE_ADDR'])) {
!       $IP = $_SERVER['REMOTE_ADDR'];
!     } else {
!       $IP = "127.0.0.1";
!     }
!     $SCRIPT = $_SERVER['PHP_SELF'];
!     $TIME = time();
  
    // Check if a record for the persons IP is made if not then create it or else update current record info

[Openfirst-cvscommit] members updateprofile.php,1.10,1.11

From: <xt...@us...> - 2003-12-22 15:50:44

Update of /cvsroot/openfirst/members
In directory sc8-pr-cvs1:/tmp/cvs-serv7972

Modified Files:
	updateprofile.php 
Log Message:
Eliminate warning messages which may occur with higher levels of debugging enabled, or when using the openFIRST built in debugging functionality.

Index: updateprofile.php
===================================================================
RCS file: /cvsroot/openfirst/members/updateprofile.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** updateprofile.php	23 Nov 2003 19:07:28 -0000	1.10
--- updateprofile.php	22 Dec 2003 15:50:40 -0000	1.11
***************
*** 137,141 ****
  	$query = ofirst_dbquery("SELECT * FROM ofirst_cellphonecarriers ORDER BY fullname;");
  	while($sms = ofirst_dbfetch_object($query)) {
!       if(($user->smsaddress == "" && $sms->smsaddress == "txt.bellmobility.ca") || ($user->cellphonecarrier == $sms->smsaddress)) {
          echo("<option value='$sms->smsaddress' selected='selected'>$sms->fullname</option>\n");
        } else {
--- 137,141 ----
  	$query = ofirst_dbquery("SELECT * FROM ofirst_cellphonecarriers ORDER BY fullname;");
  	while($sms = ofirst_dbfetch_object($query)) {
!       if(isset($user->smsaddress) == true && ($user->smsaddress == "" && $sms->smsaddress == "txt.bellmobility.ca") || ($user->cellphonecarrier == $sms->smsaddress)) {
          echo("<option value='$sms->smsaddress' selected='selected'>$sms->fullname</option>\n");
        } else {

[Openfirst-cvscommit] base/config/functions debug.php,NONE,1.1

From: <xt...@us...> - 2003-12-22 15:29:30

Update of /cvsroot/openfirst/base/config/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv2858

Added Files:
	debug.php 
Log Message:
Add optional debugging functionality-- this should help us track down some of those more obscure bugs which would otherwise go unreported ;-)

--- NEW FILE: debug.php ---
<?php
/*
 *  openFIRST.base - config/functions/debug.php
 *
 * Copyright (C) 2003,
 *  openFIRST Project
 *  Original Author: Tim Ginn <tim...@po...>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 *
 */
  // Purpose: Provide some useful features for debugging certain problems.
  //          This entire process is optional, of course.  Anyone may easily
  //          simply remove this file in order to eliminate the debugging.

  set_error_handler("ofirst_error_handler");

  // Handles errors by displaying a message and contacting openFIRST
  //   developers for assistance.
  function ofirst_error_handler($errno,$error,$file,$line) {
    global $dbasetype, $ostype, $sqlserver, $currentmodule, $user, $mailnotify, $mailfrom;
    mail("ope...@li..., $mailnotify", "openFIRST Error", "PHP_SELF: " . $_SERVER["PHP_SELF"] . "
HTTP Host: " . $_SERVER["HTTP_HOST"] . "
HTTP Referer: " . $_SERVER["HTTP_REFERER"] . "
Translated Path: " . $_SERVER["PATH_TRANSLATED"] . "
Datebase Type: $dbasetype
Operating System: $ostype
SQL Server: $sqlserver
Current Module: $currentmodule
User (if exists): $user->user
User Access Level: $user->membertype
Error Number: $errno
Error Description: $error
File: $file
Line: $line", "From: $mailfrom");

    echo("<strong>$errorno</strong> - <strong>$error</strong> in 
<strong>$file</strong> on line <strong>$line</strong>

<strong>The openFIRST system has encountered an error.  This
may be due to a misconfiguration on the behalf of the person installing it,
or an error in the openFIRST code.</strong>

<p>Since debugging is enabled (config/functions/debug.php
exists), the openFIRST team will be contacted with information
relevant to fixing the problem.  Rest assured, personal
information about the users of the site is <b>not</b> revealed.</p>");
  }

?>

[Openfirst-cvscommit] photogallery/admin newgallery.php,1.10,1.11 upload.php,1.9,1.10

From: <xt...@us...> - 2003-12-22 14:54:07

Update of /cvsroot/openfirst/photogallery/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv28535

Modified Files:
	newgallery.php upload.php 
Log Message:
Add some useful error-trapping in hopes of eliminating some confusion should certain situations arise.

Index: newgallery.php
===================================================================
RCS file: /cvsroot/openfirst/photogallery/admin/newgallery.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** newgallery.php	6 Dec 2003 17:25:30 -0000	1.10
--- newgallery.php	22 Dec 2003 14:54:03 -0000	1.11
***************
*** 39,47 ****
    // Check if user initiates create option and run create options
    if(isset($_POST['create'])){
  
!     mkdir("../".$gallerydir.$_POST['galleryname'],0777) or die("<br><br><center>Can't create folder! [ <a href='index.php'>Manage</a> ]");
!     mkdir("../".$gallerydir.$_POST['galleryname']."/thumbs",0777) or die("<br><br><center>Can't create folder! [ <a href='index.php'>Manage</a> ]");
! 
!     ofirst_dbquery("INSERT INTO ofirst_photogallery_galleries (GalleryName, Author, Dates, Description) values(
                        '".$_POST['galleryname']."',
  					  '".$user->user."',
--- 39,47 ----
    // Check if user initiates create option and run create options
    if(isset($_POST['create'])){
+     if(is_writable("../" . $gallerydir)) {
+       mkdir("../".$gallerydir.$_POST['galleryname'],0777) or die("<br><br><center>Can't create folder! [ <a href='index.php'>Manage</a> ]");
+       mkdir("../".$gallerydir.$_POST['galleryname']."/thumbs",0777) or die("<br><br><center>Can't create folder! [ <a href='index.php'>Manage</a> ]");
  
!       ofirst_dbquery("INSERT INTO ofirst_photogallery_galleries (GalleryName, Author, Dates, Description) values(
                        '".$_POST['galleryname']."',
  					  '".$user->user."',
***************
*** 49,53 ****
                        '".$_POST['description']."')");
  
!     echo "<br><br><center>New gallery added! [ <a href='index.php'>Manage</a> ]</center><br><br>";
      die(include_once($footer));
    }
--- 49,64 ----
                        '".$_POST['description']."')");
  
!       echo "<br><br><center>New gallery added! [ <a href='index.php'>Manage</a> ]</center><br><br>";
!     } elseif(file_exists("../" . $gallerydir)) {
!       echo("It appears that the permissions on the photogallery have become incorrect.
! In order for uploading of pictures to work, the gallery directory within the photogallery module must be
! writable by the web-user.
! 
! <br>On UNIX systems this is typically accomplished by:
! <br><tt>chmod -R 666 photogallery/gallery/</tt>");
!     } else {
!       echo("<p>It appears as though you have not yet created a $gallerydir directory within the photogallery module.  
! In order to use the photogallery module, this directory must be present.</p>");
!     }
      die(include_once($footer));
    }

Index: upload.php
===================================================================
RCS file: /cvsroot/openfirst/photogallery/admin/upload.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** upload.php	13 Oct 2003 18:00:28 -0000	1.9
--- upload.php	22 Dec 2003 14:54:03 -0000	1.10
***************
*** 74,80 ****
  
          // Copy files to the proper directory
!         copy($_FILES['upload'.$num]['tmp_name'], $dirlocate."/".$_FILES['upload'.$num]['name']) or $error = true;
!         echo "<center><br>".$_FILES['upload'.$num]['name']." - ".$_FILES['upload'.$num]['size']." - ".$_FILES['upload'.$num]['type']." - ";
  
          if(empty($error)){
            echo "<font color='Green'>Successful</font><br></center>\n";
--- 74,88 ----
  
          // Copy files to the proper directory
!         if(is_writable($dirlocate)) {
!           copy($_FILES['upload'.$num]['tmp_name'], $dirlocate."/".$_FILES['upload'.$num]['name']) or $error = true;
!           echo "<center><br>".$_FILES['upload'.$num]['name']." - ".$_FILES['upload'.$num]['size']." - ".$_FILES['upload'.$num]['type']." - ";
!         } else {
!           echo("It appears that the permissions on the photogallery have become incorrect.  
! In order for uploading of pictures to work, the gallery directory within the photogallery module must be writable 
! by the web-user.
  
+ <br>On UNIX systems this is typically accomplished by:
+ <br><tt>chmod -R 666 photogallery/gallery/</tt>");
+         }
          if(empty($error)){
            echo "<font color='Green'>Successful</font><br></center>\n";
***************
*** 115,117 ****
  <input name="upload" type="submit" value="Upload To Gallery">
  </form>
! <?php include_once($footer); ?>
\ No newline at end of file
--- 123,125 ----
  <input name="upload" type="submit" value="Upload To Gallery">
  </form>
! <?php include_once($footer); ?>

[Openfirst-cvscommit] members workspace.php,1.13,1.14

From: <xt...@us...> - 2003-12-22 05:03:37

Update of /cvsroot/openfirst/members
In directory sc8-pr-cvs1:/tmp/cvs-serv28106

Modified Files:
	workspace.php 
Log Message:
Fix difficulties with mkdir() on PHP versions before 4.2.0 by adding create mode

Index: workspace.php
===================================================================
RCS file: /cvsroot/openfirst/members/workspace.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** workspace.php	23 Nov 2003 19:07:28 -0000	1.13
--- workspace.php	22 Dec 2003 05:03:34 -0000	1.14
***************
*** 84,88 ****
        }
        if(isset($_POST["action"]) == true && $_POST["action"] == "makedirectory") {
!        mkdir(getcwd() . "/virtfs/$user->user/$filepath/" . $_POST["directory"]);
          $uf = ofirst_dbquery("INSERT INTO ofirst_workspace_files (size, location, owner, permissions, date, description, filetype, name) VALUES('0', '$filepath', '$user->user', 'drw-------', '" . date('D M d Y h:m:s') . "', 'Sub Directory', 'dir-" . $_POST["directorytype"] . "', '" . $_POST["directory"] . "');");
          echo("Sub directory Created [<a href='workspace.php?filepath=$filepath'>Return to Workspace</a> ]");
--- 84,88 ----
        }
        if(isset($_POST["action"]) == true && $_POST["action"] == "makedirectory") {
!        mkdir(getcwd() . "/virtfs/$user->user/$filepath/" . $_POST["directory"], 0644);
          $uf = ofirst_dbquery("INSERT INTO ofirst_workspace_files (size, location, owner, permissions, date, description, filetype, name) VALUES('0', '$filepath', '$user->user', 'drw-------', '" . date('D M d Y h:m:s') . "', 'Sub Directory', 'dir-" . $_POST["directorytype"] . "', '" . $_POST["directory"] . "');");
          echo("Sub directory Created [<a href='workspace.php?filepath=$filepath'>Return to Workspace</a> ]");
***************
*** 462,467 ****
       if(is_writable(getcwd() . "/virtfs/") == true) {
         ofirst_dbquery("INSERT INTO ofirst_workspace_users (quota, user, virtfspath, frozen) VALUES('10', '$user->user', '" . getcwd() . "/virtfs/$user->user/', '0');");
!        mkdir(getcwd() . "/virtfs/$user->user/");
!        mkdir(getcwd() . "/virtfs/$user->user/www/");
         $uf = ofirst_dbquery("INSERT INTO ofirst_workspace_files (size, location, owner, permissions,
  date, description, filetype, name) VALUES('0', '$filepath', '$user->user', 'drw-------', '" .
--- 462,467 ----
       if(is_writable(getcwd() . "/virtfs/") == true) {
         ofirst_dbquery("INSERT INTO ofirst_workspace_users (quota, user, virtfspath, frozen) VALUES('10', '$user->user', '" . getcwd() . "/virtfs/$user->user/', '0');");
!        mkdir(getcwd() . "/virtfs/$user->user/", 0644);
!        mkdir(getcwd() . "/virtfs/$user->user/www/", 0644);
         $uf = ofirst_dbquery("INSERT INTO ofirst_workspace_files (size, location, owner, permissions,
  date, description, filetype, name) VALUES('0', '$filepath', '$user->user', 'drw-------', '" .

[Openfirst-cvscommit] members/phpicalendar/languages brazilian.inc.php,1.1,1.2 catalan.inc.php,1.1,1.2 czech.inc.php,1.1,1.2 danish.inc.php,1.1,1.2 dutch.inc.php,1.1,1.2 english.inc.php,1.1,1.2 esperanto.inc.php,1.1,1.2 finnish.inc.php,1.1,1.2 french.inc.php,1.1,1.2 german.inc.php,1.1,1.2 italian.inc.php,1.1,1.2 japanese.inc.php,1.1,1.2 norwegian.inc.php,1.1,1.2 polish.inc.php,1.1,1.2 portuguese.inc.php,1.1,1.2 spanish.inc.php,1.1,1.2 swedish.inc.php,1.1,1.2 traditional_chinese.inc.php,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:18:05

Update of /cvsroot/openfirst/members/phpicalendar/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/languages

Modified Files:
	brazilian.inc.php catalan.inc.php czech.inc.php danish.inc.php 
	dutch.inc.php english.inc.php esperanto.inc.php 
	finnish.inc.php french.inc.php german.inc.php italian.inc.php 
	japanese.inc.php norwegian.inc.php polish.inc.php 
	portuguese.inc.php spanish.inc.php swedish.inc.php 
	traditional_chinese.inc.php 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: brazilian.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/brazilian.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** brazilian.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- brazilian.inc.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 2,6 ****
  
  // Brazilian Portuguese language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Wilton, Bennet (su...@be...) 
--- 2,6 ----
  
  // Brazilian Portuguese language include
! // For version 1.0 PHP iCalendar
  //
  // Translation by Wilton, Bennet (su...@be...) 
***************
*** 115,119 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 1.0
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: catalan.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/catalan.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** catalan.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- catalan.inc.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 2,8 ****
  
  // Catalan language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Oriol Ferrer Mesia; (tm...@sa...)
  
  $day_lang			= "Dia";
--- 2,10 ----
  
  // Catalan language include
! // For version 1.0 PHP iCalendar
  //
  // Translation by Oriol Ferrer Mesia; (tm...@sa...)
+ //
+ // Submit new translations to ch...@ch...
  
  $day_lang			= "Dia";
***************
*** 22,26 ****
  $download_lang		= "Descarregar";
  $powered_by_lang 	= "Gr&agrave;cies a";
- $version_lang		= "0.9";
  $event_lang			= 'Event';
  $event_start_lang	= 'Inici';
--- 24,27 ----
***************
*** 82,88 ****
  $todo_lang				= 'Pendent';
  $unfinished_lang		= 'Sense acabar';
! $prefs_set_lang 		= 'Your preferences have been set.';
! $prefs_unset_lang 		= 'Preferences unset. Changes will take place next page load.';
! $unset_prefs_lang 		= 'Unset preferences:';
  $organizer_lang			= 'Organitzador';
  $attendee_lang			= 'Persones presents';
--- 83,89 ----
  $todo_lang				= 'Pendent';
  $unfinished_lang		= 'Sense acabar';
! $prefs_set_lang 		= 'Les teves prefer&egrave;ncies s\'han guardat.';
! $prefs_unset_lang 		= 'Les prefer&egrave;ncies s\'han esborat. Els canvis ser&agrave;n visibles quan es recarregui la p&agrave;gina';
! $unset_prefs_lang 		= 'Esborra les prefer&egrave;ncies:';
  $organizer_lang			= 'Organitzador';
  $attendee_lang			= 'Persones presents';
***************
*** 93,97 ****
  $password_lang			= 'contrasenya';
  $login_lang				= 'Login';
! $invalid_login_lang		= 'Nom d\'usuari o contrassenya incorrectes.';
  $addupdate_cal_lang		= 'Afegeix o actualitza un Calendari';
  $addupdate_desc_lang	= 'Afegeix un Calendari enviant un fitxer. Actualitza un Calendari enviant un fitxer amb el mateix nom.';
--- 94,98 ----
  $password_lang			= 'contrasenya';
  $login_lang				= 'Login';
! $invalid_login_lang		= 'Nom d\'usuari o contrasenya incorrectes.';
  $addupdate_cal_lang		= 'Afegeix o actualitza un Calendari';
  $addupdate_desc_lang	= 'Afegeix un Calendari enviant un fitxer. Actualitza un Calendari enviant un fitxer amb el mateix nom.';
***************
*** 114,119 ****
  $delete_lang			= 'Esborra';
  
! // ----- New for 0.9.4
! $all_cal_comb_lang		= 'All calendars combined';
  
  // - navigation
--- 115,120 ----
  $delete_lang			= 'Esborra';
  
! // ----- New for 0.9.5
! $all_cal_comb_lang		= 'Tots els calendaris alhora';
  
  // - navigation

Index: czech.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/czech.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** czech.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- czech.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 2,6 ****
  
  // Czech language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Whit, studio jiÅ¾Ã¡k (wh...@st...)
--- 2,6 ----
  
  // Czech language include
! // For version 1.0 PHP iCalendar
  //
  // Translation by Whit, studio jiÅ¾Ã¡k (wh...@st...)

Index: danish.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/danish.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** danish.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- danish.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 2,6 ****
  
  // Danish language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Henrik Hï¿½jmark (st...@wo...)
--- 2,6 ----
  
  // Danish language include
! // For version 1.0 PHP iCalendar
  //
  // Translation by Henrik Hï¿½jmark (st...@wo...)
***************
*** 115,119 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 1.0
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: dutch.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/dutch.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dutch.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- dutch.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 2,6 ****
  
  // Dutch language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Lieven Gekiere (Li...@ge...)
--- 2,6 ----
  
  // Dutch language include
! // For version 1.0 PHP iCalendar
  //
  // Translation by Lieven Gekiere (Li...@ge...)
***************
*** 43,47 ****
  $goyear_lang		= 'Ga Naar Dit Jaar';
  $search_lang		= 'Zoeken'; // the verb
! $results_lang		= 'Zoek Resultaten';
  $query_lang			= 'Zoekopdracht: '; // will be followed by the search query
  $no_results_lang	= 'Geen activiteiten gevonden';
--- 43,47 ----
  $goyear_lang		= 'Ga Naar Dit Jaar';
  $search_lang		= 'Zoeken'; // the verb
! $results_lang		= 'Zoekresultaten';
  $query_lang			= 'Zoekopdracht: '; // will be followed by the search query
  $no_results_lang	= 'Geen activiteiten gevonden';
***************
*** 115,120 ****
  $delete_lang			= 'Verwijder';
  
! // ----- New for 0.9.4
! $all_cal_comb_lang		= 'All calendars combined';
  
  // - navigation
--- 115,120 ----
  $delete_lang			= 'Verwijder';
  
! // ----- New for 0.9.5
! $all_cal_comb_lang		= 'Alle Kalenders samen';
  
  // - navigation
***************
*** 122,129 ****
  $next_lang = 'Volgende';
  $prev_lang = 'Vorige';
! $day_view_lang = 'Dag overzicht';
! $week_view_lang = 'Week overzicht';
! $month_view_lang = 'Maand overzicht';
! $year_view_lang = 'Jaar overzicht';
  
  // ---------------------------------
--- 122,129 ----
  $next_lang = 'Volgende';
  $prev_lang = 'Vorige';
! $day_view_lang = 'Dagoverzicht';
! $week_view_lang = 'Weekoverzicht';
! $month_view_lang = 'Maandoverzicht';
! $year_view_lang = 'Jaaroverzicht';
  
  // ---------------------------------

Index: english.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/english.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** english.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- english.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 2,6 ****
  
  // English language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Chad Little (ch...@ch...)
--- 2,6 ----
  
  // English language include
! // For version 1.0 PHP iCalendar
  //
  // Translation by Chad Little (ch...@ch...)
***************
*** 115,119 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 1.0
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: esperanto.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/esperanto.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** esperanto.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- esperanto.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 2,6 ****
  
  // Esperanto language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Sjoerd Bosga (sj...@es...)
--- 2,6 ----
  
  // Esperanto language include
! // For version 1.0 PHP iCalendar
  //
  // Translation by Sjoerd Bosga (sj...@es...)
***************
*** 115,119 ****
  $delete_lang			= 'Forigi';
  
! // ----- New after 0.9.4
  $all_cal_comb_lang		= '&#264;iuj kalendaroj kune';
  
--- 115,119 ----
  $delete_lang			= 'Forigi';
  
! // ----- New after 1.0
  $all_cal_comb_lang		= '&#264;iuj kalendaroj kune';
  

Index: finnish.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/finnish.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** finnish.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- finnish.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 2,15 ****
  
  // Finnish language include
! // For version 0.9.4 PHP iCalendar
  //
! // Translation by Kari Somby (kar...@ra...)
  //
  // Submit new translations to ch...@ch...
  
! $day_lang			= 'P&auml;iv&auml;';
! $week_lang			= 'Viikko';
! $month_lang			= 'Kuukausi';
! $year_lang			= 'Vuosi';
  $calendar_lang		= 'Kalenteri';
  $next_day_lang		= 'Seuraava P&auml;iv&auml;';
--- 2,15 ----
  
  // Finnish language include
! // For version 1.0 PHP iCalendar
  //
! // Translation by Kari Somby (kar...@pp...)
  //
  // Submit new translations to ch...@ch...
  
! $day_lang		= 'P&auml;iv&auml;';
! $week_lang		= 'Viikko';
! $month_lang		= 'Kuukausi';
! $year_lang		= 'Vuosi';
  $calendar_lang		= 'Kalenteri';
  $next_day_lang		= 'Seuraava P&auml;iv&auml;';
***************
*** 24,42 ****
  $download_lang		= 'Lataa tiedosto';
  $powered_by_lang 	= 'Powered by';
! $event_lang			= 'Tapahtuma';
  $event_start_lang	= 'Aloitusaika';
  $event_end_lang		= 'Lopetusaika';
  $this_months_lang	= 'T&auml;m&auml;n Kuukauden tapahtumat';
! $date_lang			= 'P&auml;iv&auml;';
  $summary_lang		= 'Yhteenveto';
  $all_day_lang		= 'Koko p&auml;iv&auml;n tapahtuma';
! $notes_lang			= 'Muistiinpanot';
  $this_years_lang	= 'T&auml;m&auml;n Vuoden tapahtumat';
! $today_lang			= 'Today';
  $this_week_lang		= 'T&auml;m&auml; Viikko';
  $this_month_lang	= 'T&auml;m&auml; Kuukausi';
! $jump_lang			= 'Siirry';
  $tomorrows_lang		= 'Huomisen Tapahtumat';
! $goday_lang			= 'Mene T&auml;h&auml;n P&auml;iv&auml;&auml;n';
  $goweek_lang		= 'Mene T&auml;h&auml;n Viikkoon';
  $gomonth_lang		= 'Mene T&auml;h&auml;n Kuukauteen';
--- 24,42 ----
  $download_lang		= 'Lataa tiedosto';
  $powered_by_lang 	= 'Powered by';
! $event_lang		= 'Tapahtuma';
  $event_start_lang	= 'Aloitusaika';
  $event_end_lang		= 'Lopetusaika';
  $this_months_lang	= 'T&auml;m&auml;n Kuukauden tapahtumat';
! $date_lang		= 'P&auml;iv&auml;';
  $summary_lang		= 'Yhteenveto';
  $all_day_lang		= 'Koko p&auml;iv&auml;n tapahtuma';
! $notes_lang		= 'Muistiinpanot';
  $this_years_lang	= 'T&auml;m&auml;n Vuoden tapahtumat';
! $today_lang		= 'Today';
  $this_week_lang		= 'T&auml;m&auml; Viikko';
  $this_month_lang	= 'T&auml;m&auml; Kuukausi';
! $jump_lang		= 'Siirry';
  $tomorrows_lang		= 'Huomisen Tapahtumat';
! $goday_lang		= 'Mene T&auml;h&auml;n P&auml;iv&auml;&auml;n';
  $goweek_lang		= 'Mene T&auml;h&auml;n Viikkoon';
  $gomonth_lang		= 'Mene T&auml;h&auml;n Kuukauteen';
***************
*** 44,104 ****
  $search_lang		= 'Etsi'; // the verb
  $results_lang		= 'Etsinn&auml;n Tulokset';
! $query_lang			= 'Kysely'; // will be followed by the search query
  $no_results_lang	= 'Tapahtumia ei l&ouml;ytynyt';
  $goprint_lang		= 'Tulostettava versio';
! $time_lang			= 'Aika';
  $summary_lang		= 'Yhteenveto';
  $description_lang	= 'Selitys';
! $this_site_is_lang		= 'T&auml;m&auml; sivusto on';
! $no_events_day_lang		= 'Ei tapahtumia t&auml;n&auml;&auml;n.';
  $no_events_week_lang	= 'Ei tapahtumia t&auml;ll&auml; viikolla.';
  $no_events_month_lang	= 'Ei tapahtumia t&auml;ss&auml; kuussa.';
! $rss_day_date			= 'g:i A';  // Lists just the time
! $rss_week_date			= '%b %e';  // Lists just the day
! $rss_month_date			= '%b %e';  // Lists just the day
! $rss_language			= 'fi-fi';
! $search_took_lang		= 'Etsimiseen meni %s sekuntia';
  $recurring_event_lang	= 'Toistuva tapahtuma';
! $exception_lang			= 'Poikkeus';
! $no_query_lang			= 'Kysely&auml; ei annettu';
! $preferences_lang		= 'Ominaisuudet';
! $printer_lang			= 'Tulostin';
! $select_lang_lang		= 'Valitse oletuskieli:';
! $select_cal_lang		= 'Valitse oletuskalenteri:';
! $select_view_lang		= 'Valitse oletusn&auml;kym&auml;:';
! $select_time_lang		= 'Valitse oletusaloitusaika:';
! $select_day_lang		= 'Valitse oletusaloitusp&auml;iv&auml; viikolle:';
! $select_style_lang		= 'Valitse oletustyyli:';
! $set_prefs_lang			= 'Aseta ominaisuudet';
  $completed_date_lang	= 'Valmistuu';
! $completed_lang			= 'Valmis';
! $created_lang			= 'Luotu:';
! $due_lang				= 'Er&auml;&auml;ntyy:';
! $priority_lang			= 'T&auml;rkeys:';
! $priority_high_lang		= 'Korkea';
! $priority_low_lang		= 'Matala';
  $priority_medium_lang	= 'Keski';
! $priority_none_lang		= 'Ei mit&auml;&auml;n';
! $status_lang			= 'Tila:';
! $todo_lang				= 'Teht&auml;v&auml;t:';
! $unfinished_lang		= 'P&auml;&auml;ttym&auml;tt&ouml;m&auml;t';
! $prefs_set_lang 		= 'Asetukset p&auml;ivitetty';
! $prefs_unset_lang 		= 'Asetuksia ei p&auml;ivitetty. Muutokset p&auml;ivitet&auml;&auml;n seuraavan sivun ladattua';
! $unset_prefs_lang 		= 'Asetukset peruttu';
! $organizer_lang			= 'Organisoija';
! $attendee_lang			= 'Osanottajat';
! $status_lang			= 'Status';
! $location_lang			= 'Paikka';
! $admin_header_lang		= 'PHP iCalendar Hallinta';
! $username_lang			= 'K&aumlytt&aumlj&aumltunnus';
! $password_lang			= 'Salasana';
! $login_lang			= 'Kirjaudu sis&auml&aumln';
! $invalid_login_lang		= 'V&auml&aumlr&auml k&aumlytt&aumlj&aumltunnus tai salasana.';
! $addupdate_cal_lang		= 'Lis&auml&auml tai p&aumlivit&auml kalenteri';
! $addupdate_desc_lang		= 'Lis&auml&auml kalenteri lataamalla uusi tiedosto. P&aumlivit&auml kalenteri samannimisell&auml tiedostolla';
! $delete_cal_lang		= 'Tuhoa kalenteri';
! $logout_lang			= 'Kirjaudu ulos';
! $cal_file_lang			= 'Kalenteritiedosto';
! $php_error_lang			= 'PHP virhe';
  $upload_error_gen_lang	= 'Tiedoston latauksessa oli ongelma.';
  $upload_error_lang[0]	= 'Tiedoston latauksessa oli ongelma.';
--- 44,104 ----
  $search_lang		= 'Etsi'; // the verb
  $results_lang		= 'Etsinn&auml;n Tulokset';
! $query_lang		= 'Kysely'; // will be followed by the search query
  $no_results_lang	= 'Tapahtumia ei l&ouml;ytynyt';
  $goprint_lang		= 'Tulostettava versio';
! $time_lang		= 'Aika';
  $summary_lang		= 'Yhteenveto';
  $description_lang	= 'Selitys';
! $this_site_is_lang	= 'T&auml;m&auml; sivusto on';
! $no_events_day_lang	= 'Ei tapahtumia t&auml;n&auml;&auml;n.';
  $no_events_week_lang	= 'Ei tapahtumia t&auml;ll&auml; viikolla.';
  $no_events_month_lang	= 'Ei tapahtumia t&auml;ss&auml; kuussa.';
! $rss_day_date		= 'g:i A';  // Lists just the time
! $rss_week_date		= '%b %e';  // Lists just the day
! $rss_month_date		= '%b %e';  // Lists just the day
! $rss_language		= 'fi-fi';
! $search_took_lang	= 'Etsimiseen meni %s sekuntia';
  $recurring_event_lang	= 'Toistuva tapahtuma';
! $exception_lang		= 'Poikkeus';
! $no_query_lang		= 'Kysely&auml; ei annettu';
! $preferences_lang	= 'Ominaisuudet';
! $printer_lang		= 'Tulostin';
! $select_lang_lang	= 'Valitse oletuskieli:';
! $select_cal_lang	= 'Valitse oletuskalenteri:';
! $select_view_lang	= 'Valitse oletusn&auml;kym&auml;:';
! $select_time_lang	= 'Valitse oletusaloitusaika:';
! $select_day_lang	= 'Valitse oletusaloitusp&auml;iv&auml; viikolle:';
! $select_style_lang	= 'Valitse oletustyyli:';
! $set_prefs_lang		= 'Aseta ominaisuudet';
  $completed_date_lang	= 'Valmistuu';
! $completed_lang		= 'Valmis';
! $created_lang		= 'Luotu:';
! $due_lang		= 'Er&auml;&auml;ntyy:';
! $priority_lang		= 'T&auml;rkeys:';
! $priority_high_lang	= 'Korkea';
! $priority_low_lang	= 'Matala';
  $priority_medium_lang	= 'Keski';
! $priority_none_lang	= 'Ei mit&auml;&auml;n';
! $status_lang		= 'Tila:';
! $todo_lang		= 'Teht&auml;v&auml;t:';
! $unfinished_lang	= 'P&auml;&auml;ttym&auml;tt&ouml;m&auml;t';
! $prefs_set_lang 	= 'Asetukset p&auml;ivitetty';
! $prefs_unset_lang 	= 'Asetuksia ei p&auml;ivitetty. Muutokset p&auml;ivitet&auml;&auml;n seuraavan sivun ladattua';
! $unset_prefs_lang 	= 'Asetukset peruttu';
! $organizer_lang		= 'Organisoija';
! $attendee_lang		= 'Osanottajat';
! $status_lang		= 'Status';
! $location_lang		= 'Paikka';
! $admin_header_lang	= 'PHP iCalendar Hallinta';
! $username_lang		= 'K&aumlytt&aumlj&aumltunnus';
! $password_lang		= 'Salasana';
! $login_lang		= 'Kirjaudu sis&auml&aumln';
! $invalid_login_lang	= 'V&auml&aumlr&auml k&aumlytt&aumlj&aumltunnus tai salasana.';
! $addupdate_cal_lang	= 'Lis&auml&auml tai p&aumlivit&auml kalenteri';
! $addupdate_desc_lang	= 'Lis&auml&auml kalenteri lataamalla uusi tiedosto. P&aumlivit&auml kalenteri samannimisell&auml tiedostolla';
! $delete_cal_lang	= 'Tuhoa kalenteri';
! $logout_lang		= 'Kirjaudu ulos';
! $cal_file_lang		= 'Kalenteritiedosto';
! $php_error_lang		= 'PHP virhe';
  $upload_error_gen_lang	= 'Tiedoston latauksessa oli ongelma.';
  $upload_error_lang[0]	= 'Tiedoston latauksessa oli ongelma.';
***************
*** 108,129 ****
  $upload_error_lang[4]	= 'Valitse ladattava tiedosto.';
  $upload_error_type_lang = 'Vain .ics tiedostoja voidaan ladata.';
! $copy_error_lang		= 'Tiedoston kopiointi ep&aumlonnistui.';
! $delete_error_lang		= 'Tiedoston tuhoaminen ep&aumlonnistui.';
  $delete_success_lang	= 'Tuhoaminen onnistui.';
  $action_success_lang	= 'Toiminta onnistui.';
! $submit_lang			= 'L&aumlhet&auml';
! $delete_lang			= 'Tuhoa';
  
! // ----- New for 0.9.4
! $all_cal_comb_lang		= 'All calendars combined';
  
  // - navigation
! $back_lang = 'Takaisin';
! $next_lang = 'Seuraava';
! $prev_lang = 'Edellinen';
! $day_view_lang = 'P&auml;iv&auml;n&auml;kym&auml;';
! $week_view_lang = 'Viikkon&auml;kym&auml;';
! $month_view_lang = 'Kuukausin&auml;kym&auml;';
! $year_view_lang = 'Vuosin&auml;kym&auml;';
  
  // ---------------------------------
--- 108,129 ----
  $upload_error_lang[4]	= 'Valitse ladattava tiedosto.';
  $upload_error_type_lang = 'Vain .ics tiedostoja voidaan ladata.';
! $copy_error_lang	= 'Tiedoston kopiointi ep&aumlonnistui.';
! $delete_error_lang	= 'Tiedoston tuhoaminen ep&aumlonnistui.';
  $delete_success_lang	= 'Tuhoaminen onnistui.';
  $action_success_lang	= 'Toiminta onnistui.';
! $submit_lang		= 'L&aumlhet&auml';
! $delete_lang		= 'Tuhoa';
  
! // ----- New for 0.9.5
! $all_cal_comb_lang	= 'Kaikki kalenterit yhdistetty';
  
  // - navigation
! $back_lang 		= 'Takaisin';
! $next_lang 		= 'Seuraava';
! $prev_lang 		= 'Edellinen';
! $day_view_lang 		= 'P&auml;iv&auml;n&auml;kym&auml;';
! $week_view_lang 	= 'Viikkon&auml;kym&auml;';
! $month_view_lang 	= 'Kuukausin&auml;kym&auml;';
! $year_view_lang 	= 'Vuosin&auml;kym&auml;';
  
  // ---------------------------------
***************
*** 143,149 ****
  $format_recur_lang['secondly']		= array('sekuntti','sekunttia');
  
! $format_recur_lang['start']			= 'Joka %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until']			= '%date% asti';				// ie, 'until January 4'
! $format_recur_lang['count']			= '%int% kertaa';		// ie, 'for 5 times'
  
  $format_recur_lang['bymonth']		= 'Kuukaudet: %list%';			// ie, 'In months: January, February, March'
--- 143,149 ----
  $format_recur_lang['secondly']		= array('sekuntti','sekunttia');
  
! $format_recur_lang['start']		= 'Joka %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until']		= '%date% asti';				// ie, 'until January 4'
! $format_recur_lang['count']		= '%int% kertaa';		// ie, 'for 5 times'
  
  $format_recur_lang['bymonth']		= 'Kuukaudet: %list%';			// ie, 'In months: January, February, March'
***************
*** 152,172 ****
  
  $daysofweek_lang			= array ('Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai');
! $daysofweekshort_lang		= array ('Su','Ma','Ti','Ke','To','Pe','La');
! $daysofweekreallyshort_lang	= array ('S','M','T','K','T','P','L');
  $monthsofyear_lang			= array ('Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kes&auml;kuu','Hein&auml;kuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu');
! $monthsofyearshort_lang		= array ('Tammi','Helmi','Maalis','Huhti','Touko','Kes&auml;','Hein&auml;','Elo','Syys','Loka','Marras','Joulu');
  
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! //$timeFormat = 'g:i A';
! $timeFormat = 'H:i';
! $timeFormat_small = 'g:i';
  
  // For date formatting, see note below
! $dateFormat_day = '%A, %e %Bta';
! $dateFormat_week = '%e %B';
! $dateFormat_week_list = '%a, %e %b';
! $dateFormat_week_jump = '%b %e';
! $dateFormat_month = '%B %Y';
! $dateFormat_month_list = '%A, %B %e';
  
  /*
--- 152,172 ----
  
  $daysofweek_lang			= array ('Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai');
! $daysofweekshort_lang			= array ('Su','Ma','Ti','Ke','To','Pe','La');
! $daysofweekreallyshort_lang		= array ('S','M','T','K','T','P','L');
  $monthsofyear_lang			= array ('Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kes&auml;kuu','Hein&auml;kuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu');
! $monthsofyearshort_lang			= array ('Tammi','Helmi','Maalis','Huhti','Touko','Kes&auml;','Hein&auml;','Elo','Syys','Loka','Marras','Joulu');
  
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! //$timeFormat 		= 'g:i A';
! $timeFormat 		= 'H:i';
! $timeFormat_small 	= 'H:i';
  
  // For date formatting, see note below
! $dateFormat_day 	= '%A, %e %Bta';
! $dateFormat_week 	= '%e %B';
! $dateFormat_week_list 	= '%a, %e %b';
! $dateFormat_week_jump 	= '%b %e';
! $dateFormat_month 	= '%B %Y';
! $dateFormat_month_list 	= '%A, %B %e';
  
  /*
***************
*** 187,198 ****
  
  // Error messages - %s will be replaced with a variable
! $error_title_lang = 'Virhe!';
! $error_window_lang = 'Tapahtui virhe!';
! $error_calendar_lang = 'Kalenteria "%s" k&auml;siteltiin virheen sattuessa.';
! $error_path_lang = 'Polkua: "%s" ei voi avata';
! $error_back_lang = 'Ole hyv&auml; ja k&auml;yt&auml; "Takaisin" nappia palataksesi takaisin.';
! $error_remotecal_lang = 'T&auml;m&auml; palvelin sallii vain hyv&auml;ksyttyjen et&auml;kalentereiden k&auml;yt&ouml;n.';
! $error_restrictedcal_lang = 'Yritit k&auml;ytt&auml;&auml; kalenteria, jonka k&auml;ytt&ouml; on rajoitettu.';
! $error_invalidcal_lang = 'Ei kelvollinen kalenterin nimi. Ole hyv&auml; ja yrit&auml; toista kalenteria.';
  
  ?>
--- 187,198 ----
  
  // Error messages - %s will be replaced with a variable
! $error_title_lang 		= 'Virhe!';
! $error_window_lang 		= 'Tapahtui virhe!';
! $error_calendar_lang 		= 'Kalenteria "%s" k&auml;siteltiin virheen sattuessa.';
! $error_path_lang 		= 'Polkua: "%s" ei voi avata';
! $error_back_lang 		= 'Ole hyv&auml; ja k&auml;yt&auml; "Takaisin" nappia palataksesi takaisin.';
! $error_remotecal_lang 		= 'T&auml;m&auml; palvelin sallii vain hyv&auml;ksyttyjen et&auml;kalentereiden k&auml;yt&ouml;n.';
! $error_restrictedcal_lang 	= 'Yritit k&auml;ytt&auml;&auml; kalenteria, jonka k&auml;ytt&ouml; on rajoitettu.';
! $error_invalidcal_lang 		= 'Ei kelvollinen kalenterin nimi. Ole hyv&auml; ja yrit&auml; toista kalenteria.';
  
  ?>

Index: french.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/french.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** french.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- french.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 2,6 ****
  
  // French language include
! // For version 0.9.2 PHP iCalendar
  //
  // Translation by La Shampouineuse (in...@la...)
--- 2,6 ----
  
  // French language include
! // For version 1.0 PHP iCalendar
  //
  // Translation by La Shampouineuse (in...@la...)
***************
*** 11,79 ****
  $week_lang			= 'Semaine';
  $month_lang			= 'Mois';
! $year_lang			= 'Ann&eacute;e';
  $calendar_lang		= 'Calendrier';
  $next_day_lang		= 'Jour suivant';
  $next_month_lang	= 'Mois suivant';
  $next_week_lang		= 'Semaine suivante';
! $next_year_lang		= 'Ann&eacute;e suivante';
! $last_day_lang		= 'Jour pr&eacute;c&eacute;dent';
! $last_month_lang	= 'Mois pr&eacute;c&eacute;dent';
! $last_week_lang		= 'Semaine pr&eacute;c&eacute;dente';
! $last_year_lang		= 'Ann&eacute;e pr&eacute;c&eacute;dente';
  $subscribe_lang		= 'Souscrire';
! $download_lang		= 'T&eacute;l&eacute;charger';
  $powered_by_lang 	= 'Produit avec';
! $event_lang			= '&Eacute;v&eacute;nement';
! $event_start_lang	= 'D&eacute;but';
  $event_end_lang		= 'Fin';
! $this_months_lang	= '&Eacute;v&eacute;nements de ce mois';
  $date_lang			= 'Date';
! $summary_lang		= 'R&eacute;sum&eacute;';
! $all_day_lang		= '&Eacute;v&eacute;nement quotidien';
  $notes_lang			= 'Notes';
! $this_years_lang	= '&Eacute;v&eacute;nements de cette ann&eacute;';
  $today_lang			= 'Aujourd\'hui';
  $this_week_lang		= 'Cette semaine';
  $this_month_lang	= 'Ce mois';
  $jump_lang			= 'Voir';
! $tomorrows_lang		= '&Eacute;v&eacute;nements de demain';
  $goday_lang			= 'Voir aujourd\'hui';
  $goweek_lang		= 'Voir cette semaine';
  $gomonth_lang		= 'Voir ce mois';
! $goyear_lang		= 'Voir cette ann&eacute;e';
  $search_lang		= 'Recherche'; // the verb
! $results_lang		= 'R&eacute;sultats de la recherche';
! $query_lang			= 'Requ&ecirc;te: '; // will be followed by the search query
! $no_results_lang	= 'Aucun &eacute;v&eacute;nement trouv&eacute;';
  $goprint_lang		= 'Version imprimable';
  $time_lang			= 'Heure';
! $summary_lang		= 'R&eacute;sum&eacute;';
  $description_lang	= 'Description';
  $this_site_is_lang		= 'Ce site est';
! $no_events_day_lang		= 'Pas d\'&eacute;v&eacute;nement aujourd\'hui.';
! $no_events_week_lang	= 'Pas d\'&eacute;v&eacute;nement cette semaine.';
! $no_events_month_lang	= 'Pas d\'&eacute;v&eacute;nement ce mois-ci.';
  $rss_day_date			= 'H:i';  // Lists just the time
  $rss_week_date			= '%e %b';  // Lists just the day
  $rss_month_date			= '%e %b';  // Lists just the day
! $rss_language			= 'en-us';
  $search_took_lang		= 'La recherche a pris %s secondes';
! $recurring_event_lang	= '&Eacute;v&eacute;nement r&eacute;curent';
  $exception_lang			= 'Exception';
! $no_query_lang			= 'Aucune requ&ecirc;te';
! $preferences_lang		= 'Pr&eacute;f&eacute;rences';
  $printer_lang			= 'Imprimante';
! $select_lang_lang		= 'Choisissez votre language par d&eacute;faut:';
! $select_cal_lang		= 'Choisissez votre calendrier par d&eacute;faut:';
! $select_view_lang		= 'Choisissez votre vue par d&eacute;faut:';
! $select_time_lang		= 'Choisissez votre heure de d&eacute;but par d&eacute;faut:';
! $select_day_lang		= 'Choisissez votre jour de d&eacute;but de semaine:';
! $select_style_lang		= 'Choisissez votre style par d&eacute;faut:';
! $set_prefs_lang			= 'Enregistrer les pr&eacute;f&eacute;rences';
! $completed_date_lang	= 'Termin&eacute; le';
! $completed_lang			= 'Termin&eacute;';
! $created_lang			= 'Cr&eacute;&eacute;:';
  $due_lang				= 'Fin:';
! $priority_lang			= 'Priorit&eacute;:';
  $priority_high_lang		= 'Haute';
  $priority_low_lang		= 'Basse';
--- 11,79 ----
  $week_lang			= 'Semaine';
  $month_lang			= 'Mois';
! $year_lang			= 'AnnÃ©e';
  $calendar_lang		= 'Calendrier';
  $next_day_lang		= 'Jour suivant';
  $next_month_lang	= 'Mois suivant';
  $next_week_lang		= 'Semaine suivante';
! $next_year_lang		= 'AnnÃ©e suivante';
! $last_day_lang		= 'Jour prÃ©cÃ©dent';
! $last_month_lang	= 'Mois prÃ©cÃ©dent';
! $last_week_lang		= 'Semaine prÃ©cÃ©dente';
! $last_year_lang		= 'AnnÃ©e prÃ©cÃ©dente';
  $subscribe_lang		= 'Souscrire';
! $download_lang		= 'TÃ©lÃ©charger';
  $powered_by_lang 	= 'Produit avec';
! $event_lang			= 'ÃvÃ©nement';
! $event_start_lang	= 'DÃ©but';
  $event_end_lang		= 'Fin';
! $this_months_lang	= 'ÃvÃ©nements de ce mois';
  $date_lang			= 'Date';
! $summary_lang		= 'RÃ©sumÃ©';
! $all_day_lang		= 'ÃvÃ©nement quotidien';
  $notes_lang			= 'Notes';
! $this_years_lang	= 'ÃvÃ©nements de cette annÃ©';
  $today_lang			= 'Aujourd\'hui';
  $this_week_lang		= 'Cette semaine';
  $this_month_lang	= 'Ce mois';
  $jump_lang			= 'Voir';
! $tomorrows_lang		= 'ÃvÃ©nements de demain';
  $goday_lang			= 'Voir aujourd\'hui';
  $goweek_lang		= 'Voir cette semaine';
  $gomonth_lang		= 'Voir ce mois';
! $goyear_lang		= 'Voir cette annÃ©e';
  $search_lang		= 'Recherche'; // the verb
! $results_lang		= 'RÃ©sultats de la recherche';
! $query_lang			= 'RequÃªte: '; // will be followed by the search query
! $no_results_lang	= 'Aucun Ã©vÃ©nement trouvÃ©';
  $goprint_lang		= 'Version imprimable';
  $time_lang			= 'Heure';
! $summary_lang		= 'RÃ©sumÃ©';
  $description_lang	= 'Description';
  $this_site_is_lang		= 'Ce site est';
! $no_events_day_lang		= 'Pas d\'Ã©vÃ©nement aujourd\'hui.';
! $no_events_week_lang	= 'Pas d\'Ã©vÃ©nement cette semaine.';
! $no_events_month_lang	= 'Pas d\'Ã©vÃ©nement ce mois-ci.';
  $rss_day_date			= 'H:i';  // Lists just the time
  $rss_week_date			= '%e %b';  // Lists just the day
  $rss_month_date			= '%e %b';  // Lists just the day
! $rss_language			= 'fr-fr';
  $search_took_lang		= 'La recherche a pris %s secondes';
! $recurring_event_lang	= 'ÃvÃ©nement rÃ©curent';
  $exception_lang			= 'Exception';
! $no_query_lang			= 'Aucune requÃªte';
! $preferences_lang		= 'PrÃ©fÃ©rences';
  $printer_lang			= 'Imprimante';
! $select_lang_lang		= 'Choisissez votre language par dÃ©faut:';
! $select_cal_lang		= 'Choisissez votre calendrier par dÃ©faut:';
! $select_view_lang		= 'Choisissez votre vue par dÃ©faut:';
! $select_time_lang		= 'Choisissez votre heure de dÃ©but par dÃ©faut:';
! $select_day_lang		= 'Choisissez votre jour de dÃ©but de semaine:';
! $select_style_lang		= 'Choisissez votre style par dÃ©faut:';
! $set_prefs_lang			= 'Enregistrer les prÃ©fÃ©rences';
! $completed_date_lang	= 'TerminÃ© le';
! $completed_lang			= 'TerminÃ©';
! $created_lang			= 'CrÃ©Ã©:';
  $due_lang				= 'Fin:';
! $priority_lang			= 'PrioritÃ©:';
  $priority_high_lang		= 'Haute';
  $priority_low_lang		= 'Basse';
***************
*** 81,85 ****
  $priority_none_lang		= 'Aucune';
  $status_lang			= 'Status:';
! $todo_lang				= 'T&acirc;ches &agrave; faire';
  $unfinished_lang		= 'Non faites';
  $organizer_lang			= 'Organizer';
--- 81,85 ----
  $priority_none_lang		= 'Aucune';
  $status_lang			= 'Status:';
! $todo_lang				= 'TÃ¢ches Ã  faire';
  $unfinished_lang		= 'Non faites';
  $organizer_lang			= 'Organizer';
***************
*** 87,129 ****
  $status_lang			= 'Status';
  $location_lang			= 'Location';
! $admin_header_lang		= 'PHP iCalendar Administration';
! $username_lang			= 'Username';
! $password_lang			= 'Password';
! $login_lang				= 'Login';
! $invalid_login_lang		= 'Wrong username or password.';
! $addupdate_cal_lang		= 'Add or Update a Calendar';
! $addupdate_desc_lang	= 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.';
! $delete_cal_lang		= 'Delete a Calendar';
! $logout_lang			= 'Logout';
! $cal_file_lang			= 'Calendar File';
! $php_error_lang			= 'PHP Error';
! $upload_error_gen_lang	= 'There was a problem with your upload.';
! $upload_error_lang[0]	= 'There was a problem with your upload.';
! $upload_error_lang[1]	= 'The file you are trying to upload is too big.';
! $upload_error_lang[2]	= 'The file you are trying to upload is too big.';
! $upload_error_lang[3]	= 'The file you are trying upload was only partially uploaded.';
! $upload_error_lang[4]	= 'You must select a file for upload.';
! $upload_error_type_lang = 'Only .ics files may be uploaded.';
! $copy_error_lang		= 'Failed to copy file';
! $delete_error_lang		= 'Failed to delete file';
! $delete_success_lang	= 'was deleted successfully.';
! $action_success_lang	= 'Your action was successful.';
! $submit_lang			= 'Submit';
! $delete_lang			= 'Delete';
  
  // ----- New for 0.9.4
! $all_cal_comb_lang		= 'All calendars combined';
  
  // - navigation
  $back_lang = 'Retour';
  $next_lang = 'Suivant';
! $prev_lang = 'Pr&eacute;c&eacute;dent';
  $day_view_lang = 'Vue Journaliere';
  $week_view_lang = 'Vue Hebdomadaire';
  $month_view_lang = 'Vue Mensuelle';
  $year_view_lang = 'Vue Annuelle';
! $prefs_set_lang = 'Vos pr&eacute;f&eacute;rences ont &eacute;t&eacute; enregistr&eacute;es';
! $prefs_unset_lang = 'Pr&eacute;f&eacute;rences non d&eacute;finies. Les Changements seront pris en compte au prochain chargement de la page.';
! $unset_prefs_lang = 'Pr&eacute;f&eacute;rences non d&eacute;finies:';
  
  
--- 87,129 ----
  $status_lang			= 'Status';
  $location_lang			= 'Location';
! $admin_header_lang		= 'Administration de PHP iCalendar';
! $username_lang			= 'Utilisateur';
! $password_lang			= 'Mot de passe';
! $login_lang				= 'Connexion';
! $invalid_login_lang		= 'Mauvais utilisateur ou mot de passe.';
! $addupdate_cal_lang		= 'Ajouter ou mettre Ã  jour un calendrier';
! $addupdate_desc_lang	= 'Ajout d\'un calendrier en tÃ©lÃ©chargeant un nouveau fichier. Mettre Ã  jour un calendrier en tÃ©lÃ©chargeant un fichier du mÃªme nom.';
! $delete_cal_lang		= 'Effacer un calendrier';
! $logout_lang			= 'Deconnexion';
! $cal_file_lang			= 'Fichier calendrier';
! $php_error_lang			= 'Erreur PHP';
! $upload_error_gen_lang	= 'Il y a eut un problÃ¨me avec votre tÃ©lÃ©chargement.';
! $upload_error_lang[0]	= 'Il y a eut un problÃ¨me avec votre tÃ©lÃ©chargement.';
! $upload_error_lang[1]	= 'Le fichier que vous envoyez est trop gros.';
! $upload_error_lang[2]	= 'Le fichier que vous envoyez est trop gros.';
! $upload_error_lang[3]	= 'Le fichier que vous envoyez a Ã©tÃ© partiellement envoyÃ©.';
! $upload_error_lang[4]	= 'Vous devez selectionner un fichier Ã  envoyer.';
! $upload_error_type_lang = 'Seuls les fichiers en .ics peuvent Ãªtre ajoutÃ©s.';
! $copy_error_lang		= 'La copie du fichier a Ã©chouÃ©';
! $delete_error_lang		= 'La suppression du fichier a Ã©chouÃ©';
! $delete_success_lang	= 'a Ã©tÃ© effacÃ© avec succÃ¨s.';
! $action_success_lang	= 'Action effectuÃ©e avec succÃ¨s.';
! $submit_lang			= 'Envoyer';
! $delete_lang			= 'Supprimer';
  
  // ----- New for 0.9.4
! $all_cal_comb_lang		= 'Tous les calendriers';
  
  // - navigation
  $back_lang = 'Retour';
  $next_lang = 'Suivant';
! $prev_lang = 'PrÃ©cÃ©dent';
  $day_view_lang = 'Vue Journaliere';
  $week_view_lang = 'Vue Hebdomadaire';
  $month_view_lang = 'Vue Mensuelle';
  $year_view_lang = 'Vue Annuelle';
! $prefs_set_lang = 'Vos prÃ©fÃ©rences ont Ã©tÃ© enregistrÃ©es';
! $prefs_unset_lang = 'PrÃ©fÃ©rences non dÃ©finies. Les Changements seront pris en compte au prochain chargement de la page.';
! $unset_prefs_lang = 'PrÃ©fÃ©rences non dÃ©finies:';
  
  
***************
*** 154,159 ****
  $daysofweekshort_lang		= array ('Dim','Lun','Mar','Mer','Jeu','Ven','Sam');
  $daysofweekreallyshort_lang	= array ('D','L','M','M','J','V','S');
! $monthsofyear_lang			= array ('Janvier','F&eacute;vrier','Mars','Avril','Mai','Juin','Juillet','Ao&ucirc;t','Septembre','Octobre','Novembre','D&eacute;cembre');
! $monthsofyearshort_lang		= array ('jan','f&eacute;v','mar','avr','mai','juin','juil','ao&ucirc;','sep','oct','nov','d&eacute;c');
  
  
--- 154,159 ----
  $daysofweekshort_lang		= array ('Dim','Lun','Mar','Mer','Jeu','Ven','Sam');
  $daysofweekreallyshort_lang	= array ('D','L','M','M','J','V','S');
! $monthsofyear_lang			= array ('Janvier','FÃ©vrier','Mars','Avril','Mai','Juin','Juillet','AoÃ»t','Septembre','Octobre','Novembre','DÃ©cembre');
! $monthsofyearshort_lang		= array ('jan','fÃ©v','mar','avr','mai','juin','juil','aoÃ»','sep','oct','nov','dÃ©c');
  
  
***************
*** 192,198 ****
  $error_calendar_lang = 'L\'erreur s\'est produite lors du traitement du calendrier "%s".';
  $error_path_lang = 'Impossible d\'ouvrir le chemin: "%s"';
! $error_back_lang = 'Veuillez utiliser le bouton "Retour" pour revenir en arri&egrave;re.';
! $error_remotecal_lang = 'Ce serveur refuse les calendriers distants non approuv&eacute;s.';
! $error_restrictedcal_lang = 'Vous avez essay&eacute; d\'utiliser un calendrier dont les permissions sont restreintes sur ce serveur.';
  $error_invalidcal_lang = 'Fichier calendrier invalide. Veuillez utiliser un autre calendrier.';
  
--- 192,198 ----
  $error_calendar_lang = 'L\'erreur s\'est produite lors du traitement du calendrier "%s".';
  $error_path_lang = 'Impossible d\'ouvrir le chemin: "%s"';
! $error_back_lang = 'Veuillez utiliser le bouton "Retour" pour revenir en arriÃ¨re.';
! $error_remotecal_lang = 'Ce serveur refuse les calendriers distants non approuvÃ©s.';
! $error_restrictedcal_lang = 'Vous avez essayÃ© d\'utiliser un calendrier dont les permissions sont restreintes sur ce serveur.';
  $error_invalidcal_lang = 'Fichier calendrier invalide. Veuillez utiliser un autre calendrier.';
  

Index: german.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/german.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** german.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- german.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 1,199 ****
! <?php
! 
! // German language include
! // For version 0.9.4 PHP iCalendar
! //
! // Translation by David Reindl (dr...@an...)
! // Corrected by whippersnapper slomo (ma...@sl...)
! //
! // Submit new translations to ch...@ch...
! 
! 
! 
! $day_lang			= 'Tag';
! $week_lang			= 'Woche';
! $month_lang			= 'Monat';
! $year_lang			= 'Jahr';
! $calendar_lang		= 'Kalender';
! $next_day_lang		= 'Folgender Tag';
! $next_month_lang	= 'Folgender Monat';
! $next_week_lang		= 'Folgende Woche';
! $next_year_lang		= 'Folgendes Jahr';
! $last_day_lang		= 'Vorhergehender Tag';
! $last_month_lang	= 'Vorhergehender Monat';
! $last_week_lang		= 'Vorhergehende Woche';
! $last_year_lang		= 'Vorhergehendes Jahr';
! $subscribe_lang		= 'Abonnieren';
! $download_lang		= 'Herunterladen';
! $powered_by_lang 	= 'Powered by';
! $event_lang			= 'Eintrag';
! $event_start_lang	= 'Beginn';
! $event_end_lang		= 'Ende';
! $this_months_lang	= 'Alle Eintr&auml;ge in diesem Monat';
! $date_lang			= 'Datum';
! $summary_lang		= 'Beschreibung';
! $all_day_lang		= 'Tagesereignis';
! $notes_lang			= 'Notiz';
! $this_years_lang	= 'Eintr&auml;ge in diesem Jahr';
! $today_lang			= 'Heute';
! $this_week_lang		= 'Diese Woche';
! $this_month_lang	= 'Diesen Monat';
! $jump_lang			= 'Gehe zu';
! $tomorrows_lang		= 'Morgige Eintr&auml;ge';
! $goday_lang			= 'Gehe zum heutigen Tag';
! $goweek_lang		= 'Gehe zur aktuellen Woche';
! $gomonth_lang		= 'Gehe zum aktuellen Monat';
! $goyear_lang		= 'Gehe zum aktuellen Jahr';
! $search_lang		= 'Suchen'; // the verb
! $results_lang		= 'Suchresultate';
! $query_lang			= 'Suche: '; // will be followed by the search query
! $no_results_lang	= 'Keine Eintr&auml;ge gefunden';
! $goprint_lang		= 'Druckversion';
! $time_lang			= 'Zeit';
! $summary_lang		= 'Zusammenfassung';
! $description_lang	= 'Beschreibung';
! $this_site_is_lang		= 'Diese Site ist';
! $no_events_day_lang		= 'Keine Eintr&auml;ge f&uuml;r heute.';
! $no_events_week_lang	= 'Keine Eintr&auml;ge in dieser Woche.';
! $no_events_month_lang	= 'Keine Eintr&auml;ge in diesem Monat.';
! $rss_day_date			= 'H:i';  // Lists just the time
! $rss_week_date			= '%e. %b';  // Lists just the day
! $rss_month_date			= '%e. %b';  // Lists just the day
! $rss_language			= 'en-us';
! $search_took_lang		= 'Suche dauerte %s Sekunden';
! $recurring_event_lang	= 'Wiederkehrender Eintrag';
! $exception_lang			= 'Ausnahme';
! $no_query_lang			= 'Kein Suchbegriff';
! $preferences_lang		= 'Einstellungen';
! $printer_lang			= 'Drucker';
! $select_lang_lang		= 'Standardsprache w&auml;hlen:';
! $select_cal_lang		= 'Standardkalender w&auml;hlen:';
! $select_view_lang		= 'Standardansicht  w&auml;hlen:';
! $select_time_lang		= 'Tag beginnt um:';
! $select_day_lang		= 'Woche beginnt mit:';
! $select_style_lang		= 'Standardstil w&auml;hlen:';
! $set_prefs_lang			= 'Einstellungen speichern';
! $completed_date_lang	= 'Erledigt am';
! $completed_lang			= 'Erledigt';
! $created_lang			= 'Erstellt:';
! $due_lang				= 'F&auml;llig:';
! $priority_lang			= 'Priorit&auml;t:';
! $priority_high_lang		= 'hoch';
! $priority_low_lang		= 'tief';
! $priority_medium_lang	= 'mittel';
! $priority_none_lang		= 'keine';
! $status_lang			= 'Status:';
! $todo_lang				= 'Aufgaben';
! $unfinished_lang		= 'Pendent';
! $prefs_set_lang 		= 'Your preferences have been set.';
! $prefs_unset_lang 		= 'Preferences unset. Changes will take place next page load.';
! $unset_prefs_lang 		= 'Unset preferences:';
! $organizer_lang			= 'Organizer';
! $attendee_lang			= 'Attendee';
! $status_lang			= 'Status';
! $location_lang			= 'Location';
! $admin_header_lang		= 'PHP iCalendar Administration';
! $username_lang			= 'Username';
! $password_lang			= 'Password';
! $login_lang				= 'Login';
! $invalid_login_lang		= 'Wrong username or password.';
! $addupdate_cal_lang		= 'Add or Update a Calendar';
! $addupdate_desc_lang	= 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.';
! $delete_cal_lang		= 'Delete a Calendar';
! $logout_lang			= 'Logout';
! $cal_file_lang			= 'Calendar File';
! $php_error_lang			= 'PHP Error';
! $upload_error_gen_lang	= 'There was a problem with your upload.';
! $upload_error_lang[0]	= 'There was a problem with your upload.';
! $upload_error_lang[1]	= 'The file you are trying to upload is too big.';
! $upload_error_lang[2]	= 'The file you are trying to upload is too big.';
! $upload_error_lang[3]	= 'The file you are trying upload was only partially uploaded.';
! $upload_error_lang[4]	= 'You must select a file for upload.';
! $upload_error_type_lang = 'Only .ics files may be uploaded.';
! $copy_error_lang		= 'Failed to copy file';
! $delete_error_lang		= 'Failed to delete file';
! $delete_success_lang	= 'was deleted successfully.';
! $action_success_lang	= 'Your action was successful.';
! $submit_lang			= 'Submit';
! $delete_lang			= 'Delete';
! 
! // ----- New for 0.9.4
! $all_cal_comb_lang		= 'All calendars combined';
! 
! // - navigation
! $back_lang = 'Back';
! $next_lang = 'Next';
! $prev_lang = 'Prev';
! $day_view_lang = 'Day View';
! $week_view_lang = 'Week View';
! $month_view_lang = 'Month View';
! $year_view_lang = 'Year View';
! 
! // ---------------------------------
! 
! // $format_recur, items enclosed in % will be substituted with variables
! $format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'
! 
! $format_recur_lang['yearly']		= array('Jahr','Jahre');		// for these, put singular
! $format_recur_lang['monthly']		= array('Monat','Monate');		// and plural forms
! $format_recur_lang['weekly']		= array('Woche','Wochen');		// these will be %freq%
! $format_recur_lang['daily']			= array('Tag','Tage');			// in the replacement below
! $format_recur_lang['hourly']		= array('Stunde','Stunden');
! $format_recur_lang['minutely']		= array('Minute','Minuten');
! $format_recur_lang['secondly']		= array('Sekunde','Sekunden');
! 
! $format_recur_lang['start']			= 'Jeden %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until']			= 'bis %date%';				// ie, 'until January 4'
! $format_recur_lang['count']			= 'f&uuml;r %int% Mal';		// ie, 'for 5 times'
! 
! $format_recur_lang['bymonth']		= 'In den Monaten: %list%';			// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'An den Daten: %list%';			// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']			= 'An den Tagen: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'
! 
! // ---------------------------------
! 
! $daysofweek_lang			= array ('Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag');
! $daysofweekshort_lang		= array ('Son','Mon','Die','Mit','Don','Fre','Sam');
! $daysofweekreallyshort_lang	= array ('S','M','D','M','D','F','S');
! $monthsofyear_lang			= array ('Januar','Februar','M&auml;rz','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember');
! $monthsofyearshort_lang		= array ('Jan','Feb','M&auml;r','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez');
! 
! // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! $timeFormat = 'H:i';
! $timeFormat_small = 'H:i';
! 
! // For date formatting, see note below
! $dateFormat_day = '%A, %e. %B';
! $dateFormat_week = '%B %e';
! $dateFormat_week_list = '%a, %e. %b';
! $dateFormat_week_jump = ' %e. %b';
! $dateFormat_month = '%B %Y';
! $dateFormat_month_list = '%A, %e. %B';
! 
! /*
! Notes about dateFormat_*
! 	The pieces are similar to that of the PHP function strftime(), 
! 	however only the following is supported at this time:
! 	
! 	%A - the full week day name as specified in $daysofweek_lang
! 	%a - the shortened week day name as specified in $daysofweekshort_lang
! 	%B - the full month name as specified in $monthsofyear_lang
! 	%b - the shortened month name as specified in $monthsofyearshort_lang
! 	%e - the day of the month as a decimal number (1 to 31)
! 	%Y - the 4-digit year
! 
! 	If this causes problems with representing your language accurately, let
! 	us know. We will be happy to modify this if needed.
! */
! 
! // Error messages - %s will be replaced with a variable
! $error_title_lang = 'Fehler!';
! $error_window_lang = 'Es ist ein Fehler aufgetreten!';
! $error_calendar_lang = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.';
! $error_path_lang = 'Der Pfad "%s" kann nicht ge&ouml;ffnet werden.';
! $error_back_lang = 'Bitte klicken Sie die "Zur&uuml;ck" Schaltfl&auml;che des Browsers um zur&uuml;ckzuspringen.';
! $error_remotecal_lang = 'Dieser Server blockiert entfernte Kalender, welche nicht freigegeben wurden.';
! $error_restrictedcal_lang = 'Sie haben versucht einen Kalender mit eingeschr&auml;nktem Zugriff auf diesem Server aufzurufen.';
! $error_invalidcal_lang = 'Dieser Kalender enth&auml;lt Fehler. Bitte w&auml;hlen Sie einen anderen aus.';
! 
! ?>
\ No newline at end of file
--- 1 ----
! <?php

// German language include
// For version 1.0 PHP iCalendar
//
// Translation by David Reindl (dr...@an...)
// Corrected by whippersnapper slomo (ma...@sl...)
//
// Submit new translations to ch...@ch...

$day_lang		= 'Tag';
$week_lang		= 'Woche';
$month_lang		= 'Monat';
$year_lang		= 'Jahr';
$calendar_lang		= 'Kalender';

$next_day_lang		= 'Folgender Tag';
$next_month_lang	= 'Folgender Monat';
$next_week_lang		= 'Folgende Woche';
$next_year_lang		= 'Folgendes Jahr';

$last_day_lang		= 'Vorhergehender Tag';
$last_month_lang	= 'Vorhergehender Monat';
$last_week_lang		= 'Vorhergehende Woche';
$last_year_lang		= 'Vorhergehendes Jahr';

$subscribe_lang		= 'Abonnieren';
$download_lang		= 'Herunterladen';
$powered_by_lang 	= 'Powered by';
$event_lang		= 'Eintrag';
$event_start_lang	= 'Beginn';
$event_end_lang		= 'Ende';

$this_months_lang	= 'Alle Eintr&auml;ge in diesem Monat';
$date_lang		= 'Datum';
$summary_lang		= 'Beschreibung';
$all_day_lang		= 'Tagesereignis';
$notes_lang		= 'Notiz';

$this_years_lang	= 'Eintr&auml;ge in diesem Jahr';
$today_lang		= 'Heute';
$this_week_lang		= 'Diese Woche';
$this_month_lang	= 'Diesen Monat';
$jump_lang		= 'Gehe zu';
$tomorrows_lang		= 'Morgige Eintr&auml;ge';

$goday_lang		= 'Gehe zum heutigen Tag';
$goweek_lang		= 'Gehe zur aktuellen Woche';
$gomonth_lang		= 'Gehe zum aktuellen Monat';
$goyear_lang		= 'Gehe zum aktuellen Jahr';

$search_lang		= 'Suchen'; // the verb
$results_lang		= 'Suchresultate';
$query_lang		= 'Suche: '; // will be followed by the search query
$no_results_lang	= 'Keine Eintr&auml;ge gefunden';
$goprint_lang		= 'Druckversion';
$time_lang		= 'Zeit';
$summary_lang		= 'Zusammenfassung';
$description_lang	= 'Beschreibung';
$this_site_is_lang	= 'Diese Site ist';

$no_events_day_lang	= 'Keine Eintr&auml;ge f&uuml;r heute.';
$no_events_week_lang	= 'Keine Eintr&auml;ge in dieser Woche.';
$no_events_month_lang	= 'Keine Eintr&auml;ge in diesem Monat.';

$rss_day_date		= 'H:i';  // Lists just the time
$rss_week_date		= '%e. %b';  // Lists just the day
$rss_month_date		= '%e. %b';  // Lists just the day
$rss_language		= 'de-de';

$search_took_lang	= 'Suche dauerte %s Sekunden';
$recurring_event_lang	= 'Wiederkehrender Eintrag';
$exception_lang		= 'Ausnahme';
$no_query_lang		= 'Kein Suchbegriff';
$preferences_lang	= 'Einstellungen';
$printer_lang		= 'Drucker';

$select_lang_lang	= 'Standardsprache w&auml;hlen:';
$select_cal_lang	= 'Standardkalender w&auml;hlen:';
$select_view_lang	= 'Standardansicht  w&auml;hlen:';
$select_time_lang	= 'Tag beginnt um:';
$select_day_lang	= 'Woche beginnt mit:';
$select_style_lang	= 'Standardstil w&auml;hlen:';

$set_prefs_lang		= 'Einstellungen speichern';

$completed_date_lang	= 'Erledigt am';
$completed_lang		= 'Erledigt';

$created_lang		= 'Erstellt:';
$due_lang		= 'F&auml;llig:';

$priority_lang		= 'Priorit&auml;t:';
$priority_high_lang	= 'hoch';
$priority_low_lang	= 'tief';
$priority_medium_lang	= 'mittel';
$priority_none_lang	= 'keine';

$status_lang		= 'Status:';
$todo_lang		= 'Aufgaben';
$unfinished_lang	= 'Pendent';

$prefs_set_lang 	= 'Einstellungen wurden gespeichert.';
$prefs_unset_lang 	= 'Einstellungen gel&ouml;scht. &Auml;nderungen werden beim Aufruf der n&auml;chsten Seite aktiv.';
$unset_prefs_lang 	= 'Einstellungen l&ouml;schen:';

$organizer_lang		= 'Organisator';
$attendee_lang		= 'Teilnehmer';
$status_lang		= 'Status';
$location_lang		= 'Ort';

$admin_header_lang	= 'PHP iCalendar Administration';
$username_lang		= 'Benutzername';
$password_lang		= 'Passwort';
$login_lang		= 'Anmelden';
$invalid_login_lang	= 'Falscher Benutzername oder Passwort.';
$addupdate_cal_lang	= 'Kalender aktualisieren oder hochladen';
$addupdate_desc_lang	= 'Um einen Kalendar hinzuzuf&uuml;gen, laden Sie ein neues Kalender Dokument hoch. Um einen Kalender zu aktualisieren, laden Sie ein Kalender Dokument mit dem selben Namen hoch.';
$delete_cal_lang	= 'Einen Kalender l&ouml;schen';
$logout_lang		= 'Abmelden';
$cal_file_lang		= 'Kalender Dokument';
$php_error_lang		= 'PHP Fehler';

$upload_error_gen_lang	= 'Es ist ein Problem beim Hochladen aufgetreten.';
$upload_error_lang[0]	= 'Fehler beim Hochladen des Dokuments.';
$upload_error_lang[1]	= 'Das hochzuladende Dokument ist zu gross.';
$upload_error_lang[2]	= 'Das Dokument, welches Sie versuchen hochzuladen, ist zu gross.';
$upload_error_lang[3]	= 'The file you are trying upload was only partially uploaded.';
$upload_error_lang[4]	= 'Sie m&uuml;ssen ein Dokument zum Hochladen ausw&auml;hlen.';
$upload_error_type_lang = 'Nur Dokumente mit der Suffix .ics d&uuml;rfen hochgeladen werden.';

$copy_error_lang	= 'Kopieren des Dokuments nicht erfolgreich';
$delete_error_lang	= 'L&ouml;schen des Dokuments nicht erfolgreich';
$delete_success_lang	= 'wurde gel&ouml;scht.';
$action_success_lang	= 'Die Aktion war erfolgreich.';

$submit_lang		= 'Absenden';
$delete_lang		= 'L&ouml;schen';


// ----- New for 0.9.5

$all_cal_comb_lang	= 'Alle Kalender zusammen';

// - navigation

$back_lang              = 'Zur&uuml;ck';
$next_lang              = 'N&auml;chste';
$prev_lang              = 'Vorherige';

$day_view_lang          = 'Tagesansicht';
$week_view_lang         = 'Wochenansicht';
$month_view_lang        = 'Monatsansicht';
$year_view_lang         = 'Jahresansicht';


// ---------------------------------

// $format_recur, items enclosed in % will be substituted with variables

$format_recur_lang['delimiter'] = ', ';                     // ie, 'one, two, three'

$format_recur_lang['yearly']    = array('Jahr','Jahre');    // for these, put singular
$format_recur_lang['monthly']   = array('Monat','Monate');  // and plural forms
$format_recur_lang['weekly']	= array('Woche','Wochen');  // these will be %freq%
$format_recur_lang['daily']	= array('Tag','Tage');      // in the replacement below
$format_recur_lang['hourly']	= array('Stunde','Stunden');
$format_recur_lang['minutely']	= array('Minute','Minuten');
$format_recur_lang['secondly']	= array('Sekunde','Sekunden');

$format_recur_lang['start']	= 'Jeden %int% %freq% %for%';   // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
$format_recur_lang['until']	= 'bis %date%';             // ie, 'until January 4'
$format_recur_lang['count']	= 'f&uuml;r %int% Mal';     // ie, 'for 5 times'

$format_recur_lang['bymonth']	= 'In den Monaten: %list%'; // ie, 'In months: January, February, March'
$format_recur_lang['bymonthday']    = 'An den Daten: %list%';   // ie, 'On dates: 1, 2, 3, 4'
$format_recur_lang['byday']	= 'An den Tagen: %list%';   // ie, 'On days: Mon, Tues, Wed, Thurs'

// ---------------------------------

$daysofweek_lang		= array ('Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag');
$daysofweekshort_lang		= array ('Son','Mon','Die','Mit','Don','Fre','Sam');
$daysofweekreallyshort_lang	= array ('S','M','D','M','D','F','S');

$monthsofyear_lang		= array ('Januar','Februar','M&auml;rz','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember');
$monthsofyearshort_lang		= array ('Jan','Feb','M&auml;r','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez');


// For time formatting, check out: http://www.php.net/manual/en/function.date.php

$timeFormat             = 'H:i';
$timeFormat_small       = 'H:i';


// For date formatting, see note below

$dateFormat_day         = '%A, %e. %B';
$dateFormat_week        = '%B %e';
$dateFormat_week_list   = '%a, %e. %b';
$dateFormat_week_jump   = ' %e. %b';
$dateFormat_month       = '%B %Y';
$dateFormat_month_list  = '%A, %e. %B';

/*

Notes about dateFormat_*

	The pieces are similar to that of the PHP function strftime(), 
	however only the following is supported at this time:

	%A - the full week day name as specified in $daysofweek_lang
	%a - the shortened week day name as specified in $daysofweekshort_lang
	%B - the full month name as specified in $monthsofyear_lang
	%b - the shortened month name as specified in $monthsofyearshort_lang
	%e - the day of the month as a decimal number (1 to 31)
	%Y - the 4-digit year

	If this causes problems with representing your language accurately, let
	us know. We will be happy to modify this if needed.

*/


// Error messages - %s will be replaced with a variable

$error_title_lang       = 'Fehler!';
$error_window_lang      = 'Es ist ein Fehler aufgetreten!';
$error_calendar_lang    = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.';
$error_path_lang        = 'Der Pfad "%s" kann nicht ge&ouml;ffnet werden.';
$error_back_lang        = 'Bitte klicken Sie die "Zur&uuml;ck" Schaltfl&auml;che des Browsers um zur&uuml;ckzuspringen.';
$error_remotecal_lang   = 'Dieser Server blockiert entfernte Kalender, welche nicht freigegeben wurden.';
$error_restrictedcal_lang   = 'Sie haben versucht einen Kalender mit eingeschr&auml;nktem Zugriff auf diesem Server aufzurufen.';
$error_invalidcal_lang  = 'Dieser Kalender enth&auml;lt Fehler. Bitte w&auml;hlen Sie einen anderen aus.';

?>
\ No newline at end of file

Index: italian.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/italian.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** italian.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- italian.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 2,6 ****
  
  // Italian language include
! // For version 0.9.4 PHP iCalendar
  //
  // First translation by Luca Cacciagrano (cl...@cl...)
--- 2,6 ----
  
  // Italian language include
! // For version 1.0 PHP iCalendar
  //
  // First translation by Luca Cacciagrano (cl...@cl...)
***************
*** 116,120 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 116,120 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 1.0
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: japanese.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/japanese.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** japanese.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- japanese.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 120,124 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 120,124 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 1.0
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: norwegian.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/languages/norwegian.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** norwegian.inc.php	5 Oct 2003 15:29:40 -0000	1.1
--- norwegian.inc.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 1,197 ****
! <?php
! 
! // Norwegian language include
! // For version 0.9.2 PHP iCalendar
! //
! // Translation by Geir Kielland (gei...@ju...)
! //
! // Submit new translations to ch...@ch...
! 
! $day_lang			= 'Dag';
! $week_lang			= 'Uke';
! $month_lang			= 'M&aring;ned';
! $year_lang			= '&aring;r';
! $calendar_lang		= 'kalender';
! $next_day_lang		= 'Neste dag';
! $next_month_lang	= 'Neste m&aring;ned';
! $next_week_lang		= 'Neste uke';
! $next_year_lang		= 'Neste &aring;r';
! $last_day_lang		= 'Forrige dag';
! $last_month_lang	= 'Forrige m&aring;ned';
! $last_week_lang		= 'Forrige uke';
! $last_year_lang		= 'Forrige &aring;r';
! $subscribe_lang		= 'Abonn&eacute;r';
! $download_lang		= 'Last ned';
! $powered_by_lang 	= 'Kj&oslash;res med';
! $event_lang			= 'Hendelse';
! $event_start_lang	= 'Start tid';
! $event_end_lang		= 'Slutt tid';
! $this_months_lang	= 'Denne M&aring;nedens Hendelser';
! $date_lang			= 'Dato';
! $summary_lang		= 'Sammendrag';
! $all_day_lang		= 'Hele dagen';
! $notes_lang			= 'Notater';
! $this_years_lang	= 'Hendelser dette &aring;ret';
! $today_lang			= 'I dag';
! $this_week_lang		= 'Denne uken';
! $this_month_lang	= 'Denne m&aring;neden';
! $jump_lang			= 'Hopp til';
! $tomorrows_lang		= 'I morgen';
! $goday_lang			= 'G&aring; til i dag';
! $goweek_lang		= 'G&aring; til denne uken';
! $gomonth_lang		= 'G&aring; til denne m&aring;neden';
! $goyear_lang		= 'G&aring; til dette &aring;ret';
! $search_lang		= 'S&oslash;k'; // the verb
! $results_lang		= 'S&oslash;keresultater';
! $query_lang			= 'Sp&oslash;rring: '; // will be followed by the search query
! $no_results_lang	= 'Ingen hendelser funnet';
! $goprint_lang		= 'Utskriftsvennlig';
! $time_lang			= 'Tid';
! $summary_lang		= 'Oppsummering';
! $description_lang	= 'Beskrivelse';
! $this_site_is_lang		= 'Dette nettstedet er';
! $no_events_day_lang		= 'Ingen hendelser i dag.';
  $no_events_week_lang	= 'Ingen hendelser denne uken.';
! $no_events_month_lang	= 'Ingen hendelser denne m&aring;neden.';
! $rss_day_date			= 'g:i A';  // Lists just the time
! $rss_week_date			= '%b %e';  // Lists just the day
! $rss_month_date			= '%b %e';  // Lists just the day
! $...
 
[truncated message content]

[Openfirst-cvscommit] members/phpicalendar/functions event.js,NONE,1.1 admin_functions.php,1.1,1.2 date_functions.php,1.1,1.2 ical_parser.php,1.1,1.2 init.inc.php,1.1,1.2 list_icals.php,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:18:02

Update of /cvsroot/openfirst/members/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/functions

Modified Files:
	admin_functions.php date_functions.php ical_parser.php 
	init.inc.php list_icals.php 
Added Files:
	event.js 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

--- NEW FILE: event.js ---
<script language="JavaScript" type="text/javascript">
<!--
function openEventWindow(num) {
	// populate the hidden form
	var data = document.popup_data[num];
	var form = document.forms.eventPopupForm;
	form.elements.event.value = data.event;
	form.elements.cal.value = data.cal;
	form.elements.start.value = data.start;
	form.elements.end.value = data.end;
	form.elements.description.value = data.description;
	form.elements.status.value = data.status;
	form.elements.location.value = data.location;
	form.elements.organizer.value = data.organizer;
	form.elements.attendee.value = data.attendee;    
	form.elements.url.value = data.url;    
	
	// open a new window
	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
	form.target = 'Popup';
	form.submit();
}

function EventData(event, cal, start, end, description, status, location, organizer, attendee, url) {
	this.event = event;
	this.cal = cal;
	this.start = start;
	this.end = end;
	this.description = description;
	this.status = status;
	this.location = location;
	this.organizer = organizer;
	this.attendee = attendee;
	this.url = url;
}

document.popup_data = new Array();
//-->
</script>
Index: admin_functions.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/functions/admin_functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_functions.php	5 Oct 2003 15:27:12 -0000	1.1
--- admin_functions.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 285,306 ****
  }
  
! // Get all calendar filenames (not including path)
! //
! // argo: string path to calendar files
! // returns array filenames (not including path)
! function get_calendar_files($calendar_path) {
! 	global $error_path_lang;
! 	
! 	$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path)));
! 	$filelist = array();
! 	while ($file = readdir($dir_handle)) {
! 		if (preg_match("/^[^.].+\.ics$/", $file)) {
! 			array_push($filelist, $file);
! 		}
! 	}
! 	closedir($dir_handle);
! 	natcasesort($filelist);
! 	return $filelist;
! }
! 
! ?>
\ No newline at end of file
--- 285,287 ----
  }
  
! ?>

Index: date_functions.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/functions/date_functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** date_functions.php	5 Oct 2003 15:27:12 -0000	1.1
--- date_functions.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 161,212 ****
  }
  
! function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic, $class) { 
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	# for iCal pseudo tag <http> comptability
! 	if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$reg)) { 
! 		$ev = $reg[1] . $reg[2]; 
! 		$event_text = $reg[2];
  	} else { 
! 		$ev = $arr["event_text"];
  		$event_text = strip_tags($event_text, '<b><i><u>');
  	}
! 	if (isset($arr["organizer"])) {
! 		$organizer = urlencode(addslashes($arr["organizer"]));
! 	} else {
! 		$organizer = '';
! 	}
! 	if (isset($arr["attendee"])) {
! 		$attendee = urlencode(addslashes($arr["attendee"]));
! 	} else {
! 		$attendee = '';
! 	}
! 	if (isset($arr["location"])) {
! 		$location = $arr["location"];
! 	} else {
! 		$location = '';
! 	}
! 	if (isset($arr["status"])) {
! 		$status = $arr["status"];
! 	} else {
! 		$status = '';
! 	}
! 	if ($event_text != "") {	
! 		if ($lines) $event_text = word_wrap($event_text, $wrap, $lines);
! 		$dsc  = urlencode(addslashes($arr["description"]));
! 		echo '<a class="'.$class.'" href="';
! 		if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $ev, $res))) || ($dsc)) {
! 			echo "javascript:w=window.open('";
! 			echo "includes/event.php?event=";
! 			echo urlencode(addslashes($ev));
! 			echo "&cal=";
! 			echo urlencode(addslashes($cal));
! 			echo "&start=$st&end=$end&description=$dsc&status=$status&location=$location&organizer=$organizer&attendee=$attendee";
! 			echo "','Popup','";
! 			echo "scrollbars=yes,width=460,height=275";
! 			echo "');w.focus()";
  		} else {
! 			echo $res[1];
  		}
! 	echo '">'.$clic.$event_text.$fclic.'</a>';
  	}
  }
--- 161,208 ----
  }
  
! function openevent($calendar_name, $start, $end, $arr, $lines, $wrap, $pre_text, $post_text, $link_class, $url) { 
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	# for iCal pseudo tag <http> comptability
! 	if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) { 
! 		$full_event_text = $matches[1] . $matches[2]; 
! 		$event_text = $matches[2];
  	} else { 
! 		$full_event_text = $event_text;
  		$event_text = strip_tags($event_text, '<b><i><u>');
  	}
! 
! 	if (isset($arr["organizer"])) $organizer = addslashes($arr["organizer"]);
! 	if (isset($arr["attendee"])) $attendee = addslashes($arr["attendee"]);
! 	if (isset($arr["location"])) $location = addslashes($arr["location"]);
! 	if (isset($arr["status"])) $status = addslashes($arr["status"]);
! 	if (isset($arr["description"])) $description = addslashes(stripslashes(urldecode($arr["description"])));
!     if (isset($arr["url"])) $url = addslashes(stripslashes(urldecode($arr["url"])));
! 
! 	if (!empty($event_text)) {	
! 		if ($lines > 0) {
! 			$event_text = word_wrap($event_text, $wrap, $lines);
! 		}
! 
! 		if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $full_event_text, $res))) || ($description)) {
! 			$escaped_event = addslashes($full_event_text);
! 			$escaped_calendar = addslashes($calendar_name);
! 			$escaped_start = addslashes($start);
! 			$escaped_end = addslashes($end);
! 			// fix for URL-length bug in IE: populate and submit a hidden form on click
! 			static $popup_data_index = 0;
! echo <<<END
! 
!     <script language="Javascript" type="text/javascript"><!--
!     var eventData = new EventData('$escaped_event', '$escaped_calendar', '$escaped_start', '$escaped_end', '$description', '$status', '$location', '$organizer', '$attendee', '$url');
!     document.popup_data[$popup_data_index] = eventData;
!     // --></script>
! 
! END;
! 			echo '<a class="'.$link_class.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">';
! 			$popup_data_index++;
  		} else {
! 			echo '<a class="'.$link_class.'" href="'.$res[1].'">';
  		}
! 		echo $pre_text.$event_text.$post_text.'</a>'."\n";
  	}
  }

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ical_parser.php	5 Oct 2003 15:27:12 -0000	1.1
--- ical_parser.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 2,10 ****
  
  if (!defined('BASE')) define('BASE', './');
! include(BASE.'functions/init.inc.php');
! include(BASE.'functions/date_functions.php');
! include(BASE.'functions/draw_functions.php');
! include(BASE.'functions/overlapping_events.php');
! include(BASE.'functions/timezones.php');
  
  $fillTime = $day_start;
--- 2,10 ----
  
  if (!defined('BASE')) define('BASE', './');
! include_once(BASE.'functions/init.inc.php');
! include_once(BASE.'functions/date_functions.php');
! include_once(BASE.'functions/draw_functions.php');
! include_once(BASE.'functions/overlapping_events.php');
! include_once(BASE.'functions/timezones.php');
  
  $fillTime = $day_start;
***************
*** 52,61 ****
  
  if ($parse_file) {	
- // some initializations, that have to be outside the calnumber loop
- 	// auxiliary array for determining overlaps of events
  	$overlap_array = array ();
- 		
- 	// using $uid to set specific points in array, if $uid is not in the 
- 	// .ics file, we need to have some unique place in the array
  	$uid_counter = 0;
  }
--- 52,56 ----
***************
*** 63,69 ****
  $calnumber = 1;
  foreach ($cal_filelist as $filename) {
! 
  	if ($parse_file) {	
- 		// patch to speed up parser
  		
  		$ifile = fopen($filename, "r");
--- 58,67 ----
  $calnumber = 1;
  foreach ($cal_filelist as $filename) {
! 	
! 	// Find the real name of the calendar.
! 	$actual_calname = str_replace($calendar_path, '', $filename);
! 	$actual_calname = str_replace('/', '', str_replace('.ics', '', $actual_calname));
! 	
  	if ($parse_file) {	
  		
  		$ifile = fopen($filename, "r");
***************
*** 96,111 ****
  					$start_time, $end_time, $start_date, $end_date, $summary, 
  					$allday_start, $allday_end, $start, $end, $the_duration, 
! 					$beginning, $rrule_array, $start_of_vevent, $description, 
! 					$valarm_description, $start_unixtime, $end_unixtime,
! 					$recurrence_id, $uid, $class, $location, $rrule
  				);
  					
  				$except_dates 	= array();
  				$except_times 	= array();
  				$first_duration = TRUE;
  				$count 			= 1000000;
  				$valarm_set 	= FALSE;
  				$attendee		= array();
! 				$organizer	= array();
  				
  				unset(
--- 94,111 ----
  					$start_time, $end_time, $start_date, $end_date, $summary, 
  					$allday_start, $allday_end, $start, $end, $the_duration, 
! 					$beginning, $rrule_array, $start_of_vevent, $description, $bd, $url, 
! 					$valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, 
! 					$recurrence_id, $uid, $class, $location, $rrule, $abs_until, $until_check
  				);
  					
  				$except_dates 	= array();
  				$except_times 	= array();
+ 				$bymonth	 	= array();
+ 				$bymonthday 	= array();
  				$first_duration = TRUE;
  				$count 			= 1000000;
  				$valarm_set 	= FALSE;
  				$attendee		= array();
! 				$organizer		= array();
  				
  				unset(
***************
*** 117,120 ****
--- 117,126 ----
  			} elseif ($line == 'END:VEVENT') {
  				
+ 				// Handle DURATION
+ 				if (!isset($end_unixtime) && isset($the_duration)) {
+ 					$end_unixtime 	= $start_unixtime + $the_duration;
+ 					$end_time 	= date ('Hi', $end_unixtime);
+ 				}
+ 					
  				// CLASS support
  				if (isset($class)) {
***************
*** 176,181 ****
--- 182,189 ----
  				if (isset($start_unixtime,$end_unixtime) && date('d',$start_unixtime) != date('d',$end_unixtime)) {
  					$spans_day = true;
+ 					$bleed_check = (($start_unixtime - $end_unixtime) < (60*60*24)) ? '-1' : '0';
  				} else {
  					$spans_day = false;
+ 					$bleed_check = 0;
  				}
  				if (isset($start_time) && $start_time != '') {
***************
*** 219,226 ****
  						$end = strtotime('+1 day', $start);
  					}
! 					if (($end > $mArray_begin) && ($end < $mArray_end)) {
! 						while ($start != $end) {
  							$start_date2 = date('Ymd', $start);
! 							$master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber);
  							$start = strtotime('+1 day', $start);
  						}
--- 227,235 ----
  						$end = strtotime('+1 day', $start);
  					}
! 					// Changed for 1.0, basically write out the entire event if it starts while the array is written.
! 					if ($start < $mArray_end) {
! 						while (($start != $end) && ($start < $mArray_end)) {
  							$start_date2 = date('Ymd', $start);
! 							$master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber, 'calname' => $actual_calname );
  							$start = strtotime('+1 day', $start);
  						}
***************
*** 231,235 ****
  				// Handling regular events
  				if ((isset($start_time) && $start_time != '') && (!isset($allday_start) || $allday_start == '')) {
! 					if ($spans_day) {
  						$start_tmp = strtotime(date('Ymd',$start_unixtime));
  						$end_date_tmp = date('Ymd',$end_unixtime);
--- 240,244 ----
  				// Handling regular events
  				if ((isset($start_time) && $start_time != '') && (!isset($allday_start) || $allday_start == '')) {
! 					if (($end_time > $bleed_time) && ($bleed_check == '-1')) {
  						$start_tmp = strtotime(date('Ymd',$start_unixtime));
  						$end_date_tmp = date('Ymd',$end_unixtime);
***************
*** 247,260 ****
  							} else {
  								$end_time_tmp = '2400';
  							}
  							$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
! 							$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee) );
  							$start_tmp = strtotime('+1 day',$start_tmp);
  						}
  						if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true;
  					} else {
! 						$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid);
! 						$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
! 						if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
  					}
  				}
--- 256,281 ----
  							} else {
  								$end_time_tmp = '2400';
+ 								$display_end_tmp = $end_time;
  							}
+ 							
  							$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
! 							$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url );
  							$start_tmp = strtotime('+1 day',$start_tmp);
  						}
  						if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true;
  					} else {
! 						if ($bleed_check == '-1') {
! 							$display_end_tmp = $end_time;
! 							$end_time_tmp1 = '2400';	
! 						}
! 						
! 						if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
! 					
! 						// This if statement should prevent writing of an excluded date if its the first recurrance - CL
! 						if (!in_array($start_date, $except_dates)) {
! 							$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid);
! 							$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url );
! 							if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
! 						}
  					}
  				}
***************
*** 313,335 ****
  								$until = ereg_replace('T', '', $val);
  								$until = ereg_replace('Z', '', $until);
! 								ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $until, $regs);
! 								$year = $regs[1];
! 								$month = $regs[2];
! 								$day = $regs[3];
! 								$until = mktime(0,0,0,$month,$day,$year);
! 								if (ereg('^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})$', $val)) {
! 									// RFC 2445 says that if an UNTIL has a date-time value,
! 									// it MUST be in UTC (i.e. trailing Z).  iCal tends to
! 									// put an end date on the next day early in the morning,
! 									// not in UTC time, so we try to correct for it.
! 									//
! 									// Bill's guess: iCal stores the UNTIL internally as
! 									// 23:59:59 UTC, then accidentally converts that to local
! 									// time when exporting the event.  Thus, if the UNTIL time
! 									// is before noon, it is a day ahead; if it's after noon
! 									// it's the right day.
! 									if ($regs[4] < 12)
! 										$until = strtotime('-1 day', $until);
! 								}
  								$master_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until);
  								break;
--- 334,341 ----
  								$until = ereg_replace('T', '', $val);
  								$until = ereg_replace('Z', '', $until);
! 								if (strlen($until) == 8) $until = $until.'235959';
! 								$abs_until = $until;
! 								ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs);
! 								$until = mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[3],$regs[1]);
  								$master_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until);
  								break;
***************
*** 390,401 ****
  							if (!isset($number)) $number = 1;
  							// if $until isn't set yet, we set it to the end of our range we're looking at
- 							// The FREQ switch array will always kick our early, so lets try this workaround.
- 							if (isset($until)) $until = strtotime('+'.$interval.' '.$freq_type, $until);;
  							
  							if (!isset($until)) $until = $end_range_time;
  							$end_date_time = $until;
  							$start_range_time_tmp = $start_range_time;
  							$end_range_time_tmp = $end_range_time;
  							
  							// If the $end_range_time is less than the $start_date_time, or $start_range_time is greater
  							// than $end_date_time, we may as well forget the whole thing
--- 396,412 ----
  							if (!isset($number)) $number = 1;
  							// if $until isn't set yet, we set it to the end of our range we're looking at
  							
  							if (!isset($until)) $until = $end_range_time;
+ 							if (!isset($abs_until)) $abs_until = date('YmdHis', $end_range_time);
  							$end_date_time = $until;
  							$start_range_time_tmp = $start_range_time;
  							$end_range_time_tmp = $end_range_time;
  							
+ 							// For weekly's without a byday
+ 							if ((!isset($byday)) && ($rrule_array['FREQ'] == 'WEEKLY')) {
+ 								ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $start_date, $startregs);
+ 								$bd = strtolower(date ("l", mktime($hour,$minute,0,$startregs[2],$startregs[3],$startregs[1])));
+ 							}
+ 							
  							// If the $end_range_time is less than the $start_date_time, or $start_range_time is greater
  							// than $end_date_time, we may as well forget the whole thing
***************
*** 428,436 ****
  													break;
  												case 'WEEKLY':
! 													if (is_array($byday)) {
! 														// loop through the days on which this event happens
  														foreach($byday as $day) {
! 															// use my fancy little function to get the date of each day
! 															$day = two2threeCharDays($day);														
  															$next_date = dateOfWeek(date('Ymd', $next_range_time),$day);
  															$next_date_time = strtotime($next_date);
--- 439,449 ----
  													break;
  												case 'WEEKLY':
! 													if (!isset($byday)) {
! 														$next_date = dateOfWeek(date('Ymd', $next_range_time),$bd);
! 														$next_date_time = strtotime($next_date);
! 														$recur_data[] = $next_date_time;
! 													} elseif (is_array($byday)) {
  														foreach($byday as $day) {
! 															$day = two2threeCharDays($day);	
  															$next_date = dateOfWeek(date('Ymd', $next_range_time),$day);
  															$next_date_time = strtotime($next_date);
***************
*** 442,448 ****
  													if (!isset($bymonth)) $bymonth = array(1,2,3,4,5,6,7,8,9,10,11,12);
  													$next_range_time = strtotime(date('Y-m-01', $next_range_time));
! 													// month has two cases, either $bymonthday or $byday
! 													if ((is_array($bymonthday)) && (!is_array($byday))) {
! 														// loop through the days on which this event happens
  														foreach($bymonthday as $day) {
  															$year = date('Y', $next_range_time);
--- 455,459 ----
  													if (!isset($bymonth)) $bymonth = array(1,2,3,4,5,6,7,8,9,10,11,12);
  													$next_range_time = strtotime(date('Y-m-01', $next_range_time));
! 													if ((isset($bymonthday)) && (!isset($byday))) {
  														foreach($bymonthday as $day) {
  															$year = date('Y', $next_range_time);
***************
*** 453,459 ****
  															}
  														}
- 													// our other case
  													} else {
- 														// loop through the days on which this event happens
  														foreach($byday as $day) {
  															ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr);
--- 464,468 ----
***************
*** 470,474 ****
  																	$recur_data[] = $next_date_time;
  																}
! 															} elseif (is_array($bymonthday)) {
  																// This supports MONTHLY where BYDAY and BYMONTH are both set
  																foreach($bymonthday as $day) {
--- 479,483 ----
  																	$recur_data[] = $next_date_time;
  																}
! 															} elseif (isset($bymonthday)) {
  																// This supports MONTHLY where BYDAY and BYMONTH are both set
  																foreach($bymonthday as $day) {
***************
*** 520,541 ****
  														} else {
  															$day 	= date('d', $start_date_time);
! 															$next_date_time = mktime(0,0,0,$month,$day,$this_year);
  														}
  														$recur_data[] = $next_date_time;
  													}
! 													if(isset($byyearday)) {
! 													foreach ($byyearday as $yearday) {
! 														ereg ('([-\+]{0,1})?([0-9]{1,3})', $yearday, $byyearday_arr);
! 														if ($byyearday_arr[1] == '-') {
! 															$ydtime = mktime(0,0,0,12,31,$this_year);
! 															$yearnum = $byyearday_arr[2] - 1;
! 															$next_date_time = strtotime('-'.$yearnum.' days', $ydtime);
! 														} else {
! 															$ydtime = mktime(0,0,0,1,1,$this_year);
! 															$yearnum = $byyearday_arr[2] - 1;
! 															$next_date_time = strtotime('+'.$yearnum.' days', $ydtime);
  														}
- 														$recur_data[] = $next_date_time;
- 													}
  													}
  													break;
--- 529,550 ----
  														} else {
  															$day 	= date('d', $start_date_time);
! 															$next_date_time = mktime(0,0,0,$month,$day,$year);
  														}
  														$recur_data[] = $next_date_time;
  													}
! 													if (isset($byyearday)) {
! 														foreach ($byyearday as $yearday) {
! 															ereg ('([-\+]{0,1})?([0-9]{1,3})', $yearday, $byyearday_arr);
! 															if ($byyearday_arr[1] == '-') {
! 																$ydtime = mktime(0,0,0,12,31,$this_year);
! 																$yearnum = $byyearday_arr[2] - 1;
! 																$next_date_time = strtotime('-'.$yearnum.' days', $ydtime);
! 															} else {
! 																$ydtime = mktime(0,0,0,1,1,$this_year);
! 																$yearnum = $byyearday_arr[2] - 1;
! 																$next_date_time = strtotime('+'.$yearnum.' days', $ydtime);
! 															}
! 															$recur_data[] = $next_date_time;
  														}
  													}
  													break;
***************
*** 555,560 ****
  									// use the same code to write the data instead of always changing it 5 times						
  									if (isset($recur_data) && is_array($recur_data)) {
! 										$recur_data_hour = substr($start_time,0,2);
! 										$recur_data_minute = substr($start_time,2,2);
  										foreach($recur_data as $recur_data_time) {
  											$recur_data_year = date('Y', $recur_data_time);
--- 564,569 ----
  									// use the same code to write the data instead of always changing it 5 times						
  									if (isset($recur_data) && is_array($recur_data)) {
! 										$recur_data_hour = @substr($start_time,0,2);
! 										$recur_data_minute = @substr($start_time,2,2);
  										foreach($recur_data as $recur_data_time) {
  											$recur_data_year = date('Y', $recur_data_time);
***************
*** 562,566 ****
  											$recur_data_day = date('d', $recur_data_time);
  											$recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day;
! 											
  											if (($recur_data_time > $start_date_time) && ($recur_data_time <= $end_date_time) && ($count_to != $count) && !in_array($recur_data_date, $except_dates)) {
  												if (isset($allday_start) && $allday_start != '') {
--- 571,575 ----
  											$recur_data_day = date('d', $recur_data_time);
  											$recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day;
! 
  											if (($recur_data_time > $start_date_time) && ($recur_data_time <= $end_date_time) && ($count_to != $count) && !in_array($recur_data_date, $except_dates)) {
  												if (isset($allday_start) && $allday_start != '') {
***************
*** 569,573 ****
  													while ($start_time2 < $end_time2) {
  														$start_date2 = date('Ymd', $start_time2);
! 														$master_array[($start_date2)][('-1')][]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber);
  														$start_time2 = strtotime('+1 day', $start_time2);
  													}
--- 578,582 ----
  													while ($start_time2 < $end_time2) {
  														$start_date2 = date('Ymd', $start_time2);
! 														$master_array[($start_date2)][('-1')][]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url );
  														$start_time2 = strtotime('+1 day', $start_time2);
  													}
***************
*** 576,585 ****
  													$end_unixtime_tmp = $start_unixtime_tmp + $length;
  													
! 													if ($spans_day) {
  														$start_tmp = strtotime(date('Ymd',$start_unixtime_tmp));
  														$end_date_tmp = date('Ymd',$end_unixtime_tmp);
  														while ($start_tmp < $end_unixtime_tmp) {
  															$start_date_tmp = date('Ymd',$start_tmp);
! 															if ($start_date_tmp == $start_date) {
  																$time_tmp = $hour.$minute;
  																$start_time_tmp = $start_time;
--- 585,594 ----
  													$end_unixtime_tmp = $start_unixtime_tmp + $length;
  													
! 													if (($end_time > $bleed_time) && ($bleed_check == '-1')) {
  														$start_tmp = strtotime(date('Ymd',$start_unixtime_tmp));
  														$end_date_tmp = date('Ymd',$end_unixtime_tmp);
  														while ($start_tmp < $end_unixtime_tmp) {
  															$start_date_tmp = date('Ymd',$start_tmp);
! 															if ($start_date_tmp == $recur_data_year.$recur_data_month.$recur_data_day) {
  																$time_tmp = $hour.$minute;
  																$start_time_tmp = $start_time;
***************
*** 592,603 ****
  															} else {
  																$end_time_tmp = '2400';
  															}
- 															$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
- 															$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
  															$start_tmp = strtotime('+1 day',$start_tmp);
  														}
  													} else {
! 														$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid);
! 														$master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
  													}
  												}
--- 601,629 ----
  															} else {
  																$end_time_tmp = '2400';
+ 																$display_end_tmp = $end_time;
+ 															}
+ 															
+ 															// Let's double check the until to not write past it
+ 															$until_check = $start_date_tmp.$time_tmp.'00';
+ 															if ($abs_until > $until_check) {
+ 																$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
+ 																$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url) ;
  															}
  															$start_tmp = strtotime('+1 day',$start_tmp);
  														}
  													} else {
! 														if ($bleed_check == '-1') {
! 															$display_end_tmp = $end_time;
! 															$end_time_tmp1 = '2400';
! 																
! 														}
! 														if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
! 													
! 														// Let's double check the until to not write past it
! 														$until_check = $recur_data_date.$hour.$minute.'00';
! 														if ($abs_until > $until_check) {
! 															$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid);
! 															$master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url);
! 														}
  													}
  												}
***************
*** 612,618 ****
  				}
  
!                                // Clear event data now that it's been saved.
!                                unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
! 			
  			// Begin VTODO Support
  			} elseif ($line == 'END:VTODO') {
--- 638,660 ----
  				}
  
! 				// This should remove any exdates that were missed.
! 				// Added for version 0.9.5
! 				if (is_array($except_dates)) {
! 					foreach ($except_dates as $key => $value) {
! 						$time = $except_times[$key];
! 						unset($master_array[$value][$time][$uid]);
! 						if (count($master_array[$value][$time]) < 1) {
! 							unset($master_array[$value][$time]);
! 							if (count($master_array[$value]) < 1) {
! 								unset($master_array[$value]);	
! 							}
! 						}
! 					}
! 				}
! 				
! 			   // Clear event data now that it's been saved.
! 			   unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
! 
! 
  			// Begin VTODO Support
  			} elseif ($line == 'END:VTODO') {
***************
*** 624,628 ****
  					$vtodo_sort = $vtodo_priority;
  				}
! 				$master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description);
  				unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description);
  				$vtodo_set = FALSE;
--- 666,670 ----
  					$vtodo_sort = $vtodo_priority;
  				}
! 				$master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description, 'calname' => $actual_calname);
  				unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description);
  				$vtodo_set = FALSE;
***************
*** 658,661 ****
--- 700,705 ----
  							$allday_start = $data;
  							$start_date = $allday_start;
+ 							$start_unixtime = strtotime($data);
+                             $due_date = date('Ymd', $start_unixtime);
  						} else {
  							if (preg_match("/^DUE;TZID=/i", $field)) {
***************
*** 748,758 ****
  						
  					case 'STATUS':
- 						// VEVENT: TENTATIVE, CONFIRMED, CANCELLED
- 						// VTODO: NEEDS-ACTION, COMPLETED, IN-PROCESS, CANCELLED
  						$status = "$data";
  						break;
  						
  					case 'CLASS':
- 						// VEVENT, VTODO: PUBLIC, PRIVATE, CONFIDENTIAL
  						$class = "$data";
  						break;
--- 792,799 ----
***************
*** 765,769 ****
  						
  					case 'DTSTART':
! 						$data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data);
  						$zulu_time = false;
  						if (substr($data,-1) == 'Z') $zulu_time = true;
--- 806,810 ----
  						
  					case 'DTSTART':
! 						$field = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $field);
  						$zulu_time = false;
  						if (substr($data,-1) == 'Z') $zulu_time = true;
***************
*** 771,775 ****
  						$data = ereg_replace('Z', '', $data);
  						$field = ereg_replace(';VALUE=DATE-TIME', '', $field); 
! 						if (preg_match("/^DTSTART;VALUE=DATE/i", $field))  {
  							ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtstart_check);
  							if ($dtstart_check[1] < 1969) { 
--- 812,816 ----
  						$data = ereg_replace('Z', '', $data);
  						$field = ereg_replace(';VALUE=DATE-TIME', '', $field); 
! 						if ((preg_match("/^DTSTART;VALUE=DATE/i", $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data)))  {
  							ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtstart_check);
  							if ($dtstart_check[1] < 1969) { 
***************
*** 814,818 ****
  							$start_date = date('Ymd', $start_unixtime);
  							$start_time = date('Hi', $start_unixtime);
! 							unset($server_offset_tmp);
  						}
  						break;
--- 855,859 ----
  							$start_date = date('Ymd', $start_unixtime);
  							$start_time = date('Hi', $start_unixtime);
! 							unset($server_offset_tmp, $offset_tmp, $tz_dtstart);
  						}
  						break;
***************
*** 840,844 ****
  							$end_time = $regs[4] . $regs[5];
  							$end_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]);
! 			
  							$dlst = date('I', $end_unixtime);
  							$server_offset_tmp = chooseOffset($end_unixtime);
--- 881,885 ----
  							$end_time = $regs[4] . $regs[5];
  							$end_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]);
! 																	
  							$dlst = date('I', $end_unixtime);
  							$server_offset_tmp = chooseOffset($end_unixtime);
***************
*** 955,960 ****
  							$seconds 		= ereg_replace('S', '', $duration[6]); 
  							$the_duration 	= ($weeks * 60 * 60 * 24 * 7) + ($days * 60 * 60 * 24) + ($hours * 60 * 60) + ($minutes * 60) + ($seconds);
- 							$end_unixtime 	= $start_unixtime + $the_duration;
- 							$end_time 		= date ('Hi', $end_unixtime);
  							$first_duration = FALSE;
  						}	
--- 996,999 ----
***************
*** 982,985 ****
--- 1021,1027 ----
  					case 'LOCATION':
  						$location = $data;
+ 						break;
+ 					case 'URL':
+ 						$url = $data;
  						break;
  				}

Index: init.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/functions/init.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init.inc.php	5 Oct 2003 15:27:12 -0000	1.1
--- init.inc.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 7,16 ****
  
  // uncomment when developing, comment for shipping version
! //error_reporting (E_ALL);
  
  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
  if (!defined('BASE')) define('BASE', './');
! include(BASE.'config.inc.php');
! include(BASE.'functions/error.php');
  if (isset($HTTP_COOKIE_VARS['phpicalendar'])) {
  	$phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
--- 7,25 ----
  
  // uncomment when developing, comment for shipping version
! // error_reporting (E_ERROR | E_WARNING | E_PARSE);
! 
! // Older versions of PHP do not define $_SERVER. Define it here instead.
! if (!isset($_SERVER) && isset($HTTP_SERVER_VARS)) {
! 	$_SERVER = &$HTTP_SERVER_VARS;
! }
  
+ // Define some magic strings.
  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
+ 
+ // Pull in the configuration and some functions.
  if (!defined('BASE')) define('BASE', './');
! include_once(BASE.'config.inc.php');
! include_once(BASE.'functions/error.php');
! include_once(BASE.'functions/calendar_functions.php');
  if (isset($HTTP_COOKIE_VARS['phpicalendar'])) {
  	$phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
***************
*** 23,26 ****
--- 32,85 ----
  }
  
+ // Set the cookie URI.
+ if ($cookie_uri == '') {
+ 	$cookie_uri = $HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/'));
+ }
+ 
+ if ($bleed_time == '') $bleed_time = $day_start;
+ 
+ // If not HTTP authenticated, try login via cookies or the web page.
+ $username = ''; $password = '';
+ if (!isset($_SERVER['PHP_AUTH_USER'])) {
+ 	// Look for a login cookie.
+ 	if (isset($HTTP_COOKIE_VARS['phpicalendar_login'])) {
+ 		$login_cookie = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar_login']));
+ 		if (isset($login_cookie['username']))	$username = $login_cookie['username'];
+ 		if (isset($login_cookie['password']))	$password = $login_cookie['password'];
+ 	}
+ 
+ 	// Look for a new username and password.
+ 	if (isset($HTTP_GET_VARS['username']))			$username = $HTTP_GET_VARS['username'];
+ 	else if (isset($HTTP_POST_VARS['username']))	$username = $HTTP_POST_VARS['username'];
+ 	if (isset($HTTP_GET_VARS['password']))			$password = $HTTP_GET_VARS['password'];
+ 	else if (isset($HTTP_POST_VARS['password']))	$password = $HTTP_POST_VARS['password'];
+ 
+ 	// Grab the action (login or logout).
+ 	if (isset($HTTP_GET_VARS['action']))			$action = $HTTP_GET_VARS['action'];
+ 	else if (isset($HTTP_POST_VARS['action']))		$action = $HTTP_POST_VARS['action'];
+ 	else											$action = '';
+ 
+ 	// Check to make sure the username and password is valid.
+ 	if ($action == 'login' && !key_exists("$username:$password", $locked_map)) {
+ 		// Don't login, instead logout.
+ 		$action = 'logout';
+ 
+ 		// Remember the invalid login, because we may want to
+ 		// display a message elsewhere.
+ 		$invalid_login = true;
+ 	} else {
+ 		$invalid_login = false;
+ 	}
+ 
+ 	// Set the login cookie if logging in. Clear it if logging out.
+ 	if ($action == 'login') {
+ 		$the_cookie = serialize(array('username' => $username, 'password' => $password));
+ 		setcookie('phpicalendar_login', $the_cookie, time()+(60*60*24*7*12*10), '/', $cookie_uri, 0);
+ 	} else if ($action == 'logout') {
+ 		setcookie('phpicalendar_login', '', time()-(60*60*24*7), '/', $cookie_uri, 0);
+ 		$username = ''; $password = '';
+ 	}
+ }
+ 
  // language support
  $language = strtolower($language);
***************
*** 42,46 ****
  
  if (ini_get('max_execution_time') < 60) {
! 	ini_set('max_execution_time', '60');
  }
  
--- 101,105 ----
  
  if (ini_get('max_execution_time') < 60) {
! 	@ini_set('max_execution_time', '60');
  }
  
***************
*** 72,84 ****
  }
  
! if (substr($cal_filename, 0, 7) == 'http://' || substr($cal_filename, 0, 9) == 'webcal://') {
  	$is_webcal = TRUE;
  	$cal_webcalPrefix = str_replace('http://','webcal://',$cal_filename);
  	$cal_httpPrefix = str_replace('webcal://','http://',$cal_filename);
  	$cal_filename = $cal_httpPrefix;
  }
  
  if ($is_webcal) {
! 	if ($allow_webcals == 'yes' || in_array($cal_webcalPrefix, $list_webcals) || in_array($cal_httpPrefix, $list_webcals)) {
  		$cal_displayname = substr(str_replace('32', ' ', basename($cal_filename)), 0, -4);
  		$cal = urlencode($cal_filename);
--- 131,145 ----
  }
  
! if (substr($cal_filename, 0, 7) == 'http://' || substr($cal_filename, 0, 8) == 'https://' || substr($cal_filename, 0, 9) == 'webcal://') {
  	$is_webcal = TRUE;
  	$cal_webcalPrefix = str_replace('http://','webcal://',$cal_filename);
  	$cal_httpPrefix = str_replace('webcal://','http://',$cal_filename);
+ 	$cal_httpsPrefix = str_replace('webcal://','https://',$cal_filename);
+ 	$cal_httpsPrefix = str_replace('http://','https://',$cal_httpsPrefix);
  	$cal_filename = $cal_httpPrefix;
  }
  
  if ($is_webcal) {
! 	if ($allow_webcals == 'yes' || in_array($cal_webcalPrefix, $list_webcals) || in_array($cal_httpPrefix, $list_webcals) || in_array($cal_httpsPrefix, $list_webcals)) {
  		$cal_displayname = substr(str_replace('32', ' ', basename($cal_filename)), 0, -4);
  		$cal = urlencode($cal_filename);
***************
*** 98,149 ****
  	} else {
  		if (!isset($filename)) {
! 			// empty the filelist array
! 			$cal_filelist = array();
! 			if ($cal == $ALL_CALENDARS_COMBINED) { // Create an array with the paths to all files to be combined
! 				// Note: code here is similar to code in list_icals.php
! 				// open directory
! 				$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
! 	
! 				// build the array
! 				while (false != ($file = readdir($dir_handle))) {
! 					if (preg_match("/^[^.].+\.ics$/", $file) &&
! 						!in_array(substr($file, 0, -4), $blacklisted_cals)) {
! 							$file = $calendar_path.'/'.$file;
! 							array_push($cal_filelist, $file);
! 					}
! 				}
! 				// add webcals
! 				foreach ($list_webcals as $file) {
! 					if (preg_match("/^[^.].+\.ics$/", $file)) {
! 						array_push($cal_filelist, $file);
! 					}
! 				}
! 				natcasesort($cal_filelist);
! 			} else { // Handle a single file
! 				$filename = $calendar_path.'/'.$cal_filename.'.ics';
! 				if (true == false) {
! 					$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
! 					while ($file = readdir($dir_handle)) {
! 						if (substr($file, -4) == '.ics') {
! 							$cal = urlencode(substr($file, 0, -4));
! 							$filename = $calendar_path.'/'.$file;
! 							break;
! 						}
! 					}
! 				}
! 				array_push($cal_filelist, $filename);
! 			}
  		}
  		
  		// Sets the download and subscribe paths from the config if present.
! 		if ($download_uri == '') {
  			$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
  			$download_filename = $filename;
! 		} else {
  			$newurl = eregi_replace("^(http://)", "", $download_uri); 
  			$subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics';
  			$download_filename = $download_uri.'/'.$cal_filename.'.ics';
  		}
- 		
  	}
  }
--- 159,178 ----
  	} else {
  		if (!isset($filename)) {
! 			$cal_filelist = availableCalendars($username, $password, $cal_filename);
! 			if (count($cal_filelist) == 1) $filename = $cal_filelist[0];
  		}
  		
  		// Sets the download and subscribe paths from the config if present.
! 		if ($download_uri == '' && preg_match('/(^\/|\.\.\/)/', $filename) == 0) {
  			$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
  			$download_filename = $filename;
! 		} elseif ($download_uri != '') {
  			$newurl = eregi_replace("^(http://)", "", $download_uri); 
  			$subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics';
  			$download_filename = $download_uri.'/'.$cal_filename.'.ics';
+ 		} else {
+ 			$subscribe_path = '';
+ 			$download_filename = '';
  		}
  	}
  }

Index: list_icals.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/functions/list_icals.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** list_icals.php	5 Oct 2003 15:27:12 -0000	1.1
--- list_icals.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 1,70 ****
  <?php
  if ($display_ical_list == "yes") {
! 
! 	// start of <select> tag
! 	if (isset($getdate)) {
! 		$query="&amp;getdate=$getdate";
! 	} else {
! 		$query="";
! 	}	
! 	// open file
! 	$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
  	
! 	// empty the filelist array
! 	$filelist = array();
! 
! 	// build the <option> tags
! 	while (false != ($file = readdir($dir_handle))) {
! 		if (preg_match("/^[^.].+\.ics$/", $file)) {
! 			array_push($filelist, $file);
! 		}
! 	}
! 	natcasesort($filelist);
! 	foreach ($filelist as $file) {
! 		
! 		// $cal_filename is the filename of the calendar without .ics
! 		// $cal is a urlencoded version of $cal_filename
! 		// $cal_displayname is $cal_filename with occurrences of "32" replaced with " "
! 		$cal_filename_tmp = substr($file,0,-4);
! 		$cal_tmp = urlencode($cal_filename_tmp);
! 		$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
! 		if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
! 			if ($cal_tmp == $cal) {
! 				print "<option value=\"$current_view.php?cal=$cal_tmp&amp;getdate=$getdate\" selected>$cal_displayname_tmp $calendar_lang</option>";
! 			} else {
! 				print "<option value=\"$current_view.php?cal=$cal_tmp&amp;getdate=$getdate\">$cal_displayname_tmp $calendar_lang</option>";	
! 			}
! 		}	
! 	}			
! 
! 	// option to open all (non-web) calenders together
! 	if ($cal == $ALL_CALENDARS_COMBINED) {
! 		print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\" selected>$all_cal_comb_lang</option>";
! 	} else {
! 		print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\">$all_cal_comb_lang</option>";
! 	}
! 		
! 	foreach($list_webcals as $cal_tmp) {
! 		if ($cal_tmp != '') {
! 			$cal_displayname_tmp = basename($cal_tmp);
! 			$cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp);
! 			$cal_displayname_tmp = substr($cal_displayname_tmp,0,-4);
! 			$cal_encoded_tmp = urlencode($cal_tmp);
! 			if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
! 				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\" selected>$cal_displayname_tmp Webcal</option>";
! 			} else {
! 				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\">$cal_displayname_tmp Webcal</option>";	
! 			}		
! 		}
! 	}
! 
! 	// close file
! 	closedir($dir_handle);
  	
- 	// finish <select>
  	print "</select>";
- 	
  }
- 
- 
  ?>	
--- 1,12 ----
  <?php
  if ($display_ical_list == "yes") {
! 	echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'";
! 	if (isset($query)) echo $query;
! 	echo "');\">";
  	
! 	// List the calendars.
! 	display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
  	
  	print "</select>";
  }
  ?>

[Openfirst-cvscommit] members/phpicalendar publish.php,NONE,1.1 AUTHORS,1.1,1.2 README,1.1,1.2 admin.php,1.1,1.2 config.inc.php,1.1,1.2 day.php,1.1,1.2 index.php,1.1,1.2 month.php,1.1,1.2 preferences.php,1.1,1.2 print.php,1.1,1.2 search.php,1.1,1.2 week.php,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:18:02

Update of /cvsroot/openfirst/members/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv2747

Modified Files:
	AUTHORS README admin.php config.inc.php day.php index.php 
	month.php preferences.php print.php search.php week.php 
Added Files:
	publish.php 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

--- NEW FILE: publish.php ---
<?php

/*
Extension to PHP iCalendar for supporting publishing from Apple iCal
Date: 11.12.2003
Author: Dietrich Ayala
Copyright 2003 Dietrich Ayala

Description:
This allows iCal to publish to your PHP iCalendar site *without* WebDAV support.
This helps with commercial hosts where WebDAV is not available.

Features:
- supports publishing and deleting calendars
- does not require WebDAV

Installation:
1. place this file in your PHP iCalendar calendars directory (or anywhere else)
2. configure path to PHP iCalendar config file (below)
3. make sure that PHP has write access to the calendars directory (or whatever you set $calendar_path to)
4. set up directory security on your calendars directory
5. turn on publishing in your PHP iCalendar config file by setting $phpicalendar_publishing to 1.

Usage (Apple iCal):
1. Open iCal, select a calendar for publishing
2. Select "Publish" from the "Calendar" menu
3. Configure to your liking, and set the URL to (eg): http://localhost/~dietricha/calendar/calendars/publish.php
4. Click the "Publish" button

Security:
The calendars directory should be configured to require authentication. This can be done via any methods
supported by your webserver. There is much documentation available on the web for doing per-directory
authentication for Apache. This protects any private calendar data, and prevents unauthorized users
from updating or deleting your calendar data.
There's also code below that forwards any GET requests to the PHP iCalendar front page.

Troubleshooting:
You can turn on logging by setting the PHPICALENDAR_LOG_PUBLISHING constant to 1 below.
This will write out a log file to the same directory as this script.
Don't forget to turn off logging when done!!

*/

// include PHP iCalendar configuration variables
include('./config.inc.php');

// set calendar path, or just use current directory
$calendar_path = (isset($calendar_path) && $calendar_path != '') ? $calendar_path : '';

// allow/disallow publishing

$phpicalendar_publishing = isset($phpicalendar_publishing) ? $phpicalendar_publishing : 0;
define( 'PHPICALENDAR_PUBLISHING', $phpicalendar_publishing );

// toggle logging
define( 'PHPICALENDAR_LOG_PUBLISHING', 1 );

/* force GET requests to main calendar view
if($_SERVER['REQUEST_METHOD'] == 'GET')
{
	header('Location: '.$default_path);
	return;
}
*/
// only allow publishing if explicitly enabled
if(PHPICALENDAR_PUBLISHING == 1)
{
	// unpublishing
	if($_SERVER['REQUEST_METHOD'] == 'DELETE')
	{
		// get calendar filename
		$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
		
		logmsg('received request to delete '.$calendar_file);
		
		// remove calendar file
		if(!unlink($calendar_file))
		{
			logmsg('unable to delete the calendar file');
		}
		else
		{
			logmsg('deleted');
		}
		return;
	}
	
	// publishing
	if($_SERVER['REQUEST_METHOD'] == 'PUT')
	{
		// get calendar data
		if($fp = fopen('php://input','r'))
		{
			while(!@feof($fp))
			{
				$data .= fgets($fp,4096);
			}
			
			@fclose($fp);
		}
		else
		{
			logmsg('unable to read input data');
		}
		
		if(isset($data))
		{
			
			// get calendar name
			$cal_arr = explode("\n",$data);
			
			foreach($cal_arr as $k => $v)
			{
				if(strstr($v,'X-WR-CALNAME:'))
				{
					$arr = explode(':',$v);
					$calendar_name = trim($arr[1]);
					break;
				}
			}
			
			$calendar_name = isset($calendar_name) ? $calendar_name : 'default';
			
			// write to file
			if($fp = fopen($calendar_path.$calendar_name.'.ics','w+'))
			{
				fputs($fp, $data, strlen($data) );
				@fclose($fp);
			}
			else
			{
				logmsg( 'couldnt open file '.$calendar_path.$calendar_name.'.ics' );
			}
		}
	}
}

// for logging
function logmsg($str){
	if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1)
	{
		if($fp = fopen('publish_log.txt','a+'))
		{
			$str .= "\n";
			fputs($fp, $str, strlen($str) );
			fclose($fp);
		}
	}
}
?>

Index: AUTHORS
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AUTHORS	5 Oct 2003 15:21:55 -0000	1.1
--- AUTHORS	21 Dec 2003 23:17:19 -0000	1.2
***************
*** 7,41 ****
  PROJECT ADMINS
  --------------
! Chad Little    <ch...@ch...>
! Patrick Crowley    <pa...@ic...>
  
  DEVELOPERS
  ----------
! Patrick Berry  <pb...@ma...>
! Bill Fenner    <fe...@re...>
! David Reindl   <dr...@an...>
! Jared Wangen   <xe...@si...>	
  
  CODE CONTRIBUTORS
  -----------------
! Greg Westin    <php...@gr...>
! Blaine Cook    <la...@re...>
! Mike Traum     <mt...@ya...>
  
  TRANSLATORS
  -----------
! Braz. Port.    Bennet Wilton        <su...@be...>
! Danish         Henrik HÃ¸jmark       <st...@wo...>
!                Jakob PeterhÃ¤nsel    <ma...@cr...>
! Dutch          Lieven Gekiere       <Li...@ge...>
! English        Chad Little          <ch...@ch...>
! Finnish        Kari Somby           <kar...@ra...>
! French         La Shampouineuse     <in...@la...>
! German         David Reindl         <dr...@an...>
! Italian        Luca Cacciagrano     <cl...@cl...>
! Japanese       Jared Wangen         <ja...@si...>
! Norwegian      Geir Kielland        <gei...@ju...>
! Polish         Stanislaw Cieslicki  <st...@po...>
! Portuguese     Rui Costa            <rui...@ub...>
! Spanish        Javier Navarro       <jna...@xi...>
! Swedish        Jonas Hjelm          <jo...@hn...>
--- 7,41 ----
  PROJECT ADMINS
  --------------
! Chad Little    <chad at chadsdomain dot com>
! Patrick Crowley    <patrick at icalshare dot com>
  
  DEVELOPERS
  ----------
! Patrick Berry  <pberry at mac dot com>
! Bill Fenner    <fenner at research dot att dot com>
! David Reindl   <dre at andare dot ch>
! Jared Wangen   <xeo at silter dot org>	
  
  CODE CONTRIBUTORS
  -----------------
! Greg Westin    <phpicalendar at gregwestin dot com>
! Blaine Cook    <lattice at resist dot ca>
! Mike Traum     <mtraum at yahoo dot com>
  
  TRANSLATORS
  -----------
! Braz. Port.    Bennet Wilton        <suporte at bennetworks dot com dot br>
! Danish         Henrik HÃ¸jmark       <styxx at worldonline dot dk>
!                Jakob PeterhÃ¤nsel    <marook at creepers dot org>
! Dutch          Lieven Gekiere       <Lieven at gekiere dot com>
! English        Chad Little          <chad at chadsdomain dot com>
! Finnish        Kari Somby           <kari dot somby at ramk dot fi>
! French         La Shampouineuse     <info at lashampoo dot com>
! German         David Reindl         <dre at andare dot ch>
! Italian        Luca Cacciagrano     <clooka at clac dot it>
! Japanese       Jared Wangen         <jared at silter dot org>
! Norwegian      Geir Kielland        <geir dot kielland at jus dot uio dot no>
! Polish         Stanislaw Cieslicki  <stahoo at poczta dot onet dot pl>
! Portuguese     Rui Costa            <ruicosta at ubi dot pt>
! Spanish        Javier Navarro       <jnavarro at xips dot es>
! Swedish        Jonas Hjelm          <jonas at hnet dot se>

Index: README
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	5 Oct 2003 15:21:55 -0000	1.1
--- README	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 87,90 ****
--- 87,112 ----
  Changes:
  --------
+ 1.0
+ 	-Added return false to popups
+ 	-Added workaround for improperly set DTSTART dates.
+ 
+ 1.0 RC-2
+ 	-Fixed all reported bugs.
+ 	-Added failed login dialog for config authentication.
+ 	-RSS and Admin pages do not fail parsing.
+ 
+ 1.0 RC-1
+ 	-Fixed all reported bugs.
+ 	-Event and Todo popup now displays calendar name.
+ 	-Event popup now supports more than 1024 characters.
+ 	-Subscribe and download links now work again.
+ 	-URL support added for popups.
+ 	-Added config based calendar authentication.
+ 
+ 0.9.5
+ 	-Fixed all reported bugs.
+ 	-Added a method to publish without Webdav in iCal. calendars/publish.php
+ 	-Added ability to set 'bleed time' for events that run past midnight.
+ 
  0.9.4
  	-Vastly improved BYDAY, BYMONTHDAY, BYYEARDAY support.

Index: admin.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/admin.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin.php	5 Oct 2003 15:21:55 -0000	1.1
--- admin.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 6,12 ****
  include (BASE.'functions/admin_functions.php');
  
! // Redirect if administration is not allowed
! // Modified to enforce proper openFIRST administrative privilidges.
! if ($allow_admin != "yes" || isset($user->membertype) == false || $user->membertype != "administrator") {
  	header("Location: index.php");
  	die();
--- 6,11 ----
  include (BASE.'functions/admin_functions.php');
  
! // Redirect if administration is not allowed.  Now includes openFIRST modifications.
! if ($allow_admin != "yes" || isset($user->membertype) == false || $user->membertype != "administrator") {) {
  	header("Location: index.php");
  	die();
***************
*** 42,45 ****
--- 41,46 ----
  	}
  }
+ 
+ $calendar_name = $admin_header_lang;
  include (BASE.'includes/header.inc.php'); 
  
***************
*** 91,95 ****
  // If User is Not Logged In, Display The Login Page
  if ($is_loged_in == FALSE) {
! 	if (isset($username)) {
  		$login_error =  "<font color=\"red\">$invalid_login_lang</font>";
  	} else {
--- 92,96 ----
  // If User is Not Logged In, Display The Login Page
  if ($is_loged_in == FALSE) {
! 	if (isset($username)  && $username !='') {
  		$login_error =  "<font color=\"red\">$invalid_login_lang</font>";
  	} else {
***************
*** 236,240 ****
  			$COLUMNS_TO_PRINT = 3;
  			$column = 1;
! 			$filelist = get_calendar_files($calendar_path);
  			foreach ($filelist as $file) {
  				if ($column > $COLUMNS_TO_PRINT) {
--- 237,241 ----
  			$COLUMNS_TO_PRINT = 3;
  			$column = 1;
! 			$filelist = availableCalendarNames('', '', '', true);
  			foreach ($filelist as $file) {
  				if ($column > $COLUMNS_TO_PRINT) {

Index: config.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/config.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.inc.php	5 Oct 2003 15:21:55 -0000	1.1
--- config.inc.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 1,35 ****
  <?php
! /*
!  *  PHP iCalendar was taken from the PHP iCalendar project on Source Forge.
!  *   It has been adapted through the modification of this configuration file
!  *   and the accompanying sources to work with the openFIRST system.
!  *   
!  *   For more information about PHP iCalendar see: http://phpicalendar.sf.net
!  *
!  *   This file has been heavily modified.
!  *   The other modified files are:
!  *     includes/*
!  *     admin.php
!  *
!  *   Some patches in the PHP iCalendar CVS system have been applied as they were
!  *     causing bugs on some systems.
!  *
!  *   Removed default calendar files in calendars/
!  *
!  *   You will have to set the calendars/ directory to be writable for best
!  *   results.
!  */
! 
!  // Add our own global files
!  if(file_exists("../../config/globals.php")) {
!    include("../../config/globals.php");
!  } else {
!    include("../../../config/globals.php");
!  }
! 
! // This fixes a bug which is present in version 0.9.4 of PHP iCalendar
  $cal_filelist = glob('calendars/*');
  
! // Configuration file for PHP iCalendar 0.9.4
  //
  // To set values, change the text between the single quotes
--- 1,30 ----
  <?php
!  /*
!   *  PHP iCalendar was taken from the PHP iCalendar project on Source Forge.
!   *   It has been adapted through the modification of this configuration file
!   *   and the accompanying sources to work with the openFIRST system.
!   *
!   *   For more information about PHP iCalendar see: http://phpicalendar.sf.net
!   *
!   *   This file has been heavily modified.  There are other heavily modified
!   *   files present.  Be careful when upgrading to a newer version of PHP iCalendar.
!   *
!   *   Removed default calendar files in calendars/
!   *
!   *   You will have to set the calendars/ directory to be writable for best
!   *   results.
!   */
  $cal_filelist = glob('calendars/*');
  
!   // Add our own global files
!   if(file_exists("../../config/globals.php")) {
!     include("../../config/globals.php");
!   } elseif(file_exists("../../../../config/globals.php")) {
!     include("../../../../config/globals.php");
!   } else {
!     include("../../../config/globals.php");
!   }
! 
! // Configuration file for PHP iCalendar 1.0
  //
  // To set values, change the text between the single quotes
***************
*** 40,47 ****
  $minical_view 			= 'current';		// Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
  $default_cal 			= $ALL_CALENDARS_COMBINED;		// Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED to open all calenders combined into one.
! $language 				= 'English';		// Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto'
  $week_start_day 		= 'Sunday';			// Day of the week your week starts on
! $day_start 				= '0800';			// Start time for day grid
! $day_end				= '2000';			// End time for day grid
  $gridLength 			= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
  $num_years 				= '3';				// Number of years to display in 'Jump to'
--- 35,42 ----
  $minical_view 			= 'current';		// Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
  $default_cal 			= $ALL_CALENDARS_COMBINED;		// Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED to open all calenders combined into one.
! $language 				= 'English';		// Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean'
  $week_start_day 		= 'Sunday';			// Day of the week your week starts on
! $day_start 				= '0700';			// Start time for day grid
! $day_end				= '2300';			// End time for day grid
  $gridLength 			= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
  $num_years 				= '3';				// Number of years to display in 'Jump to'
***************
*** 51,67 ****
  $week_events_lines 		= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
  $timezone 				= '';				// Set timezone. Read TIMEZONES file for more information
- $default_path			= '$basepath/members/phpicalendar'; 	// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
  $tmp_dir				= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X)
  $calendar_path 			= 'calendars/';				// Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder.
  $second_offset			= '0';				// The time in seconds between your time and your server's time.
! 
! // Advanced settings for custom installs, cookies, etc.
! // In most cases these will not need to be set.
! $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
! $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'yes';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
! $use_sessions 			= 'no';				// This has not yet been implemented.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
  $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
--- 46,59 ----
  $week_events_lines 		= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
  $timezone 				= '';				// Set timezone. Read TIMEZONES file for more information
  $tmp_dir				= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X)
  $calendar_path 			= 'calendars/';				// Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder.
  $second_offset			= '0';				// The time in seconds between your time and your server's time.
! $bleed_time				= '';				// This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359'. Is automatically set to $day_start if left blank.
! $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
! $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
! $default_path			= '$basepath/members/phpicalendar'; 						// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'yes';			// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
  $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
***************
*** 70,87 ****
  $use_color_cals 		= 'yes';			// Display each calendar in the pop-up as a different color.
  $daysofweek_dayview 	= 'no';				// Display the days of the week in day.php view.
! $enable_rss				= 'no';			// Enable RSS access to your calendars (good thing).
! $show_search			= 'no';				// Show the search box in the sidebar.
  $allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.
  $printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $default_view (listed well above).
  $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
! $show_completed			= 'yes';			// Show completed todos on your todo list.
  
  // Administration settings
  $allow_admin			= 'yes';				// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
  $auth_method			= 'none';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
! //$auth_internal_username	= 'admin';			// Only used if $auth_method='internal'. The username for the administrator.
! //$auth_internal_password	= 'default';		// Only used if $auth_method='internal'. The password for the administrator.
! //$ftp_server				= 'localhost';		// Only used if $auth_method='ftp'. The ftp server name. 'localhost' will work for most servers.
! //$ftp_calendar_path		= '';				// Only used if $auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $calendar_path, but may not be accurate depending on ftp server config.
  
  $blacklisted_cals[] = '';					// Fill in between the quotes the name of the calendars 
--- 62,83 ----
  $use_color_cals 		= 'yes';			// Display each calendar in the pop-up as a different color.
  $daysofweek_dayview 	= 'no';				// Display the days of the week in day.php view.
! $enable_rss				= 'no';// Enable RSS access to your calendars (good thing).
! $show_search			= 'yes';			// Show the search box in the sidebar.
  $allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.
  $printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $default_view (listed well above).
  $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
! $show_completed			= 'yes';				// Show completed todos on your todo list.
! $allow_login			= 'no';				// Set to yes to prompt for login to unlock calendars.
! 
! // Webdav style publishing
! $phpicalendar_publishing = '1';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
  
  // Administration settings
  $allow_admin			= 'yes';				// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
  $auth_method			= 'none';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
! $auth_internal_username	= 'admin';			// Only used if $auth_method='internal'. The username for the administrator.
! $auth_internal_password	= 'default';		// Only used if $auth_method='internal'. The password for the administrator.
! $ftp_server				= 'localhost';		// Only used if $auth_method='ftp'. The ftp server name. 'localhost' will work for most servers.
! $ftp_calendar_path		= '';				// Only used if $auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $calendar_path, but may not be accurate depending on ftp server config.
  
  $blacklisted_cals[] = '';					// Fill in between the quotes the name of the calendars 
***************
*** 97,106 ****
  // add more lines as necessary
  
! $color_cals[] = 'silver';					// Fill in between the quotes the colors you want to display
! $color_cals[] = 'red';						// multiple calendars in.
! $color_cals[] = 'orange';					// The first color will be used if no color is selected.
! $color_cals[] = 'grey';						// 
! $color_cals[] = 'green';					// 
! $color_cals[] = 'tan';						// 
  // add more lines as necessary
  ?>
--- 93,112 ----
  // add more lines as necessary
  
! $locked_cals[] = '';						// Fill in-between the quotes the names of the calendars you wish to hide
! $locked_cals[] = '';						// unless unlocked by a username/password login. This should be the
! $locked_cals[] = '';						// exact calendar filename without the .ics suffix.
! $locked_cals[] = '';						//
! // add more lines as necessary
! 
! $locked_map['user1:pass'] = array('');		// Map username:password accounts to locked calendars that should be
! $locked_map['user2:pass'] = array('');		// unlocked if logged in. Calendar names should be the same as what is
! $locked_map['user3:pass'] = array('');		// listed in the $locked_cals, again without the .ics suffix.
! $locked_map['user4:pass'] = array('');		// Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
! // add more lines as necessary
! 
! $apache_map['user1'] = array('');			// Map HTTP authenticated users to specific calendars. Users listed here and
! $apache_map['user2'] = array('');			// authenticated via HTTP will not see the public calendars, and will not be
! $apache_map['user3'] = array('');			// given any login/logout options. Calendar names not include the .ics suffix.
! $apache_map['user4'] = array('');			// Example: $apache_map['username'] = array('Calendar1', 'Calendar2');
  // add more lines as necessary
  ?>

Index: day.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/day.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** day.php	5 Oct 2003 15:21:55 -0000	1.1
--- day.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 91,106 ****
  						 echo "<tr>\n";
  						 $event_calno  = $allday['calnumber'];
  						 if ($event_calno < 1) $event_calno=1;
  						 if ($event_calno > 7) $event_calno=7;
  						 echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! 						 openevent("$calendar_name",
! 							   "",
! 							   "",
! 							   $allday,
! 							   0,
! 							   "",
! 							   '<font color="#ffffff"><i>',
! 							   "</i></font>",
! 							   "psf");
  						 echo "</td>\n</tr>\n";
  					   }
--- 91,100 ----
  						 echo "<tr>\n";
  						 $event_calno  = $allday['calnumber'];
+ 						 $event_calna  = $allday['calname'];
+ 						 $event_url	   = $allday['url'];
  						 if ($event_calno < 1) $event_calno=1;
  						 if ($event_calno > 7) $event_calno=7;
  						 echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! 						 openevent($event_calna, '', '', $allday, 0, '', '<font color="#ffffff"><i>', '</i></font>', 'psf', $url);
  						 echo "</td>\n</tr>\n";
  					   }
***************
*** 230,233 ****
--- 224,228 ----
  												  $event_start 	= strtotime ($this_time_arr[($event_length[$i]['key'])]['event_start']);
  												  $event_end	= strtotime ($this_time_arr[($event_length[$i]['key'])]['event_end']);
+ 												  if (isset($this_time_arr[($event_length[$i]['key'])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['display_end']);
  												  $event_start 	= date ($timeFormat, $event_start);
  												  $event_end	= date ($timeFormat, $event_end);
***************
*** 252,266 ****
  												  echo '<tr>'."\n";
  												  echo '<td class="eventbg_'.$event_calno.'">';
! 												  // Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
! 												  if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
! 										  		  openevent("$calendar_name2",
! 												  "$event_start",
! 												  "$event_end",
! 												  $this_time_arr[($event_length[$i]['key'])],
! 												  "",
! 												  0,
! 												  "<font class=\"eventfont\">",
! 												  "</font>",
! 												  "psf");
  												  echo '</td></tr>'."\n";
  												  echo '</table>'."\n";
--- 247,253 ----
  												  echo '<tr>'."\n";
  												  echo '<td class="eventbg_'.$event_calno.'">';
! 												  $event_calna 	= $this_time_arr[($event_length[$i]['key'])]['calname'];
! 												  $event_url 	= $this_time_arr[($event_length[$i]['key'])]['url'];
! 										  		  openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '<font class="eventfont">', '</font>', 'psf', $event_url);
  												  echo '</td></tr>'."\n";
  												  echo '</table>'."\n";

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.php	5 Oct 2003 15:21:55 -0000	1.1
--- index.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 1,15 ****
  <?php
!                                                                                                                                                                             
! include "./config.inc.php";
! if ($HTTP_COOKIE_VARS['phpicalendar']) {
!         $phpicalendar           = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
!         $default_view           = $phpicalendar['cookie_view'];
! }
! if ($printview_default == 'yes') {
!         $default_view = "print.php?printview=$default_view";
! } else {
!         $default_view = "$default_view" . ".php";
! }
! header("Location: $default_view");
! 
  ?>
--- 1,3 ----
  <?php
!   header("Location: month.php");
  ?>

Index: month.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/month.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** month.php	5 Oct 2003 15:21:55 -0000	1.1
--- month.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 115,125 ****
  									foreach ($event_times as $val) {
  										$num_of_events2++;
  										if (!isset($val["event_start"])) {
  											echo '<div align="center" class="V10">';
! 											openevent("$calendar_name", "", "", $val, $month_event_lines,
! 											15,
! 											"<i>",
! 											"</i>",
! 											"psf");
  											echo '</div>';
  										} else {	
--- 115,124 ----
  									foreach ($event_times as $val) {
  										$num_of_events2++;
+ 										$event_calno 	= $val['calnumber'];
+ 										$event_calna 	= $val['calname'];
+ 										$event_url 		= $val['url'];
  										if (!isset($val["event_start"])) {
  											echo '<div align="center" class="V10">';
! 											openevent($event_calna, '', '', $val, $month_event_lines, 15, '<i>', '</i>', 'psf', $event_url);
  											echo '</div>';
  										} else {	
***************
*** 127,142 ****
  											$event_start = @$val["event_start"];
  											$event_end   = @$val["event_end"];
  											$event_start = date($timeFormat, @strtotime ("$event_start"));
  											$start2		 = date($timeFormat_small,@strtotime("$event_start"));
  											$event_end   = date($timeFormat, @strtotime ("$event_end"));
! 											@openevent("$calendar_name",
! 											"$event_start",
! 											"$event_end",
! 											$val,
! 											$month_event_lines,
! 											11,
! 											"$start2 ",
! 											"",
! 											"ps3");
  											echo '</div>';
  										}
--- 126,134 ----
  											$event_start = @$val["event_start"];
  											$event_end   = @$val["event_end"];
+ 											if (isset($val['display_end'])) $event_end = $val['display_end'];
  											$event_start = date($timeFormat, @strtotime ("$event_start"));
  											$start2		 = date($timeFormat_small,@strtotime("$event_start"));
  											$event_end   = date($timeFormat, @strtotime ("$event_end"));
! 											openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url);
  											echo '</div>';
  										}
***************
*** 144,147 ****
--- 136,140 ----
  								}
  							}
+ 							echo '</div>';
  							echo '</td>';
  						} else {
***************
*** 193,200 ****
--- 186,198 ----
  								// Pull out each time
  								foreach ($new_val as $new_key2 => $new_val2) {
+ 								$event_calno 	= $new_val2['calnumber'];
+ 								$event_calna 	= $new_val2['calname'];
+ 								$event_url 		= $new_val2['url'];
+ 
  								if ($new_val2["event_text"]) {	
  									if (isset($new_val2["event_start"])) {
  										$event_start 	= $new_val2["event_start"];
  										$event_end 		= $new_val2["event_end"];
+ 										if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end'];
  										$event_start 	= date ($timeFormat, strtotime ("$event_start"));
  										$event_end 		= date ($timeFormat, strtotime ("$event_end"));
***************
*** 213,225 ****
  									}
  									echo "<td>\n";
! 									openevent("$calendar_name",
! 									"$event_start",
! 									"$event_end",
! 									$new_val2,
! 									0,
! 									65,
! 									"<font class=\"G10B\">",
! 									"</font>",
! 									"psf");
  									echo "</td>\n";
  									echo "</tr>\n";
--- 211,215 ----
  									}
  									echo "<td>\n";
! 									openevent($event_calna, $event_start, $event_end, $new_val2, 0, 65, '<font class="G10B">', '</font>', 'psf', $event_url);
  									echo "</td>\n";
  									echo "</tr>\n";

Index: preferences.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/preferences.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** preferences.php	5 Oct 2003 15:21:55 -0000	1.1
--- preferences.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 158,203 ****
  												//
  												print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! 												$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
! 												$filelist = array();
! 												while ($file = readdir($dir_handle)) {
! 													if (preg_match("/^[^.].+\.ics$/", $file)) {
! 														array_push($filelist, $file);
! 													}
! 												}
! 												natcasesort($filelist);
! 												foreach ($filelist as $file) {
! 													$cal_filename_tmp = substr($file,0,-4);
! 													$cal_tmp = urlencode($cal_filename_tmp);
! 													$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
! 													if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
! 														if ($cal_tmp == $cookie_calendar) {
! 															print "<option value=\"$cal_tmp\" selected>$cal_displayname_tmp $calendar_lang</option>\n";
! 														} else {
! 															print "<option value=\"$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>\n";	
! 														}		
! 													}	
! 												}
! 												// add option to open all (non-web) calenders together
! 												// Todo: add $all_calenders_combined_lang (plural) in the language-specific files and use it here
! 												if ($cookie_calendar == $ALL_CALENDARS_COMBINED) {
! 													print "<option value=\"$ALL_CALENDARS_COMBINED\" selected>$all_cal_comb_lang</option>\n";
! 												} else {
! 													print "<option value=\"$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>\n";
! 												}
! 			
! 												foreach($list_webcals as $cal_tmp) {
! 													if ($cal_tmp != '') {
! 														$cal_displayname_tmp = basename($cal_tmp);
! 														$cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp);
! 														$cal_displayname_tmp = substr($cal_displayname_tmp,0,-4);
! 														$cal_encoded_tmp = urlencode($cal_tmp);
! 														if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
! 															print "<option value=\"$cal_encoded_tmp\" selected>$cal_displayname_tmp Webcal</option>\n";
! 														} else {
! 															print "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>\n";	
! 														}		
! 													}
! 												}
! 												closedir($dir_handle);
  												print "</select>\n";
  											?>
--- 158,162 ----
  												//
  												print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! 												display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
  												print "</select>\n";
  											?>

Index: print.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/print.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** print.php	5 Oct 2003 15:21:55 -0000	1.1
--- print.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 116,119 ****
--- 116,120 ----
  													$event_start 	= $new_val2["event_start"];
  													$event_end 		= $new_val2["event_end"];
+ 													if (isset($new_val2["display_end"])) $event_end = $new_val2["display_end"];
  													$event_start 	= date ($timeFormat, strtotime ("$event_start"));
  													$event_end 		= date ($timeFormat, strtotime ("$event_end"));

Index: search.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/search.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** search.php	5 Oct 2003 15:21:55 -0000	1.1
--- search.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 19,37 ****
  
  $search_box = '';
- // yet to be implemented
- switch($HTTP_GET_VARS['mode']) {
- 	case 'advanced_search':
- 		// display advanced search stuff
- 		break;
- 	case 'search':
- 		// display simple search stuff
- 		break;
- 	case 'results':
- 		// display results of either simple or advanced search
- 		break;
- 	default:
- 		// some generic thing, maybe same as search
- }
- 
  $search_box .= 
  	'<form action="search.php" method="GET">'."\n".
--- 19,22 ----
***************
*** 121,276 ****
      </tr>
  	<tr>
! 		<td colspan="3"  class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
  	</tr>
  	<tr>
! 		<td colspan="3">
! 				<table border="0" cellspacing="0" cellpadding="0" width="100%">
! 					<tr>
! 						<td align="center" valign="top">
! 							<table width="100%" border="0" cellspacing="0" cellpadding="0">
! 								<tr>
! 									<td colspan="3" height="1"></td>
! 								</tr>							
! 								<tr>
! 									<td colspan="3" class="G10B" align="center"><?php echo $query_lang.': '.$formatted_search; ?></td>
! 								</tr>
! 								<tr>
! 									<td colspan="3" class="G10B">&nbsp;</td>
! 								</tr>								
! 								<?php	
! 									if (isset($the_arr) && is_array($the_arr)) {
! 										foreach($the_arr as $val) {
! 											$key = $val['date'];
! 											$dayofmonth = strtotime ($key);
! 											$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
! 											echo "<tr><td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
! 											echo "<td align=\"left\" colspan=\"2\"><font class=\"V12\"><b><a class=\"ps3\" href=\"day.php?cal=$cal&amp;getdate=$key\">$dayofmonth</a></b></font></td></tr>";
! 											echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n";
! 											
! 											if ($val["event_text"]) {	
! 												$event_text 	= stripslashes(urldecode($val["event_text"]));
! 												$description 	= stripslashes(urldecode($val["description"]));
! 												$event_start 	= $val["event_start"];
! 												$event_end 		= $val["event_end"];
! 												$event_start 	= date ($timeFormat, strtotime ("$event_start"));
! 												$event_end 		= date ($timeFormat, strtotime ("$event_end"));
! 												$event_start 	= "$event_start - $event_end";
! 												if (!$val["event_start"]) { 
! 													$event_start = "$all_day_lang";
! 													$event_start2 = '';
! 													$event_end = '';
! 												}
! 												echo "<tr>\n";
! 												echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
! 												echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
! 												echo "<td align=\"left\">\n";
! 												echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
! 												echo "<tr>\n";
! 												echo "<td width=\"120\" class=\"G10BOLD\">$time_lang:</td>\n";
! 												echo "<td align=\"left\" class=\"G10B\">$event_start</td>\n";
! 												echo "</tr>\n";
! 												echo "<tr>\n";
! 												echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$summary_lang:</td>\n";
! 												echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$event_text</td>\n";
! 												echo "</tr>\n";
! 												if (isset($val['recur'])) {
! 													$recur = $val['recur'];
! 													echo "<tr>\n";
! 													echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">Recurring event:</td>\n";
! 													echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$recur</td>\n";
! 													echo "</tr>\n";
! 												}
! 												if ($val["description"]) {
! 													echo "<tr>\n";
! 													echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$description_lang:</td>\n";
! 													echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$description</td>\n";
! 													echo "</tr>\n";
! 												}
! 												echo "</table>\n";
! 												echo "</td>\n";
! 												echo "</tr>\n";			
! 												echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"10\" alt=\" \"></td></tr>\n";
! 												if (isset($val['exceptions'])) {
! 													echo "<tr><td colspan=\"3\"><table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
! 													foreach($val['exceptions'] as $val2) {
! 														$key = $val2['date'];
! 														$dayofmonth = strtotime ($key);
! 														$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
! 														echo "<tr><td width=\"20\"><img src=\"images/spacer.gif\" width=\"20\" height=\"1\" alt=\" \"></td>\n";
! 														echo "<td align=\"left\" colspan=\"2\"><font class=\"V10\"><i>$exception_lang</i>: <a class=\"ps3\" href=\"day.php?cal=$cal&amp;getdate=$key\">$dayofmonth</a></font></td></tr>";
! 														echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n";
! 														
! 														if ($val2["event_text"]) {	
! 															$event_text 	= stripslashes(urldecode($val2["event_text"]));
! 															$description 	= stripslashes(urldecode($val2["description"]));
! 															$event_start 	= $val2["event_start"];
! 															$event_end 		= $val2["event_end"];
! 															$event_start 	= date ($timeFormat, strtotime ("$event_start"));
! 															$event_end 		= date ($timeFormat, strtotime ("$event_end"));
! 															$event_start 	= "$event_start - $event_end";
! 															if (!$val2["event_start"]) { 
! 																$event_start = "$all_day_lang";
! 																$event_start2 = '';
! 																$event_end = '';
! 															}
! 															echo "<tr>\n";
! 															echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
! 															echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
! 															echo "<td align=\"left\">\n";
! 															echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
! 															echo "<tr>\n";
! 															echo "<td width=\"100\" class=\"V10\">$time_lang:</td>\n";
! 															echo "<td align=\"left\" class=\"V10\">$event_start</td>\n";
! 															echo "</tr>\n";
! 															echo "<tr>\n";
! 															echo "<td valign=\"top\" width=\"100\" class=\"V10\">$summary_lang:</td>\n";
! 															echo "<td valign=\"top\" align=\"left\" class=\"V10\">$event_text</td>\n";
! 															echo "</tr>\n";
! 															if (isset($val2['recur'])) {
! 																$recur = $val2['recur'];
! 																echo "<tr>\n";
! 																echo "<td valign=\"top\" width=\"100\" class=\"V10\">$recurring_event_lang:</td>\n";
! 																echo "<td valign=\"top\" align=\"left\" class=\"V10\">$recur</td>\n";
! 																echo "</tr>\n";
! 															}
! 															if ($val2["description"]) {
! 																echo "<tr>\n";
! 																echo "<td valign=\"top\" width=\"100\" class=\"V10\">$description_lang:</td>\n";
! 																echo "<td valign=\"top\" align=\"left\" class=\"V10\">$description</td>\n";
! 																echo "</tr>\n";
! 															}
! 															echo "</table>\n";
! 															echo "</td>\n";
! 															echo "</tr>\n";			
! 															echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"10\" alt=\" \"></td></tr>\n";
! 														}
! 													}
! 													echo "</table></td><tr>\n";
! 												}
! 											}
  										}
! 									} else {
! 										echo '<tr><td colspan="3" class="G10B" align="center">';
! 										echo $no_results_lang;
! 										echo '</td></tr><tr><td class="G10B">&nbsp;</td></tr>';
  									}
! 										
! 									
! 								
! 								?>
! 								<tr>
! 									<td colspan="3" class="G10B" align="center"><?php echo $search_box; ?></td>
! 								</tr>	
! 								<tr>
! 									<td colspan="3" class="G10B" align="center">
! 									<?php 
! 										echo '<font class="V9G">'.sprintf($search_took_lang,$search_took).'</font><br><br>';
! 									?>
! 									</td>
! 								</tr>
! 							</table>
! 						</td>
! 					</tr>
! 				</table>		
  		</td>
  	</tr>
--- 106,234 ----
      </tr>
  	<tr>
! 		<td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
  	</tr>
  	<tr>
! 		<td align="left">
! 			<div style="padding: 10px;">
! 				<?php 
! 				
! 				echo '<div align="center"><p class="V12">'.$query_lang.': '.$formatted_search.'</p></div>';
! 				
! 				if (isset($the_arr) && is_array($the_arr)) {
! 					foreach($the_arr as $val) {
! 						$key = $val['date'];
! 						if ($key > 1) { 
! 							$dayofmonth = strtotime ($key);
! 							$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
! 							echo '<font class="V12"><b><a class="ps3" href="day.php?cal='.$cal.'&amp;getdate='.$key.'">'.$dayofmonth.'</a></b></font><br>';
! 						}
! 						if ($val["event_text"]) {	
! 							$event_text 	= stripslashes(urldecode($val["event_text"]));
! 							$description 	= stripslashes(urldecode($val["description"]));
! 							$event_start 	= $val["event_start"];
! 							$event_end 		= $val["event_end"];
! 							$event_calna 	= $val["calname"];
! 							$event_start 	= date ($timeFormat, strtotime ("$event_start"));
! 							$event_end 		= date ($timeFormat, strtotime ("$event_end"));
! 							$event_start 	= "$event_start - $event_end";
! 							if (!$val["event_start"]) { 
! 								$event_start = "$all_day_lang";
! 								$event_start2 = '';
! 								$event_end = '';
! 							}
! 							echo '<div style="margin-left: 10px; margin-bottom: 10px;">';
! 							echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
! 							echo "<tr>\n";
! 							echo "<td width=\"120\" class=\"G10BOLD\">$time_lang:</td>\n";
! 							echo "<td align=\"left\" class=\"G10B\">$event_start</td>\n";
! 							echo "</tr>\n";
! 							echo "<tr>\n";
! 							echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$summary_lang:</td>\n";
! 							echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$event_text</td>\n";
! 							echo "</tr>\n";
! 							if (isset($val['recur'])) {
! 								$recur = $val['recur'];
! 								echo "<tr>\n";
! 								echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">Recurring event:</td>\n";
! 								echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$recur</td>\n";
! 								echo "</tr>\n";
! 							}
! 							if ($val["description"]) {
! 								echo "<tr>\n";
! 								echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$description_lang:</td>\n";
! 								echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$description</td>\n";
! 								echo "</tr>\n";
! 							}
! 							echo "</table>\n";
! 							echo '</div>';
! 							if (isset($val['exceptions'])) {
! 								echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
! 								foreach($val['exceptions'] as $val2) {
! 									$key = $val2['date'];
! 									$dayofmonth = strtotime ($key);
! 									$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
! 									echo "<td align=\"left\" colspan=\"2\"><font class=\"V10\"><i>$exception_lang</i>: <a class=\"ps3\" href=\"day.php?cal=$cal&amp;getdate=$key\">$dayofmonth</a></font></td></tr>";
! 									
! 									if ($val2["event_text"]) {	
! 										$event_text 	= stripslashes(urldecode($val2["event_text"]));
! 										$description 	= stripslashes(urldecode($val2["description"]));
! 										$event_start 	= $val2["event_start"];
! 										$event_end 		= $val2["event_end"];
! 										$event_start 	= date ($timeFormat, strtotime ("$event_start"));
! 										$event_end 		= date ($timeFormat, strtotime ("$event_end"));
! 										$event_start 	= "$event_start - $event_end";
! 										if (!$val2["event_start"]) { 
! 											$event_start = "$all_day_lang";
! 											$event_start2 = '';
! 											$event_end = '';
  										}
! 										echo "<tr>\n";
! 										echo "<td align=\"left\">\n";
! 										echo '<div style="margin-left: 10px;">';
! 										echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
! 										echo "<tr>\n";
! 										echo "<td width=\"100\" class=\"V10\">$time_lang:</td>\n";
! 										echo "<td align=\"left\" class=\"V10\">$event_start</td>\n";
! 										echo "</tr>\n";
! 										echo "<tr>\n";
! 										echo "<td valign=\"top\" width=\"100\" class=\"V10\">$summary_lang:</td>\n";
! 										echo "<td valign=\"top\" align=\"left\" class=\"V10\">$event_text</td>\n";
! 										echo "</tr>\n";
! 										if (isset($val2['recur'])) {
! 											$recur = $val2['recur'];
! 											echo "<tr>\n";
! 											echo "<td valign=\"top\" width=\"100\" class=\"V10\">$recurring_event_lang:</td>\n";
! 											echo "<td valign=\"top\" align=\"left\" class=\"V10\">$recur</td>\n";
! 											echo "</tr>\n";
! 										}
! 										if ($val2["description"]) {
! 											echo "<tr>\n";
! 											echo "<td valign=\"top\" width=\"100\" class=\"V10\">$description_lang:</td>\n";
! 											echo "<td valign=\"top\" align=\"left\" class=\"V10\">$description</td>\n";
! 											echo "</tr>\n";
! 										}
! 										echo "</table>";
! 										echo '</div><br>';
! 		
  									}
! 								}
! 							}
! 						}
! 					}
! 				} else {
! 					echo '<div align="center">';
! 					echo '<p class="V12">'.$no_results_lang.'</p>';
! 					echo '</div>';
! 				}
! 					
! 					echo '<div align="center">';
! 					echo $search_box;
! 					echo '<p class="V9G">'.sprintf($search_took_lang,$search_took).'</p></div>';
! 					echo '</div>';
! 				?>
! 
! 					</td>
! 				</tr>
! 			</table>		
  		</td>
  	</tr>

Index: week.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/week.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** week.php	5 Oct 2003 15:21:55 -0000	1.1
--- week.php	21 Dec 2003 23:17:20 -0000	1.2
***************
*** 164,171 ****
  														echo "<tr>\n";
  														$event_calno  = $allday['calnumber'];
  						 								if ($event_calno < 1) $event_calno=1;
  														if ($event_calno > 7) $event_calno=7;
  						 								echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! 														openevent("$calendar_name",
  														"",
  													  	"",
--- 164,173 ----
  														echo "<tr>\n";
  														$event_calno  = $allday['calnumber'];
+ 														$event_calna  = $allday['calname'];
+ 														$event_url    = $allday['url'];
  						 								if ($event_calno < 1) $event_calno=1;
  														if ($event_calno > 7) $event_calno=7;
  						 								echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! 														openevent("$event_calna",
  														"",
  													  	"",
***************
*** 175,179 ****
  													  	'<font color="#ffffff">',
  													  	"</font>",
! 													  	"psf");
  														echo "</td></tr>\n";
  												  	}
--- 177,182 ----
  													  	'<font color="#ffffff">',
  													  	"</font>",
! 													  	"psf",
! 													  	$event_url);
  														echo "</td></tr>\n";
  												  	}
***************
*** 185,191 ****
  											  } while ($i < 7);
  											echo "</tr>\n";
! 										}
! 											// $master_array[($getdate)]["$day_time"]
! 											
  											$thisdate = $start_week_time;
  											for ($i=0;$i<7;$i++) {
--- 188,192 ----
  											  } while ($i < 7);
  											echo "</tr>\n";
! 										}											
  											$thisdate = $start_week_time;
  											for ($i=0;$i<7;$i++) {
***************
*** 305,312 ****
  																	echo '<td class="eventbg_'.$event_calno.'">';
  																	$event_end	= $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
! 																	$event_end 		= date ($timeFormat, $event_end);
! 																	// Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
! 																	if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
! 																	openevent("$calendar_name2",
  																		  "$event_start",
  																		  "$event_end",
--- 306,315 ----
  																	echo '<td class="eventbg_'.$event_calno.'">';
  																	$event_end	= $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
! 																	 if (isset($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end']);
! 																	$event_end 	= date ($timeFormat, $event_end);
! 
! 																	$event_calna 	= $this_time_arr[($event_length[$thisday][$i]["key"])]['calname'];
! 																	$event_url 		= $this_time_arr[($event_length[$thisday][$i]["key"])]['url'];
! 																	openevent("$event_calna",
  																		  "$event_start",
  																		  "$event_end",
***************
*** 316,320 ****
  																		  "<font class=\"V10W\">",
  																		  "</font>",
! 																		  "psf");
  																	echo "</td></tr>\n";
  																	echo "</table>\n";
--- 319,324 ----
  																		  "<font class=\"V10W\">",
  																		  "</font>",
! 																		  "psf",
! 																		  $event_url);
  																	echo "</td></tr>\n";
  																	echo "</table>\n";

[Openfirst-cvscommit] members/phpicalendar/includes calendar_nav.php,1.1,1.2 event.php,1.1,1.2 footer.inc.php,1.1,1.2 sidebar.php,1.1,1.2 todo.php,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:18:01

Update of /cvsroot/openfirst/members/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/includes

Modified Files:
	calendar_nav.php event.php footer.inc.php sidebar.php todo.php 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: calendar_nav.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/includes/calendar_nav.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** calendar_nav.php	5 Oct 2003 15:29:06 -0000	1.1
--- calendar_nav.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 103,113 ****
  									<?php 
  									
  									echo '<b>'.$jump_lang.'</b><br>';
  									echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
! 									echo "<form style=\"margin-bottom:0;\" action=\"month.php\" method=\"GET\"><select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
  									include('./functions/list_icals.php');
  									include('./functions/list_years.php');
  									include('./functions/list_months.php');
  									include('./functions/list_weeks.php');
  									echo "</form>";
  									echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
--- 103,118 ----
  									<?php 
  									
+ 									if (!isset($query)) $query = '';
  									echo '<b>'.$jump_lang.'</b><br>';
  									echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
! 									echo "<form style=\"margin-bottom:0;\" action=\"month.php\" method=\"GET\">";
  									include('./functions/list_icals.php');
+ 									echo '<br>';
  									include('./functions/list_years.php');
+ 									echo '<br>';
  									include('./functions/list_months.php');
+ 									echo '<br>';
  									include('./functions/list_weeks.php');
+ 									echo '<br>';
  									echo "</form>";
  									echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
***************
*** 141,145 ****
  												echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
  												if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
! 												if ($cal != $ALL_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
  											 ?>
  											</td>
--- 146,156 ----
  												echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
  												if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
! 												if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
! 												if ($username != '') {
! 													$querys = preg_replace("/action=[^&]+/", "action=logout", $QUERY_STRING);
! 													if ($querys == $QUERY_STRING) $querys .= "&action=logout";
! 													$querys = preg_replace("/(username|password)=[^&]+/", "", $querys);
! 													echo "<a class=\"psf\" href=\"$SCRIPT_NAME?$querys\">Logout $username</a><br>\n";
! 												}
  											 ?>
  											</td>

Index: event.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/includes/event.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** event.php	5 Oct 2003 15:29:06 -0000	1.1
--- event.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 1,183 ****
  <?php 
  define('BASE', '../');
! include (BASE.'functions/init.inc.php'); 
  
! if (isset($HTTP_GET_VARS['event']) && ($HTTP_GET_VARS['event'] !== '') ) {
! 	$event = $HTTP_GET_VARS['event'];
! } else {
! 	$event = '';
  }
! if (isset($HTTP_GET_VARS['description']) && ($HTTP_GET_VARS['description'] !== '') ) {
! 	$description = $HTTP_GET_VARS['description'];
! } else {
! 	$description = '';
  }
! if (isset($HTTP_GET_VARS['cal']) && ($HTTP_GET_VARS['cal'] !== '') ) {
! 	$calendar_name = $HTTP_GET_VARS['cal'];
! } else {
! 	$calendar_name = '';
  }
  
! if (isset($HTTP_GET_VARS['start']) && ($HTTP_GET_VARS['start'] !== '') ) {
! 	$start = $HTTP_GET_VARS['start'];
! } else {
! 	$start = '';
  }
! if (isset($HTTP_GET_VARS['end']) && ($HTTP_GET_VARS['end'] !== '') ) {
! 	$end = $HTTP_GET_VARS['end'];
! } else {
! 	$end = '';
  }
! if (isset($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] !== '') ) {
! 	$status = $HTTP_GET_VARS['status'];
! } else {
! 	$status = '';
  }
! 
! if (isset($HTTP_GET_VARS['location']) && ($HTTP_GET_VARS['location'] !== '') ) {
! 	$location = $HTTP_GET_VARS['location'];
! } else {
! 	$location = '';
  }
! 
! if (isset($HTTP_GET_VARS['organizer']) && ($HTTP_GET_VARS['organizer'] !== '') ) {
! 	$organizer = $HTTP_GET_VARS['organizer'];
! } else {
! 	$organizer = '';
  }
  
- if (isset($HTTP_GET_VARS['attendee']) && ($HTTP_GET_VARS['attendee'] !== '') ) {
- 	$attendee = $HTTP_GET_VARS['attendee'];
- } else {
- 	$attendee = '';
- }
  
! $event = rawurldecode($event);
! $event = stripslashes($event);
! $event = str_replace('\\', '', $event);
! $description = rawurldecode($description);
! $description = stripslashes($description);
! $description = str_replace('\\', '', $description);
! $organizer = rawurldecode($organizer);
! $organizer = stripslashes($organizer);
! $organizer = str_replace('\\', '', $organizer);
! $organizer = unserialize ($organizer);
! $attendee = rawurldecode($attendee);
! $attendee = stripslashes($attendee);
! $attendee = str_replace('\\', '', $attendee);
! $attendee = unserialize ($attendee);
! $location = rawurldecode($location);
! $location = stripslashes($location);
! $location = str_replace('\\', '', $location);
! $calendar_name2 = rawurldecode($calendar_name);
! $calendar_name2 = stripslashes($calendar_name2);
! $calendar_name2 = str_replace('\\', '', $calendar_name2);
! ?>
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
!         "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
! <html>
! <head>
!   <meta http-equiv="content-type" content="text/html;charset=UTF-8">
!   <title><?php 
!   				if ($calendar_name == $ALL_CALENDARS_COMBINED) {
! 					echo "$all_cal_comb_lang";
! 				} else {
! 					echo "$calendar_name2";
! 				}?></title>
! 	<link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>">
! </head>
! <body bgcolor="#eeeeee"><center>
! <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
! 	<tr>
! 		<td align="left" valign="top" width="1%" class="sideback"><img src="../images/spacer.gif" width="1" height="20" alt=" "></td>
! 		<td align="center" width="98%" class="sideback"><font class="G10BOLD">
! 			<?php 
! 				if ($calendar_name == $ALL_CALENDARS_COMBINED) {
! 					echo "$all_cal_comb_lang";
! 				} else {
! 					echo "$calendar_name2 $calendar_lang";
! 				} 
! 			?>
! 		</font></td>
! 		<td align="right" valign="top" width="1%" class="sideback"></td>
! 	</tr>
! 	<tr>
! 		<td colspan="3"><img src="../images/spacer.gif" width="1" height="6" alt=" "></td>
! 	</tr>
! 	<tr>
! 		<td colspan="3">  
! 	   		<table width="430" border="0" cellspacing="0" cellpadding="0">
! 				<?php 
! 				if (($start) && ($end)) $event_times = ' - <font class="V9">(<i>'.$start.' - '.$end.'</i>)</font>'; 
! 				if ($start == '' && $end == '' && (isset($start) && isset($end))) $event_times = ' - <font class="V9">(<i>'.$all_day_lang.'</i>)</font>';
! 				?>
! 				<tr>
! 					 <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
! 		 			 <td align="left" colspan="2" class="V12"><?php echo $event.' '.$event_times.'<br><br>'; ?></td>
! 				</tr>
! 				
! 				<?php if ($description) { ?>    
! 					<tr>
! 					 <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
! 					 <td align="left" colspan="2" class="V12">
! 					 <?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",
! 							'<a target="_new" href="\0">\0</a>', $description); ?></td>
! 					</tr>
! 				<?php } ?>
  
! 				<?php 
! 					
! 					if ($organizer) {
! 						$i = 0;
! 						echo '<tr>';
! 						echo '<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>';
! 						echo '<td align="left" colspan="2" class="V12">';
! 						echo $organizer_lang.' - ';
! 						foreach ($organizer as $val) {	
! 							$organizers .= $organizer[$i]["name"].', ';
! 							$i++;
! 						}
! 						$organizers = substr ($organizers, 0, -2);
! 						echo $organizers.'</td></tr>';
! 					}	
! 					
! 					if ($attendee) {
! 						$i = 0;
! 						echo '<tr>';
! 						echo '<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>';
! 						echo '<td align="left" colspan="2" class="V12">';
! 						echo $attendee_lang.' - ';
! 						foreach ($attendee as $val) {	
! 							$attendees .= $attendee[$i]["name"].', ';
! 							$i++;
! 						}
! 						$attendees = substr ($attendees, 0, -2);
! 						echo $attendees.'</td></tr>';
! 					}
! 				
! 					if ($status) {  
! 						echo '<tr>';
! 						echo '<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>';
! 						echo '<td align="left" colspan="2" class="V12">';
! 						echo $status_lang.' - '.$status.'</td>';
! 						echo '</tr>';
! 					}
! 					
! 					if ($location) {  
! 						echo '<tr>';
! 						echo '<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>';
! 						echo '<td align="left" colspan="2" class="V12">';
! 						echo $location_lang.' - '.$location.'</td>';
! 						echo '</tr>';
! 					}
! 				
! 				
! 				?>
! 	
! 	   </table>
!    </td>
! 	</tr>
! </table> 
! </center>
! </body>
! </html>
--- 1,98 ----
  <?php 
  define('BASE', '../');
! include_once(BASE.'functions/init.inc.php'); 
  
! function decode_popup ($item) {
! 	$item = stripslashes(rawurldecode($item));
! 	$item = str_replace('\\','',$item);
! 	return $item;
  }
! 
! $event			= (isset($HTTP_POST_VARS['event'])) ? decode_popup($HTTP_POST_VARS['event']) : ('');
! $description	= (isset($HTTP_POST_VARS['description'])) ? decode_popup($HTTP_POST_VARS['description']) : ('');
! $cal			= (isset($HTTP_POST_VARS['cal'])) ? decode_popup($HTTP_POST_VARS['cal']) : ('');
! $start			= (isset($HTTP_POST_VARS['start'])) ? decode_popup($HTTP_POST_VARS['start']) : ('');
! $end			= (isset($HTTP_POST_VARS['end'])) ? decode_popup($HTTP_POST_VARS['end']) : ('');
! $status			= (isset($HTTP_POST_VARS['status'])) ? decode_popup($HTTP_POST_VARS['status']) : ('');
! $location		= (isset($HTTP_POST_VARS['location'])) ? decode_popup($HTTP_POST_VARS['location']) : ('');
! $url			= (isset($HTTP_POST_VARS['url'])) ? decode_popup($HTTP_POST_VARS['url']) : ('');
! $organizer		= (isset($HTTP_POST_VARS['organizer'])) ? ($HTTP_POST_VARS['organizer']) : ('');
! $organizer 		= unserialize (decode_popup ($organizer));
! $attendee		= (isset($HTTP_POST_VARS['attendee'])) ? ($HTTP_POST_VARS['attendee']) : ('');
! $attendee 		= unserialize (decode_popup ($attendee));
! $cal_title_full	= $cal.' '.$calendar_lang;
! 
! // Format event time
! if (($start) && ($end)) {
! 	$event_times=' - <font class="V9">(<i>' . $start . ' - ' . $end . '</i>)</font>'; 
  }
! if ($start == '' && $end == '' && (isset($start) && isset($end))) {
! 	$event_times=' - <font class="V9">(<i>' . $all_day_lang . '</i>)</font>';
  }
  
! if ($description) {
! 	$display = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$description);
! 	$display .= '<br>';
  }
! if ($organizer) {
! 	$i=0;
! 	$display .= $organizer_lang . ' - ';
! 	foreach ($organizer as $val) {	
! 		$organizers .= $organizer[$i]["name"] . ', ';
! 		$i++;
! 	}
! 	$display .= substr($organizers,0,-2);
! 	$display .= '<br>';
  }
! if ($attendee) {
! 	$i=0;
! 	$display .= $attendee_lang . ' - ';
! 	foreach ($attendee as $val) {	
! 		$attendees .= $attendee[$i]["name"] . ', ';
! 		$i++;
! 	}
! 	$display .= substr($attendees,0,-2);
! 	$display .= '<br>';
  }
! if ($status) {
! 	$display .= $status_lang . ' - ' . $status. '<br>' . "\n";
  }
! if ($location) {
! 	if ($url != '') $location = '<a href="'.$url.'" target="_blank">'.$location.'</a>';
! 	$display .= $location_lang . ' - ' . $location.'<br>';
  }
+ $sheet_href = BASE.'styles/'.$style_sheet.'/default.css';
  
  
! echo <<<END
  
! 	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
! 			"http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
! 	<html>
! 	<head>
! 		<meta http-equiv="content-type" content="text/html;charset=UTF-8">
! 		<title>{$cal}</title>
! 		<link rel="stylesheet" type="text/css" href="{$sheet_href}">
! 	</head>
! 	<body>
! 	<center>
! 		<table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
! 			<tr>
! 				<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$cal_title_full}</div></td>
! 			</tr>
! 			<tr>
! 				<td align="left" class="V12">
! 					<div style="margin-left: 10px; margin-bottom:10px;">
! 						<p>{$event}  {$event_times}</p>
! 						{$display}
! 					</div>
! 				</td>
! 			</tr>
! 		</table>
! 	</center>
! 	</body>
! 	</html>
! 
! END;
! 
! ?>

Index: footer.inc.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/includes/footer.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** footer.inc.php	5 Oct 2003 15:29:06 -0000	1.1
--- footer.inc.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 1,4 ****
  <?php 
! echo "<br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.4</a>";
  if ($enable_rss == 'yes') {
  	echo "<br>\n";
--- 1,4 ----
  <?php 
! echo "<br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 1.0</a>";
  if ($enable_rss == 'yes') {
  	echo "<br>\n";

Index: sidebar.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/includes/sidebar.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sidebar.php	5 Oct 2003 15:29:06 -0000	1.1
--- sidebar.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 35,39 ****
  				echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
  				if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
! 				if ($cal != $ALL_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
  				echo '</span></div>';
  			 ?>
--- 35,45 ----
  				echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
  				if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
! 				if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
! 				if ($username != '') {
! 					$querys = preg_replace("/action=[^&]+/", "action=logout", $QUERY_STRING);
! 					if ($querys == $QUERY_STRING) $querys .= '&action=logout';
! 					$querys = preg_replace("/(username|password)=[^&]+/", "", $querys);
! 					echo "<br>\n<a class=\"psf\" href=\"$SCRIPT_NAME?$querys\">Logout $username</a>\n";
! 				}
  				echo '</span></div>';
  			 ?>
***************
*** 52,60 ****
  			echo '<div style="padding: 5px;">';
  			echo '<form style="margin-bottom:0;" action="day.php" method="GET">';
- 			echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
  			include('./functions/list_icals.php');
  			include('./functions/list_years.php');
  			include('./functions/list_months.php');
  			include('./functions/list_weeks.php');
  			echo '</form>';
  			if ($show_search == 'yes') {
--- 58,69 ----
  			echo '<div style="padding: 5px;">';
  			echo '<form style="margin-bottom:0;" action="day.php" method="GET">';
  			include('./functions/list_icals.php');
+ 			echo '<br>';
  			include('./functions/list_years.php');
+ 			echo '<br>';
  			include('./functions/list_months.php');
+ 			echo '<br>';
  			include('./functions/list_weeks.php');
+ 			echo '<br>';
  			echo '</form>';
  			if ($show_search == 'yes') {
***************
*** 96,107 ****
  							$event_text = strip_tags($event_text, '<b><i><u>');
  							if ($event_text != "") {	
! 								$event_text2 	= rawurlencode(addslashes($val["event_text"]));
! 								$description 	= addslashes(urlencode($val["description"]));
  								$event_start 	= @$val["event_start"];
  								$event_end 		= @$val["event_end"];
! 								$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
! 								$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
! 								$calendar_name2	= addslashes($calendar_name);
! 								$calendar_name2 = urlencode($calendar_name2);
  								$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
  								
--- 105,116 ----
  							$event_text = strip_tags($event_text, '<b><i><u>');
  							if ($event_text != "") {	
! 								$event_text2 	= rawurlencode(addslashes($val['event_text']));
! 								$description 	= addslashes(urlencode($val['description']));
  								$event_start 	= @$val["event_start"];
  								$event_end 		= @$val["event_end"];
! 								$event_calna 	= @$val["calname"];
! 								$event_url 		= @$val["url"];
! 								$event_start 	= date ($timeFormat, @strtotime ($event_start));
! 								$event_end 		= date ($timeFormat, @strtotime ($event_end));
  								$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
  								
***************
*** 109,118 ****
  									$event_start = $all_day_lang; 
  									$event_end = ''; 
! 									openevent($calendar_name2, $event_start, 
! 									$event_end, $val, $tomorrows_events_lines, 21, '<i>', '</i>', 'psf'); 
  									echo "<br>\n"; 
  								} else { 
! 									openevent($calendar_name2, $event_start, 
! 									$event_end, $val, $tomorrows_events_lines, 21, '<font class="G10B">&#149; ', '</font>', 'psf'); 
  									echo "<br>\n"; 
  								}
--- 118,125 ----
  									$event_start = $all_day_lang; 
  									$event_end = ''; 
! 									openevent($event_calna, $event_start, $event_end, $val, $tomorrows_events_lines, 21, '<i>', '</i>', 'psf', $event_url); 
  									echo "<br>\n"; 
  								} else { 
! 									openevent($event_calna, $event_start, $event_end, $val, $tomorrows_events_lines, 21, '<font class="G10B">&#149; ', '</font>', 'psf', $event_url); 
  									echo "<br>\n"; 
  								}
***************
*** 162,165 ****
--- 169,173 ----
  								}
  								$completed_date = $val['completed_date'];
+ 								$event_calna 	= $val['calname'];
  								$status 		= $val["status"];
  								$priority 		= $val['priority'];
***************
*** 167,171 ****
  								$due_date 		= $val['due_date'];
  								$vtodo_array 	= array(
! 									'cal'			=> $calendar_name,
  									'completed_date'=> $completed_date,
  									'description'	=> $description,
--- 175,179 ----
  								$due_date 		= $val['due_date'];
  								$vtodo_array 	= array(
! 									'cal'			=> $event_calna,
  									'completed_date'=> $completed_date,
  									'description'	=> $description,

Index: todo.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/includes/todo.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** todo.php	5 Oct 2003 15:29:06 -0000	1.1
--- todo.php	21 Dec 2003 23:17:21 -0000	1.2
***************
*** 2,31 ****
  
  define('BASE', '../');
! include (BASE.'functions/init.inc.php');
! include (BASE.'functions/date_functions.php');
  
- // Unserialize the array so that we can use it.
  $vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));
  
  // Set the variables from the array
! if (isset($vtodo_array['vtodo_text']) && ($vtodo_array['vtodo_text'] !== '') ) {
! 	$vtodo_text = $vtodo_array['vtodo_text'];
! } else {
! 	$vtodo_text = '';
! }
  
! if (isset($vtodo_array['description']) && ($vtodo_array['description'] !== '') ) {
! 	$description = $vtodo_array['description'];
! } else {
! 	$description = '';
! }
  
- if (isset($vtodo_array['completed_date']) && ($vtodo_array['completed_date'] !== '') ) {
- 	$completed_date = localizeDate ($dateFormat_day, strtotime($vtodo_array['completed_date']));
- }
  
- if (isset($vtodo_array['status']) && ($vtodo_array['status'] !== '') ) {
- 	$status = $vtodo_array['status'];
- }
  if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {
  	$status = "$completed_date_lang $completed_date";
--- 2,26 ----
  
  define('BASE', '../');
! include_once(BASE.'functions/init.inc.php');
! include_once(BASE.'functions/date_functions.php');
  
  $vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));
  
  // Set the variables from the array
! $vtodo_text		= (isset($vtodo_array['vtodo_text'])) ? $vtodo_array['vtodo_text'] : ('');
! $description	= (isset($vtodo_array['description'])) ? $vtodo_array['description'] : ('');
! $completed_date	= (isset($vtodo_array['completed_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['completed_date'])) : ('');
! $status			= (isset($vtodo_array['status'])) ? $vtodo_array['status'] : ('');
! $calendar_name  = (isset($vtodo_array['cal'])) ? $vtodo_array['cal'] : ('');
! $start_date 	= (isset($vtodo_array['start_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['start_date'])) : ('');
! $due_date 		= (isset($vtodo_array['due_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['due_date'])) : ('');
! $priority 		= (isset($vtodo_array['priority'])) ? $vtodo_array['priority'] : ('');
  
! $cal_title_full = $calendar_name.' '.$calendar_lang;
! $description	= ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $description);
! $vtodo_text		= ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text);
! $sheet_href 	= BASE.'styles/'.$style_sheet.'/default.css';
  
  
  if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {
  	$status = "$completed_date_lang $completed_date";
***************
*** 36,135 ****
  }
  
! if (isset($vtodo_array['cal']) && ($vtodo_array['cal'] !== '') ) {
! 	$calendar_name = $vtodo_array['cal'];
! } else {
! 	$calendar_name = '';
! }
! 
! if (isset($vtodo_array['start_date']) && ($vtodo_array['start_date'] !== '') ) {
! 	$start_date = localizeDate ($dateFormat_day, strtotime($vtodo_array['start_date']));
! }
! 
! if (isset($vtodo_array['due_date']) && ($vtodo_array['due_date'] !== '') && strtotime($vtodo_array['due_date']) != strtotime("+1 year", strtotime($start_date))) {
! 	$due_date = localizeDate ($dateFormat_day, strtotime($vtodo_array['due_date']));
! } else {
! 	$due_date = '';
! }
! 
! if (isset($vtodo_array['priority']) && ($vtodo_array['priority'] !== '')) {
! 	$priority = $vtodo_array['priority'];
! 
! 	if ($priority >= 1 && $priority <= 4) {
! 		$priority = $priority_high_lang;
! 	} else if ($priority == 5) {
! 		$priority = $priority_medium_lang;
! 	} else if ($priority >= 6 && $priority <= 9) {
! 		$priority = $priority_low_lang;
! 	} else {
! 		$priority = $priority_none_lang;
! 	}
  } else {
  	$priority = $priority_none_lang;
  }
  
! ?>
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
!         "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
! <html>
! <head>
! 	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
! 	<title><?php echo $calendar_name; ?></title>
! 	<link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>">
! </head>
! <body bgcolor="#eeeeee"><center>
! <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
! 	<tr>
! 		<td align="left" valign="top" width="1%" class="sideback"><img src="../images/spacer.gif" width="1" height="20" alt=" "></td>
! 		<td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$calendar_name $calendar_lang"; ?></font></td>
! 		<td align="right" valign="top" width="1%" class="sideback"></td>
! 	</tr>
! 	<tr>
! 		<td colspan="3"><img src="../images/spacer.gif" width="1" height="6" alt=" "></td>
! 	</tr>
! 	<tr>
! 		<td colspan="3">  
! 	   		<table width="100%" border="0" cellspacing="0" cellpadding="0">
! 				<tr>
! 					 <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
! 		 			 <td align="left" colspan="2" class="V12"><?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text).'<br /><br />'; ?></td>
! 				</tr>
! 				
! 				<?php if ($description) { ?>    
! 					<tr>
! 					 <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
! 					 <td align="left" colspan="2" class="V12">
! 					 <?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $description); ?></td>
! 					</tr>
! 				<?php } ?>
  
! 				<?php if ($status) { ?>
! 				<tr>
! 					 <td></td>
! 		 			 <td align="left" colspan="2" class="V12"><?php echo "$status_lang $status"; ?></td>
! 				</tr>
! 				<?php } ?>
  
! 				<tr>
! 					 <td></td>
! 		 			 <td align="left" colspan="2" class="V12"><?php echo "$priority_lang $priority"; ?></td>
! 				</tr>
  
! 				<tr>
! 					 <td></td>
! 		 			 <td align="left" colspan="2" class="V12"><?php echo "$created_lang $start_date"; ?></td>
! 				</tr>
  
! 				<?php if ($due_date) { ?>
! 				<tr>
! 					 <td></td>
! 		 			 <td align="left" colspan="2" class="V12"><?php echo "$due_lang $due_date"; ?></td>
! 				</tr>
! 				<?php } ?>
! 				
! 	   </table>
!    </td>
! 	</tr>
! </table> 
! </center>
! </body>
! </html>
--- 31,81 ----
  }
  
! if ($priority >= 1 && $priority <= 4) {
! 	$priority = $priority_high_lang;
! } else if ($priority == 5) {
! 	$priority = $priority_medium_lang;
! } else if ($priority >= 6 && $priority <= 9) {
! 	$priority = $priority_low_lang;
  } else {
  	$priority = $priority_none_lang;
  }
  
! $display = '';
! if ($vtodo_text != '')  	$display .= $vtodo_text.'<br><br>';
! if ($description != '')  	$display .= $description.'<br>';
! if ($status != '')  		$display .= $status_lang.': '.$status.'<br>';
! if ($priority != '')  		$display .= $priority_lang.' '.$priority.'<br>';
! if ($start_date != '')  	$display .= $created_lang.' '.$start_date.'<br>';
! if ($due_date != '')  		$display .= $due_lang.' '.$due_date.'<br>';
  
! echo <<<END
  
! 	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
! 			"http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
! 	<html>
! 	<head>
! 		<meta http-equiv="content-type" content="text/html;charset=UTF-8">
! 		<title>{$calendar_name}</title>
! 		<link rel="stylesheet" type="text/css" href="{$sheet_href}">
! 	</head>
! 	<body>
! 	<center>
! 		<table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
! 			<tr>
! 				<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$cal_title_full}</div></td>
! 			</tr>
! 			<tr>
! 				<td align="left" class="V12">
! 					<div style="margin-left: 10px; margin-bottom:10px;">
! 						<p>{$display}</p>
! 					</div>
! 				</td>
! 			</tr>
! 		</table>
! 	</center>
! 	</body>
! 	</html>
  
! END;
  
! ?>
\ No newline at end of file

[Openfirst-cvscommit] members/phpicalendar/rss index.php,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:18:01

Update of /cvsroot/openfirst/members/phpicalendar/rss
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/rss

Modified Files:
	index.php 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/rss/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.php	5 Oct 2003 15:34:50 -0000	1.1
--- index.php	21 Dec 2003 23:17:22 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  define('BASE','../');
  include(BASE.'functions/ical_parser.php');
+ include_once(BASE.'functions/calendar_functions.php');
  $default_path = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/rss/'));
  if (isset($HTTP_SERVER_VARS['HTTP_REFERER']) && $HTTP_SERVER_VARS['HTTP_REFERER'] != '') {
***************
*** 58,83 ****
  									<?php 
  									
- 									// open file
- 									$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
- 									
  									// build the <option> tags
! 									while ($file = readdir($dir_handle)) {
! 										if (preg_match("/^[^.].+\.ics$/", $file)) {
! 											
! 											// $cal_filename is the filename of the calendar without .ics
! 											// $cal is a urlencoded version of $cal_filename
! 											// $cal_displayname is $cal_filename with occurrences of "32" replaced with " "
! 											$cal_filename_tmp = substr($file,0,-4);
! 											$cal_tmp = urlencode($cal_filename_tmp);
! 											$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
! 											if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
! 												echo '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br>';
! 												echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br>';
! 												echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br>';
! 												echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br>';
! 												$footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view;
! 												echo '<br><br>';		
! 											}	
! 										}
  									}
  									?>
--- 59,77 ----
  									<?php 
  									
  									// build the <option> tags
! 									$filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED);
! 									foreach ($filelist as $file) {
! 										// $cal_filename is the filename of the calendar without .ics
! 										// $cal is a urlencoded version of $cal_filename
! 										// $cal_displayname is $cal_filename with occurrences of "32" replaced with " "
! 										$cal_filename_tmp = substr($file,0,-4);
! 										$cal_tmp = urlencode($cal_filename_tmp);
! 										$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
! 										echo '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br>';
! 										echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br>';
! 										echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br>';
! 										echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br>';
! 										$footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view;
! 										echo '<br><br>';
  									}
  									?>

[Openfirst-cvscommit] members/phpicalendar/styles/green default.css,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:18:01

Update of /cvsroot/openfirst/members/phpicalendar/styles/green
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/styles/green

Modified Files:
	default.css 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: default.css
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/styles/green/default.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.css	5 Oct 2003 15:42:13 -0000	1.1
--- default.css	21 Dec 2003 23:17:23 -0000	1.2
***************
*** 99,100 ****
--- 99,101 ----
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
+ .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }

[Openfirst-cvscommit] members/phpicalendar/styles/grey default.css,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:18:00

Update of /cvsroot/openfirst/members/phpicalendar/styles/grey
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/styles/grey

Modified Files:
	default.css 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: default.css
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/styles/grey/default.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.css	5 Oct 2003 15:42:13 -0000	1.1
--- default.css	21 Dec 2003 23:17:23 -0000	1.2
***************
*** 99,101 ****
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
! 
--- 99,101 ----
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
! .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }

[Openfirst-cvscommit] members/phpicalendar/styles/silver default.css,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:17:29

Update of /cvsroot/openfirst/members/phpicalendar/styles/silver
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/styles/silver

Modified Files:
	default.css 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: default.css
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/styles/silver/default.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.css	5 Oct 2003 15:42:13 -0000	1.1
--- default.css	21 Dec 2003 23:17:24 -0000	1.2
***************
*** 97,99 ****
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
! 
--- 97,99 ----
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
! .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }

[Openfirst-cvscommit] members/phpicalendar/styles/tan default.css,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:17:29

Update of /cvsroot/openfirst/members/phpicalendar/styles/tan
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/styles/tan

Modified Files:
	default.css 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: default.css
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/styles/tan/default.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.css	5 Oct 2003 15:42:13 -0000	1.1
--- default.css	21 Dec 2003 23:17:25 -0000	1.2
***************
*** 96,98 ****
--- 96,99 ----
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
+ .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }

[Openfirst-cvscommit] members/phpicalendar/styles/orange default.css,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:17:27

Update of /cvsroot/openfirst/members/phpicalendar/styles/orange
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/styles/orange

Modified Files:
	default.css 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: default.css
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/styles/orange/default.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.css	5 Oct 2003 15:42:13 -0000	1.1
--- default.css	21 Dec 2003 23:17:23 -0000	1.2
***************
*** 98,99 ****
--- 98,100 ----
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
+ .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }

[Openfirst-cvscommit] members/phpicalendar/styles/red default.css,1.1,1.2

From: <xt...@us...> - 2003-12-21 23:17:27

Update of /cvsroot/openfirst/members/phpicalendar/styles/red
In directory sc8-pr-cvs1:/tmp/cvs-serv2747/styles/red

Modified Files:
	default.css 
Log Message:
Upgrade version of PHP iCalendar from 0.9.5 to 1.0.  According to the PHP iCalendar folks, this fixes all outstanding known bugs ;-)

Index: default.css
===================================================================
RCS file: /cvsroot/openfirst/members/phpicalendar/styles/red/default.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.css	5 Oct 2003 15:42:13 -0000	1.1
--- default.css	21 Dec 2003 23:17:24 -0000	1.2
***************
*** 98,100 ****
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
! 
--- 98,100 ----
  .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
  .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
! .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }

[Openfirst-cvscommit] base/config install.php,1.16,1.17

From: <i-...@us...> - 2003-12-14 20:32:32

Update of /cvsroot/openfirst/base/config
In directory sc8-pr-cvs1:/tmp/cvs-serv15235/config

Modified Files:
	install.php 
Log Message:
Fixed typo: changed str_pos() to strpos()

Index: install.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/install.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** install.php	16 Sep 2003 11:55:57 -0000	1.16
--- install.php	14 Dec 2003 20:32:29 -0000	1.17
***************
*** 66,72 ****
        }
        fclose($sf);
! 	  echo("<td><b><font color='Green'>Module Installed</font></b></td></tr>");
! 	   }else{
! 	   echo "<td>--</td></tr>";
      }
    }
--- 66,72 ----
        }
        fclose($sf);
!     echo("<td><b><font color='Green'>Module Installed</font></b></td></tr>");
!      }else{
!      echo "<td>--</td></tr>";
      }
    }
***************
*** 78,82 ****
        $handl=@opendir(getcwd() . "/$file/setup/");
        while ($fil = @readdir($handl)){
!         if($fil != ".." && $fil != "." && $fil != "" && str_pos($fil, $dbasetype) > 0) {
             $filename =  "../$file/setup/$fil";
             $sqlf = str_replace(".", "-", str_replace(".$dbasetype", "",substr(strrchr($filename, "/"), 1)));
--- 78,82 ----
        $handl=@opendir(getcwd() . "/$file/setup/");
        while ($fil = @readdir($handl)){
!         if($fil != ".." && $fil != "." && $fil != "" && strpos($fil, $dbasetype) > 0) {
             $filename =  "../$file/setup/$fil";
             $sqlf = str_replace(".", "-", str_replace(".$dbasetype", "",substr(strrchr($filename, "/"), 1)));
***************
*** 101,107 ****
               $filename =  "../$file/setup/$fil";
             }
! 		}
        }
! 	}
    }
  }
--- 101,107 ----
               $filename =  "../$file/setup/$fil";
             }
!     }
        }
!   }
    }
  }

[Openfirst-cvscommit] forum forumvisit.php,1.2,1.3

From: <i-...@us...> - 2003-12-06 20:09:31

Update of /cvsroot/openfirst/forum
In directory sc8-pr-cvs1:/tmp/cvs-serv2641/forum

Modified Files:
	forumvisit.php 
Log Message:
Fixed latest posts function conflict with hidden admin forums.

Index: forumvisit.php
===================================================================
RCS file: /cvsroot/openfirst/forum/forumvisit.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** forumvisit.php	25 Oct 2003 23:02:50 -0000	1.2
--- forumvisit.php	6 Dec 2003 20:09:25 -0000	1.3
***************
*** 48,52 ****
    
    function latest_posts($number){
!     $query=ofirst_dbquery("SELECT Title,Author,Forum,ID,ReplyTo FROM ofirst_forumposts ORDER BY DatePosted DESC LIMIT ".$number);
      if(ofirst_dbnum_rows($query)==0){
        echo("<div>No posts in forums</div>");
--- 48,56 ----
    
    function latest_posts($number){
!     $query=ofirst_dbquery("SELECT Title, Author, Forum, ofirst_forumposts.ID, ReplyTo
!         FROM ofirst_forumposts, ofirst_forum
!         WHERE ofirst_forum.name = ofirst_forumposts.Forum AND ofirst_forum.hidden = 0
!         ORDER BY DatePosted DESC
!         LIMIT $number");
      if(ofirst_dbnum_rows($query)==0){
        echo("<div>No posts in forums</div>");
***************
*** 54,74 ****
        echo("<ul>");
        while($post=ofirst_dbfetch_object($query)){
!         $q=ofirst_dbquery("SELECT hidden FROM ofirst_forum WHERE name='$post->Forum'");
!         $forum=ofirst_dbfetch_object($q);
!         if($forum->hidden==0){
!           if($post->ReplyTo==0){
!             $msgid=$post->ID;
!           }else{
!             $msgid=$post->ReplyTo;
!           }
!           if($post->Title==""){
!             $q=ofirst_dbquery("SELECT Title FROM ofirst_forumposts WHERE ID='$post->ReplyTo'");
!             $root=ofirst_dbfetch_object($q);
!             $title=$root->Title;
!           }else{
!             $title=$post->Title;
!           }
!           echo("<li><a href=\"".$GLOBALS["basepath"]."/forum/thread.php?id=$msgid\">$title</a><br />by $post->Author");
          }
        }
        echo("</ul>");
--- 58,74 ----
        echo("<ul>");
        while($post=ofirst_dbfetch_object($query)){
!         if($post->ReplyTo==0){
!           $msgid=$post->ID;
!         }else{
!           $msgid=$post->ReplyTo;
          }
+         if($post->Title==""){
+           $q=ofirst_dbquery("SELECT Title FROM ofirst_forumposts WHERE ID='$post->ReplyTo'");
+           $root=ofirst_dbfetch_object($q);
+           $title=$root->Title;
+         }else{
+           $title=$post->Title;
+         }
+         echo("<li><a href=\"".$GLOBALS["basepath"]."/forum/thread.php?id=$msgid\">$title</a><br />by $post->Author</li>");
        }
        echo("</ul>");

[Openfirst-cvscommit] messenger inbox.php,1.10,1.11 index.php,1.9,1.10

From: <dav...@us...> - 2003-12-06 20:07:49

Update of /cvsroot/openfirst/messenger
In directory sc8-pr-cvs1:/tmp/cvs-serv2245

Modified Files:
	inbox.php index.php 
Log Message:
Updates to design and syntax.

Index: inbox.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/inbox.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** inbox.php	2 Dec 2003 23:07:07 -0000	1.10
--- inbox.php	6 Dec 2003 20:07:46 -0000	1.11
***************
*** 51,55 ****
    $query = ofirst_dbquery("SELECT * FROM ofirst_messenger_messages WHERE Receiver = '".$user->user."'");
  ?>
! <h1>Visitor Inbox for Messaging</h1>
  <p>You have (<?php echo ofirst_dbnum_rows($query); ?>) messages within your inbox.</p>
  <table width="661">
--- 51,55 ----
    $query = ofirst_dbquery("SELECT * FROM ofirst_messenger_messages WHERE Receiver = '".$user->user."'");
  ?>
! <h1>Member Inbox</h1>
  <p>You have (<?php echo ofirst_dbnum_rows($query); ?>) messages within your inbox.</p>
  <table width="661">

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.php	2 Nov 2003 15:46:10 -0000	1.9
--- index.php	6 Dec 2003 20:07:46 -0000	1.10
***************
*** 30,34 ****
  ?>
  <h1>Current Online Users</h1>
! <table width="737">
    <tr>
      <th width="29"></th>
--- 30,35 ----
  ?>
  <h1>Current Online Users</h1>
! <p>This is a list of current users on the website.</p>
! <table>
    <tr>
      <th width="29"></th>

[Openfirst-cvscommit] news comments.php,1.4,1.5

From: <i-...@us...> - 2003-12-06 19:35:44

Update of /cvsroot/openfirst/news
In directory sc8-pr-cvs1:/tmp/cvs-serv30257/news

Modified Files:
	comments.php 
Log Message:
Removed the last committed changes. The errors were not in this code, but in the setup script.

Index: comments.php
===================================================================
RCS file: /cvsroot/openfirst/news/comments.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** comments.php	6 Dec 2003 18:08:21 -0000	1.4
--- comments.php	6 Dec 2003 19:35:41 -0000	1.5
***************
*** 44,50 ****
    if(function_exists("latest_posts")){
      //forum integration
!     $forum_query = ofirst_dbquery("SELECT Website FROM ofirst_news_comments WHERE ID='$id'");
!     if(ofirst_dbnum_rows($forum_query) != 0){
!       $redirect = ofirst_dbfetch_object($forum_query);
        header("Location: ".$redirect->Website);
      } else {
--- 44,50 ----
    if(function_exists("latest_posts")){
      //forum integration
!     $q=ofirst_dbquery("SELECT Website FROM ofirst_news_comments WHERE StoryID='$id'");
!     if(ofirst_dbnum_rows($q)!=0){
!       $redirect=ofirst_dbfetch_object($q);
        header("Location: ".$redirect->Website);
      } else {
***************
*** 54,58 ****
        $query=ofirst_dbquery("SELECT ID FROM ofirst_forumposts WHERE forum='".newsforum."' AND ReplyTo=0 AND Title='".$newspost->title."' AND Author='".$newspost->poster."' AND Message='".addslashes($newspost->news)."'");
        $news=ofirst_dbfetch_object($query);
!       ofirst_dbquery("INSERT INTO ofirst_news_comments (ID,Author,Website,Comment,Date) values ('$id','".$newspost->poster."','".$basepath."/forum/thread.php?id=".$news->ID."','Discussion moved to forum','".date("Y-m-d H:i:s")."');");
        header("Location: ".$basepath."/forum/thread.php?id=".$news->ID);
      }
--- 54,58 ----
        $query=ofirst_dbquery("SELECT ID FROM ofirst_forumposts WHERE forum='".newsforum."' AND ReplyTo=0 AND Title='".$newspost->title."' AND Author='".$newspost->poster."' AND Message='".addslashes($newspost->news)."'");
        $news=ofirst_dbfetch_object($query);
!       ofirst_dbquery("INSERT INTO ofirst_news_comments (StoryID,Author,Website,Comment,Date) values ('$id','".$newspost->poster."','".$basepath."/forum/thread.php?id=".$news->ID."','Discussion moved to forum','".date("Y-m-d H:i:s")."');");
        header("Location: ".$basepath."/forum/thread.php?id=".$news->ID);
      }
***************
*** 65,76 ****
  <tr><th colspan='2'>
  <?php
!   $comment_query = ofirst_dbquery("SELECT title FROM ofirst_news WHERE ID='$id'");
!   if(ofirst_dbnum_rows($comment_query) != 0){
!     $post=ofirst_dbfetch_object($comment_query);
      echo("Discussion: ".$post->title);
      echo("</th></tr>");
!     $discussion_query = ofirst_dbquery("SELECT * FROM ofirst_news_comments WHERE ID = '$id'");
!     if(ofirst_dbnum_rows($discussion_query) !=0 ){
!       while($post = ofirst_dbfetch_object($discussion_query)){
          echo("<tr valign='top'><td class='sub' width='200'>");
          if($post->EMail!=""){
--- 65,76 ----
  <tr><th colspan='2'>
  <?php
!   $q=ofirst_dbquery("SELECT title FROM ofirst_news WHERE ID='$id'");
!   if(ofirst_dbnum_rows($q)!=0){
!     $post=ofirst_dbfetch_object($q);
      echo("Discussion: ".$post->title);
      echo("</th></tr>");
!     $q=ofirst_dbquery("SELECT * FROM ofirst_news_comments WHERE StoryID='$id'");
!     if(ofirst_dbnum_rows($q)!=0){
!       while($post=ofirst_dbfetch_object($q)){
          echo("<tr valign='top'><td class='sub' width='200'>");
          if($post->EMail!=""){

[Openfirst-cvscommit] news/setup setup.mssql,1.5,1.6 setup.mysql,1.10,1.11

From: <i-...@us...> - 2003-12-06 19:26:35

Update of /cvsroot/openfirst/news/setup
In directory sc8-pr-cvs1:/tmp/cvs-serv28973/news/setup

Modified Files:
	setup.mssql setup.mysql 
Log Message:
Added install for the comment system

Index: setup.mssql
===================================================================
RCS file: /cvsroot/openfirst/news/setup/setup.mssql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** setup.mssql	6 Dec 2003 18:10:42 -0000	1.5
--- setup.mssql	6 Dec 2003 19:26:31 -0000	1.6
***************
*** 1,4 ****
  CREATE TABLE IF NOT EXISTS `ofirst_news` (`ID` int(6) unsigned NOT NULL auto_increment, `date` TINYTEXT, `poster` TINYTEXT, `title` TINYTEXT, `news` TEXT, PRIMARY KEY (`ID`)) Type=MyISAM;
  ALTER TABLE ofirst_news ADD COLUMN image TEXT;
! CREATE TABLE `ofirst_news_comments` (`ID` tinyint(3) unsigned NOT NULL default '0',  `Author` TEXT,  `EMail` TINYTEXT,  `Website` TINYTEXT,  `Comment` TEXT,  `Date` TEXT,  PRIMARY KEY  (`ID`)) TYPE=MyISAM;
! INSERT INTO ofirst_config SET modulename='news',showonmenu='0',active='0',adminnavigation='<a href="$basepath/news/admin/">Add News</a>',modulenavigation='<a href="$basepath/news/">Current News</a> | <a href="$basepath/news/rssfeed.php">Stream our News</a>',includes='viewnews.php';
--- 1,5 ----
  CREATE TABLE IF NOT EXISTS `ofirst_news` (`ID` int(6) unsigned NOT NULL auto_increment, `date` TINYTEXT, `poster` TINYTEXT, `title` TINYTEXT, `news` TEXT, PRIMARY KEY (`ID`)) Type=MyISAM;
  ALTER TABLE ofirst_news ADD COLUMN image TEXT;
! CREATE TABLE IF NOT EXISTS `ofirst_news_comments` (`ID` tinyint(3) unsigned NOT NULL default '0',  `Author` TEXT,  `EMail` TINYTEXT,  `Website` TINYTEXT,  `Comment` TEXT,  `Date` TEXT,  PRIMARY KEY  (`ID`)) TYPE=MyISAM;
! ALTER TABLE ofirst_news_comments ADD COLUMN `StoryID` int(6) unsigned;
! INSERT INTO ofirst_config SET modulename='news',showonmenu='0',active='0',adminnavigation='<a href="$basepath/news/admin/">Add News</a>',modulenavigation='<a href="$basepath/news/">Current News</a> | <a href="$basepath/news/rssfeed.php">Stream our News</a>',includes='viewnews.php';
\ No newline at end of file

Index: setup.mysql
===================================================================
RCS file: /cvsroot/openfirst/news/setup/setup.mysql,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** setup.mysql	6 Dec 2003 18:10:42 -0000	1.10
--- setup.mysql	6 Dec 2003 19:26:31 -0000	1.11
***************
*** 1,4 ****
  CREATE TABLE IF NOT EXISTS `ofirst_news` (`ID` int(6) unsigned NOT NULL auto_increment, `date` TINYTEXT, `poster` TINYTEXT, `title` TINYTEXT, `news` TEXT, PRIMARY KEY (`ID`)) Type=MyISAM;
  ALTER TABLE ofirst_news ADD COLUMN image TEXT;
! CREATE TABLE `ofirst_news_comments` (`ID` tinyint(3) unsigned NOT NULL default '0',  `Author` TEXT,  `EMail` TINYTEXT,  `Website` TINYTEXT,  `Comment` TEXT,  `Date` TEXT,  PRIMARY KEY  (`ID`)) TYPE=MyISAM;
  INSERT INTO ofirst_config SET modulename='news',showonmenu='0',active='0',adminnavigation='<a href="$basepath/news/admin/">Add News</a>',modulenavigation='<a href="$basepath/news/">Current News</a> | <a href="$basepath/news/rssfeed.php">Stream our News</a>',includes='viewnews.php';
--- 1,5 ----
  CREATE TABLE IF NOT EXISTS `ofirst_news` (`ID` int(6) unsigned NOT NULL auto_increment, `date` TINYTEXT, `poster` TINYTEXT, `title` TINYTEXT, `news` TEXT, PRIMARY KEY (`ID`)) Type=MyISAM;
  ALTER TABLE ofirst_news ADD COLUMN image TEXT;
! CREATE TABLE IF NOT EXISTS `ofirst_news_comments` (`ID` tinyint(3) unsigned NOT NULL default '0',  `Author` TEXT,  `EMail` TINYTEXT,  `Website` TINYTEXT,  `Comment` TEXT,  `Date` TEXT,  PRIMARY KEY  (`ID`)) TYPE=MyISAM;
! ALTER TABLE ofirst_news_comments ADD COLUMN `StoryID` int(6) unsigned;
  INSERT INTO ofirst_config SET modulename='news',showonmenu='0',active='0',adminnavigation='<a href="$basepath/news/admin/">Add News</a>',modulenavigation='<a href="$basepath/news/">Current News</a> | <a href="$basepath/news/rssfeed.php">Stream our News</a>',includes='viewnews.php';

7 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 63 64 65 66 67 .. 99 > >> (Page 65 of 99)

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