From afcc681febcb5a92b4302863a837778be1adbdf5 Mon Sep 17 00:00:00 2001
From: inureyes <inureyes@gmail.com>
Date: Sat, 26 Feb 2011 00:31:17 +0900
Subject: [PATCH 1/2]  refs #1560 : bugfix : preprocessor routine.

---
 library/preprocessor.php | 2 +-
 rewrite.php              | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/preprocessor.php b/library/preprocessor.php
index ac1ea6563..6ebc40b98 100644
--- a/library/preprocessor.php
+++ b/library/preprocessor.php
@@ -209,7 +209,7 @@
 	Determine the resource URLs and paths.
 */
 	if(is_null($context->getProperty('service.jqueryURL'))) {
-		$context->setProperty('service.jqueryURL',$context->getProperty('service.path')."/resources/script/jquery/";
+		$context->setProperty('service.jqueryURL',$context->getProperty('service.path')."/resources/script/jquery/");
 	}
 /** Administration panel skin / editor template
     -------------------------------------------
diff --git a/rewrite.php b/rewrite.php
index fd7b548ac..f90c2f270 100644
--- a/rewrite.php
+++ b/rewrite.php
@@ -2,7 +2,6 @@
 /// Copyright (c) 2004-2011, Needlworks  / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
-
 define('ROOT', '.');
 require_once(ROOT.'/framework/Dispatcher.php');
 /** Dispatching Interface request via URI */
@@ -10,4 +9,4 @@
 /** Interface Loading */
 if (empty($service['debugmode'])) {	@include_once $dispatcher->interfacePath;}
 else {include_once $dispatcher->interfacePath;}
-?>
\ No newline at end of file
+?>

From 34a108e97b471a16432b6cdcb7a1a63eeb19ea15 Mon Sep 17 00:00:00 2001
From: inureyes <inureyes@gmail.com>
Date: Fri, 25 Feb 2011 10:37:41 -0500
Subject: [PATCH 2/2]  refs #1557 : bugfix : session table installation script
 fixed

---
 resources/setup/initialize.Cubrid.sql     | 1 +
 resources/setup/initialize.MySQL.sql      | 1 +
 resources/setup/initialize.PostgreSQL.sql | 1 +
 3 files changed, 3 insertions(+)

diff --git a/resources/setup/initialize.Cubrid.sql b/resources/setup/initialize.Cubrid.sql
index b1a4f4c4d..3e7a376c6 100644
--- a/resources/setup/initialize.Cubrid.sql
+++ b/resources/setup/initialize.Cubrid.sql
@@ -323,6 +323,7 @@ CREATE TABLE [##_dbPrefix_##]Sessions (
   timer float default 0 NOT NULL,
   created integer default 0 NOT NULL,
   updated integer default 0 NOT NULL,
+  expires integer default 0 NOT NULL,
   PRIMARY KEY  (id,address)
 ) [##_charset_##];
 CREATE INDEX [##_dbPrefix_##]Sessions_updated_idx ON [##_dbPrefix_##]Sessions (updated);
diff --git a/resources/setup/initialize.MySQL.sql b/resources/setup/initialize.MySQL.sql
index 44a5cbe61..3e72ba4ec 100644
--- a/resources/setup/initialize.MySQL.sql
+++ b/resources/setup/initialize.MySQL.sql
@@ -333,6 +333,7 @@ CREATE TABLE [##_dbPrefix_##]Sessions (
   timer float NOT NULL default '0',
   created int(11) NOT NULL default '0',
   updated int(11) NOT NULL default '0',
+  expires int(11) NOT NULL default '0',
   PRIMARY KEY  (id,address),
   KEY updated (updated)
 ) [##_charset_##];
diff --git a/resources/setup/initialize.PostgreSQL.sql b/resources/setup/initialize.PostgreSQL.sql
index f468f0f16..811667931 100644
--- a/resources/setup/initialize.PostgreSQL.sql
+++ b/resources/setup/initialize.PostgreSQL.sql
@@ -331,6 +331,7 @@ CREATE TABLE [##_dbPrefix_##]Sessions (
   timer float NOT NULL default 0,
   created integer NOT NULL default 0,
   updated integer NOT NULL default 0,
+  expires integer NOT NULL default 0,
   PRIMARY KEY  (id,address)
 ) [##_charset_##];
 CREATE INDEX [##_dbPrefix_##]Sessions_updated_idx ON [##_dbPrefix_##]Sessions (updated);