chamilo / chamilo-lms

main/work/downloadfolder.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
  * @param array $arr1 first array
  * @param array $arr2 second array
  *
- * @return array difference between the two arrays
+ * @return string difference between the two arrays
  */
 function diff($arr1, $arr2)
 {

src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php

Doc Comments +1 added lines

@@ -1212,6 +1212,7 @@
 	 * Restore a forum-post
 	 * @TODO Restore tree-structure of posts. For example: attachments to posts.
 	 * @param false|string $topic_id
+	 * @param false|string $forum_id
 	 */
     public function restore_post($id, $topic_id, $forum_id, $sessionId = 0)
     {

Indentation +576 added lines, -576 removed lines

@@ -24,8 +24,8 @@ 
 class CourseRestorer
 {
     /**
-    * The course-object
-    */
+     * The course-object
+     */
     public $course;
     public $destination_course_info;
 
@@ -44,7 +44,7 @@ 
         'events',
         'forum_category',
         'forums',
-       // 'forum_topics',
+        // 'forum_topics',
         'glossary',
         'quizzes',
         'test_category',
@@ -112,15 +112,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 false|null
-	 */
+     */
     public function restore(
         $destination_course_code = '',
         $session_id = 0,
@@ -236,17 +236,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'];
@@ -256,7 +256,7 @@ 
         $params['subscribe'] = $course_info['subscribe_allowed'];
         $params['unsubscribe'] = $course_info['unsubscribe'];
         CourseManager::update_attributes($origin_course_info['real_id'], $params);
-	}
+    }
 
     /**
      * Restore documents
@@ -922,56 +922,56 @@ 
         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!
+    /**
+     * 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.'/';
-				@mkdir(dirname($path.$document->path), $perm, true);
+            foreach ($resources[RESOURCE_SCORM] as $document) {
+                $path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
+                @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,
@@ -987,32 +987,32 @@ 
                                 $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
-		}
-	}
+                }
+            } // end for each
+        }
+    }
 
-	/**
-	 * Restore forums
+    /**
+     * Restore forums
      *
      * @param int $sessionId
      */
-	public function restore_forums($sessionId = 0)
+    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]) &&
@@ -1059,33 +1059,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)) {
@@ -1123,16 +1123,16 @@ 
                 }
             }
         }
-	}
+    }
 
-	/**
-	 * Restore a forum-topic
-	 * @param false|string $forum_id
-	 */
+    /**
+     * Restore a forum-topic
+     * @param false|string $forum_id
+     */
     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);
@@ -1169,27 +1169,27 @@ 
             $sessionId
         );
 
-		$this->course->resources[RESOURCE_FORUMTOPIC][$thread_id]->destination_id = $new_id;
-		$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;
-	}
-
-	/**
-	 * Restore a forum-post
-	 * @TODO Restore tree-structure of posts. For example: attachments to posts.
-	 * @param false|string $topic_id
-	 */
+        $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id]->destination_id = $new_id;
+        $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;
+    }
+
+    /**
+     * 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)
     {
-		$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;
@@ -1225,37 +1225,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);
@@ -1284,9 +1284,9 @@ 
                     }
                     $this->course->resources[RESOURCE_LINK][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Restore a link-category
@@ -1331,21 +1331,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,
@@ -1370,21 +1370,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,
@@ -1402,7 +1402,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";
@@ -1414,32 +1414,32 @@ 
                     $this->course->resources[RESOURCE_EVENT][$id]->destination_id = $new_event_id;
                 }
 
-				// 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/';
+                // 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/';
 
-				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
+                        $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);
+                        //$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),
@@ -1453,20 +1453,20 @@ 
                                 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
+                        $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);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1482,29 +1482,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,
@@ -1533,22 +1533,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,
@@ -1567,7 +1567,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";
@@ -1579,32 +1579,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,
@@ -1621,19 +1621,19 @@ 
                                 $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);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1650,12 +1650,12 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $attachmentId";
                                 Database::query($sql);
                             }
-						}
-					}
-				}
-			}
-		}
-	}
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Quiz
@@ -1666,13 +1666,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
                     $quiz = $quiz->obj;
@@ -1681,7 +1681,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()) {
@@ -1689,14 +1689,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,
@@ -1708,13 +1708,13 @@ 
                     $quiz->start_time = $quiz->start_time == '0000-00-00 00:00:00' ? null : $quiz->start_time;
                     $quiz->end_time = $quiz->end_time == '0000-00-00 00:00:00' ? null : $quiz->end_time;
 
-					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,
@@ -1748,10 +1748,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);
 
@@ -1760,15 +1760,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);
@@ -1781,31 +1781,31 @@ 
                         Database::query($sql);
                     }
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore quiz-questions
+    /**
+     * Restore quiz-questions
      * @params int question id
-	 */
+     */
     public function restore_quiz_question($id)
     {
         $em = Database::getManager();
-		$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,
@@ -1826,7 +1826,7 @@ 
                 'extra' => self::DBUTF8($question->extra)
             ];
 
-			$new_id = Database::insert($table_que, $params);
+            $new_id = Database::insert($table_que, $params);
 
             if ($new_id) {
                 $sql = "UPDATE $table_que SET id = iid WHERE iid = $new_id";
@@ -1861,7 +1861,7 @@ 
             $allAnswers = [];
             $onlyAnswers = [];
 
-           if ($question->quiz_type == DRAGGABLE || $question->quiz_type == MATCHING ) {
+            if ($question->quiz_type == DRAGGABLE || $question->quiz_type == MATCHING ) {
                 $allAnswers = array_column($question->answers, 'answer', 'id');
             }
 
@@ -1901,11 +1901,11 @@ 
                         $correctAnswers[$answerId] = $answer['correct'];
                         $onlyAnswers[$answerId] = $answer['answer'];
                     }
-				}
-			} else {
+                }
+            } else {
 
-				foreach ($question->answers as $index => $answer) {
-					// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                foreach ($question->answers as $index => $answer) {
+                    // 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,
@@ -1945,8 +1945,8 @@ 
 
                     $correctAnswers[$answerId] = $answer['correct'];
                     $onlyAnswers[$answerId] = $answer['answer'];
-				}
-			}
+                }
+            }
 
             // Current course id
             $course_id = api_get_course_int_id();
@@ -2067,13 +2067,13 @@ 
                 }
             }
 
-			$this->course->resources[RESOURCE_QUIZQUESTION][$id]->destination_id = $new_id;
-		}
+            $this->course->resources[RESOURCE_QUIZQUESTION][$id]->destination_id = $new_id;
+        }
 
-		return $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)
@@ -2158,21 +2158,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,
@@ -2226,20 +2226,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);
@@ -2258,25 +2258,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) {
@@ -2297,11 +2297,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);
 
@@ -2323,48 +2323,48 @@ 
                             Database::query($sql);
                         }
                     }
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check availability of a survey code
-	 * @param string $survey_code
-	 */
+                }
+            }
+        }
+    }
+
+    /**
+     * Check availability of a survey code
+     * @param string $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);
+        $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
             return false;
         } else {
             return true;
         }
-	}
+    }
 
-	/**
-	 * Restore survey-questions
-	 * @param string $survey_id
-	 */
+    /**
+     * Restore survey-questions
+     * @param string $survey_id
+     */
     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;
 
-		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,
@@ -2418,10 +2418,10 @@ 
                 }
                 $this->course->resources[RESOURCE_SURVEYQUESTION][$id]->destination_id = $new_id;
             }
-		}
+        }
 
