Index: branches/5.2.x/core/units/users/users_config.php =================================================================== diff -u -N -r13840 -r14092 --- branches/5.2.x/core/units/users/users_config.php (.../users_config.php) (revision 13840) +++ branches/5.2.x/core/units/users/users_config.php (.../users_config.php) (revision 14092) @@ -1,6 +1,6 @@ Array('addr', 'u-cdata', 'u-ug', 'u-img', 'fav', 'user-profile'), - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled','show_pending'), 'type' => WHERE_FILTER), - ), + /** + * Required for depricated public profile templates to work + */ + 'UserProfileMapping' => Array ( + 'pp_firstname' => 'FirstName', + 'pp_lastname' => 'LastName', + 'pp_dob' => 'dob', + 'pp_email' => 'Email', + 'pp_phone' => 'Phone', + 'pp_street' => 'Street', + 'pp_city' => 'City', + 'pp_state' => 'State', + 'pp_zip' => 'Zip', + 'pp_country' => 'Country', + ), - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - 'show_pending' => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - ) - ), - 'CalculatedFields' => Array( '' => Array( 'PrimaryGroup' => 'g.Name', @@ -337,7 +341,7 @@ 'Password' => Array ('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('')), 'FirstName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'LastName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), - 'Company' => Array ('type' => 'string','not_null' => '1','default' => ''), + 'Company' => Array ('type' => 'string','not_null' => 1,'default' => ''), 'Email' => Array ( 'type' => 'string', 'formatter' => 'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', @@ -349,18 +353,18 @@ ), ), 'CreatedOn' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'Phone' => Array('type' => 'string','default' => null), + 'Phone' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), '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' => null), + 'Street' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Street2' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), + 'City' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'State' => Array( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array(), 'not_null' => 1, - 'default' => '' + 'default' => '', ), - 'Zip' => Array('type' => 'string','default' => null), + 'Zip' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'Country' => Array( 'type' => 'string', 'formatter' => 'kOptionsFormatter', @@ -369,24 +373,34 @@ WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' ORDER BY Name', 'option_key_field' => 'IsoCode', 'option_title_field' => 'Name', - 'not_null' => 1, 'default' => '' + 'not_null' => 1, 'default' => '', ), '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' => 1), + 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => 1, 'default' => 1), 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => null), - 'tz' => Array('type' => 'int','default' => 0), - 'ip' => Array('type' => 'string','default' => null), + 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => NULL), + 'tz' => Array('type' => 'int', 'default' => NULL), + 'ip' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'IsBanned' => Array('type' => 'int','not_null' => 1, 'default' => 0), - 'PassResetTime' => Array('type' => 'int','default' => null), - 'PwResetConfirm' => Array('type' => 'string','default' => null), - 'PwRequestTime' => Array('type' => 'int','default' => null), + 'PassResetTime' => Array('type' => 'int','default' => NULL), + '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), 'AdminLanguage' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Language ORDER BY PackName', 'option_key_field' => 'LanguageId', 'option_title_field' => 'LocalName', 'default' => NULL ), + 'DisplayToPublic' => Array ( + 'type' => 'string', + 'formatter' => 'kOptionsFormatter', 'options' => Array ( + 'FirstName' => 'lu_fld_FirstName', 'LastName' => 'lu_fld_LastName', 'dob' => 'lu_fld_BirthDate', + 'Email' => 'lu_fld_Email', 'Phone' => 'lu_fld_Phone', 'Street' => 'lu_fld_AddressLine1', + 'Street2' => 'lu_fld_AddressLine2', 'City' => 'lu_fld_City', 'State' => 'lu_fld_State', + 'Zip' => 'lu_fld_Zip', 'Country' => 'lu_fld_Country', + ), 'use_phrases' => 1, 'multiple' => 1, + 'default' => NULL + ), ), 'VirtualFields' => Array( @@ -399,7 +413,7 @@ 'UserGroup' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %1$s FROM ' . TABLE_PREFIX . 'PortalGroup WHERE Enabled = 1 AND FrontRegistration = 1', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name', - 'not_null' => 1, 'default' => 0, + 'default' => 0, ), ), @@ -418,6 +432,7 @@ 'Email' => Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'), 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'), 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), @@ -436,6 +451,7 @@ 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ), 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), @@ -452,6 +468,7 @@ 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ),