chamilo / chamilo-lms

main/survey/survey.php

Indentation +145 added lines, -145 removed lines

@@ -20,8 +20,8 @@ 
 // Coach can't view this page
 $extend_rights_for_coachs = api_get_setting('extend_rights_for_coach_on_survey');
 $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
-	api_get_user_id(),
-	api_get_course_info()
+    api_get_user_id(),
+    api_get_course_info()
 );
 
 if ($isDrhOfCourse) {
@@ -31,10 +31,10 @@ 
 if (!api_is_allowed_to_edit(false, true) ||
     (api_is_course_coach() && $extend_rights_for_coachs == 'false')
 ) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions
@@ -51,21 +51,21 @@ 
 
 // Breadcrumbs
 $interbreadcrumb[] = array(
-		'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php',
-		'name' => get_lang('SurveyList'),
+        'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php',
+        'name' => get_lang('SurveyList'),
 );
 
 // Getting the survey information
 if (!empty($_GET['survey_id'])) {
-	$course_code = api_get_course_id();
-	if ($course_code!=-1) {
-		$survey_data = SurveyManager::get_survey($survey_id);
-	} else {
-		Display :: display_header(get_lang('ToolSurvey'));
-		Display :: display_error_message(get_lang('NotAllowed'), false);
-		Display :: display_footer();
-		exit;
-	}
+    $course_code = api_get_course_id();
+    if ($course_code!=-1) {
+        $survey_data = SurveyManager::get_survey($survey_id);
+    } else {
+        Display :: display_header(get_lang('ToolSurvey'));
+        Display :: display_error_message(get_lang('NotAllowed'), false);
+        Display :: display_footer();
+        exit;
+    }
 } else {
     Display :: display_header(get_lang('ToolSurvey'));
     Display :: display_error_message(get_lang('NotAllowed'), false);
@@ -78,30 +78,30 @@ 
 $is_survey_type_1 = $survey_data['survey_type'] == 1;
 
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$tool_name .= '...';
+    $tool_name .= '...';
 }
 
 if ($is_survey_type_1 && ($action == 'addgroup' || $action == 'deletegroup')) {
-	$_POST['name'] = trim($_POST['name']);
-	if ($action == 'addgroup') {
-		if (!empty($_POST['group_id'])) {
-			Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
+    $_POST['name'] = trim($_POST['name']);
+    if ($action == 'addgroup') {
+        if (!empty($_POST['group_id'])) {
+            Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
 			                 WHERE c_id = '.$course_id.' AND id = \''.Database::escape_string($_POST['group_id']).'\'');
-			$sendmsg = 'GroupUpdatedSuccessfully';
-		} elseif(!empty($_POST['name'])) {
-			Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
-			$sendmsg = 'GroupCreatedSuccessfully';
-		} else {
-			$sendmsg = 'GroupNeedName';
-		}
-	}
-
-	if ($action == 'deletegroup') {
-		Database::query('DELETE FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND id = '.intval($_GET['gid']).' and survey_id = '.intval($survey_id));
-		$sendmsg = 'GroupDeletedSuccessfully';
-	}
-	header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&sendmsg='.$sendmsg);
-	exit;
+            $sendmsg = 'GroupUpdatedSuccessfully';
+        } elseif(!empty($_POST['name'])) {
+            Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
+            $sendmsg = 'GroupCreatedSuccessfully';
+        } else {
+            $sendmsg = 'GroupNeedName';
+        }
+    }
+
+    if ($action == 'deletegroup') {
+        Database::query('DELETE FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND id = '.intval($_GET['gid']).' and survey_id = '.intval($survey_id));
+        $sendmsg = 'GroupDeletedSuccessfully';
+    }
+    header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&sendmsg='.$sendmsg);
+    exit;
 }
 
 // Displaying the header
@@ -115,13 +115,13 @@ 
 $message_information    = isset($_GET['message']) ? Security::remove_XSS($_GET['message']) : null;
 
 if (isset($action)) {
-	if (($action == 'moveup' || $action == 'movedown') && isset($_GET['question_id'])) {
-		SurveyManager::move_survey_question($my_action_survey,$my_question_id_survey,$my_survey_id_survey);
-		Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
-	}
-	if ($action == 'delete' AND is_numeric($_GET['question_id'])) {
-		SurveyManager::delete_survey_question($my_survey_id_survey, $my_question_id_survey, $survey_data['is_shared']);
-	}
+    if (($action == 'moveup' || $action == 'movedown') && isset($_GET['question_id'])) {
+        SurveyManager::move_survey_question($my_action_survey,$my_question_id_survey,$my_survey_id_survey);
+        Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
+    }
+    if ($action == 'delete' AND is_numeric($_GET['question_id'])) {
+        SurveyManager::delete_survey_question($my_survey_id_survey, $my_question_id_survey, $survey_data['is_shared']);
+    }
 }
 
 if (!empty($survey_data['survey_version'])) echo '<b>'.get_lang('Version').': '.$survey_data['survey_version'].'</b>';
