From 4f3c36ce3f35d305eaa84c76e8c2dbfb477491bf Mon Sep 17 00:00:00 2001
From: Craig Knudsen <craig@k5n.us>
Date: Fri, 22 Feb 2013 15:56:46 +0000
Subject: [PATCH] Release 1.2.7

---
 ChangeLog                        | 3 +--
 NEWS                             | 7 +++++++
 UPGRADING.html                   | 2 +-
 docs/WebCalendar-SysAdmin.html   | 4 ++--
 includes/config.php              | 4 ++--
 install/default_config.php       | 2 +-
 install/index.php                | 1 +
 install/sql/upgrade-db2.sql      | 2 ++
 install/sql/upgrade-ibase.sql    | 2 ++
 install/sql/upgrade-mssql.sql    | 2 ++
 install/sql/upgrade-mysql.sql    | 2 ++
 install/sql/upgrade-oracle.sql   | 2 ++
 install/sql/upgrade-postgres.sql | 2 ++
 13 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 977ea0e7f..1d4386a16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,12 @@
 $Id$
 
-Version 1.2.7 (?? ??? 2013)
+Version 1.2.7 (22 Feb 2013)
  - Security fix: Do not show the reason for a failed login (i.e. "no such user")
  - Security fix: Escape HTML characters in category name.
  - Security fix: Check all passed in fields (either via HTML form or via
    URL parameter) for certain malicious tags (script, embed, etc.) and
    generate fatal error if found.
 
-
 Version 1.2.6 (07 Jan 2013)
  - Fixed bug [ 3577712 ] - typo in upcoming.php
  - Bug fix: ajax.php error on undefined function require_valide_referring_url
diff --git a/NEWS b/NEWS
index cf3e7efef..33fab70b0 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,13 @@ http://webcalendar.cvs.sourceforge.net/*checkout*/webcalendar/webcalendar/Change
 
 ---------------------------------------------------------------------------
 
+Version 1.2.7 (22 Jan 2013)
+ - Security fix: Do not show the reason for a failed login (i.e. "no such user")
+ - Security fix: Escape HTML characters in category name.
+ - Security fix: Check all passed in fields (either via HTML form or via
+   URL parameter) for certain malicious tags (script, embed, etc.) and
+   generate fatal error if found.
+
 Version 1.2.6 (07 Jan 2013)
  - Fix for "undefined function require_valide" bug
  - Other minor bug fixes.
diff --git a/UPGRADING.html b/UPGRADING.html
index ef20ed6b4..36c7507ea 100644
--- a/UPGRADING.html
+++ b/UPGRADING.html
@@ -65,7 +65,7 @@
     <h1>WebCalendar Upgrading Notes</h1>
 
     <table border="0" style="margin-left: 50px;">
-    <tr><th style="text-align: right;">WebCalendar Version:</th><td> 1.2.6 </td></tr>
+    <tr><th style="text-align: right;">WebCalendar Version:</th><td> 1.2.7 </td></tr>
     <tr><th valign="top" style="text-align: right;">Document Version:</th><td> $Revision$ <br/> $Date$</td>
     </table>
 
diff --git a/docs/WebCalendar-SysAdmin.html b/docs/WebCalendar-SysAdmin.html
index 21d20d416..b049d7d08 100644
--- a/docs/WebCalendar-SysAdmin.html
+++ b/docs/WebCalendar-SysAdmin.html
@@ -88,7 +88,7 @@
 </head>
 <body>
 <h1>WebCalendar System Administrator's Guide</h1>
-<p><strong>WebCalendar Version: 1.2.b1</strong></p>
+<p><strong>WebCalendar Version: 1.2.7</strong></p>
 
 <h2>Table of Contents</h2>
 <ul>
@@ -306,7 +306,7 @@ <h2>File Unpacking</h2>
   your web server will find it. (See your web server documentation for information.)</p>
  <p>By default, unpacking WebCalendar will create its own directory
   when you unpack it. The new directory name will typically
