chamilo / chamilo-lms

main/admin/sub_language.php

Indentation +167 added lines, -167 removed lines

@@ -66,30 +66,30 @@ 
 $sublanguage_folder_error = false;
 
 if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
-	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
-	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
-	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
+    $language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
+    $sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
+    $all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
+    $all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
+    $sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
 
-	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
-		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
-	}
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
-		$language_id_exist = true;
-	} else {
-		$language_id_exist = false;
-	}
+    if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
+        $sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
+    }
+    if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
+        $language_id_exist = true;
+    } else {
+        $language_id_exist = false;
+    }
 } else {
-	$language_name='';
-	$language_id_exist=false;
+    $language_name='';
+    $language_id_exist=false;
 }
 
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
 
 if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Display :: display_header($language_name);
@@ -101,10 +101,10 @@ 
 echo '</div>';
 
 if (!empty($_SESSION['msg'])) {
-	echo $_SESSION['msg'];
-	unset($_SESSION['msg']);
+    echo $_SESSION['msg'];
+    unset($_SESSION['msg']);
 } else {
-	echo '<br />';
+    echo '<br />';
 }
 
 
@@ -122,7 +122,7 @@ 
 echo $html;
 echo '<br /><br /><br />';
 if (!empty($sublanguage_folder_error)) {
-	Display::display_warning_message($sublanguage_folder_error);
+    Display::display_warning_message($sublanguage_folder_error);
 }
 echo '<div id="div_message_information_id">&nbsp;</div>';
 
@@ -136,186 +136,186 @@ 
  * @return array
  */
 function search_language_term(
-	$term,
-	$search_in_variable = true,
-	$search_in_english = true,
-	$search_in_parent = true,
-	$search_in_sub_language = true
+    $term,
+    $search_in_variable = true,
+    $search_in_english = true,
+    $search_in_parent = true,
+    $search_in_sub_language = true
 ) {
-	//These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
-	/*
+    //These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
+    /*
 		These 4 arrays are set in global.inc.php with the condition that will be load from sub_language.php or sub_language_ajax.inc.php
 		$english_language_array
 		$parent_language_array
 		$sub_language_array
 		$language_files_to_load
 	*/
-	global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
-	$language_files_to_load_keys = array_flip($language_files_to_load);
-	$array_to_search = $parent_language_array;
-	$list_info = array();
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
-	//@todo optimize this foreach
-	foreach ($language_files_to_load as $lang_file) {
-		//searching in parent language of the sub language
-		if ($search_in_parent) {
-			$variables = $parent_language_array[$lang_file];
-			foreach ($variables as $parent_name_variable =>$parent_variable_value) {
-				//arrays are avoided
-				if (is_array($parent_variable_value)) {
-					continue;
-				}
-				$founded = false;
-				// searching the item in the parent tool
-				if (preg_match($term,$parent_variable_value)!==0) {
-					$founded = true;
-				}
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
+    global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
+    $language_files_to_load_keys = array_flip($language_files_to_load);
+    $array_to_search = $parent_language_array;
+    $list_info = array();
+    $term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
+    //@todo optimize this foreach
+    foreach ($language_files_to_load as $lang_file) {
+        //searching in parent language of the sub language
+        if ($search_in_parent) {
+            $variables = $parent_language_array[$lang_file];
+            foreach ($variables as $parent_name_variable =>$parent_variable_value) {
+                //arrays are avoided
+                if (is_array($parent_variable_value)) {
+                    continue;
+                }
+                $founded = false;
+                // searching the item in the parent tool
+                if (preg_match($term,$parent_variable_value)!==0) {
+                    $founded = true;
+                }
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
 
-					//config buttons
-					/*if (strlen($english_name_variable)>1500) {
+                    //config buttons
+                    /*if (strlen($english_name_variable)>1500) {
 						$size =20;
 					} else {
 						$size =4;
 					}*/
 
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
 
-					$list_info[] = array(
-						$lang_file . '.inc.php',
-						$parent_name_variable,
-						$english_name_variable,
-						$parent_variable_value,
-						$obj_text,
-						$obj_button
-					);
-				}
-			}
-		}
+                    $list_info[] = array(
+                        $lang_file . '.inc.php',
+                        $parent_name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,
+                        $obj_text,
+                        $obj_button
+                    );
+                }
+            }
+        }
 
-		//search in english
-		if ($search_in_english || $search_in_variable) {
-			$variables = $english_language_array[$lang_file];
-			foreach ($variables as $name_variable =>$variable_value) {
-				if (is_array($variable_value)) {
-					continue;
-				}
+        //search in english
+        if ($search_in_english || $search_in_variable) {
+            $variables = $english_language_array[$lang_file];
+            foreach ($variables as $name_variable =>$variable_value) {
+                if (is_array($variable_value)) {
+                    continue;
+                }
 
-				if (is_array($variable_value))
-					echo $lang_file;
-				$founded = false;
-				if ($search_in_english && $search_in_variable) {
-					// searching the item in the parent tool
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
-						$founded = true;
-					}
-				} else {
-					if ($search_in_english) {
-						if (preg_match($term,$variable_value)!==0) {
-							$founded = true;
-						}
-					} else {
-						if (preg_match($term,$name_variable)!==0) {
-							$founded = true;
-						}
-					}
-				}
+                if (is_array($variable_value))
+                    echo $lang_file;
+                $founded = false;
+                if ($search_in_english && $search_in_variable) {
+                    // searching the item in the parent tool
+                    if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
+                        $founded = true;
+                    }
+                } else {
+                    if ($search_in_english) {
+                        if (preg_match($term,$variable_value)!==0) {
+                            $founded = true;
+                        }
+                    } else {
+                        if (preg_match($term,$name_variable)!==0) {
+                            $founded = true;
+                        }
+                    }
+                }
 
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = null;
-					if (isset($sub_language_array[$lang_file][$name_variable])) {
-						$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
-					}
-					$parent_variable_value = null;
-					if (isset($parent_language_array[$lang_file][$name_variable])) {
-						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
-					}
-					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
-						$sub_language_name_variable.'
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = null;
+                    if (isset($sub_language_array[$lang_file][$name_variable])) {
+                        $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
+                    }
+                    $parent_variable_value = null;
+                    if (isset($parent_language_array[$lang_file][$name_variable])) {
+                        $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
+                    }
+                    //config buttons
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
+                        $sub_language_name_variable.'
 						</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
 
-					$list_info[] = array(
-						$lang_file . '.inc.php',
-						$name_variable,
-						$english_name_variable,
-						$parent_variable_value,
-						$obj_text,
-						$obj_button
-					);
-				}
-			}
-		}
+                    $list_info[] = array(
+                        $lang_file . '.inc.php',
+                        $name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,
+                        $obj_text,
+                        $obj_button
+                    );
+                }
+            }
+        }
 
-		// Search in sub language
-		if ($search_in_sub_language) {
-			$variables = $sub_language_array[$lang_file];
-			foreach ($variables as $name_variable =>$variable_value) {
-				if (is_array($parent_variable_value)) {
-					continue;
-				}
+        // Search in sub language
+        if ($search_in_sub_language) {
+            $variables = $sub_language_array[$lang_file];
+            foreach ($variables as $name_variable =>$variable_value) {
+                if (is_array($parent_variable_value)) {
+                    continue;
+                }
 
-				if (is_array($variable_value)) {
-					continue;
-				}
+                if (is_array($variable_value)) {
+                    continue;
+                }
 
-				$founded = false;
-				// searching the item in the parent tool
-				if (preg_match($term,$variable_value)!==0) {
-					$founded = true;
-				}
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
-					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
-					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+                $founded = false;
+                // searching the item in the parent tool
+                if (preg_match($term,$variable_value)!==0) {
+                    $founded = true;
+                }
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
+                    $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
+                    //config buttons
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
-					$list_info[]=array($lang_file.'.inc.php',
-						$name_variable,
-						$english_name_variable,
-						$parent_variable_value,$obj_text,$obj_button);
-				}
-			}
-		}
-	}
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
+                    $list_info[]=array($lang_file.'.inc.php',
+                        $name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,$obj_text,$obj_button);
+                }
+            }
+        }
+    }
 
