minor fixes related to postgres development

boot.php

@@ -38,10 +38,10 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/BaseObject.php');
 require_once('include/features.php');
 
-define ( 'RED_PLATFORM',     'Red');
-define ( 'RED_VERSION',      trim(file_get_contents('version.inc')) . 'R');
-define ( 'ZOT_REVISION',               1     ); 
-define ( 'DB_UPDATE_VERSION',       1040     );
+define ( 'RED_PLATFORM',            'Red' );
+define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
+define ( 'ZOT_REVISION',            1     ); 
+define ( 'DB_UPDATE_VERSION',       1041  );
 
 define ( 'EOL',                    '<br />' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

include/account.php

@@ -107,7 +107,8 @@ function create_account($arr) {
 	$parent      = ((x($arr,'parent'))        ? intval($arr['parent'])             : 0 );
 	$flags       = ((x($arr,'account_flags')) ? intval($arr['account_flags'])      : ACCOUNT_OK);
 	$roles       = ((x($arr,'account_roles')) ? intval($arr['account_roles'])      : 0 );
-
+	$expires     = ((x($arr,'expires'))       ? intval($arr['expires'])            : '0000-00-00 00:00:00');
+	
 	$default_service_class = get_config('system','default_service_class');
 	if($default_service_class === false)
 		$default_service_class = '';

include/session.php

@@ -6,12 +6,12 @@
 $session_exists = 0;
 $session_expire = 180000;
 
-if(! function_exists('ref_session_open')) { 
+
 function ref_session_open ($s,$n) {
   return true;
-}}
+}
+
 
-if(! function_exists('ref_session_read')) { 
 function ref_session_read ($id) {
   global $session_exists;
   if(x($id))
@@ -21,9 +21,9 @@ function ref_session_read ($id) {
     return $r[0]['data'];
   }
   return '';
-}}
+}
+
 
-if(! function_exists('ref_session_write')) { 
 function ref_session_write ($id,$data) {
   global $session_exists, $session_expire;
   if(! $id || ! $data) { 
@@ -44,25 +44,25 @@ function ref_session_write ($id,$data) {
             dbesc($id), dbesc($default_expire), dbesc($data));
 
   return true;
-}}
+}
+
 
-if(! function_exists('ref_session_close')) { 
 function ref_session_close() {
   return true;
-}}
+}
+
 
-if(! function_exists('ref_session_destroy')) { 
 function ref_session_destroy ($id) {
   q("DELETE FROM `session` WHERE `sid` = '%s'", dbesc($id));
   return true;
-}}
+}
+
 
-if(! function_exists('ref_session_gc')) { 
 function ref_session_gc($expire) {
   q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time()));
   q("OPTIMIZE TABLE `sess_data`");
   return true;
-}}
+}
 
 $gc_probability = 50;
 
@@ -71,6 +71,4 @@ ini_set('session.use_only_cookies', 1);
 ini_set('session.cookie_httponly', 1);
 
 
-session_set_save_handler ('ref_session_open', 'ref_session_close',
-                            'ref_session_read', 'ref_session_write',
-                            'ref_session_destroy', 'ref_session_gc');
+session_set_save_handler ('ref_session_open', 'ref_session_close', 'ref_session_read', 'ref_session_write', 'ref_session_destroy', 'ref_session_gc');

install/database.sql

@@ -768,7 +768,7 @@ CREATE TABLE IF NOT EXISTS `session` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `sid` char(255) NOT NULL,
   `data` text NOT NULL,
-  `expire` int(10) unsigned NOT NULL,
+  `expire` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`id`),
   KEY `sid` (`sid`),
   KEY `expire` (`expire`)
@@ -832,7 +832,7 @@ CREATE TABLE IF NOT EXISTS `tokens` (
   `id` varchar(40) NOT NULL,
   `secret` text NOT NULL,
   `client_id` varchar(20) NOT NULL,
-  `expires` int(11) NOT NULL,
+  `expires` bigint(20) unsigned NOT NULL,
   `scope` varchar(200) NOT NULL,
   `uid` int(11) NOT NULL,
   PRIMARY KEY (`id`),

install/update.php

@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1040 );
+define( 'UPDATE_VERSION' , 1041 );
 
 /**
  *
@@ -513,3 +513,13 @@ function update_r1039() {
 	return UPDATE_FAILED;
 
 }
+
+function update_r1040() {
+	$r = q("ALTER TABLE `session` CHANGE `expire` `expire` BIGINT UNSIGNED NOT NULL,
+		ALTER TABLE `tokens` CHANGE `expires` `expires` BIGINT UNSIGNED NOT NULL  ");
+
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}

version.inc

@@ -1 +1 @@
-2013-05-02.301
+2013-05-05.304