chamilo / chamilo-lms

main/exercise/hotspot_updatescore.inc.php

Indentation +7 added lines, -7 removed lines

@@ -20,16 +20,16 @@
 $exerciseId = $objExercise->selectId();
 if ($_GET['answerId'] == "0") { // click is NOT on a hotspot
     $hit = 0;
-	$answerId = $hotspotId;
+    $answerId = $hotspotId;
 
-	// remove from session
-	unset($_SESSION['exerciseResult'][$questionId][$answerId]);
+    // remove from session
+    unset($_SESSION['exerciseResult'][$questionId][$answerId]);
 } else { // user clicked ON a hotspot
-	$hit = 1;
-	$answerId = $hotspotId;
+    $hit = 1;
+    $answerId = $hotspotId;
 
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 
 //round-up the coordinates

main/user/add_users_to_session.php

Indentation +104 added lines, -104 removed lines

@@ -49,29 +49,29 @@ 
     $extra_field_list = UserManager::get_extra_fields();
     $new_field_list = array();
     if (is_array($extra_field_list)) {
-    	foreach ($extra_field_list as $extra_field) {
-    		//if is enabled to filter and is a "<select>" field type
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
+        foreach ($extra_field_list as $extra_field) {
+            //if is enabled to filter and is a "<select>" field type
+            if ($extra_field[8]==1 && $extra_field[2]==4 ) {
                 $new_field_list[] = array(
                     'name' => $extra_field[3],
                     'variable' => $extra_field[1],
                     'data' => $extra_field[9],
                 );
-    		}
-    	}
+            }
+        }
     }
 
     function search_users($needle, $type)
     {
-    	global $id_session;
+        global $id_session;
 
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
         $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
 
-    	$xajax_response = new xajaxResponse();
-    	$return = '';
+        $xajax_response = new xajaxResponse();
+        $return = '';
 
-    	if (!empty($needle) && !empty($type)) {
+        if (!empty($needle) && !empty($type)) {
 
             //normal behaviour
             if ($type == 'any_session' && $needle == 'false')  {
@@ -79,32 +79,32 @@ 
                 $needle = '';
             }
 
-    		// xajax send utf8 datas... datas in db can be non-utf8 datas
-    		$charset = api_get_system_encoding();
-    		$needle = Database::escape_string($needle);
-    		$needle = api_convert_encoding($needle, $charset, 'utf-8');
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = Database::escape_string($needle);
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
 
-    		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
-    		$cond_user_id = '';
+            $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+            $cond_user_id = '';
 
             //Only for single & multiple
             if (in_array($type, array('single','multiple'))) {
-        		if (!empty($id_session)) {
-        		    $id_session = intval($id_session);
-        			// check id_user from session_rel_user table
-        			$sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
+                if (!empty($id_session)) {
+                    $id_session = intval($id_session);
+                    // check id_user from session_rel_user table
+                    $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
         			        WHERE session_id ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
-        			$res = Database::query($sql);
-        			$user_ids = array();
-        			if (Database::num_rows($res) > 0) {
-        				while ($row = Database::fetch_row($res)) {
-        					$user_ids[] = (int)$row[0];
-        				}
-        			}
-        			if (count($user_ids) > 0) {
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
-        			}
-        		}
+                    $res = Database::query($sql);
+                    $user_ids = array();
+                    if (Database::num_rows($res) > 0) {
+                        while ($row = Database::fetch_row($res)) {
+                            $user_ids[] = (int)$row[0];
+                        }
+                    }
+                    if (count($user_ids) > 0) {
+                        $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
+                    }
+                }
             }
 
             switch ($type) {
@@ -136,11 +136,11 @@ 
                                 user.status <> 6 '.$cond_user_id.
                             $order_clause;
                     break;
-    		}
-    		if (api_is_multiple_url_enabled()) {
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-    			$access_url_id = api_get_current_access_url_id();
-    			if ($access_url_id != -1) {
+            }
+            if (api_is_multiple_url_enabled()) {
+                $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                $access_url_id = api_get_current_access_url_id();
+                if ($access_url_id != -1) {
                     switch ($type) {
                         case 'single':
                             $sql = 'SELECT user.user_id, username, lastname, firstname
@@ -178,36 +178,36 @@ 
                                         user.status<>6 '.$cond_user_id.
                             $order_clause;
                             break;
-    				}
-    			}
-    		}
+                    }
+                }
+            }
 
-    		$rs = Database::query($sql);
+            $rs = Database::query($sql);
             $i=0;
-    		if ($type == 'single') {
-    			while ($user = Database::fetch_array($rs)) {
-    	            $i++;
-    	            if ($i<=10) {
-                		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
-    					$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
-    	            } else {
-    	            	$return .= '...<br />';
-    	            }
-    			}
-
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
-    		} else {
-    			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
-    			while ($user = Database :: fetch_array($rs)) {
-    				$person_name = api_get_person_name($user['firstname'], $user['lastname']);
-    	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
-    			}
-    			$return .= '</select>';
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
-    		}
-    	}
+            if ($type == 'single') {
+                while ($user = Database::fetch_array($rs)) {
+                    $i++;
+                    if ($i<=10) {
+                        $person_name = api_get_person_name($user['firstname'], $user['lastname']);
+                        $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
+                    } else {
+                        $return .= '...<br />';
+                    }
+                }
+
+                $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+            } else {
+                $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
+                while ($user = Database :: fetch_array($rs)) {
+                    $person_name = api_get_person_name($user['firstname'], $user['lastname']);
+                    $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
+                }
+                $return .= '</select>';
+                $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+            }
+        }
 
-    	return $xajax_response;
+        return $xajax_response;
     }
 
     $xajax -> processRequests();
@@ -347,8 +347,8 @@ 
 
         if ($use_extra_fields) {
             $final_result = array();
-           	if (count($extra_field_result)>1) {
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
+                if (count($extra_field_result)>1) {
+            for($i=0;$i<count($extra_field_result)-1;$i++) {
                     if (is_array($extra_field_result[$i+1])) {
                         $final_result = array_intersect(
                             $extra_field_result[$i],
@@ -426,7 +426,7 @@ 
                     'un' => $user['username']
                 );
                 unset($users[$uid]);
-    	}
+        }
         }
         unset($users); //clean to free memory
 
@@ -471,13 +471,13 @@ 
     }
 
     if ($add_type === 'multiple') {
-    	$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
-    	$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
+        $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
+        $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
     } else {
-    	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
-    	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
+        $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
+        $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
     }
-    	$link_add_group = '<a href="usergroups.php">'.
+        $link_add_group = '<a href="usergroups.php">'.
             Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
     ?>
     <div class="actions">
@@ -487,30 +487,30 @@ 
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
     <?php
     if ($add_type === 'multiple') {
-    	if (is_array($extra_field_list)) {
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
-    			echo '<h3>'.get_lang('FilterUsers').'</h3>';
-    			foreach ($new_field_list as $new_field) {
-    				echo $new_field['name'];
-    				$varname = 'field_'.$new_field['variable'];
-    				echo '&nbsp;<select name="'.$varname.'">';
-    				echo '<option value="0">--'.get_lang('Select').'--</option>';
-    				foreach	($new_field['data'] as $option) {
-    					$checked='';
-    					if (isset($_POST[$varname])) {
-    						if ($_POST[$varname] == $option[1]) {
-    							$checked = 'selected="true"';
-    						}
-    					}
-    					echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
-    				}
-    				echo '</select>';
-    				echo '&nbsp;&nbsp;';
-    			}
-    			echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
-    			echo '<br /><br />';
-    		}
-    	}
+        if (is_array($extra_field_list)) {
+            if (is_array($new_field_list) && count($new_field_list)>0 ) {
+                echo '<h3>'.get_lang('FilterUsers').'</h3>';
+                foreach ($new_field_list as $new_field) {
+                    echo $new_field['name'];
+                    $varname = 'field_'.$new_field['variable'];
+                    echo '&nbsp;<select name="'.$varname.'">';
+                    echo '<option value="0">--'.get_lang('Select').'--</option>';
+                    foreach	($new_field['data'] as $option) {
+                        $checked='';
+                        if (isset($_POST[$varname])) {
+                            if ($_POST[$varname] == $option[1]) {
+                                $checked = 'selected="true"';
+                            }
+                        }
+                        echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
+                    }
+                    echo '</select>';
+                    echo '&nbsp;&nbsp;';
+                }
+                echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
+                echo '<br /><br />';
+            }
+        }
     }
     ?>
     <input type="hidden" name="form_sent" value="1" />
@@ -533,7 +533,7 @@ 
                 <div id="content_source">
                 <?php
                 if (!($add_type == 'multiple')) {
-                  ?>
+                    ?>
                   <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
                   <div id="ajax_list_users_single"></div>
                   <?php
@@ -542,12 +542,12 @@ 
                 <div id="ajax_list_users_multiple">
                 <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="span5">
                   <?php
-                  foreach ($nosessionUsersList as $uid => $enreg) {
-                  ?>
+                    foreach ($nosessionUsersList as $uid => $enreg) {
+                    ?>
                       <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
                   <?php
-                  }
-                  ?>
+                    }
+                    ?>
                 </select>
                 </div>
                     <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
@@ -555,7 +555,7 @@ 
                 <?php
                 }
                 unset($nosessionUsersList);
-               ?>
+                ?>
             </div>
         </div>
 
@@ -582,13 +582,13 @@ 
             <br />
             <br />
     		<?php
-    		if (isset($_GET['add'])) {
-    			echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
+            if (isset($_GET['add'])) {
+                echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
             } else {
                 //@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed)
-    			echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
+                echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
             }
-    		?>
+            ?>
         </div>
         <div class="span5">
             <div class="multiple_select_header">

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

Indentation +243 added lines, -243 removed lines

@@ -17,13 +17,13 @@ 
  */
 class CourseSelectForm
 {
-	/**
-	 * Display the form
+    /**
+     * Display the form
      * @param array $course
-	 * @param array $hidden_fields Hidden fields to add to the form.
-	 * @param boolean $avoid_serialize the document array will be serialize. This is used in the course_copy.php file
-	 */
-	public static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
+     * @param array $hidden_fields Hidden fields to add to the form.
+     * @param boolean $avoid_serialize the document array will be serialize. This is used in the course_copy.php file
+     */
+    public static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
     {
         global $charset;
         $resource_titles[RESOURCE_GRADEBOOK] = get_lang('Gradebook');
@@ -138,48 +138,48 @@ 
             }
 		</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 '<div class="tool-backups-options">';
-		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;
                         }
@@ -206,30 +206,30 @@ 
                         break;
                     default:
                         echo '<div class="item-backup" onclick="javascript:exp('."'$type'".');">';
-						echo '<em id="img_'.$type.'" class="fa fa-minus-square-o fa-lg" ></em>';
-						echo '<span class="title">'.$resource_titles[$type].'</span></div>';
-						echo '<div class="item-content" 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 '<em id="img_'.$type.'" class="fa fa-minus-square-o fa-lg" ></em>';
+                        echo '<span class="title">'.$resource_titles[$type].'</span></div>';
+                        echo '<div class="item-content" 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 '<div class="well">';
+                        echo '<div class="well">';
 
                         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>';
+                        echo '</div>';
                         echo '<ul class="list-backups-options">';
-						foreach ($resources as $id => $resource) {
+                        foreach ($resources as $id => $resource) {
                             if ($resource) {
                                 echo '<li>';
-								// 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
                                 Resource::setClassType($resource);
                                 echo '<label class="checkbox">';
                                 echo '<input type="checkbox" name="resource['.$type.']['.$id.']"  id="resource['.$type.']['.$id.']" />';
@@ -237,15 +237,15 @@ 
                                 echo '</label>';
                                 echo '</li>';
                             }
-						}
+                        }
                         echo '</ul>';
-						echo '</div>';
-						echo '</div>';
-						echo '<script language="javascript">exp('."'$type'".')</script>';
-						$element_count++;
+                        echo '</div>';
+                        echo '</div>';
+                        echo '<script language="javascript">exp('."'$type'".')</script>';
+                        $element_count++;
                 }
-			}
-		}
+            }
+        }
 
         //Fixes forum order
         if (!empty($forum_categories)) {
@@ -301,66 +301,66 @@ 
             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>';
+        CourseSelectForm::display_hidden_quiz_questions($course);
+        CourseSelectForm::display_hidden_scorm_directories($course);
+        echo '</form>';
         echo '</div>';
-		echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
-	}
+        echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
+    }
 
     /**
      * @param $course
      */
     public 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
@@ -368,30 +368,30 @@ 
     public 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;
 
@@ -401,30 +401,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
@@ -433,8 +433,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,
@@ -458,25 +458,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
@@ -528,63 +528,63 @@ 
                                 }
                             }
                         }
-					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]);
-								}
-							}
-						}
-				}
-			}
-		}
+                                        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;
-	}
+        return $course;
+    }
 
