chamilo / chamilo-lms

main/coursecopy/classes/CourseSelectForm.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 {
 	/**
 	 * Display the form
-	 * @param array $hidden_fiels Hidden fields to add to the form.
+	 * @param array $hidden_fields Hidden fields to add to the form.
 	 * @param boolean the document array will be serialize. This is used in the course_copy.php file
 	 */
 	static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
@@ -570,7 +570,7 @@ 
 
 	/**
 	 * Display the form session export
-	 * @param array $hidden_fiels Hidden fields to add to the form.
+	 * @param array $hidden_fields Hidden fields to add to the form.
 	 * @param boolean the document array will be serialize. This is used in the course_copy.php file
 	 */
 	 public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)

Spacing +19 added lines, -19 removed lines

@@ -136,13 +136,13 @@ 
 
 		//get destination course title
 		if (!empty($hidden_fields['destination_course'])) {
-            $sessionTitle = !empty($hidden_fields['destination_session']) ? ' (' . api_get_session_name(
+            $sessionTitle = !empty($hidden_fields['destination_session']) ? ' ('.api_get_session_name(
                 $hidden_fields['destination_session']
-            ) . ')' : null;
+            ).')' : null;
 
             $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
 			echo '<h3>';
-			echo get_lang('DestinationCourse').' : '.$course_infos['title'] . ' ('.$course_infos['code'].') '.$sessionTitle;
+			echo get_lang('DestinationCourse').' : '.$course_infos['title'].' ('.$course_infos['code'].') '.$sessionTitle;
 			echo '</h3>';
 		}
         echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
@@ -298,7 +298,7 @@ 
 			/*Documents are avoided due the huge amount of memory that the serialize php function "eats"
 			(when there are directories with hundred/thousand of files) */
 			// this is a known issue of serialize
-			$course->resources['document']= null;
+			$course->resources['document'] = null;
 		}
 
 		echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
