Index: branches/5.0.x/core/units/structure/structure_config.php
===================================================================
diff -u -N -r12639 -r12703
--- branches/5.0.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 12639)
+++ branches/5.0.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: structure_config.php 12639 2009-09-29 15:17:02Z alex $
+* @version	$Id: structure_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -108,7 +108,7 @@
             'Filename'					=>	Array('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1),
 			'AutomaticFilename'			=>	Array('type' => 'int', 'not_null' => 1, 'default' => 1),
             'Description'				=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
-            'CreatedOn'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),
+            'CreatedOn'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
             'EditorsPick'				=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
             'Status'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1),
             'Priority'					=>	Array('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => array(), 'required' => 1, 'default' => 0),
@@ -125,7 +125,7 @@
             'HotItem'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
             'NewItem'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
             'PopItem'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
-            'Modified'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),
+            'Modified'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
             'ModifiedById'				=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0),
             'CachedTemplate'			=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
 
@@ -139,7 +139,7 @@
 																		LEFT JOIN ' . TABLE_PREFIX . 'Theme AS t ON t.ThemeId = tf.ThemeId
 																		WHERE (t.Enabled = 1) AND (tf.FileName NOT LIKE "%%.elm.tpl") AND (tf.FileName NOT LIKE "%%.des.tpl") AND (tf.FilePath = "/designs")',
 				'option_key_field' => 'Value', 'option_title_field' => 'Title',