-	/**
-	 * Display the form session export
+    /**
+     * Display the form session export
      * @param array $list_course
-	 * @param array $hidden_fields Hidden fields to add to the form.
+     * @param array $hidden_fields Hidden fields to add to the form.
      * @param boolean $avoid_serialize 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)
-     {
-         ?>
+     */
+        public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
+        {
+            ?>
 		<script>
 			function exp(item) {
 				el = document.getElementById('div_'+item);
@@ -626,68 +626,68 @@ 
 		</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 '<div class="tool-backups-options">';
-		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 '<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 '<div class="item-backup" onclick="javascript:exp('."'$course->code'".');">';
-					echo '<em id="img_'.$course->code.'" class="fa fa-minus-square-o fa-lg"></em>';
-					echo '<span class="title"> '.$course->code.'</span></div>';
-					echo '<div class="item-content" id="div_'.$course->code.'">';
-					echo '<blockquote>';
+                    echo '<em id="img_'.$course->code.'" class="fa fa-minus-square-o fa-lg"></em>';
+                    echo '<span class="title"> '.$course->code.'</span></div>';
+                    echo '<div class="item-content" 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>';
+                    echo '</div>';
 
-					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>';
+                        $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>';
-		echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
-	}
+        echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
+    }
 }

main/admin/skills_import.php

Indentation +128 added lines, -128 removed lines

@@ -70,7 +70,7 @@ 
             $oskill = new Skill();
             $skill_id = $oskill->add($skill);
             $parents[$saved_id] = $skill_id;
-		}
+        }
     }
 }
 
@@ -81,12 +81,12 @@ 
  */
 function parse_csv_data($file)
 {
-	$skills = Import :: csvToArray($file);
-	foreach ($skills as $index => $skill) {
-		$skills[$index] = $skill;
-	}
+    $skills = Import :: csvToArray($file);
+    foreach ($skills as $index => $skill) {
+        $skills[$index] = $skill;
+    }
 
-	return $skills;
+    return $skills;
 }
 
 /**
@@ -94,16 +94,16 @@ 
  */
 function element_start($parser, $data)
 {
-	$data = api_utf8_decode($data);
-	global $skill;
-	global $current_tag;
-	switch ($data) {
-		case 'Skill' :
-			$skill = array ();
-			break;
-		default :
-			$current_tag = $data;
-	}
+    $data = api_utf8_decode($data);
+    global $skill;
+    global $current_tag;
+    switch ($data) {
+        case 'Skill' :
+            $skill = array ();
+            break;
+        default :
+            $current_tag = $data;
+    }
 }
 
 /**
@@ -111,18 +111,18 @@ 
  */
 function element_end($parser, $data)
 {
-	$data = api_utf8_decode($data);
-	global $skill;
-	global $skills;
-	global $current_value;
-	switch ($data) {
-		case 'Skill' :
-			$skills[] = $skill;
-			break;
-		default :
-			$skill[$data] = $current_value;
-			break;
-	}
+    $data = api_utf8_decode($data);
+    global $skill;
+    global $skills;
+    global $current_value;
+    switch ($data) {
+        case 'Skill' :
+            $skills[] = $skill;
+            break;
+        default :
+            $skill[$data] = $current_value;
+            break;
+    }
 }
 
 /**
@@ -130,9 +130,9 @@ 
  */
 function character_data($parser, $data)
 {
-	$data = trim(api_utf8_decode($data));
-	global $current_value;
-	$current_value = $data;
+    $data = trim(api_utf8_decode($data));
+    global $current_value;
+    $current_value = $data;
 }
 
 /**
@@ -142,19 +142,19 @@ 
  */
 function parse_xml_data($file)
 {
-	global $current_tag;
-	global $current_value;
-	global $skill;
-	global $skills;
-	$skills = array();
-	$parser = xml_parser_create('UTF-8');
-	xml_set_element_handler($parser, 'element_start', 'element_end');
-	xml_set_character_data_handler($parser, 'character_data');
-	xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
-	xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
-	xml_parser_free($parser);
+    global $current_tag;
+    global $current_value;
+    global $skill;
+    global $skills;
+    $skills = array();
+    $parser = xml_parser_create('UTF-8');
+    xml_set_element_handler($parser, 'element_start', 'element_end');
+    xml_set_character_data_handler($parser, 'character_data');
+    xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
+    xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
+    xml_parser_free($parser);
 
-	return $skills;
+    return $skills;
 }
 
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -169,73 +169,73 @@ 
 $error_message = '';
 
 if (!empty($_POST['formSent']) && $_FILES['import_file']['size'] !== 0) {
-	$file_type = $_POST['file_type'];
-	Security::clear_token();
-	$tok = Security::get_token();
-	$allowed_file_mimetype = array('csv','xml');
-	$error_kind_file = false;
+    $file_type = $_POST['file_type'];
+    Security::clear_token();
+    $tok = Security::get_token();
+    $allowed_file_mimetype = array('csv','xml');
+    $error_kind_file = false;
     $error_message = '';
 
-	$ext_import_file = substr($_FILES['import_file']['name'], (strrpos($_FILES['import_file']['name'],'.')+1));
+    $ext_import_file = substr($_FILES['import_file']['name'], (strrpos($_FILES['import_file']['name'],'.')+1));
 
-	if (in_array($ext_import_file,$allowed_file_mimetype)) {
-		if (strcmp($file_type, 'csv') === 0 && $ext_import_file == $allowed_file_mimetype[0]) {
-			$skills	= parse_csv_data($_FILES['import_file']['tmp_name']);
-			$errors = validate_data($skills);
-			$error_kind_file = false;
-		} elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {
-			$skills = parse_xml_data($_FILES['import_file']['tmp_name']);
-			$errors = validate_data($skills);
-			$error_kind_file = false;
-		} else {
-			$error_kind_file = true;
-		}
-	} else {
-		$error_kind_file = true;
-	}
+    if (in_array($ext_import_file,$allowed_file_mimetype)) {
+        if (strcmp($file_type, 'csv') === 0 && $ext_import_file == $allowed_file_mimetype[0]) {
+            $skills	= parse_csv_data($_FILES['import_file']['tmp_name']);
+            $errors = validate_data($skills);
+            $error_kind_file = false;
+        } elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {
+            $skills = parse_xml_data($_FILES['import_file']['tmp_name']);
+            $errors = validate_data($skills);
+            $error_kind_file = false;
+        } else {
+            $error_kind_file = true;
+        }
+    } else {
+        $error_kind_file = true;
+    }
 
-	// List skill id with error.
-	$skills_to_insert = $skill_id_error = array();
-	if (is_array($errors)) {
-		foreach ($errors as $my_errors) {
-			$skill_id_error[] = $my_errors['SkillName'];
-		}
-	}
-	if (is_array($skills)) {
-		foreach ($skills as $my_skill) {
-			if (isset($my_skill['name']) && !in_array($my_skill['name'], $skill_id_error)) {
-				$skills_to_insert[] = $my_skill;
-			}
-		}
-	}
+    // List skill id with error.
+    $skills_to_insert = $skill_id_error = array();
+    if (is_array($errors)) {
+        foreach ($errors as $my_errors) {
+            $skill_id_error[] = $my_errors['SkillName'];
+        }
+    }
+    if (is_array($skills)) {
+        foreach ($skills as $my_skill) {
+            if (isset($my_skill['name']) && !in_array($my_skill['name'], $skill_id_error)) {
+                $skills_to_insert[] = $my_skill;
+            }
+        }
+    }
 
-	if (strcmp($file_type, 'csv') === 0) {
-		save_data($skills_to_insert);
-	} elseif (strcmp($file_type, 'xml') === 0) {
-		save_data($skills_to_insert);
-	} else {
-		$error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
-	}
+    if (strcmp($file_type, 'csv') === 0) {
+        save_data($skills_to_insert);
+    } elseif (strcmp($file_type, 'xml') === 0) {
+        save_data($skills_to_insert);
+    } else {
+        $error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
+    }
 
-	if (count($errors) > 0) {
-		$see_message_import = get_lang('FileImportedJustSkillsThatAreNotRegistered');
-	} else {
-		$see_message_import = get_lang('FileImported');
-	}
+    if (count($errors) > 0) {
+        $see_message_import = get_lang('FileImportedJustSkillsThatAreNotRegistered');
+    } else {
+        $see_message_import = get_lang('FileImported');
+    }
 
-	if (count($errors) != 0) {
-		$warning_message = '<ul>';
-		foreach ($errors as $index => $error_skill) {
-			$warning_message .= '<li><b>'.$error_skill['error'].'</b>: ';
-			$warning_message .= '<strong>'.$error_skill['SkillName'].'</strong>&nbsp;('.$error_skill['SkillName'].')';
-			$warning_message .= '</li>';
-		}
-		$warning_message .= '</ul>';
-	}
+    if (count($errors) != 0) {
+        $warning_message = '<ul>';
+        foreach ($errors as $index => $error_skill) {
+            $warning_message .= '<li><b>'.$error_skill['error'].'</b>: ';
+            $warning_message .= '<strong>'.$error_skill['SkillName'].'</strong>&nbsp;('.$error_skill['SkillName'].')';
+            $warning_message .= '</li>';
+        }
+        $warning_message .= '</ul>';
+    }
 
     if ($error_kind_file) {
-		$error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
-	}
+        $error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
+    }
 }
 
 $interbreadcrumb[] = array ("url" => 'skill_list.php', "name" => get_lang('ManageSkills'));
@@ -243,34 +243,34 @@ 
 Display :: display_header($tool_name);
 
 if (!empty($error_message)) {
-	Display::display_error_message($error_message);
+    Display::display_error_message($error_message);
 }
 if (!empty($see_message_import)) {
-	Display::display_normal_message($see_message_import);
+    Display::display_normal_message($see_message_import);
 }
 
 $toolbar = Display::toolbarButton(
-	get_lang('ManageSkills'),
-	api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
-	'list',
-	'success',
-	['title' => get_lang('CreateSkill')]
+    get_lang('ManageSkills'),
+    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    'list',
+    'success',
+    ['title' => get_lang('CreateSkill')]
 );
 $toolbar .= '&nbsp;&nbsp;';
 $toolbar .= Display::toolbarButton(
-	get_lang('SkillsWheel'),
-	api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php',
-	'bullseye',
-	'primary',
-	['title' => get_lang('CreateSkill')]
+    get_lang('SkillsWheel'),
+    api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php',
+    'bullseye',
+    'primary',
+    ['title' => get_lang('CreateSkill')]
 );
 $toolbar .= '&nbsp;&nbsp;';
 $toolbar .= Display::toolbarButton(
-	get_lang('BadgesManagement'),
-	api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php',
-	'shield',
-	'warning',
-	['title' => get_lang('BadgesManagement')]
+    get_lang('BadgesManagement'),
+    api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php',
+    'shield',
+    'warning',
+    ['title' => get_lang('BadgesManagement')]
 );
 $toolbar .= '<br /><br />';
 
@@ -296,16 +296,16 @@ 
 $i = 0;
 $count_fields = count($extra_fields);
 if ($count_fields > 0) {
-	foreach ($extra_fields as $extra) {
-		$list[] = $extra[1];
-		$list_reponse[] = 'xxx';
-		$spaces = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		$result_xml .= $spaces.'&lt;'.$extra[1].'&gt;xxx&lt;/'.$extra[1].'&gt;';
-		if ($i != $count_fields - 1) {
-			$result_xml .= '<br/>';
-		}
-		$i++;
-	}
+    foreach ($extra_fields as $extra) {
+        $list[] = $extra[1];
+        $list_reponse[] = 'xxx';
+        $spaces = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+        $result_xml .= $spaces.'&lt;'.$extra[1].'&gt;xxx&lt;/'.$extra[1].'&gt;';
+        if ($i != $count_fields - 1) {
+            $result_xml .= '<br/>';
+        }
+        $i++;
+    }
 }
 ?>
 <p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>

main/session/add_users_to_session.php

Indentation +38 added lines, -38 removed lines

@@ -38,7 +38,7 @@ 
 $add_type = 'unique';
 
 if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 $page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
@@ -426,8 +426,8 @@ 
 
     if ($use_extra_fields) {
         $final_result = array();
-       	if (count($extra_field_result)>1) {
-	    for($i=0;$i<count($extra_field_result)-1;$i++) {
+            if (count($extra_field_result)>1) {
+        for($i=0;$i<count($extra_field_result)-1;$i++) {
                 if (is_array($extra_field_result[$i+1])) {
                     $final_result  = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]);
                 }
@@ -503,7 +503,7 @@ 
                 'official_code' => $user['official_code']
             ) ;
             unset($users[$uid]);
-	}
+    }
     }
     unset($users); //clean to free memory
 
