Bladeren bron

Adding progressbar & adding api_get_cidreq() see BT#7893

Julio Montoya 11 jaren geleden
bovenliggende
commit
31e875c9d5
2 gewijzigde bestanden met toevoegingen van 35 en 21 verwijderingen
  1. 16 12
      main/coursecopy/create_backup.php
  2. 19 9
      main/coursecopy/import_backup.php

+ 16 - 12
main/coursecopy/create_backup.php

@@ -53,14 +53,18 @@ echo Display::page_header($nameTools);
 
 /*	MAIN CODE */
 
-if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (isset($_POST['backup_option']) && $_POST['backup_option'] == 'full_backup')) {
+if ((isset($_POST['action']) &&
+    $_POST['action'] == 'course_select_form') ||
+    (isset($_POST['backup_option']) &&
+    $_POST['backup_option'] == 'full_backup')
+) {
 	if (isset ($_POST['action']) && $_POST['action'] == 'course_select_form') {
-		$course = CourseSelectForm::get_posted_course();        
+		$course = CourseSelectForm::get_posted_course();
 	} else {
 		$cb = new CourseBuilder();
 		$course = $cb->build();
 	}
-	$zip_file = CourseArchiver::write_course($course); 
+	$zip_file = CourseArchiver::write_course($course);
 	Display::display_confirmation_message(get_lang('BackupCreated'));
 	echo '<br /><a class="btn btn-primary btn-large" href="../course_info/download.php?archive='.$zip_file.'">'.get_lang('Download').'</a>';
 
@@ -73,25 +77,25 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
 	$course = $cb->build();
 	if (!$course->has_resources()) {
 		echo get_lang('NoResourcesToBackup');
-	} else {		
-		
-		$form = new FormValidator('create_backup_form', 'post');
+	} else {
+		$form = new FormValidator('create_backup_form', 'post', api_get_self().'?'.api_get_cidreq());
 		$form->addElement('header',get_lang('SelectOptionForBackup'));
-		
 		$form->addElement('radio', 'backup_option', '', get_lang('CreateFullBackup'), 'full_backup');
 		$form->addElement('radio', 'backup_option', '',  get_lang('LetMeSelectItems'), 'select_items');
-		
 		$form->addElement('style_submit_button', null, get_lang('CreateBackup'), 'class="save"');
-
 		$form->add_progress_bar();
 		// When progress bar appears we have to hide the title "Please select a backup-option".
-		$form->updateAttributes(array('onsubmit' => str_replace('javascript: ', 'javascript: page_title = getElementById(\'page_title\'); if (page_title) { setTimeout(\'page_title.style.display = \\\'none\\\';\', 2000); } ', $form->getAttribute('onsubmit'))));
-
+		$form->updateAttributes(
+            array('onsubmit' => str_replace(
+                'javascript: ',
+                'javascript: page_title = getElementById(\'page_title\'); if (page_title) { setTimeout(\'page_title.style.display = \\\'none\\\';\', 2000); } ',
+                $form->getAttribute('onsubmit')
+            ))
+        );
 		$values['backup_option'] = 'full_backup';
 		$form->setDefaults($values);
 		$form->display();
 	}
 }
 
-/*	FOOTER */
 Display::display_footer();

+ 19 - 9
main/coursecopy/import_backup.php

@@ -52,12 +52,16 @@ echo Display::page_header($nameTools);
 
 /*	MAIN CODE */
 
-if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (isset($_POST['import_option']) && $_POST['import_option'] == 'full_backup' )) {
+if ((isset($_POST['action']) &&
+    $_POST['action'] == 'course_select_form') ||
+    (isset($_POST['import_option']) &&
+    $_POST['import_option'] == 'full_backup')
+) {
 	$error = false;
 	if (isset($_POST['action']) && $_POST['action'] == 'course_select_form') {
 		// Partial backup here we recover the documents posted
 		$course = CourseSelectForm::get_posted_course();
-        
+
 	} else {
 		if ($_POST['backup_type'] == 'server') {
 			$filename = $_POST['backup_server'];
@@ -74,7 +78,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 				$error = true;
 			}
 		}
-    
+
         if (!$error) {
 		  // Full backup
 		  $course = CourseArchiver::read_course($filename, $delete_file);
@@ -96,7 +100,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
             echo '<a class="btn" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
         } else {
             if ($filename == '') {
-               Display::display_error_message(get_lang('SelectBackupFile')); 
+               Display::display_error_message(get_lang('SelectBackupFile'));
                echo '<a class="btn" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
             } else {
     			Display::display_error_message(get_lang('UploadError'));
@@ -105,6 +109,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 		}
 	}
 	CourseArchiver::clean_backup_dir();
+
 } elseif (isset($_POST['import_option']) && $_POST['import_option'] == 'select_items') {
 	if ($_POST['backup_type'] == 'server') {
 		$filename = $_POST['backup_server'];
@@ -114,7 +119,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 		$delete_file = true;
 	}
 	$course = CourseArchiver::read_course($filename, $delete_file);
-  
+
 	if ($course->has_resources() && ($filename !== false)) {
 		CourseSelectForm::display_form($course, array('same_file_name_option' => $_POST['same_file_name_option']));
 	} elseif ($filename === false) {
@@ -129,7 +134,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 	$backups = CourseArchiver::get_available_backups($is_platformAdmin ?null:$user['user_id']);
 	$backups_available = count($backups) > 0;
 
-	$form = new FormValidator('import_backup_form', 'post', 'import_backup.php', '', 'multipart/form-data');
+	$form = new FormValidator('import_backup_form', 'post', api_get_path(WEB_CODE_PATH).'coursecopy/import_backup.php?'.api_get_cidreq(), '', 'multipart/form-data');
     $form->addElement('header', get_lang('SelectBackupFile'));
 	$renderer = $form->defaultRenderer();
 	$renderer->setElementTemplate('<div>{element}</div> ');
@@ -175,10 +180,15 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 
 	$form->add_progress_bar();
 	// When progress bar appears we have to hide the title "Select backup file".
-	$form->updateAttributes(array('onsubmit' => str_replace('javascript: ', 'javascript: page_title = getElementById(\'page_title\'); if (page_title) { setTimeout(\'page_title.style.display = \\\'none\\\';\', 2000); } ', $form->getAttribute('onsubmit'))));
+	$form->updateAttributes(array(
+        'onsubmit' => str_replace(
+            'javascript: ',
+            'javascript: page_title = getElementById(\'page_title\'); if (page_title) { setTimeout(\'page_title.style.display = \\\'none\\\';\', 2000); } ',
+            $form->getAttribute('onsubmit')
+        )
+    ));
 
 	$form->display();
 }
 
-/*	FOOTER */
-Display::display_footer();
+Display::display_footer();