-		return $new_id;
-	}
+        return $new_id;
+    }
 
     /**
      * Restoring learning paths
@@ -2432,19 +2432,19 @@ 
     {
         $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) {
-				$condition_session = '';
-				if (!empty($session_id)) {
+            foreach ($resources[RESOURCE_LEARNPATH] as $id => $lp) {
+                $condition_session = '';
+                if (!empty($session_id)) {
                     if ($respect_base_content) {
                         $my_session_id = $lp->session_id;
                         if (!empty($lp->session_id)) {
@@ -2455,20 +2455,20 @@ 
                         $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);
-						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);
+                        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');
@@ -2526,7 +2526,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) {
 
@@ -2587,13 +2587,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 {
@@ -2624,128 +2624,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;
-						} elseif (isset($new_item_ids[$ref])) {
+                    //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;
+                        } elseif (isset($new_item_ids[$ref])) {
                             $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);
 
-		// 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 ? $sessionId : null;
-			$new_id = Database::insert($work_table, $folder);
+            $new_id = Database::insert($work_table, $folder);
 
             if ($new_id) {
                 // query in item property
@@ -2804,23 +2804,23 @@ 
                     }
                 }
             }
-		}
+        }
 
         $destination = '../..'.api_get_path(REL_COURSE_PATH).$this->course->destination_path.'/work/';
         $origin = '../..'.api_get_path(REL_COURSE_PATH).$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
-    * @param string $source
-    * @param string $dest
-    * @return void()
-    * @deprecated
-    */
+     * copy all directory and sub directory
+     * @param string The path origin
+     * @param string The path destination
+     * @param boolean Option Overwrite
+     * @param string $source
+     * @param string $dest
+     * @return void()
+     * @deprecated
+     */
     public function allow_create_all_directory($source, $dest, $overwrite = false)
     {
         if (!is_dir($dest)) {
@@ -2831,7 +2831,7 @@ 
                 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>';
                         }*/
@@ -2846,12 +2846,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.
@@ -2873,25 +2873,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,
@@ -2925,27 +2925,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,
@@ -2980,7 +2980,7 @@ 
                     'user_ip' => ''
                 ];
 
-				$new_id = Database::insert($table_wiki, $params);
+                $new_id = Database::insert($table_wiki, $params);
 
                 if ($new_id) {
                     $sql = "UPDATE $table_wiki SET page_id = '$new_id', id = iid
@@ -3010,9 +3010,9 @@ 
 
                     Database::insert($table_wiki_conf, $params);
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Restore Thematics
@@ -3020,15 +3020,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,
@@ -3036,13 +3036,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);
@@ -3055,12 +3055,12 @@ 
                         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,
@@ -3068,7 +3068,7 @@ 
                             false
                         );
 
-						if ($my_id) {
+                        if ($my_id) {
 
                             $sql = "UPDATE $table_thematic_advance SET id = iid WHERE iid = $my_id";
                             Database::query($sql);
@@ -3080,17 +3080,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);
@@ -3102,12 +3102,12 @@ 
                                 'ThematicPlanAdded',
                                 api_get_user_id()
                             );
-						}
-					}
-				}
-			}
-		}
-	}
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Attendance
@@ -3115,14 +3115,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,
@@ -3134,11 +3134,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);
@@ -3152,11 +3152,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
@@ -3164,11 +3164,11 @@ 
 
                         $sql = "UPDATE $table_attendance_calendar SET id = iid WHERE iid = $attendanceCalendarId";
                         Database::query($sql);
