Index: core/units/relationship/relationship_config.php =================================================================== --- core/units/relationship/relationship_config.php (revision 13213) +++ core/units/relationship/relationship_config.php (working copy) @@ -97,7 +97,12 @@ 'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'TargetType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'Type' => Array('type'=>'int','formatter'=>'kOptionsFormatter', 'required' => 1, 'options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'), 'not_null'=>1,'default'=>0,'use_phrases'=>1), - 'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'), 'not_null' => 1, 'default'=>1, 'use_phrases'=>1), + 'Enabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1, + ), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), ), 'VirtualFields' => Array( Index: core/units/custom_fields/custom_fields_config.php =================================================================== --- core/units/custom_fields/custom_fields_config.php (revision 13213) +++ core/units/custom_fields/custom_fields_config.php (working copy) @@ -87,22 +87,43 @@ ), 'SubItems' => Array('confs-cf'), - 'Fields' => Array( + 'Fields' => Array ( 'CustomFieldId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Type' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'FieldName' => Array('required'=>'1', 'type' => 'string','not_null' => 1,'default' => ''), 'FieldLabel' => Array('type' => 'string', 'required' => 1, 'default' => null), - 'MultiLingual' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'MultiLingual' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1, + ), 'Heading' => Array('type' => 'string', 'required' => 1, 'default' => null), 'Prompt' => Array('type' => 'string','default' => null), 'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'multiselect' => 'la_type_multiselect', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_checkbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label', 'date' => 'la_type_date', 'datetime' => 'la_type_datetime')), 'ValueList' => Array('type' => 'string','default' => null), 'DefaultValue' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'DisplayOrder' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'OnGeneralTab' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'IsRequired' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - ), + 'OnGeneralTab' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'IsSystem' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'IsRequired' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + ), + 'VirtualFields' => Array( 'Value' => Array('type' => 'string', 'default' => ''), 'OriginalValue' => Array('type' => 'string', 'default' => ''), Index: core/units/languages/languages_config.php =================================================================== --- core/units/languages/languages_config.php (revision 13213) +++ core/units/languages/languages_config.php (working copy) @@ -16,10 +16,10 @@ $config = Array( 'Prefix' => 'lang', - 'ItemClass' => Array('class'=>'LanguagesItem','file'=>'languages_item.php','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'LanguagesEventHandler','file'=>'languages_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'LanguagesTagProcessor','file'=>'languages_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array('class' => 'LanguagesItem', 'file' => 'languages_item.php', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array('class' => 'LanguagesEventHandler', 'file' => 'languages_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array('class' => 'LanguagesTagProcessor', 'file' => 'languages_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'Hooks' => Array( @@ -61,7 +61,7 @@ 'Conditional' => false, 'HookToPrefix' => 'lang', 'HookToSpecial' => '*', - 'HookToEvent' => Array('OnSave','OnMassDelete'), + 'HookToEvent' => Array('OnSave', 'OnMassDelete'), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnScheduleTopFrameReload', @@ -76,14 +76,14 @@ ), 'IDField' => 'LanguageId', - 'StatusField' => Array('Enabled','PrimaryLang'), // field, that is affected by Approve/Decline events + 'StatusField' => Array('Enabled', 'PrimaryLang'), // field, that is affected by Approve/Decline events 'TitleField' => 'PackName', // field, used in bluebar when editing existing item 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('lang'=>'!la_title_Adding_Language!'), - 'edit_status_labels' => Array('lang'=>'!la_title_Editing_Language!'), - 'new_titlefield' => Array('lang'=>''), + 'default' => Array( 'new_status_labels' => Array('lang' => '!la_title_Adding_Language!'), + 'edit_status_labels' => Array('lang' => '!la_title_Editing_Language!'), + 'new_titlefield' => Array('lang' => ''), ), 'languages_list' => Array( @@ -93,11 +93,11 @@ 'languages_edit_general' => Array( 'prefixes' => Array('lang'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_General!"), - 'phrases_list' => Array( 'prefixes' => Array('lang','phrases_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_Labels!"), + 'phrases_list' => Array( 'prefixes' => Array('lang', 'phrases_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_Labels!"), 'phrase_edit' => Array ( 'prefixes' => Array('phrases'), - 'new_status_labels' => Array('phrases'=>'!la_title_Adding_Phrase!'), + 'new_status_labels' => Array('phrases' => '!la_title_Adding_Phrase!'), 'edit_status_labels' => Array('phrases' => '!la_title_Editing_Phrase!'), 'format' => "#phrases_status# '#phrases_titlefield#'" ), @@ -110,13 +110,13 @@ 'export_language_results' => Array( 'prefixes' => Array(), 'format' => "!la_title_ExportLanguagePackResults!"), - 'events_list' => Array( 'prefixes' => Array('lang','emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!"), + 'events_list' => Array( 'prefixes' => Array('lang', 'emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!"), 'event_edit' => Array( 'prefixes' => Array('emailevents'), 'edit_status_labels' => Array('emailevents' => '!la_title_Editing_EmailEvent!'), 'format' => '#emailevents_status# - #emailevents_titlefield#'), - 'email_messages_edit' => Array( 'prefixes' => Array('lang','emailmessages'), + 'email_messages_edit' => Array( 'prefixes' => Array('lang', 'emailmessages'), 'new_titlefield' => Array('emailmessages' => ''), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailmessages_titlefield#'"), @@ -159,7 +159,7 @@ ), 'TableName' => TABLE_PREFIX.'Language', - 'SubItems' => Array('phrases','emailmessages'), + 'SubItems' => Array('phrases', 'emailmessages'), 'FilterMenu' => Array( 'Groups' => Array( @@ -176,9 +176,9 @@ 'AutoClone' => true, - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', + 'ListSQLs' => Array( '' => 'SELECT * FROM %s', ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', + 'ItemSQLs' => Array( '' => 'SELECT * FROM %s', ), 'ListSortings' => Array ( '' => Array ( @@ -195,37 +195,42 @@ 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language ORDER BY PackName', 'option_title_field' => 'PackName', 'option_key_field' => 'PackName', - 'not_null' => 1, 'required' => 1, 'default' => '' + 'not_null' => 1, 'required' => 1, 'default' => '', ), - - 'LocalName' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language ORDER BY PackName', 'option_title_field' => 'LocalName', 'option_key_field' => 'LocalName', - 'not_null' => 1, 'required' => 1, 'default' => '' + 'not_null' => 1, 'required' => 1, 'default' => '', ), - - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Active'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'Enabled' => Array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array( + 0 => 'la_Disabled', + 1 => 'la_Active', + ), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), 'PrimaryLang' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'AdminInterfaceLang' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'IconURL' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), 'IconDisabledURL' => Array ('type' => 'string', 'max_len' => 255, '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' => 'mm/dd/yyyy', 'd/m/Y' => 'dd/mm/yyyy', 'm.d.Y' => 'mm.dd.yyyy', 'd.m.Y' => 'dd.mm.yyyy'), '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, 'required' => 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), + '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' => 'mm/dd/yyyy', 'd/m/Y' => 'dd/mm/yyyy', 'm.d.Y' => 'mm.dd.yyyy', 'd.m.Y' => 'dd.mm.yyyy'), '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, 'required' => 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), 'FilenameReplacements' => Array ('type' => 'string', 'default' => NULL), - 'Locale' => Array('type' => 'string','not_null' => 1, 'default' => 'en-US', 'formatter' => 'kOptionsFormatter', + 'Locale' => Array('type' => 'string', 'not_null' => 1, 'default' => 'en-US', 'formatter' => 'kOptionsFormatter', 'options' => Array('' => ''), - 'options_sql' => "SELECT CONCAT(LocaleName, ' ' ,'\/',Locale,'\/') AS name, Locale FROM ".TABLE_PREFIX."LocalesList ORDER BY LocaleId", 'option_title_field' => "name", 'option_key_field' => 'Locale', + 'options_sql' => "SELECT CONCAT(LocaleName, ' ' , '\/',Locale, '\/') AS name, Locale FROM ".TABLE_PREFIX."LocalesList ORDER BY LocaleId", 'option_title_field' => "name", 'option_key_field' => 'Locale', ), 'UserDocsUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), ), @@ -252,8 +257,6 @@ 'Charset' => Array ('title' => 'la_col_Charset', 'filter_block' => 'grid_like_filter', 'width' => 100, ), 'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_like_filter', 'width' => 60, ), 'Enabled' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 60, ), - - ), ), Index: core/units/phrases/phrases_config.php =================================================================== --- core/units/phrases/phrases_config.php (revision 13213) +++ core/units/phrases/phrases_config.php (working copy) @@ -133,21 +133,21 @@ 'Phrase' => Array ( 'type' => 'string', 'required' => 1, 'unique' => Array ('LanguageId'), - 'not_null' => 1, 'default' => '' + 'not_null' => 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, - 'not_null' => 1, 'required' => 1, 'default' => 0 + 'not_null' => 1, 'required' => 1, 'default' => 0, ), 'PhraseId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'LanguageId' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Language ORDER BY LocalName', 'option_key_field' => 'LanguageId', 'option_title_field' => 'LocalName', - 'not_null' => 1, 'default' => 0 + 'not_null' => 1, 'default' => 0, ), 'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), @@ -155,7 +155,7 @@ 'Module' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ('' => ''), 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Modules WHERE (Loaded = 1) AND (Name <> "In-Portal") ORDER BY LoadOrder', 'option_key_field' => 'Name', 'option_title_field' => 'Name', - 'not_null' => 1, 'default' => 'Core' + 'not_null' => 1, 'default' => 'Core', ), ), @@ -167,8 +167,24 @@ 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => WRITEBALE_BASE . '/', 'max_len' => 255, 'default' => '' ), - 'ImportOverwrite' => Array ('type' => 'int', 'default' => 0), - 'DoNotEncode' => Array (), + 'ImportOverwrite' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array( + 0 => 'la_No', + 1 => 'la_Yes', + ), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + ), + 'DoNotEncode' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array( + 0 => 'la_No', + 1 => 'la_Yes', + ), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + ), 'PackName' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', Index: core/units/reviews/reviews_config.php =================================================================== --- core/units/reviews/reviews_config.php (revision 13213) +++ core/units/reviews/reviews_config.php (working copy) @@ -18,7 +18,7 @@ 'Prefix' => 'rev', 'Clones' => Array ( - 'l-rev' => Array( + 'l-rev' => Array ( 'ParentPrefix' => 'l', 'ConfigMapping' => Array ( 'PerPage' => 'Perpage_LinkReviews', @@ -69,10 +69,10 @@ ), ), - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'ReviewsEventHandler','file'=>'reviews_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'ReviewsTagProcessor','file'=>'reviews_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'ReviewsEventHandler', 'file' => 'reviews_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'ReviewsTagProcessor', 'file' => 'reviews_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'QueryString' => Array ( @@ -91,7 +91,7 @@ ), 'IDField' => 'ReviewId', - 'StatusField' => Array('Status'), // field, that is affected by Approve/Decline events + 'StatusField' => Array ('Status'), // field, that is affected by Approve/Decline events 'TableName' => TABLE_PREFIX.'ItemReview', 'ParentTableKey' => 'ResourceId', // linked field in master table 'ForeignKey' => 'ItemId', // linked field in subtable @@ -100,21 +100,21 @@ 'AutoClone' => true, 'TitlePresets' => Array ( - 'reviews_edit' => Array('format' => "!la_title_Editing_Review!"), + 'reviews_edit' => Array ('format' => "!la_title_Editing_Review!"), - 'reviews' => Array( - 'toolbar_buttons' => Array('edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), + 'reviews' => Array ( + 'toolbar_buttons' => Array ('edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), ), ), 'FilterMenu' => Array ( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER), + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER), ), - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_pending' => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), + 'Filters' => Array ( + 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), + 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), + 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), ) ), @@ -139,46 +139,95 @@ // key - special, value - list select sql 'ListSQLs' => Array ( '' => ' SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', + FROM %1$s + LEFT JOIN ' . TABLE_PREFIX . 'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', 'products' => ' SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'Products pr ON pr.ResourceId = %1$s.ItemId - LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', + FROM %1$s + LEFT JOIN ' . TABLE_PREFIX . 'Products pr ON pr.ResourceId = %1$s.ItemId + LEFT JOIN ' . TABLE_PREFIX . 'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', 'product' => ' SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'Products pr ON pr.ResourceId = %1$s.ItemId - LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', + FROM %1$s + LEFT JOIN ' . TABLE_PREFIX . 'Products pr ON pr.ResourceId = %1$s.ItemId + LEFT JOIN ' . TABLE_PREFIX . 'PortalUser pu ON pu.PortalUserId = %1$s.CreatedById', ), 'ItemSQLs' => Array ('' => 'SELECT * FROM %s'), 'ListSortings' => Array ( - '' => Array( - 'ForcedSorting' => Array('Priority' => 'desc'), - 'Sorting' => Array('CreatedOn' => 'desc'), + '' => Array ( + 'ForcedSorting' => Array ('Priority' => 'desc'), + 'Sorting' => Array ('CreatedOn' => 'desc'), ) ), '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, '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), - 'CreatedById' => 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', 'required'=>1, 'not_null'=>1, 'default'=>-1), - 'ItemType' => Array('type'=>'int', 'not_null'=>1, 'default'=>0), - 'Priority' => Array('type'=>'int', 'not_null'=>1, 'default'=>0), - 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_Active', 2=>'la_Pending', 0=>'la_Disabled'), 'not_null'=>1, 'default'=>2 ), - 'TextFormat' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_text', 1 => 'la_html'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'Module' => Array('type'=>'string', 'not_null'=>1, 'default'=>''), + 'ReviewId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'CreatedOn' => Array ( + 'type' => 'int', + 'formatter' => 'kDateFormatter', 'default' => '#NOW#', + ), + 'ReviewText' => Array ( + 'type' => 'string', + 'formatter' => 'kFormatter', + 'using_fck' => 1, 'default' => null, 'required' => 1, + ), + '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 + ), + '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', + 'required' => 1, 'not_null' => 1, 'default' => -1, + 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), + ), + 'ItemType' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, + 'options' => Array ( + 0 => 'la_Disabled', + 1 => 'la_Active', + 2 => 'la_Pending', + ), + 'not_null' =>1, 'default' => 2, + ), + 'TextFormat' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_text', 1 => 'la_html'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Module' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), ), 'VirtualFields' => Array ( - 'ReviewedBy' => Array('type' => 'string', 'default' => ''), + 'ReviewedBy' => Array ('type' => 'string', 'default' => ''), 'CatalogItemName' => Array ('type' => 'string', 'default' => ''), 'CatalogItemId' => Array ('type' => 'int', 'default' => 0), 'CatalogItemCategory' => Array ('type' => 'int', 'default' => 0), @@ -194,11 +243,11 @@ ), 'Fields' => Array ( 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ), - 'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'CreatedOn' => Array( 'title'=>'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), - 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ), - 'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ), + 'ReviewText' => Array ( 'title' => 'la_col_ReviewText', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ), + 'ReviewedBy' => Array ( 'title' => 'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'CreatedOn' => Array ( 'title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ), + 'Rating' => Array ( 'title' => 'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ), ), ), @@ -211,11 +260,11 @@ ), 'Fields' => Array ( 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ), - 'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'CreatedOn' => Array( 'title'=>'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), - 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ), - 'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ), + 'ReviewText' => Array ( 'title' => 'la_col_ReviewText', 'data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ), + 'ReviewedBy' => Array ( 'title' => 'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'CreatedOn' => Array ( 'title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ), + 'Rating' => Array ( 'title' => 'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ), ), ), ), Index: core/units/files/files_config.php =================================================================== --- core/units/files/files_config.php (revision 13213) +++ core/units/files/files_config.php (working copy) @@ -73,11 +73,21 @@ 'type' => 'string', 'max_len' => 255, 'formatter' => 'kUploadFormatter', 'upload_dir' => ITEM_FILES_PATH, 'include_path' => false, 'size_field' => 'Size', 'content_type_field' => 'MimeType', 'max_size' => 50000000, - 'allowed_types' => Array ('video/x-flv', 'video/quicktime', 'video/x-sgi-movie', 'video/mpeg', 'video/x-msvideo', 'video/x-msvideo', 'application/x-shockwave-flash', 'video/x-fli', 'application/pdf', 'application/msexcel', 'application/vnd.ms-excel', 'application/msword', 'application/mspowerpoint', 'application/zip', 'plain/text', 'application/x-gzip'), + 'allowed_types' => Array ( + 'video/x-flv', 'video/quicktime', 'video/x-sgi-movie', 'video/mpeg', + 'video/x-msvideo', 'video/x-msvideo', 'application/x-shockwave-flash', 'video/x-fli', + 'application/pdf', 'application/msexcel', 'application/vnd.ms-excel', 'application/msword', + 'application/mspowerpoint', 'application/zip', 'plain/text', 'application/x-gzip', + ), 'not_null' => 1, 'required' => 1, 'default' => '' ), '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), + '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', 'default' => '#NOW#'), 'CreatedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => -1), 'MimeType' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), Index: core/units/images/images_config.php =================================================================== --- core/units/images/images_config.php (revision 13213) +++ core/units/images/images_config.php (working copy) @@ -116,53 +116,66 @@ 'Sorting' => Array('Name' => 'asc'), ) ), - 'Fields' => Array( - 'ImageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - '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, '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, - 'allowed_types' => Array( - 'image/jpeg', - 'image/pjpeg', - 'image/png', - 'image/x-png', - 'image/gif', - 'image/bmp' - ), - 'error_msgs' => Array( 'bad_file_format' => '!la_error_InvalidFileFormat!', - 'bad_file_size' => '!la_error_FileTooLarge!', - 'cant_save_file' => '!la_error_cant_save_file!' - ) - ), - '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' => null), - 'Priority' => Array('type'=>'int', 'default' => 0, 'not_null'=>1), - 'ThumbPath' => Array('type' => 'string', 'formatter'=>'kPictureFormatter', 'skip_empty'=>1, 'max_len' => 255, 'default' => null, - 'allowed_types' => Array( - 'image/jpeg', - 'image/pjpeg', - 'image/png', - 'image/x-png', - 'image/gif', - 'image/bmp' - ), - 'error_msgs' => Array( 'bad_file_format' => '!la_error_InvalidFileFormat!', - 'bad_file_size' => '!la_error_FileTooLarge!', - 'cant_save_file' => '!la_error_cant_save_file!' - ) - ), - 'LocalThumb' => Array('type'=>'int', 'default' => 1, 'not_null'=>1), - 'SameImages' => Array('type'=>'int', 'default' => 1, 'not_null'=>1), - ), - 'VirtualFields' => Array( - 'Preview' => Array(), - 'ImageUrl' => Array(), - ), + 'Fields' => Array ( + 'ImageId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + '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, '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, + 'allowed_types' => Array( + 'image/jpeg', 'image/pjpeg', 'image/png', + 'image/x-png', 'image/gif', 'image/bmp' + ), + 'error_msgs' => Array( + 'bad_file_format' => '!la_error_InvalidFileFormat!', + 'bad_file_size' => '!la_error_FileTooLarge!', + 'cant_save_file' => '!la_error_cant_save_file!', + ), + ), + 'Enabled' => Array ( + 'type' => 'int', 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled',), + 'default' => 0, 'not_null' => 1, 'use_phrases' => 1, + ), + 'DefaultImg' => Array ( + 'type' => 'int', 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'default' => 0, 'not_null' => 1, 'use_phrases' => 1, + ), + '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' => 240, 'default' => '', + 'not_null' => 1, 'include_path' => 1, + 'allowed_types' => Array( + 'image/jpeg', 'image/pjpeg', 'image/png', + 'image/x-png', 'image/gif', 'image/bmp' + ), + 'error_msgs' => Array( + 'bad_file_format' => '!la_error_InvalidFileFormat!', + 'bad_file_size' => '!la_error_FileTooLarge!', + 'cant_save_file' => '!la_error_cant_save_file!', + ), + ), + 'LocalThumb' => Array('type' => 'int', 'default' => 1, 'not_null'=>1), + 'SameImages' => Array ( + 'type' => 'int', 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'default' => 1, 'not_null' => 1, 'use_phrases' => 1, + ), + ), + + 'VirtualFields' => Array( + 'Preview' => Array(), + 'ImageUrl' => Array(), + ), 'Grids' => Array( 'Default' => Array( Index: core/units/categories/categories_config.php =================================================================== --- core/units/categories/categories_config.php (revision 13213) +++ core/units/categories/categories_config.php (working copy) @@ -293,10 +293,20 @@ 'ParentId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'not_null' => 1,'default' => 0, 'required' => 1), '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), + 'AutomaticFilename' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'default' => 1, 'not_null' => 1, + ), 'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => null), 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), - 'EditorsPick' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'EditorsPick' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), '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), 'MetaKeywords' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), @@ -336,14 +346,16 @@ 'UseExternalUrl' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0 + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, ), 'ExternalUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'UseMenuIconUrl' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0 + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, ), 'MenuIconUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'Title' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => '', 'not_null'=>1), Index: core/units/related_searches/related_searches_config.php =================================================================== --- core/units/related_searches/related_searches_config.php (revision 13213) +++ core/units/related_searches/related_searches_config.php (working copy) @@ -78,7 +78,12 @@ 'ResourceId' => Array('type'=>'int', 'not_null' => 1, 'required' => 1, 'default' => 0), 'Keyword' => Array('type'=>'string', 'required' => 1, 'not_null' => 1, 'default' => ''), 'ItemType' => Array('type'=>'int', 'not_null' => 1, 'required' => 1, 'default' => 0), - 'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'),'not_null'=>1,'default'=>1,'use_phrases'=>1), + 'Enabled' => Array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1, + ), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), ), 'VirtualFields' => Array( Index: core/units/themes/themes_config.php =================================================================== --- core/units/themes/themes_config.php (revision 13213) +++ core/units/themes/themes_config.php (working copy) @@ -130,14 +130,25 @@ 'Fields' => Array( 'ThemeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => 1, 'required' => 1, 'default' => ''), - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1=>'la_Active', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => 1, 'default' => 1), + 'Enabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_Disabled', 1 => 'la_Enabled'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), - 'PrimaryTheme' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), + 'PrimaryTheme' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), 'CacheTimeout' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'StylesheetId' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Stylesheets', 'option_key_field' => 'StylesheetId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0), 'LanguagePackInstalled' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0 ), 'TemplateAliases' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => 'a:0:{}'),