-	$list_info = array_unique_dimensional($list_info);
-	return $list_info;
+    $list_info = array_unique_dimensional($list_info);
+    return $list_info;
 }
 
 // Allow see data in sort table
 $list_info = array();
 if (isset($_REQUEST['txt_search_word'])) {
-	//@todo fix to accept a char with 1 char
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
-		$list_info = search_language_term(
-			$_REQUEST['txt_search_word'],
-			true,
-			true,
-			true,
-			true
-		);
-	}
+    //@todo fix to accept a char with 1 char
+    if (strlen(trim($_REQUEST['txt_search_word']))>2) {
+        $list_info = search_language_term(
+            $_REQUEST['txt_search_word'],
+            true,
+            true,
+            true,
+            true
+        );
+    }
 }
 
 $parameters = array(
-	'id' => intval($_GET['id']),
-	'sub_language_id' => intval($_GET['sub_language_id']),
-	'txt_search_word' => $txt_search_word
+    'id' => intval($_GET['id']),
+    'sub_language_id' => intval($_GET['sub_language_id']),
+    'txt_search_word' => $txt_search_word
 );
 $table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
 $table->set_additional_parameters($parameters);

main/document/edit_document.php

Indentation +188 added lines, -188 removed lines

@@ -65,7 +65,7 @@ 
 $sessionId = api_get_session_id();
 
 if (api_is_in_group()) {
-	$group_properties = GroupManager::get_group_properties($group_id);
+    $group_properties = GroupManager::get_group_properties($group_id);
 }
 
 $dir = '/';
@@ -77,7 +77,7 @@ 
         $_GET['id'],
         api_get_course_id(),
         true,
-		0
+        0
     );
 
     if (!empty($sessionId) && empty($document_data)) {
@@ -89,13 +89,13 @@ 
         );
     }
 
-	$document_id = $document_data['id'];
-	$file = $document_data['path'];
-	$parent_id = DocumentManager::get_document_id($course_info, dirname($file));
-	$dir = dirname($document_data['path']);
-	$dir_original = $dir;
-	$doc = basename($file);
-	$readonly = $document_data['readonly'];
+    $document_id = $document_data['id'];
+    $file = $document_data['path'];
+    $parent_id = DocumentManager::get_document_id($course_info, dirname($file));
+    $dir = dirname($document_data['path']);
+    $dir_original = $dir;
+    $doc = basename($file);
+    $readonly = $document_data['readonly'];
 }
 
 if (empty($document_data)) {
@@ -117,7 +117,7 @@ 
 
 // Level correction for group documents.
 if (!empty($group_properties['directory'])) {
-	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
+    $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
 }
 $relative_url = '';
 for ($i = 0; $i < ($count_dir); $i++) {
@@ -139,13 +139,13 @@ 
 );
 
 if ($is_certificate_mode) {
-	$editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
-	$editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
-	$editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
+    $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
+    $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
+    $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
 }
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId);
 $noPHP_SELF = true;
 
 /*	Other initialization code */
@@ -158,8 +158,8 @@ 
         'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
         'name' => get_lang('GroupSpace'),
     );
-	$group_document = true;
-	$noPHP_SELF = true;
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 if (!$is_certificate_mode) {
@@ -193,9 +193,9 @@ 
 
 //TODO:check the below code and his funcionality
 if (!api_is_allowed_to_edit()) {
-	if (DocumentManager::check_readonly($course_info, $user_id, $file)) {
-		api_not_allowed();
-	}
+    if (DocumentManager::check_readonly($course_info, $user_id, $file)) {
+        api_not_allowed();
+    }
 }
 
 /* MAIN TOOL CODE */
@@ -203,18 +203,18 @@ 
 /*	Code to change the comment	*/
 
 if (isset($_POST['comment'])) {
-	// Fixing the path if it is wrong
-	$comment = trim($_POST['comment']);
-	$title = trim($_POST['title']);
+    // Fixing the path if it is wrong
+    $comment = trim($_POST['comment']);
+    $title = trim($_POST['title']);
 
     // Just in case see BT#3525
     if (empty($title)) {
-		$title = $document_data['title'];
-	}
+        $title = $document_data['title'];
+    }
 
-	if (empty($title)) {
-		$title = get_document_title($_POST['filename']);
-	}
+    if (empty($title)) {
+        $title = get_document_title($_POST['filename']);
+    }
 
     if (!empty($document_id)) {
         $params = [
@@ -226,43 +226,43 @@ 
             $params,
             ['c_id = ? AND id = ?' => [$course_id, $document_id]]
         );
-		Display::addFlash(Display::return_message(get_lang('fileModified')));
+        Display::addFlash(Display::return_message(get_lang('fileModified')));
     }
 }
 
 /*	WYSIWYG HTML EDITOR - Program Logic */
 if ($is_allowed_to_edit) {
-	if (isset($_POST['formSent']) && $_POST['formSent'] == 1) {
+    if (isset($_POST['formSent']) && $_POST['formSent'] == 1) {
 
-		$filename = stripslashes($_POST['filename']);
+        $filename = stripslashes($_POST['filename']);
         $extension = $_POST['extension'];
-		$content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null;
-		$content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY);
+        $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null;
+        $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY);
 
         if ($dir == '/') {
             $dir = '';
         }
 
-		$file = $dir.'/'.$filename.'.'.$extension;
-		$read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
-		$read_only_flag = empty($read_only_flag) ? 0 : 1;
+        $file = $dir.'/'.$filename.'.'.$extension;
+        $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
+        $read_only_flag = empty($read_only_flag) ? 0 : 1;
 
-		if (empty($filename)) {
+        if (empty($filename)) {
             Display::addFlash(Display::return_message(get_lang('NoFileName'), 'warning'));
-		} else {
+        } else {
 
-		    $file_size = filesize($document_data['absolute_path']);
+            $file_size = filesize($document_data['absolute_path']);
 
-			if ($read_only_flag == 0) {
-				if (!empty($content)) {
-					if ($fp = @fopen($document_data['absolute_path'], 'w')) {
-						// For flv player, change absolute path temporarily to prevent from erasing it in the following lines
-						$content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content);
- 						fputs($fp, $content);
-						fclose($fp);
+            if ($read_only_flag == 0) {
+                if (!empty($content)) {
+                    if ($fp = @fopen($document_data['absolute_path'], 'w')) {
+                        // For flv player, change absolute path temporarily to prevent from erasing it in the following lines
+                        $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content);
+                            fputs($fp, $content);
+                        fclose($fp);
 
                         $filepath = $document_data['absolute_parent_path'];
-						/*
+                        /*
 						if (!is_dir($filepath.'css')) {
 							mkdir($filepath.'css', api_get_permissions_for_new_directories());
 							$doc_id = add_document($_course, $dir.'css', 'folder', 0, 'css');
@@ -292,7 +292,7 @@ 
 							);
 						}*/
 
-						/*if (!is_file($filepath.'css/frames.css')) {
+                        /*if (!is_file($filepath.'css/frames.css')) {
 							$platform_theme = api_get_setting('stylesheets');
 							if (file_exists(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css')) {
 								copy(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css', $filepath.'css/frames.css');
@@ -330,54 +330,54 @@ 
 							}
 						}*/
 
-						// "WHAT'S NEW" notification: update table item_property
-						$document_id = DocumentManager::get_document_id($_course, $file);
-
-						if ($document_id) {
-							update_existing_document(
-								$_course,
-								$document_id,
-								$file_size,
-								$read_only_flag
-							);
-							api_item_property_update(
-								$_course,
-								TOOL_DOCUMENT,
-								$document_id,
-								'DocumentUpdated',
-								api_get_user_id(),
-								null,
-								null,
-								null,
-								null,
-								$sessionId
-							);
-							// Update parent folders
-							item_property_update_on_folder(
-								$_course,
-								$dir,
-								api_get_user_id()
-							);
-							header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':''));
-							exit;
-						} else {
+                        // "WHAT'S NEW" notification: update table item_property
+                        $document_id = DocumentManager::get_document_id($_course, $file);
+
+                        if ($document_id) {
+                            update_existing_document(
+                                $_course,
+                                $document_id,
+                                $file_size,
+                                $read_only_flag
+                            );
+                            api_item_property_update(
+                                $_course,
+                                TOOL_DOCUMENT,
+                                $document_id,
+                                'DocumentUpdated',
+                                api_get_user_id(),
+                                null,
+                                null,
+                                null,
+                                null,
+                                $sessionId
+                            );
+                            // Update parent folders
+                            item_property_update_on_folder(
+                                $_course,
+                                $dir,
+                                api_get_user_id()
+                            );
+                            header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':''));
+                            exit;
+                        } else {
                             Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning'));
-						}
-					} else {
+                        }
+                    } else {
                         Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning'));
-					}
-				} else {
-					if ($document_id) {
+                    }
+                } else {
+                    if ($document_id) {
                         update_existing_document($_course, $document_id, $file_size, $read_only_flag);
-					}
-				}
-			} else {
+                    }
+                }
+            } else {
                 if ($document_id) {
                     update_existing_document($_course, $document_id, $file_size, $read_only_flag);
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 // Replace relative paths by absolute web paths (e.g. './' => 'http://www.chamilo.org/courses/ABC/document/')
@@ -431,35 +431,35 @@ 
         api_get_group_id()
     )
 ) {
-	$action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq();
+    $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq();
     if ($is_certificate_mode) {
         $action .= '&curdirpath=/certificates&selectcat=1';
     }
-	$form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical'));
-
-	// Form title
-	$form->addElement('header', $nameTools);
-	$form->addElement('hidden', 'filename');
-	$form->addElement('hidden', 'extension');
-	$form->addElement('hidden', 'file_path');
-	$form->addElement('hidden', 'commentPath');
-	$form->addElement('hidden', 'showedit');
-	$form->addElement('hidden', 'origin');
-	$form->addElement('hidden', 'origin_opt');
+    $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical'));
+
+    // Form title
+    $form->addElement('header', $nameTools);
+    $form->addElement('hidden', 'filename');
+    $form->addElement('hidden', 'extension');
+    $form->addElement('hidden', 'file_path');
+    $form->addElement('hidden', 'commentPath');
+    $form->addElement('hidden', 'showedit');
+    $form->addElement('hidden', 'origin');
+    $form->addElement('hidden', 'origin_opt');
     $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
 
-	$defaults['title'] = $document_data['title'];
+    $defaults['title'] = $document_data['title'];
 
-	$form->addElement('hidden', 'formSent');
-	$defaults['formSent'] = 1;
+    $form->addElement('hidden', 'formSent');
+    $defaults['formSent'] = 1;
 
-	$read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
+    $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
 
-	// Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor.
-	// This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573
-	$defaults['content'] = str_replace('<!--[', '<!-- [', $content);
+    // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor.
+    // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573
+    $defaults['content'] = str_replace('<!--[', '<!-- [', $content);
 
-	// HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved.
+    // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved.
 
     $showSystemFolders = api_get_course_setting('show_system_folders');
     $condition = stripos($dir, '/HotPotatoes_files') === false;
@@ -467,44 +467,44 @@ 
         $condition = true;
     }
 
-	if (($extension == 'htm' || $extension == 'html') && $condition) {
-		if (empty($readonly) && $readonly == 0) {
+    if (($extension == 'htm' || $extension == 'html') && $condition) {
+        if (empty($readonly) && $readonly == 0) {
             $form->addHtmlEditor('content', '', true, true, $editorConfig);
-		}
-	}
+        }
+    }
 
-	if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) {
-		// Updated on field
+    if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) {
+        // Updated on field
         $display_date = date_to_str_ago($last_edit_date).
-			' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>';
-		$form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
-	}
+            ' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>';
+        $form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
+    }
 
-	$form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]);
+    $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]);
 
-	if ($owner_id == api_get_user_id() || api_is_platform_admin()) {
-		$checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
-		if ($readonly == 1) {
-			$checked->setChecked(true);
-		}
-	}
+    if ($owner_id == api_get_user_id() || api_is_platform_admin()) {
+        $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
+        if ($readonly == 1) {
+            $checked->setChecked(true);
+        }
+    }
 
-	if ($is_certificate_mode) {
-		$form->addButtonUpdate(get_lang('SaveCertificate'));
+    if ($is_certificate_mode) {
+        $form->addButtonUpdate(get_lang('SaveCertificate'));
     } else {
-		$form->addButtonUpdate(get_lang('SaveDocument'));
+        $form->addButtonUpdate(get_lang('SaveDocument'));
     }
 
-	$defaults['filename'] = $filename;
-	$defaults['extension'] = $extension;
-	$defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null;
-	$defaults['commentPath'] = $file;
-	$defaults['renameTo'] = $file_name;
-	$defaults['comment'] = $document_data['comment'];
-	$defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
-	$defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null;
+    $defaults['filename'] = $filename;
+    $defaults['extension'] = $extension;
+    $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null;
+    $defaults['commentPath'] = $file;
+    $defaults['renameTo'] = $file_name;
+    $defaults['comment'] = $document_data['comment'];
+    $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
+    $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null;
 
-	$form->setDefaults($defaults);
+    $form->setDefaults($defaults);
 
     show_return(
         $parent_id,
@@ -514,25 +514,25 @@ 
         $is_certificate_mode
     );
 
-	if ($is_certificate_mode) {
-		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(
-			api_get_user_id(),
-			api_get_course_id()
-		);
-		$str_info = '';
-		foreach ($all_information_by_create_certificate[0] as $info_value) {
-			$str_info .= $info_value.'<br/>';
-		}
-		$create_certificate=get_lang('CreateCertificateWithTags');
-		Display::display_normal_message(
-			$create_certificate.': <br /><br />'.$str_info,
-			false
-		);
-	}
-
-	if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
-		Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
-	}
+    if ($is_certificate_mode) {
+        $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(
+            api_get_user_id(),
+            api_get_course_id()
+        );
+        $str_info = '';
+        foreach ($all_information_by_create_certificate[0] as $info_value) {
+            $str_info .= $info_value.'<br/>';
+        }
+        $create_certificate=get_lang('CreateCertificateWithTags');
+        Display::display_normal_message(
+            $create_certificate.': <br /><br />'.$str_info,
+            false
+        );
+    }
+
+    if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
+        Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
+    }
     echo '<div class="row" style="overflow:hidden">
             <div id="template_col" class="col-md-2">
                 <div class="panel panel-default">