-  contain the version name (such as <tt>WebCalendar-1.2.1</tt>).
+  contain the version name (such as <tt>WebCalendar-1.2.7</tt>).
   You can rename this directory after unpacking the files if you
   prefer a directory name like <tt>calendar</tt> or <tt>webcalendar</tt>.
   Keep in mind that unless you remap the directory (via your web server's
diff --git a/includes/config.php b/includes/config.php
index 82929eec6..7cb9f5ce0 100644
--- a/includes/config.php
+++ b/includes/config.php
@@ -108,8 +108,8 @@ function do_config ( $fileLoc ) {
   $PROGRAM_URL, $PROGRAM_VERSION, $readonly, $run_mode, $settings, $single_user,
   $single_user_login, $TROUBLE_URL, $use_http_auth, $user_inc;
 
-  $PROGRAM_VERSION = 'v1.2.6';
-  $PROGRAM_DATE = '07 Jan 2013';
+  $PROGRAM_VERSION = 'v1.2.7';
+  $PROGRAM_DATE = '22 Feb 2013';
   $PROGRAM_NAME = 'WebCalendar ' . "$PROGRAM_VERSION ($PROGRAM_DATE)";
   $PROGRAM_URL = 'http://www.k5n.us/webcalendar.php';
   $TROUBLE_URL = 'docs/WebCalendar-SysAdmin.html#trouble';
diff --git a/install/default_config.php b/install/default_config.php
index 617dc7c86..825dd6d9e 100644
--- a/install/default_config.php
+++ b/install/default_config.php
@@ -151,7 +151,7 @@
   'USER_RSS_ENABLED' => 'N',
   'USER_SEES_ONLY_HIS_GROUPS' => 'Y',
   'USER_SORT_ORDER' => 'cal_lastname, cal_firstname',
-  'WEBCAL_PROGRAM_VERSION' => 'v1.2.6',
+  'WEBCAL_PROGRAM_VERSION' => 'v1.2.7',
   'WEEK_START' => '0',
   'WEEKEND_START' => '6',
   'WEEKENDBG' => '#D0D0D0',
diff --git a/install/index.php b/install/index.php
index a6bd866fb..fcb7ee00e 100644
--- a/install/index.php
+++ b/install/index.php
@@ -30,6 +30,7 @@
  *     same value (e.g. "v1.0.0") that was defined above.
  *   - Update the version/date in ChangeLog and NEWS files.
  *   - Update UPGRADING.html documentation.
+ *   - Update docs/WebCalendar-SysAdmin.html documentation.
  *
  * ABOUT VERSION NUMBERS:
  *   From now on, we should only be using "vN.N.N" format for versions.
diff --git a/install/sql/upgrade-db2.sql b/install/sql/upgrade-db2.sql
index d3b982a87..bf37ca447 100644
--- a/install/sql/upgrade-db2.sql
+++ b/install/sql/upgrade-db2.sql
@@ -309,3 +309,5 @@ CREATE TABLE webcal_timezones (
 /*upgrade_v1.2.5*/
 
 /*upgrade_v1.2.6*/
+
+/*upgrade_v1.2.7*/
diff --git a/install/sql/upgrade-ibase.sql b/install/sql/upgrade-ibase.sql
index 81a758578..ace489d2e 100644
--- a/install/sql/upgrade-ibase.sql
+++ b/install/sql/upgrade-ibase.sql
@@ -324,3 +324,5 @@ CREATE INDEX IWEBCAL_TIMEZONESNEWINDEX ON WEBCAL_TIMEZONES(TZID);
 /*upgrade_v1.2.5*/
 
 /*upgrade_v1.2.6*/
+
+/*upgrade_v1.2.7*/
diff --git a/install/sql/upgrade-mssql.sql b/install/sql/upgrade-mssql.sql
index 4ff06f67d..5b8f97e06 100644
--- a/install/sql/upgrade-mssql.sql
+++ b/install/sql/upgrade-mssql.sql
@@ -310,3 +310,5 @@ CREATE TABLE webcal_timezones (
 /*upgrade_v1.2.5*/
 
 /*upgrade_v1.2.6*/
+
+/*upgrade_v1.2.7*/
diff --git a/install/sql/upgrade-mysql.sql b/install/sql/upgrade-mysql.sql
index 540263141..27e383c04 100644
--- a/install/sql/upgrade-mysql.sql
+++ b/install/sql/upgrade-mysql.sql
@@ -277,3 +277,5 @@ CREATE TABLE webcal_timezones (
 /*upgrade_v1.2.5*/
 
 /*upgrade_v1.2.6*/
+
+/*upgrade_v1.2.7*/
diff --git a/install/sql/upgrade-oracle.sql b/install/sql/upgrade-oracle.sql
index 6ac3b48f5..d2bcacbcf 100644
--- a/install/sql/upgrade-oracle.sql
+++ b/install/sql/upgrade-oracle.sql
@@ -310,3 +310,5 @@ CREATE TABLE webcal_timezones (
 /*upgrade_v1.2.5*/
 
 /*upgrade_v1.2.6*/
+
+/*upgrade_v1.2.7*/
diff --git a/install/sql/upgrade-postgres.sql b/install/sql/upgrade-postgres.sql
index d13085074..b7b3e6b2a 100644
--- a/install/sql/upgrade-postgres.sql
+++ b/install/sql/upgrade-postgres.sql
@@ -328,3 +328,5 @@ CREATE TABLE webcal_timezones (
 /*upgrade_v1.2.5*/
 
 /*upgrade_v1.2.6*/
+
+/*upgrade_v1.2.7*/

WebCalendar Version:	1.2.6
WebCalendar Version:	1.2.7
Document Version:	$Revision$ $Date$