@@ -139,26 +139,26 @@ 
 echo '<div class="actions">'.$survey_actions.'</div>';
 
 if ($survey_data['survey_type'] == 0) {
-	echo '<div class="panel panel-default">';
+    echo '<div class="panel panel-default">';
         echo '<div class="panel-body">';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.png', get_lang('YesNo'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.png', get_lang('UniqueSelect'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.png', get_lang('MultipleResponse'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.png', get_lang('Open'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.png', get_lang('Dropdown'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.png', get_lang('Percentage'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.png', get_lang('Score'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.png', get_lang('Comment'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.png', get_lang('Pagebreak'), null, ICON_SIZE_BIG).'</a>';
-	echo '</div>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.png', get_lang('YesNo'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.png', get_lang('UniqueSelect'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.png', get_lang('MultipleResponse'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.png', get_lang('Open'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.png', get_lang('Dropdown'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.png', get_lang('Percentage'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.png', get_lang('Score'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.png', get_lang('Comment'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.png', get_lang('Pagebreak'), null, ICON_SIZE_BIG).'</a>';
+    echo '</div>';
         echo '</div>';
 } else {
-	echo '<div class="panel panel-default">';
+    echo '<div class="panel panel-default">';
         echo '<div class="panel-body">';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'">';
-	echo Display::return_icon("yesno.png");
-	echo '</a></div>';
-	echo '</div>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'">';
+    echo Display::return_icon("yesno.png");
+    echo '</a></div>';
+    echo '</div>';
         echo '</div>';
 }
 
@@ -171,7 +171,7 @@ 
 echo '		<th width="50" >'.get_lang('NumberOfOptions').'</th>';
 echo '		<th width="100">'.get_lang('Modify').'</th>';
 if ($is_survey_type_1) {
-	echo '<th width="100">'.get_lang('Condition').'</th>';
+    echo '<th width="100">'.get_lang('Condition').'</th>';
     echo '<th width="40">'.get_lang('Group').'</th>';
 }
 echo '	</tr>';
@@ -198,97 +198,97 @@ 
 $result = Database::query($sql);
 $question_counter_max = Database::num_rows($result);
 while ($row = Database::fetch_array($result, 'ASSOC')) {
-	echo '<tr>';
-	echo '	<td>'.$question_counter.'</td>';
-	echo '	<td>';
-	if (api_strlen($row['survey_question']) > 100) {
-		echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
-	} else {
-		echo $row['survey_question'];
-	}
-
-	if ($row['type'] == 'yesno') {
-		$tool_name = get_lang('YesNo');
-	} else if ($row['type'] == 'multiplechoice') {
-		$tool_name = get_lang('UniqueSelect');
-	} else {
-		$tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
-	}
-
-	echo '</td>';
-	echo '	<td>'.$tool_name.'</td>';
-	echo '	<td>'.$row['number_of_options'].'</td>';
-	echo '	<td>';
-	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-	if ($question_counter > 1) {
-		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).'</a>';
-	} else {
-		Display::display_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
-	}
-	if ($question_counter < $question_counter_max) {
-		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).'</a>';
-	} else {
-		Display::display_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
-	}
-	echo '	</td>';
-	$question_counter++;
-
-	if ($is_survey_type_1) {
-    	echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
+    echo '<tr>';
+    echo '	<td>'.$question_counter.'</td>';
+    echo '	<td>';
+    if (api_strlen($row['survey_question']) > 100) {
+        echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
+    } else {
+        echo $row['survey_question'];
+    }
+
+    if ($row['type'] == 'yesno') {
+        $tool_name = get_lang('YesNo');
+    } else if ($row['type'] == 'multiplechoice') {
+        $tool_name = get_lang('UniqueSelect');
+    } else {
+        $tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
+    }
+
+    echo '</td>';
+    echo '	<td>'.$tool_name.'</td>';
+    echo '	<td>'.$row['number_of_options'].'</td>';
+    echo '	<td>';
+    echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+    echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+    if ($question_counter > 1) {
+        echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).'</a>';
+    } else {
+        Display::display_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+    }
+    if ($question_counter < $question_counter_max) {
+        echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).'</a>';
+    } else {
+        Display::display_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+    }
+    echo '	</td>';
+    $question_counter++;
+
+    if ($is_survey_type_1) {
+        echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
         echo '<td>'.(($row['survey_group_pri']==0)?$groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']]:$groups[$row['survey_group_pri']]).'</td>';
     }
-	echo '</tr>';
+    echo '</tr>';
 }
 
 echo '</table>';
 
 if ($is_survey_type_1) {
-	echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
-
-	if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
-		echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
-	}
-
-	if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
-		echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
-	}
-	echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
-	echo '<form action="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?action=addgroup&survey_id='.$survey_id.'" method="post">';
-	if ($_GET['action'] == 'editgroup') {
-		$sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.intval($_GET['gid']).' AND survey_id = '.intval($survey_id).' limit 1';
-		$rs = Database::query($sql);
-		$editedrow = Database::fetch_array($rs,'ASSOC');
-		echo	'<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
-		echo	'<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
-		echo	'<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
-		echo	'<input type="submit" value="'.get_lang('Save').'"'.'<input type="button" value="'.get_lang('Cancel').'" onclick="window.location.href = \'survey.php?survey_id='.Security::remove_XSS($survey_id).'\';" />';
-	} else {
-		echo	'<input type="text" maxlength="20" name="name" value="" size="10">';
-		echo	'<input type="text" maxlength="250" name="description" value="" size="80">';
-		echo	'<input type="submit" value="'.get_lang('Create').'"';
-	}
-	echo	'</form><br />';
-
-	echo '<table class="data_table">';
-	echo '	<tr class="row_odd">';
-	echo '		<th width="200">'.get_lang('Name').'</th>';
-	echo '		<th>'.get_lang('Description').'</th>';
-	echo '		<th width="100">'.get_lang('Modify').'</th>';
-	echo '	</tr>';
-
-	$sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.intval($survey_id).' ORDER BY name';
-
-	$rs = Database::query($sql);
-	while($row = Database::fetch_array($rs,ASSOC)){
-		$grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
-		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
-		Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a> '.
-		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
-		Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
-		'</td></tr>';
-	}
-	echo $grouplist.'</table>';
+    echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
+
+    if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
+        echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
+    }
+
+    if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
+        echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
+    }
+    echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
+    echo '<form action="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?action=addgroup&survey_id='.$survey_id.'" method="post">';
+    if ($_GET['action'] == 'editgroup') {
+        $sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.intval($_GET['gid']).' AND survey_id = '.intval($survey_id).' limit 1';
+        $rs = Database::query($sql);
+        $editedrow = Database::fetch_array($rs,'ASSOC');
+        echo	'<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
+        echo	'<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
+        echo	'<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
+        echo	'<input type="submit" value="'.get_lang('Save').'"'.'<input type="button" value="'.get_lang('Cancel').'" onclick="window.location.href = \'survey.php?survey_id='.Security::remove_XSS($survey_id).'\';" />';
+    } else {
+        echo	'<input type="text" maxlength="20" name="name" value="" size="10">';
+        echo	'<input type="text" maxlength="250" name="description" value="" size="80">';
+        echo	'<input type="submit" value="'.get_lang('Create').'"';
+    }
+    echo	'</form><br />';
+
+    echo '<table class="data_table">';
+    echo '	<tr class="row_odd">';
+    echo '		<th width="200">'.get_lang('Name').'</th>';
+    echo '		<th>'.get_lang('Description').'</th>';
+    echo '		<th width="100">'.get_lang('Modify').'</th>';
+    echo '	</tr>';
+
+    $sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.intval($survey_id).' ORDER BY name';
+
+    $rs = Database::query($sql);
+    while($row = Database::fetch_array($rs,ASSOC)){
+        $grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
+        '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
+        Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a> '.
+        '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
+        Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+        '</td></tr>';
+    }
+    echo $grouplist.'</table>';
 }
 
 Session::erase('answer_count');

main/tracking/lp_results_by_user.php

Indentation +102 added lines, -102 removed lines

@@ -16,34 +16,34 @@ 
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
 
 if (!$is_allowedToTrack) {
-	Display :: display_header(null);
-	api_not_allowed();
-	Display :: display_footer();
+    Display :: display_header(null);
+    api_not_allowed();
+    Display :: display_footer();
 }
 
 $export_to_csv = false;
 if (isset($_GET['export'])) {
-	$export_to_csv = true;
+    $export_to_csv = true;
 }
 
 if (api_is_platform_admin() ) {
-	$global = true;
+    $global = true;
 } else {
-	$global = false;
+    $global = false;
 }
 
 if ($global) {
-	$temp_course_list = CourseManager :: get_courses_list();
-	foreach($temp_course_list  as $temp_course_item) {
-		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
+    $temp_course_list = CourseManager :: get_courses_list();
+    foreach($temp_course_list  as $temp_course_item) {
+        $course_item = CourseManager ::get_course_information($temp_course_item['code']);
         $course_list[] = array(
             'code' => $course_item['code'],
             'title' => $course_item['title'],
         );
-	}
+    }
 } else {
     $current_course['code'] = $_course['id'];
-	$course_list = array($current_course);
+    $course_list = array($current_course);
 }
 
 $new_course_select = array();
@@ -54,20 +54,20 @@ 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
 $form->addElement('select','course_code',get_lang('Course'), $new_course_select);
 if ($global) {
-	$form->addElement('hidden','view','admin');
+    $form->addElement('hidden','view','admin');
 } else {
-	//Get exam lists
+    //Get exam lists
     $course_id = api_get_course_int_id();
-	$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
-	$sqlExercices = "SELECT quiz.title,id FROM ".$t_quiz." AS quiz
+    $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
+    $sqlExercices = "SELECT quiz.title,id FROM ".$t_quiz." AS quiz
 	                 WHERE c_id = $course_id AND active='1'
 	                 ORDER BY quiz.title ASC";
-	$resultExercices = Database::query($sqlExercices);
-	$exercise_list[0] = get_lang('All');
-	while($a_exercices = Database::fetch_array($resultExercices)) {
-		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
-	}
-	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
+    $resultExercices = Database::query($sqlExercices);
+    $exercise_list[0] = get_lang('All');
+    while($a_exercices = Database::fetch_array($resultExercices)) {
+        $exercise_list[$a_exercices['id']] = $a_exercices['title'];
+    }
+    $form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
 }
 
 //$form->addElement('submit','submit',get_lang('Filter'));
@@ -81,9 +81,9 @@ 
 }
 
 if (!$export_to_csv) {
-	Display :: display_header(get_lang('Reporting'));
-	echo '<div class="actions" style ="font-size:10pt;">';
-	if ($global) {
+    Display :: display_header(get_lang('Reporting'));
+    echo '<div class="actions" style ="font-size:10pt;">';
+    if ($global) {
 
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
                 '.Display::return_icon('csv.gif').'
@@ -93,81 +93,81 @@ 
                 &nbsp;'.get_lang('Print').'</a>
                 	</div>';
 
-		$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
+        $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
         if (api_is_platform_admin()) {
-		  $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
+            $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
         } else {
             $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=coach">'.get_lang('AdminInterface').'</a>';
         }
-		$menu_items[] = get_lang('ExamTracking');
-		$nb_menu_items = count($menu_items);
-		if($nb_menu_items>1) {
-			foreach($menu_items as $key=> $item) {
-				echo $item;
-				if($key!=$nb_menu_items-1) {
-					echo ' | ';
-				}
-			}
-			echo '<br />';
-		}
-	} else {
-	    echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
+        $menu_items[] = get_lang('ExamTracking');
+        $nb_menu_items = count($menu_items);
+        if($nb_menu_items>1) {
+            foreach($menu_items as $key=> $item) {
+                echo $item;
+                if($key!=$nb_menu_items-1) {
+                    echo ' | ';
+                }
+            }
+            echo '<br />';
+        }
+    } else {
+        echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
 		     <a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;|&nbsp';
         echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=resources">'.get_lang('ResourcesTracking').'</a>';
-		echo ' | '.get_lang('ExamTracking').'';
+        echo ' | '.get_lang('ExamTracking').'';
         echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
             '.Display::return_icon('excel.gif').'
             &nbsp;'.get_lang('ExportAsXLS').'</a><br /><br />';
 
-	}
+    }
     echo '</div>';
-	echo '<br /><br />';
-	$form->display();
+    echo '<br /><br />';
+    $form->display();
 }
 $main_result = array();
 $session_id = 0;
 $user_list = array();
 // Getting course list
 foreach ($course_list  as $current_course ) {
-	$course_info = api_get_course_info($current_course['code']);
-	$_course = $course_info;
-
-	// Getting LP list
-	$list = new LearnpathList('', $current_course['code'], $session_id);
-	$lp_list = $list->get_flat_list();
-
-	// Looping LPs
-	$lps = array();
-	foreach ($lp_list as $lp_id =>$lp) {
-		$exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
-		$attempt_result = array();
-		// Looping Chamilo Exercises in LP
-		foreach ($exercise_list as $exercise) {
-			$exercise_stats = Event::get_all_exercise_event_from_lp(
-				$exercise['path'],
-				$course_info['real_id'],
-				$session_id
-			);
-			// Looping Exercise Attempts
-			foreach ($exercise_stats as $stats) {
-				$attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
-				$user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
-			}
-			$exercise_list_name[$exercise['id']] = $exercise['title'];
-		}
-		$lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
-		$lp_list_name[$lp_id] = $lp['lp_name'];
-	}
-	$main_result[$current_course['code']] = $lps;
+    $course_info = api_get_course_info($current_course['code']);
+    $_course = $course_info;
+
+    // Getting LP list
+    $list = new LearnpathList('', $current_course['code'], $session_id);
+    $lp_list = $list->get_flat_list();
+
+    // Looping LPs
+    $lps = array();
+    foreach ($lp_list as $lp_id =>$lp) {
+        $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
+        $attempt_result = array();
+        // Looping Chamilo Exercises in LP
+        foreach ($exercise_list as $exercise) {
+            $exercise_stats = Event::get_all_exercise_event_from_lp(
+                $exercise['path'],
+                $course_info['real_id'],
+                $session_id
+            );
+            // Looping Exercise Attempts
+            foreach ($exercise_stats as $stats) {
+                $attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
+                $user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
+            }
+            $exercise_list_name[$exercise['id']] = $exercise['title'];
+        }
+        $lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
+        $lp_list_name[$lp_id] = $lp['lp_name'];
+    }
+    $main_result[$current_course['code']] = $lps;
 }
 
 if (!empty($user_list)) {
     foreach($user_list as $user_id) {
         $user_data = api_get_user_info($user_id);
-		$user_list_name[$user_id] = api_get_person_name(
-			$user_data['firstname'],
-			$user_data['lastname']
-		);
+        $user_list_name[$user_id] = api_get_person_name(
+            $user_data['firstname'],
+            $user_data['lastname']
+        );
     }
 }
 $export_array =  array();
@@ -207,15 +207,15 @@ 
                         $html_result .= Display::tag('td', $result);
 
                         $html_result .= '</tr>';
-						$export_array[] = array(
-							$course_code,
-							$lp_list_name[$lp_id],
-							$exercise_list_name[$exercise_id],
-							$user_list_name[$user_id],
-							$attempt,
-							api_get_local_time($attempt_data['exe_date']),
-							$result,
-						);
+                        $export_array[] = array(
+                            $course_code,
+                            $lp_list_name[$lp_id],
+                            $exercise_list_name[$exercise_id],
+                            $user_list_name[$user_id],
+                            $attempt,
+                            api_get_local_time($attempt_data['exe_date']),
+                            $result,
+                        );
                         $attempt++;
                     }
                 }
@@ -226,30 +226,30 @@ 
 }
 
 if (!$export_to_csv) {
-	echo $html_result;
+    echo $html_result;
 }
 $filename = 'learning_path_results-'.date('Y-m-d-h:i:s').'.xls';
 if ($export_to_csv) {
     export_complete_report_csv($filename, $export_array);
-	exit;
+    exit;
 }
 
 function export_complete_report_csv($filename, $array)
 {
-	$header[] = array(
-		get_lang('Course'),
-		get_lang('LearningPath'),
-		get_lang('Exercise'),
-		get_lang('User'),
-		get_lang('Attempt'),
-		get_lang('Date'),
-		get_lang('Results'),
-	);
-	if (!empty($array)) {
-		$array = array_merge($header, $array);
-		Export :: arrayToCsv($array, $filename);
-	}
-	exit;
+    $header[] = array(
+        get_lang('Course'),
+        get_lang('LearningPath'),
+        get_lang('Exercise'),
+        get_lang('User'),
+        get_lang('Attempt'),
+        get_lang('Date'),
+        get_lang('Results'),
+    );
+    if (!empty($array)) {
+        $array = array_merge($header, $array);
+        Export :: arrayToCsv($array, $filename);
+    }
+    exit;
 
 }
 Display :: display_footer();

main/inc/lib/upload.xajax.php

Indentation +12 added lines, -12 removed lines

@@ -17,17 +17,17 @@
  */
 function updateProgress($div_id, $upload_id, $waitAfterupload = false) {
 
-	$objResponse = new xajaxResponse();
-	$ul_info = uploadprogress_get_info($upload_id);
-	$percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
-	if($waitAfterupload && $ul_info['est_sec']<2) {
-		$percent = 100;
-		$objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-		$objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
-		$objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
-	}
-	$objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-	$objResponse->addAssign($div_id.'_filled', 'style.width', $percent.'%');
+    $objResponse = new xajaxResponse();
+    $ul_info = uploadprogress_get_info($upload_id);
+    $percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
+    if($waitAfterupload && $ul_info['est_sec']<2) {
+        $percent = 100;
+        $objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+        $objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
+        $objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
+    }
+    $objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+    $objResponse->addAssign($div_id.'_filled', 'style.width', $percent.'%');
 
-	return $objResponse;
+    return $objResponse;
 }