@@ -560,58 +560,58 @@ 
 */
 function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc)
 {
-	$file_name_for_change = $base_work_dir.$dir.$source_file;
+    $file_name_for_change = $base_work_dir.$dir.$source_file;
     $rename_to = disable_dangerous_file($rename_to); // Avoid renaming to .htaccess file
-	$rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API
-
-	if ($rename_to) {
-		if (isset($dir) && $dir != '') {
-			$source_file = $dir.$source_file;
-			$new_full_file_name = dirname($source_file).'/'.$rename_to;
-		} else {
-			$source_file = '/'.$source_file;
-			$new_full_file_name = '/'.$rename_to;
-		}
-
-		update_db_info('update', $source_file, $new_full_file_name); // fileManage API
+    $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API
+
+    if ($rename_to) {
+        if (isset($dir) && $dir != '') {
+            $source_file = $dir.$source_file;
+            $new_full_file_name = dirname($source_file).'/'.$rename_to;
+        } else {
+            $source_file = '/'.$source_file;
+            $new_full_file_name = '/'.$rename_to;
+        }
+
+        update_db_info('update', $source_file, $new_full_file_name); // fileManage API
         Display::addFlash(Display::return_message(get_lang('fileModified')));
 
-		return true;
-	} else {
+        return true;
+    } else {
         Display::addFlash(Display::return_message(get_lang('FileExists')));
-	}
+    }
 }
 
 //return button back to
 function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false)
 {
     global $parent_id;
-	echo '<div class="actions">';
+    echo '<div class="actions">';
 
     $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id;
 
-	if ($is_certificate_mode) {
-		$selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
-		echo '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
+    if ($is_certificate_mode) {
+        $selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
+        echo '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-	} elseif($call_from_tool=='slideshow') {
-		echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
+    } elseif($call_from_tool=='slideshow') {
+        echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
             Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>';
-	} elseif($call_from_tool=='editdraw') {
-		echo '<a href="'.$url.'">'.
+    } elseif($call_from_tool=='editdraw') {
+        echo '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
-	} elseif($call_from_tool=='editodf') {
+        echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
+    } elseif($call_from_tool=='editodf') {
         echo '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>';
     } elseif($call_from_tool=='editpaint'){
-		echo '<a href="'.$url.'">'.
+        echo '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
-	} else {
-		echo '<a href="'.$url.'">'.
+        echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
+    } else {
+        echo '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-	}
-	echo '</div>';
+    }
+    echo '</div>';
 }

main/inc/lib/legal.lib.php

Indentation +110 added lines, -110 removed lines

@@ -15,15 +15,15 @@ 
     {
     }
 
-	/**
-	 * Add a new Term and Condition
-	 * @param int $language language id
-	 * @param string $content content
-	 * @param int $type term and condition type (0 or 1)
-	 * @param string $changes explain changes
-	 * @return boolean success
-	 */
-	public static function add($language, $content, $type, $changes)
+    /**
+     * Add a new Term and Condition
+     * @param int $language language id
+     * @param string $content content
+     * @param int $type term and condition type (0 or 1)
+     * @param string $changes explain changes
+     * @return boolean success
+     */
+    public static function add($language, $content, $type, $changes)
     {
         $legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
         $last = self::get_last_condition($language);
@@ -64,59 +64,59 @@ 
     /**
      * @param int $id
      */
-	public static function delete($id)
+    public static function delete($id)
     {
-		/*
+        /*
 		$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$id = intval($id);
 		$sql = "DELETE FROM $legal_table WHERE id = '".$id."'";
 		*/
-	}
+    }
 
-	/**
-	 * Gets the last version of a Term and condition by language
-	 * @param int $language language id
-	 * @return array all the info of a Term and condition
-	 */
-	public static function get_last_condition_version($language)
+    /**
+     * Gets the last version of a Term and condition by language
+     * @param int $language language id
+     * @return array all the info of a Term and condition
+     */
+    public static function get_last_condition_version($language)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
-		$sql = "SELECT version FROM $legal_conditions_table
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $language= Database::escape_string($language);
+        $sql = "SELECT version FROM $legal_conditions_table
 		        WHERE language_id = '".$language."'
 		        ORDER BY id DESC LIMIT 1 ";
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         if (Database::num_rows($result) > 0) {
 
-			return $row['version'];
-		} else {
+            return $row['version'];
+        } else {
 
-			return 0;
-		}
-	}
+            return 0;
+        }
+    }
 
-	/**
-	 * Gets the data of a Term and condition by language
-	 * @param int $language language id
-	 * @return array all the info of a Term and condition
-	 */
-	public static function get_last_condition($language)
+    /**
+     * Gets the data of a Term and condition by language
+     * @param int $language language id
+     * @return array all the info of a Term and condition
+     */
+    public static function get_last_condition($language)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
-		$sql = "SELECT * FROM $legal_conditions_table
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $language= Database::escape_string($language);
+        $sql = "SELECT * FROM $legal_conditions_table
                 WHERE language_id = '".$language."'
                 ORDER BY version DESC
                 LIMIT 1 ";
-		$result = Database::query($sql);
-		$result = Database::fetch_array($result, 'ASSOC');
+        $result = Database::query($sql);
+        $result = Database::fetch_array($result, 'ASSOC');
 
         if (isset($result['content'])) {
             $result['content'] = self::replaceTags($result['content']);
         }
         return $result;
-	}
+    }
 
     /**
      * @param string $content
@@ -141,12 +141,12 @@ 
         return $content;
     }
 
-	/**
-	 * Gets the last version of a Term and condition by language
-	 * @param int $language language id
-	 * @return boolean | int the version or false if does not exist
-	 */
-	public static function get_last_version($language)
+    /**
+     * Gets the last version of a Term and condition by language
+     * @param int $language language id
+     * @return boolean | int the version or false if does not exist
+     */
+    public static function get_last_version($language)
     {
         $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
         $language = intval($language);
@@ -164,15 +164,15 @@ 
 
             return false;
         }
-	}
+    }
 
-	/**
-	 * Show the last condition
-	 * @param array $term_preview with type and content i.e array('type'=>'1', 'content'=>'hola');
+    /**
+     * Show the last condition
+     * @param array $term_preview with type and content i.e array('type'=>'1', 'content'=>'hola');
      *
-	 * @return string html preview
-	 */
-	public static function show_last_condition($term_preview)
+     * @return string html preview
+     */
+    public static function show_last_condition($term_preview)
     {
         $preview = '';
         switch ($term_preview['type']) {
@@ -201,37 +201,37 @@ 
             default:
                 break;
         }
-		return 	$preview;
-	}
+        return 	$preview;
+    }
 
-	/**
-	 * Get the terms and condition table (only for maintenance)
-	 * @param int $from
-	 * @param int $number_of_items
-	 * @param int $column
-	 * @return array
-	 */
-	public static function get_legal_data($from, $number_of_items, $column)
+    /**
+     * Get the terms and condition table (only for maintenance)
+     * @param int $from
+     * @param int $number_of_items
+     * @param int $column
+     * @return array
+     */
+    public static function get_legal_data($from, $number_of_items, $column)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
-		$from = intval($from);
-		$number_of_items = intval($number_of_items);
-		$column = intval($column);
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
+        $column = intval($column);
 
