Index: branches/5.2.x/core/units/users/users_config.php =================================================================== diff -u -N -r14617 -r14630 --- branches/5.2.x/core/units/users/users_config.php (.../users_config.php) (revision 14617) +++ branches/5.2.x/core/units/users/users_config.php (.../users_config.php) (revision 14630) @@ -1,6 +1,6 @@ Array ('formatter' => 'kDateFormatter', 'default' => NULL), 'dob' => Array ('formatter' => 'kDateFormatter', 'default' => NULL), 'tz' => Array ('default' => NULL), - 'ip' => Array ('default' => ''), + 'IPAddress' => Array ('default' => ''), 'IsBanned' => Array ('default' => 0), 'PwResetConfirm' => Array ('default' => ''), 'PwRequestTime' => Array ('formatter' => 'kDateFormatter', 'default' => NULL), @@ -414,6 +414,7 @@ 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 0 ), + 'IPRestrictions' => Array ('default' => NULL), ), 'VirtualFields' => Array ( @@ -531,7 +532,7 @@ 'Modified' => Array ('type' => 'int'), 'dob' => Array ('type' => 'int'), 'tz' => Array ('type' => 'int'), - 'ip' => Array ('type' => 'string', 'not_null' => 1), + 'IPAddress' => Array ('type' => 'string', 'not_null' => 1), 'IsBanned' => Array ('type' => 'int', 'not_null' => 1), 'PwResetConfirm' => Array ('type' => 'string', 'not_null' => 1), 'PwRequestTime' => Array ('type' => 'int'), @@ -540,6 +541,7 @@ 'UserType' => Array ('type' => 'int', 'not_null' => 1), 'PrimaryGroupId' => Array ('type' => 'int'), 'OldStyleLogin' => Array ('type' => 'int', 'not_null' => 1), + 'IPRestrictions' => Array ('type' => 'string'), ), 'VirtualFields' => Array ( @@ -632,6 +634,7 @@ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100), 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100), + 'IPAddress' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100, 'hidden' => 1), ), ), ),