@@ -315,7 +315,7 @@ 
 		    Display::display_warning_message(get_lang('NoDataAvailable'));
 		} else {
     		if (!empty($hidden_fields['destination_session'])) {
-    			echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES, $charset))."'".')) return false;" >'.
+    			echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;" >'.
                     get_lang('Ok').'</button>';
     		} else {
                 if ($recycleOption) {
@@ -339,7 +339,7 @@ 
      */
     static function display_hidden_quiz_questions($course)
     {
-		if(is_array($course->resources)){
+		if (is_array($course->resources)) {
 			foreach ($course->resources as $type => $resources) {
 				if (count($resources) > 0) {
 					switch ($type) {
@@ -359,10 +359,10 @@ 
      */
     static function display_hidden_scorm_directories($course)
     {
-        if (is_array($course->resources)){
+        if (is_array($course->resources)) {
 			foreach ($course->resources as $type => $resources) {
 				if (count($resources) > 0) {
-					switch($type) {
+					switch ($type) {
 						case RESOURCE_SCORM:
 							foreach ($resources as $id => $resource) {
 								echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />';
@@ -408,7 +408,7 @@ 
 			if (is_array($resource)) {
 				$resource = array_keys($resource);
 
-				foreach	($resource as $resource_item) {
+				foreach ($resource as $resource_item) {
 
 					$condition_session = '';
 					if (!empty($session_id)) {
@@ -444,8 +444,8 @@ 
                                         tool = '".RESOURCE_DOCUMENT."' AND
                                         ref = $resource_item ";
                             $res = Database::query($sql);
-                            $all_properties = array ();
-                            while ($item_property = Database::fetch_array($res,'ASSOC')) {
+                            $all_properties = array();
+                            while ($item_property = Database::fetch_array($res, 'ASSOC')) {
                                 $all_properties[] = $item_property;
                             }
                             $course->resources[RESOURCE_DOCUMENT][$resource_item]->item_properties = $all_properties;
@@ -460,7 +460,7 @@ 
 
 				switch ($type) {
 					case RESOURCE_SURVEYQUESTION:
-						foreach($resources as $id => $obj) {
+						foreach ($resources as $id => $obj) {
 						    if (isset($_POST['resource'][RESOURCE_SURVEY]) &&
                                 is_array($_POST['resource'][RESOURCE_SURVEY]) &&
                                 !in_array($obj->survey_id, array_keys($_POST['resource'][RESOURCE_SURVEY]))
@@ -535,7 +535,7 @@ 
                                 ) {
 									foreach ($documents as $id_to_check => $post_value) {
 										$obj_to_check = $resources[$id_to_check];
-										$shared_path_part = substr($obj_to_check->path,0,strlen($obj->path));
+										$shared_path_part = substr($obj_to_check->path, 0, strlen($obj->path));
 										if ($id_to_check != $id && $obj->path == $shared_path_part) {
 											$_POST['resource'][RESOURCE_DOCUMENT][$id] = 1;
 											break;
@@ -549,7 +549,7 @@ 
 								$resource_is_used_elsewhere = $course->is_linked_resource($obj);
 								// check if document is in a quiz (audio/video)
 								if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) {
-									foreach($course->resources[RESOURCE_QUIZ] as $quiz) {
+									foreach ($course->resources[RESOURCE_QUIZ] as $quiz) {
                                         $quiz = $quiz->obj;
 										if (isset($quiz->media) && $quiz->media == $id) {
 											$resource_is_used_elsewhere = true;
@@ -618,15 +618,15 @@ 
 		<?php
 
 		//get destination course title
-		if(!empty($hidden_fields['destination_course'])) {
+		if (!empty($hidden_fields['destination_course'])) {
              if (!empty($hidden_fields['destination_session'])) {
-                 $sessionTitle = ' (' . api_get_session_name($hidden_fields['destination_session']) . ')';
+                 $sessionTitle = ' ('.api_get_session_name($hidden_fields['destination_session']).')';
              } else {
                  $sessionTitle = null;
              }
             $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
 			echo '<h3>';
-				echo get_lang('DestinationCourse') . ' : ' . $course_infos['title'] . $sessionTitle;
+				echo get_lang('DestinationCourse').' : '.$course_infos['title'].$sessionTitle;
 			echo '</h3>';
 		}
 
@@ -634,7 +634,7 @@ 
 		echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
 		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
 		echo '<input type="hidden" name="action" value="course_select_form"/>';
-		foreach ($list_course as $course){
+		foreach ($list_course as $course) {
 			foreach ($course->resources as $type => $resources) {
 				if (count($resources) > 0) {
 					echo '<img id="img_'.$course->code.'" src="../img/1.gif" onclick="javascript:exp('."'$course->code'".');" />';
@@ -662,7 +662,7 @@ 
 		if ($avoid_serialize) {
 			//Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files)
 			// this is a known issue of serialize
-			$course->resources['document']= null;
+			$course->resources['document'] = null;
 		}
 		echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
 		if (is_array($hidden_fields)) {

Braces +3 added lines, -2 removed lines

@@ -527,14 +527,15 @@
 						// Mark folders to import which are not selected by the user to import,
 						// but in which a document was selected.
 						$documents = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
-						if (!empty($resources) && is_array($resources))
-							foreach ($resources as $id => $obj) {
+						if (!empty($resources) && is_array($resources)) {
+													foreach ($resources as $id => $obj) {
 								if (isset($obj->file_type) && $obj->file_type == 'folder' &&
                                     !isset($_POST['resource'][RESOURCE_DOCUMENT][$id]) &&
                                     is_array($documents)
                                 ) {
 									foreach ($documents as $id_to_check => $post_value) {
 										$obj_to_check = $resources[$id_to_check];
+						}
 										$shared_path_part = substr($obj_to_check->path,0,strlen($obj->path));
 										if ($id_to_check != $id && $obj->path == $shared_path_part) {
 											$_POST['resource'][RESOURCE_DOCUMENT][$id] = 1;

Indentation +252 added lines, -252 removed lines

@@ -11,12 +11,12 @@ 
  */
 class CourseSelectForm
 {
-	/**
-	 * Display the form
-	 * @param array $hidden_fiels Hidden fields to add to the form.
-	 * @param boolean the document array will be serialize. This is used in the course_copy.php file
-	 */
-	static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
+    /**
+     * Display the form
+     * @param array $hidden_fiels Hidden fields to add to the form.
+     * @param boolean the document array will be serialize. This is used in the course_copy.php file
+     */
+    static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
     {
         global $charset;
         $resource_titles[RESOURCE_GRADEBOOK] = get_lang('Gradebook');
@@ -134,50 +134,50 @@ 
 		</script>
 		<?php
 
-		//get destination course title
-		if (!empty($hidden_fields['destination_course'])) {
+        //get destination course title
+        if (!empty($hidden_fields['destination_course'])) {
             $sessionTitle = !empty($hidden_fields['destination_session']) ? ' (' . api_get_session_name(
                 $hidden_fields['destination_session']
             ) . ')' : null;
 
             $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
-			echo '<h3>';
-			echo get_lang('DestinationCourse').' : '.$course_infos['title'] . ' ('.$course_infos['code'].') '.$sessionTitle;
-			echo '</h3>';
-		}
+            echo '<h3>';
+            echo get_lang('DestinationCourse').' : '.$course_infos['title'] . ' ('.$course_infos['code'].') '.$sessionTitle;
+            echo '</h3>';
+        }
         echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
-		echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
+        echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
         $icon = Display::returnIconPath('myprogress_bar.gif');
-		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.$icon.',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
-		echo '<input type="hidden" name="action" value="course_select_form"/>';
+        echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.$icon.',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
+        echo '<input type="hidden" name="action" value="course_select_form"/>';
 
-		if (!empty($hidden_fields['destination_course']) &&
+        if (!empty($hidden_fields['destination_course']) &&
             !empty($hidden_fields['origin_course']) &&
             !empty($hidden_fields['destination_session']) &&
             !empty($hidden_fields['origin_session'])
         ) {
-			echo '<input type="hidden" name="destination_course" 	value="'.$hidden_fields['destination_course'].'"/>';
-			echo '<input type="hidden" name="origin_course" 		value="'.$hidden_fields['origin_course'].'"/>';
-			echo '<input type="hidden" name="destination_session" 	value="'.$hidden_fields['destination_session'].'"/>';
-			echo '<input type="hidden" name="origin_session" 		value="'.$hidden_fields['origin_session'].'"/>';
-		}
+            echo '<input type="hidden" name="destination_course" 	value="'.$hidden_fields['destination_course'].'"/>';
+            echo '<input type="hidden" name="origin_course" 		value="'.$hidden_fields['origin_course'].'"/>';
+            echo '<input type="hidden" name="destination_session" 	value="'.$hidden_fields['destination_session'].'"/>';
+            echo '<input type="hidden" name="origin_session" 		value="'.$hidden_fields['origin_session'].'"/>';
+        }
 
-		$element_count = 0;
+        $element_count = 0;
         $forum_categories = array();
         $forums = array();
         $forum_topics = array();
 
         echo '<p>';
-		echo get_lang('SelectResources');
-		echo '</p>';
+        echo get_lang('SelectResources');
+        echo '</p>';
 
         Display::display_normal_message(get_lang('DontForgetToSelectTheMediaFilesIfYourResourceNeedIt'));
 
         foreach ($course->resources as $type => $resources) {
             if (count($resources) > 0) {
-				switch ($type) {
-					//Resources to avoid
-					case RESOURCE_FORUMCATEGORY:
+                switch ($type) {
+                    //Resources to avoid
+                    case RESOURCE_FORUMCATEGORY:
                         foreach ($resources as $id => $resource) {
                             $forum_categories[$id] = $resource;
                         }
@@ -196,49 +196,49 @@ 
                         $element_count++;
                         break;
                     case RESOURCE_LINKCATEGORY:
-					case RESOURCE_FORUMPOST:
-					case RESOURCE_QUIZQUESTION:
-					case RESOURCE_SURVEYQUESTION:
-					case RESOURCE_SURVEYINVITATION:
-					case RESOURCE_SCORM:
-						break;
+                    case RESOURCE_FORUMPOST:
+                    case RESOURCE_QUIZQUESTION:
+                    case RESOURCE_SURVEYQUESTION:
+                    case RESOURCE_SURVEYINVITATION:
+                    case RESOURCE_SCORM:
+                        break;
                     default :
-						echo '<img id="img_'.$type.'" src="'.Display::returnIconPath('1.gif').'" onclick="javascript:exp('."'$type'".');" />&nbsp;';
-						echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
-						echo '<div id="div_'.$type.'">';
-						if ($type == RESOURCE_LEARNPATH) {
-    						Display::display_warning_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
-    						Display::display_warning_message(get_lang('IfYourLPsHaveAudioFilesIncludedYouShouldSelectThemFromTheDocuments'));
-						}
-						if ($type == RESOURCE_DOCUMENT) {
+                        echo '<img id="img_'.$type.'" src="'.Display::returnIconPath('1.gif').'" onclick="javascript:exp('."'$type'".');" />&nbsp;';
+                        echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
+                        echo '<div id="div_'.$type.'">';
+                        if ($type == RESOURCE_LEARNPATH) {
+                            Display::display_warning_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
+                            Display::display_warning_message(get_lang('IfYourLPsHaveAudioFilesIncludedYouShouldSelectThemFromTheDocuments'));
+                        }
+                        if ($type == RESOURCE_DOCUMENT) {
                             if (api_get_setting('show_glossary_in_documents') != 'none') {
                                 Display::display_warning_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
                             }
-						}
+                        }
 
-						echo '<blockquote>';
+                        echo '<blockquote>';
                         echo '<div class="btn-group">';
-						echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
+                        echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
                         echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('None')."</a>";
-						echo '</div><br />';
+                        echo '</div><br />';
 
-						foreach ($resources as $id => $resource) {
+                        foreach ($resources as $id => $resource) {
                             if ($resource) {
-								// Event obj in 1.9.x in 1.10.x the class is CalendarEvent
+                                // Event obj in 1.9.x in 1.10.x the class is CalendarEvent
                                 Coursecopy\Resource::setClassType($resource);
                                 echo '<label class="checkbox">';
                                 echo '<input type="checkbox" name="resource['.$type.']['.$id.']"  id="resource['.$type.']['.$id.']" />';
                                 $resource->show();
                                 echo '</label>';
                             }
-						}
-						echo '</blockquote>';
-						echo '</div>';
-						echo '<script language="javascript">exp('."'$type'".')</script>';
-						$element_count++;
+                        }
+                        echo '</blockquote>';
+                        echo '</div>';
+                        echo '<script language="javascript">exp('."'$type'".')</script>';
+                        $element_count++;
                 }
-			}
-		}
+            }
+        }
 
         //Fixes forum order
         if (!empty($forum_categories)) {
@@ -294,65 +294,65 @@ 
             echo '<script language="javascript">exp('."'$type'".')</script>';
         }
 
-		if ($avoid_serialize) {
-			/*Documents are avoided due the huge amount of memory that the serialize php function "eats"
+        if ($avoid_serialize) {
+            /*Documents are avoided due the huge amount of memory that the serialize php function "eats"
 			(when there are directories with hundred/thousand of files) */
-			// this is a known issue of serialize
-			$course->resources['document']= null;
-		}
+            // this is a known issue of serialize
+            $course->resources['document']= null;
+        }
 
-		echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
+        echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
 
-		if (is_array($hidden_fields)) {
-			foreach ($hidden_fields as $key => $value) {
-				echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
-			}
-		}
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $key => $value) {
+                echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
+            }
+        }
 
         $recycleOption = isset($_POST['recycle_option']) ? true : false;
 
-		if (empty($element_count)) {
-		    Display::display_warning_message(get_lang('NoDataAvailable'));
-		} else {
-    		if (!empty($hidden_fields['destination_session'])) {
-    			echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES, $charset))."'".')) return false;" >'.
+        if (empty($element_count)) {
+            Display::display_warning_message(get_lang('NoDataAvailable'));
+        } else {
+            if (!empty($hidden_fields['destination_session'])) {
+                echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES, $charset))."'".')) return false;" >'.
                     get_lang('Ok').'</button>';
-    		} else {
+            } else {
                 if ($recycleOption) {
                     echo '<br /><button class="save" type="submit">'.
                         get_lang('Ok').'</button>';
                 } else {
-    			    echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.
+                    echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.
                     get_lang('Ok').'</button>';
                 }
-    		}
-		}
+            }
+        }
 
-		CourseSelectForm :: display_hidden_quiz_questions($course);
-		CourseSelectForm :: display_hidden_scorm_directories($course);
-		echo '</form>';
-		echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
-	}
+        CourseSelectForm :: display_hidden_quiz_questions($course);
+        CourseSelectForm :: display_hidden_scorm_directories($course);
+        echo '</form>';
+        echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
+    }
 
     /**
      * @param $course
      */
     static function display_hidden_quiz_questions($course)
     {
-		if(is_array($course->resources)){
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
-					switch ($type) {
-						case RESOURCE_QUIZQUESTION:
-							foreach ($resources as $id => $resource) {
-								echo '<input type="hidden" name="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" id="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" value="On" />';
-							}
-							break;
-					}
-				}
-			}
-		}
-	}
+        if(is_array($course->resources)){
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
+                    switch ($type) {
+                        case RESOURCE_QUIZQUESTION:
+                            foreach ($resources as $id => $resource) {
+                                echo '<input type="hidden" name="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" id="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" value="On" />';
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * @param $course
@@ -360,30 +360,30 @@ 
     static function display_hidden_scorm_directories($course)
     {
         if (is_array($course->resources)){
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
-					switch($type) {
-						case RESOURCE_SCORM:
-							foreach ($resources as $id => $resource) {
-								echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />';
-							}
-							break;
-					}
-				}
-			}
-		}
-	}
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
+                    switch($type) {
+                        case RESOURCE_SCORM:
+                            foreach ($resources as $id => $resource) {
+                                echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />';
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Get the posted course
-	 * @param string $from who calls the function?
+    /**
+     * Get the posted course
+     * @param string $from who calls the function?
      * It can be copy_course, create_backup, import_backup or recycle_course
      * @param int $session_id
      * @param string $course_code
-	 * @return course The course-object with all resources selected by the user
-	 * in the form given by display_form(...)
-	 */
-	public static function get_posted_course($from = '', $session_id = 0, $course_code = '')
+     * @return course The course-object with all resources selected by the user
+     * in the form given by display_form(...)
+     */
+    public static function get_posted_course($from = '', $session_id = 0, $course_code = '')
     {
         $course = null;
 
@@ -393,30 +393,30 @@ 
             return false;
         }
 
-		// Create the resource DOCUMENT objects
-		// Loading the results from the checkboxes of ethe javascript
-		$resource = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
+        // Create the resource DOCUMENT objects
+        // Loading the results from the checkboxes of ethe javascript
+        $resource = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
 
-		$course_info = api_get_course_info($course_code);
-		$table_doc = Database::get_course_table(TABLE_DOCUMENT);
-		$table_prop = Database::get_course_table(TABLE_ITEM_PROPERTY);
-		$course_id = $course_info['real_id'];
+        $course_info = api_get_course_info($course_code);
+        $table_doc = Database::get_course_table(TABLE_DOCUMENT);
+        $table_prop = Database::get_course_table(TABLE_ITEM_PROPERTY);
+        $course_id = $course_info['real_id'];
 
-		/* Searching the documents resource that have been set to null because
+        /* Searching the documents resource that have been set to null because
         $avoid_serialize is true in the display_form() function*/
-		if ($from == 'copy_course') {
-			if (is_array($resource)) {
-				$resource = array_keys($resource);
+        if ($from == 'copy_course') {
+            if (is_array($resource)) {
+                $resource = array_keys($resource);
 
-				foreach	($resource as $resource_item) {
+                foreach	($resource as $resource_item) {
 
-					$condition_session = '';
-					if (!empty($session_id)) {
-						$session_id = intval($session_id);
-						$condition_session = ' AND d.session_id ='.$session_id;
-					}
+                    $condition_session = '';
+                    if (!empty($session_id)) {
+                        $session_id = intval($session_id);
+                        $condition_session = ' AND d.session_id ='.$session_id;
+                    }
 
-					$sql = 'SELECT d.id, d.path, d.comment, d.title, d.filetype, d.size
+                    $sql = 'SELECT d.id, d.path, d.comment, d.title, d.filetype, d.size
 							FROM '.$table_doc.' d, '.$table_prop.' p
 							WHERE
 							    d.c_id = '.$course_id.' AND
@@ -425,8 +425,8 @@ 
                                 p.ref = d.id AND p.visibility != 2 AND
                                 d.id = '.$resource_item.$condition_session.'
 							ORDER BY path';
-					$db_result = Database::query($sql);
-					while ($obj = Database::fetch_object($db_result)) {
+                    $db_result = Database::query($sql);
+                    while ($obj = Database::fetch_object($db_result)) {
                         $doc = new Document(
                             $obj->id,
                             $obj->path,
@@ -450,25 +450,25 @@ 
                             }
                             $course->resources[RESOURCE_DOCUMENT][$resource_item]->item_properties = $all_properties;
                         }
-					}
-				}
-			}
-		}
+                    }
+                }
+            }
+        }
 
-		if (is_array($course->resources)) {
-			foreach ($course->resources as $type => $resources) {
+        if (is_array($course->resources)) {
+            foreach ($course->resources as $type => $resources) {
 
-				switch ($type) {
-					case RESOURCE_SURVEYQUESTION:
-						foreach($resources as $id => $obj) {
-						    if (isset($_POST['resource'][RESOURCE_SURVEY]) &&
+                switch ($type) {
+                    case RESOURCE_SURVEYQUESTION:
+                        foreach($resources as $id => $obj) {
+                            if (isset($_POST['resource'][RESOURCE_SURVEY]) &&
                                 is_array($_POST['resource'][RESOURCE_SURVEY]) &&
                                 !in_array($obj->survey_id, array_keys($_POST['resource'][RESOURCE_SURVEY]))
                             ) {
-								unset($course->resources[$type][$id]);
-							}
-						}
-						break;
+                                unset($course->resources[$type][$id]);
+                            }
+                        }
+                        break;
                     case RESOURCE_FORUMTOPIC:
                     case RESOURCE_FORUMPOST:
                        //Add post from topic
@@ -520,62 +520,62 @@ 
                                 }
                             }
                         }
-					case RESOURCE_LINKCATEGORY :
-					case RESOURCE_FORUMCATEGORY :
-					case RESOURCE_QUIZQUESTION :
-					case RESOURCE_DOCUMENT:
-						// Mark folders to import which are not selected by the user to import,
-						// but in which a document was selected.
-						$documents = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
-						if (!empty($resources) && is_array($resources))
-							foreach ($resources as $id => $obj) {
-								if (isset($obj->file_type) && $obj->file_type == 'folder' &&
+                    case RESOURCE_LINKCATEGORY :
+                    case RESOURCE_FORUMCATEGORY :
+                    case RESOURCE_QUIZQUESTION :
+                    case RESOURCE_DOCUMENT:
+                        // Mark folders to import which are not selected by the user to import,
+                        // but in which a document was selected.
+                        $documents = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
+                        if (!empty($resources) && is_array($resources))
+                            foreach ($resources as $id => $obj) {
+                                if (isset($obj->file_type) && $obj->file_type == 'folder' &&
                                     !isset($_POST['resource'][RESOURCE_DOCUMENT][$id]) &&
                                     is_array($documents)
                                 ) {
-									foreach ($documents as $id_to_check => $post_value) {
-										$obj_to_check = $resources[$id_to_check];
-										$shared_path_part = substr($obj_to_check->path,0,strlen($obj->path));
-										if ($id_to_check != $id && $obj->path == $shared_path_part) {
-											$_POST['resource'][RESOURCE_DOCUMENT][$id] = 1;
-											break;
-										}
-									}
-								}
-							}
-					default :
-						if (!empty($resources) && is_array($resources)) {
-							foreach ($resources as $id => $obj) {
-								$resource_is_used_elsewhere = $course->is_linked_resource($obj);
-								// check if document is in a quiz (audio/video)
-								if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) {
-									foreach($course->resources[RESOURCE_QUIZ] as $quiz) {
+                                    foreach ($documents as $id_to_check => $post_value) {
+                                        $obj_to_check = $resources[$id_to_check];
+                                        $shared_path_part = substr($obj_to_check->path,0,strlen($obj->path));
+                                        if ($id_to_check != $id && $obj->path == $shared_path_part) {
+                                            $_POST['resource'][RESOURCE_DOCUMENT][$id] = 1;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                    default :
+                        if (!empty($resources) && is_array($resources)) {
+                            foreach ($resources as $id => $obj) {
+                                $resource_is_used_elsewhere = $course->is_linked_resource($obj);
+                                // check if document is in a quiz (audio/video)
+                                if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) {
+                                    foreach($course->resources[RESOURCE_QUIZ] as $quiz) {
                                         $quiz = $quiz->obj;
-										if (isset($quiz->media) && $quiz->media == $id) {
-											$resource_is_used_elsewhere = true;
-										}
-									}
-								}
-								if (!isset($_POST['resource'][$type][$id]) && !$resource_is_used_elsewhere) {
-									unset($course->resources[$type][$id]);
-								}
-							}
-						}
-				}
-			}
-		}
-
-		return $course;
-	}
-
-	/**
-	 * Display the form session export
-	 * @param array $hidden_fiels Hidden fields to add to the form.
-	 * @param boolean the document array will be serialize. This is used in the course_copy.php file
-	 */
-	 public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
-     {
-         ?>
+                                        if (isset($quiz->media) && $quiz->media == $id) {
+                                            $resource_is_used_elsewhere = true;
+                                        }
+                                    }
+                                }
+                                if (!isset($_POST['resource'][$type][$id]) && !$resource_is_used_elsewhere) {
+                                    unset($course->resources[$type][$id]);
+                                }
+                            }
+                        }
+                }
+            }
+        }
+
+        return $course;
+    }
+
+    /**
+     * Display the form session export
+     * @param array $hidden_fiels Hidden fields to add to the form.
+     * @param boolean the document array will be serialize. This is used in the course_copy.php file
+     */
+        public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
+        {
+            ?>
 		<script>
 			function exp(item) {
 				el = document.getElementById('div_'+item);
@@ -617,65 +617,65 @@ 
 		</script>
 		<?php
 
-		//get destination course title
-		if(!empty($hidden_fields['destination_course'])) {
-             if (!empty($hidden_fields['destination_session'])) {
-                 $sessionTitle = ' (' . api_get_session_name($hidden_fields['destination_session']) . ')';
-             } else {
-                 $sessionTitle = null;
-             }
+        //get destination course title
+        if(!empty($hidden_fields['destination_course'])) {
+                if (!empty($hidden_fields['destination_session'])) {
+                    $sessionTitle = ' (' . api_get_session_name($hidden_fields['destination_session']) . ')';
+                } else {
+                    $sessionTitle = null;
+                }
             $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
-			echo '<h3>';
-				echo get_lang('DestinationCourse') . ' : ' . $course_infos['title'] . $sessionTitle;
-			echo '</h3>';
-		}
+            echo '<h3>';
+                echo get_lang('DestinationCourse') . ' : ' . $course_infos['title'] . $sessionTitle;
+            echo '</h3>';
+        }
 
-		echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
-		echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
+        echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
+        echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
         $icon = Display::returnIconPath('progress_bar.gif');
-		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.$icon.'\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
-		echo '<input type="hidden" name="action" value="course_select_form"/>';
-		foreach ($list_course as $course){
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
-					echo '<img id="img_'.$course->code.'" src="'.Display::returnIconPath('1.gif').'" onclick="javascript:exp('."'$course->code'".');" />';
-					echo '<b  onclick="javascript:exp('."'$course->code'".');" > '.$course->code.'</b><br />';
-					echo '<div id="div_'.$course->code.'">';
-					echo '<blockquote>';
+        echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.$icon.'\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
+        echo '<input type="hidden" name="action" value="course_select_form"/>';
+        foreach ($list_course as $course){
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
+                    echo '<img id="img_'.$course->code.'" src="'.Display::returnIconPath('1.gif').'" onclick="javascript:exp('."'$course->code'".');" />';
+                    echo '<b  onclick="javascript:exp('."'$course->code'".');" > '.$course->code.'</b><br />';
+                    echo '<div id="div_'.$course->code.'">';
+                    echo '<blockquote>';
 
                     echo '<div class="btn-group">';
-					echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',true);\" >".get_lang('All')."</a>";
+                    echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',true);\" >".get_lang('All')."</a>";
                     echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',false);\" >".get_lang('None')."</a>";
-					echo '</div><br />';
+                    echo '</div><br />';
 
-					foreach ($resources as $id => $resource) {
-						echo '<label class="checkbox" for="resource['.$course->code.']['.$id.']">';
+                    foreach ($resources as $id => $resource) {
+                        echo '<label class="checkbox" for="resource['.$course->code.']['.$id.']">';
                         echo '<input type="checkbox" name="resource['.$course->code.']['.$id.']" id="resource['.$course->code.']['.$id.']"/>';
-						$resource->show();
-						echo '</label>';
-					}
-					echo '</blockquote>';
-					echo '</div>';
-					echo '<script type="text/javascript">exp('."'$course->code'".')</script>';
-				}
-			}
-		}
-		if ($avoid_serialize) {
-			//Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files)
-			// this is a known issue of serialize
-			$course->resources['document']= null;
-		}
-		echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
-		if (is_array($hidden_fields)) {
-			foreach ($hidden_fields as $key => $value) {
-				echo "\n";
-				echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
-			}
-		}
-		echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.get_lang('Ok').'</button>';
-		CourseSelectForm :: display_hidden_quiz_questions($course);
-		CourseSelectForm :: display_hidden_scorm_directories($course);
-		echo '</form>';
-		echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
-	}
+                        $resource->show();
+                        echo '</label>';
+                    }
+                    echo '</blockquote>';
+                    echo '</div>';
+                    echo '<script type="text/javascript">exp('."'$course->code'".')</script>';
+                }
+            }
+        }
+        if ($avoid_serialize) {
+            //Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files)
+            // this is a known issue of serialize
+            $course->resources['document']= null;
+        }
+        echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $key => $value) {
+                echo "\n";
+                echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
+            }
+        }
+        echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.get_lang('Ok').'</button>';
+        CourseSelectForm :: display_hidden_quiz_questions($course);
+        CourseSelectForm :: display_hidden_scorm_directories($course);
+        echo '</form>';
+        echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
+    }
 }

main/coursecopy/classes/DummyCourseCreator.class.php

Doc Comments +1 added lines

@@ -280,6 +280,7 @@
 	}
 	/**
 	 * Get dummy titles, descriptions and texts
+	 * @param string $type
 	 */
 	function get_dummy_content($type)
 	{

Indentation +279 added lines, -279 removed lines

@@ -20,289 +20,289 @@
  */
 class DummyCourseCreator
 {
-	/**
-	 * The dummy course
-	 */
-	public $course;
-	/**
-	 *
-	 */
-	public $default_property = array();
+    /**
+     * The dummy course
+     */
+    public $course;
+    /**
+     *
+     */
+    public $default_property = array();
 
-	/**
-	 * Create the dummy course
-	 */
-	public function create_dummy_course($course_code)
-	{
-		$this->default_property['insert_user_id'] = '1';
-		$this->default_property['insert_date'] = date('Y-m-d H:i:s');
-		$this->default_property['lastedit_date'] = date('Y-m-d H:i:s');
-		$this->default_property['lastedit_user_id'] = '1';
-		$this->default_property['to_group_id'] = '0';
-		$this->default_property['to_user_id'] = null;
-		$this->default_property['visibility'] = '1';
-		$this->default_property['start_visible'] = '0000-00-00 00:00:00';
-		$this->default_property['end_visible'] =  '0000-00-00 00:00:00';
+    /**
+     * Create the dummy course
+     */
+    public function create_dummy_course($course_code)
+    {
+        $this->default_property['insert_user_id'] = '1';
+        $this->default_property['insert_date'] = date('Y-m-d H:i:s');
+        $this->default_property['lastedit_date'] = date('Y-m-d H:i:s');
+        $this->default_property['lastedit_user_id'] = '1';
+        $this->default_property['to_group_id'] = '0';
+        $this->default_property['to_user_id'] = null;
+        $this->default_property['visibility'] = '1';
+        $this->default_property['start_visible'] = '0000-00-00 00:00:00';
+        $this->default_property['end_visible'] =  '0000-00-00 00:00:00';
 
-		$course = api_get_course_info($course_code);
-		$this->course = new Course();
-		$tmp_path = api_get_path(SYS_COURSE_PATH).$course['directory'].'/document/tmp_'.uniqid('');
-		@mkdir($tmp_path, api_get_permissions_for_new_directories(), true);
-		$this->course->backup_path = $tmp_path;
-		$this->create_dummy_links();
-		$this->create_dummy_events();
-		$this->create_dummy_forums();
-		$this->create_dummy_announcements();
-		$this->create_dummy_documents();
-		$this->create_dummy_learnpaths();
-		$cr = new CourseRestorer($this->course);
-		$cr->set_file_option(FILE_OVERWRITE);
-		$cr->restore($course_code);
-		rmdirr($tmp_path);
-	}
-	/**
-	 * Create dummy documents
-	 */
-	function create_dummy_documents()
-	{
-		$course = api_get_course_info();
-		$course_doc_path = $this->course->backup_path.'/document/';
-		$number_of_documents = rand(10, 30);
-		$extensions = array ('html', 'doc');
-		$directories = array();
-		$property = $this->default_property;
-		$property['lastedit_type'] = 'DocumentAdded';
-		$property['tool'] = TOOL_DOCUMENT;
-		$doc_id = 0;
-		for ($doc_id = 1; $doc_id < $number_of_documents; $doc_id ++)
-		{
-			$path = '';
-			$doc_type = rand(0, count($extensions) - 1);
-			$extension = $extensions[$doc_type];
-			$filename = $this->get_dummy_content('title').'_'.$doc_id.'.'.$extension;
-			$content = $this->get_dummy_content('text');
-			$dirs = rand(0, 3);
-			for ($i = 0; $i < $dirs; $i ++)
-			{
-				$path .= 'directory/';
-				$directories[$path] = 1;
-			}
-			$dir_to_make = $course_doc_path.$path;
-			if (!is_dir($dir_to_make))
-			{
-				@mkdir($dir_to_make, api_get_permissions_for_new_directories(), true);
-			}
-			$file = $course_doc_path.$path.$filename;
-			$fp = fopen($file, 'w');
-			fwrite($fp, $content);
-			fclose($fp);
-			$size = filesize($file);
-			$document = new Document($doc_id, '/'.$path.$filename,$this->get_dummy_content('description'),$this->get_dummy_content('title'), 'file', $size);
-			$document->item_properties[] = $property;
-			$this->course->add_resource($document);
-		}
-		foreach($directories as $path => $flag)
-		{
-			$path = substr($path,0,strlen($path)-1);
-			$document = new Document($doc_id++,'/'.$path, $this->get_dummy_content('description'),$this->get_dummy_content('title'),'folder',0);
-			$property['lastedit_type'] = 'FolderCreated';
-			$document->item_properties[] = $property;
-			$this->course->add_resource($document);
-		}
-	}
-	/**
-	 * Create dummy announcements
-	 */
-	function create_dummy_announcements()
-	{
-		$property = $this->default_property;
-		$property['lastedit_type'] = 'AnnouncementAdded';
-		$property['tool'] = TOOL_ANNOUNCEMENT;
-		$number_of_announcements = rand(10, 30);
-		for ($i = 0; $i < $number_of_announcements; $i ++)
-		{
-			$time = mktime(rand(1, 24), rand(1, 60), 0, rand(1, 12), rand(1, 28), intval(date('Y')));
-			$date = date('Y-m-d', $time);
-			$announcement = new Announcement($i,$this->get_dummy_content('title'),$this->get_dummy_content('text'), $date,0);
-			$announcement->item_properties[] = $property;
-			$this->course->add_resource($announcement);
-		}
-	}
-	/**
-	 * Create dummy events
-	 */
-	function create_dummy_events()
-	{
-		$number_of_events = rand(10, 30);
-		$property = $this->default_property;
-		$property['lastedit_type'] = 'AgendaAdded';
-		$property['tool'] = TOOL_CALENDAR_EVENT;
-		for ($i = 0; $i < $number_of_events; $i ++)
-		{
-			$hour = rand(1,24);
-			$minute = rand(1,60);
-			$second = rand(1,60);
-			$day = rand(1,28);
-			$month = rand(1,12);
-			$year = intval(date('Y'));
-			$time = mktime($hour,$minute,$second,$month,$day,$year);
-			$start_date = date('Y-m-d H:m:s', $time);
-			$hour = rand($hour,24);
-			$minute = rand($minute,60);
-			$second = rand($second,60);
-			$day = rand($day,28);
-			$month = rand($month,12);
-			$year = intval(date('Y'));
-			$time = mktime($hour,$minute,$second,$month,$day,$year);
-			$end_date = date('Y-m-d H:m:s', $time);
-			$event = new CalendarEvent(
-				$i,
-				$this->get_dummy_content('title'),
-				$this->get_dummy_content('text'),
-				$start_date,
-				$end_date
-			);
-			$event->item_properties[] = $property;
-			$this->course->add_resource($event);
-		}
-	}
-	/**
-	 * Create dummy links
-	 */
-	function create_dummy_links()
-	{
-		// create categorys
-		$number_of_categories = rand(5, 10);
-		for ($i = 0; $i < $number_of_categories; $i ++)
-		{
-			$linkcat = new LinkCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'),$i);
-			$this->course->add_resource($linkcat);
-		}
-		// create links
-		$number_of_links = rand(5, 50);
-		$on_homepage = rand(0,20) == 0 ? 1 : 0;
-		$property = $this->default_property;
-		$property['lastedit_type'] = 'LinkAdded';
-		$property['tool'] = TOOL_LINK;
-		for ($i = 0; $i < $number_of_links; $i ++)
-		{
-			$link = new Link($i, $this->get_dummy_content('title'), 'http://www.google.com/search?q='.$this->get_dummy_content('title'), $this->get_dummy_content('description'), rand(0, $number_of_categories -1),$on_homepage);
-			$link->item_properties[] = $property;
-			$this->course->add_resource($link);
-		}
-	}
-	/**
-	 * Create dummy forums
-	 */
-	function create_dummy_forums()
-	{
-		$number_of_categories = rand(2, 6);
-		$number_of_forums = rand(5, 50);
-		$number_of_topics = rand(30, 100);
-		$number_of_posts = rand(100, 1000);
-		$last_forum_post = array ();
-		$last_topic_post = array ();
-		// create categorys
-		$order = 1;
-		for ($i = 1; $i <= $number_of_categories; $i ++)
-		{
-			$forumcat = new ForumCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'), $order, 0, 0);
-			$this->course->add_resource($forumcat);
-			$order++;
-		}
-		// create posts
-		for ($post_id = 1; $post_id <= $number_of_posts; $post_id ++)
-		{
-			$topic_id = rand(1, $number_of_topics);
-			$last_topic_post[$topic_id] = $post_id;
-			$post = new ForumPost($post_id, $this->get_dummy_content('title'), $this->get_dummy_content('text'), date('Y-m-d H:i:s'), 1, 'Portal Administrator', 0, 0, $topic_id, 0, 1);
-			$this->course->add_resource($post);
-		}
-		// create topics
-		for ($topic_id = 1; $topic_id <= $number_of_topics; $topic_id ++)
-		{
-			$forum_id = rand(1, $number_of_forums);
-			$last_forum_post[$forum_id] = $last_topic_post[$topic_id];
-			$topic = new ForumTopic($topic_id, $this->get_dummy_content('title'), '2011-03-31 12:10:00', 'Chamilo', 'Administrator', 0, $forum_id, $last_topic_post[$topic_id]);
-			$this->course->add_resource($topic);
-		}
-		// create forums
-		for ($forum_id = 1; $forum_id <= $number_of_forums; $forum_id ++)
-		{
-			$forum = new Forum($forum_id, $this->get_dummy_content('title'),$this->get_dummy_content('description'), rand(1, $number_of_categories), $last_forum_post[$forum_id]);
-			$this->course->add_resource($forum);
-		}
-	}
-	/**
-	 * Create dummy learnpaths
-	 */
-	function create_dummy_learnpaths()
-	{
-		$number_of_learnpaths = rand(3,5);
-		$global_item_id = 1;
-		for($i=1; $i<=$number_of_learnpaths;$i++)
-		{
-		$chapters = array();
-		$number_of_chapters = rand(1,6);
-		for($chapter_id = 1; $chapter_id <= $number_of_chapters; $chapter_id++)
-		{
-			$chapter['name'] = $this->get_dummy_content('title');
-			$chapter['description'] = $this->get_dummy_content('description');
-			$chapter['display_order'] = $chapter_id;
-			$chapter['items'] = array();
-			$number_of_items = rand(5,20);
-			for( $item_id = 1; $item_id<$number_of_items; $item_id++)
-			{
-				$types = array(RESOURCE_ANNOUNCEMENT, RESOURCE_EVENT, RESOURCE_DOCUMENT,RESOURCE_LINK,RESOURCE_FORUM,RESOURCE_FORUMPOST,RESOURCE_FORUMTOPIC);
-				$type = $types[rand(0,count($types)-1)];
-				$resources = $this->course->resources[$type];
-				$resource = $resources[rand(0,count($resources)-1)];
-				$item = array();
-				$item['type'] = $resource->type;
-				$item['id'] = $resource->source_id;
-				$item['display_order'] = $item_id;
-				$item['title'] = $this->get_dummy_content('title');
-				$item['description'] = $this->get_dummy_content('description');
-				$item['ref_id'] = $global_item_id;
-				if( rand(0,5) == 1 && $item_id > 1)
-				{
-					$item['prereq_type'] = 'i';
-					$item['prereq'] = rand($global_item_id - $item_id,$global_item_id-1);
-				}
-				$chapter['items'][] = $item;
-				$global_item_id++;
-			}
-			$chapters[] = $chapter;
-		}
-		$lp = new CourseCopyLearnpath($i,$this->get_dummy_content('title'),$this->get_dummy_content('description'),1,$chapters);
-		$this->course->add_resource($lp);
-		}
-	}
-	/**
-	 * Get dummy titles, descriptions and texts
-	 */
-	function get_dummy_content($type)
-	{
-		$dummy_text = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque lectus. Duis sodales. Vivamus et nunc. Phasellus interdum est a lorem. Fusce venenatis luctus lectus. Mauris quis turpis ac erat rhoncus suscipit. Phasellus elit dui, semper at, porta ut, egestas ac, enim. Quisque pellentesque, nisl nec consequat mollis, ipsum justo pellentesque nibh, non faucibus odio ante at lorem. Donec vitae pede ut felis ultricies semper. Suspendisse velit nibh, interdum quis, gravida nec, dapibus ac, leo. Cras id sem ut tellus tincidunt scelerisque. Aenean ac magna feugiat dolor accumsan dignissim. Integer eget nisl.
+        $course = api_get_course_info($course_code);
+        $this->course = new Course();
+        $tmp_path = api_get_path(SYS_COURSE_PATH).$course['directory'].'/document/tmp_'.uniqid('');
+        @mkdir($tmp_path, api_get_permissions_for_new_directories(), true);
+        $this->course->backup_path = $tmp_path;
+        $this->create_dummy_links();
+        $this->create_dummy_events();
+        $this->create_dummy_forums();
+        $this->create_dummy_announcements();
+        $this->create_dummy_documents();
+        $this->create_dummy_learnpaths();
+        $cr = new CourseRestorer($this->course);
+        $cr->set_file_option(FILE_OVERWRITE);
+        $cr->restore($course_code);
+        rmdirr($tmp_path);
+    }
+    /**
+     * Create dummy documents
+     */
+    function create_dummy_documents()
+    {
+        $course = api_get_course_info();
+        $course_doc_path = $this->course->backup_path.'/document/';
+        $number_of_documents = rand(10, 30);
+        $extensions = array ('html', 'doc');
+        $directories = array();
+        $property = $this->default_property;
+        $property['lastedit_type'] = 'DocumentAdded';
+        $property['tool'] = TOOL_DOCUMENT;
+        $doc_id = 0;
+        for ($doc_id = 1; $doc_id < $number_of_documents; $doc_id ++)
+        {
+            $path = '';
+            $doc_type = rand(0, count($extensions) - 1);
+            $extension = $extensions[$doc_type];
+            $filename = $this->get_dummy_content('title').'_'.$doc_id.'.'.$extension;
+            $content = $this->get_dummy_content('text');
+            $dirs = rand(0, 3);
+            for ($i = 0; $i < $dirs; $i ++)
+            {
+                $path .= 'directory/';
+                $directories[$path] = 1;
+            }
+            $dir_to_make = $course_doc_path.$path;
+            if (!is_dir($dir_to_make))
+            {
+                @mkdir($dir_to_make, api_get_permissions_for_new_directories(), true);
+            }
+            $file = $course_doc_path.$path.$filename;
+            $fp = fopen($file, 'w');
+            fwrite($fp, $content);
+            fclose($fp);
+            $size = filesize($file);
+            $document = new Document($doc_id, '/'.$path.$filename,$this->get_dummy_content('description'),$this->get_dummy_content('title'), 'file', $size);
+            $document->item_properties[] = $property;
+            $this->course->add_resource($document);
+        }
+        foreach($directories as $path => $flag)
+        {
+            $path = substr($path,0,strlen($path)-1);
+            $document = new Document($doc_id++,'/'.$path, $this->get_dummy_content('description'),$this->get_dummy_content('title'),'folder',0);
+            $property['lastedit_type'] = 'FolderCreated';
+            $document->item_properties[] = $property;
+            $this->course->add_resource($document);
+        }
+    }
+    /**
+     * Create dummy announcements
+     */
+    function create_dummy_announcements()
+    {
+        $property = $this->default_property;
+        $property['lastedit_type'] = 'AnnouncementAdded';
+        $property['tool'] = TOOL_ANNOUNCEMENT;
+        $number_of_announcements = rand(10, 30);
+        for ($i = 0; $i < $number_of_announcements; $i ++)
+        {
+            $time = mktime(rand(1, 24), rand(1, 60), 0, rand(1, 12), rand(1, 28), intval(date('Y')));
+            $date = date('Y-m-d', $time);
+            $announcement = new Announcement($i,$this->get_dummy_content('title'),$this->get_dummy_content('text'), $date,0);
+            $announcement->item_properties[] = $property;
+            $this->course->add_resource($announcement);
+        }
+    }
+    /**
+     * Create dummy events
+     */
+    function create_dummy_events()
+    {
+        $number_of_events = rand(10, 30);
+        $property = $this->default_property;
+        $property['lastedit_type'] = 'AgendaAdded';
+        $property['tool'] = TOOL_CALENDAR_EVENT;
+        for ($i = 0; $i < $number_of_events; $i ++)
+        {
+            $hour = rand(1,24);
+            $minute = rand(1,60);
+            $second = rand(1,60);
+            $day = rand(1,28);
+            $month = rand(1,12);
+            $year = intval(date('Y'));
+            $time = mktime($hour,$minute,$second,$month,$day,$year);
+            $start_date = date('Y-m-d H:m:s', $time);
+            $hour = rand($hour,24);
+            $minute = rand($minute,60);
+            $second = rand($second,60);
+            $day = rand($day,28);
+            $month = rand($month,12);
+            $year = intval(date('Y'));
+            $time = mktime($hour,$minute,$second,$month,$day,$year);
+            $end_date = date('Y-m-d H:m:s', $time);
+            $event = new CalendarEvent(
+                $i,
+                $this->get_dummy_content('title'),
+                $this->get_dummy_content('text'),
+                $start_date,
+                $end_date
+            );
+            $event->item_properties[] = $property;
+            $this->course->add_resource($event);
+        }
+    }
+    /**
+     * Create dummy links
+     */
+    function create_dummy_links()
+    {
+        // create categorys
+        $number_of_categories = rand(5, 10);
+        for ($i = 0; $i < $number_of_categories; $i ++)
+        {
+            $linkcat = new LinkCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'),$i);
+            $this->course->add_resource($linkcat);
+        }
+        // create links
+        $number_of_links = rand(5, 50);
+        $on_homepage = rand(0,20) == 0 ? 1 : 0;
+        $property = $this->default_property;
+        $property['lastedit_type'] = 'LinkAdded';
+        $property['tool'] = TOOL_LINK;
+        for ($i = 0; $i < $number_of_links; $i ++)
+        {
+            $link = new Link($i, $this->get_dummy_content('title'), 'http://www.google.com/search?q='.$this->get_dummy_content('title'), $this->get_dummy_content('description'), rand(0, $number_of_categories -1),$on_homepage);
+            $link->item_properties[] = $property;
+            $this->course->add_resource($link);
+        }
+    }
+    /**
+     * Create dummy forums
+     */
+    function create_dummy_forums()
+    {
+        $number_of_categories = rand(2, 6);
+        $number_of_forums = rand(5, 50);
+        $number_of_topics = rand(30, 100);
+        $number_of_posts = rand(100, 1000);
+        $last_forum_post = array ();
+        $last_topic_post = array ();
+        // create categorys
+        $order = 1;
+        for ($i = 1; $i <= $number_of_categories; $i ++)
+        {
+            $forumcat = new ForumCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'), $order, 0, 0);
+            $this->course->add_resource($forumcat);
+            $order++;
+        }
+        // create posts
+        for ($post_id = 1; $post_id <= $number_of_posts; $post_id ++)
+        {
+            $topic_id = rand(1, $number_of_topics);
+            $last_topic_post[$topic_id] = $post_id;
+            $post = new ForumPost($post_id, $this->get_dummy_content('title'), $this->get_dummy_content('text'), date('Y-m-d H:i:s'), 1, 'Portal Administrator', 0, 0, $topic_id, 0, 1);
+            $this->course->add_resource($post);
+        }
+        // create topics
+        for ($topic_id = 1; $topic_id <= $number_of_topics; $topic_id ++)
+        {
+            $forum_id = rand(1, $number_of_forums);
+            $last_forum_post[$forum_id] = $last_topic_post[$topic_id];
+            $topic = new ForumTopic($topic_id, $this->get_dummy_content('title'), '2011-03-31 12:10:00', 'Chamilo', 'Administrator', 0, $forum_id, $last_topic_post[$topic_id]);
+            $this->course->add_resource($topic);
+        }
+        // create forums
+        for ($forum_id = 1; $forum_id <= $number_of_forums; $forum_id ++)
+        {
+            $forum = new Forum($forum_id, $this->get_dummy_content('title'),$this->get_dummy_content('description'), rand(1, $number_of_categories), $last_forum_post[$forum_id]);
+            $this->course->add_resource($forum);
+        }
+    }
+    /**
+     * Create dummy learnpaths
+     */
+    function create_dummy_learnpaths()
+    {
+        $number_of_learnpaths = rand(3,5);
+        $global_item_id = 1;
+        for($i=1; $i<=$number_of_learnpaths;$i++)
+        {
+        $chapters = array();
+        $number_of_chapters = rand(1,6);
+        for($chapter_id = 1; $chapter_id <= $number_of_chapters; $chapter_id++)
+        {
+            $chapter['name'] = $this->get_dummy_content('title');
+            $chapter['description'] = $this->get_dummy_content('description');
+            $chapter['display_order'] = $chapter_id;
+            $chapter['items'] = array();
+            $number_of_items = rand(5,20);
+            for( $item_id = 1; $item_id<$number_of_items; $item_id++)
+            {
+                $types = array(RESOURCE_ANNOUNCEMENT, RESOURCE_EVENT, RESOURCE_DOCUMENT,RESOURCE_LINK,RESOURCE_FORUM,RESOURCE_FORUMPOST,RESOURCE_FORUMTOPIC);
+                $type = $types[rand(0,count($types)-1)];
+                $resources = $this->course->resources[$type];
+                $resource = $resources[rand(0,count($resources)-1)];
+                $item = array();
+                $item['type'] = $resource->type;
+                $item['id'] = $resource->source_id;
+                $item['display_order'] = $item_id;
+                $item['title'] = $this->get_dummy_content('title');
+                $item['description'] = $this->get_dummy_content('description');
+                $item['ref_id'] = $global_item_id;
+                if( rand(0,5) == 1 && $item_id > 1)
+                {
+                    $item['prereq_type'] = 'i';
+                    $item['prereq'] = rand($global_item_id - $item_id,$global_item_id-1);
+                }
+                $chapter['items'][] = $item;
+                $global_item_id++;
+            }
+            $chapters[] = $chapter;
+        }
+        $lp = new CourseCopyLearnpath($i,$this->get_dummy_content('title'),$this->get_dummy_content('description'),1,$chapters);
+        $this->course->add_resource($lp);
+        }
+    }
+    /**
+     * Get dummy titles, descriptions and texts
+     */
+    function get_dummy_content($type)
+    {
+        $dummy_text = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque lectus. Duis sodales. Vivamus et nunc. Phasellus interdum est a lorem. Fusce venenatis luctus lectus. Mauris quis turpis ac erat rhoncus suscipit. Phasellus elit dui, semper at, porta ut, egestas ac, enim. Quisque pellentesque, nisl nec consequat mollis, ipsum justo pellentesque nibh, non faucibus odio ante at lorem. Donec vitae pede ut felis ultricies semper. Suspendisse velit nibh, interdum quis, gravida nec, dapibus ac, leo. Cras id sem ut tellus tincidunt scelerisque. Aenean ac magna feugiat dolor accumsan dignissim. Integer eget nisl.
 		Ut sit amet nulla. Vestibulum venenatis posuere mauris. Nullam magna leo, blandit luctus, consequat quis, gravida nec, justo. Nam pede. Etiam ut nisl. In at quam scelerisque sapien faucibus commodo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Proin mattis lorem quis nunc. Praesent placerat ligula id elit. Aenean blandit, purus sit amet pharetra auctor, libero orci rutrum felis, sit amet sodales mauris ipsum ultricies sapien. Vivamus wisi. Cras elit elit, ullamcorper ac, interdum nec, pulvinar nec, lacus. In lacus. Vivamus auctor, arcu vitae tincidunt porta, eros lacus tristique justo, vitae semper risus neque eget massa. Vivamus turpis.
 		Aenean ac wisi non enim aliquam scelerisque. Praesent eget mi. Vestibulum volutpat pulvinar justo. Phasellus sapien ante, pharetra id, bibendum sed, porta non, purus. Maecenas leo velit, luctus quis, porta non, feugiat sit amet, sapien. Proin vitae augue ut massa adipiscing placerat. Morbi ac risus. Proin dapibus eros egestas quam. Fusce fermentum lobortis elit. Duis lectus tellus, convallis nec, lobortis vel, accumsan ut, nunc. Nunc est. Donec ullamcorper laoreet quam.
 		Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Suspendisse potenti. Mauris mi. Vivamus risus lacus, faucibus sit amet, sollicitudin a, blandit et, justo. In hendrerit. Sed imperdiet, eros at fringilla tempor, turpis augue semper enim, quis rhoncus nibh enim quis dui. Sed massa sapien, mattis et, laoreet sit amet, dignissim nec, urna. Integer laoreet quam quis lectus. Curabitur convallis gravida dui. Nam metus. Ut sit amet augue in nibh interdum scelerisque. Donec venenatis, lacus et pulvinar euismod, libero massa condimentum pede, commodo tristique nunc massa eu quam. Donec vulputate. Aenean in nibh. Phasellus porttitor. Donec molestie, sem ac porttitor vulputate, mauris dui egestas libero, ac lobortis dolor sem vel ligula. Nam vulputate pretium libero. Cras accumsan. Vivamus lacinia sapien sit amet elit.
 		Duis bibendum elementum justo. Duis posuere. Fusce nulla odio, posuere eget, condimentum nec, venenatis eu, elit. In hac habitasse platea dictumst. Aenean ac sem in enim imperdiet feugiat. Integer tincidunt lectus at elit. Integer magna lacus, vehicula quis, eleifend eget, suscipit vitae, leo. Nunc porta augue nec enim. Curabitur vehicula volutpat enim. Aliquam consequat. Vestibulum rhoncus tellus vitae erat. Integer est. Quisque fermentum leo nec odio. Suspendisse lobortis sollicitudin augue. Nullam urna mi, suscipit eu, sagittis laoreet, ultrices ac, sem. Aliquam enim tortor, hendrerit non, cursus a, tristique sit amet, sapien. Suspendisse potenti. Aenean semper placerat neque.';
-		switch($type)
-		{
-		 case 'description':
-		 	$descriptions = explode(".",$dummy_text);
-		 	return $descriptions[rand(0,count($descriptions)-1)];
-		 	break;
-		 case 'title':
-		 	$dummy_text = str_replace(array("\n",'.',',',"\t"),array(' ','','',' '),$dummy_text);
-		 	$titles = explode(" ",$dummy_text);
-		 	return trim($titles[rand(0,count($titles)-1)]);
-		 	break;
-		 case 'text':
-		 	$texts = explode("\n",$dummy_text);
-		 	return $texts[rand(0,count($texts)-1)];
-		 	break;
-		}
-	}
+        switch($type)
+        {
+            case 'description':
+             $descriptions = explode(".",$dummy_text);
+                return $descriptions[rand(0,count($descriptions)-1)];
+                break;
+            case 'title':
+             $dummy_text = str_replace(array("\n",'.',',',"\t"),array(' ','','',' '),$dummy_text);
+                $titles = explode(" ",$dummy_text);
+                return trim($titles[rand(0,count($titles)-1)]);
+                break;
+            case 'text':
+             $texts = explode("\n",$dummy_text);
+                return $texts[rand(0,count($texts)-1)];
+                break;
+        }
+    }
 }

Spacing +55 added lines, -55 removed lines

@@ -42,7 +42,7 @@ 
 		$this->default_property['to_user_id'] = null;
 		$this->default_property['visibility'] = '1';
 		$this->default_property['start_visible'] = '0000-00-00 00:00:00';
-		$this->default_property['end_visible'] =  '0000-00-00 00:00:00';
+		$this->default_property['end_visible'] = '0000-00-00 00:00:00';
 
 		$course = api_get_course_info($course_code);
 		$this->course = new Course();
@@ -68,13 +68,13 @@ 
 		$course = api_get_course_info();
 		$course_doc_path = $this->course->backup_path.'/document/';
 		$number_of_documents = rand(10, 30);
-		$extensions = array ('html', 'doc');
+		$extensions = array('html', 'doc');
 		$directories = array();
 		$property = $this->default_property;
 		$property['lastedit_type'] = 'DocumentAdded';
 		$property['tool'] = TOOL_DOCUMENT;
 		$doc_id = 0;
-		for ($doc_id = 1; $doc_id < $number_of_documents; $doc_id ++)
+		for ($doc_id = 1; $doc_id < $number_of_documents; $doc_id++)
 		{
 			$path = '';
 			$doc_type = rand(0, count($extensions) - 1);
@@ -82,7 +82,7 @@ 
 			$filename = $this->get_dummy_content('title').'_'.$doc_id.'.'.$extension;
 			$content = $this->get_dummy_content('text');
 			$dirs = rand(0, 3);
-			for ($i = 0; $i < $dirs; $i ++)
+			for ($i = 0; $i < $dirs; $i++)
 			{
 				$path .= 'directory/';
 				$directories[$path] = 1;
@@ -97,14 +97,14 @@ 
 			fwrite($fp, $content);
 			fclose($fp);
 			$size = filesize($file);
-			$document = new Document($doc_id, '/'.$path.$filename,$this->get_dummy_content('description'),$this->get_dummy_content('title'), 'file', $size);
+			$document = new Document($doc_id, '/'.$path.$filename, $this->get_dummy_content('description'), $this->get_dummy_content('title'), 'file', $size);
 			$document->item_properties[] = $property;
 			$this->course->add_resource($document);
 		}
-		foreach($directories as $path => $flag)
+		foreach ($directories as $path => $flag)
 		{
-			$path = substr($path,0,strlen($path)-1);
-			$document = new Document($doc_id++,'/'.$path, $this->get_dummy_content('description'),$this->get_dummy_content('title'),'folder',0);
+			$path = substr($path, 0, strlen($path) - 1);
+			$document = new Document($doc_id++, '/'.$path, $this->get_dummy_content('description'), $this->get_dummy_content('title'), 'folder', 0);
 			$property['lastedit_type'] = 'FolderCreated';
 			$document->item_properties[] = $property;
 			$this->course->add_resource($document);
@@ -119,11 +119,11 @@ 
 		$property['lastedit_type'] = 'AnnouncementAdded';
 		$property['tool'] = TOOL_ANNOUNCEMENT;
 		$number_of_announcements = rand(10, 30);
-		for ($i = 0; $i < $number_of_announcements; $i ++)
+		for ($i = 0; $i < $number_of_announcements; $i++)
 		{
 			$time = mktime(rand(1, 24), rand(1, 60), 0, rand(1, 12), rand(1, 28), intval(date('Y')));
 			$date = date('Y-m-d', $time);
-			$announcement = new Announcement($i,$this->get_dummy_content('title'),$this->get_dummy_content('text'), $date,0);
+			$announcement = new Announcement($i, $this->get_dummy_content('title'), $this->get_dummy_content('text'), $date, 0);
 			$announcement->item_properties[] = $property;
 			$this->course->add_resource($announcement);
 		}
@@ -137,23 +137,23 @@ 
 		$property = $this->default_property;
 		$property['lastedit_type'] = 'AgendaAdded';
 		$property['tool'] = TOOL_CALENDAR_EVENT;
-		for ($i = 0; $i < $number_of_events; $i ++)
+		for ($i = 0; $i < $number_of_events; $i++)
 		{
-			$hour = rand(1,24);
-			$minute = rand(1,60);
-			$second = rand(1,60);
-			$day = rand(1,28);
-			$month = rand(1,12);
+			$hour = rand(1, 24);
+			$minute = rand(1, 60);
+			$second = rand(1, 60);
+			$day = rand(1, 28);
+			$month = rand(1, 12);
 			$year = intval(date('Y'));
-			$time = mktime($hour,$minute,$second,$month,$day,$year);
+			$time = mktime($hour, $minute, $second, $month, $day, $year);
 			$start_date = date('Y-m-d H:m:s', $time);
-			$hour = rand($hour,24);
-			$minute = rand($minute,60);
-			$second = rand($second,60);
-			$day = rand($day,28);
-			$month = rand($month,12);
+			$hour = rand($hour, 24);
+			$minute = rand($minute, 60);
+			$second = rand($second, 60);
+			$day = rand($day, 28);
+			$month = rand($month, 12);
 			$year = intval(date('Y'));
-			$time = mktime($hour,$minute,$second,$month,$day,$year);
+			$time = mktime($hour, $minute, $second, $month, $day, $year);
 			$end_date = date('Y-m-d H:m:s', $time);
 			$event = new CalendarEvent(
 				$i,
@@ -173,20 +173,20 @@ 
 	{
 		// create categorys
 		$number_of_categories = rand(5, 10);
-		for ($i = 0; $i < $number_of_categories; $i ++)
+		for ($i = 0; $i < $number_of_categories; $i++)
 		{
-			$linkcat = new LinkCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'),$i);
+			$linkcat = new LinkCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'), $i);
 			$this->course->add_resource($linkcat);
 		}
 		// create links
 		$number_of_links = rand(5, 50);
-		$on_homepage = rand(0,20) == 0 ? 1 : 0;
+		$on_homepage = rand(0, 20) == 0 ? 1 : 0;
 		$property = $this->default_property;
 		$property['lastedit_type'] = 'LinkAdded';
 		$property['tool'] = TOOL_LINK;
-		for ($i = 0; $i < $number_of_links; $i ++)
+		for ($i = 0; $i < $number_of_links; $i++)
 		{
-			$link = new Link($i, $this->get_dummy_content('title'), 'http://www.google.com/search?q='.$this->get_dummy_content('title'), $this->get_dummy_content('description'), rand(0, $number_of_categories -1),$on_homepage);
+			$link = new Link($i, $this->get_dummy_content('title'), 'http://www.google.com/search?q='.$this->get_dummy_content('title'), $this->get_dummy_content('description'), rand(0, $number_of_categories - 1), $on_homepage);
 			$link->item_properties[] = $property;
 			$this->course->add_resource($link);
 		}
@@ -200,18 +200,18 @@ 
 		$number_of_forums = rand(5, 50);
 		$number_of_topics = rand(30, 100);
 		$number_of_posts = rand(100, 1000);
-		$last_forum_post = array ();
-		$last_topic_post = array ();
+		$last_forum_post = array();
+		$last_topic_post = array();
 		// create categorys
 		$order = 1;
-		for ($i = 1; $i <= $number_of_categories; $i ++)
+		for ($i = 1; $i <= $number_of_categories; $i++)
 		{
 			$forumcat = new ForumCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'), $order, 0, 0);
 			$this->course->add_resource($forumcat);
 			$order++;
 		}
 		// create posts
-		for ($post_id = 1; $post_id <= $number_of_posts; $post_id ++)
+		for ($post_id = 1; $post_id <= $number_of_posts; $post_id++)
 		{
 			$topic_id = rand(1, $number_of_topics);
 			$last_topic_post[$topic_id] = $post_id;
@@ -219,7 +219,7 @@ 
 			$this->course->add_resource($post);
 		}
 		// create topics
-		for ($topic_id = 1; $topic_id <= $number_of_topics; $topic_id ++)
+		for ($topic_id = 1; $topic_id <= $number_of_topics; $topic_id++)
 		{
 			$forum_id = rand(1, $number_of_forums);
 			$last_forum_post[$forum_id] = $last_topic_post[$topic_id];
@@ -227,9 +227,9 @@ 
 			$this->course->add_resource($topic);
 		}
 		// create forums
-		for ($forum_id = 1; $forum_id <= $number_of_forums; $forum_id ++)
+		for ($forum_id = 1; $forum_id <= $number_of_forums; $forum_id++)
 		{
-			$forum = new Forum($forum_id, $this->get_dummy_content('title'),$this->get_dummy_content('description'), rand(1, $number_of_categories), $last_forum_post[$forum_id]);
+			$forum = new Forum($forum_id, $this->get_dummy_content('title'), $this->get_dummy_content('description'), rand(1, $number_of_categories), $last_forum_post[$forum_id]);
 			$this->course->add_resource($forum);
 		}
 	}
@@ -238,25 +238,25 @@ 
 	 */
 	function create_dummy_learnpaths()
 	{
-		$number_of_learnpaths = rand(3,5);
+		$number_of_learnpaths = rand(3, 5);
 		$global_item_id = 1;
-		for($i=1; $i<=$number_of_learnpaths;$i++)
+		for ($i = 1; $i <= $number_of_learnpaths; $i++)
 		{
 		$chapters = array();
-		$number_of_chapters = rand(1,6);
-		for($chapter_id = 1; $chapter_id <= $number_of_chapters; $chapter_id++)
+		$number_of_chapters = rand(1, 6);
+		for ($chapter_id = 1; $chapter_id <= $number_of_chapters; $chapter_id++)
 		{
 			$chapter['name'] = $this->get_dummy_content('title');
 			$chapter['description'] = $this->get_dummy_content('description');
 			$chapter['display_order'] = $chapter_id;
 			$chapter['items'] = array();
-			$number_of_items = rand(5,20);
-			for( $item_id = 1; $item_id<$number_of_items; $item_id++)
+			$number_of_items = rand(5, 20);
+			for ($item_id = 1; $item_id < $number_of_items; $item_id++)
 			{
-				$types = array(RESOURCE_ANNOUNCEMENT, RESOURCE_EVENT, RESOURCE_DOCUMENT,RESOURCE_LINK,RESOURCE_FORUM,RESOURCE_FORUMPOST,RESOURCE_FORUMTOPIC);
-				$type = $types[rand(0,count($types)-1)];
+				$types = array(RESOURCE_ANNOUNCEMENT, RESOURCE_EVENT, RESOURCE_DOCUMENT, RESOURCE_LINK, RESOURCE_FORUM, RESOURCE_FORUMPOST, RESOURCE_FORUMTOPIC);
+				$type = $types[rand(0, count($types) - 1)];
 				$resources = $this->course->resources[$type];
-				$resource = $resources[rand(0,count($resources)-1)];
+				$resource = $resources[rand(0, count($resources) - 1)];
 				$item = array();
 				$item['type'] = $resource->type;
 				$item['id'] = $resource->source_id;
@@ -264,17 +264,17 @@ 
 				$item['title'] = $this->get_dummy_content('title');
 				$item['description'] = $this->get_dummy_content('description');
 				$item['ref_id'] = $global_item_id;
-				if( rand(0,5) == 1 && $item_id > 1)
+				if (rand(0, 5) == 1 && $item_id > 1)
 				{
 					$item['prereq_type'] = 'i';
-					$item['prereq'] = rand($global_item_id - $item_id,$global_item_id-1);
+					$item['prereq'] = rand($global_item_id - $item_id, $global_item_id - 1);
 				}
 				$chapter['items'][] = $item;
 				$global_item_id++;
 			}
 			$chapters[] = $chapter;
 		}
-		$lp = new CourseCopyLearnpath($i,$this->get_dummy_content('title'),$this->get_dummy_content('description'),1,$chapters);
+		$lp = new CourseCopyLearnpath($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'), 1, $chapters);
 		$this->course->add_resource($lp);
 		}
 	}
@@ -288,20 +288,20 @@ 
 		Aenean ac wisi non enim aliquam scelerisque. Praesent eget mi. Vestibulum volutpat pulvinar justo. Phasellus sapien ante, pharetra id, bibendum sed, porta non, purus. Maecenas leo velit, luctus quis, porta non, feugiat sit amet, sapien. Proin vitae augue ut massa adipiscing placerat. Morbi ac risus. Proin dapibus eros egestas quam. Fusce fermentum lobortis elit. Duis lectus tellus, convallis nec, lobortis vel, accumsan ut, nunc. Nunc est. Donec ullamcorper laoreet quam.
 		Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Suspendisse potenti. Mauris mi. Vivamus risus lacus, faucibus sit amet, sollicitudin a, blandit et, justo. In hendrerit. Sed imperdiet, eros at fringilla tempor, turpis augue semper enim, quis rhoncus nibh enim quis dui. Sed massa sapien, mattis et, laoreet sit amet, dignissim nec, urna. Integer laoreet quam quis lectus. Curabitur convallis gravida dui. Nam metus. Ut sit amet augue in nibh interdum scelerisque. Donec venenatis, lacus et pulvinar euismod, libero massa condimentum pede, commodo tristique nunc massa eu quam. Donec vulputate. Aenean in nibh. Phasellus porttitor. Donec molestie, sem ac porttitor vulputate, mauris dui egestas libero, ac lobortis dolor sem vel ligula. Nam vulputate pretium libero. Cras accumsan. Vivamus lacinia sapien sit amet elit.
 		Duis bibendum elementum justo. Duis posuere. Fusce nulla odio, posuere eget, condimentum nec, venenatis eu, elit. In hac habitasse platea dictumst. Aenean ac sem in enim imperdiet feugiat. Integer tincidunt lectus at elit. Integer magna lacus, vehicula quis, eleifend eget, suscipit vitae, leo. Nunc porta augue nec enim. Curabitur vehicula volutpat enim. Aliquam consequat. Vestibulum rhoncus tellus vitae erat. Integer est. Quisque fermentum leo nec odio. Suspendisse lobortis sollicitudin augue. Nullam urna mi, suscipit eu, sagittis laoreet, ultrices ac, sem. Aliquam enim tortor, hendrerit non, cursus a, tristique sit amet, sapien. Suspendisse potenti. Aenean semper placerat neque.';
-		switch($type)
+		switch ($type)
 		{
 		 case 'description':
-		 	$descriptions = explode(".",$dummy_text);
-		 	return $descriptions[rand(0,count($descriptions)-1)];
+		 	$descriptions = explode(".", $dummy_text);
+		 	return $descriptions[rand(0, count($descriptions) - 1)];
 		 	break;
 		 case 'title':
-		 	$dummy_text = str_replace(array("\n",'.',',',"\t"),array(' ','','',' '),$dummy_text);
-		 	$titles = explode(" ",$dummy_text);
-		 	return trim($titles[rand(0,count($titles)-1)]);
+		 	$dummy_text = str_replace(array("\n", '.', ',', "\t"), array(' ', '', '', ' '), $dummy_text);
+		 	$titles = explode(" ", $dummy_text);
+		 	return trim($titles[rand(0, count($titles) - 1)]);
 		 	break;
 		 case 'text':
-		 	$texts = explode("\n",$dummy_text);
-		 	return $texts[rand(0,count($texts)-1)];
+		 	$texts = explode("\n", $dummy_text);
+		 	return $texts[rand(0, count($texts) - 1)];
 		 	break;
 		}
 	}

main/coursecopy/classes/Event.class.php

Doc Comments -3 removed lines

@@ -50,9 +50,6 @@
      * @param int $id
      * @param string $title
      * @param string $content
-     * @param string $date
-     * @param string $hour
-     * @param int $duration
      */
     public function __construct(
         $id,

Indentation +11 added lines, -11 removed lines

@@ -66,19 +66,19 @@
         $attachment_comment = null,
         $all_day = 0
     ) {
-		parent::__construct($id, RESOURCE_EVENT);
+        parent::__construct($id, RESOURCE_EVENT);
 
-		$this->title = $title;
-		$this->content = $content;
-		$this->start_date = $start_date;
-		$this->end_date = $end_date;
-		$this->all_day = $all_day;
+        $this->title = $title;
+        $this->content = $content;
+        $this->start_date = $start_date;
+        $this->end_date = $end_date;
+        $this->all_day = $all_day;
 
-		$this->attachment_path = $attachment_path;
-		$this->attachment_filename = $attachment_filename;
-		$this->attachment_size = $attachment_size;
-		$this->attachment_comment = $attachment_comment;
-	}
+        $this->attachment_path = $attachment_path;
+        $this->attachment_filename = $attachment_filename;
+        $this->attachment_size = $attachment_size;
+        $this->attachment_comment = $attachment_comment;
+    }
 
     /**
      * Show this Event

main/coursecopy/classes/QuizQuestion.class.php

Doc Comments +3 added lines

@@ -115,6 +115,9 @@
         $this->answers[] = $answer;
     }
 
+    /**
+     * @param QuizQuestionOption $option_obj
+     */
     public function add_option($option_obj)
     {
         $this->question_options[$option_obj->obj->id] = $option_obj;

main/coursecopy/classes/Resource.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 
     /**
      * Resturns the type of this resource
-     * @return constant The type.
+     * @return integer The type.
      */
     public function get_type()
     {

main/coursecopy/copy_course_session_selected.php

Doc Comments +3 added lines

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

Spacing +40 added lines, -40 removed lines

@@ -48,7 +48,7 @@ 
 $nameTools = get_lang('CopyCourse');
 $returnLink = api_get_path(
         WEB_CODE_PATH
-    ) . 'course_info/maintenance_coach.php?' . api_get_cidreq();
+    ).'course_info/maintenance_coach.php?'.api_get_cidreq();
 $interbreadcrumb[] = array(
     'url' => $returnLink,
     'name' => get_lang('Maintenance')
@@ -71,29 +71,29 @@ 
     $attrs = '';
     if (count($attr) > 0) {
         foreach ($attr as $key => $value) {
-            $attrs .= ' ' . $key . '="' . $value . '"';
+            $attrs .= ' '.$key.'="'.$value.'"';
         }
     }
-    $output = '<select name="' . $name . '" ' . $attrs . '>';
+    $output = '<select name="'.$name.'" '.$attrs.'>';
 
     if (count($sessions) == 0) {
-        $output .= '<option value = "0">' . get_lang(
+        $output .= '<option value = "0">'.get_lang(
                 'ThereIsNotStillASession'
-            ) . '</option>';
+            ).'</option>';
     } else {
-        $output .= '<option value = "0">' . get_lang(
+        $output .= '<option value = "0">'.get_lang(
                 'SelectASession'
-            ) . '</option>';
+            ).'</option>';
     }
 
     if (is_array($sessions)) {
         foreach ($sessions as $session) {
             $category_name = '';
             if (!empty($session['category_name'])) {
-                $category_name = ' (' . $session['category_name'] . ')';
+                $category_name = ' ('.$session['category_name'].')';
             }
 
-            $output .= '<option value="' . $session['id'] . '">' . $session['name'] . ' ' . $category_name . '</option>';
+            $output .= '<option value="'.$session['id'].'">'.$session['name'].' '.$category_name.'</option>';
         }
     }
     $output .= '</select>';
@@ -118,43 +118,43 @@ 
     // Actions
     $html .= '<div class="actions">';
     // Link back to the documents overview
-    $html .= '<a href="' . $returnLink . '">' . Display::return_icon(
-            'back.png', get_lang('BackTo') . ' ' . get_lang('Maintenance'), '', ICON_SIZE_MEDIUM
-        ) . '</a>';
+    $html .= '<a href="'.$returnLink.'">'.Display::return_icon(
+            'back.png', get_lang('BackTo').' '.get_lang('Maintenance'), '', ICON_SIZE_MEDIUM
+        ).'</a>';
     $html .= '</div>';
 
     $html .= Display::return_message(
             get_lang('CopyCourseFromSessionToSessionExplanation')
     );
 
-    $html .= '<form name="formulaire" method="post" action="' . api_get_self(
-        ) . '?' . api_get_cidreq() . '" >';
+    $html .= '<form name="formulaire" method="post" action="'.api_get_self(
+        ).'?'.api_get_cidreq().'" >';
     $html .= '<table border="0" cellpadding="5" cellspacing="0" width="100%">';
 
     // Source
-    $html .= '<tr><td width="15%"><b>' . get_lang(
+    $html .= '<tr><td width="15%"><b>'.get_lang(
             'OriginCoursesFromSession'
-        ) . ':</b></td>';
-    $html .= '<td width="10%" align="left">' . api_get_session_name(
+        ).':</b></td>';
+    $html .= '<td width="10%" align="left">'.api_get_session_name(
             $sessionId
-        ) . '</td>';
+        ).'</td>';
     $html .= '<td width="50%">';
-    $html .= "{$courseInfo['title']} ({$courseInfo['code']})" . '</td></tr>';
+    $html .= "{$courseInfo['title']} ({$courseInfo['code']})".'</td></tr>';
 
     // Destination
-    $html .= '<tr><td width="15%"><b>' . get_lang(
+    $html .= '<tr><td width="15%"><b>'.get_lang(
             'DestinationCoursesFromSession'
-        ) . ':</b></td>';
+        ).':</b></td>';
     $html .= '<td width="10%" align="left"><div id="ajax_sessions_list_destination">';
     $html .= '<select name="sessions_list_destination" onchange="javascript: xajax_searchCourses(this.value,\'destination\');">';
     if (empty($sessions)) {
-        $html .= '<option value = "0">' . get_lang(
+        $html .= '<option value = "0">'.get_lang(
                 'ThereIsNotStillASession'
-            ) . '</option>';
+            ).'</option>';
     } else {
-        $html .= '<option value = "0">' . get_lang(
+        $html .= '<option value = "0">'.get_lang(
                 'SelectASession'
-            ) . '</option>';
+            ).'</option>';
         foreach ($sessions as $session) {
             if ($session['id'] == $sessionId) {
                 continue;
@@ -164,7 +164,7 @@ 
                 continue;
             }
 
-            $html .= '<option value="' . $session['id'] . '">' . $session['name'] . '</option>';
+            $html .= '<option value="'.$session['id'].'">'.$session['name'].'</option>';
         }
     }
 
@@ -176,17 +176,17 @@ 
     $html .= '</tr></table>';
 
     $html .= "<fieldset>";
-    $html .= '<legend>' . get_lang('TypeOfCopy') . ' <small>(' . get_lang('CopyOnlySessionItems') . ')</small></legend>';
+    $html .= '<legend>'.get_lang('TypeOfCopy').' <small>('.get_lang('CopyOnlySessionItems').')</small></legend>';
     $html .= '<label class="radio"><input type="radio" id="copy_option_1" name="copy_option" value="full_copy" checked="checked"/>';
-    $html .= get_lang('FullCopy') . '</label>';
+    $html .= get_lang('FullCopy').'</label>';
     $html .= '<label class="radio"><input type="radio" id="copy_option_2" name="copy_option" value="select_items"/>';
-    $html .= ' ' . get_lang('LetMeSelectItems') . '</label><br/>';
+    $html .= ' '.get_lang('LetMeSelectItems').'</label><br/>';
 
     $html .= "</fieldset>";
 
-    $html .= '<button class="save" type="submit" onclick="javascript:if(!confirm(' . "'" . addslashes(
+    $html .= '<button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(
             api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)
-        ) . "'" . ')) return false;">' . get_lang('CopyCourse') . '</button>';
+        )."'".')) return false;">'.get_lang('CopyCourse').'</button>';
     $html .= '</form>';
     echo $html;
 }
@@ -212,10 +212,10 @@ 
 
             $courseTitle = str_replace("'", "\'", $course['title']);
 
-            $return .= '<option value="' . $course['code'] . '" title="' . @htmlspecialchars(
-                    $course['title'] . ' (' . $course['visual_code'] . ')', ENT_QUOTES, api_get_system_encoding()
-                ) . '">' .
-                $course['title'] . ' (' . $course['visual_code'] . ')</option>';
+            $return .= '<option value="'.$course['code'].'" title="'.@htmlspecialchars(
+                    $course['title'].' ('.$course['visual_code'].')', ENT_QUOTES, api_get_system_encoding()
+                ).'">'.
+                $course['title'].' ('.$course['visual_code'].')</option>';
         }
         $return .= '</select>';
         $_SESSION['course_list_destination'] = $course_list_destination;
@@ -233,7 +233,7 @@ 
 /* HTML head extra */
 
 $htmlHeadXtra[] = $xajax->getJavascript(
-    api_get_path(WEB_LIBRARY_PATH) . 'xajax/'
+    api_get_path(WEB_LIBRARY_PATH).'xajax/'
 );
 $htmlHeadXtra[] = '<script>
 	function checkSelected(id_select,id_radio,id_title,id_destination) {
@@ -378,13 +378,13 @@ 
 
         CourseSelectForm :: display_form($course, $hiddenFields, true);
 
-        echo '<div style="float:right"><a href="javascript:window.history.go(-1);">' .
+        echo '<div style="float:right"><a href="javascript:window.history.go(-1);">'.
             Display::return_icon(
-                'back.png', get_lang('Back') . ' ' . get_lang('To') . ' ' . get_lang(
+                'back.png', get_lang('Back').' '.get_lang('To').' '.get_lang(
                     'PlatformAdmin'
                 ), array('style' => 'vertical-align:middle')
-            ) .
-            get_lang('Back') . '</a></div>';
+            ).
+            get_lang('Back').'</a></div>';
     } else {
         Display::display_error_message(
             get_lang('You must select a course from original session and select a destination session')

main/cron/create_course_sessions.php

Doc Comments +3 added lines

@@ -50,6 +50,7 @@ 
 /**
  * Returns a quarter from a month
  * @param   string  The month (digit), with or without leading 0
+ * @param string $month
  * @return  int The yearly quarter (1, 2, 3 or 4) in which this month lies
  */
 function getQuarter($month)
@@ -96,6 +97,7 @@ 
 /**
  * Returns the first month of the quarter
  * @param   int Quarter
+ * @param integer $quarter
  * @return  string Number of the month, with leading 0
  */
 function getQuarterFirstMonth($quarter)
@@ -116,6 +118,7 @@ 
 /**
  * Get the quarter in Roman letters
  * @param   int Quarter
+ * @param integer $quarter
  * @return  string  Roman letters
  */
 function getQuarterRoman($quarter)

Spacing +7 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
     exit; //do not run from browser
 }
 
-require_once __DIR__ . "/../inc/global.inc.php";
+require_once __DIR__."/../inc/global.inc.php";
 
 // First day of the current month to create sessions and add courses for the next month (e.g. "07")
 define("OFFSET", "15");
@@ -41,7 +41,7 @@ 
 {
     $startDate = $initialDate ? $initialDate : date("Y-m-01");
     $month = getQuarterFirstMonth(getQuarter(date('m', $startDate)));
-    $startDate = substr($startDate, 0, 5) . $month . '-01';
+    $startDate = substr($startDate, 0, 5).$month.'-01';
     $nextQuarterStartDate = date('Y-m-d', api_strtotime($startDate.' + 3 month'));
     $endDate = date('Y-m-d', api_strtotime($nextQuarterStartDate.' - 1 minute'));
     return array('startDate' => $startDate, 'endDate' => $endDate);
@@ -145,8 +145,7 @@ 
 {
     echo "\n";
     echo $courses ?
-        "Creating sessions and adding courses for the period between ".$startDate." and ".$endDate :
-        "Every course is already in session for the period between ".$startDate." and ".$endDate;
+        "Creating sessions and adding courses for the period between ".$startDate." and ".$endDate : "Every course is already in session for the period between ".$startDate." and ".$endDate;
     echo "\n=====================================================================================\n\n";
     // Loop through courses creating one session per each and adding them
     foreach ($courses as $course) {
@@ -155,8 +154,8 @@ 
         $year = date("Y", api_strtotime($startDate));
         $quarter = getQuarter($month);
         $quarter = getQuarterRoman($quarter);
-        $period = $year . '-' . $quarter;
-        $sessionName = '[' . $period . '] ' . $course['title'];
+        $period = $year.'-'.$quarter;
+        $sessionName = '['.$period.'] '.$course['title'];
         $sessionId = SessionManager::create_session(
             $sessionName,
             $startDate,
@@ -175,7 +174,7 @@ 
 }
 
 // Starts the script
-echo "Starting process..." . PHP_EOL;
+echo "Starting process...".PHP_EOL;
 // Get first active administrator
 $administrators = array_reverse(UserManager::get_all_administrators());
 $lastingAdministrators = count($administrators);
@@ -196,7 +195,7 @@ 
 
 // Creates course sessions for the following month
 $offsetDay = intval(substr($dates['endDate'], 8, 2)) - OFFSET;
-if (date("Y-m-d") >= date(substr($dates['endDate'], 0, 8) . $offsetDay)) {
+if (date("Y-m-d") >= date(substr($dates['endDate'], 0, 8).$offsetDay)) {
     $dates = getQuarterFirstAndLastDates(date("Y-m-d", api_strtotime(date("Y-m-01")." + 3 month")));
     // Get courses that don't have any session the next month
     $courses = CourseManager::getCoursesWithoutSession($dates['startDate'], $dates['endDate']);

main/cron/import_csv.php

Doc Comments +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
     public $conditions;
 
     /**
-     * @param Logger $logger
+     * @param Monolog\Logger $logger
      * @param array
      */
     public function __construct($logger, $conditions)
@@ -66,7 +66,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return boolean
      */
     public function getDumpValues()
     {

Spacing +19 added lines, -19 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 
-if (PHP_SAPI !='cli') {
+if (PHP_SAPI != 'cli') {
     die('Run this script through the command line or comment this line in the code');
 }
 
@@ -365,11 +365,11 @@ 
                 $row = $this->cleanUserRow($row);
 
                 $user_id = UserManager::get_user_id_from_original_id(
-                    $row['extra_' . $this->extraFieldIdNameList['user']],
+                    $row['extra_'.$this->extraFieldIdNameList['user']],
                     $this->extraFieldIdNameList['user']
                 );
-                $userInfo  = array();
-                $userInfoByOfficialCode  = null;
+                $userInfo = array();
+                $userInfoByOfficialCode = null;
 
                 if (!empty($user_id)) {
                     $userInfo = api_get_user_info($user_id);
@@ -423,7 +423,7 @@ 
                     $result = UserManager::update_user(
                         $userInfo['user_id'],
                         $row['firstname'], // <<-- changed
-                        $row['lastname'],  // <<-- changed
+                        $row['lastname'], // <<-- changed
                         $userInfo['username'],
                         null, //$password = null,
                         $row['auth_source'],
@@ -557,7 +557,7 @@ 
 
                     if ($row['action'] == 'delete') {
                         // Inactive one year later
-                        $userInfo['expiration_date'] = api_get_utc_datetime(api_strtotime(time() + 365*24*60*60));
+                        $userInfo['expiration_date'] = api_get_utc_datetime(api_strtotime(time() + 365 * 24 * 60 * 60));
                     }
 
                     $password = $row['password']; // change password
@@ -606,8 +606,8 @@ 
                     $result = UserManager::update_user(
                         $userInfo['user_id'],
                         $row['firstname'], // <<-- changed
-                        $row['lastname'],  // <<-- changed
-                        $row['username'],  // <<-- changed
+                        $row['lastname'], // <<-- changed
+                        $row['username'], // <<-- changed
                         $password, //$password = null,
                         $row['auth_source'],
                         $email,
@@ -674,7 +674,7 @@ 
         $data = Import::csv_to_array($file);
 
         if (!empty($data)) {
-            $this->logger->addInfo(count($data) . " records found.");
+            $this->logger->addInfo(count($data)." records found.");
             $eventsToCreate = array();
             $errorFound = false;
             foreach ($data as $row) {
@@ -688,7 +688,7 @@ 
                     );
                 }
 
-                $courseCode  = null;
+                $courseCode = null;
                 if (isset($row['coursecode'])) {
                     $courseCode = $row['coursecode'];
                 }
@@ -742,7 +742,7 @@ 
                 }
 
                 $date = $row['date'];
-                $startTime  = $row['time_start'];
+                $startTime = $row['time_start'];
                 $endTime = $row['time_end'];
                 $title = $row['title'];
                 $comment = $row['comment'];
@@ -966,7 +966,7 @@ 
                 $row = $this->cleanCourseRow($row);
 
                 $courseId = CourseManager::get_course_id_from_original_id(
-                    $row['extra_' . $this->extraFieldIdNameList['course']],
+                    $row['extra_'.$this->extraFieldIdNameList['course']],
                     $this->extraFieldIdNameList['course']
                 );
 
@@ -1084,7 +1084,7 @@ 
         $data = Import::csv_reader($file);
 
         if (!empty($data)) {
-            $this->logger->addInfo(count($data) . " records found.");
+            $this->logger->addInfo(count($data)." records found.");
             foreach ($data as $row) {
                 $chamiloUserName = $row['UserName'];
                 $chamiloCourseCode = $row['CourseCode'];
@@ -1126,7 +1126,7 @@ 
                 );
 
                 $this->logger->addError(
-                    "User '$chamiloUserName' was remove from Session: #$chamiloSessionId - Course: " . $courseInfo['code']
+                    "User '$chamiloUserName' was remove from Session: #$chamiloSessionId - Course: ".$courseInfo['code']
                 );
 
             }
@@ -1143,7 +1143,7 @@ 
         $data = Import::csv_reader($file);
 
         if (!empty($data)) {
-            $this->logger->addInfo(count($data) . " records found.");
+            $this->logger->addInfo(count($data)." records found.");
             foreach ($data as $row) {
                 $chamiloUserName = $row['UserName'];
                 $chamiloCourseCode = $row['CourseCode'];
@@ -1198,7 +1198,7 @@ 
                 }
 
                 $this->logger->addError(
-                    "User '$chamiloUserName' with status $type was added to session: #$chamiloSessionId - Course: " . $courseInfo['code']
+                    "User '$chamiloUserName' with status $type was added to session: #$chamiloSessionId - Course: ".$courseInfo['code']
                 );
             }
         }
@@ -1441,7 +1441,7 @@ 
      */
     private function importSessions($file, $moveFile = true, &$teacherBackup = array(), &$groupBackup = array())
     {
-        $avoid =  null;
+        $avoid = null;
         if (isset($this->conditions['importSessions']) &&
             isset($this->conditions['importSessions']['update'])
         ) {
@@ -1486,7 +1486,7 @@ 
         $data = Import::csv_reader($file);
 
         if (!empty($data)) {
-            $this->logger->addInfo(count($data) . " records found.");
+            $this->logger->addInfo(count($data)." records found.");
             foreach ($data as $row) {
                 $chamiloUserName = $row['UserName'];
                 $chamiloCourseCode = $row['CourseCode'];
@@ -1533,7 +1533,7 @@ 
                 }
 
                 $this->logger->addError(
-                    "User '$chamiloUserName' with status $type was added to session: #$chamiloSessionId - Course: " . $courseInfo['code']
+                    "User '$chamiloUserName' with status $type was added to session: #$chamiloSessionId - Course: ".$courseInfo['code']
                 );
             }
         }

main/dropbox/dropbox_class.inc.php

Doc Comments +2 added lines, -1 removed lines

@@ -266,7 +266,7 @@ 
 	 * @param string $author
 	 * @param string $filename
 	 * @param int $filesize
-	 * @param array $recipient_ids
+	 * @param unknown_type|null $recipient_ids
 	 */
 	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {
@@ -584,6 +584,7 @@ 
 
 	/**
 	 * Deletes all the received categories and work of this person
+	 * @param integer $id
 	 */
 	function deleteReceivedWorkFolder($id)
     {

Spacing +20 added lines, -20 removed lines

@@ -184,7 +184,7 @@ 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
 
         // Do some sanity checks
-        $id	= intval($id);
+        $id = intval($id);
 
         // Get the data from DB
         $sql = "SELECT uploader_id, filename, filesize, title, description, author, upload_date, last_upload_date, cat_id
@@ -226,14 +226,14 @@ 
                 $row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']);
                 $feedback2[] = $row_feedback;
             }
-            $this->feedback2= $feedback2;
+            $this->feedback2 = $feedback2;
         }
 	}
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
+	public $recipients; //array of ['id']['name'] arrays
 
 	/**
 	 * Constructor calls private functions to create a new work or retreive an existing work from DB
@@ -290,15 +290,15 @@ 
 		settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
 
 		$justSubmit = false;
-		if ( is_int($recipient_ids)) {
+		if (is_int($recipient_ids)) {
 			$justSubmit = true;
 			$recipient_ids = array($recipient_ids + $this->id);
-		} elseif ( count($recipient_ids) == 0) {
+		} elseif (count($recipient_ids) == 0) {
 			$justSubmit = true;
 			$recipient_ids = array($uploader_id);
 		}
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+		if (!is_array($recipient_ids) || count($recipient_ids) == 0) {
 			die(get_lang('GeneralError').' (code 209)');
 		}
 
@@ -313,11 +313,11 @@ 
         $table_person = $dropbox_cnf['tbl_person'];
         $session_id = api_get_session_id();
         $uploader_id = $this->uploader_id;
-        $user  = api_get_user_id();
+        $user = api_get_user_id();
 		// Insert data in dropbox_post and dropbox_person table for each recipient
 		foreach ($this->recipients as $rec) {
-            $file_id = (int)$this->id;
-            $user_id = (int)$rec['id'];
+            $file_id = (int) $this->id;
+            $user_id = (int) $rec['id'];
 			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id)";
 	        Database::query($sql);
@@ -333,7 +333,7 @@ 
 
                 // Do not add recipient in person table if mailing zip or just upload.
                 if (!$justSubmit) {
-                    Database::query($sql);	// If work already exists no error is generated
+                    Database::query($sql); // If work already exists no error is generated
                 }
             }
 
@@ -342,7 +342,7 @@ 
 			    $ownerid = getUserOwningThisMailing($ownerid);
 			}
 			if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+			    $recipid = $ownerid; // mailing file recipient = mailing id, not a person
 			}
             api_item_property_update(
                 $_course,
@@ -401,13 +401,13 @@ 
 class Dropbox_Person
 {
 	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
+	public $receivedWork; // an array of Dropbox_Work objects
+	public $sentWork; // an array of Dropbox_SentWork objects
 
 	public $userId = 0;
 	public $isCourseAdmin = false;
 	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
+	public $_orderBy = ''; // private property that determines by which field
 
 	/**
 	 * Constructor for recreating the Dropbox_Person object
@@ -506,7 +506,7 @@ 
 	 */
 	function orderSentWork($sort)
     {
-		switch($sort) {
+		switch ($sort) {
 			case 'lastDate':
 				$this->_orderBy = 'last_upload_date';
 				break;
@@ -539,7 +539,7 @@ 
 	 */
 	function orderReceivedWork($sort)
     {
-		switch($sort) {
+		switch ($sort) {
 			case 'lastDate':
 				$this->_orderBy = 'last_upload_date';
 				break;
@@ -632,7 +632,7 @@ 
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
 		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 			Database::query($sql);
 			removeMoreIfMailing($w->id);
 		}
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -683,7 +683,7 @@ 
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
 		Database::query($sql);
 		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -705,7 +705,7 @@ 
 		$wi = -1;
 		foreach ($this->receivedWork as $w) {
 			$wi++;
-			if ($w->id == $id){
+			if ($w->id == $id) {
 			   $found = true;
 			   break;
 			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)

Braces +12 added lines, -4 removed lines

@@ -303,7 +303,9 @@ 
 		}
 
 		foreach ($recipient_ids as $rec) {
-			if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
+			if (empty($rec)) {
+			    die(get_lang('GeneralError').' (code 210)');
+			}
 			//if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
 				//this check is done when validating submitted data
 			$this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
@@ -593,13 +595,19 @@ 
 		$id = intval($id);
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		return true;
 	}
 

Indentation +421 added lines, -421 removed lines

@@ -77,20 +77,20 @@ 
         }
     }
 
-	/**
-	 * private function creating a new work object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 *
-	 * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
-	 * 			As a consequence this parameter can be removed
-	 */
-	public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
+    /**
+     * private function creating a new work object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     *
+     * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
+     * 			As a consequence this parameter can be removed
+     */
+    public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
     {
         $dropbox_cnf = getDropboxConf();
 
@@ -108,17 +108,17 @@ 
         // Check if object exists already. If it does, the old object is used
         // with updated information (authors, description, upload_date)
         $this->isOldWork = false;
-		$sql = "SELECT id, upload_date FROM ".$dropbox_cnf['tbl_file']."
+        $sql = "SELECT id, upload_date FROM ".$dropbox_cnf['tbl_file']."
 				WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'";
         $result = Database::query($sql);
-		$res = Database::fetch_array($result);
-		if ($res) {
-			$this->isOldWork = true;
-		}
-		// Insert or update the dropbox_file table and set the id property
-		if ($this->isOldWork) {
-			$this->id = $res['id'];
-			$this->upload_date = $res['upload_date'];
+        $res = Database::fetch_array($result);
+        if ($res) {
+            $this->isOldWork = true;
+        }
+        // Insert or update the dropbox_file table and set the id property
+        if ($this->isOldWork) {
+            $this->id = $res['id'];
+            $this->upload_date = $res['upload_date'];
 
             $params = [
                 'filesize' => $this->filesize,
@@ -135,9 +135,9 @@ 
                 ['c_id = ? AND id = ?' => [$course_id, $this->id]]
             );
 
-		} else {
-			$this->upload_date = $this->last_upload_date;
-			$params = [
+        } else {
+            $this->upload_date = $this->last_upload_date;
+            $params = [
                 'c_id' => $course_id,
                 'uploader_id' => $this->uploader_id,
                 'filename' => $this->filename,
@@ -149,14 +149,14 @@ 
                 'last_upload_date' => $this->last_upload_date,
                 'session_id' => api_get_session_id(),
                 'cat_id' => 0
-			];
+            ];
 
-			$this->id = Database::insert($dropbox_cnf['tbl_file'], $params);
-			if ($this->id) {
-				$sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}";
-				Database::query($sql);
-			}
-		}
+            $this->id = Database::insert($dropbox_cnf['tbl_file'], $params);
+            if ($this->id) {
+                $sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}";
+                Database::query($sql);
+            }
+        }
 
         $sql = "SELECT count(file_id) as count
         		FROM ".$dropbox_cnf['tbl_person']."
@@ -170,16 +170,16 @@ 
                     VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")";
             Database::query($sql);
         }
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param int $id
-	 */
-	public function _createExistingWork($id)
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param int $id
+     */
+    public function _createExistingWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -229,52 +229,52 @@ 
             }
             $this->feedback2= $feedback2;
         }
-	}
+    }
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
-
-	/**
-	 * Constructor calls private functions to create a new work or retreive an existing work from DB
-	 * depending on the number of parameters
-	 *
-	 * @param unknown_type $arg1
-	 * @param unknown_type $arg2
-	 * @param unknown_type $arg3
-	 * @param unknown_type $arg4
-	 * @param unknown_type $arg5
-	 * @param unknown_type $arg6
-	 * @param unknown_type $arg7
-	 * @return Dropbox_SentWork
-	 */
-	public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
+    public $recipients;	//array of ['id']['name'] arrays
+
+    /**
+     * Constructor calls private functions to create a new work or retreive an existing work from DB
+     * depending on the number of parameters
+     *
+     * @param unknown_type $arg1
+     * @param unknown_type $arg2
+     * @param unknown_type $arg3
+     * @param unknown_type $arg4
+     * @param unknown_type $arg5
+     * @param unknown_type $arg6
+     * @param unknown_type $arg7
+     * @return Dropbox_SentWork
+     */
+    public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
     {
-		if (func_num_args() > 1) {
-		    $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
-		} else {
-			$this->_createExistingSentWork($arg1);
-		}
-	}
-
-	/**
-	 * private function creating a new SentWork object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 * @param array $recipient_ids
-	 */
-	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
+        if (func_num_args() > 1) {
+            $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
+        } else {
+            $this->_createExistingSentWork($arg1);
+        }
+    }
+
+    /**
+     * private function creating a new SentWork object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     * @param array $recipient_ids
+     */
+    public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {
         $dropbox_cnf = getDropboxConf();
         $_course = api_get_course_info();
 
-		// Call constructor of Dropbox_Work object
+        // Call constructor of Dropbox_Work object
         parent::__construct(
             $uploader_id,
             $title,
@@ -284,31 +284,31 @@ 
             $filesize
         );
 
-		$course_id = api_get_course_int_id();
-
-		// Do sanity checks on recipient_ids array & property fillin
-		// The sanity check for ex-coursemembers is already done in base constructor
-		settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
+        $course_id = api_get_course_int_id();
 
-		$justSubmit = false;
-		if ( is_int($recipient_ids)) {
-			$justSubmit = true;
-			$recipient_ids = array($recipient_ids + $this->id);
-		} elseif ( count($recipient_ids) == 0) {
-			$justSubmit = true;
-			$recipient_ids = array($uploader_id);
-		}
+        // Do sanity checks on recipient_ids array & property fillin
+        // The sanity check for ex-coursemembers is already done in base constructor
+        settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
+
+        $justSubmit = false;
+        if ( is_int($recipient_ids)) {
+            $justSubmit = true;
+            $recipient_ids = array($recipient_ids + $this->id);
+        } elseif ( count($recipient_ids) == 0) {
+            $justSubmit = true;
+            $recipient_ids = array($uploader_id);
+        }
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
-			die(get_lang('GeneralError').' (code 209)');
-		}
+        if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+            die(get_lang('GeneralError').' (code 209)');
+        }
 
-		foreach ($recipient_ids as $rec) {
-			if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
-			//if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
-				//this check is done when validating submitted data
-			$this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
-		}
+        foreach ($recipient_ids as $rec) {
+            if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
+            //if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
+                //this check is done when validating submitted data
+            $this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
+        }
 
         $table_post = $dropbox_cnf['tbl_post'];
         $table_person = $dropbox_cnf['tbl_person'];
@@ -317,13 +317,13 @@ 
         $user  = api_get_user_id();
         $now = api_get_utc_datetime();
 
-		// Insert data in dropbox_post and dropbox_person table for each recipient
-		foreach ($this->recipients as $rec) {
+        // Insert data in dropbox_post and dropbox_person table for each recipient
+        foreach ($this->recipients as $rec) {
             $file_id = (int)$this->id;
             $user_id = (int)$rec['id'];
-			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
+            $sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)";
-	        Database::query($sql);
+            Database::query($sql);
             // If work already exists no error is generated
 
             /**
@@ -340,13 +340,13 @@ 
                 }
             }
 
-			// Update item_property table for each recipient
-			if (($ownerid = $this->uploader_id) > $dropbox_cnf['mailingIdBase']) {
-			    $ownerid = getUserOwningThisMailing($ownerid);
-			}
-			if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
-			}
+            // Update item_property table for each recipient
+            if (($ownerid = $this->uploader_id) > $dropbox_cnf['mailingIdBase']) {
+                $ownerid = getUserOwningThisMailing($ownerid);
+            }
+            if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
+                $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+            }
             api_item_property_update(
                 $_course,
                 TOOL_DROPBOX,
@@ -356,92 +356,92 @@ 
                 null,
                 $recipid
             );
-		}
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param unknown_type $id
-	 */
-	public function _createExistingSentWork($id)
+        }
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param unknown_type $id
+     */
+    public function _createExistingSentWork($id)
     {
         $dropbox_cnf = getDropboxConf();
         $id = intval($id);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Call constructor of Dropbox_Work object
-		parent::__construct($id);
+        // Call constructor of Dropbox_Work object
+        parent::__construct($id);
 
-		// Fill in recipients array
-		$this->recipients = array();
-		$sql = "SELECT dest_user_id, feedback_date, feedback
+        // Fill in recipients array
+        $this->recipients = array();
+        $sql = "SELECT dest_user_id, feedback_date, feedback
 				FROM ".$dropbox_cnf['tbl_post']."
 				WHERE c_id = $course_id AND file_id = ".intval($id)."";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result, 'ASSOC')) {
-
-			// Check for deleted users
-			$dest_user_id = $res['dest_user_id'];
-			$user_info = api_get_user_info($dest_user_id);
-			//$this->category = $res['cat_id'];
-			if (!$user_info) {
-				$this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
-			} else {
-				$this->recipients[] = array(
+        while ($res = Database::fetch_array($result, 'ASSOC')) {
+
+            // Check for deleted users
+            $dest_user_id = $res['dest_user_id'];
+            $user_info = api_get_user_info($dest_user_id);
+            //$this->category = $res['cat_id'];
+            if (!$user_info) {
+                $this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
+            } else {
+                $this->recipients[] = array(
                     'id' => $dest_user_id,
                     'name' => $user_info['complete_name'],
                     'user_id' => $dest_user_id,
-				    'feedback_date' => $res['feedback_date'],
+                    'feedback_date' => $res['feedback_date'],
                     'feedback' => $res['feedback']
                 );
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 class Dropbox_Person
 {
-	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
-
-	public $userId = 0;
-	public $isCourseAdmin = false;
-	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
-
-	/**
-	 * Constructor for recreating the Dropbox_Person object
-	 *
-	 * @param int $userId
-	 * @param bool $isCourseAdmin
-	 * @param bool $isCourseTutor
-	 * @return Dropbox_Person
-	 */
-	public function __construct($userId, $isCourseAdmin, $isCourseTutor)
+    // The receivedWork and the sentWork arrays are sorted.
+    public $receivedWork;	// an array of Dropbox_Work objects
+    public $sentWork;		// an array of Dropbox_SentWork objects
+
+    public $userId = 0;
+    public $isCourseAdmin = false;
+    public $isCourseTutor = false;
+    public $_orderBy = '';	// private property that determines by which field
+
+    /**
+     * Constructor for recreating the Dropbox_Person object
+     *
+     * @param int $userId
+     * @param bool $isCourseAdmin
+     * @param bool $isCourseTutor
+     * @return Dropbox_Person
+     */
+    public function __construct($userId, $isCourseAdmin, $isCourseTutor)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Fill in properties
+        // Fill in properties
         $this->userId = $userId;
         $this->isCourseAdmin = $isCourseAdmin;
         $this->isCourseTutor = $isCourseTutor;
         $this->receivedWork = array();
         $this->sentWork = array();
 
-		// Note: perhaps include an ex coursemember check to delete old files
+        // Note: perhaps include an ex coursemember check to delete old files
 
-		$session_id = api_get_session_id();
-		$condition_session = api_get_session_condition($session_id);
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id);
 
-		$post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
-		$person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
-		$file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
+        $post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
+        $person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
+        $file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
 
         // Find all entries where this person is the recipient
-		$sql = "SELECT DISTINCT r.file_id, r.cat_id
+        $sql = "SELECT DISTINCT r.file_id, r.cat_id
                 FROM $post_tbl r
                 INNER JOIN $person_tbl p
                     ON (r.file_id = p.file_id AND r.c_id = $course_id AND p.c_id = $course_id )
@@ -450,12 +450,12 @@ 
                      r.dest_user_id = ".intval($this->userId)." $condition_session ";
 
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$temp = new Dropbox_Work($res['file_id']);
-			$temp->category = $res['cat_id'];
-			$this->receivedWork[] = $temp;
-		}
-		// Find all entries where this person is the sender/uploader
+        while ($res = Database::fetch_array($result)) {
+            $temp = new Dropbox_Work($res['file_id']);
+            $temp->category = $res['cat_id'];
+            $this->receivedWork[] = $temp;
+        }
+        // Find all entries where this person is the sender/uploader
         $sql = "SELECT DISTINCT f.id
 				FROM $file_tbl f
 				INNER JOIN $person_tbl p
@@ -466,260 +466,260 @@ 
                     $condition_session
                 ";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$this->sentWork[] = new Dropbox_SentWork($res['id']);
-		}
-	}
-
-	/**
-	 * This private method is used by the usort function in  the
-	 * orderSentWork and orderReceivedWork methods.
-	 * It compares 2 work-objects by 1 of the properties of that object, dictated by the
-	 * private property _orderBy
-	 *
-	 * @param unknown_type $a
-	 * @param unknown_type $b
-	 * @return -1, 0 or 1 dependent of the result of the comparison.
-	 */
-	function _cmpWork($a, $b)
+        while ($res = Database::fetch_array($result)) {
+            $this->sentWork[] = new Dropbox_SentWork($res['id']);
+        }
+    }
+
+    /**
+     * This private method is used by the usort function in  the
+     * orderSentWork and orderReceivedWork methods.
+     * It compares 2 work-objects by 1 of the properties of that object, dictated by the
+     * private property _orderBy
+     *
+     * @param unknown_type $a
+     * @param unknown_type $b
+     * @return -1, 0 or 1 dependent of the result of the comparison.
+     */
+    function _cmpWork($a, $b)
     {
-		$sort = $this->_orderBy;
-		$aval = $a->$sort;
-		$bval = $b->$sort;
-		if ($sort == 'recipients') {
-		    // The recipients property is an array so we do the comparison based
-		    // on the first item of the recipients array
-		    $aval = $aval[0]['name'];
-			$bval = $bval[0]['name'];
-		}
-		if ($sort == 'filesize') {    // Filesize is not a string, so we use other comparison technique
-			return $aval < $bval ? -1 : 1;
-		} elseif ($sort == 'title') { // Natural order for sorting titles is more "human-friendly"
-			return api_strnatcmp($aval, $bval);
-		} else {
-		    return api_strcasecmp($aval, $bval);
-		}
-	}
-
-	/**
-	 * A method that sorts the objects in the sentWork array, dependent on the $sort parameter.
-	 * $sort can be lastDate, firstDate, title, size, ...
-	 *
-	 * @param unknown_type $sort
-	 */
-	function orderSentWork($sort)
+        $sort = $this->_orderBy;
+        $aval = $a->$sort;
+        $bval = $b->$sort;
+        if ($sort == 'recipients') {
+            // The recipients property is an array so we do the comparison based
+            // on the first item of the recipients array
+            $aval = $aval[0]['name'];
+            $bval = $bval[0]['name'];
+        }
+        if ($sort == 'filesize') {    // Filesize is not a string, so we use other comparison technique
+            return $aval < $bval ? -1 : 1;
+        } elseif ($sort == 'title') { // Natural order for sorting titles is more "human-friendly"
+            return api_strnatcmp($aval, $bval);
+        } else {
+            return api_strcasecmp($aval, $bval);
+        }
+    }
+
+    /**
+     * A method that sorts the objects in the sentWork array, dependent on the $sort parameter.
+     * $sort can be lastDate, firstDate, title, size, ...
+     *
+     * @param unknown_type $sort
+     */
+    function orderSentWork($sort)
     {
-		switch($sort) {
-			case 'lastDate':
-				$this->_orderBy = 'last_upload_date';
-				break;
-			case 'firstDate':
-				$this->_orderBy = 'upload_date';
-				break;
-			case 'title':
-				$this->_orderBy = 'title';
-				break;
-			case 'size':
-				$this->_orderBy = 'filesize';
-				break;
-			case 'author':
-				$this->_orderBy = 'author';
-				break;
-			case 'recipient':
-				$this->_orderBy = 'recipients';
-				break;
-			default:
-				$this->_orderBy = 'last_upload_date';
-		}
-
-		usort($this->sentWork, array($this, '_cmpWork'));
-	}
-
-	/**
-	 * method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
-	 * $sort can be lastDate, firstDate, title, size, ...
-	 * @param unknown_type $sort
-	 */
-	function orderReceivedWork($sort)
+        switch($sort) {
+            case 'lastDate':
+                $this->_orderBy = 'last_upload_date';
+                break;
+            case 'firstDate':
+                $this->_orderBy = 'upload_date';
+                break;
+            case 'title':
+                $this->_orderBy = 'title';
+                break;
+            case 'size':
+                $this->_orderBy = 'filesize';
+                break;
+            case 'author':
+                $this->_orderBy = 'author';
+                break;
+            case 'recipient':
+                $this->_orderBy = 'recipients';
+                break;
+            default:
+                $this->_orderBy = 'last_upload_date';
+        }
+
+        usort($this->sentWork, array($this, '_cmpWork'));
+    }
+
+    /**
+     * method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
+     * $sort can be lastDate, firstDate, title, size, ...
+     * @param unknown_type $sort
+     */
+    function orderReceivedWork($sort)
     {
-		switch($sort) {
-			case 'lastDate':
-				$this->_orderBy = 'last_upload_date';
-				break;
-			case 'firstDate':
-				$this->_orderBy = 'upload_date';
-				break;
-			case 'title':
-				$this->_orderBy = 'title';
-				break;
-			case 'size':
-				$this->_orderBy = 'filesize';
-				break;
-			case 'author':
-				$this->_orderBy = 'author';
-				break;
-			case 'sender':
-				$this->_orderBy = 'uploaderName';
-				break;
-			default:
-				$this->_orderBy = 'last_upload_date';
-		}
-
-		usort($this->receivedWork, array($this, '_cmpWork'));
-	}
-
-	/**
-	 * Deletes all the received work of this person
-	 */
-	function deleteAllReceivedWork()
+        switch($sort) {
+            case 'lastDate':
+                $this->_orderBy = 'last_upload_date';
+                break;
+            case 'firstDate':
+                $this->_orderBy = 'upload_date';
+                break;
+            case 'title':
+                $this->_orderBy = 'title';
+                break;
+            case 'size':
+                $this->_orderBy = 'filesize';
+                break;
+            case 'author':
+                $this->_orderBy = 'author';
+                break;
+            case 'sender':
+                $this->_orderBy = 'uploaderName';
+                break;
+            default:
+                $this->_orderBy = 'last_upload_date';
+        }
+
+        usort($this->receivedWork, array($this, '_cmpWork'));
+    }
+
+    /**
+     * Deletes all the received work of this person
+     */
+    function deleteAllReceivedWork()
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		// Delete entries in person table concerning received works
-		foreach ($this->receivedWork as $w) {
+        // Delete entries in person table concerning received works
+        foreach ($this->receivedWork as $w) {
             $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
 			        WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-		}
+            Database::query($sql);
+        }
         // Check for unused files
-		removeUnusedFiles();
-	}
+        removeUnusedFiles();
+    }
 
-	/**
-	 * Deletes all the received categories and work of this person
-	 */
-	function deleteReceivedWorkFolder($id)
+    /**
+     * Deletes all the received categories and work of this person
+     */
+    function deleteReceivedWorkFolder($id)
     {
         $dropbox_cnf = getDropboxConf();
         $course_id = api_get_course_int_id();
 
-		$id = intval($id);
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
+        $id = intval($id);
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		return true;
-	}
-
-	/**
-	 * Deletes a received dropbox file of this person with id=$id
-	 *
-	 * @param integer $id
-	 */
-	function deleteReceivedWork($id)
+        if (!Database::query($sql)) return false;
+        return true;
+    }
+
+    /**
+     * Deletes a received dropbox file of this person with id=$id
+     *
+     * @param integer $id
+     */
+    function deleteReceivedWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->receivedWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 216)');
-			}
-		}
-		// Delete entries in person table concerning received works
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->receivedWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 216)');
+            }
+        }
+        // Delete entries in person table concerning received works
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
-		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes all the sent dropbox files of this person
-	 */
-	function deleteAllSentWork()
+        Database::query($sql);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes all the sent dropbox files of this person
+     */
+    function deleteAllSentWork()
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		//delete entries in person table concerning sent works
-		foreach ($this->sentWork as $w) {
+        //delete entries in person table concerning sent works
+        foreach ($this->sentWork as $w) {
             $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                     WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-			removeMoreIfMailing($w->id);
-		}
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes a sent dropbox file of this person with id=$id
-	 *
-	 * @param unknown_type $id
-	 */
-	function deleteSentWork($id)
+            Database::query($sql);
+            removeMoreIfMailing($w->id);
+        }
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes a sent dropbox file of this person with id=$id
+     *
+     * @param unknown_type $id
+     */
+    function deleteSentWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
 
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->sentWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 219)');
-			}
-		}
-		//$file_id = $this->sentWork[$index]->id;
-		// Delete entries in person table concerning sent works
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->sentWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 219)');
+            }
+        }
+        //$file_id = $this->sentWork[$index]->id;
+        // Delete entries in person table concerning sent works
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
-		Database::query($sql);
-		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Updates feedback for received work of this person with id=$id
-	 *
-	 * @param string $id
-	 * @param string $text
-	 */
-	function updateFeedback($id, $text)
+        Database::query($sql);
+        removeMoreIfMailing($id);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Updates feedback for received work of this person with id=$id
+     *
+     * @param string $id
+     * @param string $text
+     */
+    function updateFeedback($id, $text)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $_course = api_get_course_info();
         $dropbox_cnf = getDropboxConf();
 
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		$wi = -1;
-		foreach ($this->receivedWork as $w) {
-			$wi++;
-			if ($w->id == $id){
-			   $found = true;
-			   break;
-			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
-		}
-		if (!$found) {
-			die(get_lang('GeneralError').' (code 221)');
-		}
-
-		$feedback_date = api_get_utc_datetime();
-		$this->receivedWork[$wi]->feedback_date = $feedback_date;
-		$this->receivedWork[$wi]->feedback = $text;
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        $wi = -1;
+        foreach ($this->receivedWork as $w) {
+            $wi++;
+            if ($w->id == $id){
+                $found = true;
+                break;
+            }  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
+        }
+        if (!$found) {
+            die(get_lang('GeneralError').' (code 221)');
+        }
+
+        $feedback_date = api_get_utc_datetime();
+        $this->receivedWork[$wi]->feedback_date = $feedback_date;
+        $this->receivedWork[$wi]->feedback = $text;
 
         $params = [
             'feedback_date' => $feedback_date,
@@ -737,11 +737,11 @@ 
             ]
         );
 
-		// Update item_property table
+        // Update item_property table
 
-		if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $dropbox_cnf['mailingIdBase']) {
-		    $ownerid = getUserOwningThisMailing($ownerid);
-		}
+        if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $dropbox_cnf['mailingIdBase']) {
+            $ownerid = getUserOwningThisMailing($ownerid);
+        }
         api_item_property_update(
             $_course,
             TOOL_DROPBOX,
@@ -752,31 +752,31 @@ 
             $ownerid
         );
 
-	}
+    }
 
-	/**
-	 * Filter the received work
-	 * @param string $type
-	 * @param string $value
-	 */
-	function filter_received_work($type, $value)
+    /**
+     * Filter the received work
+     * @param string $type
+     * @param string $value
+     */
+    function filter_received_work($type, $value)
     {
         $dropbox_cnf = getDropboxConf();
-    	$new_received_work = array();
-		foreach ($this->receivedWork as $work) {
-			switch ($type) {
-				case 'uploader_id':
-					if ($work->uploader_id == $value ||
-						($work->uploader_id > $dropbox_cnf['mailingIdBase'] &&
+        $new_received_work = array();
+        foreach ($this->receivedWork as $work) {
+            switch ($type) {
+                case 'uploader_id':
+                    if ($work->uploader_id == $value ||
+                        ($work->uploader_id > $dropbox_cnf['mailingIdBase'] &&
                         getUserOwningThisMailing($work->uploader_id) == $value)
                     ) {
-						$new_received_work[] = $work;
-					}
-					break;
-				default:
-					$new_received_work[] = $work;
-			}
-		}
-		$this->receivedWork = $new_received_work;
-	}
+                        $new_received_work[] = $work;
+                    }
+                    break;
+                default:
+                    $new_received_work[] = $work;
+            }
+        }
+        $this->receivedWork = $new_received_work;
+    }
 }