[geeklog-cvs] geeklog: Remove the (unused) in_transit flag from the Calendar p...

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Sun Jan 25 05:10:36 EST 2009


details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0db6fc3bf268
changeset: 6720:0db6fc3bf268
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jan 25 10:14:11 2009 +0100
description:
Remove the (unused) in_transit flag from the Calendar plugin

diffstat:

5 files changed, 3 insertions(+), 101 deletions(-)
plugins/calendar/functions.inc         |   24 --------------------
plugins/calendar/sql/mssql_install.php |    3 --
plugins/calendar/sql/mssql_updates.php |   37 --------------------------------
plugins/calendar/sql/mysql_install.php |    3 --
plugins/calendar/sql/mysql_updates.php |   37 --------------------------------

diffs (163 lines):

diff -r b75043713337 -r 0db6fc3bf268 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Jan 25 09:28:56 2009 +0100
+++ b/plugins/calendar/functions.inc	Sun Jan 25 10:14:11 2009 +0100
@@ -1435,7 +1435,7 @@
 */
 function plugin_upgrade_calendar()
 {
-    global $_CONF, $_TABLES, $_DB_dbms;
+    global $_CONF, $_TABLES;
 
     $installed_version = DB_getItem($_TABLES['plugins'], 'pi_version',
                                     "pi_name = 'calendar'");
@@ -1453,28 +1453,6 @@
 
     $inst_parms = plugin_autoinstall_calendar('calendar');
     $pi_gl_version = $inst_parms['info']['pi_gl_version'];
-
-    require_once $_CONF['path'] . 'plugins/calendar/sql/'
-                                . $_DB_dbms . '_updates.php';
-
-    $current_version = $installed_version;
-    $done = false;
-    while (! $done) {
-        switch ($current_version) {
-        case '1.0.2':
-            if (isset($_UPDATES[$current_version])) {
-                $_SQL = $_UPDATES[$current_version];
-                foreach ($_SQL as $sql) {
-                    DB_query($sql);
-                }
-            }
-            $current_version = '1.1.0';
-            break;
-
-        default:
-            $done = true;
-        }
-    }
 
     DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'calendar'");
 
diff -r b75043713337 -r 0db6fc3bf268 plugins/calendar/sql/mssql_install.php
--- a/plugins/calendar/sql/mssql_install.php	Sun Jan 25 09:28:56 2009 +0100
+++ b/plugins/calendar/sql/mssql_install.php	Sun Jan 25 10:14:11 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | mssql_install.php                                                         |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -57,7 +57,6 @@
     [location] [varchar] (128) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
     [timestart] [varchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
     [timeend] [varchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-    [in_transit] [tinyint] NULL
 ) ON [PRIMARY]
 ";
 
diff -r b75043713337 -r 0db6fc3bf268 plugins/calendar/sql/mssql_updates.php
--- a/plugins/calendar/sql/mssql_updates.php	Sun Jan 25 09:28:56 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<?php
-
-/* Reminder: always indent with 4 spaces (no tabs). */
-// +---------------------------------------------------------------------------+
-// | Calendar Plugin 1.1                                                       |
-// +---------------------------------------------------------------------------+
-// | mssql_updates.php                                                         |
-// +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
-// |                                                                           |
-// | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
-// +---------------------------------------------------------------------------+
-// |                                                                           |
-// | This program is licensed under the terms of the GNU General Public License|
-// | as published by the Free Software Foundation; either version 2            |
-// | of the License, or (at your option) any later version.                    |
-// |                                                                           |
-// | This program is distributed in the hope that it will be useful,           |
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                      |
-// | See the GNU General Public License for more details.                      |
-// |                                                                           |
-// | You should have received a copy of the GNU General Public License         |
-// | along with this program; if not, write to the Free Software Foundation,   |
-// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
-// |                                                                           |
-// +---------------------------------------------------------------------------+
-
-$_UPDATES = array(
-
-    '1.0.2' => array(
-        "ALTER TABLE {$_TABLES['events']} ADD in_transit tinyint NULL"
-    )
-
-);
-
-?>
diff -r b75043713337 -r 0db6fc3bf268 plugins/calendar/sql/mysql_install.php
--- a/plugins/calendar/sql/mysql_install.php	Sun Jan 25 09:28:56 2009 +0100
+++ b/plugins/calendar/sql/mysql_install.php	Sun Jan 25 10:14:11 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | mysql_install.php                                                         |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -56,7 +56,6 @@
   location varchar(128) default NULL,
   timestart time default NULL,
   timeend time default NULL,
-  in_transit tinyint(1) unsigned default '0',
   INDEX events_eid(eid),
   INDEX events_event_type(event_type),
   INDEX events_datestart(datestart),
diff -r b75043713337 -r 0db6fc3bf268 plugins/calendar/sql/mysql_updates.php
--- a/plugins/calendar/sql/mysql_updates.php	Sun Jan 25 09:28:56 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<?php
-
-/* Reminder: always indent with 4 spaces (no tabs). */
-// +---------------------------------------------------------------------------+
-// | Calendar Plugin 1.1                                                       |
-// +---------------------------------------------------------------------------+
-// | mysql_updates.php                                                         |
-// +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
-// |                                                                           |
-// | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
-// +---------------------------------------------------------------------------+
-// |                                                                           |
-// | This program is licensed under the terms of the GNU General Public License|
-// | as published by the Free Software Foundation; either version 2            |
-// | of the License, or (at your option) any later version.                    |
-// |                                                                           |
-// | This program is distributed in the hope that it will be useful,           |
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                      |
-// | See the GNU General Public License for more details.                      |
-// |                                                                           |
-// | You should have received a copy of the GNU General Public License         |
-// | along with this program; if not, write to the Free Software Foundation,   |
-// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
-// |                                                                           |
-// +---------------------------------------------------------------------------+
-
-$_UPDATES = array(
-
-    '1.0.2' => array(
-        "ALTER TABLE {$_TABLES['events']} ADD in_transit tinyint(1) unsigned default '0' AFTER timeend"
-    )
-
-);
-
-?>



More information about the geeklog-cvs mailing list