- 		$sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
+            $sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
 				FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
-		$sql .= "ORDER BY language, version ASC ";
-		$sql .= "LIMIT $from, $number_of_items ";
+        $sql .= "ORDER BY language, version ASC ";
+        $sql .= "LIMIT $from, $number_of_items ";
 
-		$result = Database::query($sql);
-		$legals = array();
-		$versions = array();
-		while ($legal = Database::fetch_array($result)) {
-			// max 2000 chars
-			//echo strlen($legal[1]); echo '<br>';
-			$versions[] = $legal[0];
-			$languages[] = $legal[1];
+        $result = Database::query($sql);
+        $legals = array();
+        $versions = array();
+        while ($legal = Database::fetch_array($result)) {
+            // max 2000 chars
+            //echo strlen($legal[1]); echo '<br>';
+            $versions[] = $legal[0];
+            $languages[] = $legal[1];
             if (strlen($legal[2]) > 2000) {
                 $legal[2] = substr($legal[2], 0, 2000).' ... ';
             }
@@ -240,50 +240,50 @@ 
             } elseif ($legal[4] == 1) {
                 $legal[4] = get_lang('PageLink');
             }
-			$legals[] = $legal;
-		}
-		return $legals;
-	}
+            $legals[] = $legal;
+        }
+        return $legals;
+    }
 
-	/**
-	 * Gets the number of terms and conditions available
-	 * @return int
-	 */
-	public static function count()
+    /**
+     * Gets the number of terms and conditions available
+     * @return int
+     */
+    public static function count()
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$sql = "SELECT count(*) as count_result
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $sql = "SELECT count(*) as count_result
 		        FROM $legal_conditions_table
 		        ORDER BY id DESC ";
-		$result = Database::query($sql);
-		$url = Database::fetch_array($result,'ASSOC');
-		$result = $url['count_result'];
+        $result = Database::query($sql);
+        $url = Database::fetch_array($result,'ASSOC');
+        $result = $url['count_result'];
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Get type of terms and conditions
-	 * @param int $legal_id
-	 * @param int $language_id
-	 * @return int The current type of terms and conditions
-	 */
-	public static function get_type_of_terms_and_conditions($legal_id, $language_id)
+    /**
+     * Get type of terms and conditions
+     * @param int $legal_id
+     * @param int $language_id
+     * @return int The current type of terms and conditions
+     */
+    public static function get_type_of_terms_and_conditions($legal_id, $language_id)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$legal_id = intval($legal_id);
-		$language_id = intval($language_id);
-		$sql = 'SELECT type FROM '.$legal_conditions_table.'
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $legal_id = intval($legal_id);
+        $language_id = intval($language_id);
+        $sql = 'SELECT type FROM '.$legal_conditions_table.'
 		        WHERE id =  "'.$legal_id.'" AND language_id="'.$language_id.'"';
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		return Database::result($rs,0,'type');
-	}
+        return Database::result($rs,0,'type');
+    }
 
     /**
      * @param int $userId
      */
