phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] calendar/inc hook_deleteaccount.inc.php, 1.6 hook_ema


From: skwashd
Subject: [Phpgroupware-cvs] calendar/inc hook_deleteaccount.inc.php, 1.6 hook_email.inc.php, 1.7 hook_home_day.inc.php, 1.5 hook_home_month.inc.php, 1.5 hook_admin.inc.php, 1.14 hook_home_planner.inc.php, 1.4 class.uialarm.inc.php, 1.8 class.soholiday.inc.php, 1.5 hook_home_week.inc.php, 1.5 class.uicalendar.inc.php, 1.107 class.uiholiday.inc.php, 1.8 class.uiicalendar.inc.php, 1.8 hook_add_def_pref.inc.php, 1.3 class.socalendar_sql.inc.php, 1.36 hook_preferences.inc.php, 1.25 hook_manual.inc.php, 1.6 hook_settings.inc.php, 1.4 hook_home_year.inc.php, 1.5 hook_home.inc.php, 1.41 class.socalendar__.inc.php, 1.15 class.holidaycalc.inc.php, 1.7 class.calendar_icap.inc.php, 1.17 class.holidaycalc_US.inc.php, 1.9 class.html.inc.php, 1.4 class.socalendar.inc.php, 1.28 class.calendar_holiday.inc.php, 1.25 class.holidaycalc_JP.inc.php, 1.5 class.socalendar_.inc.php, 1.6 class.boalarm.inc.php, 1.6 class.boholiday.inc.php, 1.13 class.bocalendar.inc.php, 1.92 class.boicalendar.inc.php, 1.24
Date: Sun, 15 May 2005 07:48:00 +0200

Update of calendar/inc

Modified Files:
     Branch: MAIN
            hook_deleteaccount.inc.php lines: +11 -10
            hook_email.inc.php lines: +14 -11
            hook_home_day.inc.php lines: +14 -11
            hook_home_month.inc.php lines: +14 -11
            hook_admin.inc.php lines: +12 -12
            hook_home_planner.inc.php lines: +14 -11
            class.uialarm.inc.php lines: +15 -18
            class.soholiday.inc.php lines: +13 -16
            hook_home_week.inc.php lines: +14 -11
            class.uicalendar.inc.php lines: +15 -18
            class.uiholiday.inc.php lines: +15 -18
            class.uiicalendar.inc.php lines: +15 -18
            hook_add_def_pref.inc.php lines: +12 -10
            class.socalendar_sql.inc.php lines: +14 -17
            hook_preferences.inc.php lines: +12 -12
            hook_manual.inc.php lines: +13 -11
            hook_settings.inc.php lines: +15 -12
            hook_home_year.inc.php lines: +14 -11
            hook_home.inc.php lines: +14 -15
            class.socalendar__.inc.php lines: +15 -28
            class.holidaycalc.inc.php lines: +13 -18
            class.calendar_icap.inc.php lines: +12 -15
            class.holidaycalc_US.inc.php lines: +12 -16
            class.html.inc.php lines: +14 -17
            class.socalendar.inc.php lines: +15 -18
            class.calendar_holiday.inc.php lines: +13 -16
            class.holidaycalc_JP.inc.php lines: +14 -19
            class.socalendar_.inc.php lines: +15 -20
            class.boalarm.inc.php lines: +15 -17
            class.boholiday.inc.php lines: +13 -16
            class.bocalendar.inc.php lines: +15 -18
            class.boicalendar.inc.php lines: +13 -30

Log Message:
rollback unlawful header changes and get a usable base so I can merge in 16 
changes

====================================================
Index: calendar/inc/hook_deleteaccount.inc.php
diff -u calendar/inc/hook_deleteaccount.inc.php:1.5 
calendar/inc/hook_deleteaccount.inc.php:1.6
--- calendar/inc/hook_deleteaccount.inc.php:1.5 Wed May 11 12:00:06 2005
+++ calendar/inc/hook_deleteaccount.inc.php     Sun May 15 05:48:35 2005
@@ -1,14 +1,15 @@
 <?php
-       /**
-       * Calendar - Delete account hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       */
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+       /* $Id$ */

        // Delete all records for a user
        if(intval($GLOBALS['HTTP_POST_VARS']['new_owner'])==0)

====================================================
Index: calendar/inc/hook_email.inc.php
diff -u calendar/inc/hook_email.inc.php:1.6 calendar/inc/hook_email.inc.php:1.7
--- calendar/inc/hook_email.inc.php:1.6 Wed May 11 12:00:06 2005
+++ calendar/inc/hook_email.inc.php     Sun May 15 05:48:35 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - EMail hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */

        global $calendar_id;


====================================================
Index: calendar/inc/hook_home_day.inc.php
diff -u calendar/inc/hook_home_day.inc.php:1.4 
calendar/inc/hook_home_day.inc.php:1.5
--- calendar/inc/hook_home_day.inc.php:1.4      Wed May 11 12:00:06 2005
+++ calendar/inc/hook_home_day.inc.php  Sun May 15 05:48:35 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - home-day hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

        $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
        if($d1 == 'htt' || $d1 == 'ftp' )

====================================================
Index: calendar/inc/hook_home_month.inc.php
diff -u calendar/inc/hook_home_month.inc.php:1.4 
calendar/inc/hook_home_month.inc.php:1.5
--- calendar/inc/hook_home_month.inc.php:1.4    Wed May 11 12:00:06 2005
+++ calendar/inc/hook_home_month.inc.php        Sun May 15 05:48:35 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - home-month hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

        $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
        if($d1 == 'htt' || $d1 == 'ftp' )

====================================================
Index: calendar/inc/hook_admin.inc.php
diff -u calendar/inc/hook_admin.inc.php:1.13 
calendar/inc/hook_admin.inc.php:1.14
--- calendar/inc/hook_admin.inc.php:1.13        Wed May 11 12:00:06 2005
+++ calendar/inc/hook_admin.inc.php     Sun May 15 05:48:35 2005
@@ -1,15 +1,15 @@
 <?php
-       /**
-       * Calendar - Admin hook
-       *
-       * @author Joseph Engo <address@hidden>
-       * @copyright Copyright (C) 2001-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       */
-
+       
/**************************************************************************\
+       * phpGroupWare                                                          
   *
+       * http://www.phpgroupware.org                                           
   *
+       * Written by Joseph Engo <address@hidden>                          *
+       * --------------------------------------------                          
   *
+       *  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.                                           
   *
+       
\**************************************************************************/
+       /* $Id$ */
        {

 // Only Modify the $file and $title variables.....
@@ -20,7 +20,7 @@
                        'Calendar Holiday Management'   => 
$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
                        'Global categories'                             => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname . '&global_cats=True')
                );
-// Do not modify below this line
+//Do not modify below this line
                display_section($appname,$file);
        }
 ?>

====================================================
Index: calendar/inc/hook_home_planner.inc.php
diff -u calendar/inc/hook_home_planner.inc.php:1.3 
calendar/inc/hook_home_planner.inc.php:1.4
--- calendar/inc/hook_home_planner.inc.php:1.3  Wed May 11 12:00:06 2005
+++ calendar/inc/hook_home_planner.inc.php      Sun May 15 05:48:35 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - home-planner hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar - Planner                                        *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

        $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
        if($d1 == 'htt' || $d1 == 'ftp' )

====================================================
Index: calendar/inc/class.uialarm.inc.php
diff -u calendar/inc/class.uialarm.inc.php:1.7 
calendar/inc/class.uialarm.inc.php:1.8
--- calendar/inc/class.uialarm.inc.php:1.7      Wed May 11 12:56:07 2005
+++ calendar/inc/class.uialarm.inc.php  Sun May 15 05:48:34 2005
@@ -1,22 +1,19 @@
 <?php