@@ -547,12 +547,12 @@ 
 }
 
 if ($add_type == 'multiple') {
-	$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.$addProcess.'&add_type=unique">'.
+    $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.$addProcess.'&add_type=unique">'.
         Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
-	$link_add_type_multiple = Display::url(Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'), '');
+    $link_add_type_multiple = Display::url(Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'), '');
 } else {
-	$link_add_type_unique = Display::url(Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'), '');
-	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.$addProcess.'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
+    $link_add_type_unique = Display::url(Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'), '');
+    $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.$addProcess.'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
 }
 $link_add_group = Display::url(
     Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups'),
@@ -580,17 +580,17 @@ 
 <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
 <?php
 if ($add_type=='multiple') {
-	if (is_array($extra_field_list)) {
-		if (is_array($new_field_list) && count($new_field_list)>0 ) {
-			echo '<h3>'.get_lang('FilterUsers').'</h3>';
-			foreach ($new_field_list as $new_field) {
-				echo $new_field['name'];
-				$varname = 'field_'.$new_field['variable'];
+    if (is_array($extra_field_list)) {
+        if (is_array($new_field_list) && count($new_field_list)>0 ) {
+            echo '<h3>'.get_lang('FilterUsers').'</h3>';
+            foreach ($new_field_list as $new_field) {
+                echo $new_field['name'];
+                $varname = 'field_'.$new_field['variable'];
                 $fieldtype = $new_field['type'];
-				echo '&nbsp;<select name="'.$varname.'">';
-				echo '<option value="0">--'.get_lang('Select').'--</option>';
-				foreach	($new_field['data'] as $option) {
-					$checked='';
+                echo '&nbsp;<select name="'.$varname.'">';
+                echo '<option value="0">--'.get_lang('Select').'--</option>';
+                foreach	($new_field['data'] as $option) {
+                    $checked='';
                     if ($fieldtype == ExtraField::FIELD_TYPE_TAG) {
                         if (isset($_POST[$varname])) {
                             if ($_POST[$varname] == $option['tag']) {
@@ -611,11 +611,11 @@ 
                 $extraHidden = $fieldtype == ExtraField::FIELD_TYPE_TAG ? '<input type="hidden" name="field_id" value="'.$option['field_id'].'" />' : '';
                 echo $extraHidden;
                 echo '&nbsp;&nbsp;';
-			}
-			echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
-			echo '<br /><br />';
-		}
-	}
+            }
+            echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
+            echo '<br /><br />';
+        }
+    }
 }
 ?>
 <input type="hidden" name="form_sent" value="1" />
@@ -623,7 +623,7 @@ 
 
 <?php
 if (!empty($errorMsg)) {
-	Display::display_normal_message($errorMsg); //main API
+    Display::display_normal_message($errorMsg); //main API
 }
 ?>
 <div id="multiple-add-session" class="row">
@@ -632,7 +632,7 @@ 
             <label><?php echo get_lang('UserListInPlatform') ?> </label>
             <?php
             if (!($add_type=='multiple')) {
-              ?>
+                ?>
               <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" class="form-control" />
               <div id="ajax_list_users_single" class="select-list-ajax"></div>
               <?php
@@ -641,21 +641,21 @@ 
             <div id="ajax_list_users_multiple">
             <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="form-control">
               <?php
-              foreach ($nosessionUsersList as $uid => $enreg) {
-              ?>
+                foreach ($nosessionUsersList as $uid => $enreg) {
+                ?>
                   <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>>
                       <?php
-                      $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code'];
-                      if ($showOfficialCode) {
-                          $officialCode = !empty($enreg['official_code']) ? $enreg['official_code'].' - ' : '? - ';
-                          $personName = $officialCode.api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')';
-                      }
-                      echo $personName;
-                      ?>
+                        $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code'];
+                        if ($showOfficialCode) {
+                            $officialCode = !empty($enreg['official_code']) ? $enreg['official_code'].' - ' : '? - ';
+                            $personName = $officialCode.api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')';
+                        }
+                        echo $personName;
+                        ?>
                   </option>
               <?php
-              }
-              ?>
+                }
+                ?>
             </select>
             </div>
                 <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
@@ -663,7 +663,7 @@ 
             <?php
             }
             unset($nosessionUsersList);
-           ?>
+            ?>
         </div>
     </div>
 
@@ -707,7 +707,7 @@ 
               <?php
             }
             if (!empty($addProcess)) {
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
             } else {
                 echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
             }

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

Indentation +586 added lines, -586 removed lines

@@ -21,16 +21,16 @@ 
  */
 class CourseRestorer
 {
-	/**
-	 * The course-object
-	 */
+    /**
+     * The course-object
+     */
     public $course;
     public $destination_course_info;
 
-	/**
-	 * What to do with files with same name (FILE_SKIP, FILE_RENAME or
-	 * FILE_OVERWRITE)
-	 */
+    /**
+     * What to do with files with same name (FILE_SKIP, FILE_RENAME or
+     * FILE_OVERWRITE)
+     */
     public $file_option;
     public $set_tools_invisible_by_default;
     public $skip_content;
@@ -42,7 +42,7 @@ 
         'events',
         'forum_category',
         'forums',
-       // 'forum_topics',
+        // 'forum_topics',
         'glossary',
         'quizzes',
         'test_category',
@@ -110,15 +110,15 @@ 
         $this->tool_copy_settings = $array;
     }
 
-	/**
-	 * Restore a course.
+    /**
+     * Restore a course.
      *
-	 * @param string    $destination_course_code code of the Chamilo-course in
-	 * @param int	    $session_id
-	 * @param bool	    $update_course_settings Course settings are going to be restore?
+     * @param string    $destination_course_code code of the Chamilo-course in
+     * @param int	    $session_id
+     * @param bool	    $update_course_settings Course settings are going to be restore?
      * @param bool      $respect_base_content
      * @return false|null
-	 */
+     */
     public function restore(
         $destination_course_code = '',
         $session_id = 0,
@@ -261,17 +261,17 @@ 
         }
     }
 
-	/**
-	 * Restore only harmless course settings:
+    /**
+     * Restore only harmless course settings:
      * course_language, visibility, department_name,department_url,
      * subscribe, unsubscribe ,category_code
-	 *
-	 * @param string $destination_course_code
-	 */
+     *
+     * @param string $destination_course_code
+     */
     public function restore_course_settings($destination_course_code)
     {
-	    $origin_course_info = api_get_course_info($destination_course_code);
-	    $course_info = $this->course->info;
+        $origin_course_info = api_get_course_info($destination_course_code);
+        $course_info = $this->course->info;
         $params['course_language'] = $course_info['language'];
         $params['visibility'] = $course_info['visibility'];
         $params['department_name'] = $course_info['department_name'];
@@ -280,8 +280,8 @@ 
         $params['category_code'] = $course_info['categoryCode'];
         $params['subscribe'] = $course_info['subscribe_allowed'];
         $params['unsubscribe'] = $course_info['unsubscribe'];
-	    CourseManager::update_attributes($origin_course_info['real_id'], $params);
-	}
+        CourseManager::update_attributes($origin_course_info['real_id'], $params);
+    }
 
     /**
      * Restore documents
@@ -925,56 +925,56 @@ 
         unset($_SESSION['new_base_foldername']);
         unset($_SESSION['orig_base_foldername']);
         unset($_SESSION['new_base_path']);
-	}
+    }
 
-	/**
-	 * Restore scorm documents
-	 * TODO @TODO check that the restore function with renaming doesn't break the scorm structure!
+    /**
+     * Restore scorm documents
+     * TODO @TODO check that the restore function with renaming doesn't break the scorm structure!
      * see #7029
-	 */
-	public function restore_scorm_documents()
+     */
+    public function restore_scorm_documents()
     {
-		$perm = api_get_permissions_for_new_directories();
+        $perm = api_get_permissions_for_new_directories();
 
-		if ($this->course->has_resources(RESOURCE_SCORM)) {
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_SCORM)) {
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_SCORM] as $document) {
-				$path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
-				@mkdir(dirname($path.$document->path), $perm, true);
+            foreach ($resources[RESOURCE_SCORM] as $document) {
+                $path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
+                @mkdir(dirname($path.$document->path), $perm, true);
 
-				if (file_exists($path.$document->path)) {
-					switch ($this->file_option) {
-						case FILE_OVERWRITE:
-							rmdirr($path.$document->path);
+                if (file_exists($path.$document->path)) {
+                    switch ($this->file_option) {
+                        case FILE_OVERWRITE:
+                            rmdirr($path.$document->path);
                             copyDirTo(
                                 $this->course->backup_path . '/' . $document->path,
                                 $path . dirname($document->path),
                                 false
                             );
-							break;
-						case FILE_SKIP:
-							break;
+                            break;
+                        case FILE_SKIP:
+                            break;
                         case FILE_RENAME:
-							$i = 1;
-							$ext = explode('.', basename($document->path));
-							if (count($ext) > 1) {
-								$ext = array_pop($ext);
-								$file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
-								$ext = '.'.$ext;
-							} else {
-								$ext = '';
-								$file_name_no_ext = $document->path;
-							}
-
-							$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-							$file_exists = file_exists($path.$new_file_name);
-
-							while ($file_exists) {
-								$i ++;
-								$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-								$file_exists = file_exists($path.$new_file_name);
-							}
+                            $i = 1;
+                            $ext = explode('.', basename($document->path));
+                            if (count($ext) > 1) {
+                                $ext = array_pop($ext);
+                                $file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
+                                $ext = '.'.$ext;
+                            } else {
+                                $ext = '';
+                                $file_name_no_ext = $document->path;
+                            }
+
+                            $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                            $file_exists = file_exists($path.$new_file_name);
+
+                            while ($file_exists) {
+                                $i ++;
+                                $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                                $file_exists = file_exists($path.$new_file_name);
+                            }
 
                             rename(
                                 $this->course->backup_path . '/' . $document->path,
@@ -990,30 +990,30 @@ 
                                 $this->course->backup_path . '/' . $document->path
                             );
 
-							break;
-					} // end switch
-				} else {
+                            break;
+                    } // end switch
+                } else {
                     // end if file exists
                     copyDirTo(
                         $this->course->backup_path . '/' . $document->path,
                         $path . dirname($document->path),
                         false
                     );
-				}
-			} // end for each
-		}
-	}
-
-	/**
-	 * Restore forums
-	 */
-	public function restore_forums($sessionId = 0)
+                }
+            } // end for each
+        }
+    }
+
+    /**
+     * Restore forums
+     */
+    public function restore_forums($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_FORUM)) {
+        if ($this->course->has_resources(RESOURCE_FORUM)) {
             $sessionId = intval($sessionId);
-			$table_forum = Database::get_course_table(TABLE_FORUM);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_FORUM] as $id => $forum) {
+            $table_forum = Database::get_course_table(TABLE_FORUM);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_FORUM] as $id => $forum) {
                 $params = (array)$forum->obj;
                 $cat_id = '';
                 if (isset($this->course->resources[RESOURCE_FORUMCATEGORY]) &&
@@ -1060,33 +1060,33 @@ 
                     Database::query($sql);
                 }
 
-				$this->course->resources[RESOURCE_FORUM][$id]->destination_id = $new_id;
-
-				$forum_topics = 0;
-				if (is_array($this->course->resources[RESOURCE_FORUMTOPIC])) {
-					foreach ($this->course->resources[RESOURCE_FORUMTOPIC] as $topic_id => $topic) {
-						if ($topic->obj->forum_id == $id) {
-							$this->restore_topic($topic_id, $new_id, $sessionId);
-							$forum_topics ++;
-						}
-					}
-				}
-				if ($forum_topics > 0) {
-					$sql = "UPDATE ".$table_forum." SET forum_threads = ".$forum_topics."
+                $this->course->resources[RESOURCE_FORUM][$id]->destination_id = $new_id;
+
+                $forum_topics = 0;
+                if (is_array($this->course->resources[RESOURCE_FORUMTOPIC])) {
+                    foreach ($this->course->resources[RESOURCE_FORUMTOPIC] as $topic_id => $topic) {
+                        if ($topic->obj->forum_id == $id) {
+                            $this->restore_topic($topic_id, $new_id, $sessionId);
+                            $forum_topics ++;
+                        }
+                    }
+                }
+                if ($forum_topics > 0) {
+                    $sql = "UPDATE ".$table_forum." SET forum_threads = ".$forum_topics."
                             WHERE c_id = {$this->destination_course_id} AND forum_id = ".(int)$new_id;
-					Database::query($sql);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Restore forum-categories
-	 */
+                    Database::query($sql);
+                }
+            }
+        }
+    }
+
+    /**
+     * Restore forum-categories
+     */
     public function restore_forum_category($my_id = null, $sessionId = 0)
     {
-		$forum_cat_table = Database :: get_course_table(TABLE_FORUM_CATEGORY);
-		$resources = $this->course->resources;
+        $forum_cat_table = Database :: get_course_table(TABLE_FORUM_CATEGORY);
+        $resources = $this->course->resources;
         if (!empty($resources[RESOURCE_FORUMCATEGORY])) {
             foreach ($resources[RESOURCE_FORUMCATEGORY] as $id => $forum_cat) {
                 if (!empty($my_id)) {
@@ -1123,16 +1123,16 @@ 
                 }
             }
         }
-	}
+    }
 
-	/**
-	 * Restore a forum-topic
-	 * @param false|string $forum_id
-	 */
+    /**
+     * Restore a forum-topic
+     * @param false|string $forum_id
+     */
     public function restore_topic($thread_id, $forum_id, $sessionId = 0)
     {
-		$table = Database :: get_course_table(TABLE_FORUM_THREAD);
-		$topic = $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id];
+        $table = Database :: get_course_table(TABLE_FORUM_THREAD);
+        $topic = $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id];
 
         $params = (array)$topic->obj;
         $params = self::DBUTF8_array($params);
@@ -1169,27 +1169,27 @@ 
             $sessionId
         );
 