-				/*'required' => 1,*/ 'default' => null
+				'not_null' => 1, 'default' => CATEGORY_TEMPLATE_INHERIT
 			),
 
 			'UseExternalUrl'	=>	Array (
Index: branches/5.0.x/core/install/install_schema.sql
===================================================================
diff -u -N -r12641 -r12703
--- branches/5.0.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 12641)
+++ branches/5.0.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 12703)
@@ -80,16 +80,16 @@
 );
 
 CREATE TABLE EmailQueue (
-  EmailQueueId int(10) unsigned NOT NULL auto_increment,
-  ToEmail varchar(255) NOT NULL default '',
-  `Subject` varchar(255) NOT NULL default '',
+  EmailQueueId int(10) unsigned NOT NULL AUTO_INCREMENT,
+  ToEmail varchar(255) NOT NULL DEFAULT '',
+  `Subject` varchar(255) NOT NULL DEFAULT '',
   MessageHeaders text,
   MessageBody longtext,
-  Queued int(10) unsigned NOT NULL default '0',
-  SendRetries int(10) unsigned NOT NULL default '0',
-  LastSendRetry int(10) unsigned NOT NULL default '0',
-  MailingId int(10) unsigned NOT NULL,
-  PRIMARY KEY  (EmailQueueId),
+  Queued int(10) unsigned DEFAULT NULL,
+  SendRetries int(10) unsigned NOT NULL DEFAULT '0',
+  LastSendRetry int(10) unsigned DEFAULT NULL,
+  MailingId int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (EmailQueueId),
   KEY LastSendRetry (LastSendRetry),
   KEY SendRetries (SendRetries),
   KEY MailingId (MailingId)
@@ -124,27 +124,27 @@
 );
 
 CREATE TABLE Language (
-  LanguageId int(11) NOT NULL auto_increment,
-  PackName varchar(40) NOT NULL default '',
-  LocalName varchar(40) NOT NULL default '',
-  Enabled int(11) NOT NULL default '1',
-  PrimaryLang int(11) NOT NULL default '0',
-  AdminInterfaceLang tinyint(3) unsigned NOT NULL default '0',
-  Priority int(11) NOT NULL default '0',
-  IconURL varchar(255) default NULL,
-  IconDisabledURL varchar(255) default NULL,
-  DateFormat varchar(50) NOT NULL default '',
-  TimeFormat varchar(50) NOT NULL default '',
-  InputDateFormat varchar(50) NOT NULL default 'm/d/Y',
-  InputTimeFormat varchar(50) NOT NULL default 'g:i:s A',
-  DecimalPoint varchar(10) NOT NULL default '',
-  ThousandSep varchar(10) NOT NULL default '',
-  `Charset` varchar(20) NOT NULL default '',
-  UnitSystem tinyint(4) NOT NULL default '1',
+  LanguageId int(11) NOT NULL AUTO_INCREMENT,
+  PackName varchar(40) NOT NULL DEFAULT '',
+  LocalName varchar(40) NOT NULL DEFAULT '',
+  Enabled int(11) NOT NULL DEFAULT '1',
+  PrimaryLang int(11) NOT NULL DEFAULT '0',
+  AdminInterfaceLang tinyint(3) unsigned NOT NULL DEFAULT '0',
+  Priority int(11) NOT NULL DEFAULT '0',
+  IconURL varchar(255) DEFAULT NULL,
+  IconDisabledURL varchar(255) DEFAULT NULL,
+  DateFormat varchar(50) NOT NULL DEFAULT '',
+  TimeFormat varchar(50) NOT NULL DEFAULT '',
+  InputDateFormat varchar(50) NOT NULL DEFAULT 'm/d/Y',
+  InputTimeFormat varchar(50) NOT NULL DEFAULT 'g:i:s A',
+  DecimalPoint varchar(10) NOT NULL DEFAULT '',
+  ThousandSep varchar(10) NOT NULL DEFAULT '',
+  `Charset` varchar(20) NOT NULL DEFAULT '',
+  UnitSystem tinyint(4) NOT NULL DEFAULT '1',
   FilenameReplacements text,
-  Locale varchar(10) NOT NULL default 'en-US',
-  UserDocsUrl varchar(255) NOT NULL,
-  PRIMARY KEY  (LanguageId),
+  Locale varchar(10) NOT NULL DEFAULT 'en-US',
+  UserDocsUrl varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (LanguageId),
   KEY Enabled (Enabled),
   KEY PrimaryLang (PrimaryLang),
   KEY AdminInterfaceLang (AdminInterfaceLang),
@@ -167,23 +167,23 @@
 );
 
 CREATE TABLE PersistantSessionData (
-  VariableId bigint(20) NOT NULL auto_increment,
-  PortalUserId int(11) NOT NULL default '0',
-  VariableName varchar(255) NOT NULL default '',
-  VariableValue text NOT NULL,
+  VariableId bigint(20) NOT NULL AUTO_INCREMENT,
+  PortalUserId int(11) NOT NULL DEFAULT '0',
+  VariableName varchar(255) NOT NULL DEFAULT '',
+  VariableValue text,
   PRIMARY KEY (VariableId),
   KEY UserId (PortalUserId),
   KEY VariableName (VariableName)
 );
 
 CREATE TABLE Phrase (
   Phrase varchar(255) NOT NULL DEFAULT '',
-  PhraseKey varchar(255) NOT NULL,
-  Translation text NOT NULL,
+  PhraseKey varchar(255) NOT NULL DEFAULT '',
+  Translation text,
   PhraseType int(11) NOT NULL DEFAULT '0',
   PhraseId int(11) NOT NULL AUTO_INCREMENT,
   LanguageId int(11) NOT NULL DEFAULT '0',
-  LastChanged int(10) unsigned NOT NULL DEFAULT '0',
+  LastChanged int(10) unsigned DEFAULT NULL,
   LastChangeIP varchar(15) NOT NULL DEFAULT '',
   Module varchar(30) NOT NULL DEFAULT 'In-Portal',
   PRIMARY KEY (PhraseId),
@@ -194,13 +194,13 @@
 );
 
 CREATE TABLE PhraseCache (
-  Template varchar(40) NOT NULL default '',
-  PhraseList text NOT NULL,
-  CacheDate int(11) NOT NULL default '0',
-  ThemeId int(11) NOT NULL default '0',
-  StylesheetId int(10) unsigned NOT NULL default '0',
+  Template varchar(40) NOT NULL DEFAULT '',
+  PhraseList text,
+  CacheDate int(11) NOT NULL DEFAULT '0',
+  ThemeId int(11) NOT NULL DEFAULT '0',
+  StylesheetId int(10) unsigned NOT NULL DEFAULT '0',
   ConfigVariables text,
-  PRIMARY KEY  (Template),
+  PRIMARY KEY (Template),
   KEY CacheDate (CacheDate),
   KEY ThemeId (ThemeId),
   KEY StylesheetId (StylesheetId)
@@ -223,38 +223,38 @@
 );
 
 CREATE TABLE PortalUser (
-  PortalUserId int(11) NOT NULL auto_increment,
-  Login varchar(255) default NULL,
-  `Password` VARCHAR(255) NULL DEFAULT 'd41d8cd98f00b204e9800998ecf8427e',
-  FirstName VARCHAR(255) NOT NULL DEFAULT '',
-  LastName VARCHAR(255) NOT NULL DEFAULT '',
-  Company varchar(255) NOT NULL default '',
-  Email varchar(255) NOT NULL default '',
-  CreatedOn INT DEFAULT NULL,
-  Phone varchar(20) default NULL,
-  Fax varchar(255) NOT NULL default '',
-  Street varchar(255) default NULL,
-  Street2 varchar(255) NOT NULL default '',
-  City varchar(20) default NULL,
-  State varchar(20) NOT NULL default '',
-  Zip varchar(20) default NULL,
-  Country varchar(20) NOT NULL default '',
-  ResourceId int(11) NOT NULL default '0',
-  `Status` tinyint(4) NOT NULL default '2',
-  Modified int(11) NOT NULL default '0',
-  dob INT(11) NULL DEFAULT NULL,
-  tz int(11) default NULL,
-  ip varchar(20) default NULL,
-  IsBanned tinyint(1) NOT NULL default '0',
-  PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL,
-  PwResetConfirm varchar(255) default NULL,
-  PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL,
-  MinPwResetDelay int(11) NOT NULL default '1800',
-  PRIMARY KEY  (PortalUserId),
+  PortalUserId int(11) NOT NULL AUTO_INCREMENT,
+  Login varchar(255) DEFAULT NULL,
+  `Password` varchar(255) DEFAULT 'd41d8cd98f00b204e9800998ecf8427e',
+  FirstName varchar(255) NOT NULL DEFAULT '',
+  LastName varchar(255) NOT NULL DEFAULT '',
+  Company varchar(255) NOT NULL DEFAULT '',
+  Email varchar(255) NOT NULL DEFAULT '',
+  CreatedOn int(11) DEFAULT NULL,
+  Phone varchar(20) DEFAULT NULL,
+  Fax varchar(255) NOT NULL DEFAULT '',
+  Street varchar(255) DEFAULT NULL,
+  Street2 varchar(255) NOT NULL DEFAULT '',
+  City varchar(20) DEFAULT NULL,
+  State varchar(20) NOT NULL DEFAULT '',
+  Zip varchar(20) DEFAULT NULL,
+  Country varchar(20) NOT NULL DEFAULT '',
+  ResourceId int(11) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '1',
+  Modified int(11) DEFAULT NULL,
+  dob int(11) DEFAULT NULL,
+  tz int(11) DEFAULT NULL,
+  ip varchar(20) DEFAULT NULL,
+  IsBanned tinyint(1) NOT NULL DEFAULT '0',
+  PassResetTime int(11) unsigned DEFAULT NULL,
+  PwResetConfirm varchar(255) DEFAULT NULL,
+  PwRequestTime int(11) unsigned DEFAULT NULL,
+  MinPwResetDelay int(11) NOT NULL DEFAULT '1800',
+  PRIMARY KEY (PortalUserId),
   UNIQUE KEY ResourceId (ResourceId),
   UNIQUE KEY Login (Login),
   KEY CreatedOn (CreatedOn),
-  KEY Status (Status),
+  KEY `Status` (`Status`),
   KEY Modified (Modified),
   KEY dob (dob),
   KEY IsBanned (IsBanned)
@@ -268,10 +268,10 @@
 );
 
 CREATE TABLE SessionData (
-  SessionKey varchar(50) NOT NULL default '',
-  VariableName varchar(255) NOT NULL default '',
-  VariableValue longtext NOT NULL,
-  PRIMARY KEY  (SessionKey,VariableName),
+  SessionKey varchar(50) NOT NULL DEFAULT '',
+  VariableName varchar(255) NOT NULL DEFAULT '',
+  VariableValue longtext,
+  PRIMARY KEY (SessionKey,VariableName),
   KEY SessionKey (SessionKey),
   KEY VariableName (VariableName)
 );