main/admin/specific_fields_add.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 $tool_name = get_lang('AddSpecificSearchField');
 
 if (isset($_GET['action']) && $_GET['action'] === 'edit') {
-  $tool_name = get_lang('EditSpecificSearchField');
+    $tool_name = get_lang('EditSpecificSearchField');
 }
 // Create the form
 $form = new FormValidator('specific_fields_add');

app/Resources/public/assets/ckeditor/samples/old/assets/posteddata.php

Indentation +9 added lines, -9 removed lines

@@ -27,22 +27,22 @@
 

 if (!empty($_POST))

 {

-	foreach ( $_POST as $key => $value )

-	{

-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )

-			continue;

+    foreach ( $_POST as $key => $value )

+    {

+        if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )

+            continue;

 

-		if ( get_magic_quotes_gpc() )

-			$value = htmlspecialchars( stripslashes((string)$value) );

-		else

-			$value = htmlspecialchars( (string)$value );

+        if ( get_magic_quotes_gpc() )

+            $value = htmlspecialchars( stripslashes((string)$value) );

+        else

+            $value = htmlspecialchars( (string)$value );

 ?>

 		<tr>

 			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>

 			<td><pre class="samples"><?php echo $value; ?></pre></td>

 		</tr>

 	<?php

-	}

+    }

 }

 ?>

 	</table>

main/gradebook/lib/fe/resulttable.class.php

Indentation +154 added lines, -154 removed lines

@@ -10,166 +10,166 @@
  */
 class ResultTable extends SortableTable
 {
-	private $datagen;
-	private $evaluation;
-	private $allresults;
-	private $iscourse;
-
-	/**
-	 * Constructor
-	 */
+    private $datagen;
+    private $evaluation;
+    private $allresults;
+    private $iscourse;
+
+    /**
+     * Constructor
+     */
     public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
-	{
-    	parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
-
-		$this->datagen = new ResultsDataGenerator($evaluation, $results, true);
-
-		$this->evaluation = $evaluation;
-		$this->iscourse = $iscourse;
-		$this->forprint = $forprint;
-
-		if (isset ($addparams))  {
-			$this->set_additional_parameters($addparams);
-		}
-		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
-		if ($this->iscourse == '1') {
-			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
-					'delete' => get_lang('Delete')
-			));
-		}
-		if (api_is_western_name_order()) {
-			$this->set_header($column++, get_lang('FirstName'));
-			$this->set_header($column++, get_lang('LastName'));
-		} else {
-			$this->set_header($column++, get_lang('LastName'));
-			$this->set_header($column++, get_lang('FirstName'));
-		}
-		$this->set_header($column++, get_lang('Score'));
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
-		}
+    {
+        parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
+
+        $this->datagen = new ResultsDataGenerator($evaluation, $results, true);
+
+        $this->evaluation = $evaluation;
+        $this->iscourse = $iscourse;
+        $this->forprint = $forprint;
+
+        if (isset ($addparams))  {
+            $this->set_additional_parameters($addparams);
+        }
+        $scoredisplay = ScoreDisplay :: instance();
+        $column= 0;
+        if ($this->iscourse == '1') {
+            $this->set_header($column++, '', false);
+            $this->set_form_actions(array (
+                    'delete' => get_lang('Delete')
+            ));
+        }
+        if (api_is_western_name_order()) {
+            $this->set_header($column++, get_lang('FirstName'));
+            $this->set_header($column++, get_lang('LastName'));
+        } else {
+            $this->set_header($column++, get_lang('LastName'));
+            $this->set_header($column++, get_lang('FirstName'));
+        }
+        $this->set_header($column++, get_lang('Score'));
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+        if (!$this->forprint) {
+            $this->set_header($column++, get_lang('Modify'),false);
+        }
     }
 
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	public function get_total_number_of_items ()
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    public function get_total_number_of_items ()
     {
-		return $this->datagen->get_total_results_count();
-	}
-
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
-
-		$is_western_name_order = api_is_western_name_order();
-		$scoredisplay = ScoreDisplay :: instance();
-
-		// determine sorting type
-		$col_adjust = $this->iscourse == '1' ? 1 : 0;
-
-		switch ($this->column) {
-			// first name or last name
-			case (0 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				}
-				break;
+        return $this->datagen->get_total_results_count();
+    }
+
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
+
+        $is_western_name_order = api_is_western_name_order();
+        $scoredisplay = ScoreDisplay :: instance();
+
+        // determine sorting type
+        $col_adjust = $this->iscourse == '1' ? 1 : 0;
+
+        switch ($this->column) {
             // first name or last name
-			case (1 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				}
-				break;
+            case (0 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                }
+                break;
+            // first name or last name
+            case (1 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                }
+                break;
             //Score
-			case (2 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
-				break;
-			case (3 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_MASK;
-				break;
-		}
-
-		if ($this->direction == 'DESC') {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
-		} else {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
-		}
-
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $item) {
-			$row = array ();
-			if ($this->iscourse == '1') {
-				 $row[] = $item['result_id'];
-			}
-			if ($is_western_name_order) {
-				$row[] = $item['firstname'];
-				$row[] = $item['lastname'];
-			} else {
-				$row[] = $item['lastname'];
-				$row[] = $item['firstname'];
-			}
-
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+            case (2 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
+                break;
+            case (3 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_MASK;
+                break;
+        }
+
+        if ($this->direction == 'DESC') {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
+        } else {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
+        }
+
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $item) {
+            $row = array ();
+            if ($this->iscourse == '1') {
+                    $row[] = $item['result_id'];
+            }
+            if ($is_western_name_order) {
+                $row[] = $item['firstname'];
+                $row[] = $item['lastname'];
+            } else {
+                $row[] = $item['lastname'];
+                $row[] = $item['firstname'];
+            }
+
+            $row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
-			if ($scoredisplay->is_custom()) {
-				$row[] = $item['display'];
-			}
-			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
-			}
-			$sortable_data[] = $row;
-		}
-
-		return $sortable_data;
-	}
-
-	private function build_edit_column ($item)
-	{
-		$status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
-		$locked_status = $this->evaluation->get_locked();
-		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
-			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
-		}
-
-		if ($this->evaluation->get_course_code() == null) {
-			$edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
-			$edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
-			$edit_column .= '</a>';
-		    $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
-			$edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
-		    $edit_column .= '</a>';
-		}
-
-		// Evaluation's origin is a link
-		if ($this->evaluation->get_category_id() < 0) {
-			$link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
-			$doc_url = $link->get_view_url($item['id']);
-
-			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
-				$edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
-			}
-		}
-
-		return $edit_column;
-	}
+            if ($scoredisplay->is_custom()) {
+                $row[] = $item['display'];
+            }
+            if (!$this->forprint) {
+                $row[] = $this->build_edit_column ($item);
+            }
+            $sortable_data[] = $row;
+        }
+
+        return $sortable_data;
+    }
+
+    private function build_edit_column ($item)
+    {
+        $status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
+        $locked_status = $this->evaluation->get_locked();
+        if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
+            //api_is_course_admin()
+            $edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
+            $edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+        }
+
+        if ($this->evaluation->get_course_code() == null) {
+            $edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
+            $edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
+            $edit_column .= '</a>';
+            $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
+            $edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
+            $edit_column .= '</a>';
+        }
+
+        // Evaluation's origin is a link
+        if ($this->evaluation->get_category_id() < 0) {
+            $link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
+            $doc_url = $link->get_view_url($item['id']);
+
+            if ($doc_url != null) {
+                $edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
+                $edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
+            }
+        }
+
+        return $edit_column;
+    }
 }

main/admin/configure_homepage.php

Indentation +846 added lines, -846 removed lines

@@ -17,35 +17,35 @@ 
  */
 function home_tabs($file_logged_in)
 {
-	$post = strpos($file_logged_in, "_logged_in");
-	if ($post !== false) {
-		$file_logged_out = str_replace('_logged_in','', $file_logged_in);
-		//variables initialization
-		$data_logged_out = array();
-		$data_logged_in  = array();
-
-		//we read the file with all links
-		$file = file($file_logged_in);
-		foreach ($file as $line) {
-			$line = str_replace("\n", '',$line);
-			//not logged user only sees public links
-			if (!preg_match('/::private/',$line)) {
-				$data_logged_out[] = $line;
-			}
-			//logged user only sees all links
-			$data_logged_in[] = $line;
-		}
-		//tabs file for logged out users
-		if (file_exists($file_logged_out)) {
-			$fp = fopen($file_logged_out, 'w');
-			fputs($fp, implode("\n", $data_logged_out));
-			fclose($fp);
-		}
-		//tabs file for logged in users
-		$fp = fopen($file_logged_in, 'w');
-		fputs($fp, implode("\n", $data_logged_in));
-		fclose($fp);
-	}
+    $post = strpos($file_logged_in, "_logged_in");
+    if ($post !== false) {
+        $file_logged_out = str_replace('_logged_in','', $file_logged_in);
+        //variables initialization
+        $data_logged_out = array();
+        $data_logged_in  = array();
+
+        //we read the file with all links
+        $file = file($file_logged_in);
+        foreach ($file as $line) {
+            $line = str_replace("\n", '',$line);
+            //not logged user only sees public links
+            if (!preg_match('/::private/',$line)) {
+                $data_logged_out[] = $line;
+            }
+            //logged user only sees all links
+            $data_logged_in[] = $line;
+        }
+        //tabs file for logged out users
+        if (file_exists($file_logged_out)) {
+            $fp = fopen($file_logged_out, 'w');
+            fputs($fp, implode("\n", $data_logged_out));
+            fclose($fp);
+        }
+        //tabs file for logged in users
+        $fp = fopen($file_logged_in, 'w');
+        fputs($fp, implode("\n", $data_logged_in));
+        fclose($fp);
+    }
 }
 
 $cidReset = true;
@@ -76,39 +76,39 @@ 
 $_languages = api_get_languages();
 $selfUrl =  api_get_self();
 $interbreadcrumb[] = array(
-	'url' => 'index.php',
-	'name' => get_lang('PlatformAdmin')
+    'url' => 'index.php',
+    'name' => get_lang('PlatformAdmin')
 );
 
 if (!empty($action)) {
-	$interbreadcrumb[] = array(
-		'url' => 'configure_homepage.php',
-		'name' => get_lang('ConfigureHomePage')
-	);
-
-	switch ($action) {
-		case 'edit_top':
-			$tool_name = get_lang('EditHomePage');
-			break;
-		case 'edit_news':
-			$tool_name = get_lang('EditNews');
-			break;
-		case 'edit_notice':
-			$tool_name = get_lang('EditNotice');
-			break;
-		case 'insert_link':
-			$tool_name = get_lang('InsertLink');
-			break;
-		case 'edit_link':
-			$tool_name = get_lang('EditLink');
-			break;
-		case 'insert_tabs':
-			$tool_name = get_lang('InsertTabs');
-			break;
-		case 'edit_tabs':
-			$tool_name = get_lang('EditTabs');
-			break;
-	}
+    $interbreadcrumb[] = array(
+        'url' => 'configure_homepage.php',
+        'name' => get_lang('ConfigureHomePage')
+    );
+
+    switch ($action) {
+        case 'edit_top':
+            $tool_name = get_lang('EditHomePage');
+            break;
+        case 'edit_news':
+            $tool_name = get_lang('EditNews');
+            break;
+        case 'edit_notice':
+            $tool_name = get_lang('EditNotice');
+            break;
+        case 'insert_link':
+            $tool_name = get_lang('InsertLink');
+            break;
+        case 'edit_link':
+            $tool_name = get_lang('EditLink');
+            break;
+        case 'insert_tabs':
+            $tool_name = get_lang('InsertTabs');
+            break;
+        case 'edit_tabs':
+            $tool_name = get_lang('EditTabs');
+            break;
+    }
 }
 
 // The global logic for language priorities should be:
@@ -131,11 +131,11 @@ 
 
 $lang = ''; //el for "Edit Language"
 if (!empty($_SESSION['user_language_choice'])) {
-	$lang = $_SESSION['user_language_choice'];
+    $lang = $_SESSION['user_language_choice'];
 } elseif (!empty($_SESSION['_user']['language'])) {
-	$lang = $_SESSION['_user']['language'];
+    $lang = $_SESSION['_user']['language'];
 } else {
-	$lang = api_get_setting('platformLanguage');
+    $lang = api_get_setting('platformLanguage');
 }
 
 $languageGet = isset($_GET['language']) ? Security::remove_XSS($_GET['language']) : $lang;
@@ -144,25 +144,25 @@ 
 $homePath = api_get_path(SYS_APP_PATH).'home/';
 
 if (api_is_multiple_url_enabled()) {
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$url_info = api_get_access_url($access_url_id);
-		$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
-		$clean_url = api_replace_dangerous_char($url);
-		$clean_url = str_replace('/', '-', $clean_url);
-		$clean_url .= '/';
-
-		$homep = $homePath; //homep for Home Path
-		$homep_new = $homePath.$clean_url; //homep for Home Path added the url
-		$new_url_dir = $homePath.$clean_url;
-		//we create the new dir for the new sites
-		if (!is_dir($new_url_dir)) {
-			mkdir($new_url_dir, api_get_permissions_for_new_directories());
-		}
-	}
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $url_info = api_get_access_url($access_url_id);
+        $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
+        $clean_url = api_replace_dangerous_char($url);
+        $clean_url = str_replace('/', '-', $clean_url);
+        $clean_url .= '/';
+
+        $homep = $homePath; //homep for Home Path
+        $homep_new = $homePath.$clean_url; //homep for Home Path added the url
+        $new_url_dir = $homePath.$clean_url;
+        //we create the new dir for the new sites
+        if (!is_dir($new_url_dir)) {
+            mkdir($new_url_dir, api_get_permissions_for_new_directories());
+        }
+    }
 } else {
-	$homep_new = '';
-	$homep = $homePath; //homep for Home Path
+    $homep_new = '';
+    $homep = $homePath; //homep for Home Path
 }
 
 $menuf = 'home_menu'; //menuf for Menu File
@@ -177,25 +177,25 @@ 
 
 // If language-specific file does not exist, create it by copying default file
 foreach ($homef as $my_file) {
-	if (api_is_multiple_url_enabled()) {
-		if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) {
-			if (!file_exists($homep.$my_file.$ext)) {
-				touch($homep.$my_file.$ext);
-			}
-			@copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext);
-		}
-	} else {
-		if (!file_exists($homep.$my_file.'_'.$lang.$ext)) {
-			if (!file_exists($homep.$my_file.$ext)) {
-				touch($homep.$my_file.$ext);
-			}
-			@copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext);
-		}
-	}
+    if (api_is_multiple_url_enabled()) {
+        if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) {
+            if (!file_exists($homep.$my_file.$ext)) {
+                touch($homep.$my_file.$ext);
+            }
+            @copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext);
+        }
+    } else {
+        if (!file_exists($homep.$my_file.'_'.$lang.$ext)) {
+            if (!file_exists($homep.$my_file.$ext)) {
+                touch($homep.$my_file.$ext);
+            }
+            @copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext);
+        }
+    }
 }
 
 if (api_is_multiple_url_enabled()) {
-	$homep = $homep_new;
+    $homep = $homep_new;
 }
 
 // Check WCAG settings and prepare edition using WCAG
@@ -204,577 +204,577 @@ 
 // Filter link param
 $link = '';
 if (!empty($_GET['link'])) {
-	$link = $_GET['link'];
-	// If the link parameter is suspicious, empty it
-	if (strstr($link, '/') || !strstr($link, '.html') || strstr($link, '\\')) {
-		$link = '';
-		$action = '';
-	}
+    $link = $_GET['link'];
+    // If the link parameter is suspicious, empty it
+    if (strstr($link, '/') || !strstr($link, '.html') || strstr($link, '\\')) {
+        $link = '';
+        $action = '';
+    }
 }
 
 // Start analysing requested actions
 if (!empty($action)) {
-	if (!empty($_POST['formSent'])) {
-		// Variables used are $homep for home path, $menuf for menu file, $newsf
-		// for news file, $topf for top file, $noticef for noticefile,
-		// $ext for '.html'
-		switch ($action) {
-			case 'edit_top':
-				// Filter
-				$home_top = trim(stripslashes($_POST['home_top']));
-
-				// Write
-				if (is_writable($homep)) {
-					// Default
-					if (is_writable($homep.$topf.'_'.$lang.$ext)) {
-						$fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
-						fputs($fp, $home_top);
-						fclose($fp);
-
-						// Language
-						foreach ($_languages['name'] as $key => $value) {
-							$lang_name = $_languages['folder'][$key];
-							if (isset($_POST[$lang_name])) {
-								$fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_top);
-								fclose($fp);
-							}
-						}
-					} else {
-						$errorMsg = get_lang('HomePageFilesNotWritable');
-					}
-				} else {
-					//File does not exist
-					$fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
-					fputs($fp, $home_top);
-					fclose($fp);
-
-					foreach ($_languages['name'] as $key => $value) {
-						$lang_name = $_languages['folder'][$key];
-						if (isset($_POST[$lang_name])) {
-							if (file_exists($homep.$topf.'_'.$lang_name.$ext)) {
-								$fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_top);
-								fclose($fp);
-							}
-						}
-					}
-				}
-
-				if (EventsMail::check_if_using_class('portal_homepage_edited')) {
-					EventsDispatcher::events('portal_homepage_edited',array('about_user' => api_get_user_id()));
-				}
-				Event::addEvent(
-					LOG_HOMEPAGE_CHANGED,
-					'edit_top',
-					cut(strip_tags($home_top), 254),
-					api_get_utc_datetime(),
-					api_get_user_id()
-				);
-				break;
-			case 'edit_notice':
-				// Filter
-				$notice_title = trim(strip_tags(stripslashes($_POST['notice_title'])));
-				$notice_text = trim(str_replace(array("\r", "\n"), array('', '<br />'), strip_tags(stripslashes($_POST['notice_text']), '<a>')));
-				if (empty($notice_title) || empty($notice_text)) {
-					$errorMsg = get_lang('NoticeWillBeNotDisplayed');
-				}
-				// Write
-				if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
-					if (is_writable($homep.$noticef.'_'.$lang.$ext)) {
-						$fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
-						if ($errorMsg == '') {
-							fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
-										if (is_writable($homep.$noticef.'_'.$lang_name.$ext)) {
-											$fp = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
-											fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-											fclose($fp);
-										}
-									}
-								}
-							}
-						} else {
-							fputs($fp, '');
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
-										$fp1 = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
-										fputs($fp1, '');
-										fclose($fp1);
-									}
-								}
-							}
-						}
-						fclose($fp);
-					} else {
-						$errorMsg .= "<br/>\n".get_lang('HomePageFilesNotWritable');
-					}
-				} else {
-					//File does not exist
-					$fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
-					fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-					fclose($fp);
-				}
-				Event::addEvent(
+    if (!empty($_POST['formSent'])) {
+        // Variables used are $homep for home path, $menuf for menu file, $newsf
+        // for news file, $topf for top file, $noticef for noticefile,
+        // $ext for '.html'
+        switch ($action) {
+            case 'edit_top':
+                // Filter
+                $home_top = trim(stripslashes($_POST['home_top']));
+
+                // Write
+                if (is_writable($homep)) {
+                    // Default
+                    if (is_writable($homep.$topf.'_'.$lang.$ext)) {
+                        $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
+                        fputs($fp, $home_top);
+                        fclose($fp);
+
+                        // Language
+                        foreach ($_languages['name'] as $key => $value) {
+                            $lang_name = $_languages['folder'][$key];
+                            if (isset($_POST[$lang_name])) {
+                                $fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_top);
+                                fclose($fp);
+                            }
+                        }
+                    } else {
+                        $errorMsg = get_lang('HomePageFilesNotWritable');
+                    }
+                } else {
+                    //File does not exist
+                    $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
+                    fputs($fp, $home_top);
+                    fclose($fp);
+
+                    foreach ($_languages['name'] as $key => $value) {
+                        $lang_name = $_languages['folder'][$key];
+                        if (isset($_POST[$lang_name])) {
+                            if (file_exists($homep.$topf.'_'.$lang_name.$ext)) {
+                                $fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_top);
+                                fclose($fp);
+                            }
+                        }
+                    }
+                }
+
+                if (EventsMail::check_if_using_class('portal_homepage_edited')) {
+                    EventsDispatcher::events('portal_homepage_edited',array('about_user' => api_get_user_id()));
+                }
+                Event::addEvent(
+                    LOG_HOMEPAGE_CHANGED,
+                    'edit_top',
+                    cut(strip_tags($home_top), 254),
+                    api_get_utc_datetime(),
+                    api_get_user_id()
+                );
+                break;
+            case 'edit_notice':
+                // Filter
+                $notice_title = trim(strip_tags(stripslashes($_POST['notice_title'])));
+                $notice_text = trim(str_replace(array("\r", "\n"), array('', '<br />'), strip_tags(stripslashes($_POST['notice_text']), '<a>')));
+                if (empty($notice_title) || empty($notice_text)) {
+                    $errorMsg = get_lang('NoticeWillBeNotDisplayed');
+                }
+                // Write
+                if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
+                    if (is_writable($homep.$noticef.'_'.$lang.$ext)) {
+                        $fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
+                        if ($errorMsg == '') {
+                            fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
+                                        if (is_writable($homep.$noticef.'_'.$lang_name.$ext)) {
+                                            $fp = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
+                                            fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+                                            fclose($fp);
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            fputs($fp, '');
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
+                                        $fp1 = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
+                                        fputs($fp1, '');
+                                        fclose($fp1);
+                                    }
+                                }
+                            }
+                        }
+                        fclose($fp);
+                    } else {
+                        $errorMsg .= "<br/>\n".get_lang('HomePageFilesNotWritable');
+                    }
+                } else {
+                    //File does not exist
+                    $fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
+                    fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+                    fclose($fp);
+                }
+                Event::addEvent(
                     LOG_HOMEPAGE_CHANGED,
                     'edit_notice',
                     cut(strip_tags($notice_title), 254),
                     api_get_utc_datetime(),
                     api_get_user_id()
                 );