-		$this->course->resources[RESOURCE_FORUMTOPIC][$thread_id]->destination_id = $new_id;
-		$topic_replies = -1;
-
-		foreach ($this->course->resources[RESOURCE_FORUMPOST] as $post_id => $post) {
-			if ($post->obj->thread_id == $thread_id) {
-				$topic_replies++;
-				$this->restore_post($post_id, $new_id, $forum_id, $sessionId);
-			}
-		}
-		return $new_id;
-	}
-
-	/**
-	 * Restore a forum-post
-	 * @TODO Restore tree-structure of posts. For example: attachments to posts.
-	 * @param false|string $topic_id
-	 */
+        $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id]->destination_id = $new_id;
+        $topic_replies = -1;
+
+        foreach ($this->course->resources[RESOURCE_FORUMPOST] as $post_id => $post) {
+            if ($post->obj->thread_id == $thread_id) {
+                $topic_replies++;
+                $this->restore_post($post_id, $new_id, $forum_id, $sessionId);
+            }
+        }
+        return $new_id;
+    }
+
+    /**
+     * Restore a forum-post
+     * @TODO Restore tree-structure of posts. For example: attachments to posts.
+     * @param false|string $topic_id
+     */
     public function restore_post($id, $topic_id, $forum_id, $sessionId = 0)
     {
-		$table_post = Database :: get_course_table(TABLE_FORUM_POST);
-		$post = $this->course->resources[RESOURCE_FORUMPOST][$id];
+        $table_post = Database :: get_course_table(TABLE_FORUM_POST);
+        $post = $this->course->resources[RESOURCE_FORUMPOST][$id];
         $params = (array) $post->obj;
         $params['c_id'] = $this->destination_course_id;
         $params['forum_id'] = $forum_id;
@@ -1224,37 +1224,37 @@ 
             null,
             $sessionId
         );
-		$this->course->resources[RESOURCE_FORUMPOST][$id]->destination_id = $new_id;
+        $this->course->resources[RESOURCE_FORUMPOST][$id]->destination_id = $new_id;
 
-		return $new_id;
-	}
+        return $new_id;
+    }
 
-	/**
-	 * Restore links
-	 */
+    /**
+     * Restore links
+     */
     public function restore_links($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_LINK)) {
-			$link_table = Database :: get_course_table(TABLE_LINK);
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_LINK)) {
+            $link_table = Database :: get_course_table(TABLE_LINK);
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_LINK] as $id => $link) {
+            foreach ($resources[RESOURCE_LINK] as $id => $link) {
                 $cat_id = $this->restore_link_category(
                     $link->category_id,
                     $session_id
                 );
-				$sql = "SELECT MAX(display_order)
+                $sql = "SELECT MAX(display_order)
 				        FROM $link_table
 				        WHERE
 				            c_id = ".$this->destination_course_id." AND
 				            category_id='" . intval($cat_id). "'";
-				$result = Database::query($sql);
-    			list($max_order) = Database::fetch_array($result);
+                $result = Database::query($sql);
+                list($max_order) = Database::fetch_array($result);
 
                 $params = [];
-    			if (!empty($session_id)) {
+                if (!empty($session_id)) {
                     $params['session_id'] = $session_id;
-    			}
+                }
 
                 $params['c_id'] = $this->destination_course_id;
                 $params['url'] = self::DBUTF8($link->url);
@@ -1283,9 +1283,9 @@ 
                     }
                     $this->course->resources[RESOURCE_LINK][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Restore a link-category
@@ -1329,21 +1329,21 @@ 
         return $this->course->resources[RESOURCE_LINKCATEGORY][$id]->destination_id;
     }
 
-	/**
-	 * Restore tool intro
-	 */
+    /**
+     * Restore tool intro
+     */
     public function restore_tool_intro($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_TOOL_INTRO)) {
+        if ($this->course->has_resources(RESOURCE_TOOL_INTRO)) {
             $sessionId = intval($sessionId);
-			$tool_intro_table = Database :: get_course_table(TABLE_TOOL_INTRO);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_TOOL_INTRO] as $id => $tool_intro) {
-				$sql = "DELETE FROM ".$tool_intro_table."
+            $tool_intro_table = Database :: get_course_table(TABLE_TOOL_INTRO);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_TOOL_INTRO] as $id => $tool_intro) {
+                $sql = "DELETE FROM ".$tool_intro_table."
 				        WHERE
 				            c_id = ".$this->destination_course_id." AND
 				            id='".self::DBUTF8escapestring($tool_intro->id)."'";
-				Database::query($sql);
+                Database::query($sql);
 
                 $tool_intro->intro_text = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $tool_intro->intro_text,
@@ -1373,21 +1373,21 @@ 
 
                     $this->course->resources[RESOURCE_TOOL_INTRO][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore events
-	 */
+    /**
+     * Restore events
+     */
     public function restore_events($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_EVENT)) {
+        if ($this->course->has_resources(RESOURCE_EVENT)) {
             $sessionId = intval($sessionId);
-			$table = Database :: get_course_table(TABLE_AGENDA);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_EVENT] as $id => $event) {
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            $table = Database :: get_course_table(TABLE_AGENDA);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_EVENT] as $id => $event) {
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $event->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $event->content,
                     $this->course->code,
@@ -1405,7 +1405,7 @@ 
                     'end_date' => $event->end_date,
                     'session_id' => $sessionId,
                 ];
-				$new_event_id = Database::insert($table, $params);
+                $new_event_id = Database::insert($table, $params);
 
                 if ($new_event_id) {
                     $sql = "UPDATE $table SET id = iid WHERE iid = $new_event_id";
@@ -1418,30 +1418,30 @@ 
                     $this->course->resources[RESOURCE_EVENT][$id]->destination_id = $new_event_id;
                 }
 
-				// Copy event attachment
+                // Copy event attachment
 
-				$origin_path = $this->course->backup_path.'/upload/calendar/';
-				$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/calendar/';
+                $origin_path = $this->course->backup_path.'/upload/calendar/';
+                $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/calendar/';
 
-				if (!empty($this->course->orig)) {
+                if (!empty($this->course->orig)) {
 
-					$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
-					$sql = 'SELECT path, comment, size, filename
+                    $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                    $sql = 'SELECT path, comment, size, filename
 					        FROM '.$table_attachment.'
 					        WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id;
-					$attachment_event = Database::query($sql);
-					$attachment_event = Database::fetch_object($attachment_event);
+                    $attachment_event = Database::query($sql);
+                    $attachment_event = Database::fetch_object($attachment_event);
 
-					if (file_exists($origin_path.$attachment_event->path) &&
+                    if (file_exists($origin_path.$attachment_event->path) &&
                         !is_dir($origin_path.$attachment_event->path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$attachment_event->path, $destination_path.$new_filename);
-						//$copy_result = true;
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$attachment_event->path, $destination_path.$new_filename);
+                        //$copy_result = true;
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
 
-							$params = [
+                            $params = [
                                 'c_id' => $this->destination_course_id,
                                 'path' => self::DBUTF8($new_filename),
                                 'comment' => self::DBUTF8($attachment_event->comment),
@@ -1455,17 +1455,17 @@ 
                                 Database::query($sql);
                             }
                         }
-					}
-				} else {
-					// get the info of the file
-					if (!empty($event->attachment_path) &&
+                    }
+                } else {
+                    // get the info of the file
+                    if (!empty($event->attachment_path) &&
                         is_file($origin_path.$event->attachment_path) &&
                         is_readable($origin_path.$event->attachment_path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$event->attachment_path, $destination_path.$new_filename);
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$event->attachment_path, $destination_path.$new_filename);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1481,29 +1481,29 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $id";
                                 Database::query($sql);
                             }
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Restore course-description
-	 */
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Restore course-description
+     */
     public function restore_course_descriptions($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_COURSEDESCRIPTION)) {
-			$table = Database :: get_course_table(TABLE_COURSE_DESCRIPTION);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_COURSEDESCRIPTION] as $id => $cd) {
+        if ($this->course->has_resources(RESOURCE_COURSEDESCRIPTION)) {
+            $table = Database :: get_course_table(TABLE_COURSE_DESCRIPTION);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_COURSEDESCRIPTION] as $id => $cd) {
                 $courseDescription = (array) $cd;
 
                 $content = isset($courseDescription['content']) ? $courseDescription['content'] : '';
                 $descriptionType = isset($courseDescription['description_type']) ? $courseDescription['description_type'] : '';
                 $title = isset($courseDescription['title']) ? $courseDescription['title'] : '';
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $description_content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $content,
                     $this->course->code,
@@ -1532,22 +1532,22 @@ 
                     }
                     $this->course->resources[RESOURCE_COURSEDESCRIPTION][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore announcements
-	 */
+    /**
+     * Restore announcements
+     */
     public function restore_announcements($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_ANNOUNCEMENT)) {
+        if ($this->course->has_resources(RESOURCE_ANNOUNCEMENT)) {
             $sessionId = intval($sessionId);
-			$table = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_ANNOUNCEMENT] as $id => $announcement) {
+            $table = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_ANNOUNCEMENT] as $id => $announcement) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $announcement->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $announcement->content,
                     $this->course->code,
@@ -1566,7 +1566,7 @@ 
                     'session_id' => $sessionId,
                 ];
 
-				$new_announcement_id = Database::insert($table, $params);
+                $new_announcement_id = Database::insert($table, $params);
 
                 if ($new_announcement_id) {
                     $sql = "UPDATE $table SET id = iid WHERE iid = $new_announcement_id";
@@ -1578,32 +1578,32 @@ 
                     $this->course->resources[RESOURCE_ANNOUNCEMENT][$id]->destination_id = $new_announcement_id;
                 }
 
-				$origin_path = $this->course->backup_path.'/upload/announcements/';
-				$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/announcements/';
+                $origin_path = $this->course->backup_path.'/upload/announcements/';
+                $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/announcements/';
 
-				// Copy announcement attachment file
-				if (!empty($this->course->orig)) {
+                // Copy announcement attachment file
+                if (!empty($this->course->orig)) {
 
-					$table_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
-					$sql = 'SELECT path, comment, size, filename
+                    $table_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                    $sql = 'SELECT path, comment, size, filename
 					        FROM '.$table_attachment.'
 					        WHERE
 					            c_id = '.$this->destination_course_id.' AND
 					            announcement_id = '.$id;
-					$attachment_event = Database::query($sql);
-					$attachment_event = Database::fetch_object($attachment_event);
+                    $attachment_event = Database::query($sql);
+                    $attachment_event = Database::fetch_object($attachment_event);
 
-					if (file_exists($origin_path.$attachment_event->path) &&
+                    if (file_exists($origin_path.$attachment_event->path) &&
                         !is_dir($origin_path.$attachment_event->path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
                         $copy_result = copy(
                             $origin_path.$attachment_event->path,
                             $destination_path.$new_filename
                         );
 
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1620,19 +1620,19 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $attachmentId";
                                 Database::query($sql);
                             }
-						}
-					}
-				} else {
-					// get the info of the file
-					if (!empty($announcement->attachment_path) &&
+                        }
+                    }
+                } else {
+                    // get the info of the file
+                    if (!empty($announcement->attachment_path) &&
                         is_file($origin_path.$announcement->attachment_path) &&
                         is_readable($origin_path.$announcement->attachment_path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$announcement->attachment_path, $destination_path.$new_filename);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$announcement->attachment_path, $destination_path.$new_filename);
 
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1649,12 +1649,12 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $attachmentId";
                                 Database::query($sql);
                             }
-						}
-					}
-				}
-			}
-		}
-	}
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Quiz
@@ -1665,13 +1665,13 @@ 
         $session_id = 0,
         $respect_base_content = false
     ) {
-		if ($this->course->has_resources(RESOURCE_QUIZ)) {
-			$table_qui = Database :: get_course_table(TABLE_QUIZ_TEST);
-			$table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
-			$table_doc = Database :: get_course_table(TABLE_DOCUMENT);
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_QUIZ)) {
+            $table_qui = Database :: get_course_table(TABLE_QUIZ_TEST);
+            $table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
+            $table_doc = Database :: get_course_table(TABLE_DOCUMENT);
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_QUIZ] as $id => $quiz) {
+            foreach ($resources[RESOURCE_QUIZ] as $id => $quiz) {
 
                 if (isset($quiz->obj)) {
                     //For new imports
@@ -1681,7 +1681,7 @@ 
                     $quiz->obj = $quiz;
                 }
 
-				$doc = '';
+                $doc = '';
                 if (!empty($quiz->sound)) {
                     if (isset($this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]) &&
                         $this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]->is_restored()) {
@@ -1689,14 +1689,14 @@ 
                                 WHERE
                                     c_id = " . $this->destination_course_id . "  AND
                                     id = " . $resources[RESOURCE_DOCUMENT][$quiz->sound]->destination_id;
-						$doc = Database::query($sql);
-						$doc = Database::fetch_object($doc);
-						$doc = str_replace('/audio/', '', $doc->path);
-					}
-				}
-
-				if ($id != -1) {
-					// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                        $doc = Database::query($sql);
+                        $doc = Database::fetch_object($doc);
+                        $doc = str_replace('/audio/', '', $doc->path);
+                    }
+                }
+
+                if ($id != -1) {
+                    // check resources inside html from ckeditor tool and copy correct urls into recipient course
                     $quiz->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $quiz->description,
                         $this->course->code,
@@ -1708,13 +1708,13 @@ 
                     $quiz->start_time = $quiz->start_time == '0000-00-00 00:00:00' ? null : $quiz->start_time;
                     $quiz->end_time = $quiz->end_time == '0000-00-00 00:00:00' ? null : $quiz->end_time;
 
-					global $_custom;
-					if (isset($_custom['exercises_clean_dates_when_restoring']) &&
+                    global $_custom;
+                    if (isset($_custom['exercises_clean_dates_when_restoring']) &&
                         $_custom['exercises_clean_dates_when_restoring']
                     ) {
-						$quiz->start_time = null;
-						$quiz->end_time   = null;
-					}
+                        $quiz->start_time = null;
+                        $quiz->end_time   = null;
+                    }
 
                     $params = array(
                         'c_id' => $this->destination_course_id,
@@ -1748,10 +1748,10 @@ 
                         }
                         $params['session_id'] = $my_session_id;
                     } else {
-        				if (!empty($session_id)) {
-        					$session_id = intval($session_id);
+                        if (!empty($session_id)) {
+                            $session_id = intval($session_id);
                             $params['session_id'] = $session_id;
-    				    }
+                        }
                     }
                     $new_id = Database::insert($table_qui, $params);
 
