[geeklog-cvs] geeklog: Updated version numbers

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Wed Jan 7 03:53:35 EST 2009


details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/706481908635
changeset: 6664:706481908635
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Jan 06 16:10:40 2009 +0100
description:
Updated version numbers

diffstat:

16 files changed, 68 insertions(+), 53 deletions(-)
plugins/calendar/functions.inc                    |    6 ++----
plugins/links/functions.inc                       |    6 ++----
plugins/polls/functions.inc                       |    6 ++----
plugins/spamx/functions.inc                       |    5 ++---
plugins/staticpages/functions.inc                 |    6 ++----
public_html/admin/install/index.php               |   18 +++++++++++++-----
public_html/admin/plugins/calendar/install.php    |    6 ++----
public_html/admin/plugins/links/install.php       |    6 ++----
public_html/admin/plugins/polls/install.php       |    6 ++----
public_html/admin/plugins/spamx/install.php       |    2 +-
public_html/admin/plugins/staticpages/install.php |    6 ++----
public_html/siteconfig.php.dist                   |    4 ++--
sql/mssql_tableanddata.php                        |   10 +++++-----
sql/mysql_tableanddata.php                        |   10 +++++-----
sql/updates/mssql_1.5.1_to_1.5.2.php              |   12 ++++++++++++
sql/updates/mysql_1.5.1_to_1.5.2.php              |   12 ++++++++++++

diffs (truncated from 442 to 300 lines):

diff -r 6e9a1e838996 -r 706481908635 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Tue Jan 06 13:32:02 2009 +0100
+++ b/plugins/calendar/functions.inc	Tue Jan 06 16:10:40 2009 +0100
@@ -10,7 +10,7 @@
 // | API method and 2) implements all the common code needed by the CAlendar   |
 // | plugin' PHP files.                                                        |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
@@ -33,8 +33,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.95 2008/09/21 08:37:07 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
@@ -59,7 +57,7 @@
     $_CA_CONF = $ca_config->get_config('calendar');
 }
 
-$_CA_CONF['version'] = '1.0.2';
+$_CA_CONF['version'] = '1.0.3';
 
 // +---------------------------------------------------------------------------+
 // | Geeklog Plugin API Implementations                                        |
diff -r 6e9a1e838996 -r 706481908635 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Tue Jan 06 13:32:02 2009 +0100
+++ b/plugins/links/functions.inc	Tue Jan 06 16:10:40 2009 +0100
@@ -10,7 +10,7 @@
 // | API method and 2) implements all the common code needed by the Links      |
 // | Plugins' PHP files.                                                       |
 // +---------------------------------------------------------------------------+
-// | 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.sourceforge DOT net       |
@@ -35,8 +35,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.111 2008/09/21 08:37:08 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
@@ -61,7 +59,7 @@
     $_LI_CONF = $li_config->get_config('links');
 }
 
-$_LI_CONF['version'] = '2.0.0';
+$_LI_CONF['version'] = '2.0.1';
 
 // +---------------------------------------------------------------------------+
 // | Geeklog Plugin API Implementation                                         |
diff -r 6e9a1e838996 -r 706481908635 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Tue Jan 06 13:32:02 2009 +0100
+++ b/plugins/polls/functions.inc	Tue Jan 06 16:10:40 2009 +0100
@@ -10,7 +10,7 @@
 // | API method and 2) implements all the common code needed by the Polls      |
 // | plugin' PHP files.                                                        |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
@@ -33,8 +33,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.92 2008/09/21 08:37:08 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
@@ -59,7 +57,7 @@
     $_PO_CONF = $po_config->get_config('polls');
 }
 
-$_PO_CONF['version'] = '2.0.1';
+$_PO_CONF['version'] = '2.0.2';
 
 // +---------------------------------------------------------------------------+
 // | Geeklog Plugin API Implementations                                        |
diff -r 6e9a1e838996 -r 706481908635 plugins/spamx/functions.inc
--- a/plugins/spamx/functions.inc	Tue Jan 06 13:32:02 2009 +0100
+++ b/plugins/spamx/functions.inc	Tue Jan 06 16:10:40 2009 +0100
@@ -4,13 +4,12 @@
  * File: functions.inc
  * This is the functions.inc for the Geeklog Spam-X plugin
  *
- * Copyright (C) 2004-2008 by the following authors:
+ * Copyright (C) 2004-2009 by the following authors:
  * Authors      Tom Willett     tomw AT pigstye DOT net
  *              Dirk Haun       dirk AT haun-online DOT de
  *
  * Licensed under GNU General Public License
  *
- * $Id: functions.inc,v 1.37 2008/09/21 08:37:08 dhaun Exp $
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
@@ -39,7 +38,7 @@
     $_SPX_CONF = $spx_config->get_config('spamx');
 }
 
-$_SPX_CONF['version'] = '1.1.1';
+$_SPX_CONF['version'] = '1.1.2';
 
 // +---------------------------------------------------------------------------+
 // | Geeklog Plugin API Implementations                                        |
diff -r 6e9a1e838996 -r 706481908635 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Tue Jan 06 13:32:02 2009 +0100
+++ b/plugins/staticpages/functions.inc	Tue Jan 06 16:10:40 2009 +0100
@@ -10,7 +10,7 @@
 // | API method and 2) implements all the common code needed by the Static     |
 // | Pages' PHP files.                                                         |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
@@ -33,8 +33,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.127 2008/09/21 08:37:08 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
@@ -59,7 +57,7 @@
     $_SP_CONF = $sp_config->get_config('staticpages');
 }
 
-$_SP_CONF['version'] = '1.5.0';
+$_SP_CONF['version'] = '1.5.1';
 
 // +---------------------------------------------------------------------------+
 // | Plugin API - Services                                                     |