@@ -338,14 +338,14 @@
 );
 
 CREATE TABLE EmailLog (
-  EmailLogId int(11) NOT NULL auto_increment,
-  fromuser varchar(200) default NULL,
-  addressto varchar(255) default NULL,
-  `subject` varchar(255) default NULL,
-  `timestamp` bigint(20) default '0',
-  event varchar(100) default NULL,
-  EventParams text NOT NULL,
-  PRIMARY KEY  (EmailLogId),
+  EmailLogId int(11) NOT NULL AUTO_INCREMENT,
+  fromuser varchar(200) DEFAULT NULL,
+  addressto varchar(255) DEFAULT NULL,
+  `subject` varchar(255) DEFAULT NULL,
+  `timestamp` bigint(20) DEFAULT '0',
+  `event` varchar(100) DEFAULT NULL,
+  EventParams text,
+  PRIMARY KEY (EmailLogId),
   KEY `timestamp` (`timestamp`)
 );
 
@@ -389,9 +389,9 @@
   l3_Description text,
   l4_Description text,
   l5_Description text,
-  CreatedOn int(11) NOT NULL DEFAULT '0',
+  CreatedOn int(11) DEFAULT NULL,
   EditorsPick tinyint(4) NOT NULL DEFAULT '0',
-  `Status` tinyint(4) NOT NULL DEFAULT '2',
+  `Status` tinyint(4) NOT NULL DEFAULT '1',
   Priority int(11) NOT NULL DEFAULT '0',
   MetaKeywords text,
   CachedDescendantCatsQty int(11) DEFAULT NULL,
@@ -411,7 +411,7 @@
   HotItem int(11) NOT NULL DEFAULT '2',
   NewItem int(11) NOT NULL DEFAULT '2',
   PopItem int(11) NOT NULL DEFAULT '2',
-  Modified int(11) NOT NULL DEFAULT '0',
+  Modified int(11) DEFAULT NULL,
   ModifiedById int(11) NOT NULL DEFAULT '0',
   CachedTemplate varchar(255) NOT NULL DEFAULT '',
   Template varchar(255) NOT NULL DEFAULT '#inherit#',
@@ -496,13 +496,13 @@
 );
 
 CREATE TABLE Stylesheets (
-  StylesheetId int(11) NOT NULL auto_increment,
-  Name varchar(255) NOT NULL default '',
-  Description varchar(255) NOT NULL default '',
-  AdvancedCSS text NOT NULL,
-  LastCompiled int(10) unsigned NOT NULL default '0',
-  Enabled int(11) NOT NULL default '0',
-  PRIMARY KEY  (StylesheetId),
+  StylesheetId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  Description varchar(255) NOT NULL DEFAULT '',
+  AdvancedCSS text,
+  LastCompiled int(10) unsigned DEFAULT NULL,
+  Enabled int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (StylesheetId),
   KEY Enabled (Enabled),
   KEY LastCompiled (LastCompiled)
 );
@@ -533,32 +533,32 @@
 );
 
 CREATE TABLE Skins (
-  SkinId int(11) NOT NULL auto_increment,
-  `Name` varchar(255) default NULL,
+  SkinId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) DEFAULT NULL,
   CSS text,
