chamilo / chamilo-lms

main/coursecopy/classes/CourseSession.class.php

Indentation +18 added lines, -18 removed lines

@@ -11,24 +11,24 @@
 class CourseSession extends Coursecopy\Resource
 {
     // The title session
-	public $title;
+    public $title;
 
-	/**
-	 * Create a new Session
-	 * @param int $id
-	 * @param string $title
-	 */
-	public function __construct($id,$title)
-	{
-		parent::__construct($id, RESOURCE_SESSION_COURSE);
-		$this->title = $title;
-	}
+    /**
+     * Create a new Session
+     * @param int $id
+     * @param string $title
+     */
+    public function __construct($id,$title)
+    {
+        parent::__construct($id, RESOURCE_SESSION_COURSE);
+        $this->title = $title;
+    }
 
-	/**
-	 * Show this Event
-	 */
-	function show() {
-		parent::show();
-		echo $this->title;
-	}
+    /**
+     * Show this Event
+     */
+    function show() {
+        parent::show();
+        echo $this->title;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 	 * @param int $id
 	 * @param string $title
 	 */
-	public function __construct($id,$title)
+	public function __construct($id, $title)
 	{
 		parent::__construct($id, RESOURCE_SESSION_COURSE);
 		$this->title = $title;

main/coursecopy/classes/ForumTopic.class.php

Spacing +1 added lines, -1 removed lines

@@ -47,6 +47,6 @@
             $user_info = api_get_user_info($this->obj->thread_poster_id);
             $extra = $user_info['complete_name'].', '.$extra;
         }
-        echo $this->obj->thread_title . ' (' . $extra . ')';
+        echo $this->obj->thread_title.' ('.$extra.')';
     }
 }

main/coursecopy/classes/CourseRestorer.class.php

Spacing +82 added lines, -82 removed lines

@@ -520,7 +520,7 @@ 
                                             $this->course->backup_path,
                                             $this->course->info['path']
                                         );
