[geeklog-hg] geeklog: bring documentation and upgrades in line with the 1.8.2...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Dec 30 04:31:29 EST 2012
changeset 8901:709b3940e3e5
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/709b3940e3e5
user: Dirk Haun <dirk at haun-online.de>
date: Sun Dec 30 10:30:36 2012 +0100
description:
bring documentation and upgrades in line with the 1.8.2 release
diffstat:
public_html/admin/install/lib-upgrade.php | 7 +-
public_html/docs/english/changes.html | 12 ++
public_html/docs/english/install.html | 10 +-
public_html/docs/history | 23 ++++-
sql/updates/mssql_1.8.1_to_2.0.0.php | 146 ----------------------------
sql/updates/mssql_1.8.2_to_2.0.0.php | 146 ++++++++++++++++++++++++++++
sql/updates/mysql_1.8.1_to_2.0.0.php | 144 ----------------------------
sql/updates/mysql_1.8.2_to_2.0.0.php | 144 ++++++++++++++++++++++++++++
sql/updates/pgsql_1.8.1_to_2.0.0.php | 154 ------------------------------
sql/updates/pgsql_1.8.2_to_2.0.0.php | 154 ++++++++++++++++++++++++++++++
10 files changed, 487 insertions(+), 453 deletions(-)
diffs (truncated from 1025 to 300 lines):
diff -r 46371fbbb73e -r 709b3940e3e5 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php Fri Dec 21 16:25:45 2012 -0500
+++ b/public_html/admin/install/lib-upgrade.php Sun Dec 30 10:30:36 2012 +0100
@@ -479,10 +479,11 @@
break;
case '1.8.0':
- // there were no database changes in 1.8.0
+ case '1.8.1':
+ case '1.8.2':
+ // there were no database changes in 1.8.x
- case '1.8.1':
- require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.8.1_to_2.0.0.php';
+ require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.8.2_to_2.0.0.php';
INST_updateDB($_SQL);
update_ConfValuesFor200();
diff -r 46371fbbb73e -r 709b3940e3e5 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html Fri Dec 21 16:25:45 2012 -0500
+++ b/public_html/docs/english/changes.html Sun Dec 30 10:30:36 2012 +0100
@@ -53,6 +53,18 @@
</ul>
+<h2><a name="changes182">Geeklog 1.8.2</a></h2>
+
+<p>Geeklog 1.8.2 is a maintenance release. There were no changes in the database, the templates, or the language files in this release, so upgrades should be straightforward.</p>
+
+<h3>Bugfixes</h3>
+<ul>
+<li>Fixed compatibility with MySQL 5.5 (upgrade, database backup). For this fix, we also had to raise the minimum supported MySQL version to 4.1.2.</li>
+<li>Fixed Twitter OAuth login.</li>
+</ul>
+
+
+
<h2><a name="changes181">Geeklog 1.8.1</a></h2>
<p>Geeklog 1.8.1 is a maintenance release and a recommended update for all
diff -r 46371fbbb73e -r 709b3940e3e5 public_html/docs/english/install.html
--- a/public_html/docs/english/install.html Fri Dec 21 16:25:45 2012 -0500
+++ b/public_html/docs/english/install.html Sun Dec 30 10:30:36 2012 +0100
@@ -62,7 +62,7 @@
</li>
<li>
<p>Unpack the downloaded tarball file by running: </p>
- <p><code>tar -zxvf geeklog-1.8.0.tar.gz</code> </p>
+ <p><code>tar -zxvf geeklog-2.0.0.tar.gz</code> </p>
<p><strong>Note:</strong> Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try <a href="http://www.7-zip.org/">7-Zip</a> or <a href="http://www.rarlab.com/">WinRAR</a> if you must decompress the file locally.</p>
</li>
@@ -70,9 +70,9 @@
<p>Create a blank MySQL, PostgreSQL, or Microsoft SQL database and a user account with privileges to modify it. Your hosting provider may have already set up a database and account for you, contact them if you need assistance with this step.</p>
</li>
<li>
- <p>Place the contents of <code>geeklog-1.8.0/public_html/</code> into your web root directory on your web server. The web root directory is often named "public_html", "htdocs", or "www".</p>
+ <p>Place the contents of <code>geeklog-2.0.0/public_html/</code> into your web root directory on your web server. The web root directory is often named "public_html", "htdocs", or "www".</p>
- <p>Next, place the remaining contents of <code>geeklog-1.8.0/</code> into either the parent directory of your root web directory (recommended) or any other non public folder and the installation wizard will attempt to locate them automatically. If it cannot you will be asked to specify their paths during installation. This is done as a security measure to prevent access to Geeklog system files by Internet users. </p>
+ <p>Next, place the remaining contents of <code>geeklog-2.0.0/</code> into either the parent directory of your root web directory (recommended) or any other non public folder and the installation wizard will attempt to locate them automatically. If it cannot you will be asked to specify their paths during installation. This is done as a security measure to prevent access to Geeklog system files by Internet users. </p>
<p><strong>Note:</strong> If your hosting provider does not allow you to place files outside of your root web directory:</p>
<ul>
@@ -110,12 +110,12 @@
</li>
<li>
<p>Unpack the downloaded tarball file by running: </p>
- <p><code>tar -zxvf geeklog-1.8.0.tar.gz</code> </p>
+ <p><code>tar -zxvf geeklog-2.0.0.tar.gz</code> </p>
<p><strong>Note:</strong> Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try <a href="http://www.7-zip.org/">7-Zip</a> or <a href="http://www.rarlab.com/">WinRAR</a> if you must decompress the file locally.</p>
</li>
<li>
- <p>Place the contents of <code>geeklog-1.8.0/</code> into the same directory your old installation was located. For instance, if your old Geeklog was in <code>/usr/home/www/geeklog/</code>, then your new installation should also be in <code>/usr/home/www/geeklog/</code>.</p>
+ <p>Place the contents of <code>geeklog-2.0.0/</code> into the same directory your old installation was located. For instance, if your old Geeklog was in <code>/usr/home/www/geeklog/</code>, then your new installation should also be in <code>/usr/home/www/geeklog/</code>.</p>
</li>
<li>Depending on the version you're upgrading from:
<ul>
diff -r 46371fbbb73e -r 709b3940e3e5 public_html/docs/history
--- a/public_html/docs/history Fri Dec 21 16:25:45 2012 -0500
+++ b/public_html/docs/history Sun Dec 30 10:30:36 2012 +0100
@@ -1,8 +1,29 @@
Geeklog History/Changes:
-Sep ??, 2012 (2.0.0rc1)
+Dec 30, 2012 (1.8.2)
------------
+- A remote service user now bypasses current password check when account is
+ deleted (bug #0001417) [Tom]
+- Fixed Twitter OAuth login error after Twitter deactived some old URLs (bug
+ #0001497) [Tom]
+- $dbconfig_path was not escaped in the install script (bug #0001457, patch
+ provided by mystral-kk)
+- COM_stripslashes will now handle arrays; this was a problem during
+ re-authentication after a security token expired (bug #0001413) [suprsidr]
+- The comment count for a story could be wrong if there was a different object
+ with the same id and a comment (bug #0001414) [Tom]
+- Feeds with the full story text still had a '...' at the end (bug #0001431)
+ [Jeff Rivett, Tom]
+- Allow MIME type application/x-gzip-compressed when uploading a plugin for
+ installation (bug #0001405) [Dirk]
+- Fixed compatibility with MySQL 5.5 (bugs #0001410, #0001456). This also
+ raises the minimum supported MySQL version to 4.1.2 [Dirk, Tom]
+
+
+Oct 2, 2012 (2.0.0rc1)
+-----------
+
- You can create a new topic with the same id as another topic (bug #0001472)
[Tom]
- Feed Editor Field "Header-link in topic" Displays None and All Selections
diff -r 46371fbbb73e -r 709b3940e3e5 sql/updates/mssql_1.8.1_to_2.0.0.php
--- a/sql/updates/mssql_1.8.1_to_2.0.0.php Fri Dec 21 16:25:45 2012 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-<?php
-
-// Add Topic Assignment Table
-$_SQL[] = "
-CREATE TABLE [dbo].[{$_TABLES['topic_assignments']}] (
- [tid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
- [type] [varchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
- [id] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
- [inherit] [tinyint] NOT NULL,
- [tdefault] [tinyint] NOT NULL
-) ON [PRIMARY]
-";
-
-// Add new Topic Columns used for Child Topics
-$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD [parent_id] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL AFTER [archive_flag]";
-$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD [inherit] [tinyint] NOT NULL AFTER [parent_id]";
-$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD [hidden] [tinyint] NOT NULL AFTER [inherit]";
-
-// Update Session Table
-$_SQL[] = "ALTER TABLE {$_TABLES['sessions']} ADD [whos_online] [tinyint] NOT NULL AFTER [md5_sess_id]";
-$_SQL[] = "ALTER TABLE {$_TABLES['sessions']} ADD [topic] [varchar] (20) NOT NULL AFTER [whos_online]";
-
-// Password Updates
-$_SQL[] = "ALTER TABLE {$_TABLES['users']} ALTER COLUMN [passwd] [varchar] (128) NOT NULL default ''";
-$_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD [salt] [varchar] (64) NOT NULL default '' AFTER [passwd]";
-$_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD [algorithm] [tinyint] NOT NULL default '0' AFTER [salt]";
-$_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD [stretch] [int] NOT NULL default '1' AFTER [algorithm]";
-
-// New Geeklog variable for Article content syndication
-$_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('last_article_publish','') ";
-
-/**
- * Create Story and Submission Topic assignments
- *
- */
-function update_StoryTopicAssignmentsFor200()
-{
- global $_TABLES;
-
- $story_tables[] = $_TABLES['stories'];
- $story_tables[] = $_TABLES['storysubmission'];
-
- foreach ($story_tables as $story_table) {
- $sql = "SELECT * FROM $story_table";
- $result = DB_query($sql);
- $nrows = DB_numRows($result);
-
- for ($i = 0; $i < $nrows; $i++) {
- $A = DB_fetchArray($result);
-
- $sql = "INSERT INTO {$_TABLES['topic_assignments']} (tid, type, id, inherit, tdefault) VALUES ('{$A['tid']}', 'article', '{$A['sid']}', 1, 1)";
- DB_query($sql);
- }
-
- // Remove tid from table
- $sql = "ALTER TABLE $story_table DROP tid";
- DB_query($sql);
- }
-
-}
-
-/**
- * Create Block Topic assignments
- *
- */
-function update_BlockTopicAssignmentsFor200()
-{
- global $_TABLES;
-
-
- $sql = "SELECT * FROM {$_TABLES['blocks']}";
- $result = DB_query($sql);
- $nrows = DB_numRows($result);
-
- for ($i = 0; $i < $nrows; $i++) {
- $A = DB_fetchArray($result);
-
- $sql = "INSERT INTO {$_TABLES['topic_assignments']} (tid, type, id, inherit, tdefault) VALUES ('{$A['tid']}', 'block', '{$A['bid']}', 1, 0)";
- DB_query($sql);
- }
-
- // Remove Topic Id from blocks table
- $sql = "ALTER TABLE {$_TABLES['blocks']} DROP tid";
- DB_query($sql);
-
-}
-
-
-/**
- * Add new config options
- *
- */
-function update_ConfValuesFor200()
-{
- global $_CONF, $_TABLES;
-
- require_once $_CONF['path_system'] . 'classes/config.class.php';
-
- $c = config::get_instance();
-
- $me = 'Core';
-
- // Breadcrumbs
- $c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('multiple_breadcrumbs', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
-
- // Password Update
- $c->add('fs_pass', NULL, 'fieldset', 4, 42, NULL, 0, TRUE, $me, 18);
- $c->add('pass_alg', 1, 'select', 4, 42, 29, 800, TRUE, $me, 18);
- $c->add('pass_stretch', 4096, 'text', 4, 42, NULL, 810, TRUE, $me, 18);
-
- // Max Link Text
- $c->add('linktext_maxlen',50,'text',7,31,NULL,1754,TRUE, $me,31);
-
- // Email CC settings
- $c->add('mail_cc_enabled', 1, 'select', 0, 1, 0, 180, TRUE, $me, 1);
- $c->add('mail_cc_default', 0, 'select', 0, 1, 0, 190, TRUE, $me, 1);
-
- // Comments
- $c->add('comment_on_same_page',0,'select',4,21,0, 1690, TRUE, $me, 21);
- $c->add('show_comments_at_replying',0,'select',4,21,0, 1691, TRUE, $me, 21);
-
- // Microsummary
- $c->del('microsummary_short', 'Core');
-
- // Breadcrumb Root Site Name
- $c->add('breadcrumb_root_site_name', 0, 'select', 7, 45, 0, 2040, TRUE, $me, 45);
-
- // Page Navigation
- $c->add('page_navigation_max_pages',7,'text',7,31,NULL,1800,TRUE, $me, 31);
-
- // Add in Comment Syndication
- $c->add('fs_syndication_comment', NULL, 'fieldset', 0, 3, NULL, 0, TRUE, $me, 2);
- $c->add('comment_feeds_article_tag', "<p>[Original Article: <a href=\"%s\">%s</a>%s%s]\n", 'text', 0, 3, NULL, 10, TRUE, $me, 2);
- $c->add('comment_feeds_article_tag_position', 'end', 'select', 0, 3, 30, 20, TRUE, $me, 2);
- $c->add('comment_feeds_article_author_tag', '', 'text', 0, 3, NULL, 30, TRUE, $me, 2);
- $c->add('comment_feeds_comment_author_tag', ", Comment By: <a href=\"%s\">%s</a>", 'text', 0, 3, NULL, 40, TRUE, $me, 2);
-
- return true;
-}
-
-?>
diff -r 46371fbbb73e -r 709b3940e3e5 sql/updates/mssql_1.8.2_to_2.0.0.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mssql_1.8.2_to_2.0.0.php Sun Dec 30 10:30:36 2012 +0100
@@ -0,0 +1,146 @@
+<?php
+
+// Add Topic Assignment Table
+$_SQL[] = "
+CREATE TABLE [dbo].[{$_TABLES['topic_assignments']}] (
+ [tid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+ [type] [varchar] (30) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+ [id] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+ [inherit] [tinyint] NOT NULL,
+ [tdefault] [tinyint] NOT NULL
+) ON [PRIMARY]
+";
+
+// Add new Topic Columns used for Child Topics
+$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD [parent_id] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL AFTER [archive_flag]";
+$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD [inherit] [tinyint] NOT NULL AFTER [parent_id]";
+$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD [hidden] [tinyint] NOT NULL AFTER [inherit]";
+
+// Update Session Table
+$_SQL[] = "ALTER TABLE {$_TABLES['sessions']} ADD [whos_online] [tinyint] NOT NULL AFTER [md5_sess_id]";
+$_SQL[] = "ALTER TABLE {$_TABLES['sessions']} ADD [topic] [varchar] (20) NOT NULL AFTER [whos_online]";
+
+// Password Updates
+$_SQL[] = "ALTER TABLE {$_TABLES['users']} ALTER COLUMN [passwd] [varchar] (128) NOT NULL default ''";
+$_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD [salt] [varchar] (64) NOT NULL default '' AFTER [passwd]";
+$_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD [algorithm] [tinyint] NOT NULL default '0' AFTER [salt]";
+$_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD [stretch] [int] NOT NULL default '1' AFTER [algorithm]";
+
+// New Geeklog variable for Article content syndication
+$_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('last_article_publish','') ";
+
+/**
+ * Create Story and Submission Topic assignments
More information about the geeklog-cvs
mailing list