-	public static function sendLegal($userId)
+    public static function sendLegal($userId)
     {
         $subject = get_lang('SendTermsSubject');
         $content = sprintf(

main/inc/lib/security.lib.php

Indentation +11 added lines, -11 removed lines

@@ -304,9 +304,9 @@ 
      */
     public static function remove_XSS($var, $user_status = null, $filter_terms = false)
     {
-    	if ($filter_terms) {
-    		$var = self::filter_terms($var);
-    	}
+        if ($filter_terms) {
+            $var = self::filter_terms($var);
+        }
 
         if (empty($user_status)) {
             if (api_is_anonymous()) {
@@ -401,7 +401,7 @@ 
      */
     public static function filter_terms($text)
     {
-    	static $bad_terms = array();
+        static $bad_terms = array();
 
         if (empty($bad_terms)) {
             $list = api_get_setting('filter_terms');
@@ -422,14 +422,14 @@ 
             }
         }
 
-    	$replace = '***';
-    	if (!empty($bad_terms)) {
-    		// Fast way
-    		$new_text = str_ireplace($bad_terms, $replace, $text, $count);
-    		$text = $new_text;
-    	}
+        $replace = '***';
+        if (!empty($bad_terms)) {
+            // Fast way
+            $new_text = str_ireplace($bad_terms, $replace, $text, $count);
+            $text = $new_text;
+        }
         
-		return $text;
+        return $text;
     }
 
 

main/inc/lib/online.inc.php

Indentation +120 added lines, -120 removed lines

@@ -165,10 +165,10 @@ 
  */
 function LoginDelete($user_id)
 {
-	$online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
     $user_id = intval($user_id);
-	$query = "DELETE FROM " . $online_table . " WHERE login_user_id = $user_id";
-	Database::query($query);
+    $query = "DELETE FROM " . $online_table . " WHERE login_user_id = $user_id";
+    Database::query($query);
 }
 
 /**
@@ -177,17 +177,17 @@ 
  */
 function user_is_online($user_id)
 {
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-	$access_url_id = api_get_current_access_url_id();
-	$time_limit = api_get_setting('time_limit_whosonline');
+    $access_url_id = api_get_current_access_url_id();
+    $time_limit = api_get_setting('time_limit_whosonline');
 
     $online_time = time() - $time_limit*60;
     $limit_date = api_get_utc_datetime($online_time);
     $user_id = intval($user_id);
 
-	$query = " SELECT login_user_id,login_date
+    $query = " SELECT login_user_id,login_date
                FROM $track_online_table track
                INNER JOIN $table_user u ON (u.id=track.login_user_id)
                WHERE
@@ -196,13 +196,13 @@ 
                     u.id =  $user_id
                LIMIT 1 ";
 
-	$result = Database::query($query);
-	if (Database::num_rows($result)) {
+    $result = Database::query($query);
+    if (Database::num_rows($result)) {
 
-		return true;
-	}
+        return true;
+    }
 
-	return false;
+    return false;
 
 }
 /**
@@ -238,13 +238,13 @@ 
 
     $online_time = time() - $time_limit * 60;
     $current_date = api_get_utc_datetime($online_time);
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-	$table_user	= Database::get_main_table(TABLE_MAIN_USER);
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
+    $table_user	= Database::get_main_table(TABLE_MAIN_USER);
 
-	if ($friends) {
-		// 	who friends from social network is online
-		$query = "SELECT DISTINCT login_user_id, login_date
+    if ($friends) {
+        // 	who friends from social network is online
+        $query = "SELECT DISTINCT login_user_id, login_date
 				  FROM $track_online_table INNER JOIN $friend_user_table
 				  ON (friend_user_id = login_user_id)
 				  WHERE
@@ -254,21 +254,21 @@ 
                     user_id = '".api_get_user_id()."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
-	} else {
-		$query = "SELECT DISTINCT login_user_id, login_date
+    } else {
+        $query = "SELECT DISTINCT login_user_id, login_date
                     FROM ".$track_online_table ." e
 		            INNER JOIN ".$table_user ." u ON (u.id = e.login_user_id)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '".$current_date."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
-	}
-
-	if (api_get_multiple_access_url()) {
-		$access_url_id = api_get_current_access_url_id();
-		if ($access_url_id != -1) {
-			if ($friends) {
-				// 	friends from social network is online
-				$query = "SELECT distinct login_user_id, login_date
+    }
+
+    if (api_get_multiple_access_url()) {
+        $access_url_id = api_get_current_access_url_id();
+        if ($access_url_id != -1) {
+            if ($friends) {
+                // 	friends from social network is online
+                $query = "SELECT distinct login_user_id, login_date
 							FROM $track_online_table track INNER JOIN $friend_user_table
 							ON (friend_user_id = login_user_id)
 							WHERE   track.access_url_id =  $access_url_id AND
@@ -277,9 +277,9 @@ 
                                     relation_type='".USER_RELATION_TYPE_FRIEND."'
                             ORDER BY $column $direction
                             LIMIT $from, $number_of_items";
-			} else {
-				// all users online
-				$query = "SELECT login_user_id, login_date
+            } else {
+                // all users online
+                $query = "SELECT login_user_id, login_date
 						  FROM ".$track_online_table ." track
                           INNER JOIN ".$table_user ." u
                           ON (u.id=track.login_user_id)
@@ -287,26 +287,26 @@ 
                                 login_date >= '".$current_date."'
                           ORDER BY $column $direction
                           LIMIT $from, $number_of_items";
-			}
-		}
-	}
+            }
+        }
+    }
 
-	//This query will show all registered users. Only for dev purposes.
-	/*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
+    //This query will show all registered users. Only for dev purposes.
+    /*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
             GROUP by u.id
             ORDER BY $column $direction
             LIMIT $from, $number_of_items";*/
 
-	$result = Database::query($query);
-	if ($result) {
-		$users_online = array();
-		while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
+    $result = Database::query($query);
+    if ($result) {
+        $users_online = array();
+        while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
             $users_online[] = $login_user_id;
-		}
-		return $users_online;
-	} else {
-		return false;
-	}
+        }
+        return $users_online;
+    } else {
+        return false;
+    }
 }
 
 function who_is_online_count($time_limit = null, $friends = false)
@@ -316,15 +316,15 @@ 
     } else {
         $time_limit = intval($time_limit);
     }
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
-	$online_time = time() - $time_limit * 60;
-	$current_date = api_get_utc_datetime($online_time);
-
-	if ($friends) {
-		// 	who friends from social network is online
-		$query = "SELECT DISTINCT count(login_user_id) as count
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $online_time = time() - $time_limit * 60;
+    $current_date = api_get_utc_datetime($online_time);
+
+    if ($friends) {
+        // 	who friends from social network is online
+        $query = "SELECT DISTINCT count(login_user_id) as count
 				  FROM $track_online_table INNER JOIN $friend_user_table
                   ON (friend_user_id = login_user_id)
 				  WHERE
@@ -332,20 +332,20 @@ 
 				        friend_user_id <> '".api_get_user_id()."' AND
 				        relation_type='".USER_RELATION_TYPE_FRIEND."' AND
 				        user_id = '".api_get_user_id()."' ";
-	} else {
-		// All users online
-		$query = "SELECT count(login_id) as count
+    } else {
+        // All users online
+        $query = "SELECT count(login_id) as count
                   FROM $track_online_table track INNER JOIN $table_user u
                   ON (u.id=track.login_user_id)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '$current_date'  ";
-	}
-
-	if (api_get_multiple_access_url()) {
-		$access_url_id = api_get_current_access_url_id();
-		if ($access_url_id != -1) {
-			if ($friends) {
-				// 	friends from social network is online
-				$query = "SELECT DISTINCT count(login_user_id) as count
+    }
+
+    if (api_get_multiple_access_url()) {
+        $access_url_id = api_get_current_access_url_id();
+        if ($access_url_id != -1) {
+            if ($friends) {
+                // 	friends from social network is online
+                $query = "SELECT DISTINCT count(login_user_id) as count
 							FROM $track_online_table track
 							INNER JOIN $friend_user_table ON (friend_user_id = login_user_id)
 							WHERE
@@ -353,29 +353,29 @@ 
 							    login_date >= '".$current_date."' AND
 							    friend_user_id <> '".api_get_user_id()."' AND
 							    relation_type='".USER_RELATION_TYPE_FRIEND."'  ";
-			} else {
-				// all users online
-				$query = "SELECT count(login_id) as count FROM $track_online_table  track
+            } else {
+                // all users online
+                $query = "SELECT count(login_id) as count FROM $track_online_table  track
                           INNER JOIN $table_user u ON (u.id=track.login_user_id)
 						  WHERE
 						    u.status != ".ANONYMOUS." AND
 						    track.access_url_id =  $access_url_id AND
 						    login_date >= '$current_date' ";
-			}
-		}
-	}
+            }
+        }
+    }
 
     // Dev purposes show all users online
     /*$table_user = Database::get_main_table(TABLE_MAIN_USER);
     $query = "SELECT count(*)  as count FROM ".$table_user;*/
 
-	$result = Database::query($query);
-	if (Database::num_rows($result) > 0) {
-		$row = Database::fetch_array($result);
-		return $row['count'];
-	} else {
-		return false;
-	}
+    $result = Database::query($query);
+    if (Database::num_rows($result) > 0) {
+        $row = Database::fetch_array($result);
+        return $row['count'];
+    } else {
+        return false;
+    }
 }
 
 
