Ticket #631

inc/classes/BxDolFilesUploader.php

@@ -639,15 +639,6 @@ function getUploadFormFile($aExtras)
                         'onchange' => "parent." . $this->_sJsPostObject . ".onFileChangedEvent(this);"
                     )
                 ),
-                'agreement' => array(
-                    'type'     => 'checkbox',
-                    'name'     => 'agree',
-                    'label'    => _t('_bx_' . $this->sUploadTypeLC . 's_i_have_the_right_to_distribute'),
-                    'required' => true,
-                    'attrs'    => array(
-                        'onchange' => "parent.{$this->_sJsPostObject}.onFileChangedEvent();"
-                    )
-                ),
                 'submit'    => array(
                     'type'    => 'submit',
                     'name'    => 'upload',

modules/boonex/files/install/langs/en.php

@@ -104,10 +104,9 @@
     '_bx_files_file_was_uploaded' => 'Your file was uploaded (id:{0}) by {1}',
     '_bx_files_forbidden' => 'Access is forbidden',
     '_bx_files_home' => 'Files home',
-    '_bx_files_i_have_the_right_to_distribute' => 'I have the right to distribute these files',
     '_bx_files_info' => 'Author',
     '_bx_files_info_main' => 'File info',
-	'_bx_files_info_album' => 'Folder info',
+    '_bx_files_info_album' => 'Folder info',
     '_bx_files_latest' => 'Latest files from this user',
     '_bx_files_latest_file' => 'File of the day',
     '_bx_files_main' => 'Main',

modules/boonex/files/install/langs/ru.php

@@ -104,10 +104,9 @@
     '_bx_files_file_was_uploaded' => 'Ваш файл был загружен (id:{0}) от {1}',
     '_bx_files_forbidden' => 'Доступ запрещен',
     '_bx_files_home' => 'Главная',
-    '_bx_files_i_have_the_right_to_distribute' => 'У меня есть право распространять эти файлы',
     '_bx_files_info' => 'Автор',
     '_bx_files_info_main' => 'Информация о файле',
-	'_bx_files_info_album' => 'Информация о папке',
+    '_bx_files_info_album' => 'Информация о папке',
     '_bx_files_latest' => 'Последние файлы от этого пользователя',
     '_bx_files_latest_file' => 'Файл дня',
     '_bx_files_main' => 'Главная',

modules/boonex/files/js/upload.js

@@ -24,9 +24,8 @@ BxFileUpload.prototype.changeContinueButtonStatus = function () {
 	switch(this.getType()) {
 		case 'upload':
 			var sFileVal = $('#file_upload_form .file_upload_form_wrapper .form_input_file').val();
-			var sAgreeVal = $('#file_upload_form #file_upload_form_input_agree').is(':checked');
 			var sAcceptedFilesBlockVal = $('#file_accepted_files_block').text();
-			shFileEnableSubmit(sFileVal != null && sFileVal != '' && sAgreeVal == true && sAcceptedFilesBlockVal == '');
+			shFileEnableSubmit(sFileVal != null && sFileVal != '' && sAcceptedFilesBlockVal == '');
 			break;
 		default:
 			break;

modules/boonex/photos/install/langs/en.php

@@ -81,7 +81,7 @@
     '_bx_photos_count_info' => 'You have {0} <a href="{1}">photo(s)</a> in this album.',
     '_bx_photos_count_status_info' => 'You have {0} <a href="{1}">{2} photo(s)</a> in this album.',
     '_bx_photos_couple_photo_block' => 'Couple Photos',
-	'_bx_photos_cover' => 'Cover',
+    '_bx_photos_cover' => 'Cover',
     '_bx_photos_crop' => 'Crop Photo',
     '_bx_photos_crop_action' => 'Crop',
     '_bx_photos_delete' => 'Photo was deleted',
@@ -101,9 +101,8 @@
     '_bx_photos_file_was_uploaded' => 'Your photo was uploaded (id:{0}) by {1}',
     '_bx_photos_forbidden' => 'Access is forbidden',
     '_bx_photos_home' => 'Photos home',
-    '_bx_photos_i_have_the_right_to_distribute' => 'I have the right to distribute these photos',
     '_bx_photos_info_main' => 'Photo info',
-	'_bx_photos_info_album' => 'Album info',
+    '_bx_photos_info_album' => 'Album info',
     '_bx_photos_latest' => 'Latest photos from this user',
     '_bx_photos_latest_file' => 'Latest featured photo',
     '_bx_photos_main' => 'Main',

modules/boonex/photos/install/langs/ru.php

@@ -81,7 +81,7 @@
     '_bx_photos_count_info' => 'У Вас {0} <a href="{1}">фото</a> в этом альбоме.',
     '_bx_photos_count_status_info' => 'У Вас {0} <a href="{1}">{2} фото</a> в этом альбоме.',
     '_bx_photos_couple_photo_block' => 'Парные фото',
-	'_bx_photos_cover' => 'Обложка',
+    '_bx_photos_cover' => 'Обложка',
     '_bx_photos_crop' => 'Подрезать фото',
     '_bx_photos_crop_action' => 'Подрезать',
     '_bx_photos_delete' => 'Фото было удалено',
@@ -101,9 +101,8 @@
     '_bx_photos_file_was_uploaded' => 'Ваше фото было добавлено (id:{0}) от {1}',
     '_bx_photos_forbidden' => 'Доступ запрещен',
     '_bx_photos_home' => 'Главная',
-    '_bx_photos_i_have_the_right_to_distribute' => 'У меня есть право выкладывать это фото',
     '_bx_photos_info_main' => 'Информация о фото',
-	'_bx_photos_info_album' => 'Информация об альбоме',
+    '_bx_photos_info_album' => 'Информация об альбоме',
     '_bx_photos_latest' => 'Последние фото от этого пользователя',
     '_bx_photos_latest_file' => 'Последние избранные фото',
     '_bx_photos_main' => 'Главная',

modules/boonex/photos/js/upload.js

@@ -43,9 +43,8 @@ BxPhotoUpload.prototype.changeContinueButtonStatus = function () {
 	switch(this.getType()) {
 		case 'upload':
 			var sFileVal = $('#photo_upload_form .photo_upload_form_wrapper .form_input_file').val();
-			var sAgreeVal = $('#photo_upload_form #photo_upload_form_input_agree').is(':checked');
 			var sAcceptedFilesBlockVal = $('#photo_accepted_files_block').text();
-			shPhotoEnableSubmit(sFileVal != null && sFileVal != '' && sAgreeVal == true && sAcceptedFilesBlockVal == '');
+			shPhotoEnableSubmit(sFileVal != null && sFileVal != '' && sAcceptedFilesBlockVal == '');
 
             bPossibleToReload = true;
 			break;

modules/boonex/sounds/install/langs/en.php

@@ -99,10 +99,9 @@
     '_bx_sounds_file_was_uploaded' => 'Your Sound was uploaded (id:{0}) by {1}',
     '_bx_sounds_forbidden' => 'Access is forbidden',
     '_bx_sounds_home' => 'Sounds home',
-    '_bx_sounds_i_have_the_right_to_distribute' => 'I have the right to publish these Sounds',
     '_bx_sounds_info' => 'File info',
     '_bx_sounds_info_main' => 'Sound info',
-	'_bx_sounds_info_album' => 'Album info',
+    '_bx_sounds_info_album' => 'Album info',
     '_bx_sounds_latest' => 'Latest Sounds from this user',
     '_bx_sounds_latest_file' => 'Latest featured sound',
     '_bx_sounds_main' => 'Main',

modules/boonex/sounds/install/langs/ru.php

@@ -99,10 +99,9 @@
     '_bx_sounds_file_was_uploaded' => 'Ваше аудио было загружено (id:{0}) от {1}',
     '_bx_sounds_forbidden' => 'Доступ запрещен',
     '_bx_sounds_home' => 'Главная',
-    '_bx_sounds_i_have_the_right_to_distribute' => 'У меня есть право на публикацию этого аудио',
     '_bx_sounds_info' => 'Информация о файле',
     '_bx_sounds_info_main' => 'Информация об аудио',
-	'_bx_sounds_info_album' => 'Информация об альбоме',
+    '_bx_sounds_info_album' => 'Информация об альбоме',
     '_bx_sounds_latest' => 'Последнее аудио от этого пользователя',
     '_bx_sounds_latest_file' => 'Последнее избранное аудио',
     '_bx_sounds_main' => 'Главная',

modules/boonex/sounds/js/upload.js

@@ -43,9 +43,8 @@ BxSoundUpload.prototype.changeContinueButtonStatus = function () {
 	switch(this.getType()) {
 		case 'upload':
 			var sFileVal = $('#sound_upload_form .sound_upload_form_wrapper .form_input_file').val();
-			var sAgreeVal = $('#sound_upload_form #sound_upload_form_input_agree').is(':checked');
 			var sAcceptedFilesBlockVal = $('#sound_accepted_files_block').text();
-			shMusicEnableSubmit(sFileVal != null && sFileVal != '' && sAgreeVal == true && sAcceptedFilesBlockVal == '');
+			shMusicEnableSubmit(sFileVal != null && sFileVal != '' && sAcceptedFilesBlockVal == '');
 
             bPossibleToReload = true;
 			break;

modules/boonex/videos/install/langs/en.php

@@ -103,10 +103,9 @@
     '_bx_videos_file_was_uploaded' => 'Your Video was added (id:{0}) by {1}',
     '_bx_videos_forbidden' => 'Access is forbidden',
     '_bx_videos_home' => 'Videos home',
-    '_bx_videos_i_have_the_right_to_distribute' => 'I have the right to distribute this Video',
     '_bx_videos_info' => 'File info',
     '_bx_videos_info_main' => 'Video info',
-	'_bx_videos_info_album' => 'Album info',
+    '_bx_videos_info_album' => 'Album info',
     '_bx_videos_latest' => 'Latest Videos from this user',
     '_bx_videos_latest_file' => 'Latest featured video',
     '_bx_videos_main' => 'Main',

modules/boonex/videos/install/langs/ru.php

@@ -103,10 +103,9 @@
     '_bx_videos_file_was_uploaded' => 'Ваше видео было добавлено (id:{0}) от {1}',
     '_bx_videos_forbidden' => 'Доступ запрещен',
     '_bx_videos_home' => 'Главная',
-    '_bx_videos_i_have_the_right_to_distribute' => 'У меня есть право выкладывать это видео',
     '_bx_videos_info' => 'Информация о файле',
     '_bx_videos_info_main' => 'Информация о видео',
-	'_bx_videos_info_album' => 'Информация об альбоме',
+    '_bx_videos_info_album' => 'Информация об альбоме',
     '_bx_videos_latest' => 'Последние видео от этого пользователя',
     '_bx_videos_latest_file' => 'Последние избранные видео',
     '_bx_videos_main' => 'Главная',

modules/boonex/videos/js/upload.js

@@ -43,9 +43,8 @@ BxVideoUpload.prototype.changeContinueButtonStatus = function () {
 	switch(this.getType()) {
 		case 'upload':
 			var sFileVal = $('#video_upload_form .video_upload_form_wrapper .form_input_file').val();
-			var sAgreeVal = $('#video_upload_form #video_upload_form_input_agree').is(':checked');
 			var sAcceptedFilesBlockVal = $('#video_accepted_files_block').text();
-			shVideoEnableSubmit(sFileVal != null && sFileVal != '' && sAgreeVal == true && sAcceptedFilesBlockVal == '');
+			shVideoEnableSubmit(sFileVal != null && sFileVal != '' && sAcceptedFilesBlockVal == '');
 
             bPossibleToReload = true;
 			break;