@@ -1760,15 +1760,15 @@ 
                         Database::query($sql);
                     }
 
-				} else {
-					// $id = -1 identifies the fictionary test for collecting
-					// orphan questions. We do not store it in the database.
-					$new_id = -1;
-				}
+                } else {
+                    // $id = -1 identifies the fictionary test for collecting
+                    // orphan questions. We do not store it in the database.
+                    $new_id = -1;
+                }
 
-				$this->course->resources[RESOURCE_QUIZ][$id]->destination_id = $new_id;
+                $this->course->resources[RESOURCE_QUIZ][$id]->destination_id = $new_id;
 
-				$order = 0;
+                $order = 0;
                 if (!empty($quiz->question_ids)) {
                     foreach ($quiz->question_ids as $index => $question_id) {
                         $qid = $this->restore_quiz_question($question_id);
@@ -1781,30 +1781,30 @@ 
                         Database::query($sql);
                     }
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore quiz-questions
+    /**
+     * Restore quiz-questions
      * @params int question id
-	 */
+     */
     public function restore_quiz_question($id)
     {
-		$resources = $this->course->resources;
+        $resources = $this->course->resources;
         $question = isset($resources[RESOURCE_QUIZQUESTION][$id]) ? $resources[RESOURCE_QUIZQUESTION][$id] : null;
 
-		$new_id = 0;
+        $new_id = 0;
 
-		if (is_object($question)) {
-			if ($question->is_restored()) {
-				return $question->destination_id;
-			}
-			$table_que = Database::get_course_table(TABLE_QUIZ_QUESTION);
-			$table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        if (is_object($question)) {
+            if ($question->is_restored()) {
+                return $question->destination_id;
+            }
+            $table_que = Database::get_course_table(TABLE_QUIZ_QUESTION);
+            $table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
             $table_options = Database::get_course_table(TABLE_QUIZ_QUESTION_OPTION);
 
-			// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            // check resources inside html from ckeditor tool and copy correct urls into recipient course
             $question->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                 $question->description,
                 $this->course->code,
@@ -1825,7 +1825,7 @@ 
                 'extra' => self::DBUTF8($question->extra),
             ];
 
-			$new_id = Database::insert($table_que, $params);
+            $new_id = Database::insert($table_que, $params);
 
             if ($new_id) {
 
@@ -1866,7 +1866,7 @@ 
 
                 foreach ($temp as $index => $answer) {
                     //id = '".$index."',
-					$params = [
+                    $params = [
                         'c_id' => $this->destination_course_id,
                         'question_id' => $new_id,
                         'answer' => self::DBUTF8($answer['answer']),
@@ -1885,12 +1885,12 @@ 
                         $sql = "UPDATE $table_ans SET id = iid, id_auto = iid WHERE iid = $answerId";
                         Database::query($sql);
                     }
-				}
-			} else {
+                }
+            } else {
                 $correct_answers = array();
-				foreach ($question->answers as $index => $answer) {
+                foreach ($question->answers as $index => $answer) {
 
-					// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                    // check resources inside html from ckeditor tool and copy correct urls into recipient course
                     $answer['answer'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $answer['answer'],
                         $this->course->code,
@@ -1929,8 +1929,8 @@ 
                     }
 
                     $correct_answers[$answerId] = $answer['correct'];
-				}
-			}
+                }
+            }
 
             //Current course id
             $course_id = api_get_course_int_id();
@@ -2027,12 +2027,12 @@ 
                     }
                 }
             }
-			$this->course->resources[RESOURCE_QUIZQUESTION][$id]->destination_id = $new_id;
-		}
-		return $new_id;
-	}
+            $this->course->resources[RESOURCE_QUIZQUESTION][$id]->destination_id = $new_id;
+        }
+        return $new_id;
+    }
 
-	/**
+    /**
      * @todo : add session id when used for session
      */
     public function restore_test_category($session_id, $respect_base_content, $destination_course_code)
@@ -2112,21 +2112,21 @@ 
         $sessionId = intval($sessionId);
 
         if ($this->course->has_resources(RESOURCE_SURVEY)) {
-			$table_sur = Database :: get_course_table(TABLE_SURVEY);
-			$table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-			$table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_SURVEY] as $id => $survey) {
+            $table_sur = Database :: get_course_table(TABLE_SURVEY);
+            $table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+            $table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_SURVEY] as $id => $survey) {
 
-				$sql = 'SELECT survey_id FROM '.$table_sur.'
+                $sql = 'SELECT survey_id FROM '.$table_sur.'
                         WHERE
                             c_id = '.$this->destination_course_id.' AND
                             code = "'.self::DBUTF8escapestring($survey->code).'" AND
                             lang = "'.self::DBUTF8escapestring($survey->lang).'" ';
 
-				$result_check = Database::query($sql);
+                $result_check = Database::query($sql);
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $survey->title = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $survey->title,
                     $this->course->code,
@@ -2180,20 +2180,20 @@ 
                     'session_id' => $sessionId,
                 ];
 
-				//An existing survey exists with the same code and the same language
-				if (Database::num_rows($result_check) == 1) {
-					switch ($this->file_option) {
-						case FILE_SKIP:
-							//Do nothing
-							break;
-						case FILE_RENAME:
-							$survey_code = $survey->code.'_';
-							$i=1;
-							$temp_survey_code = $survey_code.$i;
-							while (!$this->is_survey_code_available($temp_survey_code)) {
-								$temp_survey_code = $survey_code.++$i;
-							}
-							$survey_code = $temp_survey_code;
+                //An existing survey exists with the same code and the same language
+                if (Database::num_rows($result_check) == 1) {
+                    switch ($this->file_option) {
+                        case FILE_SKIP:
+                            //Do nothing
+                            break;
+                        case FILE_RENAME:
+                            $survey_code = $survey->code.'_';
+                            $i=1;
+                            $temp_survey_code = $survey_code.$i;
+                            while (!$this->is_survey_code_available($temp_survey_code)) {
+                                $temp_survey_code = $survey_code.++$i;
+                            }
+                            $survey_code = $temp_survey_code;
 
                             $params['code'] = $survey_code;
                             $new_id = Database::insert($table_sur, $params);
@@ -2212,25 +2212,25 @@ 
                                     Database::query($sql);
                                 }
                             }
-							break;
-						case FILE_OVERWRITE:
-							// Delete the existing survey with the same code and language and import the one of the source course
-							// getting the information of the survey (used for when the survey is shared)
+                            break;
+                        case FILE_OVERWRITE:
+                            // Delete the existing survey with the same code and language and import the one of the source course
+                            // getting the information of the survey (used for when the survey is shared)
 
-							$sql = "SELECT * FROM $table_sur
+                            $sql = "SELECT * FROM $table_sur
 							        WHERE
 							            c_id = ".$this->destination_course_id." AND
 							            survey_id='".self::DBUTF8escapestring(Database::result($result_check,0,0))."'";
-							$result = Database::query($sql);
-							$survey_data = Database::fetch_array($result,'ASSOC');
+                            $result = Database::query($sql);
+                            $survey_data = Database::fetch_array($result,'ASSOC');
 
-							// if the survey is shared => also delete the shared content
-							if (isset($survey_data['survey_share']) && is_numeric($survey_data['survey_share'])) {
+                            // if the survey is shared => also delete the shared content
+                            if (isset($survey_data['survey_share']) && is_numeric($survey_data['survey_share'])) {
                                 SurveyManager::delete_survey($survey_data['survey_share'], true,$this->destination_course_id);
-							}
-							SurveyManager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
+                            }
+                            SurveyManager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
 
-							// Insert the new source survey
+                            // Insert the new source survey
                             $new_id = Database::insert($table_sur, $params);
 
                             if ($new_id) {
@@ -2251,11 +2251,11 @@ 
                                     Database::query($sql);
                                 }
                             }
-							break;
-						default:
-							break;
-					}
-				} else {
+                            break;
+                        default:
+                            break;
+                    }
+                } else {
                     // No existing survey with the same language and the same code, we just copy the survey
                     $new_id = Database::insert($table_sur, $params);
 
@@ -2277,48 +2277,48 @@ 
                             Database::query($sql);
                         }
                     }
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check availability of a survey code
-	 * @param string $survey_code
-	 */
+                }
+            }
+        }
+    }
+
+    /**
+     * Check availability of a survey code
+     * @param string $survey_code
+     */
     public function is_survey_code_available($survey_code)
     {
-		$table_sur = Database :: get_course_table(TABLE_SURVEY);
-		$sql = "SELECT * FROM $table_sur
+        $table_sur = Database :: get_course_table(TABLE_SURVEY);
+        $sql = "SELECT * FROM $table_sur
 		        WHERE
 		            c_id = ".$this->destination_course_id." AND
 		            code='".self::DBUTF8escapestring($survey_code)."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
             return false;
         } else {
             return true;
         }
-	}
+    }
 
-	/**
-	 * Restore survey-questions
-	 * @param string $survey_id
-	 */
+    /**
+     * Restore survey-questions
+     * @param string $survey_id
+     */
     public function restore_survey_question($id, $survey_id)
     {
-		$resources = $this->course->resources;
-		$question = $resources[RESOURCE_SURVEYQUESTION][$id];
+        $resources = $this->course->resources;
+        $question = $resources[RESOURCE_SURVEYQUESTION][$id];
         $new_id = 0;
 
-		if (is_object($question)) {
-			if ($question->is_restored()) {
-				return $question->destination_id;
-			}
-			$table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-			$table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+        if (is_object($question)) {
+            if ($question->is_restored()) {
+                return $question->destination_id;
+            }
+            $table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+            $table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 
-			// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            // check resources inside html from ckeditor tool and copy correct urls into recipient course
             $question->survey_question = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                 $question->survey_question,
                 $this->course->code,
@@ -2372,10 +2372,10 @@ 
                 }
                 $this->course->resources[RESOURCE_SURVEYQUESTION][$id]->destination_id = $new_id;
             }
-		}
+        }
 
