Index: branches/5.1.x/core/units/images/images_config.php =================================================================== diff -u -N -r13159 -r13545 --- branches/5.1.x/core/units/images/images_config.php (.../images_config.php) (revision 13159) +++ branches/5.1.x/core/units/images/images_config.php (.../images_config.php) (revision 13545) @@ -1,6 +1,6 @@ 'img', 'Clones' => Array ( - 'u-img' => Array('ParentPrefix' => 'u'), - - 'l-img' => Array('ParentPrefix' => 'l'), - 'n-img' => Array('ParentPrefix' => 'n'), - 'bb-img'=> Array('ParentPrefix' => 'bb'), 'bb-post-img'=> Array('ParentPrefix' => 'bb-post'), - /*'p-img' => Array('ParentPrefix' => 'p'),*/ - 'c-img' => Array('ParentPrefix' => 'c'), ), 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), @@ -117,54 +110,67 @@ '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( 'Icons' => Array (