[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [18958] update headers and clean up some code too
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] [18958] update headers and clean up some code too |
|
Date: |
Sun, 28 Sep 2008 14:33:00 +0000 |
Revision: 18958
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18958
Author: skwashd
Date: 2008-09-28 14:33:00 +0000 (Sun, 28 Sep 2008)
Log Message:
-----------
update headers and clean up some code too
Modified Paths:
--------------
core/trunk/calendar/inc/class.boalarm.inc.php
core/trunk/calendar/inc/class.bocalendar.inc.php
core/trunk/calendar/inc/class.bocustom_fields.inc.php
core/trunk/calendar/inc/class.boholiday.inc.php
core/trunk/calendar/inc/class.boicalendar.inc.php
core/trunk/calendar/inc/class.calendar_holiday.inc.php
core/trunk/calendar/inc/class.calendar_icap.inc.php
core/trunk/calendar/inc/class.holidaycalc.inc.php
core/trunk/calendar/inc/class.holidaycalc_JP.inc.php
core/trunk/calendar/inc/class.holidaycalc_US.inc.php
core/trunk/calendar/inc/class.html.inc.php
core/trunk/calendar/inc/class.ipc_calendar.inc.php
core/trunk/calendar/inc/class.menu.inc.php
core/trunk/calendar/inc/class.socalendar.inc.php
core/trunk/calendar/inc/class.socalendar_.inc.php
core/trunk/calendar/inc/class.socalendar__.inc.php
core/trunk/calendar/inc/class.socalendar_sql.inc.php
core/trunk/calendar/inc/class.soholiday.inc.php
core/trunk/calendar/inc/class.uialarm.inc.php
core/trunk/calendar/inc/class.uicalendar.inc.php
core/trunk/calendar/inc/class.uicustom_fields.inc.php
core/trunk/calendar/inc/class.uiholiday.inc.php
core/trunk/calendar/inc/class.uiicalendar.inc.php
Modified: core/trunk/calendar/inc/class.boalarm.inc.php
===================================================================
--- core/trunk/calendar/inc/class.boalarm.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.boalarm.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -1,19 +1,33 @@
<?php
- /**************************************************************************\
- * 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. *
- \**************************************************************************/
+ /**
+ * Javascript support class
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Mark Peters <address@hidden>
+ * @author Craig Knudsen <address@hidden>
+ * @internal Based on WebCalender by Craig Knudsen
http://www.radix.net/~cknudsen
+ * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
phpgw::import_class('phpgwapi.datetime');
define('PHPGW_ACL_DELETEALARM',PHPGW_ACL_DELETE); // for now
@@ -209,4 +223,3 @@
return $deleted;
}
}
-?>
Modified: core/trunk/calendar/inc/class.bocalendar.inc.php
===================================================================
--- core/trunk/calendar/inc/class.bocalendar.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.bocalendar.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -1,19 +1,33 @@
<?php
- /**************************************************************************\
- * 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. *
- \**************************************************************************/
+ /**
+ * Calendar Business Logic
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Mark Peters <address@hidden>
+ * @author Craig Knudsen <address@hidden>
+ * @internal Based on WebCalender by Craig Knudsen
http://www.radix.net/~cknudsen
+ * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
phpgw::import_class('phpgwapi.datetime');
class calendar_bocalendar
Modified: core/trunk/calendar/inc/class.bocustom_fields.inc.php
===================================================================
--- core/trunk/calendar/inc/class.bocustom_fields.inc.php 2008-09-28
13:44:27 UTC (rev 18957)
+++ core/trunk/calendar/inc/class.bocustom_fields.inc.php 2008-09-28
14:33:00 UTC (rev 18958)
@@ -1,17 +1,31 @@
<?php
- /**************************************************************************\
- * phpGroupWare - Calendar - Custom fields and sorting *
- * http://www.phpgroupware.org *
- * Written 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. *
- \**************************************************************************/
+ /**
+ * Calendar - Custom Fields Logic
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Ralf Becker <address@hidden>
+ * @copyright Copyright (C) 2003-2008 Free Software Foundation, Inc
http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
class calendar_bocustom_fields
{
var $stock_fields = array
Modified: core/trunk/calendar/inc/class.boholiday.inc.php
===================================================================
--- core/trunk/calendar/inc/class.boholiday.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.boholiday.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -1,20 +1,34 @@
<?php
- /**************************************************************************\
- * 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. *
- \**************************************************************************/
+ /**
+ * Calendar - Holiday Logic
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Mark Peters <address@hidden>
+ * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
class calendar_boholiday
{
- var $public_functions = Array(
+ public $public_functions = Array(
'add' => True,
'delete_holiday' => True,
'delete_locale' => True,
@@ -26,24 +40,24 @@
'update_entry' => True
);
- var $debug = False;
- var $base_url = '/index.php';
+ public $debug = False;
+ public $base_url = '/index.php';
- var $ui;
- var $so;
- var $owner;
- var $year;
+ public $ui;
+ public $so;
+ public $owner;
+ public $year;
- var $id;
- var $total;
- var $start;
- var $query;
- var $sort;
+ public $id;
+ public $total;
+ public $start;
+ public $query;
+ public $sort;
- var $locales = array();
- var $holidays;
- var $cached_holidays;
- var $locale;
+ public $locales = array();
+ public $holidays;
+ public $cached_holidays;
+ public $locale;
public function __construct()
{
@@ -65,7 +79,7 @@
}
/* Begin Calendar functions */
- function read_entry($id=0)
+ public function read_entry($id=0)
{
if($this->debug)
{
@@ -87,7 +101,7 @@
return $this->so->read_holiday($id);
}
- function delete_holiday($id=0)
+ public function delete_holiday($id=0)
{
if(!$id)
{
@@ -109,7 +123,7 @@
}
}
- function delete_locale($locale='')
+ public function delete_locale($locale='')
{
if(!$locale)
{
@@ -127,7 +141,7 @@
$this->ui->admin();
}
- function accept_holiday()
+ public function accept_holiday()
{
$send_back_to =
str_replace('submitlocale','holiday_admin', phpgw::get_var('HTTP_REFERER',
'string', 'SERVER') );
if ( isset($this->locales[0]) &&
strlen($this->locales[0]) == 2 )
@@ -154,7 +168,7 @@
Header('Location: '.$send_back_to);
}
- function get_holiday_list($locale='', $sort='', $order='',
$query='', $total='', $year=0)
+ public function get_holiday_list($locale='', $sort='',
$order='', $query='', $total='', $year=0)
{
$locale = ($locale?$locale:$this->locales[0]);
$sort = ($sort?$sort:$this->sort);
@@ -164,7 +178,7 @@
return
$this->so->read_holidays($locale,$query,$order,$year);
}
- function get_locale_list($sort='', $order='', $query='')
+ public function get_locale_list($sort='', $order='', $query='')
{
$sort = ($sort?$sort:$this->sort);
$order = ($order?$order:$this->order);
@@ -172,7 +186,7 @@
return $this->so->get_locale_list($sort,$order,$query);
}
- function prepare_read_holidays($year=0,$owner=0)
+ public function prepare_read_holidays($year=0,$owner=0)
{
$this->year = (isset($year) && $year >
0?$year:$GLOBALS['phpgw']->common->show_date(time() -
phpgwapi_datetime::user_timezone(), 'Y'));
$this->owner =
($owner?$owner:$GLOBALS['phpgw_info']['user']['account_id']);
@@ -221,7 +235,7 @@
}
}
- function auto_load_holidays($locale)
+ public function auto_load_holidays($locale)
{
if($this->so->holiday_total($locale) == 0)
{
@@ -283,12 +297,12 @@
}
}
- function save_holiday($holiday)
+ public function save_holiday($holiday)
{
$this->so->save_holiday($holiday);
}
- function add()
+ public function add()
{
if ( phpgw::get_var('submit', 'bool') )
{
@@ -346,7 +360,7 @@
}
}
- function sort_holidays_by_date($holidays)
+ public function sort_holidays_by_date($holidays)
{
$c_holidays = count($holidays);
for($outer_loop=0;$outer_loop<($c_holidays -
1);$outer_loop++)
@@ -364,7 +378,7 @@
return $holidays;
}
- function set_holidays_to_date($holidays)
+ public function set_holidays_to_date($holidays)
{
$new_holidays = Array();
for($i=0;$i<count($holidays);$i++)
@@ -375,7 +389,7 @@
return $new_holidays;
}
- function read_holiday()
+ public function read_holiday()
{
if(isset($this->cached_holidays))
{
@@ -415,15 +429,15 @@
}
/* End Calendar functions */
- function check_admin()
+ public function check_admin()
{
- if(address@hidden'phpgw_info']['user']['apps']['admin'])
+ if (
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) )
{
Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php'));
}
}
- function rule_string($holiday)
+ public function rule_string($holiday)
{
if (!is_array($holiday))
{
@@ -453,4 +467,3 @@
return $str;
}
}
-?>
Modified: core/trunk/calendar/inc/class.boicalendar.inc.php
===================================================================
--- core/trunk/calendar/inc/class.boicalendar.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.boicalendar.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -3,13 +3,23 @@
* 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. *
\**************************************************************************/
+/*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
phpgw::import_class('phpgwapi.datetime');
@@ -4265,4 +4275,3 @@
}
}
}
-?>
Modified: core/trunk/calendar/inc/class.calendar_holiday.inc.php
===================================================================
--- core/trunk/calendar/inc/class.calendar_holiday.inc.php 2008-09-28
13:44:27 UTC (rev 18957)
+++ core/trunk/calendar/inc/class.calendar_holiday.inc.php 2008-09-28
14:33:00 UTC (rev 18958)
@@ -3,13 +3,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
class calendar_holiday
@@ -317,4 +327,3 @@
return $this->holidays[$id]['name'];
}
}
-?>
Modified: core/trunk/calendar/inc/class.calendar_icap.inc.php
===================================================================
--- core/trunk/calendar/inc/class.calendar_icap.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.calendar_icap.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -1,17 +1,31 @@
<?php
- /**************************************************************************\
- * 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. *
- \**************************************************************************/
+ /**
+ * Calendar - storage logic
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Mark Peters <address@hidden>
+ * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
phpgw::import_class('calendar.calendar__');
class calendar_calendar_ extends calendar_calendar__
Modified: core/trunk/calendar/inc/class.holidaycalc.inc.php
===================================================================
--- core/trunk/calendar/inc/class.holidaycalc.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.holidaycalc.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -1,18 +1,31 @@
-<?php
- /**************************************************************************\
- * 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. *
- \**************************************************************************/
+<?php
+ /**
+ * Calendar - Localised Holidays Include Handler
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Yoshihiro Kamimura <address@hidden> - http://www.itheart.com
+ * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
if (
!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
||
strlen($GLOBALS['phpgw_info']['user']['preferences']['common']['country']) <> 2
)
{
Modified: core/trunk/calendar/inc/class.holidaycalc_JP.inc.php
===================================================================
--- core/trunk/calendar/inc/class.holidaycalc_JP.inc.php 2008-09-28
13:44:27 UTC (rev 18957)
+++ core/trunk/calendar/inc/class.holidaycalc_JP.inc.php 2008-09-28
14:33:00 UTC (rev 18958)
@@ -1,18 +1,31 @@
-<?php
- /**************************************************************************\
- * 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. *
- \**************************************************************************/
+<?php
+ /**
+ * Calendar - Localised Holidays Logic - Japan
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Yoshihiro Kamimura <address@hidden> - http://www.itheart.com
+ * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
phpgw::import_class('phpgwapi.datetime');
class calendar_holidaycalc
@@ -153,4 +166,3 @@
return $date;
}
}
-?>
Modified: core/trunk/calendar/inc/class.holidaycalc_US.inc.php
===================================================================
--- core/trunk/calendar/inc/class.holidaycalc_US.inc.php 2008-09-28
13:44:27 UTC (rev 18957)
+++ core/trunk/calendar/inc/class.holidaycalc_US.inc.php 2008-09-28
14:33:00 UTC (rev 18958)
@@ -1,18 +1,31 @@
-<?php
- /**************************************************************************\
- * 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. *
- \**************************************************************************/
+<?php
+ /**
+ * Calendar - Localised Holidays Logic - United States
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Yoshihiro Kamimura <address@hidden> - http://www.itheart.com
+ * @copyright Portions Copyright (C) 2003-2008 Free Software Foundation,
Inc http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
phpgw::import_class('phpgwapi.datetime');
class calendar_holidaycalc
Modified: core/trunk/calendar/inc/class.html.inc.php
===================================================================
--- core/trunk/calendar/inc/class.html.inc.php 2008-09-28 13:44:27 UTC (rev
18957)
+++ core/trunk/calendar/inc/class.html.inc.php 2008-09-28 14:33:00 UTC (rev
18958)
@@ -1,26 +1,40 @@
<?php
-
/**************************************************************************\
- * phpGroupWare - HTML creation class
*
- * http://www.phpgroupware.org
*
- * Written 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.
*
-
\**************************************************************************/
+ /**
+ * Calendar - HTML Builder
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Ralf Becker <address@hidden>
+ * @copyright Copyright (C) 2003-2008 Free Software Foundation, Inc
http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
- /* $Id$ */
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
class calendar_html
{
- var $user_agent;
- var $ua_version;
+ public $user_agent;
+ public $ua_version;
/**
* @constructor
*/
- function __construct()
+ public function __construct()
{
//This should really be handled in API browser class - not the
html class
if ( preg_match('/compatible; ([a-z_]+)[/ ]+([0-9.]+)/i',
phpgw::get_var('HTTP_USER_AGENT', 'string', 'SERVER'), $parts))
@@ -35,7 +49,7 @@
/**
* Function: Allows to show and select one item from an array
- * Parameters: $name string with name of the
submitted var which holds the key of the selected item form array
+ * Parameters: $name string with name of the
submitted public which holds the key of the selected item form array
* $key key(s)
of already selected item(s) from $arr, eg. '1' or '1,2' or array with keys
* $arr array
with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' =>
'maybe');
* $no_lang if
!$no_lang send items through lang()
@@ -43,7 +57,7 @@
* On submit $XXX is the key of the selected item
(XXX is the content of $name)
* Returns: string to set for a template or to echo
into html page
*/
- function select($name, $key, $arr=0,$no_lang=0,$options='',$multiple=0)
+ public function select($name, $key,
$arr=0,$no_lang=0,$options='',$multiple=0)
{
// should be in class common.sbox
if (!is_array($arr))
@@ -86,7 +100,7 @@
* @paeam string $options the html options of the div
* @returns string DIV element
*/
- function div($content,$options='')
+ public function div($content,$options='')
{
return "<div $options>\n$content</div>\n";
}
@@ -99,7 +113,7 @@
* @param bool $ignore_empty should empty values be ignored?
* @return string hidden form element
*/
- function input_hidden($vars,$value='',$ignore_empty=True)
+ public function input_hidden($vars,$value='',$ignore_empty=True)
{
$html = '';
if (!is_array($vars))
@@ -128,7 +142,7 @@
* @param string optios the html options of the textarea
* @returns string textarea element
*/
- function textarea($name,$value='',$options='' )
+ public function textarea($name,$value='',$options='' )
{
return "<textarea name=\"$name\"
$options>".htmlspecialchars($value)."</textarea>\n";
}
@@ -142,7 +156,7 @@
* @param string options the html options of the input element
* @returns string form input element
*/
- function input($name, $value = '', $type = 'text', $options = '')
+ public function input($name, $value = '', $type = 'text', $options = '')
{
if ( strlen($type) )
{
@@ -155,7 +169,7 @@
return "<input $type name=\"$name\"
value=\"".htmlspecialchars($value)."\" $options>\n";
}
- function submit_button($name, $lang, $onClick='', $no_lang=0,
$options='', $image='', $app='')
+ public function submit_button($name, $lang, $onClick='', $no_lang=0,
$options='', $image='', $app='')
{
if ($image != '')
{
@@ -206,7 +220,7 @@
* =
'http://domain/phpgw-path/index.php?menuaction=infolog.uiinfolog.get_list&info_id=123'
* @return string absolute URI ( parsed by $GLOBALS['phpgw']->link )
*/
- function link($uri, $vars='')
+ public function link($uri, $vars='')
{
if (!is_array($vars))
{
@@ -215,12 +229,12 @@
return $GLOBALS['phpgw']->link($uri, $vars);
}
- function checkbox($name,$value='')
+ public function checkbox($name,$value='')
{
return "<input type=\"checkbox\" name=\"$name\" value=\"True\""
.($value ? ' checked="checked"' : '') . ">\n";
}
- function
form($content,$hidden_vars,$url,$url_vars='',$name='',$options='',$method='POST')
+ public function
form($content,$hidden_vars,$url,$url_vars='',$name='',$options='',$method='POST')
{
$html = "<form method=\"$method\" ".($name != '' ?
"name=\"$name\" " : '')."action=\"".$this->link($url,$url_vars)."\"
$options>\n";
$html .= $this->input_hidden($hidden_vars);
@@ -233,7 +247,7 @@
return $html;
}
- function
form_1button($name,$lang,$hidden_vars,$url,$url_vars='',$form_name='',$method='POST')
+ public function
form_1button($name,$lang,$hidden_vars,$url,$url_vars='',$form_name='',$method='POST')
{
return $this->form($this->submit_button($name,$lang),
$hidden_vars,$url,$url_vars,$form_name,'',$method);
@@ -250,7 +264,7 @@
* table($rows,'WIDTH="100%"') = '<table WIDTH="100%"><tr><td
colspan=3>cell1</td><td>cell2</td><td width="10%">cell3</td></tr></table>'
* @return string with html-code of the table
*/
- function table($rows,$options = '',$no_table_tr=False)
+ public function table($rows,$options = '',$no_table_tr=False)
{
$html = $no_table_tr ? '' : "<table $options>\n";
@@ -290,7 +304,7 @@
return $html;
}
- function sbox_submit( $sbox,$no_script=0 )
+ public function sbox_submit( $sbox,$no_script=0 )
{
$html = str_replace('<select','<select
onChange="this.form.submit()" ',
$sbox);
@@ -301,7 +315,7 @@
return $html;
}
- function image( $app,$name,$title='',$options='' )
+ public function image( $app,$name,$title='',$options='' )
{
if (strstr($name,'.') === False)
{
@@ -322,7 +336,7 @@
return "<img src=\"$path\" $options />";
}
- function a_href( $content,$url,$vars='',$options='')
+ public function a_href( $content,$url,$vars='',$options='')
{
if (!strstr($url,'/') && count(explode('.',$url)) == 3)
{
@@ -336,18 +350,18 @@
return '<a href="'.$this->link($url,$vars).'"
'.$options.'>'.$content.'</a>';
}
- function bold($content)
+ public function bold($content)
{
return "<strong>{$content}</strong>";
}
- function italic($content)
+ public function italic($content)
{
return "<em>{$content}</em>";
}
//FIXME Deprecated Tag! use div with hr class? 1px high and
$width wide? - skwashd nov2005
- function hr($width,$options='')
+ public function hr($width,$options='')
{
if ($width)
{
@@ -365,7 +379,7 @@
* formatOptions('100%,,1','WIDTH,HEIGHT,BORDER') = ' WIDTH="100%"
BORDER="1"'
* @return option string
*/
- function formatOptions($options, $names)
+ public function formatOptions($options, $names)
{
if (!is_array($options))
{
@@ -389,7 +403,7 @@
*
* @return the classes 'th' = nextmatch header, 'row_on'+'row_off' =
alternating rows
*/
- function themeStyles()
+ public function themeStyles()
{
return $this->style($this->theme2css());
}
@@ -402,7 +416,7 @@
*
* @return the classes 'th' = nextmatch header, 'row_on'+'row_off' =
alternating rows
*/
- function theme2css()
+ public function theme2css()
{
return
".th { background-color:
{$GLOBALS['phpgw_info']['theme']['th_bg']}; font-weight: bold; }\n".
@@ -416,7 +430,7 @@
* @param string $styles the styles to be contained within the style tag
* @returns a html style tag
*/
- function style($styles)
+ public function style($styles)
{
return $styles ? "<style
type=\"text/css\">\n<!--\n$styles\n-->\n</style>" : '';
}
@@ -431,7 +445,7 @@
* @param string $options the html options for the label
* @return string the label as html
*/
- function label($content, $id, $accesskey='', $options='')
+ public function label($content, $id, $accesskey='', $options='')
{
$id = " for=\"$id\"";
if ($accesskey != '')
Modified: core/trunk/calendar/inc/class.ipc_calendar.inc.php
===================================================================
--- core/trunk/calendar/inc/class.ipc_calendar.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.ipc_calendar.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -10,6 +10,21 @@
* @version $id$
*/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
phpgw::import_class('phpgwapi.ipc_');
/**
@@ -27,7 +42,7 @@
*
* @access public
*/
- function ipc_calendar()
+ public function ipc_calendar()
{
$this->bocalendar = CreateObject('calendar.bocalendar');
}
@@ -42,7 +57,7 @@
* @return mixed ID of the added data or false on failure or
wrong
* type.
*/
- function addData($data, $type)
+ public function addData($data, $type)
{
$data_internal = $this->convertData($data, $type,
'application/x-phpgw-calendar');
@@ -66,7 +81,7 @@
* passed mime type, false if no data exists for
the
* passed id.
*/
- function getData($id, $type)
+ public function getData($id, $type)
{
$internal_data = $this->bocalendar->read_entry($id);
@@ -89,7 +104,7 @@
* all data IDs.
* @return array List of data IDs.
*/
- function getIdList($time = -1)
+ public function getIdList($time = -1)
{
return $this->bocalendar->list_events(
0, 0, 0,
@@ -103,7 +118,7 @@
* @param $id ID of data to remove from the application.
* @return boolean True if the data is removed, otherwise false.
*/
- function removeData($id)
+ public function removeData($id)
{
$exists = $this->existData($id);
@@ -124,7 +139,7 @@
* @param $type Specifies the mime type of the passed data.
* @return boolean True if the data is replaced, otherwise
false.
*/
- function replaceData($id, $data, $type)
+ public function replaceData($id, $data, $type)
{
$internal_data = $this->convertData($data, $type,
'application/x-phpgw-calendar');
@@ -152,7 +167,7 @@
* @param $id ID to check
* @return boolean True if the data with id exist, otherwise
false
*/
- function existData($id)
+ public function existData($id)
{
return $this->bocalendar->exists($id);
}
@@ -166,7 +181,7 @@
* @return mixed The converted data in the format specified
by
* $to_type.
*/
- function convertData($data, $from_type, $to_type)
+ public function convertData($data, $from_type, $to_type)
{
// http://www.ietf.org/rfc/rfc2445.txt
@@ -215,7 +230,7 @@
* @param $data string Internal array structure of a calendar
event.
* @return array The calendar event in iCalendar format.
*/
- function convertICalToInternal($data)
+ public function convertICalToInternal($data)
{
$ical = CreateObject('phpgwapi.icalendar', array());
@@ -288,7 +303,7 @@
* @param $data array Internal array structure of a calendar
event.
* @return string The calendar event in iCalendar format.
*/
- function convertInternalToICal($internal_data)
+ public function convertInternalToICal($internal_data)
{
// @todo alarm, modtime
@@ -312,4 +327,3 @@
))->render();
}
}
-?>
Modified: core/trunk/calendar/inc/class.menu.inc.php
===================================================================
--- core/trunk/calendar/inc/class.menu.inc.php 2008-09-28 13:44:27 UTC (rev
18957)
+++ core/trunk/calendar/inc/class.menu.inc.php 2008-09-28 14:33:00 UTC (rev
18958)
@@ -3,7 +3,7 @@
* Calendar - Menus
*
* @author Dave Hall <address@hidden>
- * @copyright Copyright (C) 2007 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Copyright (C) 2007 - 2008 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.menu.inc.php 727 2008-02-08 04:13:28Z dave $
@@ -37,7 +37,7 @@
*
* @return array available menus for the current user
*/
- function get_menu()
+ public function get_menu()
{
$menus = array();
Modified: core/trunk/calendar/inc/class.socalendar.inc.php
===================================================================
--- core/trunk/calendar/inc/class.socalendar.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.socalendar.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -5,13 +5,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
phpgw::import_class('phpgwapi.datetime');
Modified: core/trunk/calendar/inc/class.socalendar_.inc.php
===================================================================
--- core/trunk/calendar/inc/class.socalendar_.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.socalendar_.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -5,28 +5,23 @@
* 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$ */
+ /*
+ 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 3 of the License, or
+ (at your option) any later version.
- /* I think this can go - skwashd Nov 2007
- if( isset($GLOBALS['phpgw_info']['server']['calendar_type'])
- && $GLOBALS['phpgw_info']['server']['calendar_type'] == 'mcal'
- && !extension_loaded('mcal') )
- {
- $GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
- }
- else
- {
- $GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
- }
- */
+ 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, see <http://www.gnu.org/licenses/>.
+ */
+
$GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
phpgw::import_class('calendar.socalendar__');
Modified: core/trunk/calendar/inc/class.socalendar__.inc.php
===================================================================
--- core/trunk/calendar/inc/class.socalendar__.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.socalendar__.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -5,13 +5,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
if ( !extension_loaded('mcal') )
Modified: core/trunk/calendar/inc/class.socalendar_sql.inc.php
===================================================================
--- core/trunk/calendar/inc/class.socalendar_sql.inc.php 2008-09-28
13:44:27 UTC (rev 18957)
+++ core/trunk/calendar/inc/class.socalendar_sql.inc.php 2008-09-28
14:33:00 UTC (rev 18958)
@@ -5,13 +5,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
phpgw::import_class('phpgwapi.datetime');
Modified: core/trunk/calendar/inc/class.soholiday.inc.php
===================================================================
--- core/trunk/calendar/inc/class.soholiday.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.soholiday.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -3,13 +3,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
class calendar_soholiday
Modified: core/trunk/calendar/inc/class.uialarm.inc.php
===================================================================
--- core/trunk/calendar/inc/class.uialarm.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.uialarm.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -5,13 +5,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
phpgw::import_class('phpgwapi.datetime');
Modified: core/trunk/calendar/inc/class.uicalendar.inc.php
===================================================================
--- core/trunk/calendar/inc/class.uicalendar.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.uicalendar.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -5,13 +5,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
/*
Modified: core/trunk/calendar/inc/class.uicustom_fields.inc.php
===================================================================
--- core/trunk/calendar/inc/class.uicustom_fields.inc.php 2008-09-28
13:44:27 UTC (rev 18957)
+++ core/trunk/calendar/inc/class.uicustom_fields.inc.php 2008-09-28
14:33:00 UTC (rev 18958)
@@ -3,13 +3,23 @@
* phpGroupWare - Calendar - Custom fields and sorting *
* http://www.phpgroupware.org *
* Written 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
phpgw::import_class('calendar.bocustom_fields');
Modified: core/trunk/calendar/inc/class.uiholiday.inc.php
===================================================================
--- core/trunk/calendar/inc/class.uiholiday.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.uiholiday.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -5,13 +5,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
class calendar_uiholiday
Modified: core/trunk/calendar/inc/class.uiicalendar.inc.php
===================================================================
--- core/trunk/calendar/inc/class.uiicalendar.inc.php 2008-09-28 13:44:27 UTC
(rev 18957)
+++ core/trunk/calendar/inc/class.uiicalendar.inc.php 2008-09-28 14:33:00 UTC
(rev 18958)
@@ -5,13 +5,23 @@
* 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. *
\**************************************************************************/
+ /*
+ 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 3 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* $Id$ */
class calendar_uiicalendar
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [18958] update headers and clean up some code too,
Dave Hall <=