chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Fixing tab/whitespaces

Browse Source
1.9.x
Julio Montoya 12 years ago
parent c673fc2d67
commit 9850d255b9
4 changed files with 74 additions and 73 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 65
      main/coursecopy/classes/CourseRestorer.class.php
  2. 8
      main/coursecopy/classes/CourseSelectForm.class.php
  3. 73
      main/coursecopy/copy_course.php
  4. 1
      main/inc/lib/database.lib.php

65
main/coursecopy/classes/CourseRestorer.class.php
Unescape View File

@ -30,10 +30,10 @@ require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
define('FILE_SKIP', 1);
define('FILE_RENAME', 2);
define('FILE_OVERWRITE', 3);
define('UTF8_CONVERT', false); //false by default
define('FILE_SKIP', 1);
define('FILE_RENAME', 2);
define('FILE_OVERWRITE', 3);
define('UTF8_CONVERT', false); //false by default
/**
* Class to restore items from a course object to a Chamilo-course
@ -43,16 +43,17 @@ define('UTF8_CONVERT', false); //false by default
*/
class CourseRestorer
{
/**
* The course-object
*/
/**
* The course-object
*/
/** @var Course */
public $course;
public $destination_course_info;
/**
* What to do with files with same name (FILE_SKIP, FILE_RENAME or
* FILE_OVERWRITE)
*/
/**
* What to do with files with same name (FILE_SKIP, FILE_RENAME or
* FILE_OVERWRITE)
*/
public $file_option;
public $set_tools_invisible_by_default;
public $skip_content;
@ -91,26 +92,26 @@ class CourseRestorer
*/
public function __construct($course)
{
$this->course = $course;
$course_info = api_get_course_info($this->course->code);
$this->course = $course;
$course_info = api_get_course_info($this->course->code);
if (!empty($course_info)) {
$this->course_origin_id = $course_info['real_id'];
$this->course_origin_id = $course_info['real_id'];
} else {
$this->course_origin_id = null;
}
$this->file_option = FILE_RENAME;
$this->set_tools_invisible_by_default = false;
$this->skip_content = array();
}
$this->file_option = FILE_RENAME;
$this->set_tools_invisible_by_default = false;
$this->skip_content = array();
}
/**
* Set the file-option
* @param constant $options What to do with files with same name (FILE_SKIP, FILE_RENAME or FILE_OVERWRITE)
*/
/**
* Set the file-option
* @param constant $options What to do with files with same name (FILE_SKIP, FILE_RENAME or FILE_OVERWRITE)
*/
function set_file_option($option)
{
$this->file_option = $option;
}
$this->file_option = $option;
}
function set_add_text_in_items($status)
{
$this->add_text_in_items = $status;
@ -120,13 +121,13 @@ class CourseRestorer
$this->tool_copy_settings = $array;
}
/**
* Restore a course.
* @param string The code of the Chamilo-course in
* @param int The session id
* @param bool Course settings are going to be restore?
*/
/**
* Restore a course.
* @param string The code of the Chamilo-course in
* @param int The session id
* @param bool Course settings are going to be restore.
* @param bool $respect_base_content
*/
public function restore(
$destination_course_code = '',
$session_id = 0,
@ -144,7 +145,7 @@ class CourseRestorer
}
$this->destination_course_id = $course_info['real_id'];
//Getting first teacher (for the forums)
// Getting first teacher (for the forums)
$teacher_list = CourseManager::get_teacher_list_from_course_code($course_info['code']);
$this->first_teacher_id = api_get_user_id();

8
main/coursecopy/classes/CourseSelectForm.class.php
Unescape View File

