Index: trunk/core/install/install_schema.sql =================================================================== diff -u -r7997 -r8015 --- trunk/core/install/install_schema.sql (.../install_schema.sql) (revision 7997) +++ trunk/core/install/install_schema.sql (.../install_schema.sql) (revision 8015) @@ -110,7 +110,7 @@ InputDateFormat varchar(50) NOT NULL default 'm/d/Y', InputTimeFormat varchar(50) NOT NULL default 'g:i:s A', DecimalPoint char(2) NOT NULL default '', - ThousandSep tinytext, + ThousandSep TINYTEXT NOT NULL default '', `Charset` varchar(20) NOT NULL default '', UnitSystem tinyint(4) NOT NULL default '1', PRIMARY KEY (LanguageId) Index: trunk/core/units/statistics/statistics_config.php =================================================================== diff -u -r7867 -r8015 --- trunk/core/units/statistics/statistics_config.php (.../statistics_config.php) (revision 7867) +++ trunk/core/units/statistics/statistics_config.php (.../statistics_config.php) (revision 8015) @@ -38,11 +38,11 @@ 'Fields' => Array( 'StatItemId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Module' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ValueSQL' => Array('type' => 'string','default' => ''), - 'ResetSQL' => Array('type' => 'string','default' => ''), - 'ListLabel' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Priority' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'AdminSummary' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'ValueSQL' => Array('type' => 'string','default' => null), + 'ResetSQL' => Array('type' => 'string','default' => null), + 'ListLabel' => Array('type' => 'string','not_null' => 1, 'default' => ''), + 'Priority' => Array('type' => 'int','not_null' => 1, 'default' => 0), + 'AdminSummary' => Array('type' => 'int','not_null' => 1, 'default' => 0), ), Index: trunk/core/units/email_messages/email_messages_config.php =================================================================== diff -u -r7997 -r8015 --- trunk/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 7997) +++ trunk/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 8015) @@ -55,12 +55,12 @@ 'Fields' => Array ( 'EmailMessageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Template' => Array('type' => 'string','default' => ''), + 'Template' => Array('type' => 'string', 'default' => null), 'ReplacementTags' => Array ('type' => 'string', 'not_null' => 1, 'default' => null), 'MessageType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'), - 'LanguageId' => Array('type' => 'int', 'not_null' => '1', 'default' => '0'), - 'EventId' => Array('type' => 'int', 'not_null' => '1', 'default' => '0'), - 'Subject' => Array('type' => 'string', 'default' => '',), + 'LanguageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'EventId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Subject' => Array('type' => 'string', 'default' => null), ), 'VirtualFields' => Array( Index: trunk/core/units/groups/groups_config.php =================================================================== diff -u -r7855 -r8015 --- trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 7855) +++ trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 8015) @@ -72,13 +72,13 @@ 'Fields' => Array ( 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Name' => Array('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => ''), - 'Description' => Array('type' => 'string','default' => ''), + 'Name' => Array('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'Description' => Array('type' => 'string', 'default' => null), 'CreatedOn' => Array('type' => 'double', 'formatter' => 'kDateFormatter', 'not_null' => '1','default' => '#NOW#'), - 'System' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'Personal' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 1), - 'ResourceId' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'System' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Personal' => Array('type' => 'int','not_null' => 1, 'default' => 0), + 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'ResourceId' => Array('type' => 'int','not_null' => 1, 'default' => 0), ), 'VirtualFields' => Array( Index: trunk/core/units/visits/visits_config.php =================================================================== diff -u -r7867 -r8015 --- trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 7867) +++ trunk/core/units/visits/visits_config.php (.../visits_config.php) (revision 8015) @@ -93,7 +93,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', 'not_null' => 1, 'default' => 0), 'Referer' => Array('type' => 'string','not_null' => '1','default' => ''), 'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''), 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','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: trunk/core/units/images/images_config.php =================================================================== diff -u -r7997 -r8015 --- trunk/core/units/images/images_config.php (.../images_config.php) (revision 7997) +++ trunk/core/units/images/images_config.php (.../images_config.php) (revision 8015) @@ -81,7 +81,7 @@ 'ResourceId' => Array('type'=>'int', 'not_null'=>1, 'default' => 0), 'Url' => Array('type' => 'string', 'max_len'=>255, 'default' => '', 'not_null'=>1), 'Name' => Array('type' => 'string', 'max_len'=>255, 'required'=>1, 'not_null'=>1, 'default' => ''), - 'AltName' => Array('type' => 'string', 'max_len'=>255, 'required'=>1, 'not_null'=>1, 'default' => ''), + 'AltName' => Array('type' => 'string', 'max_len'=>255, 'required' => 1, 'not_null' => 1, 'default' => ''), 'ImageIndex' => Array('type'=>'int', 'default' => 0, 'not_null'=>1), 'LocalImage' => Array('type'=>'int', 'default' => 1, 'not_null'=>1), 'LocalPath' => Array('type' => 'string', 'formatter'=>'kPictureFormatter', 'skip_empty'=>1, 'max_len'=>240, 'default' => '', 'not_null' => 1, 'include_path' => 1, @@ -99,9 +99,9 @@ ), 'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'default' => 0, 'not_null'=>1), 'DefaultImg' => Array('type'=>'int', 'default' => 0, 'not_null'=>1), - 'ThumbUrl' => Array('type' => 'string', 'max_len' => 255, 'default' => ''), + 'ThumbUrl' => Array('type' => 'string', 'max_len' => 255, 'default' => null), 'Priority' => Array('type'=>'int', 'default' => 0, 'not_null'=>1), - 'ThumbPath' => Array('type' => 'string', 'formatter'=>'kPictureFormatter', 'skip_empty'=>1, 'max_len' => 255, 'default' => '', + 'ThumbPath' => Array('type' => 'string', 'formatter'=>'kPictureFormatter', 'skip_empty'=>1, 'max_len' => 255, 'default' => null, 'allowed_types' => Array( 0 => 'image/jpeg', 1 => 'image/pjpeg', Index: trunk/core/units/categories/categories_config.php =================================================================== diff -u -r7997 -r8015 --- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 7997) +++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 8015) @@ -226,24 +226,24 @@ 'Name' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''), 'Filename' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), - 'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'default' => null), 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1), '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' => 2), 'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'MetaKeywords' => Array('type' => 'string', 'default' => ''), + 'MetaKeywords' => Array('type' => 'string', 'default' => null), 'CachedDescendantCatsQty' => Array('type' => 'int', 'default' => 0), - 'CachedNavbar' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => ''), - 'CreatedById' => 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'), - 'ResourceId' => Array('type' => 'int', 'default' => ''), + 'CachedNavbar' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null), + 'CreatedById' => 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), + 'ResourceId' => Array('type' => 'int', 'default' => null), 'ParentPath' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'NamedParentPath' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), - 'MetaDescription' => Array('type' => 'string', 'default' => ''), + 'MetaDescription' => Array('type' => 'string', 'default' => null), '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#'), - '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'), + '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), 'CategoryTemplate' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'CachedCategoryTemplate' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), ), Index: trunk/core/units/themes/themes_config.php =================================================================== diff -u -r7855 -r8015 --- trunk/core/units/themes/themes_config.php (.../themes_config.php) (revision 7855) +++ trunk/core/units/themes/themes_config.php (.../themes_config.php) (revision 8015) @@ -65,11 +65,11 @@ 'Fields' => Array( 'ThemeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1=>'la_Enabled', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => '1','default' => '1'), - 'Description' => Array('type' => 'string','default' => ''), - 'PrimaryTheme' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'CacheTimeout' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'StylesheetId' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1=>'la_Enabled', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => 1, 'default' => 1), + 'Description' => Array('type' => 'string','default' => null), + 'PrimaryTheme' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'CacheTimeout' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'StylesheetId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ), 'VirtualFields' => Array( Index: trunk/kernel/units/visits/visits_config.php =================================================================== diff -u -r7867 -r8015 --- trunk/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 7867) +++ trunk/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 8015) @@ -93,7 +93,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', 'not_null' => 1, 'default' => 0), 'Referer' => Array('type' => 'string','not_null' => '1','default' => ''), 'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''), 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','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: trunk/kernel/units/images/images_config.php =================================================================== diff -u -r7997 -r8015 --- trunk/kernel/units/images/images_config.php (.../images_config.php) (revision 7997) +++ trunk/kernel/units/images/images_config.php (.../images_config.php) (revision 8015) @@ -81,7 +81,7 @@ 'ResourceId' => Array('type'=>'int', 'not_null'=>1, 'default' => 0), 'Url' => Array('type' => 'string', 'max_len'=>255, 'default' => '', 'not_null'=>1), 'Name' => Array('type' => 'string', 'max_len'=>255, 'required'=>1, 'not_null'=>1, 'default' => ''), - 'AltName' => Array('type' => 'string', 'max_len'=>255, 'required'=>1, 'not_null'=>1, 'default' => ''), + 'AltName' => Array('type' => 'string', 'max_len'=>255, 'required' => 1, 'not_null' => 1, 'default' => ''), 'ImageIndex' => Array('type'=>'int', 'default' => 0, 'not_null'=>1), 'LocalImage' => Array('type'=>'int', 'default' => 1, 'not_null'=>1), 'LocalPath' => Array('type' => 'string', 'formatter'=>'kPictureFormatter', 'skip_empty'=>1, 'max_len'=>240, 'default' => '', 'not_null' => 1, 'include_path' => 1, @@ -99,9 +99,9 @@ ), 'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'default' => 0, 'not_null'=>1), 'DefaultImg' => Array('type'=>'int', 'default' => 0, 'not_null'=>1), - 'ThumbUrl' => Array('type' => 'string', 'max_len' => 255, 'default' => ''), + 'ThumbUrl' => Array('type' => 'string', 'max_len' => 255, 'default' => null), 'Priority' => Array('type'=>'int', 'default' => 0, 'not_null'=>1), - 'ThumbPath' => Array('type' => 'string', 'formatter'=>'kPictureFormatter', 'skip_empty'=>1, 'max_len' => 255, 'default' => '', + 'ThumbPath' => Array('type' => 'string', 'formatter'=>'kPictureFormatter', 'skip_empty'=>1, 'max_len' => 255, 'default' => null, 'allowed_types' => Array( 0 => 'image/jpeg', 1 => 'image/pjpeg', Index: trunk/kernel/units/statistics/statistics_config.php =================================================================== diff -u -r7867 -r8015 --- trunk/kernel/units/statistics/statistics_config.php (.../statistics_config.php) (revision 7867) +++ trunk/kernel/units/statistics/statistics_config.php (.../statistics_config.php) (revision 8015) @@ -38,11 +38,11 @@ 'Fields' => Array( 'StatItemId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Module' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ValueSQL' => Array('type' => 'string','default' => ''), - 'ResetSQL' => Array('type' => 'string','default' => ''), - 'ListLabel' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Priority' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'AdminSummary' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'ValueSQL' => Array('type' => 'string','default' => null), + 'ResetSQL' => Array('type' => 'string','default' => null), + 'ListLabel' => Array('type' => 'string','not_null' => 1, 'default' => ''), + 'Priority' => Array('type' => 'int','not_null' => 1, 'default' => 0), + 'AdminSummary' => Array('type' => 'int','not_null' => 1, 'default' => 0), ), Index: trunk/core/units/languages/languages_config.php =================================================================== diff -u -r8007 -r8015 --- trunk/core/units/languages/languages_config.php (.../languages_config.php) (revision 8007) +++ trunk/core/units/languages/languages_config.php (.../languages_config.php) (revision 8015) @@ -147,16 +147,16 @@ 'PackName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'LocalName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), - 'PrimaryLang' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'IconURL' => Array('type' => 'string','default' => ''), + 'PrimaryLang' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'IconURL' => Array('type' => 'string','default' => null), 'DateFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'TimeFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'InputDateFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('m/d/Y' => 'm/d/Y', 'd/m/Y' => 'd/m/Y'), 'not_null' => '1','default' => 'm/d/Y', 'required' => 1), 'InputTimeFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('g:i:s A' => 'g:i:s A', 'g:i A' => 'g:i A', 'H:i:s' => 'H:i:s', 'H:i' => 'H:i' ), 'not_null' => '1','default' => 'g:i:s A', 'required' => 1), - 'DecimalPoint' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ThousandSep' => Array('type' => 'string','not_null' => '1','default' => ''), + 'DecimalPoint' => Array('type' => 'string','not_null' => 1, 'default' => ''), + 'ThousandSep' => Array('type' => 'string','not_null' => 1, 'default' => ''), 'Charset' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), - 'UnitSystem' => Array('type' => 'int','not_null' => '1','default' => '1','formatter' => 'kOptionsFormatter','options' => Array(1 => 'la_Metric', 2 => 'la_US_UK'),'use_phrases' => 1), + 'UnitSystem' => Array('type' => 'int','not_null' => 1, 'default' => 1, 'formatter' => 'kOptionsFormatter','options' => Array(1 => 'la_Metric', 2 => 'la_US_UK'),'use_phrases' => 1), ), 'VirtualFields' => Array( Index: trunk/core/units/phrases/phrases_config.php =================================================================== diff -u -r8007 -r8015 --- trunk/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 8007) +++ trunk/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 8015) @@ -107,12 +107,12 @@ 'Fields' => Array( 'Phrase' => Array('type' => 'string','required'=>1,'unique'=>Array('LanguageId'),'not_null' => '1','default' => ''), 'Translation' => Array('type' => 'string','required'=>1,'not_null' => '1','default' => ''), - 'PhraseType' => Array('type' => 'int','required'=>1,'formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_PhraseType_Front',1=>'la_PhraseType_Admin',2=>'la_PhraseType_Both'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'), + 'PhraseType' => Array('type' => 'int','required'=>1,'formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_PhraseType_Front',1=>'la_PhraseType_Admin',2=>'la_PhraseType_Both'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'PhraseId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'LanguageId' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'LastChanged' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '0'), - 'LastChangeIP' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Module' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'), + 'LanguageId' => Array('type' => 'int','not_null' => 1, 'default' => 0), + 'LastChanged' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => 1, 'default' => 0), + 'LastChangeIP' => Array('type' => 'string','not_null' => 1, 'default' => ''), + 'Module' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 'In-Portal'), ), 'VirtualFields' => Array( Index: trunk/core/units/user_groups/user_groups_config.php =================================================================== diff -u -r7855 -r8015 --- trunk/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 7855) +++ trunk/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 8015) @@ -50,7 +50,7 @@ 'Fields' => Array( 'PortalUserId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'MembershipExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''), + 'MembershipExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), 'PrimaryGroup' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), 'ExpirationReminderSent' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), ), Index: trunk/core/units/users/users_config.php =================================================================== diff -u -r7997 -r8015 --- trunk/core/units/users/users_config.php (.../users_config.php) (revision 7997) +++ trunk/core/units/users/users_config.php (.../users_config.php) (revision 8015) @@ -130,23 +130,23 @@ 'Fields' => Array ( 'PortalUserId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Login' => Array('type' => 'string', 'unique'=>Array('Login'), 'default' => '','required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!')), + 'Login' => Array('type' => 'string', 'unique'=>Array('Login'), 'default' => null,'required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!')), 'Password' => Array('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('') ), - 'FirstName' => Array('type' => 'string','default' => ''), - 'LastName' => Array('type' => 'string','default' => ''), + 'FirstName' => Array('type' => 'string','default' => null), + 'LastName' => Array('type' => 'string','default' => null), 'Company' => Array('type' => 'string','not_null' => '1','default' => ''), 'Email' => Array('type' => 'string', 'formatter'=>'kFormatter', 'regexp'=>'/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/', 'sample_value' => 'email@domain.com', 'unique'=>Array('Email'), 'not_null' => '1', 'required'=>1, 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!') ), 'CreatedOn' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'Phone' => Array('type' => 'string','default' => ''), - 'Fax' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Street' => Array('type' => 'string','default' => ''), + 'Phone' => Array('type' => 'string','default' => null), + 'Fax' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Street' => Array('type' => 'string', 'default' => null), 'Street2' => Array('type' => 'string', 'not_null' => '1', 'default' => ''), - 'City' => Array('type' => 'string','default' => ''), + 'City' => Array('type' => 'string','default' => null), 'State' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options' => Array(), 'option_key_field'=>'DestAbbr','option_title_field'=>'Translation', 'not_null' => '1','default' => ''), - 'Zip' => Array('type' => 'string','default' => ''), + 'Zip' => Array('type' => 'string','default' => null), 'Country' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT %1$s FROM '.TABLE_PREFIX.'StdDestinations @@ -159,15 +159,15 @@ ORDER BY Translation', 'option_key_field'=>'DestAbbr','option_title_field'=>'Translation', 'not_null' => '1','default' => ''), - 'ResourceId' => Array('type' => 'int','not_null' => '1','default' => '0'), + '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#' ), - 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '', 'required'=>1), + 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => null, 'required'=>1), 'tz' => Array('type' => 'int','default' => 0), - 'ip' => Array('type' => 'string','default' => ''), - 'IsBanned' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'ip' => Array('type' => 'string','default' => null), + 'IsBanned' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'PassResetTime' => Array('type' => 'int','default' => null), - 'PwResetConfirm' => Array('type' => 'string','default' => ''), + 'PwResetConfirm' => Array('type' => 'string','default' => null), 'PwRequestTime' => Array('type' => 'int','default' => null), 'MinPwResetDelay' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(300 => '5', 600 => '10', 900 => '15', 1800 => '30', 3600 => '60'), 'use_phrases' => 0, 'not_null' => '1', 'default' => 1800), ), Index: trunk/admin/install/inportal_schema.sql =================================================================== diff -u -r7997 -r8015 --- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 7997) +++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 8015) @@ -43,7 +43,7 @@ ResourceId int(11) NOT NULL default '0', Url varchar(255) NOT NULL default '', Name varchar(255) NOT NULL default '', - AltName varchar(255) default NULL, + AltName VARCHAR(255) NOT NULL DEFAULT '', ImageIndex int(11) NOT NULL default '0', LocalImage tinyint(4) NOT NULL default '1', LocalPath varchar(240) NOT NULL default '', Index: trunk/core/install/upgrades.sql =================================================================== diff -u -r7997 -r8015 --- trunk/core/install/upgrades.sql (.../upgrades.sql) (revision 7997) +++ trunk/core/install/upgrades.sql (.../upgrades.sql) (revision 8015) @@ -48,7 +48,8 @@ CHANGE Enabled Enabled INT(11) NOT NULL DEFAULT '1', CHANGE InputDateFormat InputDateFormat VARCHAR(50) NOT NULL DEFAULT 'm/d/Y', CHANGE InputTimeFormat InputTimeFormat VARCHAR(50) NOT NULL DEFAULT 'g:i:s A', - CHANGE DecimalPoint DecimalPoint CHAR(2) NOT NULL DEFAULT ''; + CHANGE DecimalPoint DecimalPoint CHAR(2) NOT NULL DEFAULT '', + CHANGE ThousandSep ThousandSep TINYTEXT NOT NULL DEFAULT ''; ALTER TABLE Events CHANGE FromUserId FromUserId INT(11) NOT NULL DEFAULT '-1'; Index: trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql =================================================================== diff -u -r7997 -r8015 --- trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql (.../inportal_upgrade_v4.0.2.sql) (revision 7997) +++ trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql (.../inportal_upgrade_v4.0.2.sql) (revision 8015) @@ -11,14 +11,15 @@ ALTER TABLE PortalUser CHANGE CreatedOn CreatedOn INT NOT NULL DEFAULT '0', CHANGE dob dob INT(11) NULL DEFAULT NULL, CHANGE PassResetTime PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL, CHANGE PwRequestTime PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL, CHANGE `Password` `Password` VARCHAR(255) NULL DEFAULT 'd41d8cd98f00b204e9800998ecf8427e'; ALTER TABLE Modules CHANGE BuildDate BuildDate INT UNSIGNED NULL DEFAULT NULL, CHANGE Version Version VARCHAR(10) NOT NULL DEFAULT '0.0.0'; -ALTER TABLE Language CHANGE Enabled Enabled INT(11) NOT NULL DEFAULT '1', CHANGE InputDateFormat InputDateFormat VARCHAR(50) NOT NULL DEFAULT 'm/d/Y', CHANGE InputTimeFormat InputTimeFormat VARCHAR(50) NOT NULL DEFAULT 'g:i:s A', CHANGE DecimalPoint DecimalPoint CHAR(2) NOT NULL DEFAULT ''; +ALTER TABLE Language CHANGE Enabled Enabled INT(11) NOT NULL DEFAULT '1', CHANGE InputDateFormat InputDateFormat VARCHAR(50) NOT NULL DEFAULT 'm/d/Y', CHANGE InputTimeFormat InputTimeFormat VARCHAR(50) NOT NULL DEFAULT 'g:i:s A', CHANGE DecimalPoint DecimalPoint CHAR(2) NOT NULL DEFAULT '', CHANGE ThousandSep ThousandSep TINYTEXT NOT NULL DEFAULT ''; ALTER TABLE Events CHANGE FromUserId FromUserId INT(11) NOT NULL DEFAULT '-1'; ALTER TABLE StdDestinations CHANGE DestAbbr2 DestAbbr2 CHAR(2) NULL DEFAULT NULL; ALTER TABLE PermCache DROP DACL; -ALTER TABLE Images CHANGE LocalThumb LocalThumb TINYINT(4) NOT NULL DEFAULT '1', CHANGE SameImages SameImages TINYINT(4) NOT NULL DEFAULT '1'; +ALTER TABLE Images CHANGE LocalThumb LocalThumb TINYINT(4) NOT NULL DEFAULT '1', CHANGE SameImages SameImages TINYINT(4) NOT NULL DEFAULT '1', CHANGE AltName AltName VARCHAR(255) NOT NULL DEFAULT ''; + ALTER TABLE SearchConfig CHANGE SimpleSearch SimpleSearch TINYINT(4) NOT NULL DEFAULT '1', CHANGE AdvancedSearch AdvancedSearch TINYINT(4) NOT NULL DEFAULT '1', CHANGE ModuleName ModuleName VARCHAR(20) NULL DEFAULT 'In-Portal'; ALTER TABLE ItemReview CHANGE CreatedById CreatedById INT(11) NOT NULL DEFAULT '-1', CHANGE Status Status TINYINT(4) NOT NULL DEFAULT '2'; ALTER TABLE Visits CHANGE PortalUserId PortalUserId INT(11) NOT NULL DEFAULT '-2'; Index: trunk/core/units/modules/modules_config.php =================================================================== diff -u -r7855 -r8015 --- trunk/core/units/modules/modules_config.php (.../modules_config.php) (revision 7855) +++ trunk/core/units/modules/modules_config.php (.../modules_config.php) (revision 8015) @@ -97,10 +97,10 @@ 'Path' => Array('type' => 'string','not_null' => '1','default' => ''), 'Var' => Array('type' => 'string','not_null' => '1','default' => ''), 'Version' => Array('type' => 'string','not_null' => '1','default' => '0.0.0'), - 'Loaded' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => '1','default' => '1'), - 'LoadOrder' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'TemplatePath' => Array('type' => 'string','not_null' => '1','default' => ''), - 'RootCat' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'Loaded' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'LoadOrder' => Array('type' => 'int','not_null' => 1, 'default' => 0), + 'TemplatePath' => Array('type' => 'string','not_null' => 1, 'default' => ''), + 'RootCat' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'BuildDate' => Array('type' => 'double', 'formatter' => 'kDateFormatter', 'not_null' => '1','default' => ''), ), Index: trunk/core/units/configuration/configuration_config.php =================================================================== diff -u -r7855 -r8015 --- trunk/core/units/configuration/configuration_config.php (.../configuration_config.php) (revision 7855) +++ trunk/core/units/configuration/configuration_config.php (.../configuration_config.php) (revision 8015) @@ -59,7 +59,7 @@ 'Fields' => Array( 'VariableId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'VariableName' => Array('type' => 'string','not_null' => '1','default' => ''), - 'VariableValue' => Array('type'=>'string', 'default'=>''), + 'VariableValue' => Array('type'=>'string', 'default' => null), 'ModuleOwner' => Array('type'=>'string', 'default'=>'In-Portal'), 'Section' => Array('type'=>'string','not_null' => '1','default'=>''), ), Index: trunk/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r8002 -r8015 --- trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 8002) +++ trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 8015) @@ -385,7 +385,9 @@ 'type_missing' => 'Type definition for field %s missing in config', ); - $config_errors = Array (); + $config_errors = Array (); + $tablename = preg_replace('/^'.preg_quote(TABLE_PREFIX, '/').'(.*)/', '\\1', $tablename); // remove table prefix + foreach ($res as $field) { $f_name = $field['Field']; @@ -437,7 +439,7 @@ } if ($config_errors) { - $error_prefix = 'Config Error'.(count($config_errors) > 1 ? 's' : '').': for prefix '.$config_link.' in unit config:
'; + $error_prefix = 'Config Error'.(count($config_errors) > 1 ? 's' : '').': for prefix '.$config_link.' ('.$tablename.') in unit config:
'; $config_errors = $error_prefix.'   '.implode('
   ', $config_errors); $debugger->appendHTML($config_errors); @@ -447,7 +449,7 @@ function varDump($value) { - return var_export($value, true).' of '.gettype($value).''; + return ''.var_export($value, true).' of '.gettype($value); } function ProcessDependencies($prefix) Index: trunk/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -r7921 -r8015 --- trunk/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7921) +++ trunk/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 8015) @@ -163,12 +163,12 @@ - + "> " id="" tabindex="" size="" class=""> - + () [upload]" id="[upload]" value=""> @@ -290,7 +290,7 @@ - + "> Index: trunk/core/units/config_search/config_search_config.php =================================================================== diff -u -r7867 -r8015 --- trunk/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 7867) +++ trunk/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 8015) @@ -70,15 +70,15 @@ 'Fields' => Array( 'TableName' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), 'FieldName' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), - 'SimpleSearch' => Array('type' => 'int','not_null' => '1','default' => '1'), - 'AdvancedSearch' => Array('type' => 'int','not_null' => '1','default' => '1'), - 'Description' => Array('type' => 'string','default' => ''), - 'DisplayName' => Array('type' => 'string', 'required' => 1, 'default' => ''), + 'SimpleSearch' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), + 'AdvancedSearch' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), + 'Description' => Array('type' => 'string','default' => null), + 'DisplayName' => Array('type' => 'string', 'required' => 1, 'default' => null), 'ModuleName' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'), - 'ConfigHeader' => Array('type' => 'string', 'required' => 1, 'default' => ''), - 'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'ConfigHeader' => Array('type' => 'string', 'required' => 1, 'default' => null), + 'DisplayOrder' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'SearchConfigId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Priority' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'FieldType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text' => 'text', 'range' => 'range', 'boolean' => 'boolean', 'date' => 'date'), 'not_null' => '1', 'required' => 1, 'default' => 'text'), 'ForeignField' => Array('type' => 'string','default' => null), 'JoinClause' => Array('type' => 'string','default' => null), Index: trunk/core/units/stylesheets/stylesheets_config.php =================================================================== diff -u -r7867 -r8015 --- trunk/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 7867) +++ trunk/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 8015) @@ -106,7 +106,7 @@ 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), 'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''), - 'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => '1','default' => '0'), + 'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0), 'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0), ), Index: trunk/core/units/permissions/permissions_config.php =================================================================== diff -u -r7855 -r8015 --- trunk/core/units/permissions/permissions_config.php (.../permissions_config.php) (revision 7855) +++ trunk/core/units/permissions/permissions_config.php (.../permissions_config.php) (revision 8015) @@ -78,10 +78,10 @@ 'Fields' => Array( 'PermissionId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Permission' => Array('type' => 'string','not_null' => '1','default' => ''), - 'GroupId' => Array('type' => 'int','default' => '0'), - 'PermissionValue' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'Type' => Array('type' => 'int','not_null' => '1','default' => '0'), - 'CatId' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'GroupId' => Array('type' => 'int','default' => 0), + 'PermissionValue' => Array('type' => 'int','not_null' => 1,'default' => 0), + 'Type' => Array('type' => 'int','not_null' => 1,'default' => 0), + 'CatId' => Array('type' => 'int','not_null' => 1,'default' => 0), ), ); Index: trunk/core/units/selectors/selectors_config.php =================================================================== diff -u -r7997 -r8015 --- trunk/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 7997) +++ trunk/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 8015) @@ -88,14 +88,14 @@ ), 'Fields' => Array( 'SelectorId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => '1','default' => '0'), + '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','not_null' => '1','default' => ''), - 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'), + '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','not_null' => '1','default' => ''), - 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => '1','default' => '0'), + 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => 1, 'default' => 0), ), 'VirtualFields' => Array( Index: trunk/kernel/units/config_search/config_search_config.php =================================================================== diff -u -r7867 -r8015 --- trunk/kernel/units/config_search/config_search_config.php (.../config_search_config.php) (revision 7867) +++ trunk/kernel/units/config_search/config_search_config.php (.../config_search_config.php) (revision 8015) @@ -70,15 +70,15 @@ 'Fields' => Array( 'TableName' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), 'FieldName' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), - 'SimpleSearch' => Array('type' => 'int','not_null' => '1','default' => '1'), - 'AdvancedSearch' => Array('type' => 'int','not_null' => '1','default' => '1'), - 'Description' => Array('type' => 'string','default' => ''), - 'DisplayName' => Array('type' => 'string', 'required' => 1, 'default' => ''), + 'SimpleSearch' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), + 'AdvancedSearch' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), + 'Description' => Array('type' => 'string','default' => null), + 'DisplayName' => Array('type' => 'string', 'required' => 1, 'default' => null), 'ModuleName' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'), - 'ConfigHeader' => Array('type' => 'string', 'required' => 1, 'default' => ''), - 'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'ConfigHeader' => Array('type' => 'string', 'required' => 1, 'default' => null), + 'DisplayOrder' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'SearchConfigId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Priority' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'FieldType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text' => 'text', 'range' => 'range', 'boolean' => 'boolean', 'date' => 'date'), 'not_null' => '1', 'required' => 1, 'default' => 'text'), 'ForeignField' => Array('type' => 'string','default' => null), 'JoinClause' => Array('type' => 'string','default' => null), Index: trunk/kernel/units/stylesheets/stylesheets_config.php =================================================================== diff -u -r7867 -r8015 --- trunk/kernel/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 7867) +++ trunk/kernel/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 8015) @@ -106,7 +106,7 @@ 'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), 'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''), - 'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => '1','default' => '0'), + 'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0), 'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0), ), Index: trunk/kernel/units/selectors/selectors_config.php =================================================================== diff -u -r7997 -r8015 --- trunk/kernel/units/selectors/selectors_config.php (.../selectors_config.php) (revision 7997) +++ trunk/kernel/units/selectors/selectors_config.php (.../selectors_config.php) (revision 8015) @@ -88,14 +88,14 @@ ), 'Fields' => Array( 'SelectorId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => '1','default' => '0'), + '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','not_null' => '1','default' => ''), - 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'), + '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','not_null' => '1','default' => ''), - 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => '1','default' => '0'), + 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => 1, 'default' => 0), ), 'VirtualFields' => Array(