-       /**
-       * Calendar - Alarm
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002-2003,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
-
-
-       /**
-       * Alarm
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
        class uialarm
        {
                var $template;

====================================================
Index: calendar/inc/class.soholiday.inc.php
diff -u calendar/inc/class.soholiday.inc.php:1.4 
calendar/inc/class.soholiday.inc.php:1.5
--- calendar/inc/class.soholiday.inc.php:1.4    Wed May 11 12:56:07 2005
+++ calendar/inc/class.soholiday.inc.php        Sun May 15 05:48:34 2005
@@ -1,20 +1,17 @@
 <?php
-       /**
-       * Calendar - Holidays
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002-2003,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       */
-
-
-       /**
-       * Holidays
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Holiday                                                   *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
        class soholiday
        {
                var $debug = False;

====================================================
Index: calendar/inc/hook_home_week.inc.php
diff -u calendar/inc/hook_home_week.inc.php:1.4 
calendar/inc/hook_home_week.inc.php:1.5
--- calendar/inc/hook_home_week.inc.php:1.4     Wed May 11 12:00:06 2005
+++ calendar/inc/hook_home_week.inc.php Sun May 15 05:48:35 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - home-week hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

        $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
        if($d1 == 'htt' || $d1 == 'ftp' )

====================================================
Index: calendar/inc/class.uicalendar.inc.php
diff -u calendar/inc/class.uicalendar.inc.php:1.106 
calendar/inc/class.uicalendar.inc.php:1.107
--- calendar/inc/class.uicalendar.inc.php:1.106 Wed May 11 12:56:07 2005
+++ calendar/inc/class.uicalendar.inc.php       Sun May 15 05:48:34 2005
@@ -1,22 +1,19 @@
 <?php
-       /**
-       * Calendar
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002-2003,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id: class.uicalendar.inc.php,v 1.105 2003/09/06 12:42:54 
skeeter Exp
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
-
-
-       /**
-       * Calendar
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
        class uicalendar
        {
                var $template;

====================================================
Index: calendar/inc/class.uiholiday.inc.php
diff -u calendar/inc/class.uiholiday.inc.php:1.7 
calendar/inc/class.uiholiday.inc.php:1.8
--- calendar/inc/class.uiholiday.inc.php:1.7    Wed May 11 12:56:07 2005
+++ calendar/inc/class.uiholiday.inc.php        Sun May 15 05:48:35 2005
@@ -1,22 +1,19 @@
 <?php
-       /**
-       * Calendar - Holidays
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002-2003,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
-
-
-       /**
-       * Holidays
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
        class uiholiday
        {
                var $debug = False;

====================================================
Index: calendar/inc/class.uiicalendar.inc.php
diff -u calendar/inc/class.uiicalendar.inc.php:1.7 
calendar/inc/class.uiicalendar.inc.php:1.8
--- calendar/inc/class.uiicalendar.inc.php:1.7  Wed May 11 12:56:07 2005
+++ calendar/inc/class.uiicalendar.inc.php      Sun May 15 05:48:35 2005
@@ -1,22 +1,19 @@
 <?php
-       /**
-       * Calendar
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002-2003,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
-
-
-       /**
-       * Calendar
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
        class uiicalendar
        {
                var $bo;

====================================================
Index: calendar/inc/hook_add_def_pref.inc.php
diff -u calendar/inc/hook_add_def_pref.inc.php:1.2 
calendar/inc/hook_add_def_pref.inc.php:1.3
--- calendar/inc/hook_add_def_pref.inc.php:1.2  Wed May 11 12:00:06 2005
+++ calendar/inc/hook_add_def_pref.inc.php      Sun May 15 05:48:35 2005
@@ -1,14 +1,16 @@
 <?php
-       /**
-       * Calendar - Preferences hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

   global $pref;
   $pref->change("calendar","weekstarts","Monday");

====================================================
Index: calendar/inc/class.socalendar_sql.inc.php
diff -u calendar/inc/class.socalendar_sql.inc.php:1.35 
calendar/inc/class.socalendar_sql.inc.php:1.36
--- calendar/inc/class.socalendar_sql.inc.php:1.35      Wed May 11 12:56:07 2005
+++ calendar/inc/class.socalendar_sql.inc.php   Sun May 15 05:48:34 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - Calendar SQL storage
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

 if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'])
 {
@@ -18,12 +21,6 @@

 $GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'] = True;

-
-       /**
-       * Calendar SQL storage
-       *
-       * @package calendar
-       */
 class socalendar_ extends socalendar__
 {
        var $deleted_events = Array();

====================================================
Index: calendar/inc/hook_preferences.inc.php
diff -u calendar/inc/hook_preferences.inc.php:1.24 
calendar/inc/hook_preferences.inc.php:1.25
--- calendar/inc/hook_preferences.inc.php:1.24  Wed May 11 12:00:06 2005
+++ calendar/inc/hook_preferences.inc.php       Sun May 15 05:48:35 2005
@@ -1,15 +1,15 @@
 <?php
-       /**
-       * Calendar - Preferences hook
-       *
-       * @author Joseph Engo <address@hidden>
-       * @copyright Copyright (C) 2001-2003,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       */
-
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * Written by Joseph Engo <address@hidden>                          *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+  /* $Id$ */
 {
 // Only Modify the $file and $title variables.....
        $title = $appname;
@@ -18,7 +18,7 @@
                'Grant Access'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
                'Edit Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app='.$appname.'&cats_level=True&global_cats=True')
        );
-// Do not modify below this line
+//Do not modify below this line
        display_section($appname,$title,$file);
 }
 ?>

====================================================
Index: calendar/inc/hook_manual.inc.php
diff -u calendar/inc/hook_manual.inc.php:1.5 
calendar/inc/hook_manual.inc.php:1.6
--- calendar/inc/hook_manual.inc.php:1.5        Wed May 11 12:00:06 2005
+++ calendar/inc/hook_manual.inc.php    Sun May 15 05:48:35 2005
@@ -1,14 +1,16 @@
 <?php
-       /**
-       * Calendar - manual hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar Holidays                                         *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */

 // Only Modify the $file variable.....
        $file = Array(
@@ -16,6 +18,6 @@
                'Adding'        => 'add.php',
                'Edit/Deleting' => 'edit_delete.php'
        );
-// Do not modify below this line
+//Do not modify below this line
        display_manual_section($appname,$file);
 ?>

====================================================
Index: calendar/inc/hook_settings.inc.php
diff -u calendar/inc/hook_settings.inc.php:1.3 
calendar/inc/hook_settings.inc.php:1.4
--- calendar/inc/hook_settings.inc.php:1.3      Wed May 11 12:00:06 2005
+++ calendar/inc/hook_settings.inc.php  Sun May 15 05:48:35 2005
@@ -1,16 +1,19 @@
 <?php