-                                        file_put_contents($path.$document->path,$content);
+                                        file_put_contents($path.$document->path, $content);
                                     }
 
                                     $params = [
@@ -564,14 +564,14 @@ 
 								$new_file_name = $file_name_no_ext.'_'.$i.$ext;
 								$file_exists = file_exists($path.$new_file_name);
 								while ($file_exists) {
-									$i ++;
+									$i++;
 									$new_file_name = $file_name_no_ext.'_'.$i.$ext;
 									$file_exists = file_exists($path.$new_file_name);
 								}
 
 								if (!empty($session_id)) {
 
-									$document_path = explode('/',$document->path,3);
+									$document_path = explode('/', $document->path, 3);
 									$course_path = $path;
 									$orig_base_folder = $document_path[1];
 									$orig_base_path   = $course_path.$document_path[0].'/'.$document_path[1];
@@ -589,7 +589,7 @@ 
 
 										$folder_exists = file_exists($new_base_path);
 										if ($folder_exists) {
-											$_SESSION['orig_base_foldername'] = $new_base_foldername; 		// e.g: carpeta1 in session
+											$_SESSION['orig_base_foldername'] = $new_base_foldername; // e.g: carpeta1 in session
 											$x = '';
 											while ($folder_exists) {
 												$x = $x + 1;
@@ -609,9 +609,9 @@ 
 											$new_base_path = $_SESSION['new_base_path'];
 										}
 
-										$dest_document_path = $new_base_path.'/'.$document_path[2];		// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1/collaborative.png"
-										$basedir_dest_path 	= dirname($dest_document_path);				// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1"
-										$base_path_document = $course_path.$document_path[0];			// e.g: "/var/www/wiener/courses/CURSO4/document"
+										$dest_document_path = $new_base_path.'/'.$document_path[2]; // e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1/collaborative.png"
+										$basedir_dest_path 	= dirname($dest_document_path); // e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1"
+										$base_path_document = $course_path.$document_path[0]; // e.g: "/var/www/wiener/courses/CURSO4/document"
 
 										$path_title = '/'.$new_base_foldername.'/'.$document_path[2];
 
@@ -631,7 +631,7 @@ 
                                         //Replace old course code with the new destination code see BT#1985
                                         if (file_exists($dest_document_path)) {
                                             $file_info = pathinfo($dest_document_path);
-                                            if (in_array($file_info['extension'], array('html','htm'))) {
+                                            if (in_array($file_info['extension'], array('html', 'htm'))) {
                                                 $content = file_get_contents($dest_document_path);
                                                 if (UTF8_CONVERT) {
                                                     $content = utf8_encode($content);
@@ -687,8 +687,8 @@ 
                                         //Replace old course code with the new destination code see BT#1985
                                         if (file_exists($path.$new_file_name)) {
                                             $file_info = pathinfo($path.$new_file_name);
-                                            if (in_array($file_info['extension'], array('html','htm'))) {
-                                                $content    = file_get_contents($path.$new_file_name);
+                                            if (in_array($file_info['extension'], array('html', 'htm'))) {
+                                                $content = file_get_contents($path.$new_file_name);
                                                 if (UTF8_CONVERT) {
                                                     $content = utf8_encode($content);
                                                 }
@@ -741,8 +741,8 @@ 
                                     //Replace old course code with the new destination code see BT#1985
                                     if (file_exists($path.$new_file_name)) {
                                         $file_info = pathinfo($path.$new_file_name);
-                                        if (in_array($file_info['extension'], array('html','htm'))) {
-                                            $content    = file_get_contents($path.$new_file_name);
+                                        if (in_array($file_info['extension'], array('html', 'htm'))) {
+                                            $content = file_get_contents($path.$new_file_name);
                                             if (UTF8_CONVERT) {
                                                 $content = utf8_encode($content);
                                             }
@@ -805,8 +805,8 @@ 
                             //Replace old course code with the new destination code see BT#1985
                             if (file_exists($path.$document->path)) {
                                 $file_info = pathinfo($path.$document->path);
-                                if (in_array($file_info['extension'], array('html','htm'))) {
-                                    $content    = file_get_contents($path.$document->path);
+                                if (in_array($file_info['extension'], array('html', 'htm'))) {
+                                    $content = file_get_contents($path.$document->path);
                                     if (UTF8_CONVERT) {
                                         $content = utf8_encode($content);
                                     }
@@ -896,8 +896,8 @@ 
 						case FILE_OVERWRITE:
 							rmdirr($path.$document->path);
                             copyDirTo(
-                                $this->course->backup_path . '/' . $document->path,
-                                $path . dirname($document->path),
+                                $this->course->backup_path.'/'.$document->path,
+                                $path.dirname($document->path),
                                 false
                             );
 							break;
@@ -919,23 +919,23 @@ 
 							$file_exists = file_exists($path.$new_file_name);
 
 							while ($file_exists) {
-								$i ++;
+								$i++;
 								$new_file_name = $file_name_no_ext.'_'.$i.$ext;
 								$file_exists = file_exists($path.$new_file_name);
 							}
 
                             rename(
-                                $this->course->backup_path . '/' . $document->path,
-                                $this->course->backup_path . '/' . $new_file_name
+                                $this->course->backup_path.'/'.$document->path,
+                                $this->course->backup_path.'/'.$new_file_name
                             );
                             copyDirTo(
-                                $this->course->backup_path . '/' . $new_file_name,
-                                $path . dirname($new_file_name),
+                                $this->course->backup_path.'/'.$new_file_name,
+                                $path.dirname($new_file_name),
                                 false
                             );
                             rename(
-                                $this->course->backup_path . '/' . $new_file_name,
-                                $this->course->backup_path . '/' . $document->path
+                                $this->course->backup_path.'/'.$new_file_name,
+                                $this->course->backup_path.'/'.$document->path
                             );
 
 							break;
@@ -943,8 +943,8 @@ 
 				} else {
                     // end if file exists
                     copyDirTo(
-                        $this->course->backup_path . '/' . $document->path,
-                        $path . dirname($document->path),
+                        $this->course->backup_path.'/'.$document->path,
+                        $path.dirname($document->path),
                         false
                     );
 				}
@@ -962,7 +962,7 @@ 
 			$table_forum = Database::get_course_table(TABLE_FORUM);
 			$resources = $this->course->resources;
 			foreach ($resources[RESOURCE_FORUM] as $id => $forum) {
-                $params = (array)$forum->obj;
+                $params = (array) $forum->obj;
                 $cat_id = '';
                 if (isset($this->course->resources[RESOURCE_FORUMCATEGORY]) &&
                     isset($this->course->resources[RESOURCE_FORUMCATEGORY][$params['forum_category']])) {
@@ -1014,13 +1014,13 @@ 
 					foreach ($this->course->resources[RESOURCE_FORUMTOPIC] as $topic_id => $topic) {
 						if ($topic->obj->forum_id == $id) {
 							$this->restore_topic($topic_id, $new_id, $sessionId);
-							$forum_topics ++;
+							$forum_topics++;
 						}
 					}
 				}
 				if ($forum_topics > 0) {
 					$sql = "UPDATE ".$table_forum." SET forum_threads = ".$forum_topics."
-                            WHERE c_id = {$this->destination_course_id} AND forum_id = ".(int)$new_id;
+                            WHERE c_id = {$this->destination_course_id} AND forum_id = ".(int) $new_id;
 					Database::query($sql);
 				}
 			}
@@ -1090,13 +1090,13 @@ 
 		$table = Database :: get_course_table(TABLE_FORUM_THREAD);
 		$topic = $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id];
 
-        $params = (array)$topic->obj;
+        $params = (array) $topic->obj;
         $params = self::DBUTF8_array($params);
         $params['c_id'] = $this->destination_course_id;
         $params['forum_id'] = $forum_id;
         $params['thread_poster_id'] = $this->first_teacher_id;
         $params['thread_date'] = api_get_utc_datetime();
-        $params['thread_close_date']  = '0000-00-00 00:00:00';
+        $params['thread_close_date'] = '0000-00-00 00:00:00';
         $params['thread_last_post'] = 0;
         $params['thread_replies'] = 0;
         $params['thread_views'] = 0;
@@ -1202,7 +1202,7 @@ 
 				        FROM $link_table
 				        WHERE
 				            c_id = ".$this->destination_course_id." AND
-				            category_id='" . intval($cat_id). "'";
+				            category_id='" . intval($cat_id)."'";
 				$result = Database::query($sql);
     			list($max_order) = Database::fetch_array($result);
 
@@ -1217,7 +1217,7 @@ 
                 $params['description'] = self::DBUTF8($link->description);
                 $params['category_id'] = $cat_id;
                 $params['on_homepage'] = $link->on_homepage;
-                $params['display_order'] = $max_order+1;
+                $params['display_order'] = $max_order + 1;
 
                 $id = Database::insert($link_table, $params);
 
@@ -1261,9 +1261,9 @@ 
         if (is_object($link_cat) && !$link_cat->is_restored()) {
             $sql = "SELECT MAX(display_order) FROM  $link_cat_table
 			        WHERE c_id = ".$this->destination_course_id." ";
-            $result=Database::query($sql);
-            list($orderMax)=Database::fetch_array($result,'NUM');
-            $display_order=$orderMax+1;
+            $result = Database::query($sql);
+            list($orderMax) = Database::fetch_array($result, 'NUM');
+            $display_order = $orderMax + 1;
 
             $params['c_id'] = $this->destination_course_id;
             $params['category_title'] = self::DBUTF8($link_cat->title);
@@ -1639,9 +1639,9 @@ 
                 if (!empty($quiz->sound)) {
                     if (isset($this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]) &&
                         $this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]->is_restored()) {
-                        $sql = "SELECT path FROM " . $table_doc . "
+                        $sql = "SELECT path FROM ".$table_doc."
                                 WHERE
-                                    c_id = " . $this->destination_course_id . "  AND
+                                    c_id = " . $this->destination_course_id."  AND
                                     id = " . $resources[RESOURCE_DOCUMENT][$quiz->sound]->destination_id;
 						$doc = Database::query($sql);
 						$doc = Database::fetch_object($doc);
@@ -1675,19 +1675,19 @@ 
                         'random' => $quiz->random,
                         'active' => $quiz->active,
                         'sound' => self::DBUTF8($doc),
-                        'max_attempt' => (int)$quiz->max_attempt,
-                        'results_disabled' => (int)$quiz->results_disabled,
+                        'max_attempt' => (int) $quiz->max_attempt,
+                        'results_disabled' => (int) $quiz->results_disabled,
                         'access_condition' => $quiz->access_condition,
                         'start_time' => $quiz->start_time,
                         'pass_percentage' => $quiz->pass_percentage,
                         'end_time' => $quiz->end_time,
-                        'feedback_type' => (int)$quiz->feedback_type,
-                        'random_answers' => (int)$quiz->random_answers,
+                        'feedback_type' => (int) $quiz->feedback_type,
+                        'random_answers' => (int) $quiz->random_answers,
                         'random_by_category' => $quiz->random_by_category,
                         'review_answers' => $quiz->review_answers,
                         'propagate_neg' => $quiz->propagate_neg,
                         'text_when_finished' => $quiz->text_when_finished,
-                        'expired_time' => (int)$quiz->expired_time,
+                        'expired_time' => (int) $quiz->expired_time,
                     );
 
                     if ($respect_base_content) {
@@ -1723,9 +1723,9 @@ 
                         $qid = $this->restore_quiz_question($question_id);
                         $question_order = $quiz->question_orders[$index] ? $quiz->question_orders[$index] : ++$order;
                         $sql = "INSERT IGNORE INTO $table_rel SET
-                                c_id = " . $this->destination_course_id . ",
-                                question_id = " . $qid . ",
-                                exercice_id = " . $new_id . ",
+                                c_id = ".$this->destination_course_id.",
+                                question_id = " . $qid.",
+                                exercice_id = " . $new_id.",
                                 question_order = " . $question_order;
                         Database::query($sql);
                     }
@@ -1800,7 +1800,7 @@ 
                             $sql = "UPDATE $table_que SET
                                         picture = '$picture_name'
                                     WHERE
-                                        c_id = " . $this->destination_course_id . " AND
+                                        c_id = ".$this->destination_course_id." AND
                                         id = $new_id ";
                             Database::query($sql);
                         }
@@ -1955,7 +1955,7 @@ 
                             }
                         }
 
-                        foreach($correct_answers as $answer_id => $correct_answer) {
+                        foreach ($correct_answers as $answer_id => $correct_answer) {
                             $params = array();
                             $params['correct'] = $new_options[$correct_answer];
                             Database::update(
@@ -1989,7 +1989,7 @@ 
         $tab_test_category_id_old_new = array(); // used to build the quiz_question_rel_category table
         if ($this->course->has_resources(RESOURCE_TEST_CATEGORY)) {
             $resources = $this->course->resources;
-            foreach ($resources[RESOURCE_TEST_CATEGORY] as $id => $CourseCopyTestcategory ) {
+            foreach ($resources[RESOURCE_TEST_CATEGORY] as $id => $CourseCopyTestcategory) {
                 $tab_test_category_id_old_new[$CourseCopyTestcategory->source_id] = $id;
                 // check if this test_category already exist in the destination BDD
                 // do not Database::escape_string $title and $description, it will be done later
@@ -2135,7 +2135,7 @@ 
 							break;
 						case FILE_RENAME:
 							$survey_code = $survey->code.'_';
-							$i=1;
+							$i = 1;
 							$temp_survey_code = $survey_code.$i;
 							while (!$this->is_survey_code_available($temp_survey_code)) {
 								$temp_survey_code = $survey_code.++$i;
@@ -2167,15 +2167,15 @@ 
 							$sql = "SELECT * FROM $table_sur
 							        WHERE
 							            c_id = ".$this->destination_course_id." AND
-							            survey_id='".self::DBUTF8escapestring(Database::result($result_check,0,0))."'";
+							            survey_id='".self::DBUTF8escapestring(Database::result($result_check, 0, 0))."'";
 							$result = Database::query($sql);
-							$survey_data = Database::fetch_array($result,'ASSOC');
+							$survey_data = Database::fetch_array($result, 'ASSOC');
 
 							// if the survey is shared => also delete the shared content
 							if (isset($survey_data['survey_share']) && is_numeric($survey_data['survey_share'])) {
-                                SurveyManager::delete_survey($survey_data['survey_share'], true,$this->destination_course_id);
+                                SurveyManager::delete_survey($survey_data['survey_share'], true, $this->destination_course_id);
 							}
-							SurveyManager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
+							SurveyManager :: delete_survey($survey_data['survey_id'], false, $this->destination_course_id);
 
 							// Insert the new source survey
                             $new_id = Database::insert($table_sur, $params);
@@ -2251,7 +2251,7 @@ 
 		$resources = $this->course->resources;
 		$question = $resources[RESOURCE_SURVEYQUESTION][$id];
 
-		$new_id=0;
+		$new_id = 0;
 
 		if (is_object($question)) {
 			if ($question->is_restored()) {
@@ -2356,14 +2356,14 @@ 
 
 				// Adding the author's image
 				if (!empty($lp->preview_image)) {
-					$new_filename = uniqid('').substr($lp->preview_image,strlen($lp->preview_image)-7, strlen($lp->preview_image));
+					$new_filename = uniqid('').substr($lp->preview_image, strlen($lp->preview_image) - 7, strlen($lp->preview_image));
 					if (file_exists($origin_path.$lp->preview_image) && !is_dir($origin_path.$lp->preview_image)) {
 						$copy_result = copy($origin_path.$lp->preview_image, $destination_path.$new_filename);
 						//$copy_result = true;
 						if ($copy_result) {
 							$lp->preview_image = $new_filename;
 						} else {
-							$lp->preview_image ='';
+							$lp->preview_image = '';
 						}
 					}
 				}
@@ -2524,20 +2524,20 @@ 
 					$next_item_ids[$new_item_id] = $item['next_item_id'];
 
 					if (!empty($item['prerequisite'])) {
-						if ($lp->lp_type =='2') {
+						if ($lp->lp_type == '2') {
 							// if is an sco
-							$old_prerequisite[$new_item_id]= $item['prerequisite'];
+							$old_prerequisite[$new_item_id] = $item['prerequisite'];
 						} else {
-							$old_prerequisite[$new_item_id]= $new_item_ids[$item['prerequisite']];
+							$old_prerequisite[$new_item_id] = $new_item_ids[$item['prerequisite']];
 						}
 					}
 
 					if (!empty($ref)) {
-						if ($lp->lp_type =='2') {
+						if ($lp->lp_type == '2') {
 							// if is an sco
-							$old_refs[$new_item_id]= $ref;
+							$old_refs[$new_item_id] = $ref;
 						} else {
-                            $old_refs[$new_item_id]= $new_item_ids[$ref];
+                            $old_refs[$new_item_id] = $new_item_ids[$ref];
 						}
 					}
 
@@ -2546,7 +2546,7 @@ 
 
 				// Updating prerequisites
 				foreach ($old_prerequisite  as $key=>$my_old_prerequisite) {
-					if($my_old_prerequisite != ''){
+					if ($my_old_prerequisite != '') {
 						$sql = "UPDATE ".$table_item." SET prerequisite = '".$my_old_prerequisite."'
 						        WHERE c_id = ".$this->destination_course_id." AND id = '".$key."'  ";
 						Database::query($sql);
@@ -2564,7 +2564,7 @@ 
 
 				foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
 					$parent_new_id = 0;
-					if($parent_item_old_id != 0){
+					if ($parent_item_old_id != 0) {
 						$parent_new_id = $new_item_ids[$parent_item_old_id];
 					}
 					$sql = "UPDATE ".$table_item." SET parent_item_id = '".$parent_new_id."'
@@ -2573,7 +2573,7 @@ 
 				}
 				foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
 					$previous_new_id = 0;
-					if($previous_item_old_id != 0){
+					if ($previous_item_old_id != 0) {
 						$previous_new_id = $new_item_ids[$previous_item_old_id];
 					}
 					$sql = "UPDATE ".$table_item." SET previous_item_id = '".$previous_new_id."'
@@ -2583,7 +2583,7 @@ 
 
 				foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
 					$next_new_id = 0;
-					if($next_item_old_id != 0){
+					if ($next_item_old_id != 0) {
 						$next_new_id = $new_item_ids[$next_item_old_id];
 					}
 					$sql = "UPDATE ".$table_item." SET next_item_id = '".$next_new_id."'
@@ -2593,7 +2593,7 @@ 
 
 				foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
 					$prerequisite_new_id = 0;
-					if($prerequisite_old_id != 0){
+					if ($prerequisite_old_id != 0) {
 						$prerequisite_new_id = $new_item_ids[$prerequisite_old_id];
 					}
 					$sql = "UPDATE ".$table_item." SET prerequisite = '".$prerequisite_new_id."'
@@ -2613,9 +2613,9 @@ 
 	public function restore_student_publication($sessionId = 0)
     {
         $sessionId = intval($sessionId);
-		$work_assignment_table  = Database :: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
+		$work_assignment_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
 		$work_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-		$item_property_table  	= Database :: get_course_table(TABLE_ITEM_PROPERTY);
+		$item_property_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
 
 		// Query in student publication
 		$sql = 'SELECT * FROM '.$work_table.'
@@ -2693,7 +2693,7 @@ 
 
 		$destination = '../../courses/'.$this->course->destination_path.'/work/';
 		$origin = '../../courses/'.$this->course->info['path'].'/work/';
-		self::allow_create_all_directory($origin,$destination,false);
+		self::allow_create_all_directory($origin, $destination, false);
 	}
 
     /**
@@ -2712,16 +2712,16 @@ 
         if ($handle = opendir($source)) {        // if the folder exploration is sucsessful, continue
             while (false !== ($file = readdir($handle))) { // as long as storing the next file to $file is successful, continue
                 if ($file != '.' && $file != '..') {
-                    $path = $source . '/' . $file;
+                    $path = $source.'/'.$file;
                     if (is_file($path)) {
                        /* if (!is_file($dest . '/' . $file) || $overwrite)
                         if (!@copy($path, $dest . '/' . $file)) {
                             echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>';
                         }*/
-                    } elseif(is_dir($path)) {
-                        if (!is_dir($dest . '/' . $file))
-                        mkdir($dest . '/' . $file);
-                       self:: allow_create_all_directory($path, $dest . '/' . $file, $overwrite);
+                    } elseif (is_dir($path)) {
+                        if (!is_dir($dest.'/'.$file))
+                        mkdir($dest.'/'.$file);
+                       self:: allow_create_all_directory($path, $dest.'/'.$file, $overwrite);
                     }
                 }
             }
@@ -2908,7 +2908,7 @@ 
                     $this->course->backup_path,
                     $this->course->info['path']
                 );
-				$thematic->params['c_id']  = $this->destination_course_id;
+				$thematic->params['c_id'] = $this->destination_course_id;
 				unset($thematic->params['id']);
                 unset($thematic->params['iid']);
 
@@ -2932,7 +2932,7 @@ 
                         unset($thematic_advance['iid']);
 						$thematic_advance['attendance_id'] = 0;
 						$thematic_advance['thematic_id'] = $last_id;
-						$thematic_advance['c_id']  = $this->destination_course_id;
+						$thematic_advance['c_id'] = $this->destination_course_id;
                         $my_id = Database::insert(
                             $table_thematic_advance,
                             $thematic_advance,
@@ -2954,7 +2954,7 @@ 
 						}
 					}
 
-					foreach($thematic->thematic_plan_list as $thematic_plan) {
+					foreach ($thematic->thematic_plan_list as $thematic_plan) {
 						unset($thematic_plan['id']);
                         unset($thematic_plan['iid']);
 						$thematic_plan['thematic_id'] = $last_id;
@@ -3070,7 +3070,7 @@ 
                 // re-create dir
                 // @todo check security against injection of dir in crafted course backup here!
                 $path = $obj->params['url'];
-                $path = '/'.str_replace('/','',substr($path,1));
+                $path = '/'.str_replace('/', '', substr($path, 1));
 
                 $workData = array();
                 switch ($this->file_option) {
@@ -3092,9 +3092,9 @@ 
                         $obj->params['new_dir'] = $obj->params['title'];
 
                         if (!empty($this->course_origin_id)) {
-                            $sql = 'SELECT * FROM ' . $table_work_assignment . '
+                            $sql = 'SELECT * FROM '.$table_work_assignment.'
                                     WHERE
-                                        c_id = ' . $this->course_origin_id . ' AND
+                                        c_id = ' . $this->course_origin_id.' AND
                                         publication_id = ' . $id_work;
 
                             $result = Database::query($sql);
@@ -3206,7 +3206,7 @@ 
     public function DBUTF8_array($array)
     {
         if (UTF8_CONVERT) {
-            foreach ($array as &$item)  {
+            foreach ($array as &$item) {
                 $item = utf8_encode($item);
             }
             return $array;

Braces +11 added lines, -4 removed lines

@@ -512,7 +512,9 @@ 
 
                                     if (in_array($file_info['extension'], array('html', 'htm'))) {
                                         $content = file_get_contents($path.$document->path);
-                                        if (UTF8_CONVERT) $content = utf8_encode($content);
+                                        if (UTF8_CONVERT) {
+                                            $content = utf8_encode($content);
+                                        }
                                         $content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                                             $content,
                                             $this->course->code,
@@ -2240,7 +2242,11 @@ 
 		            c_id = ".$this->destination_course_id." AND
 		            code='".self::DBUTF8escapestring($survey_code)."'";
 		$result = Database::query($sql);
-		if (Database::num_rows($result) > 0) return false; else return true;
+		if (Database::num_rows($result) > 0) {
+		    return false;
+		} else {
+		    return true;
+		}
 	}
 
 	/**
@@ -2719,8 +2725,9 @@ 
                             echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>';
                         }*/
                     } elseif(is_dir($path)) {
-                        if (!is_dir($dest . '/' . $file))
-                        mkdir($dest . '/' . $file);
+                        if (!is_dir($dest . '/' . $file)) {
+                                                mkdir($dest . '/' . $file);
+                        }
                        self:: allow_create_all_directory($path, $dest . '/' . $file, $overwrite);
                     }
                 }

Doc Comments +8 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
 
     /**
      * CourseRestorer constructor.
-     * @param array $course
+     * @param Course $course
      */
     public function __construct($course)
     {
@@ -133,7 +133,7 @@ 
 	 * @param int	    $session_id
 	 * @param bool	    $update_course_settings Course settings are going to be restore?
      * @param bool      $respect_base_content
-     * @return bool
+     * @return false|null
 	 */
     public function restore(
         $destination_course_code = '',
@@ -1154,6 +1154,7 @@ 
 
 	/**
 	 * Restore a forum-topic
+	 * @param false|string $forum_id
 	 */
     public function restore_topic($thread_id, $forum_id, $sessionId = 0)
     {
@@ -1210,6 +1211,7 @@ 
 	/**
 	 * Restore a forum-post
 	 * @TODO Restore tree-structure of posts. For example: attachments to posts.
+	 * @param false|string $topic_id
 	 */
     public function restore_post($id, $topic_id, $forum_id, $sessionId = 0)
     {
@@ -2307,6 +2309,7 @@ 
 
 	/**
 	 * Check availability of a survey code
+	 * @param string $survey_code
 	 */
     public function is_survey_code_available($survey_code)
     {
@@ -2321,6 +2324,7 @@ 
 
 	/**
 	 * Restore survey-questions
+	 * @param string $survey_id
 	 */
     public function restore_survey_question($id, $survey_id)
     {
@@ -2777,6 +2781,8 @@ 
     * @param string The path origin
     * @param string The path destination
     * @param boolean Option Overwrite
+    * @param string $source
+    * @param string $dest
     * @return void()
     * @deprecated
     */

Indentation +710 added lines, -710 removed lines

@@ -36,16 +36,16 @@ 
  */
 class CourseRestorer
 {
-	/**
-	 * The course-object
-	 */
+    /**
+     * The course-object
+     */
     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;
@@ -57,7 +57,7 @@ 
         'events',
         'forum_category',
         'forums',
-       // 'forum_topics',
+        // 'forum_topics',
         'glossary',
         'quizzes',
         'test_category',
@@ -126,15 +126,15 @@ 
         $this->tool_copy_settings = $array;
     }
 
-	/**
-	 * Restore a course.
+    /**
+     * Restore a course.
      *
-	 * @param string    $destination_course_code code of the Chamilo-course in
-	 * @param int	    $session_id
-	 * @param bool	    $update_course_settings Course settings are going to be restore?
+     * @param string    $destination_course_code code of the Chamilo-course in
+     * @param int	    $session_id
+     * @param bool	    $update_course_settings Course settings are going to be restore?
      * @param bool      $respect_base_content
      * @return bool
-	 */
+     */
     public function restore(
         $destination_course_code = '',
         $session_id = 0,
@@ -277,17 +277,17 @@ 
         }
     }
 
-	/**
-	 * Restore only harmless course settings:
+    /**
+     * Restore only harmless course settings:
      * course_language, visibility, department_name,department_url,
      * subscribe, unsubscribe ,category_code
-	 *
-	 * @param string $destination_course_code
-	 */
+     *
+     * @param string $destination_course_code
+     */
     public function restore_course_settings($destination_course_code)
     {
-	    $origin_course_info = api_get_course_info($destination_course_code);
-	    $course_info = $this->course->info;
+        $origin_course_info = api_get_course_info($destination_course_code);
+        $course_info = $this->course->info;
         $params['course_language'] = $course_info['language'];
         $params['visibility'] = $course_info['visibility'];
         $params['department_name'] = $course_info['department_name'];
@@ -296,8 +296,8 @@ 
         $params['category_code'] = $course_info['categoryCode'];
         $params['subscribe'] = $course_info['subscribe_allowed'];
         $params['unsubscribe'] = $course_info['unsubscribe'];
-	    CourseManager::update_attributes($origin_course_info['real_id'], $params);
-	}
+        CourseManager::update_attributes($origin_course_info['real_id'], $params);
+    }
 
     /**
      * Restore documents
@@ -311,11 +311,11 @@ 
         $course_info = api_get_course_info($destination_course_code);
 
         if ($this->course->has_resources(RESOURCE_DOCUMENT)) {
-			$table = Database :: get_course_table(TABLE_DOCUMENT);
-			$resources = $this->course->resources;
+            $table = Database :: get_course_table(TABLE_DOCUMENT);
+            $resources = $this->course->resources;
             $path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
 
-			foreach ($resources[RESOURCE_DOCUMENT] as $id => $document) {
+            foreach ($resources[RESOURCE_DOCUMENT] as $id => $document) {
 
                 if (empty($document->item_properties[0]['id_session'])) {
                     $my_session_id = 0;
@@ -385,7 +385,7 @@ 
                             }
                         }
                     }
-		    	} elseif ($document->file_type == DOCUMENT) {
+                } elseif ($document->file_type == DOCUMENT) {
                     //Checking if folder exists in the database otherwise we created it
                     $dir_to_create = dirname($document->path);
 
@@ -441,19 +441,19 @@ 
                         }
                     }
 
-					if (file_exists($path.$document->path)) {
-						switch ($this->file_option) {
-							case FILE_OVERWRITE:
+                    if (file_exists($path.$document->path)) {
+                        switch ($this->file_option) {
+                            case FILE_OVERWRITE:
                                 $origin_path = $this->course->backup_path.'/'.$document->path;
 
-								if (file_exists($origin_path)) {
-        						    copy($origin_path, $path.$document->path);
+                                if (file_exists($origin_path)) {
+                                    copy($origin_path, $path.$document->path);
                                     $sql = "SELECT id FROM $table
                                             WHERE
                                                 c_id = ".$this->destination_course_id." AND
                                                 path = '/".self::DBUTF8escapestring(substr($document->path, 9))."'";
 
-        						    $res = Database::query($sql);
+                                    $res = Database::query($sql);
                                     $count = Database::num_rows($res);
 
                                     if ($count == 0) {
@@ -467,7 +467,7 @@ 
                                             'session_id' => $my_session_id,
                                         ];
 
-    									$document_id = Database::insert($table, $params);
+                                        $document_id = Database::insert($table, $params);
 
                                         if ($document_id) {
                                             $sql = "UPDATE $table SET id = iid WHERE iid = $document_id";
@@ -575,83 +575,83 @@ 
                                             ],
                                         ]
                                     );
-								}
+                                }
 
-								break;
-							case FILE_SKIP:
-								$sql = "SELECT id FROM $table
+                                break;
+                            case FILE_SKIP:
+                                $sql = "SELECT id FROM $table
 								        WHERE
 								            c_id = ".$this->destination_course_id." AND
 								            path='/".self::DBUTF8escapestring(substr($document->path, 9))."'";
-								$res = Database::query($sql);
-								$obj = Database::fetch_object($res);
-								$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $obj->id;
-								break;
-							case FILE_RENAME:
-								$i = 1;
-								$ext = explode('.', basename($document->path));
-								if (count($ext) > 1) {
-									$ext = array_pop($ext);
-									$file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
-									$ext = '.'.$ext;
-								} else {
-									$ext = '';
-									$file_name_no_ext = $document->path;
-								}
-								$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-								$file_exists = file_exists($path.$new_file_name);
-								while ($file_exists) {
-									$i ++;
-									$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-									$file_exists = file_exists($path.$new_file_name);
-								}
-
-								if (!empty($session_id)) {
-
-									$document_path = explode('/',$document->path,3);
-									$course_path = $path;
-									$orig_base_folder = $document_path[1];
-									$orig_base_path   = $course_path.$document_path[0].'/'.$document_path[1];
-
-									if (is_dir($orig_base_path)) {
-
-										$new_base_foldername = $orig_base_folder;
-										$new_base_path = $orig_base_path;
-
-										if ($_SESSION['orig_base_foldername'] != $new_base_foldername) {
-											unset($_SESSION['new_base_foldername']);
-											unset($_SESSION['orig_base_foldername']);
-											unset($_SESSION['new_base_path']);
-										}
-
-										$folder_exists = file_exists($new_base_path);
-										if ($folder_exists) {
-											$_SESSION['orig_base_foldername'] = $new_base_foldername; 		// e.g: carpeta1 in session
-											$x = '';
-											while ($folder_exists) {
-												$x = $x + 1;
-												$new_base_foldername = $document_path[1].'_'.$x;
-												$new_base_path = $orig_base_path.'_'.$x;
+                                $res = Database::query($sql);
+                                $obj = Database::fetch_object($res);
+                                $this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $obj->id;
+                                break;
+                            case FILE_RENAME:
+                                $i = 1;
+                                $ext = explode('.', basename($document->path));
+                                if (count($ext) > 1) {
+                                    $ext = array_pop($ext);
+                                    $file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
+                                    $ext = '.'.$ext;
+                                } else {
+                                    $ext = '';
+                                    $file_name_no_ext = $document->path;
+                                }
+                                $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                                $file_exists = file_exists($path.$new_file_name);
+                                while ($file_exists) {
+                                    $i ++;
+                                    $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                                    $file_exists = file_exists($path.$new_file_name);
+                                }
+
+                                if (!empty($session_id)) {
+
+                                    $document_path = explode('/',$document->path,3);
+                                    $course_path = $path;
+                                    $orig_base_folder = $document_path[1];
+                                    $orig_base_path   = $course_path.$document_path[0].'/'.$document_path[1];
+
+                                    if (is_dir($orig_base_path)) {
+
+                                        $new_base_foldername = $orig_base_folder;
+                                        $new_base_path = $orig_base_path;
+
+                                        if ($_SESSION['orig_base_foldername'] != $new_base_foldername) {
+                                            unset($_SESSION['new_base_foldername']);
+                                            unset($_SESSION['orig_base_foldername']);
+                                            unset($_SESSION['new_base_path']);
+                                        }
+
+                                        $folder_exists = file_exists($new_base_path);
+                                        if ($folder_exists) {
+                                            $_SESSION['orig_base_foldername'] = $new_base_foldername; 		// e.g: carpeta1 in session
+                                            $x = '';
+                                            while ($folder_exists) {
+                                                $x = $x + 1;
+                                                $new_base_foldername = $document_path[1].'_'.$x;
+                                                $new_base_path = $orig_base_path.'_'.$x;
                                                 if ($_SESSION['new_base_foldername'] == $new_base_foldername) {
                                                     break;
                                                 }
-												$folder_exists = file_exists($new_base_path);
-											}
-											$_SESSION['new_base_foldername'] = $new_base_foldername;
-											$_SESSION['new_base_path'] = $new_base_path;
-										}
-
-										if (isset($_SESSION['new_base_foldername']) && isset($_SESSION['new_base_path'])) {
-											$new_base_foldername = $_SESSION['new_base_foldername'];
-											$new_base_path = $_SESSION['new_base_path'];
-										}
-
-										$dest_document_path = $new_base_path.'/'.$document_path[2];		// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1/collaborative.png"
-										$basedir_dest_path 	= dirname($dest_document_path);				// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1"
-										$base_path_document = $course_path.$document_path[0];			// e.g: "/var/www/wiener/courses/CURSO4/document"
-										$path_title = '/'.$new_base_foldername.'/'.$document_path[2];
-
-										copy_folder_course_session(
+                                                $folder_exists = file_exists($new_base_path);
+                                            }
+                                            $_SESSION['new_base_foldername'] = $new_base_foldername;
+                                            $_SESSION['new_base_path'] = $new_base_path;
+                                        }
+
+                                        if (isset($_SESSION['new_base_foldername']) && isset($_SESSION['new_base_path'])) {
+                                            $new_base_foldername = $_SESSION['new_base_foldername'];
+                                            $new_base_path = $_SESSION['new_base_path'];
+                                        }
+
+                                        $dest_document_path = $new_base_path.'/'.$document_path[2];		// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1/collaborative.png"
+                                        $basedir_dest_path 	= dirname($dest_document_path);				// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1"
+                                        $base_path_document = $course_path.$document_path[0];			// e.g: "/var/www/wiener/courses/CURSO4/document"
+                                        $path_title = '/'.$new_base_foldername.'/'.$document_path[2];
+
+                                        copy_folder_course_session(
                                             $basedir_dest_path,
                                             $base_path_document,
                                             $session_id,
@@ -693,7 +693,7 @@ 
                                             'session_id' => $my_session_id,
                                         ];
 
-										$document_id = Database::insert($table, $params);
+                                        $document_id = Database::insert($table, $params);
 
                                         if ($document_id) {
                                             $sql = "UPDATE $table SET id = iid WHERE iid = $document_id";
@@ -722,10 +722,10 @@ 
                                             null,
                                             $my_session_id
                                         );
-									} else {
-									    if (file_exists($path.$document->path)) {
+                                    } else {
+                                        if (file_exists($path.$document->path)) {
                                             copy($path.$document->path, $path.$new_file_name);
-									    }
+                                        }
                                         //Replace old course code with the new destination code see BT#1985
                                         if (file_exists($path.$new_file_name)) {
                                             $file_info = pathinfo($path.$new_file_name);
@@ -784,10 +784,10 @@ 
                                                 $my_session_id
                                             );
                                         }
-									}
-								} else {
+                                    }
+                                } else {
 
-									copy($this->course->backup_path.'/'.$document->path, $path.$new_file_name);
+                                    copy($this->course->backup_path.'/'.$document->path, $path.$new_file_name);
 
                                     //Replace old course code with the new destination code see BT#1985
                                     if (file_exists($path.$new_file_name)) {
@@ -847,20 +847,20 @@ 
                                         null,
                                         $my_session_id
                                     );
-								}
-								break;
-
-						} // end switch
-					} else {
-					    // end if file exists
-						//make sure the source file actually exists
-						if (is_file($this->course->backup_path.'/'.$document->path) &&
+                                }
+                                break;
+
+                        } // end switch
+                    } else {
+                        // end if file exists
+                        //make sure the source file actually exists
+                        if (is_file($this->course->backup_path.'/'.$document->path) &&
                             is_readable($this->course->backup_path.'/'.$document->path) &&
                             is_dir(dirname($path.$document->path)) &&
                             is_writeable(dirname($path.$document->path))
                         ) {
-						    //echo 'Copying';
-							copy($this->course->backup_path.'/'.$document->path, $path.$document->path);
+                            //echo 'Copying';
+                            copy($this->course->backup_path.'/'.$document->path, $path.$document->path);
 
                             //Replace old course code with the new destination code see BT#1985
                             if (file_exists($path.$document->path)) {
@@ -898,7 +898,7 @@ 
                                 Database::query($sql);
                             }
 
-							$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $document_id;
+                            $this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $document_id;
 
                             $itemProperty = isset($document->item_properties[0]) ? $document->item_properties[0] : '';
                             $insertUserId = isset($itemProperty['insert_user_id']) ? $itemProperty['insert_user_id'] : api_get_user_id();
@@ -920,79 +920,79 @@ 
                                 null,
                                 $my_session_id
                             );
-						} else {
-							if (is_file($this->course->backup_path.'/'.$document->path) &&
+                        } else {
+                            if (is_file($this->course->backup_path.'/'.$document->path) &&
                                 is_readable($this->course->backup_path.'/'.$document->path)
                             ) {
-								error_log('Course copy generated an ignoreable error while trying to copy '.$this->course->backup_path.'/'.$document->path.': file not found');
-							}
-							if (!is_dir(dirname($path.$document->path))) {
-								error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not found');
-							}
-							if (!is_writeable(dirname($path.$document->path))) {
-								error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not writeable');
-							}
-						}
-					} // end file doesn't exist
-				}
-			} // end for each
-
-    		// Delete sessions for the copy the new folder in session
-    		unset($_SESSION['new_base_foldername']);
-    		unset($_SESSION['orig_base_foldername']);
-    		unset($_SESSION['new_base_path']);
-		}
-	}
-
-	/**
-	 * Restore scorm documents
-	 * TODO @TODO check that the restore function with renaming doesn't break the scorm structure!
+                                error_log('Course copy generated an ignoreable error while trying to copy '.$this->course->backup_path.'/'.$document->path.': file not found');
+                            }
+                            if (!is_dir(dirname($path.$document->path))) {
+                                error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not found');
+                            }
+                            if (!is_writeable(dirname($path.$document->path))) {
+                                error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not writeable');
+                            }
+                        }
+                    } // end file doesn't exist
+                }
+            } // end for each
+
+            // Delete sessions for the copy the new folder in session
+            unset($_SESSION['new_base_foldername']);
+            unset($_SESSION['orig_base_foldername']);
+            unset($_SESSION['new_base_path']);
+        }
+    }
+
+    /**
+     * Restore scorm documents
+     * TODO @TODO check that the restore function with renaming doesn't break the scorm structure!
      * see #7029
-	 */
-	public function restore_scorm_documents()
+     */
+    public function restore_scorm_documents()
     {
-		$perm = api_get_permissions_for_new_directories();
+        $perm = api_get_permissions_for_new_directories();
 
-		if ($this->course->has_resources(RESOURCE_SCORM)) {
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_SCORM)) {
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_SCORM] as $document) {
-				$path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
+            foreach ($resources[RESOURCE_SCORM] as $document) {
+                $path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
 
-				@mkdir(dirname($path.$document->path), $perm, true);
+                @mkdir(dirname($path.$document->path), $perm, true);
 
-				if (file_exists($path.$document->path)) {
-					switch ($this->file_option) {
-						case FILE_OVERWRITE:
-							rmdirr($path.$document->path);
+                if (file_exists($path.$document->path)) {
+                    switch ($this->file_option) {
+                        case FILE_OVERWRITE:
+                            rmdirr($path.$document->path);
                             copyDirTo(
                                 $this->course->backup_path . '/' . $document->path,
                                 $path . dirname($document->path),
                                 false
                             );
-							break;
-						case FILE_SKIP:
-							break;
+                            break;
+                        case FILE_SKIP:
+                            break;
                         case FILE_RENAME:
-							$i = 1;
-							$ext = explode('.', basename($document->path));
-							if (count($ext) > 1) {
-								$ext = array_pop($ext);
-								$file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
-								$ext = '.'.$ext;
-							} else {
-								$ext = '';
-								$file_name_no_ext = $document->path;
-							}
-
-							$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-							$file_exists = file_exists($path.$new_file_name);
-
-							while ($file_exists) {
-								$i ++;
-								$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-								$file_exists = file_exists($path.$new_file_name);
-							}
+                            $i = 1;
+                            $ext = explode('.', basename($document->path));
+                            if (count($ext) > 1) {
+                                $ext = array_pop($ext);
+                                $file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
+                                $ext = '.'.$ext;
+                            } else {
+                                $ext = '';
+                                $file_name_no_ext = $document->path;
+                            }
+
+                            $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                            $file_exists = file_exists($path.$new_file_name);
+
+                            while ($file_exists) {
+                                $i ++;
+                                $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                                $file_exists = file_exists($path.$new_file_name);
+                            }
 
                             rename(
                                 $this->course->backup_path . '/' . $document->path,
@@ -1008,30 +1008,30 @@ 
                                 $this->course->backup_path . '/' . $document->path
                             );
 
-							break;
-					} // end switch
-				} else {
+                            break;
+                    } // end switch
+                } else {
                     // end if file exists
                     copyDirTo(
                         $this->course->backup_path . '/' . $document->path,
                         $path . dirname($document->path),
                         false
                     );
-				}
-			} // end for each
-		}
-	}
-
-	/**
-	 * Restore forums
-	 */
-	public function restore_forums($sessionId = 0)
+                }
+            } // end for each
+        }
+    }
+
+    /**
+     * Restore forums
+     */
+    public function restore_forums($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_FORUM)) {
+        if ($this->course->has_resources(RESOURCE_FORUM)) {
             $sessionId = intval($sessionId);
-			$table_forum = Database::get_course_table(TABLE_FORUM);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_FORUM] as $id => $forum) {
+            $table_forum = Database::get_course_table(TABLE_FORUM);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_FORUM] as $id => $forum) {
                 $params = (array)$forum->obj;
                 $cat_id = '';
                 if (isset($this->course->resources[RESOURCE_FORUMCATEGORY]) &&
@@ -1077,33 +1077,33 @@ 
                     Database::query($sql);
                 }
 
-				$this->course->resources[RESOURCE_FORUM][$id]->destination_id = $new_id;
-
-				$forum_topics = 0;
-				if (is_array($this->course->resources[RESOURCE_FORUMTOPIC])) {
-					foreach ($this->course->resources[RESOURCE_FORUMTOPIC] as $topic_id => $topic) {
-						if ($topic->obj->forum_id == $id) {
-							$this->restore_topic($topic_id, $new_id, $sessionId);
-							$forum_topics ++;
-						}
-					}
-				}
-				if ($forum_topics > 0) {
-					$sql = "UPDATE ".$table_forum." SET forum_threads = ".$forum_topics."
+                $this->course->resources[RESOURCE_FORUM][$id]->destination_id = $new_id;
+
+                $forum_topics = 0;
+                if (is_array($this->course->resources[RESOURCE_FORUMTOPIC])) {
+                    foreach ($this->course->resources[RESOURCE_FORUMTOPIC] as $topic_id => $topic) {
+                        if ($topic->obj->forum_id == $id) {
+                            $this->restore_topic($topic_id, $new_id, $sessionId);
+                            $forum_topics ++;
+                        }
+                    }
+                }
+                if ($forum_topics > 0) {
+                    $sql = "UPDATE ".$table_forum." SET forum_threads = ".$forum_topics."
                             WHERE c_id = {$this->destination_course_id} AND forum_id = ".(int)$new_id;
-					Database::query($sql);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Restore forum-categories
-	 */
+                    Database::query($sql);
+                }
+            }
+        }
+    }
+
+    /**
+     * Restore forum-categories
+     */
     public function restore_forum_category($my_id = null, $sessionId = 0)
     {
-		$forum_cat_table = Database :: get_course_table(TABLE_FORUM_CATEGORY);
-		$resources = $this->course->resources;
+        $forum_cat_table = Database :: get_course_table(TABLE_FORUM_CATEGORY);
+        $resources = $this->course->resources;
         if (!empty($resources[RESOURCE_FORUMCATEGORY])) {
             foreach ($resources[RESOURCE_FORUMCATEGORY] as $id => $forum_cat) {
                 if (!empty($my_id)) {
@@ -1150,15 +1150,15 @@ 
                 }
             }
         }
-	}
+    }
 
-	/**
-	 * Restore a forum-topic
-	 */
+    /**
+     * Restore a forum-topic
+     */
     public function restore_topic($thread_id, $forum_id, $sessionId = 0)
     {
-		$table = Database :: get_course_table(TABLE_FORUM_THREAD);
-		$topic = $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id];
+        $table = Database :: get_course_table(TABLE_FORUM_THREAD);
+        $topic = $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id];
 
         $params = (array)$topic->obj;
         $params = self::DBUTF8_array($params);
@@ -1194,27 +1194,27 @@ 
             $sessionId
         );
 
-		$this->course->resources[RESOURCE_FORUMTOPIC][$thread_id]->destination_id = $new_id;
+        $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id]->destination_id = $new_id;
 
-		$topic_replies = -1;
+        $topic_replies = -1;
 
-		foreach ($this->course->resources[RESOURCE_FORUMPOST] as $post_id => $post) {
-			if ($post->obj->thread_id == $thread_id) {
-				$topic_replies++;
-				$this->restore_post($post_id, $new_id, $forum_id, $sessionId);
-			}
-		}
-		return $new_id;
-	}
+        foreach ($this->course->resources[RESOURCE_FORUMPOST] as $post_id => $post) {
+            if ($post->obj->thread_id == $thread_id) {
+                $topic_replies++;
+                $this->restore_post($post_id, $new_id, $forum_id, $sessionId);
+            }
+        }
+        return $new_id;
+    }
 
-	/**
-	 * Restore a forum-post
-	 * @TODO Restore tree-structure of posts. For example: attachments to posts.
-	 */
+    /**
+     * Restore a forum-post
+     * @TODO Restore tree-structure of posts. For example: attachments to posts.
+     */
     public function restore_post($id, $topic_id, $forum_id, $sessionId = 0)
     {
-		$table_post = Database :: get_course_table(TABLE_FORUM_POST);
-		$post = $this->course->resources[RESOURCE_FORUMPOST][$id];
+        $table_post = Database :: get_course_table(TABLE_FORUM_POST);
+        $post = $this->course->resources[RESOURCE_FORUMPOST][$id];
         $params = (array) $post->obj;
         $params['c_id'] = $this->destination_course_id;
         $params['forum_id'] = $forum_id;
@@ -1249,37 +1249,37 @@ 
             null,
             $sessionId
         );
-		$this->course->resources[RESOURCE_FORUMPOST][$id]->destination_id = $new_id;
+        $this->course->resources[RESOURCE_FORUMPOST][$id]->destination_id = $new_id;
 
-		return $new_id;
-	}
+        return $new_id;
+    }
 
-	/**
-	 * Restore links
-	 */
+    /**
+     * Restore links
+     */
     public function restore_links($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_LINK)) {
-			$link_table = Database :: get_course_table(TABLE_LINK);
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_LINK)) {
+            $link_table = Database :: get_course_table(TABLE_LINK);
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_LINK] as $id => $link) {
+            foreach ($resources[RESOURCE_LINK] as $id => $link) {
                 $cat_id = $this->restore_link_category(
                     $link->category_id,
                     $session_id
                 );
-				$sql = "SELECT MAX(display_order)
+                $sql = "SELECT MAX(display_order)
 				        FROM $link_table
 				        WHERE
 				            c_id = ".$this->destination_course_id." AND
 				            category_id='" . intval($cat_id). "'";
-				$result = Database::query($sql);
-    			list($max_order) = Database::fetch_array($result);
+                $result = Database::query($sql);
+                list($max_order) = Database::fetch_array($result);
 
                 $params = [];
-    			if (!empty($session_id)) {
+                if (!empty($session_id)) {
                     $params['session_id'] = $session_id;
-    			}
+                }
 
                 $params['c_id'] = $this->destination_course_id;
                 $params['url'] = self::DBUTF8($link->url);
@@ -1308,9 +1308,9 @@ 
                     }
                     $this->course->resources[RESOURCE_LINK][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Restore a link-category
@@ -1354,21 +1354,21 @@ 
         return $this->course->resources[RESOURCE_LINKCATEGORY][$id]->destination_id;
     }
 
-	/**
-	 * Restore tool intro
-	 */
+    /**
+     * Restore tool intro
+     */
     public function restore_tool_intro($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_TOOL_INTRO)) {
+        if ($this->course->has_resources(RESOURCE_TOOL_INTRO)) {
             $sessionId = intval($sessionId);
-			$tool_intro_table = Database :: get_course_table(TABLE_TOOL_INTRO);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_TOOL_INTRO] as $id => $tool_intro) {
-				$sql = "DELETE FROM ".$tool_intro_table."
+            $tool_intro_table = Database :: get_course_table(TABLE_TOOL_INTRO);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_TOOL_INTRO] as $id => $tool_intro) {
+                $sql = "DELETE FROM ".$tool_intro_table."
 				        WHERE
 				            c_id = ".$this->destination_course_id." AND
 				            id='".self::DBUTF8escapestring($tool_intro->id)."'";
-				Database::query($sql);
+                Database::query($sql);
 
                 $tool_intro->intro_text = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $tool_intro->intro_text,
@@ -1396,21 +1396,21 @@ 
 
                     $this->course->resources[RESOURCE_TOOL_INTRO][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore events
-	 */
+    /**
+     * Restore events
+     */
     public function restore_events($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_EVENT)) {
+        if ($this->course->has_resources(RESOURCE_EVENT)) {
             $sessionId = intval($sessionId);
-			$table = Database :: get_course_table(TABLE_AGENDA);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_EVENT] as $id => $event) {
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            $table = Database :: get_course_table(TABLE_AGENDA);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_EVENT] as $id => $event) {
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $event->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $event->content,
                     $this->course->code,
@@ -1428,7 +1428,7 @@ 
                     'end_date' => $event->end_date,
                     'session_id' => $sessionId,
                 ];
-				$new_event_id = Database::insert($table, $params);
+                $new_event_id = Database::insert($table, $params);
 
                 if ($new_event_id) {
                     $sql = "UPDATE $table SET id = iid WHERE iid = $new_event_id";
@@ -1441,30 +1441,30 @@ 
                     $this->course->resources[RESOURCE_EVENT][$id]->destination_id = $new_event_id;
                 }
 
-				// Copy event attachment
+                // Copy event attachment
 
-				$origin_path = $this->course->backup_path.'/upload/calendar/';
-				$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/calendar/';
+                $origin_path = $this->course->backup_path.'/upload/calendar/';
+                $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/calendar/';
 
-				if (!empty($this->course->orig)) {
+                if (!empty($this->course->orig)) {
 
-					$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
-					$sql = 'SELECT path, comment, size, filename
+                    $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                    $sql = 'SELECT path, comment, size, filename
 					        FROM '.$table_attachment.'
 					        WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id;
-					$attachment_event = Database::query($sql);
-					$attachment_event = Database::fetch_object($attachment_event);
+                    $attachment_event = Database::query($sql);
+                    $attachment_event = Database::fetch_object($attachment_event);
 
-					if (file_exists($origin_path.$attachment_event->path) &&
+                    if (file_exists($origin_path.$attachment_event->path) &&
                         !is_dir($origin_path.$attachment_event->path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$attachment_event->path, $destination_path.$new_filename);
-						//$copy_result = true;
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$attachment_event->path, $destination_path.$new_filename);
+                        //$copy_result = true;
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
 
-							$params = [
+                            $params = [
                                 'c_id' => $this->destination_course_id,
                                 'path' => self::DBUTF8($new_filename),
                                 'comment' => self::DBUTF8($attachment_event->comment),
@@ -1478,17 +1478,17 @@ 
                                 Database::query($sql);
                             }
                         }
-					}
-				} else {
-					// get the info of the file
-					if (!empty($event->attachment_path) &&
+                    }
+                } else {
+                    // get the info of the file
+                    if (!empty($event->attachment_path) &&
                         is_file($origin_path.$event->attachment_path) &&
                         is_readable($origin_path.$event->attachment_path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$event->attachment_path, $destination_path.$new_filename);
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$event->attachment_path, $destination_path.$new_filename);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1504,29 +1504,29 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $id";
                                 Database::query($sql);
                             }
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Restore course-description
-	 */
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Restore course-description
+     */
     public function restore_course_descriptions($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_COURSEDESCRIPTION)) {
-			$table = Database :: get_course_table(TABLE_COURSE_DESCRIPTION);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_COURSEDESCRIPTION] as $id => $cd) {
+        if ($this->course->has_resources(RESOURCE_COURSEDESCRIPTION)) {
+            $table = Database :: get_course_table(TABLE_COURSE_DESCRIPTION);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_COURSEDESCRIPTION] as $id => $cd) {
                 $courseDescription = (array) $cd;
 
                 $content = isset($courseDescription['content']) ? $courseDescription['content'] : '';
                 $descriptionType = isset($courseDescription['description_type']) ? $courseDescription['description_type'] : '';
                 $title = isset($courseDescription['title']) ? $courseDescription['title'] : '';
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $description_content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $content,
                     $this->course->code,
@@ -1554,22 +1554,22 @@ 
                     }
                     $this->course->resources[RESOURCE_COURSEDESCRIPTION][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore announcements
-	 */
+    /**
+     * Restore announcements
+     */
     public function restore_announcements($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_ANNOUNCEMENT)) {
+        if ($this->course->has_resources(RESOURCE_ANNOUNCEMENT)) {
             $sessionId = intval($sessionId);
-			$table = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_ANNOUNCEMENT] as $id => $announcement) {
+            $table = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_ANNOUNCEMENT] as $id => $announcement) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $announcement->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $announcement->content,
                     $this->course->code,
@@ -1588,7 +1588,7 @@ 
                     'session_id' => $sessionId,
                 ];
 
-				$new_announcement_id = Database::insert($table, $params);
+                $new_announcement_id = Database::insert($table, $params);
 
                 if ($new_announcement_id) {
                     $sql = "UPDATE $table SET id = iid WHERE iid = $new_announcement_id";
@@ -1600,32 +1600,32 @@ 
                     $this->course->resources[RESOURCE_ANNOUNCEMENT][$id]->destination_id = $new_announcement_id;
                 }
 
-				$origin_path = $this->course->backup_path.'/upload/announcements/';
-				$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/announcements/';
+                $origin_path = $this->course->backup_path.'/upload/announcements/';
+                $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/announcements/';
 
-				// Copy announcement attachment file
-				if (!empty($this->course->orig)) {
+                // Copy announcement attachment file
+                if (!empty($this->course->orig)) {
 
-					$table_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
-					$sql = 'SELECT path, comment, size, filename
+                    $table_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                    $sql = 'SELECT path, comment, size, filename
 					        FROM '.$table_attachment.'
 					        WHERE
 					            c_id = '.$this->destination_course_id.' AND
 					            announcement_id = '.$id;
-					$attachment_event = Database::query($sql);
-					$attachment_event = Database::fetch_object($attachment_event);
+                    $attachment_event = Database::query($sql);
+                    $attachment_event = Database::fetch_object($attachment_event);
 
-					if (file_exists($origin_path.$attachment_event->path) &&
+                    if (file_exists($origin_path.$attachment_event->path) &&
                         !is_dir($origin_path.$attachment_event->path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
                         $copy_result = copy(
                             $origin_path.$attachment_event->path,
                             $destination_path.$new_filename
                         );
 
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1642,20 +1642,20 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $attachmentId";
                                 Database::query($sql);
                             }
-						}
-					}
-				} else {
-					// get the info of the file
-					if (!empty($announcement->attachment_path) &&
+                        }
+                    }
+                } else {
+                    // get the info of the file
+                    if (!empty($announcement->attachment_path) &&
                         is_file($origin_path.$announcement->attachment_path) &&
                         is_readable($origin_path.$announcement->attachment_path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$announcement->attachment_path, $destination_path.$new_filename);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$announcement->attachment_path, $destination_path.$new_filename);
 
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
-							/*$sql = "INSERT INTO ".$table_attachment." SET
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                            /*$sql = "INSERT INTO ".$table_attachment." SET
 							        c_id = ".$this->destination_course_id." ,
 							        path = '".self::DBUTF8escapestring($new_filename)."',
 							        comment = '".self::DBUTF8escapestring($announcement->attachment_comment)."',
@@ -1678,12 +1678,12 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $attachmentId";
                                 Database::query($sql);
                             }
-						}
-					}
-				}
-			}
-		}
-	}
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Quiz
@@ -1694,13 +1694,13 @@ 
         $session_id = 0,
         $respect_base_content = false
     ) {
-		if ($this->course->has_resources(RESOURCE_QUIZ)) {
-			$table_qui = Database :: get_course_table(TABLE_QUIZ_TEST);
-			$table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
-			$table_doc = Database :: get_course_table(TABLE_DOCUMENT);
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_QUIZ)) {
+            $table_qui = Database :: get_course_table(TABLE_QUIZ_TEST);
+            $table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
+            $table_doc = Database :: get_course_table(TABLE_DOCUMENT);
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_QUIZ] as $id => $quiz) {
+            foreach ($resources[RESOURCE_QUIZ] as $id => $quiz) {
 
                 if (isset($quiz->obj)) {
                     //For new imports
@@ -1710,7 +1710,7 @@ 
                     $quiz->obj = $quiz;
                 }
 
-				$doc = '';
+                $doc = '';
                 if (!empty($quiz->sound)) {
                     if (isset($this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]) &&
                         $this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]->is_restored()) {
@@ -1718,14 +1718,14 @@ 
                                 WHERE
                                     c_id = " . $this->destination_course_id . "  AND
                                     id = " . $resources[RESOURCE_DOCUMENT][$quiz->sound]->destination_id;
-						$doc = Database::query($sql);
-						$doc = Database::fetch_object($doc);
-						$doc = str_replace('/audio/', '', $doc->path);
-					}
-				}
-
-				if ($id != -1) {
-					// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                        $doc = Database::query($sql);
+                        $doc = Database::fetch_object($doc);
+                        $doc = str_replace('/audio/', '', $doc->path);
+                    }
+                }
+
+                if ($id != -1) {
+                    // check resources inside html from ckeditor tool and copy correct urls into recipient course
                     $quiz->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $quiz->description,
                         $this->course->code,
@@ -1734,13 +1734,13 @@ 
                         $this->course->info['path']
                     );
 
-					global $_custom;
-					if (isset($_custom['exercises_clean_dates_when_restoring']) &&
+                    global $_custom;
+                    if (isset($_custom['exercises_clean_dates_when_restoring']) &&
                         $_custom['exercises_clean_dates_when_restoring']
                     ) {
-						$quiz->start_time = null;
-						$quiz->end_time   = null;
-					}
+                        $quiz->start_time = null;
+                        $quiz->end_time   = null;
+                    }
 
                     $params = array(
                         'c_id' => $this->destination_course_id,
@@ -1772,10 +1772,10 @@ 
                         }
                         $params['session_id'] = $my_session_id;
                     } else {
-        				if (!empty($session_id)) {
-        					$session_id = intval($session_id);
+                        if (!empty($session_id)) {
+                            $session_id = intval($session_id);
                             $params['session_id'] = $session_id;
-    				    }
+                        }
                     }
                     $new_id = Database::insert($table_qui, $params);
 
@@ -1784,15 +1784,15 @@ 
                         Database::query($sql);
                     }
 
-				} else {
-					// $id = -1 identifies the fictionary test for collecting
-					// orphan questions. We do not store it in the database.
-					$new_id = -1;
-				}
+                } else {
+                    // $id = -1 identifies the fictionary test for collecting
+                    // orphan questions. We do not store it in the database.
+                    $new_id = -1;
+                }
 
-				$this->course->resources[RESOURCE_QUIZ][$id]->destination_id = $new_id;
+                $this->course->resources[RESOURCE_QUIZ][$id]->destination_id = $new_id;
 
-				$order = 0;
+                $order = 0;
                 if (!empty($quiz->question_ids)) {
                     foreach ($quiz->question_ids as $index => $question_id) {
                         $qid = $this->restore_quiz_question($question_id);
@@ -1805,30 +1805,30 @@ 
                         Database::query($sql);
                     }
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore quiz-questions
+    /**
+     * Restore quiz-questions
      * @params int question id
-	 */
+     */
     public function restore_quiz_question($id)
     {
-		$resources = $this->course->resources;
+        $resources = $this->course->resources;
         $question = isset($resources[RESOURCE_QUIZQUESTION][$id]) ? $resources[RESOURCE_QUIZQUESTION][$id] : null;
 
-		$new_id = 0;
+        $new_id = 0;
 
-		if (is_object($question)) {
-			if ($question->is_restored()) {
-				return $question->destination_id;
-			}
-			$table_que = Database::get_course_table(TABLE_QUIZ_QUESTION);
-			$table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        if (is_object($question)) {
+            if ($question->is_restored()) {
+                return $question->destination_id;
+            }
+            $table_que = Database::get_course_table(TABLE_QUIZ_QUESTION);
+            $table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
             $table_options = Database::get_course_table(TABLE_QUIZ_QUESTION_OPTION);
 
-			// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            // check resources inside html from ckeditor tool and copy correct urls into recipient course
             $question->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                 $question->description,
                 $this->course->code,
@@ -1849,7 +1849,7 @@ 
                 'extra' => self::DBUTF8($question->extra),
             ];
 
-			$new_id = Database::insert($table_que, $params);
+            $new_id = Database::insert($table_que, $params);
 
             if ($new_id) {
 
@@ -1890,7 +1890,7 @@ 
 
                 foreach ($temp as $index => $answer) {
                     //id = '".$index."',
-					$params = [
+                    $params = [
                         'c_id' => $this->destination_course_id,
                         'question_id' => $new_id,
                         'answer' => self::DBUTF8($answer['answer']),
@@ -1907,12 +1907,12 @@ 
                         $sql = "UPDATE $table_ans SET id = iid, id_auto = iid WHERE iid = $answerId";
                         Database::query($sql);
                     }
-				}
-			} else {
+                }
+            } else {
                 $correct_answers = array();
-				foreach ($question->answers as $index => $answer) {
+                foreach ($question->answers as $index => $answer) {
 
-					// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                    // check resources inside html from ckeditor tool and copy correct urls into recipient course
                     $answer['answer'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $answer['answer'],
                         $this->course->code,
@@ -1951,8 +1951,8 @@ 
                     }
 
                     $correct_answers[$answerId] = $answer['correct'];
-				}
-			}
+                }
+            }
 
             //Current course id
             $course_id = api_get_course_int_id();
@@ -2049,12 +2049,12 @@ 
                     }
                 }
             }
-			$this->course->resources[RESOURCE_QUIZQUESTION][$id]->destination_id = $new_id;
-		}
-		return $new_id;
-	}
+            $this->course->resources[RESOURCE_QUIZQUESTION][$id]->destination_id = $new_id;
+        }
+        return $new_id;
+    }
 
-	/**
+    /**
      * @todo : add session id when used for session
      */
     public function restore_test_category($session_id, $respect_base_content, $destination_course_code)
@@ -2134,21 +2134,21 @@ 
         $sessionId = intval($sessionId);
 
         if ($this->course->has_resources(RESOURCE_SURVEY)) {
-			$table_sur = Database :: get_course_table(TABLE_SURVEY);
-			$table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-			$table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_SURVEY] as $id => $survey) {
+            $table_sur = Database :: get_course_table(TABLE_SURVEY);
+            $table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+            $table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_SURVEY] as $id => $survey) {
 
-				$sql = 'SELECT survey_id FROM '.$table_sur.'
+                $sql = 'SELECT survey_id FROM '.$table_sur.'
                         WHERE
                             c_id = '.$this->destination_course_id.' AND
                             code = "'.self::DBUTF8escapestring($survey->code).'" AND
                             lang = "'.self::DBUTF8escapestring($survey->lang).'" ';
 
-				$result_check = Database::query($sql);
+                $result_check = Database::query($sql);
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $survey->title = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $survey->title,
                     $this->course->code,
@@ -2202,20 +2202,20 @@ 
                     'session_id' => $sessionId,
                 ];
 
-				//An existing survey exists with the same code and the same language
-				if (Database::num_rows($result_check) == 1) {
-					switch ($this->file_option) {
-						case FILE_SKIP:
-							//Do nothing
-							break;
-						case FILE_RENAME:
-							$survey_code = $survey->code.'_';
-							$i=1;
-							$temp_survey_code = $survey_code.$i;
-							while (!$this->is_survey_code_available($temp_survey_code)) {
-								$temp_survey_code = $survey_code.++$i;
-							}
-							$survey_code = $temp_survey_code;
+                //An existing survey exists with the same code and the same language
+                if (Database::num_rows($result_check) == 1) {
+                    switch ($this->file_option) {
+                        case FILE_SKIP:
+                            //Do nothing
+                            break;
+                        case FILE_RENAME:
+                            $survey_code = $survey->code.'_';
+                            $i=1;
+                            $temp_survey_code = $survey_code.$i;
+                            while (!$this->is_survey_code_available($temp_survey_code)) {
+                                $temp_survey_code = $survey_code.++$i;
+                            }
+                            $survey_code = $temp_survey_code;
 
                             $params['code'] = $survey_code;
                             $new_id = Database::insert($table_sur, $params);
@@ -2234,25 +2234,25 @@ 
                                     Database::query($sql);
                                 }
                             }
-							break;
-						case FILE_OVERWRITE:
-							// Delete the existing survey with the same code and language and import the one of the source course
-							// getting the information of the survey (used for when the survey is shared)
+                            break;
+                        case FILE_OVERWRITE:
+                            // Delete the existing survey with the same code and language and import the one of the source course
+                            // getting the information of the survey (used for when the survey is shared)
 
-							$sql = "SELECT * FROM $table_sur
+                            $sql = "SELECT * FROM $table_sur
 							        WHERE
 							            c_id = ".$this->destination_course_id." AND
 							            survey_id='".self::DBUTF8escapestring(Database::result($result_check,0,0))."'";
-							$result = Database::query($sql);
-							$survey_data = Database::fetch_array($result,'ASSOC');
+                            $result = Database::query($sql);
+                            $survey_data = Database::fetch_array($result,'ASSOC');
 
-							// if the survey is shared => also delete the shared content
-							if (isset($survey_data['survey_share']) && is_numeric($survey_data['survey_share'])) {
+                            // if the survey is shared => also delete the shared content
+                            if (isset($survey_data['survey_share']) && is_numeric($survey_data['survey_share'])) {
                                 SurveyManager::delete_survey($survey_data['survey_share'], true,$this->destination_course_id);
-							}
-							SurveyManager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
+                            }
+                            SurveyManager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
 
-							// Insert the new source survey
+                            // Insert the new source survey
                             $new_id = Database::insert($table_sur, $params);
 
                             if ($new_id) {
@@ -2273,11 +2273,11 @@ 
                                     Database::query($sql);
                                 }
                             }
-							break;
-						default:
-							break;
-					}
-				} else {
+                            break;
+                        default:
+                            break;
+                    }
+                } else {
                     // No existing survey with the same language and the same code, we just copy the survey
                     $new_id = Database::insert($table_sur, $params);
 
@@ -2299,43 +2299,43 @@ 
                             Database::query($sql);
                         }
                     }
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check availability of a survey code
-	 */
+                }
+            }
+        }
+    }
+
+    /**
+     * Check availability of a survey code
+     */
     public function is_survey_code_available($survey_code)
     {
-		$table_sur = Database :: get_course_table(TABLE_SURVEY);
-		$sql = "SELECT * FROM $table_sur
+        $table_sur = Database :: get_course_table(TABLE_SURVEY);
+        $sql = "SELECT * FROM $table_sur
 		        WHERE
 		            c_id = ".$this->destination_course_id." AND
 		            code='".self::DBUTF8escapestring($survey_code)."'";
-		$result = Database::query($sql);
-		if (Database::num_rows($result) > 0) return false; else return true;
-	}
+        $result = Database::query($sql);
+        if (Database::num_rows($result) > 0) return false; else return true;
+    }
 