-					}
-				}
-			}
-		}
-	}
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Works
@@ -3309,11 +3309,11 @@ 
      */
     public function DBUTF8($str)
     {
-		if (UTF8_CONVERT) {
+        if (UTF8_CONVERT) {
             $str = utf8_encode($str);
         }
-		return $str;
-	}
+        return $str;
+    }
 
     /**
      * @param string $str
@@ -3324,8 +3324,8 @@ 
         if (UTF8_CONVERT) {
             $str = utf8_encode($str);
         }
-		return Database::escape_string($str);
-	}
+        return Database::escape_string($str);
+    }
 
     /**
      * @param array $array

Spacing +71 added lines, -71 removed lines

@@ -217,7 +217,7 @@ 
                                 $params['lastedit_date'] = self::DBUTF8($property['lastedit_date']);
                                 $params['ref'] = $resource->destination_id;
                                 $params['lastedit_type'] = self::DBUTF8($property['lastedit_type']);
-                                $params['lastedit_user_id'] =  $this->checkUserId($property['lastedit_user_id']);
+                                $params['lastedit_user_id'] = $this->checkUserId($property['lastedit_user_id']);
                                 $params['visibility'] = self::DBUTF8($property['visibility']);
                                 $params['start_visible'] = self::DBUTF8($property['start_visible']);
                                 $params['end_visible'] = self::DBUTF8($property['end_visible']);
@@ -578,7 +578,7 @@ 
                             $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);
                             }
@@ -622,9 +622,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];
 
                                     copy_folder_course_session(
@@ -643,7 +643,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);
@@ -705,8 +705,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);
                                             }
@@ -770,7 +770,7 @@ 
                                 // 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'))) {
+                                    if (in_array($file_info['extension'], array('html', 'htm'))) {
                                         $content = file_get_contents($path.$new_file_name);
                                         if (UTF8_CONVERT) {
                                             $content = utf8_encode($content);
@@ -845,7 +845,7 @@ 
                         // 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 (isset($file_info['extension']) && in_array($file_info['extension'], array('html','htm'))) {
+                            if (isset($file_info['extension']) && in_array($file_info['extension'], array('html', 'htm'))) {
                                 $content = file_get_contents($path.$document->path);
                                 if (UTF8_CONVERT) {
                                     $content = utf8_encode($content);
@@ -945,8 +945,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;
@@ -968,23 +968,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;
@@ -992,8 +992,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
                     );
 				}
@@ -1013,7 +1013,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']])) {
@@ -1066,13 +1066,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);
 				}
 			}
@@ -1134,7 +1134,7 @@ 
 		$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;
@@ -1248,7 +1248,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);
 
@@ -1263,7 +1263,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);
 
@@ -1307,9 +1307,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);
@@ -1687,7 +1687,7 @@ 
                         $this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]->is_restored()) {
                         $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);
@@ -1724,17 +1724,17 @@ 
                         '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,
                         'pass_percentage' => $quiz->pass_percentage,
-                        '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,
                         'start_time' => $quiz->start_time,
                         'end_time' => $quiz->end_time,
                         'save_correct_answers' => 0,
@@ -1774,10 +1774,10 @@ 
                         $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 . ",
+                                c_id = ".$this->destination_course_id.",
                                 question_id = $qid ,
                                 exercice_id = $new_id ,
-                                question_order = " . $question_order;
+                                question_order = ".$question_order;
                         Database::query($sql);
                     }
                 }
@@ -1849,7 +1849,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);
                         }
@@ -1861,7 +1861,7 @@ 
             $allAnswers = [];
             $onlyAnswers = [];
 
-           if ($question->quiz_type == DRAGGABLE || $question->quiz_type == MATCHING ) {
+           if ($question->quiz_type == DRAGGABLE || $question->quiz_type == MATCHING) {
                 $allAnswers = array_column($question->answers, 'answer', 'id');
             }
 
@@ -2083,7 +2083,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
@@ -2234,7 +2234,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;
@@ -2266,15 +2266,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);
@@ -2459,13 +2459,13 @@ 
 
 				// 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);
 						if ($copy_result) {
 							$lp->preview_image = $new_filename;
 						} else {
-							$lp->preview_image ='';
+							$lp->preview_image = '';
 						}
 					}
 				}
@@ -2639,20 +2639,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;
 						} elseif (isset($new_item_ids[$ref])) {
-                            $old_refs[$new_item_id]= $new_item_ids[$ref];
+                            $old_refs[$new_item_id] = $new_item_ids[$ref];
                         }
 					}
 
@@ -2661,7 +2661,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);
@@ -2679,7 +2679,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."'
@@ -2688,7 +2688,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."'
@@ -2698,7 +2698,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."'
@@ -2708,7 +2708,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."'
@@ -2829,16 +2829,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);
                     }
                 }
             }
@@ -3036,7 +3036,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']);
 
@@ -3060,7 +3060,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,
@@ -3083,7 +3083,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;
@@ -3199,7 +3199,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) {
@@ -3221,9 +3221,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);
@@ -3334,7 +3334,7 @@ 
     public function DBUTF8_array($array)
     {
         if (UTF8_CONVERT) {
-            foreach ($array as &$item)  {
+            foreach ($array as &$item) {
                 $item = utf8_encode($item);
             }
             return $array;

main/inc/lib/document.lib.php

Doc Comments +22 added lines, -18 removed lines

@@ -277,7 +277,7 @@ 
     /**
      *  @param string
      *  @param string
-     * 	@return true if the user is allowed to see the document, false otherwise
+     * 	@return boolean if the user is allowed to see the document, false otherwise
      * 	@author Sergio A Kessler, first version
      * 	@author Roan Embrechts, bugfix
      *  @todo not only check if a file is visible, but also check if the user is allowed to see the file??
@@ -1558,7 +1558,7 @@ 
      * Return true if the documentpath have visibility=1 as
      * item_property (you should use the is_visible_by_id)
      *
-     * @param string $document_path the relative complete path of the document
+     * @param string $doc_path the relative complete path of the document
      * @param array  $course the _course array info of the document's course
      * @param int
      * @param string
@@ -1644,6 +1644,7 @@ 
      * @param   int
      * @param   int
      * @param bool
+     * @param integer $user_id
      * @return  bool
      */
     public static function is_visible_by_id(
@@ -1995,7 +1996,7 @@ 
      * Remove default certificate
      * @param string $course_id The course code
      * @param int $default_certificate_id The document id of the default certificate
-     * @return void
+     * @return false|null
      */
     public static function remove_attach_certificate($course_id, $default_certificate_id)
     {
@@ -2128,6 +2129,7 @@ 
      * @param	bool  	is file or string html
      * @param	string	type (one of the app tools) - optional (otherwise takes the current item's type)
      * @param	int		level of recursivity we're in
+     * @param string $source_html
      * @return	array	List of file paths. An additional field containing 'local' or 'remote' helps determine
      * if the file should be copied into the zip or just linked
      */
@@ -2970,6 +2972,7 @@ 
 
     /**
      * Obtains the text inside the file with the right parser
+     * @param string $doc_path
      */
     public static function get_text_content($doc_path, $doc_mime)
     {
@@ -3221,6 +3224,7 @@ 
      * Shows a play icon next to the document title in the document list
      * @param int
      * @param string
+     * @param integer|null $i
      * @return string	html content
      */
     public static function generate_media_preview($i, $type = 'simple')
@@ -4122,7 +4126,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function get_web_odf_extension_list()
     {
@@ -4131,10 +4135,10 @@ 
 
     /**
      * Set of extension allowed to use Jodconverter
-     * @param $mode 'from'
+     * @param string $mode 'from'
      *              'to'
      *              'all'
-     * @param $format   'text'
+     * @param string $format   'text'
      *                  'spreadsheet'
      *                  'presentation'
      *                  'drawing'
@@ -4338,7 +4342,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function get_system_folders()
     {
@@ -4356,7 +4360,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getProtectedFolderFromStudent()
     {
@@ -4512,7 +4516,7 @@ 
      * Requires the ffmpeg lib. In ubuntu: sudo apt-get install ffmpeg
      * @param string $wavFile
      * @param bool $removeWavFileIfSuccess
-     * @return bool
+     * @return string|false
      */
     public static function convertWavToMp3($wavFile, $removeWavFileIfSuccess = false)
     {
@@ -5088,6 +5092,8 @@ 
      * @param string	The current folder (path inside of the "document" directory, including the prefix "/")
      * @param string	Group directory, if empty, prevents documents to be uploaded (because group documents cannot be uploaded in root)
      * @param	boolean	Whether to change the renderer (this will add a template <span> to the QuickForm object displaying the form)
+     * @param string $document_id
+     * @param FormValidator $form
 
      * @return string html form
      */
@@ -5596,9 +5602,6 @@ 
     /**
      * Creates the row of edit icons for a file/folder
      *
-     * @param string $curdirpath current path (cfr open folder)
-     * @param string $type (file/folder)
-     * @param string $path dbase path of file/folder
      * @param int $visibility (1/0)
      * @param int $id dbase id of the document
      * @return string html img tags with hyperlinks
@@ -5947,7 +5950,7 @@ 
     /**
      * Gets the path translated with title of docs and folders
      * @param string $path the real path
-     * @return the path which should be displayed
+     * @return string path which should be displayed
      */
     public static function get_titles_of_path($path)
     {
@@ -6003,7 +6006,8 @@ 
 
     /**
      * Checks whether the user is in shared folder
-     * @return return bool Return true when user is into shared folder
+     * @param integer $current_session_id
+     * @return boolean bool Return true when user is into shared folder
      */
     public static function is_shared_folder($curdirpath, $current_session_id)
     {
@@ -6019,7 +6023,7 @@ 
 
     /**
      * Checks whether the user is into any user shared folder
-     * @return return bool Return true when user is in any user shared folder
+     * @return boolean bool Return true when user is in any user shared folder
      */
     public static function is_any_user_shared_folder($path, $current_session_id)
     {
@@ -6233,7 +6237,7 @@ 
      * @param int $id
      * @param array $courseInfo
      * @param int $sessionId
-     * @return bool
+     * @return boolean|null
      */
     public static function downloadDeletedDocument($id, $courseInfo, $sessionId)
     {
@@ -6252,7 +6256,7 @@ 
      * @param array $courseInfo
      * @param int $sessionId
      *
-     * @return bool
+     * @return false|null
      */
     public static function downloadAllDeletedDocument($courseInfo, $sessionId)
     {
@@ -6291,7 +6295,7 @@ 
      * @param array $courseInfo
      * @param int $sessionId
      *
-     * @return bool
+     * @return false|null
      */
     public static function deleteDocumentsFromSession($courseInfo, $sessionId)
     {

main/inc/lib/api.lib.php

Doc Comments +8 added lines, -3 removed lines

@@ -1263,6 +1263,7 @@ 
  * Gets the list of courses a specific user is subscribed to
  * @param int       User ID
  * @param boolean   $fetch_session Whether to get session courses or not - NOT YET IMPLEMENTED
+ * @param integer $userid
  * @return array    Array of courses in the form [0]=>('code'=>xxx,'db'=>xxx,'dir'=>xxx,'status'=>d)
  */
 function api_get_user_courses($userid, $fetch_session = true)
@@ -3024,7 +3025,7 @@ 
 * on the session visibility
 * @param bool $tutor  Whether to check if the user has the tutor role
 * @param bool  $coach Whether to check if the user has the coach role
-* @return boolean true: the user has the rights to edit, false: he does not
+* @return boolean|null true: the user has the rights to edit, false: he does not
 */
 function api_is_allowed_to_session_edit($tutor = false, $coach = false)
 {
@@ -4199,6 +4200,7 @@ 
 /**
  * Returns the id (the database id) of a language
  * @param   string  language name (the corresponding name of the language-folder in the filesystem)
+ * @param string $language
  * @return  int     id of the language
  */
 function api_get_language_id($language)
@@ -5207,6 +5209,7 @@ 
  * @param string    Whether we want a simple list (display a category) or
  * a grouped list (group by variable as in settings.php default). Values: 'list' or 'group'
  * @param int       Access URL's ID. Optional. Uses 1 by default, which is the unique URL
+ * @param string $cat
  * @return array    Array of database results for the current settings of the current access URL
  */
 function &api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url_changeable = 0)
@@ -6285,7 +6288,7 @@ 
  *
  * Returns the <link> HTML tag
  *
- * @param $file
+ * @param string $file
  * @param string $media
  * @return string
  */
@@ -6608,7 +6611,7 @@ 
 /**
  * Returns an array of global configuration settings which should be ignored
  * when printing the configuration settings screens
- * @return array Array of strings, each identifying one of the excluded settings
+ * @return string[] Array of strings, each identifying one of the excluded settings
  */
 function api_get_locked_settings() {
     return array(
@@ -6649,6 +6652,7 @@ 
  * false if he isn't. If the user ID is given and is an integer, then the same
  * ID is simply returned
  * @param  integer User ID
+ * @param integer $user_id
  * @return boolean Integer User ID is logged in, or false otherwise
  */
 function api_user_is_login($user_id = null) {
@@ -7069,6 +7073,7 @@ 
 /**
  * Gets memory limit in bytes
  * @param string The memory size (128M, 1G, 1000K, etc)
+ * @param string $mem
  * @return int
  * @assert (null) === false
  * @assert ('1t')  === 1099511627776