[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar index.php,1.48 preferences.php,1.43
From: |
skwashd |
Subject: |
[Phpgroupware-cvs] calendar index.php,1.48 preferences.php,1.43 |
Date: |
Sun, 15 May 2005 07:48:00 +0200 |
Update of calendar
Modified Files:
Branch: MAIN
index.php lines: +14 -16
preferences.php lines: +11 -12
Log Message:
rollback unlawful header changes and get a usable base so I can merge in 16
changes
====================================================
Index: calendar/index.php
diff -u calendar/index.php:1.47 calendar/index.php:1.48
--- calendar/index.php:1.47 Wed May 11 11:38:06 2005
+++ calendar/index.php Sun May 15 05:48:34 2005
@@ -1,16 +1,18 @@
<?php
- /**
- * Calendar
- *
- * @author Craig Knudsen <address@hidden>
- * @author Mark Peters <address@hidden>
- * @copyright Copyright (C) xxxx Craig Knudsen
- * @copyright Copyright (C) 2000-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 ased 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$ */
$phpgw_flags = Array(
'currentapp' => 'calendar',
@@ -23,11 +25,7 @@
$GLOBALS['phpgw_info']['flags'] = $phpgw_flags;
- /**
- * Include phpgroupware header
- */
include('../header.inc.php');
-
if(!is_object($GLOBALS['phpgw']->datetime))
{
$GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
====================================================
Index: calendar/preferences.php
diff -u calendar/preferences.php:1.42 calendar/preferences.php:1.43
--- calendar/preferences.php:1.42 Wed May 11 11:38:06 2005
+++ calendar/preferences.php Sun May 15 05:48:34 2005
@@ -1,12 +1,15 @@
<?php
- /**
- * Calendar - preferences
- *
- * @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$
- */
+ /**************************************************************************\
+ * phpGroupWare - Calendar *
+ * http://www.phpgroupware.org *
+ * -------------------------------------------- *
+ * 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$ */
$phpgw_flags = Array(
'currentapp' => 'calendar',
@@ -18,10 +21,6 @@
);
$phpgw_info['flags'] = $phpgw_flags;
-
- /**
- * Include phpgroupware header
- */
include('../header.inc.php');
if ($submit)
- [Phpgroupware-cvs] calendar index.php,1.48 preferences.php,1.43, skwashd, 2005/05/16
- [Phpgroupware-cvs] calendar index.php,1.48 preferences.php,1.43,
skwashd <=
- [Phpgroupware-cvs] calendar index.php,1.48 preferences.php,1.43, skwashd, 2005/05/16
- [Phpgroupware-cvs] calendar index.php,1.48 preferences.php,1.43, skwashd, 2005/05/17
- Prev by Date:
[Phpgroupware-cvs] setup/tools versions.pl.txt,1.2
- Next by Date:
[Phpgroupware-cvs] tts index.php, 1.53 viewticket_details.php, 1.48 test.php, 1.3 admin.php, 1.4 newticket.php, 1.34
- Previous by thread:
[Phpgroupware-cvs] calendar index.php,1.48 preferences.php,1.43
- Next by thread:
[Phpgroupware-cvs] calendar index.php,1.48 preferences.php,1.43
- Index(es):