-		return $new_id;
-	}
+        return $new_id;
+    }
 
     /**
      * Restoring learning paths
@@ -2386,19 +2386,19 @@ 
     {
         $session_id = intval($session_id);
 
-		if ($this->course->has_resources(RESOURCE_LEARNPATH)) {
+        if ($this->course->has_resources(RESOURCE_LEARNPATH)) {
             $table_main = Database::get_course_table(TABLE_LP_MAIN);
             $table_item = Database::get_course_table(TABLE_LP_ITEM);
             $table_tool = Database::get_course_table(TABLE_TOOL_LIST);
 
-			$resources = $this->course->resources;
+            $resources = $this->course->resources;
 
-			$origin_path = $this->course->backup_path.'/upload/learning_path/images/';
-			$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/learning_path/images/';
+            $origin_path = $this->course->backup_path.'/upload/learning_path/images/';
+            $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/learning_path/images/';
 
-			foreach ($resources[RESOURCE_LEARNPATH] as $id => $lp) {
-				$condition_session = '';
-				if (!empty($session_id)) {
+            foreach ($resources[RESOURCE_LEARNPATH] as $id => $lp) {
+                $condition_session = '';
+                if (!empty($session_id)) {
                     if ($respect_base_content) {
                         $my_session_id = $lp->session_id;
                         if (!empty($lp->session_id)) {
@@ -2409,20 +2409,20 @@ 
                         $session_id = intval($session_id);
                         $condition_session = $session_id;
                     }
-				}
-
-				// Adding the author's image
-				if (!empty($lp->preview_image)) {
-					$new_filename = uniqid('').substr($lp->preview_image,strlen($lp->preview_image)-7, strlen($lp->preview_image));
-					if (file_exists($origin_path.$lp->preview_image) && !is_dir($origin_path.$lp->preview_image)) {
-						$copy_result = copy($origin_path.$lp->preview_image, $destination_path.$new_filename);
-						if ($copy_result) {
-							$lp->preview_image = $new_filename;
-						} else {
-							$lp->preview_image ='';
-						}
-					}
-				}
+                }
+
+                // Adding the author's image
+                if (!empty($lp->preview_image)) {
+                    $new_filename = uniqid('').substr($lp->preview_image,strlen($lp->preview_image)-7, strlen($lp->preview_image));
+                    if (file_exists($origin_path.$lp->preview_image) && !is_dir($origin_path.$lp->preview_image)) {
+                        $copy_result = copy($origin_path.$lp->preview_image, $destination_path.$new_filename);
+                        if ($copy_result) {
+                            $lp->preview_image = $new_filename;
+                        } else {
+                            $lp->preview_image ='';
+                        }
+                    }
+                }
 
                 if ($this->add_text_in_items) {
                     $lp->name = $lp->name.' '.get_lang('CopyLabelSuffix');
@@ -2480,7 +2480,7 @@ 
                     $params['session_id'] = $condition_session;
                 }
 
-				$new_lp_id = Database::insert($table_main, $params);
+                $new_lp_id = Database::insert($table_main, $params);
 
                 if ($new_lp_id) {
 
@@ -2541,13 +2541,13 @@ 
                 $old_refs = array();
                 $prerequisite_ids = array();
 
-				foreach ($lp->get_items() as $index => $item) {
-					// we set the ref code here and then we update in a for loop
-					$ref = $item['ref'];
+                foreach ($lp->get_items() as $index => $item) {
+                    // we set the ref code here and then we update in a for loop
+                    $ref = $item['ref'];
 
-					// Dealing with path the same way as ref as some data has
+                    // Dealing with path the same way as ref as some data has
                     // been put into path when it's a local resource
-					// Only fix the path for no scos
+                    // Only fix the path for no scos
                     if ($item['item_type'] == 'sco') {
                         $path = $item['path'];
                     } else {
@@ -2576,128 +2576,128 @@ 
                         'launch_data' => self::DBUTF8($item['launch_data']),
                     ];
 
-					$new_item_id = Database::insert($table_item, $params);
+                    $new_item_id = Database::insert($table_item, $params);
 
                     $sql = "UPDATE $table_item SET id = iid WHERE iid = $new_item_id";
                     Database::query($sql);
 
-					//save a link between old and new item IDs
-					$new_item_ids[$item['id']] = $new_item_id;
-					//save a reference of items that need a parent_item_id refresh
-					$parent_item_ids[$new_item_id] = $item['parent_item_id'];
-					//save a reference of items that need a previous_item_id refresh
-					$previous_item_ids[$new_item_id] = $item['previous_item_id'];
-					//save a reference of items that need a next_item_id refresh
-					$next_item_ids[$new_item_id] = $item['next_item_id'];
-
-					if (!empty($item['prerequisite'])) {
-						if ($lp->lp_type =='2') {
-							// if is an sco
-							$old_prerequisite[$new_item_id]= $item['prerequisite'];
-						} else {
-							$old_prerequisite[$new_item_id]= $new_item_ids[$item['prerequisite']];
-						}
-					}
-
-					if (!empty($ref)) {
-						if ($lp->lp_type =='2') {
-							// if is an sco
-							$old_refs[$new_item_id]= $ref;
-						} elseif (isset($new_item_ids[$ref])) {
+                    //save a link between old and new item IDs
+                    $new_item_ids[$item['id']] = $new_item_id;
+                    //save a reference of items that need a parent_item_id refresh
+                    $parent_item_ids[$new_item_id] = $item['parent_item_id'];
+                    //save a reference of items that need a previous_item_id refresh
+                    $previous_item_ids[$new_item_id] = $item['previous_item_id'];
+                    //save a reference of items that need a next_item_id refresh
+                    $next_item_ids[$new_item_id] = $item['next_item_id'];
+
+                    if (!empty($item['prerequisite'])) {
+                        if ($lp->lp_type =='2') {
+                            // if is an sco
+                            $old_prerequisite[$new_item_id]= $item['prerequisite'];
+                        } else {
+                            $old_prerequisite[$new_item_id]= $new_item_ids[$item['prerequisite']];
+                        }
+                    }
+
+                    if (!empty($ref)) {
+                        if ($lp->lp_type =='2') {
+                            // if is an sco
+                            $old_refs[$new_item_id]= $ref;
+                        } elseif (isset($new_item_ids[$ref])) {
                             $old_refs[$new_item_id]= $new_item_ids[$ref];
                         }
-					}
+                    }
 
-					$prerequisite_ids[$new_item_id] = $item['prerequisite'];
-				}
+                    $prerequisite_ids[$new_item_id] = $item['prerequisite'];
+                }
 
-				// Updating prerequisites
-				foreach ($old_prerequisite  as $key=>$my_old_prerequisite) {
-					if ($my_old_prerequisite != ''){
-						$sql = "UPDATE ".$table_item." SET prerequisite = '".$my_old_prerequisite."'
+                // Updating prerequisites
+                foreach ($old_prerequisite  as $key=>$my_old_prerequisite) {
+                    if ($my_old_prerequisite != ''){
+                        $sql = "UPDATE ".$table_item." SET prerequisite = '".$my_old_prerequisite."'
 						        WHERE c_id = ".$this->destination_course_id." AND id = '".$key."'  ";
-						Database::query($sql);
-					}
-				}
-
-				// Updating refs
-				foreach ($old_refs  as $key=>$my_old_ref) {
-					if ($my_old_ref != '') {
-						$sql = "UPDATE ".$table_item." SET ref = '".$my_old_ref."'
+                        Database::query($sql);
+                    }
+                }
+
+                // Updating refs
+                foreach ($old_refs  as $key=>$my_old_ref) {
+                    if ($my_old_ref != '') {
+                        $sql = "UPDATE ".$table_item." SET ref = '".$my_old_ref."'
 						        WHERE c_id = ".$this->destination_course_id." AND id = '".$key."'  ";
-						Database::query($sql);
-					}
-				}
-
-				foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
-					$parent_new_id = 0;
-					if($parent_item_old_id != 0){
-						$parent_new_id = $new_item_ids[$parent_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET parent_item_id = '".$parent_new_id."'
+                        Database::query($sql);
+                    }
+                }
+
+                foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
+                    $parent_new_id = 0;
+                    if($parent_item_old_id != 0){
+                        $parent_new_id = $new_item_ids[$parent_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET parent_item_id = '".$parent_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-				foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
-					$previous_new_id = 0;
-					if ($previous_item_old_id != 0){
-						$previous_new_id = $new_item_ids[$previous_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET previous_item_id = '".$previous_new_id."'
+                    Database::query($sql);
+                }
+                foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
+                    $previous_new_id = 0;
+                    if ($previous_item_old_id != 0){
+                        $previous_new_id = $new_item_ids[$previous_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET previous_item_id = '".$previous_new_id."'
 					        WHERE  c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-
-				foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
-					$next_new_id = 0;
-					if ($next_item_old_id != 0){
-						$next_new_id = $new_item_ids[$next_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET next_item_id = '".$next_new_id."'
+                    Database::query($sql);
+                }
+
+                foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
+                    $next_new_id = 0;
+                    if ($next_item_old_id != 0){
+                        $next_new_id = $new_item_ids[$next_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET next_item_id = '".$next_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-
-				foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
-					$prerequisite_new_id = 0;
-					if ($prerequisite_old_id != 0){
-						$prerequisite_new_id = $new_item_ids[$prerequisite_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET prerequisite = '".$prerequisite_new_id."'
+                    Database::query($sql);
+                }
+
+                foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
+                    $prerequisite_new_id = 0;
+                    if ($prerequisite_old_id != 0){
+                        $prerequisite_new_id = $new_item_ids[$prerequisite_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET prerequisite = '".$prerequisite_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-				$this->course->resources[RESOURCE_LEARNPATH][$id]->destination_id = $new_lp_id;
-			}
-		}
-	}
-
-	/**
-	 * Restore works
+                    Database::query($sql);
+                }
+                $this->course->resources[RESOURCE_LEARNPATH][$id]->destination_id = $new_lp_id;
+            }
+        }
+    }
+
+    /**
+     * Restore works
      * @deprecated use restore_works
      *
-	 */
-	public function restore_student_publication($sessionId = 0)
+     */
+    public function restore_student_publication($sessionId = 0)
     {
         $sessionId = intval($sessionId);
         $work_assignment_table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
         $work_table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION);
         $item_property_table = Database:: get_course_table(TABLE_ITEM_PROPERTY);
 
-		// Query in student publication
-		$sql = 'SELECT * FROM '.$work_table.'
+        // Query in student publication
+        $sql = 'SELECT * FROM '.$work_table.'
 		        WHERE c_id = '.$this->course_origin_id.' AND filetype = "folder" AND active IN (0, 1) ';
 
-		$result = Database::query($sql);
-		$folders = Database::store_result($result, 'ASSOC');
+        $result = Database::query($sql);
+        $folders = Database::store_result($result, 'ASSOC');
 
-		foreach ($folders  as $folder) {
-		    $old_id = $folder['id'];
+        foreach ($folders  as $folder) {
+            $old_id = $folder['id'];
             unset($folder['id']);
-			$folder['c_id'] = $this->destination_course_id;
+            $folder['c_id'] = $this->destination_course_id;
             $folder['parent_id'] = 0;
             $folder['session_id'] = $sessionId;
-			$new_id = Database::insert($work_table, $folder);
+            $new_id = Database::insert($work_table, $folder);
 
             if ($new_id) {
                 // query in item property
@@ -2756,23 +2756,23 @@ 
                     }
                 }
             }
-		}
+        }
 
         $destination = '../..'.api_get_path(REL_COURSE_PATH).$this->course->destination_path.'/work/';
         $origin = '../..'.api_get_path(REL_COURSE_PATH).$this->course->info['path'].'/work/';
         self::allow_create_all_directory($origin, $destination, false);
-	}
+    }
 
     /**
-    * copy all directory and sub directory
-    * @param string The path origin
-    * @param string The path destination
-    * @param boolean Option Overwrite
-    * @param string $source
-    * @param string $dest
-    * @return void()
-    * @deprecated
-    */
+     * copy all directory and sub directory
+     * @param string The path origin
+     * @param string The path destination
+     * @param boolean Option Overwrite
+     * @param string $source
+     * @param string $dest
+     * @return void()
+     * @deprecated
+     */
     public function allow_create_all_directory($source, $dest, $overwrite = false)
     {
         if (!is_dir($dest)) {
@@ -2783,7 +2783,7 @@ 
                 if ($file != '.' && $file != '..') {
                     $path = $source . '/' . $file;
                     if (is_file($path)) {
-                       /* if (!is_file($dest . '/' . $file) || $overwrite)
+                        /* if (!is_file($dest . '/' . $file) || $overwrite)
                         if (!@copy($path, $dest . '/' . $file)) {
                             echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>';
                         }*/
@@ -2798,12 +2798,12 @@ 
         }
     }
 
-	/**
-	 * Gets the new ID of one specific tool item from the tool name and the old ID
-	 * @param	string	Tool name
-	 * @param	integer	Old ID
-	 * @return	integer	New ID
-	 */
+    /**
+     * Gets the new ID of one specific tool item from the tool name and the old ID
+     * @param	string	Tool name
+     * @param	integer	Old ID
+     * @return	integer	New ID
+     */
     public function get_new_id($tool, $ref)
     {
         // Check if the value exist in the current array.
@@ -2825,25 +2825,25 @@ 
         }
 
         return '';
-	}
+    }
 
-	/**
-	 * Restore glossary
-	 */
+    /**
+     * Restore glossary
+     */
     public function restore_glossary($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_GLOSSARY)) {
-			$table_glossary = Database :: get_course_table(TABLE_GLOSSARY);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_GLOSSARY] as $id => $glossary) {
+        if ($this->course->has_resources(RESOURCE_GLOSSARY)) {
+            $table_glossary = Database :: get_course_table(TABLE_GLOSSARY);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_GLOSSARY] as $id => $glossary) {
 
                 $params = [];
-    			if (!empty($session_id)) {
-    				$session_id = intval($session_id);
+                if (!empty($session_id)) {
+                    $session_id = intval($session_id);
                     $params['session_id'] = $session_id;
-    			}
+                }
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $glossary->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $glossary->description,
                     $this->course->code,
@@ -2877,27 +2877,27 @@ 
 
                     $this->course->resources[RESOURCE_GLOSSARY][$id]->destination_id = $my_id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * @param int $session_id
      */
     public function restore_wiki($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_WIKI)) {
-			// wiki table of the target course
-			$table_wiki = Database :: get_course_table(TABLE_WIKI);
-			$table_wiki_conf = Database :: get_course_table(TABLE_WIKI_CONF);
+        if ($this->course->has_resources(RESOURCE_WIKI)) {
+            // wiki table of the target course
+            $table_wiki = Database :: get_course_table(TABLE_WIKI);
+            $table_wiki_conf = Database :: get_course_table(TABLE_WIKI_CONF);
 
-			// storing all the resources that have to be copied in an array
-			$resources = $this->course->resources;
+            // storing all the resources that have to be copied in an array
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_WIKI] as $id => $wiki) {
-				// the sql statement to insert the groups from the old course to the new course
+            foreach ($resources[RESOURCE_WIKI] as $id => $wiki) {
+                // the sql statement to insert the groups from the old course to the new course
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $wiki->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $wiki->content,
                     $this->course->code,
@@ -2932,7 +2932,7 @@ 
                     'user_ip' => ''
                 ];
 
-				$new_id = Database::insert($table_wiki, $params);
+                $new_id = Database::insert($table_wiki, $params);
 
                 if ($new_id) {
                     $sql = "UPDATE $table_wiki SET page_id = '$new_id', id = iid
@@ -2962,9 +2962,9 @@ 
 
                     Database::insert($table_wiki_conf, $params);
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Restore Thematics
@@ -2972,15 +2972,15 @@ 
      */
     public function restore_thematic($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_THEMATIC)) {
+        if ($this->course->has_resources(RESOURCE_THEMATIC)) {
             $table_thematic = Database::get_course_table(TABLE_THEMATIC);
             $table_thematic_advance = Database::get_course_table(TABLE_THEMATIC_ADVANCE);
             $table_thematic_plan = Database::get_course_table(TABLE_THEMATIC_PLAN);
 
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_THEMATIC] as $id => $thematic) {
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_THEMATIC] as $id => $thematic) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $thematic->params['content'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $thematic->params['content'],
                     $this->course->code,
@@ -2988,13 +2988,13 @@ 
                     $this->course->backup_path,
                     $this->course->info['path']
                 );