-	/**
-	 * Restore survey-questions
-	 */
+    /**
+     * Restore survey-questions
+     */
     public function restore_survey_question($id, $survey_id)
     {
-		$resources = $this->course->resources;
-		$question = $resources[RESOURCE_SURVEYQUESTION][$id];
+        $resources = $this->course->resources;
+        $question = $resources[RESOURCE_SURVEYQUESTION][$id];
 
-		$new_id=0;
+        $new_id=0;
 
-		if (is_object($question)) {
-			if ($question->is_restored()) {
-				return $question->destination_id;
-			}
-			$table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-			$table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+        if (is_object($question)) {
+            if ($question->is_restored()) {
+                return $question->destination_id;
+            }
+            $table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+            $table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 
-			// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            // check resources inside html from ckeditor tool and copy correct urls into recipient course
             $question->survey_question = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                 $question->survey_question,
                 $this->course->code,
@@ -2389,10 +2389,10 @@ 
                 }
                 $this->course->resources[RESOURCE_SURVEYQUESTION][$id]->destination_id = $new_id;
             }
-		}
+        }
 
-		return $new_id;
-	}
+        return $new_id;
+    }
 
     /**
      * Restoring learning paths
@@ -2403,20 +2403,20 @@ 
     {
         $session_id = intval($session_id);
 
-		if ($this->course->has_resources(RESOURCE_LEARNPATH)) {
+        if ($this->course->has_resources(RESOURCE_LEARNPATH)) {
             $table_main = Database::get_course_table(TABLE_LP_MAIN);
             $table_item = Database::get_course_table(TABLE_LP_ITEM);
             $table_tool = Database::get_course_table(TABLE_TOOL_LIST);
 
-			$resources = $this->course->resources;
+            $resources = $this->course->resources;
 
-			$origin_path = $this->course->backup_path.'/upload/learning_path/images/';
-			$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/learning_path/images/';
+            $origin_path = $this->course->backup_path.'/upload/learning_path/images/';
+            $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/learning_path/images/';
 
-			foreach ($resources[RESOURCE_LEARNPATH] as $id => $lp) {
+            foreach ($resources[RESOURCE_LEARNPATH] as $id => $lp) {
 
-				$condition_session = "";
-				if (!empty($session_id)) {
+                $condition_session = "";
+                if (!empty($session_id)) {
                     if ($respect_base_content) {
                         $my_session_id = $lp->session_id;
                         if (!empty($lp->session_id)) {
@@ -2427,21 +2427,21 @@ 
                         $session_id = intval($session_id);
                         $condition_session = $session_id;
                     }
-				}
-
-				// Adding the author's image
-				if (!empty($lp->preview_image)) {
-					$new_filename = uniqid('').substr($lp->preview_image,strlen($lp->preview_image)-7, strlen($lp->preview_image));
-					if (file_exists($origin_path.$lp->preview_image) && !is_dir($origin_path.$lp->preview_image)) {
-						$copy_result = copy($origin_path.$lp->preview_image, $destination_path.$new_filename);
-						//$copy_result = true;
-						if ($copy_result) {
-							$lp->preview_image = $new_filename;
-						} else {
-							$lp->preview_image ='';
-						}
-					}
-				}
+                }
+
+                // Adding the author's image
+                if (!empty($lp->preview_image)) {
+                    $new_filename = uniqid('').substr($lp->preview_image,strlen($lp->preview_image)-7, strlen($lp->preview_image));
+                    if (file_exists($origin_path.$lp->preview_image) && !is_dir($origin_path.$lp->preview_image)) {
+                        $copy_result = copy($origin_path.$lp->preview_image, $destination_path.$new_filename);
+                        //$copy_result = true;
+                        if ($copy_result) {
+                            $lp->preview_image = $new_filename;
+                        } else {
+                            $lp->preview_image ='';
+                        }
+                    }
+                }
 
                 if ($this->add_text_in_items) {
                     $lp->name = $lp->name.' '.get_lang('CopyLabelSuffix');
@@ -2488,7 +2488,7 @@ 
                     $params['session_id'] = $condition_session;
                 }
 
-				$new_lp_id = Database::insert($table_main, $params);
+                $new_lp_id = Database::insert($table_main, $params);
 
                 if ($new_lp_id) {
 
@@ -2549,13 +2549,13 @@ 
                 $old_refs = array();
                 $prerequisite_ids = array();
 
-				foreach ($lp->get_items() as $index => $item) {
-					// we set the ref code here and then we update in a for loop
-					$ref = $item['ref'];
+                foreach ($lp->get_items() as $index => $item) {
+                    // we set the ref code here and then we update in a for loop
+                    $ref = $item['ref'];
 
-					// Dealing with path the same way as ref as some data has
+                    // Dealing with path the same way as ref as some data has
                     // been put into path when it's a local resource
-					// Only fix the path for no scos
+                    // Only fix the path for no scos
                     if ($item['item_type'] == 'sco') {
                         $path = $item['path'];
                     } else {
@@ -2584,128 +2584,128 @@ 
                         'launch_data' => self::DBUTF8($item['launch_data']),
                     ];
 
-					$new_item_id = Database::insert($table_item, $params);
+                    $new_item_id = Database::insert($table_item, $params);
 
                     $sql = "UPDATE $table_item SET id = iid WHERE iid = $new_item_id";
                     Database::query($sql);
 
-					//save a link between old and new item IDs
-					$new_item_ids[$item['id']] = $new_item_id;
-					//save a reference of items that need a parent_item_id refresh
-					$parent_item_ids[$new_item_id] = $item['parent_item_id'];
-					//save a reference of items that need a previous_item_id refresh
-					$previous_item_ids[$new_item_id] = $item['previous_item_id'];
-					//save a reference of items that need a next_item_id refresh
-					$next_item_ids[$new_item_id] = $item['next_item_id'];
-
-					if (!empty($item['prerequisite'])) {
-						if ($lp->lp_type =='2') {
-							// if is an sco
-							$old_prerequisite[$new_item_id]= $item['prerequisite'];
-						} else {
-							$old_prerequisite[$new_item_id]= $new_item_ids[$item['prerequisite']];
-						}
-					}
-
-					if (!empty($ref)) {
-						if ($lp->lp_type =='2') {
-							// if is an sco
-							$old_refs[$new_item_id]= $ref;
-						} else {
+                    //save a link between old and new item IDs
+                    $new_item_ids[$item['id']] = $new_item_id;
+                    //save a reference of items that need a parent_item_id refresh
+                    $parent_item_ids[$new_item_id] = $item['parent_item_id'];
+                    //save a reference of items that need a previous_item_id refresh
+                    $previous_item_ids[$new_item_id] = $item['previous_item_id'];
+                    //save a reference of items that need a next_item_id refresh
+                    $next_item_ids[$new_item_id] = $item['next_item_id'];
+
+                    if (!empty($item['prerequisite'])) {
+                        if ($lp->lp_type =='2') {
+                            // if is an sco
+                            $old_prerequisite[$new_item_id]= $item['prerequisite'];
+                        } else {
+                            $old_prerequisite[$new_item_id]= $new_item_ids[$item['prerequisite']];
+                        }
+                    }
+
+                    if (!empty($ref)) {
+                        if ($lp->lp_type =='2') {
+                            // if is an sco
+                            $old_refs[$new_item_id]= $ref;
+                        } else {
                             $old_refs[$new_item_id]= $new_item_ids[$ref];
-						}
-					}
+                        }
+                    }
 
-					$prerequisite_ids[$new_item_id] = $item['prerequisite'];
-				}
+                    $prerequisite_ids[$new_item_id] = $item['prerequisite'];
+                }
 
-				// Updating prerequisites
-				foreach ($old_prerequisite  as $key=>$my_old_prerequisite) {
-					if($my_old_prerequisite != ''){
-						$sql = "UPDATE ".$table_item." SET prerequisite = '".$my_old_prerequisite."'
+                // Updating prerequisites
+                foreach ($old_prerequisite  as $key=>$my_old_prerequisite) {
+                    if($my_old_prerequisite != ''){
+                        $sql = "UPDATE ".$table_item." SET prerequisite = '".$my_old_prerequisite."'
 						        WHERE c_id = ".$this->destination_course_id." AND id = '".$key."'  ";
-						Database::query($sql);
-					}
-				}
-
-				// Updating refs
-				foreach ($old_refs  as $key=>$my_old_ref) {
-					if ($my_old_ref != '') {
-						$sql = "UPDATE ".$table_item." SET ref = '".$my_old_ref."'
+                        Database::query($sql);
+                    }
+                }
+
+                // Updating refs
+                foreach ($old_refs  as $key=>$my_old_ref) {
+                    if ($my_old_ref != '') {
+                        $sql = "UPDATE ".$table_item." SET ref = '".$my_old_ref."'
 						        WHERE c_id = ".$this->destination_course_id." AND id = '".$key."'  ";
-						Database::query($sql);
-					}
-				}
-
-				foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
-					$parent_new_id = 0;
-					if($parent_item_old_id != 0){
-						$parent_new_id = $new_item_ids[$parent_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET parent_item_id = '".$parent_new_id."'
+                        Database::query($sql);
+                    }
+                }
+
+                foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
+                    $parent_new_id = 0;
+                    if($parent_item_old_id != 0){
+                        $parent_new_id = $new_item_ids[$parent_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET parent_item_id = '".$parent_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-				foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
-					$previous_new_id = 0;
-					if($previous_item_old_id != 0){
-						$previous_new_id = $new_item_ids[$previous_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET previous_item_id = '".$previous_new_id."'
+                    Database::query($sql);
+                }
+                foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
+                    $previous_new_id = 0;
+                    if($previous_item_old_id != 0){
+                        $previous_new_id = $new_item_ids[$previous_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET previous_item_id = '".$previous_new_id."'
 					        WHERE  c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-
-				foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
-					$next_new_id = 0;
-					if($next_item_old_id != 0){
-						$next_new_id = $new_item_ids[$next_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET next_item_id = '".$next_new_id."'
+                    Database::query($sql);
+                }
+
+                foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
+                    $next_new_id = 0;
+                    if($next_item_old_id != 0){
+                        $next_new_id = $new_item_ids[$next_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET next_item_id = '".$next_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-
-				foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
-					$prerequisite_new_id = 0;
-					if($prerequisite_old_id != 0){
-						$prerequisite_new_id = $new_item_ids[$prerequisite_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET prerequisite = '".$prerequisite_new_id."'
+                    Database::query($sql);
+                }
+
+                foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
+                    $prerequisite_new_id = 0;
+                    if($prerequisite_old_id != 0){
+                        $prerequisite_new_id = $new_item_ids[$prerequisite_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET prerequisite = '".$prerequisite_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-				$this->course->resources[RESOURCE_LEARNPATH][$id]->destination_id = $new_lp_id;
-			}
-		}
-	}
-
-	/**
-	 * Restore works
+                    Database::query($sql);
+                }
+                $this->course->resources[RESOURCE_LEARNPATH][$id]->destination_id = $new_lp_id;
+            }
+        }
+    }
+
+    /**
+     * Restore works
      * @deprecated use restore_works
      *
-	 */
-	public function restore_student_publication($sessionId = 0)
+     */
+    public function restore_student_publication($sessionId = 0)
     {
         $sessionId = intval($sessionId);
-		$work_assignment_table  = Database :: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
-		$work_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-		$item_property_table  	= Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $work_assignment_table  = Database :: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
+        $work_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+        $item_property_table  	= Database :: get_course_table(TABLE_ITEM_PROPERTY);
 
-		// Query in student publication
-		$sql = 'SELECT * FROM '.$work_table.'
+        // Query in student publication
+        $sql = 'SELECT * FROM '.$work_table.'
 		        WHERE c_id = '.$this->course_origin_id.' AND filetype = "folder" AND active IN (0, 1) ';
 
-		$result = Database::query($sql);
-		$folders = Database::store_result($result, 'ASSOC');
+        $result = Database::query($sql);
+        $folders = Database::store_result($result, 'ASSOC');
 
-		foreach ($folders  as $folder) {
-		    $old_id = $folder['id'];
+        foreach ($folders  as $folder) {
+            $old_id = $folder['id'];
             unset($folder['id']);
-			$folder['c_id'] = $this->destination_course_id;
+            $folder['c_id'] = $this->destination_course_id;
             $folder['parent_id'] = 0;
             $folder['session_id'] = $sessionId;
-			$new_id = Database::insert($work_table, $folder);
+            $new_id = Database::insert($work_table, $folder);
 
             if ($new_id) {
                 //query in item property
@@ -2764,21 +2764,21 @@ 
                     }
                 }
             }
-		}
+        }
 
-		$destination = '../../courses/'.$this->course->destination_path.'/work/';
-		$origin = '../../courses/'.$this->course->info['path'].'/work/';
-		self::allow_create_all_directory($origin,$destination,false);
-	}
+        $destination = '../../courses/'.$this->course->destination_path.'/work/';
+        $origin = '../../courses/'.$this->course->info['path'].'/work/';
+        self::allow_create_all_directory($origin,$destination,false);
+    }
 
     /**
-    * copy all directory and sub directory
-    * @param string The path origin
-    * @param string The path destination
-    * @param boolean Option Overwrite
-    * @return void()
-    * @deprecated
-    */
+     * copy all directory and sub directory
+     * @param string The path origin
+     * @param string The path destination
+     * @param boolean Option Overwrite
+     * @return void()
+     * @deprecated
+     */
     public function allow_create_all_directory($source, $dest, $overwrite = false)
     {
         if (!is_dir($dest)) {
@@ -2789,14 +2789,14 @@ 
                 if ($file != '.' && $file != '..') {
                     $path = $source . '/' . $file;
                     if (is_file($path)) {
-                       /* if (!is_file($dest . '/' . $file) || $overwrite)
+                        /* if (!is_file($dest . '/' . $file) || $overwrite)
                         if (!@copy($path, $dest . '/' . $file)) {
                             echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>';
                         }*/
                     } elseif(is_dir($path)) {
                         if (!is_dir($dest . '/' . $file))
                         mkdir($dest . '/' . $file);
-                       self:: allow_create_all_directory($path, $dest . '/' . $file, $overwrite);
+                        self:: allow_create_all_directory($path, $dest . '/' . $file, $overwrite);
                     }
                 }
             }
@@ -2804,12 +2804,12 @@ 
         }
     }
 
