Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tools/system_tools.tpl =================================================================== diff -u -r7698 -r7853 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tools/system_tools.tpl (.../system_tools.tpl) (revision 7698) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tools/system_tools.tpl (.../system_tools.tpl) (revision 7853) @@ -10,19 +10,30 @@ : - + ]" value="Go"> -   - - - - - + + + + + + + + "> + + + +
+ : + + + +
\ No newline at end of file Index: branches/unlabeled/unlabeled-1.5.2/core/units/reviews/reviews_config.php =================================================================== diff -u -r7656 -r7853 --- branches/unlabeled/unlabeled-1.5.2/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 7656) +++ branches/unlabeled/unlabeled-1.5.2/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 7853) @@ -95,7 +95,7 @@ ), 'Fields' => Array( - 'ReviewId' => Array('type'=>'int'), + 'ReviewId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'CreatedOn' => Array('formatter'=>'kDateFormatter','not_null'=>1,'default'=>'#NOW#'), 'ReviewText' => Array('type'=>'string','required'=>1,'not_null'=>1,'default'=>''), 'IPAddress' => Array('type'=>'string','max_value_inc'=>15,'not_null'=>1,'default'=>''), Index: branches/unlabeled/unlabeled-1.9.2/core/units/config_search/config_search_config.php =================================================================== diff -u -r6628 -r7853 --- branches/unlabeled/unlabeled-1.9.2/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 6628) +++ branches/unlabeled/unlabeled-1.9.2/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 7853) @@ -77,7 +77,7 @@ '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'), - 'SearchConfigId' => Array('type' => 'int','not_null' => '1','default' => ''), + 'SearchConfigId' => 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), Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/inportal_upgrade_v4.0.2.sql =================================================================== diff -u -r7849 -r7853 --- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/inportal_upgrade_v4.0.2.sql (.../inportal_upgrade_v4.0.2.sql) (revision 7849) +++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/inportal_upgrade_v4.0.2.sql (.../inportal_upgrade_v4.0.2.sql) (revision 7853) @@ -18,4 +18,9 @@ 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 SearchConfig CHANGE SimpleSearch SimpleSearch TINYINT(4) NOT NULL DEFAULT '1', CHANGE AdvancedSearch AdvancedSearch TINYINT(4) NOT NULL DEFAULT '1'; +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'; + UPDATE Modules SET Version = '4.0.2' WHERE Name = 'In-Portal'; \ No newline at end of file Index: branches/unlabeled/unlabeled-1.5.2/kernel/units/reviews/reviews_config.php =================================================================== diff -u -r7656 -r7853 --- branches/unlabeled/unlabeled-1.5.2/kernel/units/reviews/reviews_config.php (.../reviews_config.php) (revision 7656) +++ branches/unlabeled/unlabeled-1.5.2/kernel/units/reviews/reviews_config.php (.../reviews_config.php) (revision 7853) @@ -95,7 +95,7 @@ ), 'Fields' => Array( - 'ReviewId' => Array('type'=>'int'), + 'ReviewId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'CreatedOn' => Array('formatter'=>'kDateFormatter','not_null'=>1,'default'=>'#NOW#'), 'ReviewText' => Array('type'=>'string','required'=>1,'not_null'=>1,'default'=>''), 'IPAddress' => Array('type'=>'string','max_value_inc'=>15,'not_null'=>1,'default'=>''), Index: branches/unlabeled/unlabeled-1.9.2/kernel/units/config_search/config_search_config.php =================================================================== diff -u -r6628 -r7853 --- branches/unlabeled/unlabeled-1.9.2/kernel/units/config_search/config_search_config.php (.../config_search_config.php) (revision 6628) +++ branches/unlabeled/unlabeled-1.9.2/kernel/units/config_search/config_search_config.php (.../config_search_config.php) (revision 7853) @@ -77,7 +77,7 @@ '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'), - 'SearchConfigId' => Array('type' => 'int','not_null' => '1','default' => ''), + 'SearchConfigId' => 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), Index: branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r7829 -r7853 --- branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 7829) +++ branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 7853) @@ -362,7 +362,7 @@ $config =& $this->configData[$prefix]; $tablename = $config['TableName']; - + $float_types = Array ('float', 'double', 'numeric'); $conn =& $this->Application->GetADODBConnection(); $table_found = $conn->Query('SHOW TABLES LIKE "'.$tablename.'"'); @@ -410,7 +410,7 @@ $debugger->appendHTML("Config Error: Default value for field IDField $f_name (".var_export($options['default'], true).") in config for prefix ".$config_link." differs from default value from field in database (".var_export($field['Default'], true).") !"); safeDefine('DBG_RAISE_ON_WARNINGS', 1); } - else if ($options['default'] != '#NOW#' && $field['Default'] !== (string)$options['default']) { + else if ($options['default'] != '#NOW#' && $field['Default'] !== (string)$options['default'] && !in_array($options['type'], $float_types)) { $debugger->appendHTML("Config Error: Default value for field $f_name (".var_export($options['default'], true).") in config for prefix ".$config_link." differs from default value from field in database (".var_export($field['Default'], true).") !"); // $debugger->dumpVars($field['Default'], $options['default'], 'STRICT'); safeDefine('DBG_RAISE_ON_WARNINGS', 1); Index: branches/unlabeled/unlabeled-1.7.26/core/units/selectors/selectors_config.php =================================================================== diff -u -r3106 -r7853 --- branches/unlabeled/unlabeled-1.7.26/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 3106) +++ branches/unlabeled/unlabeled-1.7.26/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 7853) @@ -87,7 +87,7 @@ ) ), 'Fields' => Array( - 'SelectorId' => 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'), '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), Index: branches/unlabeled/unlabeled-1.64.2/admin/install/inportal_schema.sql =================================================================== diff -u -r7775 -r7853 --- branches/unlabeled/unlabeled-1.64.2/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 7775) +++ branches/unlabeled/unlabeled-1.64.2/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 7853) @@ -52,8 +52,8 @@ ThumbUrl varchar(255) default NULL, Priority int(11) NOT NULL default '0', ThumbPath varchar(255) default NULL, - LocalThumb tinyint(4) NOT NULL default '0', - SameImages tinyint(4) NOT NULL default '0', + LocalThumb tinyint(4) NOT NULL default '1', + SameImages tinyint(4) NOT NULL default '1', PRIMARY KEY (ImageId), KEY ResourceId (ResourceId) ) @@ -77,10 +77,10 @@ ReviewText longtext NOT NULL, IPAddress varchar(255) NOT NULL default '', ItemId int(11) NOT NULL default '0', - CreatedById 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 '0', + Status tinyint(4) NOT NULL default '2', TextFormat int(11) NOT NULL default '0', Module varchar(255) NOT NULL default '', PRIMARY KEY (ReviewId) @@ -127,8 +127,8 @@ CREATE TABLE SearchConfig ( TableName varchar(40) NOT NULL default '', FieldName varchar(40) NOT NULL default '', - SimpleSearch tinyint(4) NOT NULL default '0', - AdvancedSearch tinyint(4) NOT NULL default '0', + SimpleSearch tinyint(4) NOT NULL default '1', + AdvancedSearch tinyint(4) NOT NULL default '1', Description varchar(255) default NULL, DisplayName varchar(80) default NULL, ModuleName varchar(20) default NULL, @@ -271,7 +271,7 @@ 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 '0', + PortalUserId int(11) NOT NULL default '-2', PRIMARY KEY (VisitId), KEY PortalUserId (PortalUserId), KEY AffiliateId (AffiliateId) Index: branches/unlabeled/unlabeled-1.7.26/kernel/units/selectors/selectors_config.php =================================================================== diff -u -r3106 -r7853 --- branches/unlabeled/unlabeled-1.7.26/kernel/units/selectors/selectors_config.php (.../selectors_config.php) (revision 3106) +++ branches/unlabeled/unlabeled-1.7.26/kernel/units/selectors/selectors_config.php (.../selectors_config.php) (revision 7853) @@ -87,7 +87,7 @@ ) ), 'Fields' => Array( - 'SelectorId' => 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'), '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), Index: branches/unlabeled/unlabeled-1.23.2/core/units/visits/visits_config.php =================================================================== diff -u -r7645 -r7853 --- branches/unlabeled/unlabeled-1.23.2/core/units/visits/visits_config.php (.../visits_config.php) (revision 7645) +++ branches/unlabeled/unlabeled-1.23.2/core/units/visits/visits_config.php (.../visits_config.php) (revision 7853) @@ -92,7 +92,7 @@ ), 'Fields' => Array( - 'VisitId' => Array('type' => 'int'), + 'VisitId' => Array('type' => 'int', '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' => ''), Index: branches/unlabeled/unlabeled-1.5.2/core/units/relationship/relationship_config.php =================================================================== diff -u -r6134 -r7853 --- branches/unlabeled/unlabeled-1.5.2/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 6134) +++ branches/unlabeled/unlabeled-1.5.2/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 7853) @@ -77,7 +77,7 @@ 'ItemSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s #ITEM_JOIN#',), 'Fields' => Array( - 'RelationshipId' => Array(), + 'RelationshipId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'SourceId' => Array('type'=>'int', 'required' => 1, 'default' => 0), 'TargetId' => Array('type'=>'int', 'required' => 1, 'default' => ''), 'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0), Index: branches/unlabeled/unlabeled-1.23.2/kernel/units/visits/visits_config.php =================================================================== diff -u -r7645 -r7853 --- branches/unlabeled/unlabeled-1.23.2/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 7645) +++ branches/unlabeled/unlabeled-1.23.2/kernel/units/visits/visits_config.php (.../visits_config.php) (revision 7853) @@ -92,7 +92,7 @@ ), 'Fields' => Array( - 'VisitId' => Array('type' => 'int'), + 'VisitId' => Array('type' => 'int', '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' => ''), Index: branches/unlabeled/unlabeled-1.5.2/kernel/units/relationship/relationship_config.php =================================================================== diff -u -r6134 -r7853 --- branches/unlabeled/unlabeled-1.5.2/kernel/units/relationship/relationship_config.php (.../relationship_config.php) (revision 6134) +++ branches/unlabeled/unlabeled-1.5.2/kernel/units/relationship/relationship_config.php (.../relationship_config.php) (revision 7853) @@ -77,7 +77,7 @@ 'ItemSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s #ITEM_JOIN#',), 'Fields' => Array( - 'RelationshipId' => Array(), + 'RelationshipId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'SourceId' => Array('type'=>'int', 'required' => 1, 'default' => 0), 'TargetId' => Array('type'=>'int', 'required' => 1, 'default' => ''), 'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0),