Index: trunk/kernel/units/users/users_config.php =================================================================== diff -u -r3576 -r3840 --- trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 3576) +++ trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 3840) @@ -9,9 +9,9 @@ 'RegisterClasses' => Array( Array('pseudo' => 'UsersSyncronizeManager', 'class' => 'UsersSyncronizeManager', 'file' => 'users_syncronize.php', 'build_event' => ''), ), - + 'AutoLoad' => true, - 'Hooks' => Array( + 'Hooks' => Array( Array( 'Mode' => hAFTER, 'Conditional' => false, @@ -22,7 +22,7 @@ 'DoSpecial' => '', 'DoEvent' => 'OnPrepareStates', ), - + Array( 'Mode' => hBEFORE, 'Conditional' => false, @@ -32,36 +32,36 @@ 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnSubstituteSubscriber', - ), - + ), + ), 'QueryString' => Array( 1 => 'id', 2 => 'page', 3 => 'event', ), - + 'RegularEvents' => Array( 'membership_expiration' => Array('EventName' => 'OnCheckExpiredMembership', 'RunInterval' => 1800, 'Type' => reAFTER), ), - + 'IDField' => 'PortalUserId', 'ItemType' => 6, // used for custom fields only (on user's case) 'TableName' => TABLE_PREFIX.'PortalUser', - + 'ListSQLs' => Array( ''=>'SELECT * FROM %s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', ), - 'ListSortings' => Array( + 'ListSortings' => Array( '' => Array( 'Sorting' => Array('Login' => 'asc'), ) ), - + 'SubItems' => Array('addr'), - + 'Fields' => Array ( 'PortalUserId' => Array(), @@ -74,20 +74,20 @@ 'Phone' => Array('type' => 'string','default' => ''), 'Street' => Array('type' => 'string','default' => ''), 'City' => Array('type' => 'string','default' => ''), - 'State' => Array('formatter'=>'kOptionsFormatter', + 'State' => Array('formatter'=>'kOptionsFormatter', 'options' => Array(), 'option_key_field'=>'DestAbbr','option_title_field'=>'Translation', 'not_null' => '1','default' => ''), 'Zip' => Array('type' => 'string','default' => ''), - 'Country' => Array('formatter'=>'kOptionsFormatter', - 'options_sql'=>'SELECT %s + 'Country' => Array('formatter'=>'kOptionsFormatter', + 'options_sql'=>'SELECT %1$s FROM '.TABLE_PREFIX.'StdDestinations LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = '.TABLE_PREFIX.'StdDestinations.DestName WHERE DestType=1 AND - LanguageId = 1 + LanguageId = %2$s ORDER BY Translation', 'option_key_field'=>'DestAbbr','option_title_field'=>'Translation', 'not_null' => '1','default' => ''), @@ -102,15 +102,15 @@ 'PwResetConfirm' => Array('type' => 'string','default' => ''), 'PwRequestTime' => Array('type' => 'int','default' => ''), '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' => 30), - ), - + ), + 'VirtualFields' => Array( 'ValidateLogin' => Array('type'=>'string','default'=>''), 'SubscribeEmail' => Array('type'=>'string','default'=>''), ), - + 'Grids' => Array(), - + ); ?> \ No newline at end of file