-  Logo varchar(255) default NULL,
-  LogoBottom varchar(255) NOT NULL,
-  LogoLogin varchar(255) NOT NULL,
-  Options text,
-  LastCompiled int(11) NOT NULL default '0',
-  IsPrimary int(1) NOT NULL default '0',
-  PRIMARY KEY  (SkinId),
+  Logo varchar(255) DEFAULT NULL,
+  LogoBottom varchar(255) NOT NULL DEFAULT '',
+  LogoLogin varchar(255) NOT NULL DEFAULT '',
+  `Options` text,
+  LastCompiled int(11) NOT NULL DEFAULT '0',
+  IsPrimary int(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (SkinId),
   KEY IsPrimary (IsPrimary),
   KEY LastCompiled (LastCompiled)
 );
 
 CREATE TABLE ChangeLogs (
-  ChangeLogId bigint(20) NOT NULL auto_increment,
-  PortalUserId int(11) NOT NULL default '0',
-  SessionLogId int(11) NOT NULL default '0',
-  `Action` tinyint(4) NOT NULL default '0',
-  OccuredOn int(11) NOT NULL default '0',
-  Prefix varchar(255) NOT NULL default '',
-  ItemId bigint(20) NOT NULL default '0',
-  Changes text NOT NULL,
-  MasterPrefix varchar(255) NOT NULL default '',
-  MasterId bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (ChangeLogId),
+  ChangeLogId bigint(20) NOT NULL AUTO_INCREMENT,
+  PortalUserId int(11) NOT NULL DEFAULT '0',
+  SessionLogId int(11) NOT NULL DEFAULT '0',
+  `Action` tinyint(4) NOT NULL DEFAULT '0',
+  OccuredOn int(11) DEFAULT NULL,
+  Prefix varchar(255) NOT NULL DEFAULT '',
+  ItemId bigint(20) NOT NULL DEFAULT '0',
+  Changes text,
+  MasterPrefix varchar(255) NOT NULL DEFAULT '',
+  MasterId bigint(20) NOT NULL DEFAULT '0',
+  PRIMARY KEY (ChangeLogId),
   KEY PortalUserId (PortalUserId),
   KEY SessionLogId (SessionLogId),
   KEY `Action` (`Action`),
@@ -568,15 +568,15 @@
 );
 
 CREATE TABLE SessionLogs (
-  SessionLogId bigint(20) NOT NULL auto_increment,
-  PortalUserId int(11) NOT NULL default '0',
-  SessionId int(10) NOT NULL default '0',
-  `Status` tinyint(4) NOT NULL default '1',
-  SessionStart int(11) NOT NULL default '0',
-  SessionEnd int(11) default NULL,
-  IP varchar(15) NOT NULL default '',
-  AffectedItems int(11) NOT NULL default '0',
-  PRIMARY KEY  (SessionLogId),
+  SessionLogId bigint(20) NOT NULL AUTO_INCREMENT,
+  PortalUserId int(11) NOT NULL DEFAULT '0',
+  SessionId int(10) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '1',
+  SessionStart int(11) DEFAULT NULL,
+  SessionEnd int(11) DEFAULT NULL,
+  IP varchar(15) NOT NULL DEFAULT '',
+  AffectedItems int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (SessionLogId),
   KEY SessionId (SessionId),
   KEY `Status` (`Status`),
   KEY PortalUserId (PortalUserId)
@@ -756,24 +756,24 @@
 );
 
 CREATE TABLE ItemReview (
-  ReviewId int(11) NOT NULL auto_increment,
-  CreatedOn INT UNSIGNED NULL DEFAULT NULL,
-  ReviewText longtext NOT NULL,
-  Rating tinyint(3) unsigned default NULL,
-  IPAddress varchar(255) NOT NULL default '',
-  ItemId int(11) NOT NULL default '0',
-  CreatedById int(11) NOT NULL default '-1',
-  ItemType tinyint(4) NOT NULL default '0',
-  Priority int(11) NOT NULL default '0',
-  Status tinyint(4) NOT NULL default '2',
-  TextFormat int(11) NOT NULL default '0',
-  Module varchar(255) NOT NULL default '',
-  PRIMARY KEY  (ReviewId),
+  ReviewId int(11) NOT NULL AUTO_INCREMENT,
+  CreatedOn int(10) unsigned DEFAULT NULL,
+  ReviewText longtext,
+  Rating tinyint(3) unsigned DEFAULT NULL,
+  IPAddress varchar(255) NOT NULL DEFAULT '',
+  ItemId int(11) NOT NULL DEFAULT '0',
+  CreatedById int(11) NOT NULL DEFAULT '-1',
+  ItemType tinyint(4) NOT NULL DEFAULT '0',
+  Priority int(11) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '2',
+  TextFormat int(11) NOT NULL DEFAULT '0',
+  Module varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (ReviewId),
   KEY CreatedOn (CreatedOn),
   KEY ItemId (ItemId),
   KEY ItemType (ItemType),
   KEY Priority (Priority),
-  KEY Status (Status)
+  KEY `Status` (`Status`)
 );
 
 CREATE TABLE ItemTypes (
@@ -795,19 +795,19 @@
 );
 
 CREATE TABLE ItemFiles (
-  FileId int(11) NOT NULL auto_increment,
-  ResourceId int(11) unsigned NOT NULL default '0',
-  FileName varchar(255) NOT NULL default '',
-  FilePath varchar(255) NOT NULL default '',
-  Size int(11) NOT NULL default '0',
-  `Status` tinyint(4) NOT NULL default '1',
-  CreatedOn int(11) unsigned NOT NULL default '0',
-  CreatedById int(11) NOT NULL default '-1',
-  MimeType varchar(255) NOT NULL default '',
-  PRIMARY KEY  (FileId),
+  FileId int(11) NOT NULL AUTO_INCREMENT,
+  ResourceId int(11) unsigned NOT NULL DEFAULT '0',
+  FileName varchar(255) NOT NULL DEFAULT '',
+  FilePath varchar(255) NOT NULL DEFAULT '',
+  Size int(11) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '1',
+  CreatedOn int(11) unsigned DEFAULT NULL,
+  CreatedById int(11) NOT NULL DEFAULT '-1',
+  MimeType varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (FileId),
   KEY ResourceId (ResourceId),
   KEY CreatedOn (CreatedOn),
-  KEY Status (Status)
+  KEY `Status` (`Status`)
 );
 
 CREATE TABLE Relationship (
@@ -931,54 +931,54 @@
 );
 
 CREATE TABLE ImportScripts (
-  ImportId INT(11) NOT NULL auto_increment,
-  Name VARCHAR(255) NOT NULL DEFAULT '',
-  Description TEXT NOT NULL,
-  Prefix VARCHAR(10) NOT NULL DEFAULT '',
-  Module VARCHAR(50) NOT NULL DEFAULT '',
-  ExtraFields VARCHAR(255) NOT NULL DEFAULT '',
-  Type VARCHAR(10) NOT NULL DEFAULT '',
-  Status TINYINT NOT NULL,
+  ImportId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  Description text,
+  Prefix varchar(10) NOT NULL DEFAULT '',
+  Module varchar(50) NOT NULL DEFAULT '',
+  ExtraFields varchar(255) NOT NULL DEFAULT '',
+  `Type` varchar(10) NOT NULL DEFAULT '',
+  `Status` tinyint(4) NOT NULL DEFAULT '1',
   PRIMARY KEY (ImportId),
   KEY Module (Module),
-  KEY Status (Status)
+  KEY `Status` (`Status`)
 );
 
 CREATE TABLE StylesheetSelectors (
-  SelectorId int(11) NOT NULL auto_increment,
-  StylesheetId int(11) NOT NULL default '0',
-  Name varchar(255) NOT NULL default '',
-  SelectorName varchar(255) NOT NULL default '',
-  SelectorData text NOT NULL,
-  Description text NOT NULL,
-  Type tinyint(4) NOT NULL default '0',
-  AdvancedCSS text NOT NULL,
-  ParentId int(11) NOT NULL default '0',
-  PRIMARY KEY  (SelectorId),
+  SelectorId int(11) NOT NULL AUTO_INCREMENT,
+  StylesheetId int(11) NOT NULL DEFAULT '0',
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  SelectorName varchar(255) NOT NULL DEFAULT '',
+  SelectorData text,
+  Description text,
+  `Type` tinyint(4) NOT NULL DEFAULT '0',
+  AdvancedCSS text,
+  ParentId int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (SelectorId),
   KEY StylesheetId (StylesheetId),
   KEY ParentId (ParentId),
   KEY `Type` (`Type`)
 );
 
 CREATE TABLE Visits (
-  VisitId int(11) NOT NULL auto_increment,
-  VisitDate int(10) unsigned NOT NULL default '0',
-  Referer varchar(255) NOT NULL default '',
-  IPAddress varchar(15) NOT NULL default '',
-  AffiliateId int(10) unsigned NOT NULL default '0',
-  PortalUserId int(11) NOT NULL default '-2',
-  PRIMARY KEY  (VisitId),
+  VisitId int(11) NOT NULL AUTO_INCREMENT,
+  VisitDate int(10) unsigned DEFAULT NULL,
+  Referer varchar(255) NOT NULL DEFAULT '',
+  IPAddress varchar(15) NOT NULL DEFAULT '',
+  AffiliateId int(10) unsigned NOT NULL DEFAULT '0',
+  PortalUserId int(11) NOT NULL DEFAULT '-2',
+  PRIMARY KEY (VisitId),
   KEY PortalUserId (PortalUserId),
   KEY AffiliateId (AffiliateId),
   KEY VisitDate (VisitDate)
 );
 
 CREATE TABLE ImportCache (
-  CacheId int(11) NOT NULL auto_increment,
-  CacheName varchar(255) NOT NULL default '',
-  VarName int(11) NOT NULL default '0',
-  VarValue text NOT NULL,
-  PRIMARY KEY  (CacheId),
+  CacheId int(11) NOT NULL AUTO_INCREMENT,
+  CacheName varchar(255) NOT NULL DEFAULT '',
+  VarName int(11) NOT NULL DEFAULT '0',
+  VarValue text,
+  PRIMARY KEY (CacheId),
   KEY CacheName (CacheName),
   KEY VarName (VarName)
 );