@ -16,7 +16,7 @@ class CourseSelectForm
* @param array $hidden_fiels Hidden fields to add to the form.
* @param boolean the document array will be serialize. This is used in the course_copy.php file
*/
static function display_form($course, $hidden_fields = null, $avoid_serialize=false)
static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
{
global $charset;
$resource_titles[RESOURCE_EVENT] = get_lang('Events');
@ -141,6 +141,7 @@ class CourseSelectForm
}
echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif\',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
echo '<input type="hidden" name="action" value="course_select_form"/>';
@ -348,10 +349,13 @@ class CourseSelectForm
/**
* Get the posted course
* @param string who calls the function? It can be copy_course, create_backup, import_backup or recycle_course
* @param int
* @param string
* @return course The course-object with all resources selected by the user
* in the form given by display_form(...)
*/
static function get_posted_course($from = '', $session_id = 0, $course_code = '') {
static function get_posted_course($from = '', $session_id = 0, $course_code = '')
{
$course = null;
if (isset($_POST['course'])) {

73
main/coursecopy/copy_course.php
Unescape View File

@ -22,13 +22,13 @@ require_once 'classes/CourseSelectForm.class.php';
// Notice for unauthorized people.
if (!api_is_allowed_to_edit()) {
api_not_allowed(true);
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')) {
api_set_memory_limit('256M');
ini_set('max_execution_time', 1800);
api_set_memory_limit('256M');
ini_set('max_execution_time', 1800);
//ini_set('post_max_size', "512M");
}
@ -46,46 +46,45 @@ echo Display::page_header(get_lang('CopyCourse'));
// If a CourseSelectForm is posted or we should copy all resources, then copy them
if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (isset($_POST['copy_option']) && $_POST['copy_option'] == 'full_copy')) {
if (isset($_POST['action']) && $_POST['action'] == 'course_select_form') {
$course = CourseSelectForm :: get_posted_course('copy_course');
} else {
$cb = new CourseBuilder();
$course = $cb->build();
}
$cr = new CourseRestorer($course);
$cr->set_file_option($_POST['same_file_name_option']);
$cr->restore($_POST['destination_course']);
Display::display_normal_message(get_lang('CopyFinished').': <a href="'.api_get_course_url($_POST['destination_course']).'">'.$_POST['destination_course'].'</a>',false);
if (isset($_POST['action']) && $_POST['action'] == 'course_select_form') {
$course = CourseSelectForm::get_posted_course('copy_course');
} else {
$cb = new CourseBuilder();
$course = $cb->build();
}
$cr = new CourseRestorer($course);
$cr->set_file_option($_POST['same_file_name_option']);
$cr->restore($_POST['destination_course']);
Display::display_normal_message(get_lang('CopyFinished').': <a href="'.api_get_course_url($_POST['destination_course']).'">'.$_POST['destination_course'].'</a>', false);
} elseif (isset ($_POST['copy_option']) && $_POST['copy_option'] == 'select_items') {
$cb = new CourseBuilder();
$course = $cb->build();
$cb = new CourseBuilder();
$course = $cb->build();
$hidden_fields = array();
$hidden_fields['same_file_name_option'] = $_POST['same_file_name_option'];
$hidden_fields['destination_course'] = $_POST['destination_course'];
CourseSelectForm :: display_form($course, $hidden_fields, true);
$hidden_fields['same_file_name_option'] = $_POST['same_file_name_option'];
$hidden_fields['destination_course'] = $_POST['destination_course'];
CourseSelectForm::display_form($course, $hidden_fields, true);
} else {
$table_c = Database :: get_main_table(TABLE_MAIN_COURSE);
$table_cu = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$user_info = api_get_user_info();
$course_info = api_get_course_info();
$sql = 'SELECT * FROM '.$table_c.' c, '.$table_cu.' cu WHERE cu.course_code = c.code';
if (!api_is_platform_admin()) {
$sql .= ' AND cu.status=1 ';
}
$sql .= ' AND target_course_code IS NULL AND cu.user_id = '.$user_info['user_id'].' AND c.code != '."'".$course_info['sysCode']."'".' ORDER BY title ASC';
$res = Database::query($sql);
if (Database::num_rows($res) == 0) {
Display::display_normal_message(get_lang('NoDestinationCoursesAvailable'));
} else {
$table_c = Database :: get_main_table(TABLE_MAIN_COURSE);
$table_cu = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$user_info = api_get_user_info();
$course_info = api_get_course_info();
$sql = 'SELECT * FROM '.$table_c.' c, '.$table_cu.' cu WHERE cu.course_code = c.code';
if (!api_is_platform_admin()) {
$sql .= ' AND cu.status=1 ';
}
$sql .= ' AND target_course_code IS NULL AND cu.user_id = '.$user_info['user_id'].' AND c.code != '."'".$course_info['sysCode']."'".' ORDER BY title ASC';
$res = Database::query($sql);
if (Database::num_rows($res) == 0) {
Display::display_normal_message(get_lang('NoDestinationCoursesAvailable'));
} else {
$options = array();
while ($obj = Database::fetch_object($res)) {
$options[$obj->code] = $obj->title;
}
$form = new FormValidator('copy_course', 'post', 'copy_course.php?'.api_get_cidreq());
$form->addElement('header','' );
$form->addElement('select','destination_course', get_lang('SelectDestinationCourse'), $options);
$form->addElement('header', '');
$form->addElement('select', 'destination_course', get_lang('SelectDestinationCourse'), $options);
$group = array();
$group[] = $form->createElement('radio', 'copy_option', null, get_lang('FullCopy'), 'full_copy');
@ -97,14 +96,10 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
$group[] = $form->createElement('radio', 'same_file_name_option', null, get_lang('SameFilenameRename'), FILE_RENAME);
$group[] = $form->createElement('radio', 'same_file_name_option', null, get_lang('SameFilenameOverwrite'), FILE_OVERWRITE);
$form->addGroup($group, '', get_lang('SameFilename'));
$form->addElement('style_submit_button', 'submit', get_lang('CopyCourse'),'class="save"');
$form->addElement('style_submit_button', 'submit', get_lang('CopyCourse'), 'class="save"');
$form->setDefaults(array('copy_option' =>'select_items','same_file_name_option' => FILE_OVERWRITE));
$form->display();
}
}
/* FOOTER */
Display::display_footer();

1
main/inc/lib/database.lib.php
Unescape View File

@ -1174,6 +1174,7 @@ class Database {
}
$sql = "SELECT $clean_columns FROM $table_name $conditions";
$result = self::query($sql);
$array = array();
//if (self::num_rows($result) > 0 ) {

Write Preview
Loading…
Cancel
Save