@@ -388,7 +388,7 @@ 
 */
 function who_is_online_in_this_course($from, $number_of_items, $uid, $time_limit, $course_code)
 {
-	if (empty($course_code)) return false;
+    if (empty($course_code)) return false;
 
     if (empty($time_limit)) {
         $time_limit = api_get_setting('time_limit_whosonline');
@@ -401,55 +401,55 @@ 
     $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
     $course_code = Database::escape_string($course_code);
     $courseInfo = api_get_course_info($course_code);
-	$courseId = $courseInfo['real_id'];
+    $courseId = $courseInfo['real_id'];
 
     $from = intval($from);
     $number_of_items = intval($number_of_items);
 
-	$query = "SELECT login_user_id, login_date FROM $track_online_table
+    $query = "SELECT login_user_id, login_date FROM $track_online_table
               WHERE login_user_id <> 2 AND c_id = $courseId AND login_date >= '$current_date'
               LIMIT $from, $number_of_items ";
 
-	$result = Database::query($query);
-	if ($result) {
-		$users_online = array();
+    $result = Database::query($query);
+    if ($result) {
+        $users_online = array();
 
-		while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
+        while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
             $users_online[] = $login_user_id;
-		}
-		return $users_online;
-	} else {
-		return false;
-	}
+        }
+        return $users_online;
+    } else {
+        return false;
+    }
 }
 
 function who_is_online_in_this_course_count($uid, $time_limit, $coursecode=null)
 {
-	if (empty($coursecode)) {
-		return false;
-	}
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$coursecode = Database::escape_string($coursecode);
-	$time_limit = Database::escape_string($time_limit);
+    if (empty($coursecode)) {
+        return false;
+    }
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $coursecode = Database::escape_string($coursecode);
+    $time_limit = Database::escape_string($time_limit);
 
     $online_time = time() - $time_limit * 60;
     $current_date = api_get_utc_datetime($online_time);
-	$courseId = api_get_course_int_id($coursecode);
+    $courseId = api_get_course_int_id($coursecode);
 
-	if (empty($courseId)) {
-		return false;
-	}
+    if (empty($courseId)) {
+        return false;
+    }
 
-	$query = "SELECT count(login_user_id) as count
+    $query = "SELECT count(login_user_id) as count
               FROM $track_online_table
               WHERE login_user_id <> 2 AND c_id = $courseId AND login_date >= '$current_date' ";
-	$result = Database::query($query);
-	if (Database::num_rows($result) > 0) {
-		$row = Database::fetch_array($result);
-		return $row['count'];
-	} else {
-		return false;
-	}
+    $result = Database::query($query);
+    if (Database::num_rows($result) > 0) {
+        $row = Database::fetch_array($result);
+        return $row['count'];
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -459,15 +459,15 @@ 
  * @deprecated user api_get_user_info($user_id)
  */
 function GetFullUserName($uid) {
-	$uid = (int) $uid;
-	$uid = intval($uid);
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$query = "SELECT firstname, lastname FROM ".$user_table." WHERE id=$uid";
-	$result = @Database::query($query);
-	if (count($result)>0) {
-		while(list($firstname,$lastname)= Database::fetch_array($result)) {
-			$str = str_replace(' ', '&nbsp;', api_get_person_name($firstname, $lastname));
-			return $str;
-		}
-	}
+    $uid = (int) $uid;
+    $uid = intval($uid);
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $query = "SELECT firstname, lastname FROM ".$user_table." WHERE id=$uid";
+    $result = @Database::query($query);
+    if (count($result)>0) {
+        while(list($firstname,$lastname)= Database::fetch_array($result)) {
+            $str = str_replace(' ', '&nbsp;', api_get_person_name($firstname, $lastname));
+            return $str;
+        }
+    }
 }

main/inc/lib/internationalization.lib.php

Indentation +25 added lines, -26 removed lines

@@ -95,13 +95,13 @@ 
     if (isset($_configuration['language_measure_frequency']) &&
         $_configuration['language_measure_frequency'] == 1
     ) {
-      require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
-      global $langstats;
-      $langstats->add_use($variable,'');
+        require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
+        global $langstats;
+        $langstats->add_use($variable,'');
     }
 
     if (!isset($used_lang_vars)) {
-    	$used_lang_vars = array();
+        $used_lang_vars = array();
     }
 
     // Caching results from some API functions, for speed.
@@ -291,7 +291,7 @@ 
     static $text_direction = array();
 
     if (empty($language)) {
-    	$language = api_get_interface_language();
+        $language = api_get_interface_language();
     }
     if (!isset($text_direction[$language])) {
         $text_direction[$language] = in_array(api_purify_language_id($language),
@@ -528,24 +528,24 @@ 
             case DATE_FORMAT_ONLY_DAYNAME:
                 $date_format = get_lang('dateFormatOnlyDayName', '', $language);
                 if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
                 break;
             case DATE_FORMAT_NUMBER_NO_YEAR:
                 $date_format = get_lang('dateFormatShortNumberNoYear', '', $language);
-        		if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
+                if (INTL_INSTALLED) {
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
+                break;
+            case DATE_FORMAT_NUMBER:
+                $date_format = get_lang('dateFormatShortNumber', '', $language);
+                if (INTL_INSTALLED) {
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
                 break;
-        	case DATE_FORMAT_NUMBER:
-        		$date_format = get_lang('dateFormatShortNumber', '', $language);
-        		if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
-        		break;
             case TIME_NO_SEC_FORMAT:
                 $date_format = get_lang('timeNoSecFormat', '', $language);
                 if (INTL_INSTALLED) {
@@ -581,14 +581,14 @@ 
                     $timetype = IntlDateFormatter::SHORT;
                 }
                 break;
-			case DATE_TIME_FORMAT_SHORT:
+            case DATE_TIME_FORMAT_SHORT:
                 $date_format = get_lang('dateTimeFormatShort', '', $language);
                 if (INTL_INSTALLED) {
                     $datetype = IntlDateFormatter::FULL;
                     $timetype = IntlDateFormatter::SHORT;
                 }
                 break;
-			case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
+            case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
                 $date_format = get_lang('dateTimeFormatShortTimeFirst', '', $language);
                 if (INTL_INSTALLED) {
                     $datetype = IntlDateFormatter::FULL;
@@ -1700,7 +1700,6 @@ 
 
 /**
  * Return true a date is valid
-
  * @param string $date example: 2014-06-30 13:05:05
  * @param string $format example: "Y-m-d H:i:s"
  *
@@ -1969,15 +1968,15 @@ 
 function apiGetHumanDateTime($date, $showTime = true, $humanForm = false) {
     if ($showTime) {
         if ($humanForm) {
-           return $date->format('j M Y H:i:s');
+            return $date->format('j M Y H:i:s');
         } else {
-           return $date->format('Y-m-d H:i:s');
+            return $date->format('Y-m-d H:i:s');
         }
     } else {
         if ($humanForm) {
-           return $date->format('j M Y');
+            return $date->format('j M Y');
         } else {
-           return $date->format('Y-m-d');
+            return $date->format('Y-m-d');
         }
     }
 }

main/glossary/index.php

Indentation +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
                     api_get_local_time($glossary_data['update_date'])
                 );
             } else {
-                 $glossary_data['update_date'] = '';
+                    $glossary_data['update_date'] = '';
             }
 
             $form->addLabel(get_lang('CreationDate'), $glossary_data['insert_date']);

main/inc/lib/certificate.lib.php

Indentation +13 added lines, -13 removed lines

@@ -251,12 +251,12 @@ 
     }
 
     /**
-    * update user info about certificate
-    * @param int $cat_id category id
-    * @param int $user_id user id
-    * @param string $path_certificate the path name of the certificate
-    * @return void
-    */
+     * update user info about certificate
+     * @param int $cat_id category id
+     * @param int $user_id user id
+     * @param string $path_certificate the path name of the certificate
+     * @return void
+     */
     public function update_user_info_about_certificate(
         $cat_id,
         $user_id,
@@ -359,13 +359,13 @@ 
     }
 
     /**
-    * Shows the student's certificate (HTML file). If the global setting
-    * allow_public_certificates is set to 'false', no certificate can be printed.
-    * If the global allow_public_certificates is set to 'true' and the course
-    * setting allow_public_certificates is set to 0, no certificate *in this
-    * course* can be printed (for anonymous users). Connected users can always
-    * print them.
-    */
+     * Shows the student's certificate (HTML file). If the global setting
+     * allow_public_certificates is set to 'false', no certificate can be printed.
+     * If the global allow_public_certificates is set to 'true' and the course
+     * setting allow_public_certificates is set to 0, no certificate *in this
+     * course* can be printed (for anonymous users). Connected users can always
+     * print them.
+     */
     public function show()
     {
         // Special rules for anonymous users

main/admin/user_list.php

Indentation +87 added lines, -87 removed lines

@@ -373,13 +373,13 @@ 
     $firstname = $userInfo['firstname'];
     $lastname = $userInfo['lastname'];
 
-	if (api_is_western_name_order()) {
-		$message = sprintf(get_lang('AttemptingToLoginAs'),$firstname, $lastname, $userId);
-	} else {
-		$message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
-	}
+    if (api_is_western_name_order()) {
+        $message = sprintf(get_lang('AttemptingToLoginAs'),$firstname, $lastname, $userId);
+    } else {
+        $message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
+    }
 
-	if ($userId) {
+    if ($userId) {
 
         // Logout the current user
         LoginDelete(api_get_user_id());
@@ -454,7 +454,7 @@ 
     }*/
 
     if (!in_array($direction, array('ASC','DESC'))) {
-    	$direction = 'ASC';
+        $direction = 'ASC';
     }
     $column = intval($column);
     $from = intval($from);
@@ -465,23 +465,23 @@ 
         $sql .= " WHERE u.creator_id = ".api_get_user_id();
     }
 
-	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
 
-	$res = Database::query($sql);
+    $res = Database::query($sql);
 
-	$users = array ();
+    $users = array ();
     $t = time();
-	while ($user = Database::fetch_row($res)) {
-		$userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
-		$photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
+    while ($user = Database::fetch_row($res)) {
+        $userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
+        $photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
 
         if ($user[7] == 1 && !empty($user[10])) {
             // check expiration date
             $expiration_time = convert_sql_date($user[10]);
             // if expiration date is passed, store a special value for active field
             if ($expiration_time < $t) {
-        	   $user[7] = '-1';
+                $user[7] = '-1';
             }
         }
 
@@ -511,7 +511,7 @@ 
 */
 function email_filter($email)
 {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 
 /**
@@ -521,7 +521,7 @@ 
 */
 function user_filter($name, $params, $row)
 {
-	return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
+    return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
 }
 
 /**
@@ -533,32 +533,32 @@ 
  */
 function modify_filter($user_id, $url_params, $row)
 {
-	global $charset, $_admins_list;
+    global $charset, $_admins_list;
     $is_admin = in_array($user_id, $_admins_list);
     $statusname = api_get_status_langvars();
     $user_is_anonymous = false;
     $current_user_status_label = $row['7'];
 
-	if ($current_user_status_label == $statusname[ANONYMOUS]) {
-		$user_is_anonymous =true;
-	}
-	$result = '';
-	if (!$user_is_anonymous) {
-		$icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
+    if ($current_user_status_label == $statusname[ANONYMOUS]) {
+        $user_is_anonymous =true;
+    }
+    $result = '';
+    if (!$user_is_anonymous) {
+        $icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
+        $result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
 			        '.$icon.'
 					<div class="blackboard_hide" id="div_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
 
         $icon = Display::return_icon('session.png', get_lang('Sessions'), array('onmouseout' => 'clear_session_list (\'div_s_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
+        $result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
 					'.$icon.'
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
-	} else {
-		$result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
-		$result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
-	}
+    } else {
+        $result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
+    }
 
     if (api_is_platform_admin()) {
         if (!$user_is_anonymous) {
@@ -607,14 +607,14 @@ 
         );
     }
 
-	if ($is_admin) {
-		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
-	} else {
-		$result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
-	}
+    if ($is_admin) {
+        $result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
+    } else {
+        $result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
+    }
 
-	// actions for assigning sessions, courses or users
-	if (!api_is_session_admin()) {
+    // actions for assigning sessions, courses or users
+    if (!api_is_session_admin()) {
         if ($current_user_status_label == $statusname[SESSIONADMIN]) {
             $result .= Display::url(
                 Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')),
@@ -644,7 +644,7 @@ 
                 );
             }
         }
-	}
+    }
 
     if (api_is_platform_admin()) {
         $result .= ' <a data-title="'.get_lang('FreeBusyCalendar').'" href="'.api_get_path(WEB_AJAX_PATH).'agenda.ajax.php?a=get_user_agenda&user_id='.$user_id.'&modal_size=lg" class="agenda_opener ajax">'.
@@ -662,7 +662,7 @@ 
             }
         }
     }
-	return $result;
+    return $result;
 }
 
 /**
@@ -694,11 +694,11 @@ 
     if ($action === 'edit') {
         $result = Display::return_icon($image.'.png', get_lang('AccountExpired'), array(), 16);
     } elseif ($row['0'] <> $_user['user_id']) {
-    	// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
-	}
+        // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -711,8 +711,8 @@ 
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  */
 function status_filter($status) {
-	$statusname = api_get_status_langvars();
-	return $statusname[$status];
+    $statusname = api_get_status_langvars();
+    return $statusname[$status];
 }
 
 if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
@@ -728,8 +728,8 @@ 
 
 if (!empty($action)) {
     $check = Security::check_token('get');
-	if ($check) {
-		switch ($action) {
+    if ($check) {
+        switch ($action) {
             case 'add_user_to_my_url':
                 $user_id = $_REQUEST["user_id"];
                 $result = UrlManager::add_user_to_url($user_id, $current_access_url_id);
@@ -739,45 +739,45 @@ 
                     $message  = Display::return_message($message, 'confirmation');
                 }
                 break;
-			case 'delete_user':
-				if (api_is_platform_admin()) {
+            case 'delete_user':
+                if (api_is_platform_admin()) {
                     $user_to_delete = $_GET['user_id'];
                     $current_user_id = api_get_user_id();
 
-					if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
-						if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
-							$message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
-						} else {
-							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
-						}
-					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
-					}
-				}
-				break;
+                    if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
+                        if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
+                            $message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
+                        } else {
+                            $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
+                        }
+                    } else {
+                        $message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
+                    }
+                }
+                break;
             case 'delete':
-				if (api_is_platform_admin()) {
-					$number_of_selected_users = count($_POST['id']);
-					$number_of_deleted_users = 0;
-					if (is_array($_POST['id'])) {
-						foreach ($_POST['id'] as $index => $user_id) {
-							if ($user_id != $_user['user_id']) {
-								if (UserManager::delete_user($user_id)) {
-									$number_of_deleted_users++;
-								}
-							}
-						}
-					}
-					if ($number_of_selected_users == $number_of_deleted_users) {
+                if (api_is_platform_admin()) {
+                    $number_of_selected_users = count($_POST['id']);
+                    $number_of_deleted_users = 0;
+                    if (is_array($_POST['id'])) {
+                        foreach ($_POST['id'] as $index => $user_id) {
+                            if ($user_id != $_user['user_id']) {
+                                if (UserManager::delete_user($user_id)) {
+                                    $number_of_deleted_users++;
+                                }
+                            }
+                        }
+                    }
+                    if ($number_of_selected_users == $number_of_deleted_users) {
                         $message = Display :: return_message(get_lang('SelectedUsersDeleted'), 'confirmation');
-					} else {
+                    } else {
                         $message = Display :: return_message(get_lang('SomeUsersNotDeleted'), 'error');
-					}
-				}
-				break;
-		}
-		Security::clear_token();
-	}
+                    }
+                }
+                break;
+        }
+        Security::clear_token();
+    }
 }
 
 // Create a search-box
@@ -794,15 +794,15 @@ 
 $actionsCenter = '';
 $actionsRight  = '';
 if (api_is_platform_admin()) {
-	$actionsRight .= '<a class="pull-right" href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
-         Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actionsRight .= '<a class="pull-right" href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
+            Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>';
 }
 
 $actionsLeft .= $form->returnForm();
 $actionsCenter .= $searchAdvanced;
 
 if (isset($_GET['keyword'])) {
-	$parameters = array('keyword' => Security::remove_XSS($_GET['keyword']));
+    $parameters = array('keyword' => Security::remove_XSS($_GET['keyword']));
 } elseif (isset ($_GET['keyword_firstname'])) {
     $parameters['keyword_firstname'] = Security::remove_XSS($_GET['keyword_firstname']);
     $parameters['keyword_lastname'] = Security::remove_XSS($_GET['keyword_lastname']);
@@ -878,11 +878,11 @@ 
 $table->set_header(2, get_lang('OfficialCode'));
 
 if (api_is_western_name_order()) {
-	$table->set_header(3, get_lang('FirstName'));
-	$table->set_header(4, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
+    $table->set_header(4, get_lang('LastName'));
 } else {
-	$table->set_header(3, get_lang('LastName'));
-	$table->set_header(4, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
+    $table->set_header(4, get_lang('FirstName'));
 }
 $table->set_header(5, get_lang('LoginName'));
 $table->set_header(6, get_lang('Email'));