[Phpgroupware-cvs] calendar/setup tables_update.inc.php, 1.23 tables_current.inc.php, 1.15 tables_baseline.inc.php, 1.4 setup.inc.php, 1.27

[skwashd]

Update of calendar/setup

Modified Files:
     Branch: MAIN
            tables_update.inc.php lines: +12 -16
            tables_current.inc.php lines: +11 -9
            tables_baseline.inc.php lines: +11 -9
            setup.inc.php lines: +10 -9

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

====================================================
Index: calendar/setup/tables_update.inc.php
diff -u calendar/setup/tables_update.inc.php:1.22 
calendar/setup/tables_update.inc.php:1.23
--- calendar/setup/tables_update.inc.php:1.22   Wed May 11 11:38:06 2005
+++ calendar/setup/tables_update.inc.php        Sun May 15 05:48:35 2005
@@ -1,20 +1,16 @@
 <?php
-       /**
-       * Calendar - Setup
-       *
-       * @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 setup
-       * @version $Id$
-       */
-
-       /**
-       * Update from 0.9.2 to 0.9.3
-       *
-       * @param string $table Table name
-       * @param string $field Column name
-       */
+  /**************************************************************************\
+  * phpGroupWare - Setup                                                     *
+  * 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$ */
+
        function calendar_v0_9_2to0_9_3update_owner($table, $field)
        {
                $GLOBALS['phpgw_setup']->oProc->query("select distinct($field) 
from $table");

====================================================
Index: calendar/setup/tables_current.inc.php
diff -u calendar/setup/tables_current.inc.php:1.14 
calendar/setup/tables_current.inc.php:1.15
--- calendar/setup/tables_current.inc.php:1.14  Wed May 11 11:38:06 2005
+++ calendar/setup/tables_current.inc.php       Sun May 15 05:48:35 2005
@@ -1,13 +1,15 @@
 <?php
-       /**
-       * Calendar - Setup
-       *
-       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage setup
-       * @version $Id$
-       */
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * 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_baseline = array(
                'phpgw_cal' => array(

====================================================
Index: calendar/setup/tables_baseline.inc.php
diff -u calendar/setup/tables_baseline.inc.php:1.3 
calendar/setup/tables_baseline.inc.php:1.4
--- calendar/setup/tables_baseline.inc.php:1.3  Wed May 11 11:38:06 2005
+++ calendar/setup/tables_baseline.inc.php      Sun May 15 05:48:35 2005
@@ -1,13 +1,15 @@
 <?php
-       /**
-       * Calendar - Setup
-       *
-       * @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 setup
-       * @version $Id$
-       */
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * 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_baseline = array(
                "webcal_entry" => array(

====================================================
Index: calendar/setup/setup.inc.php
diff -u calendar/setup/setup.inc.php:1.26 calendar/setup/setup.inc.php:1.27
--- calendar/setup/setup.inc.php:1.26   Wed May 11 11:38:06 2005
+++ calendar/setup/setup.inc.php        Sun May 15 05:48:35 2005
@@ -1,14 +1,15 @@
 <?php
-       /**
-       * Calendar - Setup
-       *
-       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
-       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package calendar
-       * @subpackage setup
-       * @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$ */

        $setup_info['calendar']['name']    = 'calendar';
        $setup_info['calendar']['version'] = '0.9.13.007';