瀏覽代碼

Feature #272 - create_backup.php: Revision and cleaning, a visual correction has been added.

Ivan Tcholakov 15 年之前
父節點
當前提交
51506db4a4
共有 2 個文件被更改,包括 51 次插入66 次删除
  1. 36 51
      main/coursecopy/create_backup.php
  2. 15 15
      main/coursecopy/import_backup.php

+ 36 - 51
main/coursecopy/create_backup.php

@@ -1,6 +1,6 @@
 <?php
-// $Id: create_backup.php 20084 2009-04-24 20:10:43Z aportugal $
 /* For licensing terms, see /license.txt */
+
 /**
  * Create a backup.
  *
@@ -8,37 +8,35 @@
  * @package chamilo.backup
  */
 
-// name of the language file that needs to be included
-$language_file = array ('exercice', 'admin', 'coursebackup');
+// Language files that need to be included
+$language_file = array('exercice', 'admin', 'coursebackup');
 
-// including the global file
-require_once ('../inc/global.inc.php');
+// Including the global initialization file
+require_once '../inc/global.inc.php';
 
 // Check access rights (only teachers are allowed here)
-if (!api_is_allowed_to_edit())
-{
+if (!api_is_allowed_to_edit()) {
 	api_not_allowed(true);
 }
 
-//remove memory and time limits as much as possible as this might be a long process...
-if(function_exists('ini_set'))
-{
-	ini_set('memory_limit','256M');
-	ini_set('max_execution_time',1800);
+// Remove memory and time limits as much as possible as this might be a long process...
+if (function_exists('ini_set')) {
+	ini_set('memory_limit', '256M');
+	ini_set('max_execution_time', 1800);
 }
 
-// section for the tabs
-$this_section=SECTION_COURSES;
+// Section for the tabs
+$this_section = SECTION_COURSES;
 
-// breadcrumbs
-$interbreadcrumb[] = array ("url" => "../course_info/maintenance.php", "name" => get_lang('Maintenance'));
+// Breadcrumbs
+$interbreadcrumb[] = array('url' => '../course_info/maintenance.php', 'name' => get_lang('Maintenance'));
 
 // Displaying the header
 $nameTools = get_lang('CreateBackup');
 Display::display_header($nameTools);
 
-// include additional libraries
-require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
+// Include additional libraries
+require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 require_once 'classes/CourseBuilder.class.php';
 require_once 'classes/CourseArchiver.class.php';
 require_once 'classes/CourseRestorer.class.php';
@@ -47,66 +45,53 @@ require_once 'classes/CourseSelectForm.class.php';
 // Display the tool title
 api_display_tool_title($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')
-	{
+/*	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') {
 		$course = CourseSelectForm :: get_posted_course();
-	}
-	else
-	{
+	} else {
 		$cb = new CourseBuilder();
 		$course = $cb->build();
 	}
 	$zip_file = CourseArchiver :: write_course($course);
-	Display::display_confirmation_message(get_lang('BackupCreated').str_repeat('<br />',3).'<a class="bottom-link" href="../course_info/download.php?archive='.$zip_file.'">'.$zip_file.'</a>', false);
-	//echo '<p><a href="../course_home/course_home.php">&lt;&lt; '.get_lang('CourseHomepage').'</a></p>'; // This is not the preferable way to go to the course homepage.
+	Display::display_confirmation_message(get_lang('BackupCreated').str_repeat('<br />', 3).'<a class="bottom-link" href="../course_info/download.php?archive='.$zip_file.'">'.$zip_file.'</a>', false);
 	echo '<div style="width:200px"><a class="bottom-link" href="'.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php" >'.get_lang('CourseHomepage').'</a></div>';
 ?>
 	<!-- Manual download <script language="JavaScript">
 	 setTimeout('download_backup()',2000);
 	 function download_backup()
 	 {
-		window.location="../course_info/download.php?archive=<?php echo $zip_file ?>";
+		window.location="../course_info/download.php?archive=<?php echo $zip_file; ?>";
 	 }
 	</script> //-->
-	<?php
+<?php
 
-}
-elseif (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'select_items')
-{
+} elseif (isset($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') {
 	$cb = new CourseBuilder('partial');
 	$course = $cb->build();
 	Display::display_normal_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
 	CourseSelectForm :: display_form($course);
-}
-else
-{
+} else {
 	$cb = new CourseBuilder();
 	$course = $cb->build();
-	if (!$course->has_resources())
-	{
+	if (!$course->has_resources()) {
 		echo get_lang('NoResourcesToBackup');
-	}
-	else
-	{
-		echo get_lang('SelectOptionForBackup');
+	} else {
+		echo '<span id="page_title">'.get_lang('SelectOptionForBackup').'</span><br /><br />';
 
-		require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
-		$form = new FormValidator('create_backup_form','POST');
+		require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
+		$form = new FormValidator('create_backup_form', 'post');
 		$renderer = $form->defaultRenderer();
 		$renderer->setElementTemplate('<div>{element}</div> ');
 		$form->addElement('radio', 'backup_option', '', get_lang('CreateFullBackup'), 'full_backup');
 		$form->addElement('radio', 'backup_option', '',  get_lang('LetMeSelectItems'), 'select_items');
-		$form->addElement('html','<br />');
+		$form->addElement('html', '<br />');
 		$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'))));
 
 		$values['backup_option'] = 'full_backup';
 		$form->setDefaults($values);
@@ -114,6 +99,6 @@ else
 		$form->display();
 	}
 }
-/*		FOOTER		*/
+
+/*	FOOTER */
 Display::display_footer();
-?>

+ 15 - 15
main/coursecopy/import_backup.php

@@ -8,7 +8,7 @@
  * @package chamilo.backup
  */
 
-/*		INIT SECTION	*/
+/*	INIT SECTION */
 
 // Language files that need to be included
 $language_file = array('exercice', 'coursebackup', 'admin');
@@ -37,7 +37,7 @@ $interbreadcrumb[] = array('url' => '../course_info/maintenance.php', 'name' =>
 $nameTools = get_lang('ImportBackup');
 Display::display_header($nameTools);
 
-// include additional libraries
+// Include additional libraries
 require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 require_once 'classes/CourseBuilder.class.php';
 require_once 'classes/CourseArchiver.class.php';
@@ -47,7 +47,7 @@ require_once 'classes/CourseSelectForm.class.php';
 // Display the tool title
 api_display_tool_title($nameTools);
 
-/*		MAIN CODE		*/
+/*	MAIN CODE */
 
 if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (isset($_POST['import_option']) && $_POST['import_option'] == 'full_backup' )) {
 	$error = false;
@@ -81,17 +81,17 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 		$cr->set_file_option($_POST['same_file_name_option']);
 		$cr->restore();
 		Display::display_normal_message(get_lang('ImportFinished').
-            '<a class="bottom-link" href="'.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php">&lt;&lt; '.get_lang('CourseHomepage').'</a>', false);
+            '<a class="bottom-link" href="'.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php">'.get_lang('CourseHomepage').'</a>', false);
 	} else {
 		if (!$error) {
 			Display::display_warning_message(get_lang('NoResourcesInBackupFile').
-                '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">&lt;&lt; '.get_lang('TryAgain').'</a>', false);
+                '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
 		} elseif ($filename === false) {
             Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin').
-                '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">&lt;&lt; '.get_lang('TryAgain').'</a>', false);
+                '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
         } else {
 			Display::display_error_message(api_ucfirst(get_lang('UploadError')).
-                '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">&lt;&lt; '.get_lang('TryAgain').'</a>', false);
+                '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
 		}
 	}
 	CourseArchiver::clean_backup_dir();
@@ -105,18 +105,18 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 	}
 	$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']));
+		CourseSelectForm::display_form($course, array('same_file_name_option' => $_POST['same_file_name_option']));
 	} elseif ($filename === false) {
     	Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin').
-            '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">&lt;&lt; '.get_lang('TryAgain').'</a>',false);
+            '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
     } else {
 		Display::display_warning_message(get_lang('NoResourcesInBackupFile').
-            '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">&lt;&lt; '.get_lang('TryAgain').'</a>',false);
+            '<a class="bottom-link" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>', false);
 	}
 } else {
 	$user = api_get_user_info();
 	$backups = CourseArchiver::get_available_backups($is_platformAdmin?null:$user['user_id']);
-	$backups_available = (count($backups)>0);
+	$backups_available = count($backups) > 0;
 
 	echo '<span id="page_title">'.get_lang('SelectBackupFile').'</span><br /><br />';
 
@@ -126,7 +126,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 	$renderer = $form->defaultRenderer();
 	$renderer->setElementTemplate('<div>{element}</div> ');
 
-	$form->addElement('hidden','action', 'restore_backup');
+	$form->addElement('hidden', 'action', 'restore_backup');
 
 	$form->addElement('radio', 'backup_type', '', get_lang('LocalFile'), 'local', 'id="bt_local" class="checkbox" onclick="javascript: document.import_backup_form.backup_server.disabled=true;document.import_backup_form.backup.disabled=false;"');
 	$form->addElement('file', 'backup', '', 'style="margin-left: 50px;"');
@@ -136,10 +136,10 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 		$form->addElement('radio', 'backup_type', '', get_lang('ServerFile'), 'server', 'id="bt_server" class="checkbox" onclick="javascript: document.import_backup_form.backup_server.disabled=false;document.import_backup_form.backup.disabled=true;"');
 		$options['null'] = '-';
 		foreach ($backups as $index => $backup) {
-			$options[$backup['file']]= $backup['course_code'].' ('.$backup['date'];
+			$options[$backup['file']] = $backup['course_code'].' ('.$backup['date'];
 		}
 		$form->addElement('select', 'backup_server', '', $options, 'style="margin-left: 50px;"');
-		$form->addElement('html','<script type="text/javascript">document.import_backup_form.backup_server.disabled=true;</script>');
+		$form->addElement('html', '<script type="text/javascript">document.import_backup_form.backup_server.disabled=true;</script>');
 	} else {
 		$form->addElement('radio', '', '', '<i>'.get_lang('NoBackupsAvailable').'</i>', '', 'disabled="true"');
 	}
@@ -173,5 +173,5 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form' ) || (i
 
 }
 
-/*	FOOTER	*/
+/*	FOOTER */
 Display::display_footer();