-				$thematic->params['c_id']  = $this->destination_course_id;
-				unset($thematic->params['id']);
+                $thematic->params['c_id']  = $this->destination_course_id;
+                unset($thematic->params['id']);
                 unset($thematic->params['iid']);
 
-				$last_id = Database::insert($table_thematic, $thematic->params, false);
+                $last_id = Database::insert($table_thematic, $thematic->params, false);
 
-				if ($last_id) {
+                if ($last_id) {
 
                     $sql = "UPDATE $table_thematic SET id = iid WHERE iid = $last_id";
                     Database::query($sql);
@@ -3007,12 +3007,12 @@ 
                         api_get_user_id()
                     );
 
-					foreach ($thematic->thematic_advance_list as $thematic_advance) {
-						unset($thematic_advance['id']);
+                    foreach ($thematic->thematic_advance_list as $thematic_advance) {
+                        unset($thematic_advance['id']);
                         unset($thematic_advance['iid']);
-						$thematic_advance['attendance_id'] = 0;
-						$thematic_advance['thematic_id'] = $last_id;
-						$thematic_advance['c_id']  = $this->destination_course_id;
+                        $thematic_advance['attendance_id'] = 0;
+                        $thematic_advance['thematic_id'] = $last_id;
+                        $thematic_advance['c_id']  = $this->destination_course_id;
 
                         $my_id = Database::insert(
                             $table_thematic_advance,
@@ -3020,7 +3020,7 @@ 
                             false
                         );
 
-						if ($my_id) {
+                        if ($my_id) {
 
                             $sql = "UPDATE $table_thematic_advance SET id = iid WHERE iid = $my_id";
                             Database::query($sql);
@@ -3032,17 +3032,17 @@ 
                                 'ThematicAdvanceAdded',
                                 api_get_user_id()
                             );
-						}
-					}
+                        }
+                    }
 
-					foreach($thematic->thematic_plan_list as $thematic_plan) {
-						unset($thematic_plan['id']);
+                    foreach($thematic->thematic_plan_list as $thematic_plan) {
+                        unset($thematic_plan['id']);
                         unset($thematic_plan['iid']);
-						$thematic_plan['thematic_id'] = $last_id;
-						$thematic_plan['c_id'] = $this->destination_course_id;
-						$my_id = Database::insert($table_thematic_plan, $thematic_plan, false);
+                        $thematic_plan['thematic_id'] = $last_id;
+                        $thematic_plan['c_id'] = $this->destination_course_id;
+                        $my_id = Database::insert($table_thematic_plan, $thematic_plan, false);
 
-						if ($my_id) {
+                        if ($my_id) {
 
                             $sql = "UPDATE $table_thematic_plan SET id = iid WHERE iid = $my_id";
                             Database::query($sql);
@@ -3054,12 +3054,12 @@ 
                                 'ThematicPlanAdded',
                                 api_get_user_id()
                             );
-						}
-					}
-				}
-			}
-		}
-	}
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Attendance
@@ -3067,14 +3067,14 @@ 
      */
     public function restore_attendance($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
-			$table_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
-			$table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
+            $table_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
+            $table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR);
 
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_ATTENDANCE] as $id => $obj) {
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_ATTENDANCE] as $id => $obj) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $obj->params['description'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $obj->params['description'],
                     $this->course->code,
@@ -3086,11 +3086,11 @@ 
                 unset($obj->params['id']);
                 unset($obj->params['iid']);
 
-				$obj->params['c_id'] = $this->destination_course_id;
+                $obj->params['c_id'] = $this->destination_course_id;
 
-				$last_id = Database::insert($table_attendance, $obj->params);
+                $last_id = Database::insert($table_attendance, $obj->params);
 
-				if (is_numeric($last_id)) {
+                if (is_numeric($last_id)) {
 
                     $sql = "UPDATE $table_attendance SET id = iid WHERE iid = $last_id";
                     Database::query($sql);
@@ -3104,11 +3104,11 @@ 
                     );
 
                     foreach ($obj->attendance_calendar as $attendance_calendar) {
-						unset($attendance_calendar['id']);
+                        unset($attendance_calendar['id']);
                         unset($attendance_calendar['iid']);
 
-						$attendance_calendar['attendance_id'] = $last_id;
-						$attendance_calendar['c_id'] = $this->destination_course_id;
+                        $attendance_calendar['attendance_id'] = $last_id;
+                        $attendance_calendar['c_id'] = $this->destination_course_id;
                         $attendanceCalendarId = Database::insert(
                             $table_attendance_calendar,
                             $attendance_calendar
@@ -3116,11 +3116,11 @@ 
 
                         $sql = "UPDATE $table_attendance_calendar SET id = iid WHERE iid = $attendanceCalendarId";
                         Database::query($sql);
-					}
-				}
-			}
-		}
-	}
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Works
@@ -3261,11 +3261,11 @@ 
      */
     public function DBUTF8($str)
     {
-		if (UTF8_CONVERT) {
+        if (UTF8_CONVERT) {
             $str = utf8_encode($str);
         }
-		return $str;
-	}
+        return $str;
+    }
 
     /**
      * @param string $str
@@ -3276,8 +3276,8 @@ 
         if (UTF8_CONVERT) {
             $str = utf8_encode($str);
         }
-		return Database::escape_string($str);
-	}
+        return Database::escape_string($str);
+    }
 
     /**
      * @param array $array

main/group/group_creation.php

Indentation +130 added lines, -130 removed lines

@@ -57,10 +57,10 @@ 
             exit;
             break;
         case 'create_subgroups':
-			GroupManager::create_subgroups(
-				$_POST['base_group'],
-				$_POST['number_of_groups']
-			);
+            GroupManager::create_subgroups(
+                $_POST['base_group'],
+                $_POST['number_of_groups']
+            );
             Display::addFlash(Display::return_message(get_lang('GroupsAdded')));
             header("Location: ".$currentUrl);
             exit;
@@ -84,10 +84,10 @@ 
 if (isset($_POST['number_of_groups'])) {
     if (!is_numeric($_POST['number_of_groups']) || intval($_POST['number_of_groups']) < 1) {
         Display :: display_error_message(
-			get_lang('PleaseEnterValidNumber').'<br /><br />
+            get_lang('PleaseEnterValidNumber').'<br /><br />
 			<a href="group_creation.php?'.api_get_cidreq().'">&laquo; '.get_lang('Back').'</a>',
-			false
-		);
+            false
+        );
     } else {
         $number_of_groups = intval($_POST['number_of_groups']);
         if ($number_of_groups > 1) {
@@ -125,20 +125,20 @@ 
     }
     </script>
     <?php
-		}
-		$group_categories = GroupManager::get_categories();
-		$group_id = GroupManager :: get_number_of_groups() + 1;
-		$cat_options = [];
-		foreach ($group_categories as $index => $category) {
-			$cat_options[$category['id']] = $category['title'];
-		}
+        }
+        $group_categories = GroupManager::get_categories();
+        $group_id = GroupManager :: get_number_of_groups() + 1;
+        $cat_options = [];
+        foreach ($group_categories as $index => $category) {
+            $cat_options[$category['id']] = $category['title'];
+        }
         $form = new FormValidator('create_groups_step2', 'POST', api_get_self().'?'.api_get_cidreq());
 
-		// Modify the default templates
-		$renderer = $form->defaultRenderer();
-		$form_template = "<form {attributes}>\n<div class='create-groups'>\n<table>\n{content}\n</table>\n</div>\n</form>";
-		$renderer->setFormTemplate($form_template);
-		$element_template = <<<EOT
+        // Modify the default templates
+        $renderer = $form->defaultRenderer();
+        $form_template = "<form {attributes}>\n<div class='create-groups'>\n<table>\n{content}\n</table>\n</div>\n</form>";
+        $renderer->setFormTemplate($form_template);
+        $element_template = <<<EOT
         <tr class="separate">
 		<td>
 			<!-- BEGIN required -->
@@ -151,25 +151,25 @@ 
 	</tr>
 
 EOT;
-		$renderer->setCustomElementTemplate($element_template);
+        $renderer->setCustomElementTemplate($element_template);
         $form->addElement('header', $nameTools);
-		$form->addElement('hidden', 'action');
-		$form->addElement('hidden', 'number_of_groups');
-		$defaults = array();
-		// Table heading
-		$group_el = array();
-		$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
+        $form->addElement('hidden', 'action');
+        $form->addElement('hidden', 'number_of_groups');
+        $defaults = array();
+        // Table heading
+        $group_el = array();
+        $group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
 
-		if (api_get_setting('allow_group_categories') === 'true') {
-			$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupCategory').'</b>');
-		}
-		$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupPlacesThis').'</b>');
-		$form->addGroup($group_el, 'groups', null, "</td><td>", false);
-		// Checkboxes
-		if ($_POST['number_of_groups'] > 1) {
-			$group_el = array ();
-			$group_el[] = $form->createElement('static', null, null, ' ');
-			if (api_get_setting('allow_group_categories') === 'true') {
+        if (api_get_setting('allow_group_categories') === 'true') {
+            $group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupCategory').'</b>');
+        }
+        $group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupPlacesThis').'</b>');
+        $form->addGroup($group_el, 'groups', null, "</td><td>", false);
+        // Checkboxes
+        if ($_POST['number_of_groups'] > 1) {
+            $group_el = array ();
+            $group_el[] = $form->createElement('static', null, null, ' ');
+            if (api_get_setting('allow_group_categories') === 'true') {
                 $group_el[] = $form->createElement(
                     'checkbox',
                     'same_category',
@@ -177,7 +177,7 @@ 
                     get_lang('SameForAll'),
                     array('onclick' => "javascript: switch_state('category');")
                 );
-			}
+            }
             $group_el[] = $form->createElement(
                 'checkbox',
                 'same_places',
@@ -185,13 +185,13 @@ 
                 get_lang('SameForAll'),
                 array('onclick' => "javascript: switch_state('places');")
             );
-			$form->addGroup($group_el, 'groups', null, '</td><td>', false);
-		}
-		// Properties for all groups
-		for ($group_number = 0; $group_number < $_POST['number_of_groups']; $group_number ++) {
-			$group_el = array();
-			$group_el[] = $form->createElement('text', 'group_'.$group_number.'_name');
-			if (api_get_setting('allow_group_categories') === 'true') {
+            $form->addGroup($group_el, 'groups', null, '</td><td>', false);
+        }
+        // Properties for all groups
+        for ($group_number = 0; $group_number < $_POST['number_of_groups']; $group_number ++) {
+            $group_el = array();
+            $group_el[] = $form->createElement('text', 'group_'.$group_number.'_name');
+            if (api_get_setting('allow_group_categories') === 'true') {
                 $group_el[] = $form->createElement(
                     'select',
                     'group_'.$group_number.'_category',
@@ -199,7 +199,7 @@ 
                     $cat_options,
                     array('id' => 'category_'.$group_number)
                 );
-			}
+            }
             $group_el[] = $form->createElement(
                 'text',
                 'group_'.$group_number.'_places',
@@ -207,110 +207,110 @@ 
                 array('class' => 'span1', 'id' => 'places_'.$group_number)
             );
 
-			if ($_POST['number_of_groups'] < 10000) {
-				if ($group_id < 10) {
-					$prev = '000';
-				} elseif ($group_id < 100) {
-					$prev = '00';
-				} elseif ($group_id<1000) {
-					$prev = '0';
-				} else {
-					$prev = '';
-				}
-			}
+            if ($_POST['number_of_groups'] < 10000) {
+                if ($group_id < 10) {
+                    $prev = '000';
+                } elseif ($group_id < 100) {
+                    $prev = '00';
+                } elseif ($group_id<1000) {
+                    $prev = '0';
+                } else {
+                    $prev = '';
+                }
+            }
 
-			$defaults['group_'.$group_number.'_name'] = get_lang('GroupSingle').' '.$prev.$group_id ++;
-			$form->addGroup($group_el, 'group_'.$group_number, null, '</td><td>', false);
-		}
-		$defaults['action'] = 'create_groups';
-		$defaults['number_of_groups'] = intval($_POST['number_of_groups']);
-		$form->setDefaults($defaults);
-		$form->addButtonCreate(get_lang('CreateGroup'), 'submit');
+            $defaults['group_'.$group_number.'_name'] = get_lang('GroupSingle').' '.$prev.$group_id ++;
+            $form->addGroup($group_el, 'group_'.$group_number, null, '</td><td>', false);
+        }
+        $defaults['action'] = 'create_groups';
+        $defaults['number_of_groups'] = intval($_POST['number_of_groups']);
+        $form->setDefaults($defaults);
+        $form->addButtonCreate(get_lang('CreateGroup'), 'submit');
         $form->display();
-	}
+    }
 } else {
-	/*
+    /*
 	 * Show form to generate new groups
 	 */