-	/**
-	 * Gets the new ID of one specific tool item from the tool name and the old ID
-	 * @param	string	Tool name
-	 * @param	integer	Old ID
-	 * @return	integer	New ID
-	 */
+    /**
+     * Gets the new ID of one specific tool item from the tool name and the old ID
+     * @param	string	Tool name
+     * @param	integer	Old ID
+     * @return	integer	New ID
+     */
     public function get_new_id($tool, $ref)
     {
         // Check if the value exist in the current array.
@@ -2831,25 +2831,25 @@ 
         }
 
         return '';
-	}
+    }
 
-	/**
-	 * Restore glossary
-	 */
+    /**
+     * Restore glossary
+     */
     public function restore_glossary($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_GLOSSARY)) {
-			$table_glossary = Database :: get_course_table(TABLE_GLOSSARY);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_GLOSSARY] as $id => $glossary) {
+        if ($this->course->has_resources(RESOURCE_GLOSSARY)) {
+            $table_glossary = Database :: get_course_table(TABLE_GLOSSARY);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_GLOSSARY] as $id => $glossary) {
 
                 $params = [];
-    			if (!empty($session_id)) {
-    				$session_id = intval($session_id);
+                if (!empty($session_id)) {
+                    $session_id = intval($session_id);
                     $params['session_id'] = $session_id;
-    			}
+                }
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $glossary->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $glossary->description,
                     $this->course->code,
@@ -2883,27 +2883,27 @@ 
 
                     $this->course->resources[RESOURCE_GLOSSARY][$id]->destination_id = $my_id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * @param int $session_id
      */
     public function restore_wiki($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_WIKI)) {
-			// wiki table of the target course
-			$table_wiki = Database :: get_course_table(TABLE_WIKI);
-			$table_wiki_conf = Database :: get_course_table(TABLE_WIKI_CONF);
+        if ($this->course->has_resources(RESOURCE_WIKI)) {
+            // wiki table of the target course
+            $table_wiki = Database :: get_course_table(TABLE_WIKI);
+            $table_wiki_conf = Database :: get_course_table(TABLE_WIKI_CONF);
 
-			// storing all the resources that have to be copied in an array
-			$resources = $this->course->resources;
+            // storing all the resources that have to be copied in an array
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_WIKI] as $id => $wiki) {
-				// the sql statement to insert the groups from the old course to the new course
+            foreach ($resources[RESOURCE_WIKI] as $id => $wiki) {
+                // the sql statement to insert the groups from the old course to the new course
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $wiki->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $wiki->content,
                     $this->course->code,
@@ -2926,7 +2926,7 @@ 
                     'session_id' => !empty($session_id) ? intval($session_id) : 0,
                 ];
 
-				$new_id = Database::insert($table_wiki, $params);
+                $new_id = Database::insert($table_wiki, $params);
 
                 if ($new_id) {
 
@@ -2957,9 +2957,9 @@ 
 
                     Database::insert($table_wiki_conf, $params);
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Restore Thematics
@@ -2967,15 +2967,15 @@ 
      */
     public function restore_thematic($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_THEMATIC)) {
+        if ($this->course->has_resources(RESOURCE_THEMATIC)) {
             $table_thematic = Database:: get_course_table(TABLE_THEMATIC);
             $table_thematic_advance = Database:: get_course_table(TABLE_THEMATIC_ADVANCE);
             $table_thematic_plan = Database:: get_course_table(TABLE_THEMATIC_PLAN);
 
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_THEMATIC] as $id => $thematic) {
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_THEMATIC] as $id => $thematic) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $thematic->params['content'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $thematic->params['content'],
                     $this->course->code,
@@ -2983,13 +2983,13 @@ 
                     $this->course->backup_path,
                     $this->course->info['path']
                 );
-				$thematic->params['c_id']  = $this->destination_course_id;
-				unset($thematic->params['id']);
+                $thematic->params['c_id']  = $this->destination_course_id;
+                unset($thematic->params['id']);
                 unset($thematic->params['iid']);
 
-				$last_id = Database::insert($table_thematic, $thematic->params, false);
+                $last_id = Database::insert($table_thematic, $thematic->params, false);
 
-				if ($last_id) {
+                if ($last_id) {
 
                     $sql = "UPDATE $table_thematic SET id = iid WHERE iid = $last_id";
                     Database::query($sql);
@@ -3002,19 +3002,19 @@ 
                         api_get_user_id()
                     );
 
-					foreach ($thematic->thematic_advance_list as $thematic_advance) {
-						unset($thematic_advance['id']);
+                    foreach ($thematic->thematic_advance_list as $thematic_advance) {
+                        unset($thematic_advance['id']);
                         unset($thematic_advance['iid']);
-						$thematic_advance['attendance_id'] = 0;
-						$thematic_advance['thematic_id'] = $last_id;
-						$thematic_advance['c_id']  = $this->destination_course_id;
+                        $thematic_advance['attendance_id'] = 0;
+                        $thematic_advance['thematic_id'] = $last_id;
+                        $thematic_advance['c_id']  = $this->destination_course_id;
                         $my_id = Database::insert(
                             $table_thematic_advance,
                             $thematic_advance,
                             false
                         );
 
-						if ($my_id) {
+                        if ($my_id) {
 
                             $sql = "UPDATE $table_thematic_advance SET id = iid WHERE iid = $my_id";
                             Database::query($sql);
@@ -3026,17 +3026,17 @@ 
                                 "ThematicAdvanceAdded",
                                 api_get_user_id()
                             );
-						}
-					}
+                        }
+                    }
 