-				break;
-			case 'edit_news':
-				//Filter
-				$home_news = trim(stripslashes($_POST['home_news']));
-
-				//Write
-				if ($s_languages_news != 'all') {
-					if (file_exists($homep.$newsf.'_'.$s_languages_news.$ext)) {
-						if (is_writable($homep.$newsf.'_'.$s_languages_news.$ext)) {
-							$fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
-							fputs($fp, $home_news);
-							fclose($fp);
-						} else {
-							$errorMsg = get_lang('HomePageFilesNotWritable');
-						}
-					} else {
-						// File does not exist
-						$fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
-						fputs($fp, $home_news);
-						fclose($fp);
-					}
-				} else {
-					// We update all the news file
-					foreach ($_languages['name'] as $key => $value) {
-						$english_name = $_languages['folder'][$key];
-						if (file_exists($homep.$newsf.'_'.$english_name.$ext)) {
-							if (is_writable($homep.$newsf.'_'.$english_name.$ext)) {
-								$fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
-								fputs($fp, $home_news);
-								fclose($fp);
-							} else {
-								$errorMsg = get_lang('HomePageFilesNotWritable');
-							}
-						} else {
-							// File does not exist
-							$fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
-							fputs($fp, $home_news);
-							fclose($fp);
-						}
-					}
-				}
-				Event::addEvent(
+                break;
+            case 'edit_news':
+                //Filter
+                $home_news = trim(stripslashes($_POST['home_news']));
+
+                //Write
+                if ($s_languages_news != 'all') {
+                    if (file_exists($homep.$newsf.'_'.$s_languages_news.$ext)) {
+                        if (is_writable($homep.$newsf.'_'.$s_languages_news.$ext)) {
+                            $fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
+                            fputs($fp, $home_news);
+                            fclose($fp);
+                        } else {
+                            $errorMsg = get_lang('HomePageFilesNotWritable');
+                        }
+                    } else {
+                        // File does not exist
+                        $fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
+                        fputs($fp, $home_news);
+                        fclose($fp);
+                    }
+                } else {
+                    // We update all the news file
+                    foreach ($_languages['name'] as $key => $value) {
+                        $english_name = $_languages['folder'][$key];
+                        if (file_exists($homep.$newsf.'_'.$english_name.$ext)) {
+                            if (is_writable($homep.$newsf.'_'.$english_name.$ext)) {
+                                $fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
+                                fputs($fp, $home_news);
+                                fclose($fp);
+                            } else {
+                                $errorMsg = get_lang('HomePageFilesNotWritable');
+                            }
+                        } else {
+                            // File does not exist
+                            $fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
+                            fputs($fp, $home_news);
+                            fclose($fp);
+                        }
+                    }
+                }
+                Event::addEvent(
                     LOG_HOMEPAGE_CHANGED,
                     'edit_news',
                     strip_tags(cut($home_news, 254)),
                     api_get_utc_datetime(),
                     api_get_user_id()
                 );
-				break;
-			case 'insert_tabs':
-			case 'edit_tabs':
-			case 'insert_link':
-			case 'edit_link':
-				$link_index     = intval($_POST['link_index']);
-				$insert_where   = intval($_POST['insert_where']);
-				$link_name      = trim(stripslashes($_POST['link_name']));
-				$link_url       = trim(stripslashes($_POST['link_url']));
-				$add_in_tab     = intval($_POST['add_in_tab']);
-				$link_html = trim(stripslashes($_POST['link_html']));
-				$filename = trim(stripslashes($_POST['filename']));
-				$target_blank = $_POST['target_blank'] ? true : false;
-
-				if ($link_url == 'http://' || $link_url == 'https://') {
-					$link_url = '';
-				} elseif (!empty($link_url) && !strstr($link_url, '://')) {
-					$link_url='http://'.$link_url;
-				}
-				$menuf = ($action == 'insert_tabs' || $action == 'edit_tabs')? $mtloggedin : $menuf;
-
-				if (!is_writable($homep.$menuf.'_'.$lang.$ext)) {
-					$errorMsg = get_lang('HomePageFilesNotWritable');
-				} elseif (empty($link_name)) {
-					$errorMsg = get_lang('PleaseEnterLinkName');
-				} else {
-					// New links are added as new files in the home/ directory
-					if ($action == 'insert_link' || $action == 'insert_tabs' || empty($filename) || strstr($filename, '/') || !strstr($filename, '.html')) {
-						$filename = api_replace_dangerous_char($link_name).'.html';
-					}
-
-					// "home_" prefix for links are renamed to "user_" prefix (to avoid name clash with existing home page files)
-					if (!empty($filename)) {
-						$filename = str_replace('home_', 'user_', $filename);
-					}
-					// If the typical language suffix is not found in the file name,
-					// replace the ".html" suffix by "_en.html" or the active menu language
-					if (!strstr($filename,'_'.$lang.$ext)) {
-						$filename = str_replace($ext, '_'.$lang.$ext, $filename);
-					}
-					// Get the contents of home_menu_en.html (or active menu language
-					// version) into $home_menu as an array of one entry per line
-					$home_menu = file($homep.$menuf.'_'.$lang.$ext);
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-					$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-					// Prepare place to insert the new link into (default is end of file)
-					if ($insert_where < -1 || $insert_where > (sizeof($home_menu) - 1)) {
-						$insert_where = sizeof($home_menu) - 1;
-					}
-					//
-					// For each line of the file, remove trailing spaces and special chars
-					//foreach ($home_menu as $key => $enreg) {
-					//	$home_menu[$key] = trim($enreg);
-					//}
-					//
-					// If the given link url is empty, then replace the link url by a link to the link file created
-
-					if (empty($link_url) || $link_url == 'http://' ||  $link_url == 'https://') {
-						$link_url = api_get_path(WEB_PATH).'index.php?include='.urlencode($filename);
-						// If the file doesn't exist, then create it and
-						// fill it with default text
-
-						$fp = @fopen($homep.$filename, 'w');
-						if ($fp) {
-							if (empty($link_html)) {
-								fputs($fp, get_lang('MyTextHere'));
-								home_tabs($homep.$filename);
-							} else {
-								fputs($fp, $link_html);
-								home_tabs($homep.$filename);
-							}
-							fclose($fp);
-						}
-					}
-					// If the requested action is to edit a link, open the file and
-					// write to it (if the file doesn't exist, create it)
-					if (in_array($action, array('edit_link'))  && !empty($link_html)) {
-						$fp = @fopen($homep.$filename, 'w');
-						if ($fp) {
-							fputs($fp, $link_html);
-							home_tabs($homep.$filename);
-							fclose($fp);
-						}
-					}
+                break;
+            case 'insert_tabs':
+            case 'edit_tabs':
+            case 'insert_link':
+            case 'edit_link':
+                $link_index     = intval($_POST['link_index']);
+                $insert_where   = intval($_POST['insert_where']);
+                $link_name      = trim(stripslashes($_POST['link_name']));
+                $link_url       = trim(stripslashes($_POST['link_url']));
+                $add_in_tab     = intval($_POST['add_in_tab']);
+                $link_html = trim(stripslashes($_POST['link_html']));
+                $filename = trim(stripslashes($_POST['filename']));
+                $target_blank = $_POST['target_blank'] ? true : false;
+
+                if ($link_url == 'http://' || $link_url == 'https://') {
+                    $link_url = '';
+                } elseif (!empty($link_url) && !strstr($link_url, '://')) {
+                    $link_url='http://'.$link_url;
+                }
+                $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs')? $mtloggedin : $menuf;
+
+                if (!is_writable($homep.$menuf.'_'.$lang.$ext)) {
+                    $errorMsg = get_lang('HomePageFilesNotWritable');
+                } elseif (empty($link_name)) {
+                    $errorMsg = get_lang('PleaseEnterLinkName');
+                } else {
+                    // New links are added as new files in the home/ directory
+                    if ($action == 'insert_link' || $action == 'insert_tabs' || empty($filename) || strstr($filename, '/') || !strstr($filename, '.html')) {
+                        $filename = api_replace_dangerous_char($link_name).'.html';
+                    }
+
+                    // "home_" prefix for links are renamed to "user_" prefix (to avoid name clash with existing home page files)
+                    if (!empty($filename)) {
+                        $filename = str_replace('home_', 'user_', $filename);
+                    }
+                    // If the typical language suffix is not found in the file name,
+                    // replace the ".html" suffix by "_en.html" or the active menu language
+                    if (!strstr($filename,'_'.$lang.$ext)) {
+                        $filename = str_replace($ext, '_'.$lang.$ext, $filename);
+                    }
+                    // Get the contents of home_menu_en.html (or active menu language
+                    // version) into $home_menu as an array of one entry per line
+                    $home_menu = file($homep.$menuf.'_'.$lang.$ext);
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                    $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                    // Prepare place to insert the new link into (default is end of file)
+                    if ($insert_where < -1 || $insert_where > (sizeof($home_menu) - 1)) {
+                        $insert_where = sizeof($home_menu) - 1;
+                    }
+                    //
+                    // For each line of the file, remove trailing spaces and special chars
+                    //foreach ($home_menu as $key => $enreg) {
+                    //	$home_menu[$key] = trim($enreg);
+                    //}
+                    //
+                    // If the given link url is empty, then replace the link url by a link to the link file created
+
+                    if (empty($link_url) || $link_url == 'http://' ||  $link_url == 'https://') {
+                        $link_url = api_get_path(WEB_PATH).'index.php?include='.urlencode($filename);
+                        // If the file doesn't exist, then create it and
+                        // fill it with default text
+
+                        $fp = @fopen($homep.$filename, 'w');
+                        if ($fp) {
+                            if (empty($link_html)) {
+                                fputs($fp, get_lang('MyTextHere'));
+                                home_tabs($homep.$filename);
+                            } else {
+                                fputs($fp, $link_html);
+                                home_tabs($homep.$filename);
+                            }
+                            fclose($fp);
+                        }
+                    }
+                    // If the requested action is to edit a link, open the file and
+                    // write to it (if the file doesn't exist, create it)
+                    if (in_array($action, array('edit_link'))  && !empty($link_html)) {
+                        $fp = @fopen($homep.$filename, 'w');
+                        if ($fp) {
+                            fputs($fp, $link_html);
+                            home_tabs($homep.$filename);
+                            fclose($fp);
+                        }
+                    }
 
                     $class_add_in_tab = 'class="show_menu"';
 
-					if (!$add_in_tab) {
-						$class_add_in_tab = 'class="hide_menu"';
-					}
+                    if (!$add_in_tab) {
+                        $class_add_in_tab = 'class="hide_menu"';
+                    }
 
-					// If the requested action is to create a link, make some room
-					// for the new link in the home_menu array at the requested place
-					// and insert the new link there
+                    // If the requested action is to create a link, make some room
+                    // for the new link in the home_menu array at the requested place
+                    // and insert the new link there
                     
-					if ($action == 'insert_link' || $action == 'insert_tabs') {
-						for ($i = sizeof($home_menu); $i; $i--) {
-							if ($i > $insert_where) {
-								$home_menu[$i] = $home_menu[$i - 1];
-							} else {
-								break;
-							}
-						}
-						$home_menu[$insert_where + 1] = '<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank ? '_blank' : '_self').'">'. $link_name .'</a></li>';
-					} else {
-						// If the request is about a link edition, change the link
-						$home_menu[$link_index]='<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'. $link_name .'</a></li>';
-					}
-					// Re-build the file from the home_menu array
-					$home_menu = implode("\n", $home_menu);
-					// Write
-					if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
-						if (is_writable($homep.$menuf.'_'.$lang.$ext)) {
-							$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-							fputs($fp, $home_menu);
-							home_tabs($homep.$menuf.'_'.$lang.$ext);
-							fclose($fp);
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									$fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
-									fputs($fp, $home_menu);
-									home_tabs($homep.$menuf.'_'.$lang_name.$ext);
-									fclose($fp);
-								}
-							}
-
-							if (file_exists($homep.$menuf.$ext)) {
-								if (is_writable($homep.$menuf.$ext)) {
-									$fpo = fopen($homep.$menuf.$ext, 'w');
-									fputs($fpo, $home_menu);
-									home_tabs($homep.$menuf.$ext);
-									fclose($fpo);
-								}
-							}
-						} else {
-							$errorMsg = get_lang('HomePageFilesNotWritable');
-						}
-					} else {
-						//File does not exist
-						$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-						fputs($fp, $home_menu);
-						home_tabs($homep.$menuf.'_'.$lang.$ext);
-						fclose($fp);
-
-						foreach ($_languages['name'] as $key => $value) {
-							$lang_name = $_languages['folder'][$key];
-							if (isset($_POST[$lang_name])) {
-								$fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_menu);
-								home_tabs($homep.$menuf.'_'.$lang_name.$ext);
-								fclose($fp);
-							}
-						}
-					}
-				}
-				Event::addEvent(
-					LOG_HOMEPAGE_CHANGED,
-					$action,
-					cut($link_name . ':' . $link_url, 254),
-					api_get_utc_datetime(),
-					api_get_user_id()
-				);
-				break;
-		} //end of switch($action)
-
-		if (empty($errorMsg)) {
-			header('Location: '.$selfUrl.'?language='.$languageGet);
-			exit();
-		}
-	} else {
-		//if POST[formSent] is not set
-		switch ($action) {
-			case 'open_link':
-				// Previously, filtering of GET['link'] was done here but it left
-				// a security threat. Filtering has now been moved outside conditions
-				break;
-			case 'delete_tabs':
-			case 'delete_link':
-				// A link is deleted by getting the file into an array, removing the
-				// link and re-writing the array to the file
-				$link_index = intval($_GET['link_index']);
-				$menuf = ($action == 'delete_tabs')? $mtloggedin : $menuf;
-				$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				foreach ($home_menu as $key => $enreg) {
-					if ($key == $link_index) {
-						unset($home_menu[$key]);
-					} else {
-						$home_menu[$key] = trim($enreg);
-					}
-				}
-				$home_menu = implode("\n", $home_menu);
-				$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-
-				$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-				fputs($fp, $home_menu);
-				home_tabs($homep.$menuf.'_'.$lang.$ext);
-				fclose($fp);
-				if (file_exists($homep.$menuf.$ext)) {
-					if (is_writable($homep.$menuf.$ext)) {
-						$fpo = fopen($homep.$menuf.$ext,'w');
-						fputs($fpo, $home_menu);
-						home_tabs($homep.$menuf.$ext);
-						fclose($fpo);
-					}
-				}
-				header('Location: '.$selfUrl);
-				exit();
-				break;
-			case 'edit_top':
-				// This request is only the preparation for the update of the home_top
-				$home_top = '';
-				if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
-					$home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
-				} elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
-					$home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				$home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
-				break;
-			case 'edit_notice':
-				// This request is only the preparation for the update of the home_notice
-				$home_notice = '';
-				if (is_file($homep.$noticef.'_'.$lang.$ext) && is_readable($homep.$noticef.'_'.$lang.$ext)) {
-					$home_notice = @file($homep.$noticef.'_'.$lang.$ext);
-				} elseif (is_file($homep.$noticef.$lang.$ext) && is_readable($homep.$noticef.$lang.$ext)) {
-					$home_notice = @file($homep.$noticef.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_notice)) {
-					$home_notice = array();
-				}
-				$notice_title = strip_tags($home_notice[0]);
-				$notice_title = api_to_system_encoding($notice_title, api_detect_encoding($notice_title));
-				$notice_text = strip_tags(str_replace('<br />', "\n", $home_notice[1]), '<a>');
-				$notice_text = api_to_system_encoding($notice_text, api_detect_encoding(strip_tags($notice_text)));
-				break;
-			case 'edit_news':
-				// This request is the preparation for the update of the home_news page
-				$home_news = '';
-				if (is_file($homep.$newsf.'_'.$lang.$ext) && is_readable($homep.$newsf.'_'.$lang.$ext)) {
-					$home_news = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
-				} elseif (is_file($homep.$newsf.$lang.$ext) && is_readable($homep.$newsf.$lang.$ext)) {
-					$home_news = @(string)file_get_contents($homep.$newsf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				$home_news = api_to_system_encoding($home_news, api_detect_encoding(strip_tags($home_news)));
-				break;
-			case 'insert_link':
-				// This request is the preparation for the addition of an item in home_menu
-				$home_menu = '';
-				$menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
-				if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				} elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-				break;
-			case 'insert_tabs':
-				// This request is the preparation for the addition of an item in home_menu
-				$home_menu = '';
-				if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-				} elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.$lang.$ext);
-				} elseif (touch($homep.$mtloggedin.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-				break;
-			case 'edit_tabs':
-			case 'edit_link':
-				// This request is the preparation for the edition of the links array
-				$home_menu = '';
-				$menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
-				if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				} elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-
-				if (empty($home_menu)) {
-					if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
-						$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
-					}
-				}
-
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-
-				$link_index = intval($_GET['link_index']);
-
-				$target_blank = false;
-				$link_name = '';
-				$link_url = '';
-
-				//$home_menu_new = array();
-				//
-				//Cleaning array
-				//foreach ($home_menu as $item) {
-				//	if(!empty($item)) {
-				//		$home_menu_new[] = $item;
-				//	}
-				//}
-				//$home_menu = $home_menu_new;
-
-				// Cleaning the array
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-
-				// For each line of the home_menu file
-				foreach ($home_menu as $key => $enreg) {
-
-					// Check if the current item is the one we want to update
-					if ($key == $link_index) {
-						// This is the link we want to update
-						// Check if the target should be "_blank"
-						if (strstr($enreg, 'target="_blank"')) {
-							$target_blank = true;
-						}
-
-						if (strstr($enreg, 'hide_menu')) {
-							$add_in_tab = false;
-						} else {
-							$add_in_tab = true;
-						}
-
-						// Remove dangerous HTML tags from the link itself (this is an
-						// additional measure in case a link previously contained
-						// unsecure tags)
-						$link_name = strip_tags($enreg);
-
-						// Get the contents of "href" attribute in $link_url
-						$enreg = explode('href="',$enreg);
-						list($link_url) = explode('"', $enreg[sizeof($enreg) - 1]);
-
-						// If the link contains the web root of this portal, then strip
-						// it off and keep only the name of the file that needs edition
-						if (strstr($link_url, '?include=')) {
-							$link_url = explode('?include=', $link_url);
-
-							$filename = $link_url[sizeof($link_url) - 1];
-
-							if (!strstr($filename, '/') && strstr($filename, '.html')) {
-								// Get oonly the contents of the link file
-								$link_html = @file($homep.$filename);
-								$link_html = implode('', $link_html);
-								$link_url = '';
-							} else {
-								$filename = '';
-							}
-						}
-						break;
-					}
-				}
-				break;
-		}//end of second switch($action) (when POST['formSent'] was not set, yet)
-	}// end of "else" in if($_POST['formSent']) condition
+                    if ($action == 'insert_link' || $action == 'insert_tabs') {
+                        for ($i = sizeof($home_menu); $i; $i--) {
+                            if ($i > $insert_where) {
+                                $home_menu[$i] = $home_menu[$i - 1];
+                            } else {
+                                break;
+                            }
+                        }
+                        $home_menu[$insert_where + 1] = '<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank ? '_blank' : '_self').'">'. $link_name .'</a></li>';
+                    } else {
+                        // If the request is about a link edition, change the link
+                        $home_menu[$link_index]='<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'. $link_name .'</a></li>';
+                    }
+                    // Re-build the file from the home_menu array
+                    $home_menu = implode("\n", $home_menu);
+                    // Write
+                    if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
+                        if (is_writable($homep.$menuf.'_'.$lang.$ext)) {
+                            $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                            fputs($fp, $home_menu);
+                            home_tabs($homep.$menuf.'_'.$lang.$ext);
+                            fclose($fp);
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    $fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
+                                    fputs($fp, $home_menu);
+                                    home_tabs($homep.$menuf.'_'.$lang_name.$ext);
+                                    fclose($fp);
+                                }
+                            }
+
+                            if (file_exists($homep.$menuf.$ext)) {
+                                if (is_writable($homep.$menuf.$ext)) {
+                                    $fpo = fopen($homep.$menuf.$ext, 'w');
+                                    fputs($fpo, $home_menu);
+                                    home_tabs($homep.$menuf.$ext);
+                                    fclose($fpo);
+                                }
+                            }
+                        } else {
+                            $errorMsg = get_lang('HomePageFilesNotWritable');
+                        }
+                    } else {
+                        //File does not exist
+                        $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                        fputs($fp, $home_menu);
+                        home_tabs($homep.$menuf.'_'.$lang.$ext);
+                        fclose($fp);
+
+                        foreach ($_languages['name'] as $key => $value) {
+                            $lang_name = $_languages['folder'][$key];
+                            if (isset($_POST[$lang_name])) {
+                                $fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_menu);
+                                home_tabs($homep.$menuf.'_'.$lang_name.$ext);
+                                fclose($fp);
+                            }
+                        }
+                    }
+                }
+                Event::addEvent(
+                    LOG_HOMEPAGE_CHANGED,
+                    $action,
+                    cut($link_name . ':' . $link_url, 254),
+                    api_get_utc_datetime(),
+                    api_get_user_id()
+                );
+                break;
+        } //end of switch($action)
+
+        if (empty($errorMsg)) {
+            header('Location: '.$selfUrl.'?language='.$languageGet);
+            exit();
+        }
+    } else {
+        //if POST[formSent] is not set
+        switch ($action) {
+            case 'open_link':
+                // Previously, filtering of GET['link'] was done here but it left
+                // a security threat. Filtering has now been moved outside conditions
+                break;
+            case 'delete_tabs':
+            case 'delete_link':
+                // A link is deleted by getting the file into an array, removing the
+                // link and re-writing the array to the file
+                $link_index = intval($_GET['link_index']);
+                $menuf = ($action == 'delete_tabs')? $mtloggedin : $menuf;
+                $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                foreach ($home_menu as $key => $enreg) {
+                    if ($key == $link_index) {
+                        unset($home_menu[$key]);
+                    } else {
+                        $home_menu[$key] = trim($enreg);
+                    }
+                }
+                $home_menu = implode("\n", $home_menu);
+                $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+
+                $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                fputs($fp, $home_menu);
+                home_tabs($homep.$menuf.'_'.$lang.$ext);
+                fclose($fp);
+                if (file_exists($homep.$menuf.$ext)) {
+                    if (is_writable($homep.$menuf.$ext)) {
+                        $fpo = fopen($homep.$menuf.$ext,'w');
+                        fputs($fpo, $home_menu);
+                        home_tabs($homep.$menuf.$ext);
+                        fclose($fpo);
+                    }
+                }
+                header('Location: '.$selfUrl);
+                exit();
+                break;
+            case 'edit_top':
+                // This request is only the preparation for the update of the home_top
+                $home_top = '';
+                if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
+                    $home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
+                } elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
+                    $home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
+                break;
+            case 'edit_notice':
+                // This request is only the preparation for the update of the home_notice
+                $home_notice = '';
+                if (is_file($homep.$noticef.'_'.$lang.$ext) && is_readable($homep.$noticef.'_'.$lang.$ext)) {
+                    $home_notice = @file($homep.$noticef.'_'.$lang.$ext);
+                } elseif (is_file($homep.$noticef.$lang.$ext) && is_readable($homep.$noticef.$lang.$ext)) {
+                    $home_notice = @file($homep.$noticef.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_notice)) {
+                    $home_notice = array();
+                }
+                $notice_title = strip_tags($home_notice[0]);
+                $notice_title = api_to_system_encoding($notice_title, api_detect_encoding($notice_title));
+                $notice_text = strip_tags(str_replace('<br />', "\n", $home_notice[1]), '<a>');
+                $notice_text = api_to_system_encoding($notice_text, api_detect_encoding(strip_tags($notice_text)));
+                break;
+            case 'edit_news':
+                // This request is the preparation for the update of the home_news page
+                $home_news = '';
+                if (is_file($homep.$newsf.'_'.$lang.$ext) && is_readable($homep.$newsf.'_'.$lang.$ext)) {
+                    $home_news = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+                } elseif (is_file($homep.$newsf.$lang.$ext) && is_readable($homep.$newsf.$lang.$ext)) {
+                    $home_news = @(string)file_get_contents($homep.$newsf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                $home_news = api_to_system_encoding($home_news, api_detect_encoding(strip_tags($home_news)));
+                break;
+            case 'insert_link':
+                // This request is the preparation for the addition of an item in home_menu
+                $home_menu = '';
+                $menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
+                if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                } elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                break;
+            case 'insert_tabs':
+                // This request is the preparation for the addition of an item in home_menu
+                $home_menu = '';
+                if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
+                } elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.$lang.$ext);
+                } elseif (touch($homep.$mtloggedin.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                break;
+            case 'edit_tabs':
+            case 'edit_link':
+                // This request is the preparation for the edition of the links array
+                $home_menu = '';
+                $menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
+                if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                } elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+
+                if (empty($home_menu)) {
+                    if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
+                        $home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
+                    }
+                }
+
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+
+                $link_index = intval($_GET['link_index']);
+
+                $target_blank = false;
+                $link_name = '';
+                $link_url = '';
+
+                //$home_menu_new = array();
+                //
+                //Cleaning array
+                //foreach ($home_menu as $item) {
+                //	if(!empty($item)) {
+                //		$home_menu_new[] = $item;
+                //	}
+                //}
+                //$home_menu = $home_menu_new;
+
+                // Cleaning the array
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+
+                // For each line of the home_menu file
+                foreach ($home_menu as $key => $enreg) {
+
+                    // Check if the current item is the one we want to update
+                    if ($key == $link_index) {
+                        // This is the link we want to update
+                        // Check if the target should be "_blank"
+                        if (strstr($enreg, 'target="_blank"')) {
+                            $target_blank = true;
+                        }
+
+                        if (strstr($enreg, 'hide_menu')) {
+                            $add_in_tab = false;
+                        } else {
+                            $add_in_tab = true;
+                        }
+
+                        // Remove dangerous HTML tags from the link itself (this is an
+                        // additional measure in case a link previously contained
+                        // unsecure tags)
+                        $link_name = strip_tags($enreg);
+
+                        // Get the contents of "href" attribute in $link_url
+                        $enreg = explode('href="',$enreg);
+                        list($link_url) = explode('"', $enreg[sizeof($enreg) - 1]);
+
+                        // If the link contains the web root of this portal, then strip
+                        // it off and keep only the name of the file that needs edition
+                        if (strstr($link_url, '?include=')) {
+                            $link_url = explode('?include=', $link_url);
+
+                            $filename = $link_url[sizeof($link_url) - 1];
+
+                            if (!strstr($filename, '/') && strstr($filename, '.html')) {
+                                // Get oonly the contents of the link file
+                                $link_html = @file($homep.$filename);
+                                $link_html = implode('', $link_html);
+                                $link_url = '';
+                            } else {
+                                $filename = '';
+                            }
+                        }
+                        break;
+                    }
+                }
+                break;
+        }//end of second switch($action) (when POST['formSent'] was not set, yet)
+    }// end of "else" in if($_POST['formSent']) condition
 } else {
-	//if $action is empty, then prepare a list of the course categories to display (?)
-	$Categories = getCategoriesToDisplayInHomePage();
+    //if $action is empty, then prepare a list of the course categories to display (?)
+    $Categories = getCategoriesToDisplayInHomePage();
 }
 
 // Display section