@@ -1004,19 +1004,19 @@
 );
 
 CREATE TABLE MailingLists (
-  MailingId int(10) unsigned NOT NULL auto_increment,
-  PortalUserId int(11) NOT NULL default '-1',
+  MailingId int(10) unsigned NOT NULL AUTO_INCREMENT,
+  PortalUserId int(11) NOT NULL DEFAULT '-1',
   `To` longtext,
   ToParsed longtext,
   Attachments text,
-  `Subject` varchar(255) NOT NULL,
+  `Subject` varchar(255) NOT NULL DEFAULT '',
   MessageText longtext,
   MessageHtml longtext,
-  `Status` tinyint(3) unsigned NOT NULL default '1',
-  EmailsQueued int(10) unsigned NOT NULL,
-  EmailsSent int(10) unsigned NOT NULL,
-  EmailsTotal int(10) unsigned NOT NULL,
-  PRIMARY KEY  (MailingId),
+  `Status` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  EmailsQueued int(10) unsigned NOT NULL DEFAULT '0',
+  EmailsSent int(10) unsigned NOT NULL DEFAULT '0',
+  EmailsTotal int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (MailingId),
   KEY EmailsTotal (EmailsTotal),
   KEY EmailsSent (EmailsSent),
   KEY EmailsQueued (EmailsQueued),
@@ -1038,22 +1038,22 @@
 );
 
 CREATE TABLE FormFields (
-  FormFieldId int(11) NOT NULL auto_increment,
-  FormId int(11) NOT NULL default '0',
-  Type int(11) NOT NULL default '0',
-  FieldName varchar(255) NOT NULL default '',
-  FieldLabel varchar(255) default NULL,
-  Heading varchar(255) default NULL,
-  Prompt varchar(255) default NULL,
-  ElementType varchar(50) NOT NULL default '',
-  ValueList varchar(255) default NULL,
-  Priority int(11) NOT NULL default '0',
-  IsSystem tinyint(3) unsigned NOT NULL default '0',
-  Required tinyint(1) NOT NULL default '0',
-  DisplayInGrid tinyint(1) NOT NULL default '1',
-  DefaultValue text NOT NULL,
-  Validation TINYINT NOT NULL DEFAULT '0',
-  PRIMARY KEY  (FormFieldId),
+  FormFieldId int(11) NOT NULL AUTO_INCREMENT,
+  FormId int(11) NOT NULL DEFAULT '0',
+  `Type` int(11) NOT NULL DEFAULT '0',
+  FieldName varchar(255) NOT NULL DEFAULT '',
+  FieldLabel varchar(255) DEFAULT NULL,
+  Heading varchar(255) DEFAULT NULL,
+  Prompt varchar(255) DEFAULT NULL,
+  ElementType varchar(50) NOT NULL DEFAULT '',
+  ValueList varchar(255) DEFAULT NULL,
+  Priority int(11) NOT NULL DEFAULT '0',
+  IsSystem tinyint(3) unsigned NOT NULL DEFAULT '0',
+  Required tinyint(1) NOT NULL DEFAULT '0',
+  DisplayInGrid tinyint(1) NOT NULL DEFAULT '1',
+  DefaultValue text,
+  Validation tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (FormFieldId),
   KEY `Type` (`Type`),
   KEY FormId (FormId),
   KEY Priority (Priority),
@@ -1062,10 +1062,10 @@
 );
 
 CREATE TABLE FormSubmissions (
-  FormSubmissionId int(11) NOT NULL auto_increment,
-  FormId int(11) NOT NULL default '0',
-  SubmissionTime int(11) NOT NULL default '0',
-  PRIMARY KEY  (FormSubmissionId),
+  FormSubmissionId int(11) NOT NULL AUTO_INCREMENT,
+  FormId int(11) NOT NULL DEFAULT '0',
+  SubmissionTime int(11) DEFAULT NULL,
+  PRIMARY KEY (FormSubmissionId),
   KEY FormId (FormId),
   KEY SubmissionTime (SubmissionTime)
 );
