Merge branch '1.9.x' of https://github.com/chamilo/chamilo-lms into 9063

main/inc/lib/document.lib.php

@@ -612,7 +612,9 @@ class DocumentManager
                     $doc_list[] = $row;
                 }
 
-                if ($row['filetype'] == 'file' && pathinfo($row['path'], PATHINFO_EXTENSION) == 'html') {
+                if ($row['filetype'] == 'file' &&
+                    pathinfo($row['path'], PATHINFO_EXTENSION) == 'html'
+                ) {
                     // Templates management
                     $table_template = Database::get_main_table(TABLE_MAIN_TEMPLATES);
                     $sql = "SELECT id FROM $table_template
@@ -741,7 +743,8 @@ class DocumentManager
 
             if ($to_group_id <> 0) {
                 $sql = "SELECT DISTINCT docs.id, path
-                       FROM $TABLE_ITEMPROPERTY  AS last INNER JOIN $TABLE_DOCUMENT  AS docs
+                       FROM $TABLE_ITEMPROPERTY  AS last
+                       INNER JOIN $TABLE_DOCUMENT  AS docs
                        ON (
                             docs.id = last.ref AND
                             last.tool = '" . TOOL_DOCUMENT . "' AND
@@ -752,10 +755,12 @@ class DocumentManager
                             docs.filetype 		= 'folder' AND
                             last.to_group_id	= " . $to_group_id . " AND
                             docs.path NOT LIKE '%shared_folder%' AND
+                            docs.path NOT LIKE '%_DELETED_%' AND
                             last.visibility 	<> 2 $condition_session ";
             } else {
                 $sql = "SELECT DISTINCT docs.id, path
-                        FROM $TABLE_ITEMPROPERTY  AS last INNER JOIN $TABLE_DOCUMENT  AS docs
+                        FROM $TABLE_ITEMPROPERTY  AS last
+                        INNER JOIN $TABLE_DOCUMENT  AS docs
                         ON (
                             docs.id = last.ref AND
                             last.tool = '" . TOOL_DOCUMENT . "' AND
@@ -764,6 +769,7 @@ class DocumentManager
                         )
                         WHERE
                             docs.filetype 		= 'folder' AND
+                            docs.path NOT LIKE '%_DELETED_%' AND
                             last.to_group_id	= 0  AND
                             last.visibility 	<> 2
                             $show_users_condition $condition_session ";
@@ -914,7 +920,8 @@ class DocumentManager
                     // Check
                     $sql = "SELECT td.id, readonly, tp.insert_user_id
                             FROM $TABLE_DOCUMENT td, $TABLE_PROPERTY tp
-                            WHERE td.c_id = $course_id AND
+                            WHERE
+                                td.c_id = $course_id AND
                                 tp.c_id = $course_id AND
                                 td.session_id = $sessionId AND
                                 tp.ref= td.id AND
@@ -1466,7 +1473,7 @@ class DocumentManager
      * Unset a document as template
      *
      * @param int $document_id
-     * @param string $couse_code
+     * @param string $course_code
      * @param int $user_id
      */
     public static function unset_document_as_template($document_id, $course_code, $user_id)
@@ -1491,7 +1498,8 @@ class DocumentManager
     }
 
     /**
-     * Return true if the documentpath have visibility=1 as item_property (you should use the is_visible_by_id)
+     * 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 array  $course the _course array info of the document's course
@@ -4668,6 +4676,7 @@ class DocumentManager
                     (path = '".$folder."' OR path = '$folderWithSuffix') AND
                     (session_id = 0 OR session_id = $sessionId)
         ";
+
         $rs = Database::query($sql);
         if (Database::num_rows($rs)) {
             return true;