@@ -782,25 +782,25 @@ 
 Display::display_header($tool_name);
 
 switch ($action) {
-	case 'open_link':
-		if (!empty($link)) {
-			// $link is only set in case of action=open_link and is filtered
-			$open = @(string)file_get_contents($homep.$link);
-			$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-			echo $open;
-		}
-		break;
-	case 'edit_notice':
-		// Display for edit_notice case
-		?>
+    case 'open_link':
+        if (!empty($link)) {
+            // $link is only set in case of action=open_link and is filtered
+            $open = @(string)file_get_contents($homep.$link);
+            $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+            echo $open;
+        }
+        break;
+    case 'edit_notice':
+        // Display for edit_notice case
+        ?>
 		<form action="<?php echo $selfUrl; ?>?action=<?php echo $action; ?>" method="post" class="form-horizontal">
 			<legend><?php echo $tool_name; ?></legend>
 			<input type="hidden" name="formSent" value="1"/>
 			<?php
-			if (!empty($errorMsg)) {
-				Display::display_normal_message($errorMsg);
-			}
-			?>
+            if (!empty($errorMsg)) {
+                Display::display_normal_message($errorMsg);
+            }
+            ?>
                         <div class="row">
                             <div class="col-md-12">
                                 <p><?php echo get_lang('LetThoseFieldsEmptyToHideTheNotice'); ?></p>
@@ -838,170 +838,170 @@ 
                         </div>
 		</form>
 		<?php
-		break;
-	case 'insert_tabs':
-	case 'edit_tabs':
-	case 'insert_link':
-	case 'edit_link':
-		$menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
-		if (!empty($errorMsg)) {
-			Display::display_normal_message($errorMsg);
-		}
-		$default = array();
-		$form = new FormValidator('configure_homepage_'.$action, 'post', $selfUrl.'?action='.$action, '', array('style' => 'margin: 0px;'));
-		$renderer =& $form->defaultRenderer();
-
-		$form->addElement('header', '', $tool_name);
-		$form->addElement('hidden', 'formSent', '1');
-		$form->addElement('hidden', 'link_index', ($action == 'edit_link' || $action == 'edit_tabs') ? $link_index : '0');
-		$form->addElement('hidden', 'filename', ($action == 'edit_link' || $action == 'edit_tabs') ? (!empty($filename) ? $filename : '') : '');
-
-		$form->addElement('text', 'link_name', get_lang('LinkName'), array('size' => '30', 'maxlength' => '50'));
-		if (!empty($link_name)) {
-			$default['link_name'] = $link_name;
-		}
-		$default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES);
-		$linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'<br />'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : '';
-		$form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;'));
-
-		$options = array('-1' => get_lang('FirstPlace'));
-
-		$selected = '';
-
-		if ($action == 'insert_link' || $action == 'insert_tabs') {
-			$add_in_tab = 1;
-			if (is_array($home_menu)){
-				foreach ($home_menu as $key => $enreg) {
-					if (strlen($enreg = trim(strip_tags($enreg))) > 0) {
-						$options[$key] = get_lang('After').' &quot;'.$enreg.'&quot;';
-						$formSentCheck = (!empty($_POST['formSent']) ? true : false);
-						$selected = $formSentCheck && $insert_where == $key ? $key : '';
-					}
-				}
-			}
-			$default['insert_link'] = $selected;
-			$form->addElement('select', 'insert_where', get_lang('InsertThisLink') , $options);
-		}
-
-		$target_blank_checkbox = $form->addElement('checkbox', 'target_blank', null, get_lang('OpenInNewWindow'), 1);
-
-		if ($action == 'insert_tabs' || $action == 'edit_tabs') {
-			$form->addElement('checkbox', 'add_in_tab', null, get_lang('AddInMenu'), 1);
-			$default['add_in_tab'] = $add_in_tab;
-		}
-
-		if (!empty($target_blank)) { $target_blank_checkbox->setChecked(true); }
-
-		if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://' || $link_url == 'https://')) {
-			$default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : $link_html;
-			$form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+        break;
+    case 'insert_tabs':
+    case 'edit_tabs':
+    case 'insert_link':
+    case 'edit_link':
+        $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
+        if (!empty($errorMsg)) {
+            Display::display_normal_message($errorMsg);
+        }
+        $default = array();
+        $form = new FormValidator('configure_homepage_'.$action, 'post', $selfUrl.'?action='.$action, '', array('style' => 'margin: 0px;'));
+        $renderer =& $form->defaultRenderer();
+
+        $form->addElement('header', '', $tool_name);
+        $form->addElement('hidden', 'formSent', '1');
+        $form->addElement('hidden', 'link_index', ($action == 'edit_link' || $action == 'edit_tabs') ? $link_index : '0');
+        $form->addElement('hidden', 'filename', ($action == 'edit_link' || $action == 'edit_tabs') ? (!empty($filename) ? $filename : '') : '');
+
+        $form->addElement('text', 'link_name', get_lang('LinkName'), array('size' => '30', 'maxlength' => '50'));
+        if (!empty($link_name)) {
+            $default['link_name'] = $link_name;
+        }
+        $default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES);
+        $linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'<br />'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : '';
+        $form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;'));
+
+        $options = array('-1' => get_lang('FirstPlace'));
+
+        $selected = '';
+
+        if ($action == 'insert_link' || $action == 'insert_tabs') {
+            $add_in_tab = 1;
+            if (is_array($home_menu)){
+                foreach ($home_menu as $key => $enreg) {
+                    if (strlen($enreg = trim(strip_tags($enreg))) > 0) {
+                        $options[$key] = get_lang('After').' &quot;'.$enreg.'&quot;';
+                        $formSentCheck = (!empty($_POST['formSent']) ? true : false);
+                        $selected = $formSentCheck && $insert_where == $key ? $key : '';
+                    }
+                }
+            }
+            $default['insert_link'] = $selected;
+            $form->addElement('select', 'insert_where', get_lang('InsertThisLink') , $options);
+        }
+
+        $target_blank_checkbox = $form->addElement('checkbox', 'target_blank', null, get_lang('OpenInNewWindow'), 1);
+
+        if ($action == 'insert_tabs' || $action == 'edit_tabs') {
+            $form->addElement('checkbox', 'add_in_tab', null, get_lang('AddInMenu'), 1);
+            $default['add_in_tab'] = $add_in_tab;
+        }
+
+        if (!empty($target_blank)) { $target_blank_checkbox->setChecked(true); }
+
+        if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://' || $link_url == 'https://')) {
+            $default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : $link_html;
+            $form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
             $form->addButtonSave(get_lang('Save'),'submit');
 