@@ -1078,12 +1078,12 @@
 );
 
 CREATE TABLE Semaphores (
-  SemaphoreId int(11) NOT NULL auto_increment,
-  SessionKey int(10) unsigned NOT NULL,
-  Timestamp int(10) unsigned NOT NULL,
-  MainPrefix varchar(255) NOT NULL,
-  PRIMARY KEY  (SemaphoreId),
+  SemaphoreId int(11) NOT NULL AUTO_INCREMENT,
+  SessionKey int(10) unsigned NOT NULL DEFAULT '0',
+  `Timestamp` int(10) unsigned NOT NULL DEFAULT '0',
+  MainPrefix varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (SemaphoreId),
   KEY SessionKey (SessionKey),
-  KEY Timestamp (Timestamp),
+  KEY `Timestamp` (`Timestamp`),
   KEY MainPrefix (MainPrefix)
 );
\ No newline at end of file
Index: branches/5.0.x/core/units/user_profile/user_profile_config.php
===================================================================
diff -u -N -r12299 -r12703
--- branches/5.0.x/core/units/user_profile/user_profile_config.php	(.../user_profile_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/user_profile/user_profile_config.php	(.../user_profile_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_profile_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: user_profile_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -44,6 +44,6 @@
 			'VariableId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		    'VariableName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-		    'VariableValue' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		    'VariableValue' => Array ('type' => 'string', 'default' => NULL),
 	    ),
 	);
\ No newline at end of file
Index: branches/5.0.x/core/units/visits/visits_config.php
===================================================================
diff -u -N -r12495 -r12703
--- branches/5.0.x/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: visits_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -129,7 +129,7 @@
 
 					'Fields' => Array (
 										'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-										'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => 1, 'default' => 0),
+										'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'default' => NULL),
 										'Referer' => Array ('type' => 'string','not_null' => '1','default' => ''),
             							'IPAddress' => Array ('type' => 'string','not_null' => '1','default' => ''),
 										'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Login','not_null'=>1,'default'=>0),
Index: branches/5.0.x/core/units/form_submissions/form_submissions_config.php
===================================================================
diff -u -N -r12597 -r12703
--- branches/5.0.x/core/units/form_submissions/form_submissions_config.php	(.../form_submissions_config.php)	(revision 12597)
+++ branches/5.0.x/core/units/form_submissions/form_submissions_config.php	(.../form_submissions_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_config.php 12597 2009-09-25 18:31:30Z dmitrya $
+* @version	$Id: form_submissions_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -87,7 +87,7 @@
 					'Fields'	=>	Array(
 							'FormSubmissionId' => Array('type' => 'int', 'not_null' => 1,'default' => 0),
 							'FormId' => Array('type' => 'int','not_null' => '1','default' => 0),
-							'SubmissionTime' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#', 'not_null' => '1' ),
+							'SubmissionTime' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 					),
 					'VirtualFields'	=>	Array(
 					),
Index: branches/5.0.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r12666 -r12703
--- branches/5.0.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 12666)
+++ branches/5.0.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 12666 2009-10-08 22:45:34Z dmitrya $
+* @version	$Id: categories_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -295,7 +295,7 @@
 		    'Filename'					=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			'AutomaticFilename'			=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 1),
 		    'Description'				=>	Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null),
-		    'CreatedOn'					=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),
+		    'CreatedOn'					=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
 		    'EditorsPick'				=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		    'Status'					=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1),
 		    'Priority'					=>	Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
@@ -312,7 +312,7 @@
 		    'HotItem'					=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
 		    'NewItem'					=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
 		    'PopItem'					=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
-		    'Modified'					=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),
+		    'Modified'					=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 		    'ModifiedById'				=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0),
 		    'CachedTemplate'			=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 
Index: branches/5.0.x/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -N -r12495 -r12703
--- branches/5.0.x/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_queue_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: email_queue_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -68,9 +68,9 @@
 			'Subject' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 			'MessageHeaders' => Array ('type' => 'string', 'default' => NULL),
 			'MessageBody' => Array ('type' => 'string', 'default' => NULL),
-			'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
+			'Queued' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 			'SendRetries' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
+			'LastSendRetry' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 			'MailingId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		),
 
Index: branches/5.0.x/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -N -r12495 -r12703
--- branches/5.0.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_logs_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: email_logs_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -69,7 +69,7 @@
 			'subject' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
 			'timestamp' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 			'event' => Array ('type' => 'string', 'max_len' => 100, 'default' => NULL),