diff -r 6e9a1e838996 -r 706481908635 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Tue Jan 06 13:32:02 2009 +0100
+++ b/public_html/admin/install/index.php	Tue Jan 06 16:10:40 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Geeklog installation script.                                              |
 // +---------------------------------------------------------------------------+
-// | 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    |
@@ -36,8 +36,6 @@
 // | You don't need to change anything in this file.                           |
 // | Please read docs/install.html which describes how to install Geeklog.     |
 // +---------------------------------------------------------------------------+
-//
-// $Id: index.php,v 1.55 2008/09/06 14:46:24 dhaun Exp $
 
 // this should help expose parse errors even when
 // display_errors is set to Off in php.ini
@@ -50,7 +48,7 @@
     define("LB", "\n");
 }
 if (!defined('VERSION')) {
-    define('VERSION', '1.5.1');
+    define('VERSION', '1.5.2');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
@@ -588,7 +586,7 @@
                                           . '<p>' . $LANG_INSTALL[91] . '</p>';
                             } else {
 
-                                $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0');
+                                $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0','1.5.1');
                                 if (empty($curv)) {
                                     // If we were unable to determine the current GL
                                     // version is then ask the user what it is
@@ -944,6 +942,7 @@
 
     case 'mysql':
         $test = array(
+            '1.5.2'  => array("SELECT value FROM {$_TABLES['vars']} WHERE name = 'database_version'", '1.5.2'),
             '1.5.1'  => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'),
             '1.5.0'  => array("DESCRIBE {$_TABLES['storysubmission']} bodytext",''),
             '1.4.1'  => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit'),
@@ -966,6 +965,7 @@
 
     case 'mssql':
 	    $test = array(
+            '1.5.2'  => array("SELECT value FROM {$_TABLES['vars']} WHERE name = 'database_version'", '1.5.2'),
             '1.5.1'  => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'),
             '1.5.0'  => array("SELECT c.name FROM syscolumns c JOIN sysobjects o ON o.id = c.id WHERE c.name='bodytext' AND o.name='{$_TABLES['storysubmission']}'",'bodytext'),
             '1.4.1'  => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit')
@@ -1643,6 +1643,14 @@
             $_SQL = '';
             break;
 
+        case '1.5.1':
+            require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.5.1_to_1.5.2.php';
+            INST_updateDB($_SQL);
+
+            $current_gl_version = '1.5.2';
+            $_SQL = '';
+            break;
+
         default:
             $done = true;
         }
diff -r 6e9a1e838996 -r 706481908635 public_html/admin/plugins/calendar/install.php
--- a/public_html/admin/plugins/calendar/install.php	Tue Jan 06 13:32:02 2009 +0100
+++ b/public_html/admin/plugins/calendar/install.php	Tue Jan 06 16:10:40 2009 +0100
@@ -11,7 +11,7 @@
 // +---------------------------------------------------------------------------+
 // | Based on the Universal Plugin and prior work by the following authors:    |
 // |                                                                           |
-// | Copyright (C) 2002-2008 by the following authors:                         |
+// | Copyright (C) 2002-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Tom Willett       - tom AT pigstye DOT net                       |
@@ -35,8 +35,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: install.php,v 1.15 2008/05/23 13:36:12 dhaun Exp $
 
 require_once '../../../lib-common.php';
 
@@ -46,7 +44,7 @@
 //
 $pi_display_name = 'Calendar';
 $pi_name         = 'calendar';
-$pi_version      = '1.0.2';
+$pi_version      = '1.0.3';
 $gl_version      = '1.5.0';
 $pi_url          = 'http://www.geeklog.net/';
 
diff -r 6e9a1e838996 -r 706481908635 public_html/admin/plugins/links/install.php
--- a/public_html/admin/plugins/links/install.php	Tue Jan 06 13:32:02 2009 +0100
+++ b/public_html/admin/plugins/links/install.php	Tue Jan 06 16:10:40 2009 +0100
@@ -11,7 +11,7 @@
 // +---------------------------------------------------------------------------+
 // | Based on the Universal Plugin and prior work by the following authors:    |
 // |                                                                           |
-// | Copyright (C) 2002-2008 by the following authors:                         |
+// | Copyright (C) 2002-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs         - tony AT tonybibbs DOT com                   |
 // |          Tom Willett        - tom AT pigstye DOT net                      |
@@ -37,8 +37,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: install.php,v 1.26 2008/05/23 13:36:12 dhaun Exp $
 
 require_once '../../../lib-common.php';
 
@@ -48,7 +46,7 @@
 //
 $pi_display_name = 'Links';
 $pi_name         = 'links';
-$pi_version      = '2.0.0';
+$pi_version      = '2.0.1';
 $gl_version      = '1.5.0';
 $pi_url          = 'http://www.geeklog.net/';
 
diff -r 6e9a1e838996 -r 706481908635 public_html/admin/plugins/polls/install.php
--- a/public_html/admin/plugins/polls/install.php	Tue Jan 06 13:32:02 2009 +0100
+++ b/public_html/admin/plugins/polls/install.php	Tue Jan 06 16:10:40 2009 +0100
@@ -11,7 +11,7 @@
 // +---------------------------------------------------------------------------+
 // | Based on the Universal Plugin and prior work by the following authors:    |
 // |                                                                           |
-// | Copyright (C) 2002-2008 by the following authors:                         |
+// | Copyright (C) 2002-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Tom Willett       - tom AT pigstye DOT net                       |
@@ -35,8 +35,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: install.php,v 1.24 2008/05/23 13:36:12 dhaun Exp $
 
 require_once '../../../lib-common.php';
 
@@ -46,7 +44,7 @@
 //



More information about the geeklog-cvs mailing list