-		} else {
-			if (in_array($action, array('edit_tabs','insert_tabs'))) {
-				$default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : (!empty($link_html) ? $link_html : '');
-				$form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-			}
-			$form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'), array('id' => 'all_langs'));
-			$form->addElement('html','<table id="table_langs" style="margin-left:159px;"><tr>');
-			$i = 0;
-			foreach ($_languages['name'] as $key => $value) {
-				$i++;
-				$lang_name = $_languages['folder'][$key];
-				$html_langs = '<td width="300">';
-				$html_langs .= '<label><input type="checkbox" id="lang" name="'.$lang_name.'" />&nbsp;'.$lang_name.'<label/>';
-				$html_langs .= '</td>';
-				if ($i % 5 == 0) {
-					$html_langs .= '</tr><tr>';
-				}
-				$form->addElement('html', $html_langs);
-			}
-			$form->addElement('html','</tr></table><br/>');
+        } else {
+            if (in_array($action, array('edit_tabs','insert_tabs'))) {
+                $default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : (!empty($link_html) ? $link_html : '');
+                $form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+            }
+            $form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'), array('id' => 'all_langs'));
+            $form->addElement('html','<table id="table_langs" style="margin-left:159px;"><tr>');
+            $i = 0;
+            foreach ($_languages['name'] as $key => $value) {
+                $i++;
+                $lang_name = $_languages['folder'][$key];
+                $html_langs = '<td width="300">';
+                $html_langs .= '<label><input type="checkbox" id="lang" name="'.$lang_name.'" />&nbsp;'.$lang_name.'<label/>';
+                $html_langs .= '</td>';
+                if ($i % 5 == 0) {
+                    $html_langs .= '</tr><tr>';
+                }
+                $form->addElement('html', $html_langs);
+            }
+            $form->addElement('html','</tr></table><br/>');
             $form->addButtonSave(get_lang('Save'),'submit');
-		}
-
-		$form->setDefaults($default);
-		$form->display();
-
-		break;
-	case 'edit_top':
-	case 'edit_news':
-		if ($action == 'edit_top') {
-			$name = $topf;
-			$open = $home_top;
-		} else {
-			$name = $newsf;
-			$open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
-		}
-		$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-
-		if (!empty($errorMsg)) {
-			Display::display_normal_message($errorMsg); //main API
-		}
-
-		$default = array();
-		$form = new FormValidator(
-			'configure_homepage_'.$action,
-			'post',
-			$selfUrl.'?action='.$action,
-			'',
-			array('style' => 'margin: 0px;')
-		);
-		$renderer =& $form->defaultRenderer();
-		$renderer->setHeaderTemplate('');
-		$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-		$renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
-		$renderer->setRequiredNoteTemplate('');
-		$form->addElement('hidden', 'formSent', '1');
-
-		if ($action == 'edit_news') {
-			$_languages = api_get_languages();
-			$html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
-			$html .= '<select name="news_languages">';
-			$html .= '<option value="all">'.get_lang('ApplyAllLanguages').'</option>';
-			foreach ($_languages['name'] as $key => $value) {
-				$english_name = $_languages['folder'][$key];
-				if ($language == $english_name) {
-					$html .= '<option value="'.$english_name.'" selected="selected">'.$value.'</option>';
-				} else {
-					$html .= '<option value="'.$english_name.'">'.$value.'</option>';
-				}
-			}
-			$html .= '</select></td></tr>';
-			$form->addElement('html', $html);
-		}
-
-		$default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
-		$form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-		$form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'),array('id' => 'all_langs'));
-		$form->addElement('html','<table id="table_langs" style="margin-left:5px;"><tr>');
-
-		$currentLanguage = api_get_interface_language();
-		$i = 0;
-		foreach ($_languages['name'] as $key => $value) {
-			$lang_name = $_languages['folder'][$key];
-			$i++;
-
-			$checked = null;
-			if ($languageGet == $lang_name)  {
-				$checked = "checked";
-			}
-			$html_langs = '<td width="300">';
-			$html_langs .= '<label><input type="checkbox" '.$checked.' id="lang" name="'.$lang_name.'" />&nbsp;'.$value.'<label/>';
-			$html_langs .= '</td>';
-			if ($i % 5 == 0) {
-				$html_langs .= '</tr><tr>';
-			}
-			$form->addElement('html', $html_langs);
-		}
-		$form->addElement('html','</tr></table><br/>');
-		$form->addButtonSave(get_lang('Save'));
-		$form->setDefaults($default);
-		$form->display();
-
-		break;
-	default: // When no action applies, default page to update campus homepage
-		?>
+        }
+
+        $form->setDefaults($default);
+        $form->display();
+
+        break;
+    case 'edit_top':
+    case 'edit_news':
+        if ($action == 'edit_top') {
+            $name = $topf;
+            $open = $home_top;
+        } else {
+            $name = $newsf;
+            $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+        }
+        $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+
+        if (!empty($errorMsg)) {
+            Display::display_normal_message($errorMsg); //main API
+        }
+
+        $default = array();
+        $form = new FormValidator(
+            'configure_homepage_'.$action,
+            'post',
+            $selfUrl.'?action='.$action,
+            '',
+            array('style' => 'margin: 0px;')
+        );
+        $renderer =& $form->defaultRenderer();
+        $renderer->setHeaderTemplate('');
+        $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
+        $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
+        $renderer->setRequiredNoteTemplate('');
+        $form->addElement('hidden', 'formSent', '1');
+
+        if ($action == 'edit_news') {
+            $_languages = api_get_languages();
+            $html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
+            $html .= '<select name="news_languages">';
+            $html .= '<option value="all">'.get_lang('ApplyAllLanguages').'</option>';
+            foreach ($_languages['name'] as $key => $value) {
+                $english_name = $_languages['folder'][$key];
+                if ($language == $english_name) {
+                    $html .= '<option value="'.$english_name.'" selected="selected">'.$value.'</option>';
+                } else {
+                    $html .= '<option value="'.$english_name.'">'.$value.'</option>';
+                }
+            }
+            $html .= '</select></td></tr>';
+            $form->addElement('html', $html);
+        }
+
+        $default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
+        $form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+        $form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'),array('id' => 'all_langs'));
+        $form->addElement('html','<table id="table_langs" style="margin-left:5px;"><tr>');
+
+        $currentLanguage = api_get_interface_language();
+        $i = 0;
+        foreach ($_languages['name'] as $key => $value) {
+            $lang_name = $_languages['folder'][$key];
+            $i++;
+
+            $checked = null;
+            if ($languageGet == $lang_name)  {
+                $checked = "checked";
+            }
+            $html_langs = '<td width="300">';
+            $html_langs .= '<label><input type="checkbox" '.$checked.' id="lang" name="'.$lang_name.'" />&nbsp;'.$value.'<label/>';
+            $html_langs .= '</td>';
+            if ($i % 5 == 0) {
+                $html_langs .= '</tr><tr>';
+            }
+            $form->addElement('html', $html_langs);
+        }
+        $form->addElement('html','</tr></table><br/>');
+        $form->addButtonSave(get_lang('Save'));
+        $form->setDefaults($default);
+        $form->display();
+
+        break;
+    default: // When no action applies, default page to update campus homepage
+        ?>
 
 <section id="page-home">
     <div class="row">