-			'EventParams' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+			'EventParams' => Array ('type' => 'string', 'default' => NULL),
 		),
 
 		'Grids' => Array (
Index: branches/5.0.x/core/units/logs/session_logs/session_logs_config.php
===================================================================
diff -u -N -r12497 -r12703
--- branches/5.0.x/core/units/logs/session_logs/session_logs_config.php	(.../session_logs_config.php)	(revision 12497)
+++ branches/5.0.x/core/units/logs/session_logs/session_logs_config.php	(.../session_logs_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: session_logs_config.php 12497 2009-09-15 16:17:08Z alex $
+* @version	$Id: session_logs_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -92,14 +92,14 @@
 		    	'use_phrases' => 1,
 		    	'not_null' => 1, 'default' => 1
 		    ),
-		    'SessionStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'time_format' => 'H:i:s', 'default' => 0),
+		    'SessionStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL),
 		    'SessionEnd' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL),
 		    'IP' => Array ('type' => 'string', 'max_len' => 15, 'not_null' => 1, 'default' => ''),
 		    'AffectedItems' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		),
 
 		'VirtualFields' => Array(
-			'Duration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'date_format' => '', 'time_format' => 'H:i:s', 'use_timezone' => false, 'default' => 0),
+			'Duration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'date_format' => '', 'time_format' => 'H:i:s', 'use_timezone' => false, 'default' => NULL),
 		),
 
 		'Grids' => Array (
Index: branches/5.0.x/core/units/reviews/reviews_config.php
===================================================================
diff -u -N -r12495 -r12703
--- branches/5.0.x/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reviews_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: reviews_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -165,7 +165,7 @@
 		'Fields' =>	Array (
 		    'ReviewId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 		    'CreatedOn' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default'=>'#NOW#'),
-		    'ReviewText' => Array('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
+		    'ReviewText' => Array('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'using_fck' => 1, 'default' => NULL),
 		    'Rating' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'lu_None', 1 => 'lu_Rating_1', 2 => 'lu_Rating_2', 3 => 'lu_Rating_3', 4 => 'lu_Rating_4', 5 => 'lu_Rating_5'), 'use_phrases' => 1, 'min_value_inc' => 0, 'max_value_inc' => 5, 'default' => 0),
 		    'IPAddress' => Array('type'=>'string', 'max_value_inc'=>15, 'not_null'=>1, 'default'=>'', ),
 		    'ItemId' => Array('type'=>'int','not_null'=>1,'default'=>0),
Index: branches/5.0.x/core/units/logs/change_logs/change_logs_config.php
===================================================================
diff -u -N -r12506 -r12703
--- branches/5.0.x/core/units/logs/change_logs/change_logs_config.php	(.../change_logs_config.php)	(revision 12506)
+++ branches/5.0.x/core/units/logs/change_logs/change_logs_config.php	(.../change_logs_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: change_logs_config.php 12506 2009-09-15 16:28:49Z dmitrya $
+* @version	$Id: change_logs_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -105,7 +105,7 @@
 		    	'use_phrases' => 1,
 		    	'not_null' => 1, 'default' => 0
 		    ),
-		    'OccuredOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'not_null' => 1, 'default' => 0),
+		    'OccuredOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => 'H:i:s', 'default' => NULL),
 		    'Prefix' => Array (
 		    	'type' => 'string', 'formatter' => 'kOptionsFormatter',
 		    	'options_sql' => 'SELECT DISTINCT %s FROM '.TABLE_PREFIX.'ChangeLogs ORDER BY Phrase',
@@ -115,7 +115,7 @@
 		    	'max_len' => 255, 'not_null' => 1, 'default' => ''
 		    ),
 		    'ItemId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-		    'Changes' => Array ('type' => 'string', 'formatter' => 'kChangesFormatter', 'not_null' => 1, 'default' => ''),
+		    'Changes' => Array ('type' => 'string', 'formatter' => 'kChangesFormatter', 'default' => NULL),
 		    'MasterPrefix' => Array (
 		    	'type' => 'string', 'formatter' => 'kOptionsFormatter',
 		    	'options_sql' => 'SELECT DISTINCT %s FROM '.TABLE_PREFIX.'ChangeLogs ORDER BY Phrase',
Index: branches/5.0.x/core/units/phrases/phrases_config.php
===================================================================
diff -u -N -r12640 -r12703
--- branches/5.0.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 12640)
+++ branches/5.0.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_config.php 12640 2009-09-29 16:37:35Z alex $
+* @version	$Id: phrases_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -135,8 +135,8 @@
             	'required' => 1, 'unique' => Array ('LanguageId'),
             	'not_null' => 1, 'default' => ''
             ),
-			'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => NULL),
-            'Translation' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
+			'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+            'Translation' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'required' => 1, 'using_fck' => 1, 'default' => NULL),
             'PhraseType' => Array (
             	'type' => 'int',
             	'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1,
@@ -150,7 +150,7 @@
             	'not_null' => 1, 'default' => 0
             ),
 
-            'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
+            'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 			'LastChangeIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			'Module' => Array (
 				'type' => 'string',
Index: branches/5.0.x/core/units/users/users_config.php
===================================================================
diff -u -N -r12506 -r12703
--- branches/5.0.x/core/units/users/users_config.php	(.../users_config.php)	(revision 12506)
+++ branches/5.0.x/core/units/users/users_config.php	(.../users_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_config.php 12506 2009-09-15 16:28:49Z dmitrya $
+* @version	$Id: users_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -380,7 +380,7 @@
 												           'not_null' => '1','default' => ''),
 							        'ResourceId' => Array('type' => 'int','not_null' => 1, 'default' => 0),
 							        'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => '1','default' => 2),
-							        'Modified' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1', 'default' => '#NOW#' ),
+							        'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 							        'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => null),
 							        'tz' => Array('type' => 'int','default' => 0),
 							        'ip' => Array('type' => 'string','default' => null),
Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -N -r12641 -r12703
--- branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12641)
+++ branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12703)
@@ -1528,4 +1528,71 @@
 	CHANGE CachedTemplate CachedTemplate varchar(255) NOT NULL DEFAULT '',
 	CHANGE ThemeId ThemeId int(10) unsigned NOT NULL DEFAULT '0';
 