-					foreach($thematic->thematic_plan_list as $thematic_plan) {
-						unset($thematic_plan['id']);
+                    foreach($thematic->thematic_plan_list as $thematic_plan) {
+                        unset($thematic_plan['id']);
                         unset($thematic_plan['iid']);
-						$thematic_plan['thematic_id'] = $last_id;
-						$thematic_plan['c_id'] = $this->destination_course_id;
-						$my_id = Database::insert($table_thematic_plan, $thematic_plan, false);
+                        $thematic_plan['thematic_id'] = $last_id;
+                        $thematic_plan['c_id'] = $this->destination_course_id;
+                        $my_id = Database::insert($table_thematic_plan, $thematic_plan, false);
 
-						if ($my_id) {
+                        if ($my_id) {
 
                             $sql = "UPDATE $table_thematic_plan SET id = iid WHERE iid = $my_id";
                             Database::query($sql);
@@ -3048,12 +3048,12 @@ 
                                 "ThematicPlanAdded",
                                 api_get_user_id()
                             );
-						}
-					}
-				}
-			}
-		}
-	}
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Attendance
@@ -3061,14 +3061,14 @@ 
      */
     public function restore_attendance($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
-			$table_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
-			$table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
+            $table_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
+            $table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR);
 
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_ATTENDANCE] as $id => $obj) {
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_ATTENDANCE] as $id => $obj) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $obj->params['description'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $obj->params['description'],
                     $this->course->code,
@@ -3080,11 +3080,11 @@ 
                 unset($obj->params['id']);
                 unset($obj->params['iid']);
 
-				$obj->params['c_id'] = $this->destination_course_id;
+                $obj->params['c_id'] = $this->destination_course_id;
 
-				$last_id = Database::insert($table_attendance, $obj->params);
+                $last_id = Database::insert($table_attendance, $obj->params);
 
-				if (is_numeric($last_id)) {
+                if (is_numeric($last_id)) {
 
                     $sql = "UPDATE $table_attendance SET id = iid WHERE iid = $last_id";
                     Database::query($sql);
@@ -3098,11 +3098,11 @@ 
                     );
 
                     foreach ($obj->attendance_calendar as $attendance_calendar) {
-						unset($attendance_calendar['id']);
+                        unset($attendance_calendar['id']);
                         unset($attendance_calendar['iid']);
 
-						$attendance_calendar['attendance_id'] = $last_id;
-						$attendance_calendar['c_id'] = $this->destination_course_id;
+                        $attendance_calendar['attendance_id'] = $last_id;
+                        $attendance_calendar['c_id'] = $this->destination_course_id;
                         $attendanceCalendarId = Database::insert(
                             $table_attendance_calendar,
                             $attendance_calendar
@@ -3110,11 +3110,11 @@ 
 
                         $sql = "UPDATE $table_attendance_calendar SET id = iid WHERE iid = $attendanceCalendarId";
                         Database::query($sql);
-					}
-				}
-			}
-		}
-	}
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Works
@@ -3256,11 +3256,11 @@ 
      */
     public function DBUTF8($str)
     {
-		if (UTF8_CONVERT) {
+        if (UTF8_CONVERT) {
             $str = utf8_encode($str);
         }
-		return $str;
-	}
+        return $str;
+    }
 
     /**
      * @param string $str
@@ -3271,8 +3271,8 @@ 
         if (UTF8_CONVERT) {
             $str = utf8_encode($str);
         }
-		return Database::escape_string($str);
-	}
+        return Database::escape_string($str);
+    }
 
     /**
      * @param array $array

main/coursecopy/copy_course_session.php

Spacing +21 added lines, -21 removed lines

@@ -11,7 +11,7 @@ 
 
 $cidReset = true;
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_COURSE_MAINTENANCE;
+$current_course_tool = TOOL_COURSE_MAINTENANCE;
 
 api_protect_global_admin_script();
 api_protect_limit_for_session_admin();
@@ -82,7 +82,7 @@ 
 
 function display_form()
 {
-    $html  = '';
+    $html = '';
     $sessions = SessionManager::get_sessions_list(array(), array('name', 'ASC'));
 
     // Actions
@@ -109,7 +109,7 @@ 
 
     //destination
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-2 control-label">' . get_lang('DestinationCoursesFromSession') . ': </label>';
+    $html .= '<label class="col-sm-2 control-label">'.get_lang('DestinationCoursesFromSession').': </label>';
     $html .= '<div class="col-sm-5" id="ajax_sessions_list_destination">';
     $html .= '<select class="form-control" name="sessions_list_destination" onchange="javascript: xajax_search_courses(this.value,\'destination\');">';
     $html .= '<option value = "0">'.get_lang('ThereIsNotStillASession').'</option></select ></div>';
@@ -131,7 +131,7 @@ 
     $html .= '<button class="btn btn-success" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;"><em class="fa fa-files-o"></em> '.get_lang('CopyCourse').'</button>';
 
     // Add Security token
-    $html .= '<input type="hidden" value="' . Security::get_token() . '" name="sec_token">';
+    $html .= '<input type="hidden" value="'.Security::get_token().'" name="sec_token">';
     $html .= '</div></div>';
 
     $html .= '</form>';
@@ -229,7 +229,7 @@ 
 
 /* HTML head extra */
 
-$htmlHeadXtra[] = $xajax->getJavascript( api_get_path(WEB_LIBRARY_PATH).'xajax/');
+$htmlHeadXtra[] = $xajax->getJavascript(api_get_path(WEB_LIBRARY_PATH).'xajax/');
 $htmlHeadXtra[] = '<script type="text/javascript">
 function checkSelected(id_select,id_radio,id_title,id_destination) {
    var num=0;
@@ -299,22 +299,22 @@ 
         display_form();
     } else {
 
-        $arr_course_origin 		= array();
+        $arr_course_origin = array();
         $arr_course_destination = array();
-        $destination_session 	= '';
-        $origin_session 		= '';
+        $destination_session = '';
+        $origin_session = '';
 
         if (isset($_POST['SessionCoursesListOrigin'])) {
-            $arr_course_origin 		= $_POST['SessionCoursesListOrigin'];
+            $arr_course_origin = $_POST['SessionCoursesListOrigin'];
         }
         if (isset($_POST['SessionCoursesListDestination'])) {
             $arr_course_destination = $_POST['SessionCoursesListDestination'];
         }
         if (isset($_POST['sessions_list_destination'])) {
-            $destination_session 	= $_POST['sessions_list_destination'];
+            $destination_session = $_POST['sessions_list_destination'];
         }
         if (isset($_POST['sessions_list_origin'])) {
-            $origin_session 		= $_POST['sessions_list_origin'];
+            $origin_session = $_POST['sessions_list_origin'];
         }
 
         if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) {
@@ -354,22 +354,22 @@ 
         Display::display_normal_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
     }
 
-    $arr_course_origin 		= array();
+    $arr_course_origin = array();
     $arr_course_destination = array();