@@ -1157,53 +1157,53 @@ 
             ?>
 
             <?php
-		if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
+        if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
                     $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
                     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
                     echo $open;
-		} else {
+        } else {
                     $open = @(string)file_get_contents($homep.$newsf.$ext);
                     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
                     echo $open;
-		}
+        }
             ?>
 
             <?php
                 // Add new page
-		$home_menu = '';
-		if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
+        $home_menu = '';
+        if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
                     $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-		} else {
+        } else {
                     $home_menu = @file($homep.$mtloggedin.$ext);
-		}
-		if (empty($home_menu)) {
+        }
+        if (empty($home_menu)) {
                     if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
-			$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
+            $home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
                     }
-		}
-		if (empty($home_menu)) {
+        }
+        if (empty($home_menu)) {
                     $home_menu = array();
-		}
-		if (!empty($home_menu)) {
+        }
+        if (!empty($home_menu)) {
                     $home_menu = implode("\n", $home_menu);
                     $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
                     $home_menu = explode("\n", $home_menu);
-		}
-		$link_list = '';
-		$tab_counter = 0;
+        }
+        $link_list = '';
+        $tab_counter = 0;
                     foreach ($home_menu as $enreg) {
                     $enreg = trim($enreg);
-			if (!empty($enreg)) {
+            if (!empty($enreg)) {
                             $edit_link   = ' <a href="'.$selfUrl.'?action=edit_tabs&amp;link_index='.$tab_counter.'" ><span>'.Display::return_icon('edit.png', get_lang('Edit')).'</span></a>';
                             $delete_link = ' <a href="'.$selfUrl.'?action=delete_tabs&amp;link_index='.$tab_counter.'"  onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;"><span>'.Display::return_icon('delete.png', get_lang('Delete')).'</span></a>';
                             $tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', '</li>'),
                                 array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename($selfUrl).'?action=open_link&link=', $edit_link.$delete_link.'</li>'),
-				$enreg);
+                $enreg);
                             $tab_string = str_replace(array('<li>', '</li>','class="hide_menu"', 'hide_menu'), '', $tab_string);
-				$link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
-				$tab_counter++;
-			}
-		}
+                $link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
+                $tab_counter++;
+            }
+        }
             ?>
             <div class="actions">
 		<a href="<?php echo $selfUrl; ?>?action=insert_tabs">
@@ -1211,9 +1211,9 @@ 
                 </a>
             </div>
             <?php
-		echo '<ul id="list-hiperlink" class="list-group">';
-		echo $link_list;
-		echo '</ul>';
+        echo '<ul id="list-hiperlink" class="list-group">';
+        echo $link_list;
+        echo '</ul>';
             ?>
         </div>
     </div>

custompages/language.inc.php

Indentation +8 added lines, -8 removed lines

@@ -29,11 +29,11 @@ 
     krsort($langs, SORT_NUMERIC);
     // Choosing the best match
     foreach($langs as $weight => $codes) {
-		foreach ($codes as $code) {
-        	if (in_array($code, $available_langs)) {
-            	return $code;
-        	}
-		}
+        foreach ($codes as $code) {
+            if (in_array($code, $available_langs)) {
+                return $code;
+            }
+        }
     }
     // No match
     return null;
@@ -44,7 +44,7 @@ 
  * use this if you want to avoid translation caching issues
  */
 function cp_get_lang($variable) {
-	return get_lang($variable, null, $_SESSION['user_language_choice']);
+    return get_lang($variable, null, $_SESSION['user_language_choice']);
 }
 /**
  * Code
@@ -63,12 +63,12 @@ 
 
 // Chamilo overrides this parameters at some places, e.g. in the logout link
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
-	$lang_match = $_REQUEST['language'];
+    $lang_match = $_REQUEST['language'];
 }
 
 // Maybe a language had already been selected, we should honor this
 if (isset($_SESSION['user_language_choice']) && in_array($_SESSION['user_language_choice'], $chamilo_langs)) {
-	$lang_match = $_SESSION['user_language_choice'];
+    $lang_match = $_SESSION['user_language_choice'];
 }
 
 // We need to set the relevant session variables to the best match, to use Chamilo's i18n lib.

custompages/first_login-dist.php

Indentation +23 added lines, -23 removed lines

@@ -14,7 +14,7 @@ 
  * Security checks
  */
 if (! isset($_SESSION['conditional_login']['uid']))
-  die("Not Authorised");
+    die("Not Authorised");
 
 if (isset($_POST['password'])) {
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
@@ -27,26 +27,26 @@ 
         exit();
     }
     $password = $_POST['password'];
-	$updated = UserManager::update_user(
-		$u['user_id'],
-		$u['firstname'],
-		$u['lastname'],
-		$u['username'],
-		$password,
-		$u['auth_source'],
-		$u['email'],
-		$u['status'],
-		$u['official_code'],
-		$u['phone'],
-		$u['picture_uri'],
-		$u['expiration_date'],
-		$u['active'],
-		$u['creator_id'],
-		$u['hr_dept_id'],
-		null,
-		$u['language'],
-		''
-	);
+    $updated = UserManager::update_user(
+        $u['user_id'],
+        $u['firstname'],
+        $u['lastname'],
+        $u['username'],
+        $password,
+        $u['auth_source'],
+        $u['email'],
+        $u['status'],
+        $u['official_code'],
+        $u['phone'],
+        $u['picture_uri'],
+        $u['expiration_date'],
+        $u['active'],
+        $u['creator_id'],
+        $u['hr_dept_id'],
+        null,
+        $u['language'],
+        ''
+    );
 
     if ($updated !== false) {
         UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true');
@@ -104,8 +104,8 @@ 
 		<div id="changepassword-form-box" class="form-box">
       <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
 		<?php if (isset($error_message)) {
-			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
-		}?>
+            echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
+        }?>
 			<form id="changepassword-form" class="form" method="post">
 				<div>
           <label for="password">*<?php echo custompages_get_lang('Password');?></label>