-ALTER TABLE UserSession CHANGE BrowserSignature BrowserSignature varchar(32) NOT NULL DEFAULT '';
\ No newline at end of file
+ALTER TABLE UserSession CHANGE BrowserSignature BrowserSignature varchar(32) NOT NULL DEFAULT '';
+
+ALTER TABLE ChangeLogs
+	CHANGE Changes Changes text NULL,
+	CHANGE OccuredOn OccuredOn INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE EmailLog CHANGE EventParams EventParams text NULL;
+ALTER TABLE FormFields CHANGE DefaultValue DefaultValue text NULL;
+ALTER TABLE ImportCache CHANGE VarValue VarValue text NULL;
+ALTER TABLE ImportScripts CHANGE Description Description text NULL;
+ALTER TABLE PersistantSessionData CHANGE VariableValue VariableValue text NULL;
+
+ALTER TABLE Phrase
+	CHANGE `Translation` `Translation` text NULL,
+	CHANGE PhraseKey PhraseKey VARCHAR(255) NOT NULL DEFAULT '',
+	CHANGE LastChanged LastChanged INT(10) UNSIGNED NULL DEFAULT NULL;
+
+ALTER TABLE PhraseCache CHANGE PhraseList PhraseList text NULL;
+
+ALTER TABLE Stylesheets
+	CHANGE AdvancedCSS AdvancedCSS text NULL,
+	CHANGE LastCompiled LastCompiled INT(10) UNSIGNED NULL DEFAULT NULL;
+
+ALTER TABLE StylesheetSelectors
+	CHANGE SelectorData SelectorData text NULL,
+	CHANGE Description Description text NULL,
+	CHANGE AdvancedCSS AdvancedCSS text NULL;
+
+ALTER TABLE Category
+	CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1',
+	CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL,
+	CHANGE Modified Modified INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE Language CHANGE UserDocsUrl UserDocsUrl VARCHAR(255) NOT NULL DEFAULT '';
+
+ALTER TABLE MailingLists
+	CHANGE Subject Subject VARCHAR(255) NOT NULL DEFAULT '',
+	CHANGE EmailsQueued EmailsQueued INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	CHANGE EmailsSent EmailsSent INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	CHANGE EmailsTotal EmailsTotal INT(10) UNSIGNED NOT NULL DEFAULT '0';
+
+ALTER TABLE EmailQueue
+	CHANGE MailingId MailingId INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	CHANGE Queued Queued INT(10) UNSIGNED NULL DEFAULT NULL,
+	CHANGE LastSendRetry LastSendRetry INT(10) UNSIGNED NULL DEFAULT NULL;
+
+ALTER TABLE ImportScripts CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1';
+
+ALTER TABLE Semaphores
+	CHANGE SessionKey SessionKey INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	CHANGE `Timestamp` `Timestamp` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	CHANGE MainPrefix MainPrefix VARCHAR(255) NOT NULL DEFAULT '';
+
+ALTER TABLE Skins
+	CHANGE LogoBottom LogoBottom VARCHAR(255) NOT NULL DEFAULT '',
+	CHANGE LogoLogin LogoLogin VARCHAR(255) NOT NULL DEFAULT '';
+
+ALTER TABLE ItemReview CHANGE ReviewText ReviewText LONGTEXT NULL;
+ALTER TABLE SessionData CHANGE VariableValue VariableValue LONGTEXT NULL;
+
+ALTER TABLE PortalUser
+	CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '1',
+	CHANGE Modified Modified INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE ItemFiles CHANGE CreatedOn CreatedOn INT(11) UNSIGNED NULL DEFAULT NULL;
+ALTER TABLE FormSubmissions CHANGE SubmissionTime SubmissionTime INT(11) NULL DEFAULT NULL;
+ALTER TABLE SessionLogs CHANGE SessionStart SessionStart INT(11) NULL DEFAULT NULL;
+ALTER TABLE Visits CHANGE VisitDate VisitDate INT(10) UNSIGNED NULL DEFAULT NULL;
\ No newline at end of file
Index: branches/5.0.x/core/units/files/files_config.php
===================================================================
diff -u -N -r12615 -r12703
--- branches/5.0.x/core/units/files/files_config.php	(.../files_config.php)	(revision 12615)
+++ branches/5.0.x/core/units/files/files_config.php	(.../files_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: files_config.php 12615 2009-09-27 11:22:33Z alex $
+* @version	$Id: files_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -78,7 +78,7 @@
 			),
 			'Size' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
-			'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),
+			'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 			'CreatedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => -1),
 			'MimeType' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		),
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r12691 -r12703
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12691)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12691 2009-10-13 07:08:24Z dmitrya $
+* @version	$Id: categories_tag_processor.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -259,6 +259,10 @@
 
 	function CategoryLink($params)
 	{
+		if (array_key_exists('watch_here', $params)) {
+			echo '';
+		}
+
 		$category_id = getArrayValue($params, 'cat_id');
 
 		if ($category_id === false) {
Index: branches/5.0.x/core/units/stylesheets/stylesheets_config.php
===================================================================
diff -u -N -r12542 -r12703
--- branches/5.0.x/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 12542)
+++ branches/5.0.x/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: stylesheets_config.php 12542 2009-09-16 20:53:16Z dmitrya $
+* @version	$Id: stylesheets_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -152,8 +152,8 @@
 										'StylesheetId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 										'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
-										'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
-										'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
+										'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+										'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 										'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0),
 								),
 
Index: branches/5.0.x/core/units/selectors/selectors_config.php
===================================================================
diff -u -N -r12299 -r12703
--- branches/5.0.x/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: selectors_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: selectors_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -105,10 +105,10 @@
 										'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => 1, 'default' => 0),
 										'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1),
-										'SelectorData' => Array('type' => 'string', 'not_null' => '1','default' => ''),
-										'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
+										'SelectorData' => Array('type' => 'string', 'default' => NULL),
+										'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
 										'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
-										'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
+										'AdvancedCSS' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
 										'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => 1, 'default' => 0),
 								),
 
Index: branches/5.0.x/core/units/form_fields/form_fields_config.php
===================================================================
diff -u -N -r12495 -r12703
--- branches/5.0.x/core/units/form_fields/form_fields_config.php	(.../form_fields_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/form_fields/form_fields_config.php	(.../form_fields_config.php)	(revision 12703)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_fields_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: form_fields_config.php 12703 2009-10-20 08:17:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -74,7 +74,7 @@
 			            'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 			            'Required' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 			            'DisplayInGrid' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
-			            'DefaultValue' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
+			            'DefaultValue' => Array('type' => 'string', 'default' => NULL),
 			            'Validation' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_None', 1 => 'la_ValidationEmail'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 					),