-    $destination_session 	= '';
-    $origin_session 		= '';
+    $destination_session = '';
+    $origin_session = '';
 
     if (isset($_POST['SessionCoursesListOrigin'])) {
-        $arr_course_origin 		= $_POST['SessionCoursesListOrigin'];
+        $arr_course_origin = $_POST['SessionCoursesListOrigin'];
     }
     if (isset($_POST['SessionCoursesListDestination'])) {
         $arr_course_destination = $_POST['SessionCoursesListDestination'];
     }
     if (isset($_POST['sessions_list_destination'])) {
-        $destination_session 	= $_POST['sessions_list_destination'];
+        $destination_session = $_POST['sessions_list_destination'];
     }
     if (isset($_POST['sessions_list_origin'])) {
-        $origin_session 		= $_POST['sessions_list_origin'];
+        $origin_session = $_POST['sessions_list_origin'];
     }
 
     if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) {
@@ -378,10 +378,10 @@ 
         $cb = new CourseBuilder('', $course_origin);
         $course = $cb->build($origin_session, $arr_course_origin[0], $with_base_content);
         //$hiddenFields['same_file_name_option'] = $_POST['same_file_name_option'];
-        $hiddenFields['destination_course'] 	= $arr_course_destination[0];
-        $hiddenFields['origin_course'] 		= $arr_course_origin[0];
-        $hiddenFields['destination_session'] 	= $destination_session;
-        $hiddenFields['origin_session'] 		= $origin_session;
+        $hiddenFields['destination_course'] = $arr_course_destination[0];
+        $hiddenFields['origin_course'] = $arr_course_origin[0];
+        $hiddenFields['destination_session'] = $destination_session;
+        $hiddenFields['origin_session'] = $origin_session;
         // Add token to Course select form
         $hiddenFields['sec_token'] = Security::get_token();
 

Doc Comments +3 added lines

@@ -65,6 +65,9 @@
 
 /* FUNCTIONS */
 
+/**
+ * @param string $name
+ */
 function make_select_session_list($name, $sessions, $attr = array())
 {
 

main/coursecopy/import_backup.php

Spacing +10 added lines, -10 removed lines

@@ -98,21 +98,21 @@ 
         $cr->set_file_option($_POST['same_file_name_option']);
         $cr->restore();
         Display::display_normal_message(get_lang('ImportFinished'));
-        echo '<a class="btn btn-default" href="' . api_get_path(WEB_COURSE_PATH) . api_get_course_path() . '/index.php">' . get_lang('CourseHomepage') . '</a>';
+        echo '<a class="btn btn-default" href="'.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php">'.get_lang('CourseHomepage').'</a>';
     } else {
         if (!$error) {
             Display::display_warning_message(get_lang('NoResourcesInBackupFile'));
-            echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+            echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
         } elseif ($filename === false) {
             Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'));
-            echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+            echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
         } else {
             if ($filename == '') {
                 Display::display_error_message(get_lang('SelectBackupFile'));
-                echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+                echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
             } else {
                 Display::display_error_message(get_lang('UploadError'));
-                echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+                echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
             }
         }
     }
@@ -142,10 +142,10 @@ 
         CourseSelectForm::display_form($course, $hiddenFields);
     } elseif ($filename === false) {
         Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'));
-        echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+        echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
     } else {
         Display::display_warning_message(get_lang('NoResourcesInBackupFile'));
-        echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+        echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
     }
 } else {
     $user = api_get_user_info();
@@ -157,7 +157,7 @@ 
     $form = new FormValidator(
         'import_backup_form',
         'post',
-        api_get_path(WEB_CODE_PATH) . 'coursecopy/import_backup.php?' . api_get_cidreq(),
+        api_get_path(WEB_CODE_PATH).'coursecopy/import_backup.php?'.api_get_cidreq(),
         '',
         array('enctype' => 'multipart/form-data')
     );
@@ -189,7 +189,7 @@ 
         );
         $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',
@@ -207,7 +207,7 @@ 
             'radio',
             '',
             '',
-            '<i>' . get_lang('NoBackupsAvailable') . '</i>',
+            '<i>'.get_lang('NoBackupsAvailable').'</i>',
             '',
             'disabled="true"'
         );

main/search/index.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 $this_section =  SECTION_COURSES;
 
 if (extension_loaded('xapian')) {
-	require '../newscorm/lp_list_search.php';
+    require '../newscorm/lp_list_search.php';
 } else {
     Display::display_header(get_lang('Search'));
     Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  */
 
 require_once '../inc/global.inc.php';
-$this_section =  SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 if (extension_loaded('xapian')) {
 	require '../newscorm/lp_list_search.php';

main/search/search_suggestions.php

Braces +3 added lines, -1 removed lines

@@ -104,6 +104,8 @@
 }
 
 $q = strtolower($_GET["q"]);
-if (!$q) return;
+if (!$q) {
+    return;
+}
 //echo $q . "| value\n";
 get_suggestions_from_search_engine($q);

Spacing +11 added lines, -11 removed lines

@@ -6,7 +6,7 @@ 
  * @package chamilo.search
  */
 
-require_once dirname(__FILE__) . '/../inc/global.inc.php';
+require_once dirname(__FILE__).'/../inc/global.inc.php';
 
 function get_suggestions_from_search_engine($q)
 {
@@ -14,7 +14,7 @@ 
     global $charset;
 
     $json = [];
-    $table_sfv     = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
+    $table_sfv = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
     $q = Database::escape_string($q);
     $cid = api_get_course_id();
     $sql_add = '';
@@ -28,13 +28,13 @@ 
     $i = 0;
     while ($row = Database::fetch_array($sql_result)) {
         $json[] = [
-            'id' => api_convert_encoding($row['value'],'UTF-8',$charset),
-            'value' => api_convert_encoding($row['value'],'UTF-8',$charset),
-            'label' => api_convert_encoding($row['value'],'UTF-8',$charset)
+            'id' => api_convert_encoding($row['value'], 'UTF-8', $charset),
+            'value' => api_convert_encoding($row['value'], 'UTF-8', $charset),
+            'label' => api_convert_encoding($row['value'], 'UTF-8', $charset)
         ];
 
-        if ($i<20) {
-            $data[ $row['course_code'] ] [ $row['tool_id'] ] [ $row['ref_id'] ] = 1;
+        if ($i < 20) {
+            $data[$row['course_code']] [$row['tool_id']] [$row['ref_id']] = 1;
         }
         $i++;
     }
@@ -78,8 +78,8 @@ 
                         // will create a copy as Yannick - Car - Speed
                         // in $output[3]
                         $c = count($output);
-                        for ($i=0;$i<$c; $i++) {
-                            $output[($c+$i)] = $current_field_val;
+                        for ($i = 0; $i < $c; $i++) {
+                            $output[($c + $i)] = $current_field_val;
                         }
                     } else {
                         //no identical field id, continue as usual
@@ -96,9 +96,9 @@ 
                     }
                 }
                 foreach ($output as $i=>$out) {
-                    if (api_stristr($out,$q) === false) {continue;}
+                    if (api_stristr($out, $q) === false) {continue; }
                     $s = api_convert_encoding(substr($out, 0, -3), 'UTF-8', $charset);
-                    if (!in_array($s,$more_sugg)) {
+                    if (!in_array($s, $more_sugg)) {
                         $more_sugg[] = $s;
                         $json[] = [
                             'id' => $s,

main/social/home.php

Indentation +2 added lines, -2 removed lines

@@ -101,8 +101,8 @@
         $group_url = "group_view.php?id=$id";
 
         $result['name'] = '<div class="group-name">'.Display::url(
-                          api_ucwords(cut($result['name'], 40, true)), $group_url)
-                          .'</div><div class="count-username">'.
+                            api_ucwords(cut($result['name'], 40, true)), $group_url)
+                            .'</div><div class="count-username">'.
                             Display::returnFontAwesomeIcon('user').$result['count'].'</div>';
 
         $picture = $userGroup->get_picture_group(

Spacing +36 added lines, -36 removed lines

@@ -20,8 +20,8 @@ 
 api_block_anonymous_users();
 
 if (api_get_setting('allow_social_tool') != 'true') {
-    $url = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
-    header('Location: ' . $url);
+    $url = api_get_path(WEB_CODE_PATH).'auth/profile.php';
+    header('Location: '.$url);
     exit;
 }
 
@@ -45,10 +45,10 @@ 
     $allowed_picture_types = api_get_supported_image_extensions();
     $form->addRule(
         'picture',
-        get_lang('OnlyImagesAllowed') . ' (' . implode(
+        get_lang('OnlyImagesAllowed').' ('.implode(
             ',',
             $allowed_picture_types
-        ) . ')',
+        ).')',
         'filetype',
         $allowed_picture_types
     );
@@ -67,7 +67,7 @@ 
                 $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 
                 $sql = "UPDATE $table_user
-                    SET picture_uri = '$new_picture' WHERE user_id =  " . api_get_user_id();
+                    SET picture_uri = '$new_picture' WHERE user_id =  ".api_get_user_id();
 
                 $result = Database::query($sql);
             }
@@ -93,9 +93,9 @@ 
         $result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
 
         if ($result['count'] == 1) {
-            $result['count'] = '1 ' . get_lang('Member');
+            $result['count'] = '1 '.get_lang('Member');
         } else {
-            $result['count'] = $result['count'] . ' ' . get_lang('Members');
+            $result['count'] = $result['count'].' '.get_lang('Members');
         }
 
         $group_url = "group_view.php?id=$id";
@@ -111,9 +111,9 @@ 
             80
         );
 
-        $result['picture'] = '<img class="group-image" src="' . $picture['file'] . '" />';
-        $group_actions = '<div class="group-more"><a href="groups.php?#tab_browse-2">' . get_lang('SeeMore') . '</a></div>';
-        $group_info= '<div class="description"><p>' . cut($result['description'], 120, true) . "</p></div>";
+        $result['picture'] = '<img class="group-image" src="'.$picture['file'].'" />';
+        $group_actions = '<div class="group-more"><a href="groups.php?#tab_browse-2">'.get_lang('SeeMore').'</a></div>';
+        $group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
         $groups_newest[] = array(
             Display::url(
                 $result['picture'],
@@ -140,12 +140,12 @@ 
     $group_url = "group_view.php?id=$id";
 
     if ($result['count'] == 1) {
-        $result['count'] = '1 ' . get_lang('Member');
+        $result['count'] = '1 '.get_lang('Member');
     } else {
-        $result['count'] = $result['count'] . ' ' . get_lang('Members');
+        $result['count'] = $result['count'].' '.get_lang('Members');
     }
     $result['name'] = '<div class="group-name">'.Display::url(
-            api_ucwords(cut($result['name'], 40, true)),$group_url)
+            api_ucwords(cut($result['name'], 40, true)), $group_url)
         .'</div><div class="count-username">'.Display::returnFontAwesomeIcon('user').$result['count'].'</div>';
 
     $picture = $userGroup->get_picture_group(
@@ -153,42 +153,42 @@ 
         $result['picture'],
         80
     );
-    $result['picture_uri'] = '<img class="group-image" src="' . $picture['file'] . '" />';
-    $group_actions = '<div class="group-more" ><a href="groups.php?#tab_browse-3">' . get_lang('SeeMore') . '</a></div>';
-    $group_info= '<div class="description"><p>' . cut($result['description'], 120, true) . "</p></div>";
+    $result['picture_uri'] = '<img class="group-image" src="'.$picture['file'].'" />';
+    $group_actions = '<div class="group-more" ><a href="groups.php?#tab_browse-3">'.get_lang('SeeMore').'</a></div>';
+    $group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
     $groups_pop[] = array(
         Display::url($result['picture_uri'], $group_url),
-        $result['name'],$group_info. $group_actions
+        $result['name'], $group_info.$group_actions
     );
 }
 
-$list=count($groups_newest);
+$list = count($groups_newest);
 $social_group_block = null;
 if ($list > 0) {
     $social_group_block .= '<div class="list-group-newest">';
-    $social_group_block .= '<div class="group-title">' . get_lang('Newest') . '</div>';
-    for($i = 0;$i < $list; $i++){
-        $social_group_block.='<div class="row">';
-        $social_group_block.='<div class="col-md-2">' . $groups_newest[$i][0] . '</div>';
-        $social_group_block.='<div class="col-md-10">' . $groups_newest[$i][1];
-        $social_group_block.= $groups_newest[$i][2] . '</div>';
-        $social_group_block.="</div>";
+    $social_group_block .= '<div class="group-title">'.get_lang('Newest').'</div>';
+    for ($i = 0; $i < $list; $i++) {
+        $social_group_block .= '<div class="row">';
+        $social_group_block .= '<div class="col-md-2">'.$groups_newest[$i][0].'</div>';
+        $social_group_block .= '<div class="col-md-10">'.$groups_newest[$i][1];
+        $social_group_block .= $groups_newest[$i][2].'</div>';
+        $social_group_block .= "</div>";
     }
-    $social_group_block.= "</div>";
+    $social_group_block .= "</div>";
 }
-$list=count($groups_pop);
+$list = count($groups_pop);
 if ($list > 0) {
     $social_group_block .= '<div class="list-group-newest">';
-    $social_group_block .= '<div class="group-title">' . get_lang('Popular') . '</div>';
-
-    for($i = 0;$i < $list; $i++){
-        $social_group_block.='<div class="row">';
-        $social_group_block.='<div class="col-md-2">' . $groups_pop[$i][0] . '</div>';
-        $social_group_block.='<div class="col-md-10">' . $groups_pop[$i][1];
-        $social_group_block.= $groups_pop[$i][2] . '</div>';
-        $social_group_block.="</div>";
+    $social_group_block .= '<div class="group-title">'.get_lang('Popular').'</div>';
+
+    for ($i = 0; $i < $list; $i++) {
+        $social_group_block .= '<div class="row">';
+        $social_group_block .= '<div class="col-md-2">'.$groups_pop[$i][0].'</div>';
+        $social_group_block .= '<div class="col-md-10">'.$groups_pop[$i][1];
+        $social_group_block .= $groups_pop[$i][2].'</div>';
+        $social_group_block .= "</div>";
     }
-    $social_group_block.= "</div>";
+    $social_group_block .= "</div>";
 }
 // My friends
 $friend_html = SocialManager::listMyFriendsBlock(

main/social/my_skills_report.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 $isDRH = api_is_drh();
 
 if (!$isStudent && !$isStudentBoss && !$isDRH) {
-    header('Location: ' . api_get_path(WEB_CODE_PATH) . 'social/skills_wheel.php');
+    header('Location: '.api_get_path(WEB_CODE_PATH).'social/skills_wheel.php');
     exit;
 }
 
@@ -191,7 +191,7 @@ 
 
 $tpl->assign('rows', $tableRows);
 
-$contentTemplate = $tpl->fetch("default/" . $tplPath);
+$contentTemplate = $tpl->fetch("default/".$tplPath);
 
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();