-       /**
-       * Calendar - settings hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @author Ralf Becker <address@hidden>
-       * @copyright Copyright (C) 2001-2003,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+       
/**************************************************************************\
+       * phpGroupWare - Calendar Preferences                                   
   *
+       * http://www.phpgroupware.org                                           
   *
+       * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+       *          http://www.radix.net/~cknudsen                               
   *
+       * Modified by Mark Peters <address@hidden>                       *
+       * Modified by Ralf Becker <address@hidden>                 *
+       * --------------------------------------------                          
   *
+       *  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.                                           
   *
+       
\**************************************************************************/
+
+       /* $Id$ */

        create_check_box('show default view on main 
screen','mainscreen_showevents');


====================================================
Index: calendar/inc/hook_home_year.inc.php
diff -u calendar/inc/hook_home_year.inc.php:1.4 
calendar/inc/hook_home_year.inc.php:1.5
--- calendar/inc/hook_home_year.inc.php:1.4     Wed May 11 12:00:06 2005
+++ calendar/inc/hook_home_year.inc.php Sun May 15 05:48:35 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - home-year hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

        $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
        if($d1 == 'htt' || $d1 == 'ftp' )

====================================================
Index: calendar/inc/hook_home.inc.php
diff -u calendar/inc/hook_home.inc.php:1.40 calendar/inc/hook_home.inc.php:1.41
--- calendar/inc/hook_home.inc.php:1.40 Wed May 11 12:00:06 2005
+++ calendar/inc/hook_home.inc.php      Sun May 15 05:48:35 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - home hook
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage hooks
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

        $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
        if($d1 == 'htt' || $d1 == 'ftp' )
@@ -47,10 +50,6 @@
                {
                        $_page = 'day';
                }
-
-               /**
-               * Include page relevant home hook (day,week,month,year)
-               */
                
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php');

                $app_id = $GLOBALS['phpgw']->applications->name2id('calendar');

====================================================
Index: calendar/inc/class.socalendar__.inc.php
diff -u calendar/inc/class.socalendar__.inc.php:1.14 
calendar/inc/class.socalendar__.inc.php:1.15
--- calendar/inc/class.socalendar__.inc.php:1.14        Wed May 11 13:15:37 2005
+++ calendar/inc/class.socalendar__.inc.php     Sun May 15 05:48:34 2005
@@ -1,15 +1,18 @@
 <?php
-       /**
-       * Calendar - Alarm
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */

 if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'])
 {
@@ -18,13 +21,10 @@

 $GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'] = True;

-//     include(PHPGW_SERVER_ROOT.'/calendar/setup/setup.inc.php');
+/*     include(PHPGW_SERVER_ROOT.'/calendar/setup/setup.inc.php');     */

 if(extension_loaded('mcal') == False)
 {
-       /**
-       * Define Recurence none
-       */
        define('MCAL_RECUR_NONE',0);
        define('MCAL_RECUR_DAILY',1);
        define('MCAL_RECUR_WEEKLY',2);
@@ -54,22 +54,9 @@

 define('REJECTED',0);
 define('NO_RESPONSE',1);
-
-/**
-* Define tentative
-*/
 define('TENTATIVE',2);
-/**
-* Define accepted
-*/
 define('ACCEPTED',3);

-
-       /**
-       * Calendar
-       *
-       * @package calendar
-       */
 class socalendar__
 {
        var $event;

====================================================
Index: calendar/inc/class.holidaycalc.inc.php
diff -u calendar/inc/class.holidaycalc.inc.php:1.6 
calendar/inc/class.holidaycalc.inc.php:1.7
--- calendar/inc/class.holidaycalc.inc.php:1.6  Wed May 11 12:56:07 2005
+++ calendar/inc/class.holidaycalc.inc.php      Sun May 15 05:48:34 2005
@@ -1,15 +1,17 @@
 <?php
-       /**
-       * Calendar - Holidays
-       *
-       * @author Yoshihiro Kamimura <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on http://www.itheart.com/
-       */
+  /**************************************************************************\
+  * phpGroupWare - holidaycalc                                               *
+  * http://www.phpgroupware.org                                              *
+  * Based on Yoshihiro Kamimura <address@hidden>                           *
+  *          http://www.itheart.com                                          *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

        if 
(empty($GLOBALS['phpgw_info']['user']['preferences']['common']['country']))
        {
@@ -23,17 +25,10 @@
        $calc_include = 
PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_'.$rule.'.inc.php';
        if(@file_exists($calc_include))
        {
-
-               /**
-               * Include country specific holidays calculation
-               */
                include($calc_include);
        }
        else
        {
-               /**
-               * Include US specific holidays calculation
-               */
                
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_US.inc.php');
        }
 ?>

====================================================
Index: calendar/inc/class.calendar_icap.inc.php
diff -u calendar/inc/class.calendar_icap.inc.php:1.16 
calendar/inc/class.calendar_icap.inc.php:1.17
--- calendar/inc/class.calendar_icap.inc.php:1.16       Wed May 11 12:56:07 2005
+++ calendar/inc/class.calendar_icap.inc.php    Sun May 15 05:48:34 2005
@@ -1,13 +1,16 @@
 <?php
-       /**
-       * Calendar - ICal
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       */
+  /**************************************************************************\
+  * phpGroupWare - ICal Calendar                                             *
+  * http://www.phpgroupware.org                                              *
+  * Created by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

 if (isset($phpgw_info['flags']['included_classes']['calendar_']) &&
     $phpgw_info['flags']['included_classes']['calendar_'] == True)
@@ -17,12 +20,6 @@

 $phpgw_info['flags']['included_classes']['calendar_'] = True;

-
-       /**
-       * ICal
-       *
-       * @package calendar
-       */
 class calendar_ extends calendar__
 {
        function open($calendar='',$user='',$passwd='',$options='')

====================================================
Index: calendar/inc/class.holidaycalc_US.inc.php
diff -u calendar/inc/class.holidaycalc_US.inc.php:1.8 
calendar/inc/class.holidaycalc_US.inc.php:1.9
--- calendar/inc/class.holidaycalc_US.inc.php:1.8       Wed May 11 12:56:07 2005
+++ calendar/inc/class.holidaycalc_US.inc.php   Sun May 15 05:48:34 2005
@@ -1,22 +1,18 @@
 <?php
-       /**
-       * Calendar - Holidays US
-       *
-       * @author Yoshihiro Kamimura <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on http://www.itheart.com/
-       */
+  /**************************************************************************\
+  * phpGroupWare - holidaycalc_US                                            *
+  * http://www.phpgroupware.org                                              *
+  * Based on Yoshihiro Kamimura <address@hidden>                           *
+  *          http://www.itheart.com                                          *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/

+  /* $Id$ */

-       /**
-       * Holidays US
-       *
-       * @package calendar
-       */
 class holidaycalc {

        function calculate_date($holiday, &$holidays, $year, $datetime, &$i)

====================================================
Index: calendar/inc/class.html.inc.php
diff -u calendar/inc/class.html.inc.php:1.3 calendar/inc/class.html.inc.php:1.4
--- calendar/inc/class.html.inc.php:1.3 Wed May 11 12:56:07 2005
+++ calendar/inc/class.html.inc.php     Sun May 15 05:48:34 2005
@@ -1,21 +1,18 @@
 <?php
-       /**
-       * Calendar - HTML
-       *
-       * @author Ralf Becker <address@hidden>
-       * @author Joseph Engo <address@hidden>
-       * @copyright Copyright (C) 2000-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       */
-
-
-       /**
-       * HTML
-       *
-       * @package calendar
-       */
+       
/**************************************************************************\
+       * phpGroupWare - InfoLog                                                
   *
+       * http://www.phpgroupware.org                                           
   *
+       * Written by Ralf Becker <address@hidden>                  *
+       * originaly based on todo written by Joseph Engo <address@hidden>  *
+       * --------------------------------------------                          
   *
+       *  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.                                           
   *
+       
\**************************************************************************/
+
+       /* $Id$ */
+
 class html
 {
        function html()

====================================================
Index: calendar/inc/class.socalendar.inc.php
diff -u calendar/inc/class.socalendar.inc.php:1.27 
calendar/inc/class.socalendar.inc.php:1.28
--- calendar/inc/class.socalendar.inc.php:1.27  Wed May 11 12:56:07 2005
+++ calendar/inc/class.socalendar.inc.php       Sun May 15 05:48:34 2005
@@ -1,22 +1,19 @@
 <?php
-       /**
-       * Calendar - Calendar
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
-
-
-       /**
-       * Calendar
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
        class socalendar
        {
 //             var $debug = True;

====================================================
Index: calendar/inc/class.calendar_holiday.inc.php
diff -u calendar/inc/class.calendar_holiday.inc.php:1.24 
calendar/inc/class.calendar_holiday.inc.php:1.25
--- calendar/inc/class.calendar_holiday.inc.php:1.24    Wed May 11 12:56:07 2005
+++ calendar/inc/class.calendar_holiday.inc.php Sun May 15 05:48:34 2005
@@ -1,20 +1,17 @@
 <?php
-       /**
-       * Calendar - Holidays
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       */
-
-
-       /**
-       * Holidays
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar Holidays                                         *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
 class calendar_holiday
 {
        var $db;

====================================================
Index: calendar/inc/class.holidaycalc_JP.inc.php
diff -u calendar/inc/class.holidaycalc_JP.inc.php:1.4 
calendar/inc/class.holidaycalc_JP.inc.php:1.5
--- calendar/inc/class.holidaycalc_JP.inc.php:1.4       Wed May 11 13:15:37 2005
+++ calendar/inc/class.holidaycalc_JP.inc.php   Sun May 15 05:48:34 2005
@@ -1,23 +1,18 @@
 <?php
-       /**
-       * Calendar - Holidays Japan
-       *
-       * @author Yoshihiro Kamimura <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on http://www.itheart.com/
-       */
-
-
-       /**
-       * Holidays Japan
-       *
-       * @package calendar
-       * @ignore
-       */
+  /**************************************************************************\
+  * phpGroupWare - holidaycalc_JP                                            *
+  * http://www.phpgroupware.org                                              *
+  * Based on Yoshihiro Kamimura <address@hidden>                           *
+  *          http://www.itheart.com                                          *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
 class holidaycalc {

        function calculate_date($holiday, &$holidays, $year, $datetime, &$i)

====================================================
Index: calendar/inc/class.socalendar_.inc.php
diff -u calendar/inc/class.socalendar_.inc.php:1.5 
calendar/inc/class.socalendar_.inc.php:1.6
--- calendar/inc/class.socalendar_.inc.php:1.5  Wed May 11 12:56:07 2005
+++ calendar/inc/class.socalendar_.inc.php      Sun May 15 05:48:34 2005
@@ -1,34 +1,29 @@
 <?php
-       /**
-       * Calendar - Alarm
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */

        if(@$GLOBALS['phpgw_info']['server']['calendar_type'] == 'mcal' &&
                extension_loaded('mcal') == False)
        {
                $GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
        }
-    // This will be elminated when ical is fully implemented
+/* This will be elminated when ical is fully implemented */
        else
        {
                $GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
        }
-
-       /**
-       * Include calendar class
-       */
        include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.socalendar__.inc.php');
-
-       /**
-       * Include calendar class depending on storage model
-       */
        
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.socalendar_'.$GLOBALS['phpgw_info']['server']['calendar_type'].'.inc.php');
 ?>

====================================================
Index: calendar/inc/class.boalarm.inc.php
diff -u calendar/inc/class.boalarm.inc.php:1.5 
calendar/inc/class.boalarm.inc.php:1.6
--- calendar/inc/class.boalarm.inc.php:1.5      Wed May 11 12:56:07 2005
+++ calendar/inc/class.boalarm.inc.php  Sun May 15 05:48:34 2005
@@ -1,21 +1,19 @@
 <?php
-       /**
-       * Calendar - Alarm
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
-
-       /**
-       * Alarm
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
        class boalarm
        {
                var $so;

====================================================
Index: calendar/inc/class.boholiday.inc.php
diff -u calendar/inc/class.boholiday.inc.php:1.12 
calendar/inc/class.boholiday.inc.php:1.13
--- calendar/inc/class.boholiday.inc.php:1.12   Wed May 11 12:56:07 2005
+++ calendar/inc/class.boholiday.inc.php        Sun May 15 05:48:34 2005
@@ -1,20 +1,17 @@
 <?php
-       /**
-       * Calendar - Holidays
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2003,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       */
-
-
-       /**
-       * Holidays
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Holiday                                                   *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
        class boholiday
        {
                var $public_functions = Array(

====================================================
Index: calendar/inc/class.bocalendar.inc.php
diff -u calendar/inc/class.bocalendar.inc.php:1.91 
calendar/inc/class.bocalendar.inc.php:1.92
--- calendar/inc/class.bocalendar.inc.php:1.91  Wed May 11 12:56:07 2005
+++ calendar/inc/class.bocalendar.inc.php       Sun May 15 05:48:34 2005
@@ -1,22 +1,19 @@
 <?php
-       /**
-       * Calendar
-       *
-       * @author Craig Knudsen <address@hidden>
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2002,2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       * @internal Based on Webcalendar http://www.radix.net/~cknudsen/
-       */
-
-
-       /**
-       * Calendar
-       *
-       * @package calendar
-       */
+  /**************************************************************************\
+  * phpGroupWare - Calendar                                                  *
+  * http://www.phpgroupware.org                                              *
+  * Based on Webcalendar by Craig Knudsen <address@hidden>               *
+  *          http://www.radix.net/~cknudsen                                  *
+  * Modified by Mark Peters <address@hidden>                       *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
        class bocalendar
        {
                var $public_functions = Array(

====================================================
Index: calendar/inc/class.boicalendar.inc.php
diff -u calendar/inc/class.boicalendar.inc.php:1.23 
calendar/inc/class.boicalendar.inc.php:1.24
--- calendar/inc/class.boicalendar.inc.php:1.23 Wed May 11 13:15:37 2005
+++ calendar/inc/class.boicalendar.inc.php      Sun May 15 05:48:34 2005
@@ -1,17 +1,17 @@
 <?php
-       /**
-       * Calendar
-       *
-       * @author Mark Peters <address@hidden>
-       * @copyright Copyright (C) 2001-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @version $Id$
-       */
-
-/**
-* Define fold length
-*/
+  /**************************************************************************\
+  * phpGroupWare - iCalendar Parser                                          *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <address@hidden>                        *
+  * --------------------------------------------                             *
+  *  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.                                              *
+  \**************************************************************************/
+
+       /* $Id$ */
+
 define('FOLD_LENGTH',75);

 define('VEVENT',1);
@@ -30,21 +30,9 @@
 define('UNKNOWN',16);

 define('NEEDS_ACTION',0);
-
-/**
-* Define accepted
-* @ignore
-*/
 define('ACCEPTED',1);
-
 define('DECLINED',2);
-
-/**
-* Define tentative
-* @ignore
-*/
 define('TENTATIVE',3);
-
 define('DELEGATED',4);
 define('COMPLETED',5);
 define('IN_PROCESS',6);
@@ -89,11 +77,6 @@

 define('OTHER',99);

-/**
-* Calendar
-*
-* @package calendar
-*/
 class boicalendar
 {







reply via email to

[Prev in Thread] Current Thread [Next in Thread]