-	$create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq());
-	$create_groups_form->addElement('header', $nameTools);
+    $create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq());
+    $create_groups_form->addElement('header', $nameTools);
     $create_groups_form->addText('number_of_groups',get_lang('NumberOfGroupsToCreate'),null,array('value'=>'1'));
     $create_groups_form->addButton('submit', get_lang('ProceedToCreateGroup'),'plus','primary');
-	$defaults = array();
-	$defaults['number_of_groups'] = 1;
-	$create_groups_form->setDefaults($defaults);
-	$create_groups_form->display();
+    $defaults = array();
+    $defaults['number_of_groups'] = 1;
+    $create_groups_form->setDefaults($defaults);
+    $create_groups_form->display();
 
-	/*
+    /*
 	 * Show form to generate subgroups
 	 */
-	if (api_get_setting('allow_group_categories') === 'true' && count(GroupManager :: get_group_list()) > 0) {
-		$base_group_options = array ();
-		$groups = GroupManager :: get_group_list();
-		foreach ($groups as $index => $group) {
-			$number_of_students = GroupManager :: number_of_students($group['id']);
-			if ($number_of_students > 0) {
-				$base_group_options[$group['id']] = $group['name'].' ('.$number_of_students.' '.get_lang('Users').')';
-			}
-		}
-		if (count($base_group_options) > 0) {
-			$create_subgroups_form = new FormValidator('create_subgroups', 'post', api_get_self().'?'.api_get_cidreq());
+    if (api_get_setting('allow_group_categories') === 'true' && count(GroupManager :: get_group_list()) > 0) {
+        $base_group_options = array ();
+        $groups = GroupManager :: get_group_list();
+        foreach ($groups as $index => $group) {
+            $number_of_students = GroupManager :: number_of_students($group['id']);
+            if ($number_of_students > 0) {
+                $base_group_options[$group['id']] = $group['name'].' ('.$number_of_students.' '.get_lang('Users').')';
+            }
+        }
+        if (count($base_group_options) > 0) {
+            $create_subgroups_form = new FormValidator('create_subgroups', 'post', api_get_self().'?'.api_get_cidreq());
             $create_subgroups_form->addElement('header', get_lang('CreateSubgroups'));
             $create_subgroups_form->addElement('html', get_lang('CreateSubgroupsInfo'));
-			$create_subgroups_form->addElement('hidden', 'action');
-			$group_el = array();
-			$group_el[] = $create_subgroups_form->createElement('static', null, null, get_lang('CreateNumberOfGroups'));
-			$group_el[] = $create_subgroups_form->createElement('text', 'number_of_groups', null, array('size' => 3));
-			$group_el[] = $create_subgroups_form->createElement('static', null, null, get_lang('WithUsersFrom'));
-			$group_el[] = $create_subgroups_form->createElement('select', 'base_group', null, $base_group_options);
-			$group_el[] = $create_subgroups_form->createElement('button', 'submit', get_lang('Ok'));
-			$create_subgroups_form->addGroup($group_el, 'create_groups', null, null, false);
-			$defaults = array();
-			$defaults['action'] = 'create_subgroups';
-			$create_subgroups_form->setDefaults($defaults);
-			$create_subgroups_form->display();
-		}
-	}
+            $create_subgroups_form->addElement('hidden', 'action');
+            $group_el = array();
+            $group_el[] = $create_subgroups_form->createElement('static', null, null, get_lang('CreateNumberOfGroups'));
+            $group_el[] = $create_subgroups_form->createElement('text', 'number_of_groups', null, array('size' => 3));
+            $group_el[] = $create_subgroups_form->createElement('static', null, null, get_lang('WithUsersFrom'));
+            $group_el[] = $create_subgroups_form->createElement('select', 'base_group', null, $base_group_options);
+            $group_el[] = $create_subgroups_form->createElement('button', 'submit', get_lang('Ok'));
+            $create_subgroups_form->addGroup($group_el, 'create_groups', null, null, false);
+            $defaults = array();
+            $defaults['action'] = 'create_subgroups';
+            $create_subgroups_form->setDefaults($defaults);
+            $create_subgroups_form->display();
+        }
+    }
 
-	/*
+    /*
 	 * Show form to generate groups from classes subscribed to the course
 	 */
     $options['where'] = array(" usergroup.course_id = ? " =>  api_get_course_int_id());
     $obj = new UserGroup();
     $classes = $obj->getUserGroupInCourse($options);
-	if (count($classes) > 0) {
-		echo '<b>'.get_lang('GroupsFromClasses').'</b>';
-		echo '<blockquote>';
-		echo '<p>'.get_lang('GroupsFromClassesInfo').'</p>';
-		echo '<ul>';
-		foreach ($classes as $index => $class) {
-			$number_of_users = count($obj->get_users_by_usergroup($class['id']));
-			echo '<li>';
-			echo $class['name'];
-			echo ' ('.$number_of_users.' '.get_lang('Users').')';
-			echo '</li>';
-		}
-		echo '</ul>';
+    if (count($classes) > 0) {
+        echo '<b>'.get_lang('GroupsFromClasses').'</b>';
+        echo '<blockquote>';
+        echo '<p>'.get_lang('GroupsFromClassesInfo').'</p>';
+        echo '<ul>';
+        foreach ($classes as $index => $class) {
+            $number_of_users = count($obj->get_users_by_usergroup($class['id']));
+            echo '<li>';
+            echo $class['name'];
+            echo ' ('.$number_of_users.' '.get_lang('Users').')';
+            echo '</li>';
+        }
+        echo '</ul>';
 
-		$create_class_groups_form = new FormValidator('create_class_groups_form', 'post', api_get_self().'?'.api_get_cidreq());
-		$create_class_groups_form->addElement('hidden', 'action');
-		if (api_get_setting('allow_group_categories') === 'true') {
-			$group_categories = GroupManager :: get_categories();
-			$cat_options = array();
-			foreach ($group_categories as $index => $category) {
-				$cat_options[$category['id']] = $category['title'];
-			}
-			$create_class_groups_form->addElement('select', 'group_category', null, $cat_options);
-		} else {
-			$create_class_groups_form->addElement('hidden', 'group_category');
-		}
-		$create_class_groups_form->addElement('submit', 'submit', get_lang('Ok'));
-		$defaults['group_category'] = GroupManager::DEFAULT_GROUP_CATEGORY;
-		$defaults['action'] = 'create_class_groups';
-		$create_class_groups_form->setDefaults($defaults);
-		$create_class_groups_form->display();
-		echo '</blockquote>';
-	}
+        $create_class_groups_form = new FormValidator('create_class_groups_form', 'post', api_get_self().'?'.api_get_cidreq());
+        $create_class_groups_form->addElement('hidden', 'action');
+        if (api_get_setting('allow_group_categories') === 'true') {
+            $group_categories = GroupManager :: get_categories();
+            $cat_options = array();
+            foreach ($group_categories as $index => $category) {
+                $cat_options[$category['id']] = $category['title'];
+            }
+            $create_class_groups_form->addElement('select', 'group_category', null, $cat_options);
+        } else {
+            $create_class_groups_form->addElement('hidden', 'group_category');
+        }
+        $create_class_groups_form->addElement('submit', 'submit', get_lang('Ok'));
+        $defaults['group_category'] = GroupManager::DEFAULT_GROUP_CATEGORY;
+        $defaults['action'] = 'create_class_groups';
+        $create_class_groups_form->setDefaults($defaults);
+        $create_class_groups_form->display();
+        echo '</blockquote>';
+    }
 }
 
 Display :: display_footer();

main/upload/upload.document.php

Indentation +21 added lines, -21 removed lines

@@ -47,9 +47,9 @@ 
  */
 //user has submitted a file
 if (isset($_FILES['user_upload'])) {
-	$upload_ok = process_uploaded_file($_FILES['user_upload']);
-	if ($upload_ok) {
-		//file got on the server without problems, now process it
+    $upload_ok = process_uploaded_file($_FILES['user_upload']);
+    if ($upload_ok) {
+        //file got on the server without problems, now process it
         $new_path = handle_uploaded_document(
             $_course,
             $_FILES['user_upload'],
@@ -61,21 +61,21 @@ 
             $_POST['unzip'],
             $_POST['if_exists']
         );
-    	$new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
-    	$new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
+        $new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
+        $new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
 
-    	if ($new_path && ($new_comment || $new_title))
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
-        	$table_document = Database::get_course_table(TABLE_DOCUMENT);
-        	$ct = '';
+        if ($new_path && ($new_comment || $new_title))
+        if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
+            $table_document = Database::get_course_table(TABLE_DOCUMENT);
+            $ct = '';
             if ($new_comment) {
                 $ct .= ", comment='$new_comment'";
             }
             if ($new_title) {
                 $ct .= ", title='$new_title'";
             }
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
-    	}
+            Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
+        }
         //check for missing images in html files
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
         if ($missing_files) {
@@ -133,7 +133,7 @@ 
 //they want to create a directory
 if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
     $added_slash = $path == '/' ? '' : '/';
-	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
+    $dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
     $created_dir = create_unexisting_directory(
         $_course,
         api_get_user_id(),
@@ -153,15 +153,15 @@ 
 }
 
 if (isset($_GET['createdir'])) {
-	//create the form that asks for the directory name
-	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
-	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
-	$new_folder_text .= get_lang('NewDir') .' ';
-	$new_folder_text .= '<input type="text" name="dirname"/>';
-	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
-	$new_folder_text .= '</form>';
-	//show the form
-	Display::display_normal_message($new_folder_text);
+    //create the form that asks for the directory name
+    $new_folder_text = '<form action="'.api_get_self().'" method="POST">';
+    $new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
+    $new_folder_text .= get_lang('NewDir') .' ';
+    $new_folder_text .= '<input type="text" name="dirname"/>';
+    $new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
+    $new_folder_text .= '</form>';
+    //show the form
+    Display::display_normal_message($new_folder_text);
 } else {	//give them a link to create a directory
 ?>
 	<p>

main/exercise/hotpotatoes_exercise_result.class.php

Indentation +137 added lines, -137 removed lines

@@ -14,15 +14,15 @@ 
     //stores the results
     private $results = array();
 
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 * @param string $document_path
-	 */
-	public function getExercisesReporting($document_path, $hotpotato_name)
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param	string		The document path (for HotPotatoes retrieval)
+     * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     * @param string $document_path
+     */
+    public function getExercisesReporting($document_path, $hotpotato_name)
     {
-		$return = array();
+        $return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
         $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
@@ -34,7 +34,7 @@ 
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
-          $session_id_and .= " AND exe_exo_id = $exercise_id ";
+            $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
         if (empty($user_id)) {
@@ -111,25 +111,25 @@ 
         $this->results = $return;
 
         return true;
-	}
+    }
 
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
     {
-		global $charset;
-		$this->getExercisesReporting($document_path, $hotpotato_name);
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $hotpotato_name);
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
 
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
@@ -148,7 +148,7 @@ 
         }
         $data .= get_lang('Email').';';
 
-		/*if ($export_user_fields) {
+        /*if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
 			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 			$num = count($extra_user_fields);
@@ -157,25 +157,25 @@ 
 			}
 		}*/
 
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
-		$data .= "\n";
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
+        $data .= "\n";
 
-		//results
-		foreach($this->results as $row) {
+        //results
+        foreach($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
-			/*if ($export_user_fields) {
+            /*if ($export_user_fields) {
 				//show user fields data, if any, for this user
 				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
 				foreach($user_fields_values as $value) {
@@ -183,40 +183,40 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['exe_date']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        // @todo add this utf-8 header for all csv files
+        echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -225,37 +225,37 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
-		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
-		    $column++;
+        if ($with_column_user) {
+            $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+            $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
-    			$column++;
+                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $column++;
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
                 $column++;
             } else {
@@ -264,36 +264,36 @@ 
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
                 $column++;
             }
-		}
+        }
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
-				$column++;
-			}
-		}
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+                $column++;
+            }
+        }
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
@@ -310,38 +310,38 @@ 
                     $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
-			}
+            }
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
-			$column++;
             $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }