chamilo / chamilo-lms

main/blog/download.php

Indentation +7 added lines, -7 removed lines

@@ -33,18 +33,18 @@
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
 if (! isset($_course)) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 $full_file_name = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/blog/'.$doc_url;
 
 //if the rewrite rule asks for a directory, we redirect to the course view
 if (is_dir($full_file_name)) {
-	//remove last slash if present
-	while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
-	//create the path
-	$document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
-	//redirect
-	header('Location: '.$document_explorer);
+    //remove last slash if present
+    while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+    //create the path
+    $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
+    //redirect
+    header('Location: '.$document_explorer);
     exit;
 }
 

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 session_cache_limiter('public');
 
 require_once '../inc/global.inc.php';
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 // IMPORTANT to avoid caching of documents
 header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
@@ -32,7 +32,7 @@ 
 $doc_url = str_replace(' ', '+', $doc_url);
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
-if (! isset($_course)) {
+if (!isset($_course)) {
 	api_not_allowed(true);
 }
 $full_file_name = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/blog/'.$doc_url;
@@ -40,7 +40,7 @@ 
 //if the rewrite rule asks for a directory, we redirect to the course view
 if (is_dir($full_file_name)) {
 	//remove last slash if present
-	while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+	while ($doc_url{$dul = strlen($doc_url) - 1} == '/') $doc_url = substr($doc_url, 0, $dul);
 	//create the path
 	$document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
 	//redirect
@@ -48,7 +48,7 @@ 
     exit;
 }
 
-$tbl_blogs_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+$tbl_blogs_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 $course_id = api_get_course_int_id();
 
 // launch event

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
 //if the rewrite rule asks for a directory, we redirect to the course view
 if (is_dir($full_file_name)) {
 	//remove last slash if present
-	while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+	while ($doc_url{$dul = strlen($doc_url)-1}=='/') {
+	    $doc_url = substr($doc_url,0,$dul);
+	}
 	//create the path
 	$document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
 	//redirect

main/blog/blog.php

Braces +11 added lines, -9 removed lines

@@ -379,9 +379,10 @@ 
 	$result = Database::query($sql);
 	$row = Database::fetch_array($result);
 
-	if ($row['number'] == 1)
-		$user_task = true;
-}
+	if ($row['number'] == 1) {
+			$user_task = true;
+	}
+	}
 
 switch ($action) {
 	case 'new_post':
@@ -468,16 +469,17 @@ 
 			echo '<br /><br />';
 			Blog :: display_assigned_task_list($blog_id);
 			echo '<br /><br />';
+		} else {
+					api_not_allowed();
 		}
-		else
-			api_not_allowed();
 
 		break;
 	case 'execute_task' :
-		if (isset ($_GET['post_id']))
-			Blog :: display_post($blog_id, intval($_GET['post_id']));
-		else
-			Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
+		if (isset ($_GET['post_id'])) {
+					Blog :: display_post($blog_id, intval($_GET['post_id']));
+		} else {
+					Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
+		}
 
 		break;
 	case 'view_search_result' :

Indentation +288 added lines, -288 removed lines

@@ -41,181 +41,181 @@ 
 $safe_task_description  = isset($_POST['task_description']) ? Security::remove_XSS($_POST['task_description']) : null;
 
 if (!empty($_POST['new_post_submit'])) {
-	Blog:: create_post(
-		$_POST['title'],
-		$_POST['full_text'],
-		$_POST['post_file_comment'],
-		$blog_id
-	);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
+    Blog:: create_post(
+        $_POST['title'],
+        $_POST['full_text'],
+        $_POST['post_file_comment'],
+        $blog_id
+    );
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
 }
 if (!empty($_POST['edit_post_submit'])) {
-	Blog:: edit_post(
-		$_POST['post_id'],
-		$_POST['title'],
-		$_POST['full_text'],
-		$blog_id
-	);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
+    Blog:: edit_post(
+        $_POST['post_id'],
+        $_POST['title'],
+        $_POST['full_text'],
+        $blog_id
+    );
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
 }
 
 if (!empty($_POST['new_comment_submit'])) {
-	Blog:: create_comment(
-		$_POST['title'],
-		$_POST['comment'],
-		$_POST['post_file_comment'],
-		$blog_id,
-		$_GET['post_id'],
-		$_POST['comment_parent_id']
-	);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
+    Blog:: create_comment(
+        $_POST['title'],
+        $_POST['comment'],
+        $_POST['post_file_comment'],
+        $blog_id,
+        $_GET['post_id'],
+        $_POST['comment_parent_id']
+    );
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
 }
 
 if (!empty($_POST['new_task_submit'])) {
 
-	Blog:: create_task(
-		$blog_id,
-		$safe_task_name,
-		$safe_task_description,
-		(isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null),
-		(isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null),
-		(isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null),
-		(isset($_POST['task_color']) ? $_POST['task_color'] : null)
-	);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
+    Blog:: create_task(
+        $blog_id,
+        $safe_task_name,
+        $safe_task_description,
+        (isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null),
+        (isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null),
+        (isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null),
+        (isset($_POST['task_color']) ? $_POST['task_color'] : null)
+    );
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
 }
 
 if (isset($_POST['edit_task_submit'])) {
-	Blog:: edit_task(
-		$_POST['blog_id'],
-		$_POST['task_id'],
-		$safe_task_name,
-		$safe_task_description,
-		$_POST['chkArticleDelete'],
-		$_POST['chkArticleEdit'],
-		$_POST['chkCommentsDelete'],
-		$_POST['task_color']
-	);
-	$return_message = array(
-		'type' => 'confirmation',
-		'message' => get_lang('TaskEdited')
-	);
+    Blog:: edit_task(
+        $_POST['blog_id'],
+        $_POST['task_id'],
+        $safe_task_name,
+        $safe_task_description,
+        $_POST['chkArticleDelete'],
+        $_POST['chkArticleEdit'],
+        $_POST['chkCommentsDelete'],
+        $_POST['task_color']
+    );
+    $return_message = array(
+        'type' => 'confirmation',
+        'message' => get_lang('TaskEdited')
+    );
 }
 
 if (!empty($_POST['assign_task_submit'])) {
-	Blog:: assign_task(
-		$blog_id,
-		$_POST['task_user_id'],
-		$_POST['task_task_id'],
-		$_POST['task_day']
-	);
-	$return_message = array(
-		'type' => 'confirmation',
-		'message' => get_lang('TaskAssigned')
-	);
+    Blog:: assign_task(
+        $blog_id,
+        $_POST['task_user_id'],
+        $_POST['task_task_id'],
+        $_POST['task_day']
+    );
+    $return_message = array(
+        'type' => 'confirmation',
+        'message' => get_lang('TaskAssigned')
+    );
 }
 
 if (isset($_POST['assign_task_edit_submit'])) {
-	Blog:: edit_assigned_task(
-		$blog_id,
-		$_POST['task_user_id'],
-		$_POST['task_task_id'],
-		$_POST['task_day'],
-		$_POST['old_user_id'],
-		$_POST['old_task_id'],
-		$_POST['old_target_date']
-	);
-	$return_message = array(
-		'type' => 'confirmation',
-		'message' => get_lang('AssignedTaskEdited')
-	);
+    Blog:: edit_assigned_task(
+        $blog_id,
+        $_POST['task_user_id'],
+        $_POST['task_task_id'],
+        $_POST['task_day'],
+        $_POST['old_user_id'],
+        $_POST['old_task_id'],
+        $_POST['old_target_date']
+    );
+    $return_message = array(
+        'type' => 'confirmation',
+        'message' => get_lang('AssignedTaskEdited')
+    );
 }
 if (!empty($_POST['new_task_execution_submit'])) {
-	Blog:: create_comment(
-		$safe_comment_title,
-		$safe_comment_text,
-		$blog_id,
-		(int)$_GET['post_id'],
-		$_POST['comment_parent_id'],
-		$_POST['task_id']
-	);
-	$return_message = array(
-		'type' => 'confirmation',
-		'message' => get_lang('CommentCreated')
-	);
+    Blog:: create_comment(
+        $safe_comment_title,
+        $safe_comment_text,
+        $blog_id,
+        (int)$_GET['post_id'],
+        $_POST['comment_parent_id'],
+        $_POST['task_id']
+    );
+    $return_message = array(
+        'type' => 'confirmation',
+        'message' => get_lang('CommentCreated')
+    );
 }
 if (!empty($_POST['register'])) {
-	if (is_array($_POST['user'])) {
-		foreach ($_POST['user'] as $index => $user_id) {
-			Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
-		}
-	}
+    if (is_array($_POST['user'])) {
+        foreach ($_POST['user'] as $index => $user_id) {
+            Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
+        }
+    }
 }
 if (!empty($_POST['unregister'])) {
-	if (is_array($_POST['user'])) {
-		foreach ($_POST['user'] as $index => $user_id) {
-			Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
-		}
-	}
+    if (is_array($_POST['user'])) {
+        foreach ($_POST['user'] as $index => $user_id) {
+            Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
+        }
+    }
 }
 if (!empty($_GET['register'])) {
-	Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
-	$flag = 1;
+    Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
+    $flag = 1;
 }
 if (!empty($_GET['unregister'])) {
-	Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
+    Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
 }
 
 if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
-	if (isset($_GET['do']) && $_GET['do'] == 'delete') {
-		Blog :: delete_task($blog_id, (int)$_GET['task_id']);
-		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
-	}
-
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') {
-		Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
-		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
-	}
+    if (isset($_GET['do']) && $_GET['do'] == 'delete') {
+        Blog :: delete_task($blog_id, (int)$_GET['task_id']);
+        $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
+    }
+
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') {
+        Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
+        $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
+    }
 }
 
 if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
-	$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
-
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
-			Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
-			$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
-		} else {
-			$error = true;
-			$message = get_lang('ActionNotAllowed');
-		}
-	}
-
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
-			Blog :: delete_post($blog_id, (int)$_GET['article_id']);
-			$action = ''; // Article is gone, go to blog home
-			$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
-		} else {
-			$error = true;
-			$message = get_lang('ActionNotAllowed');
-		}
-	}
-	if (isset($_GET['do']) && $_GET['do'] == 'rate') {
-		if (isset($_GET['type']) && $_GET['type'] == 'post') {
-			if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
-				Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
-				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
-			}
-		}
-		if (isset($_GET['type']) && $_GET['type'] == 'comment') {
-			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
-				Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
-				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
-			}
-		}
-	}
+    $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
+
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
+            Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
+            $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
+        } else {
+            $error = true;
+            $message = get_lang('ActionNotAllowed');
+        }
+    }
+
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
+            Blog :: delete_post($blog_id, (int)$_GET['article_id']);
+            $action = ''; // Article is gone, go to blog home
+            $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
+        } else {
+            $error = true;
+            $message = get_lang('ActionNotAllowed');
+        }
+    }
+    if (isset($_GET['do']) && $_GET['do'] == 'rate') {
+        if (isset($_GET['type']) && $_GET['type'] == 'post') {
+            if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
+                Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
+                $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
+            }
+        }
+        if (isset($_GET['type']) && $_GET['type'] == 'comment') {
+            if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
+                Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
+                $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
+            }
+        }
+    }
 }
 /*
 	DISPLAY
@@ -223,67 +223,67 @@ 
 
 // Set breadcrumb
 switch ($action) {
-	case 'new_post' :
-		$nameTools = get_lang('NewPost');
+    case 'new_post' :
+        $nameTools = get_lang('NewPost');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             "name" => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'manage_tasks' :
-		$nameTools = get_lang('TaskManager');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'manage_tasks' :
+        $nameTools = get_lang('TaskManager');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             "name" => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'manage_members' :
-		$nameTools = get_lang('MemberManager');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'manage_members' :
+        $nameTools = get_lang('MemberManager');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             "name" => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'manage_rights' :
-		$nameTools = get_lang('RightsManager');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'manage_rights' :
+        $nameTools = get_lang('RightsManager');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             'name' => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'view_search_result' :
-		$nameTools = get_lang('SearchResults');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'view_search_result' :
+        $nameTools = get_lang('SearchResults');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             'name' => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	case 'execute_task' :
-		$nameTools = get_lang('ExecuteThisTask');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    case 'execute_task' :
+        $nameTools = get_lang('ExecuteThisTask');
         $interbreadcrumb[] = array(
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
             'name' => Blog:: get_blog_title($blog_id),
         );
-		Display :: display_header($nameTools, 'Blogs');
-		break;
-	default :
-		$nameTools = Blog :: get_blog_title($blog_id);
-		Display :: display_header($nameTools, 'Blogs');
+        Display :: display_header($nameTools, 'Blogs');
+        break;
+    default :
+        $nameTools = Blog :: get_blog_title($blog_id);
+        Display :: display_header($nameTools, 'Blogs');
 }
 
 // feedback messages
 if (!empty($return_message)) {
-	if ($return_message['type'] == 'confirmation') {
-		Display::display_confirmation_message($return_message['message']);
-	}
-	if ($return_message['type'] == 'error') {
-		Display::display_error_message($return_message['message']);
-	}
+    if ($return_message['type'] == 'confirmation') {
+        Display::display_confirmation_message($return_message['message']);
+    }
+    if ($return_message['type'] == 'error') {
+        Display::display_error_message($return_message['message']);
+    }
 }
 
 // actions
@@ -350,12 +350,12 @@ 
 		<?php
 
 if (isset($error)) {
-	Display :: display_error_message($message);
+    Display :: display_error_message($message);
 }
 
 if (isset($flag) && $flag == '1') {
-	$action = "manage_tasks";
-	Blog :: display_assign_task_form($blog_id);
+    $action = "manage_tasks";
+    Blog :: display_assign_task_form($blog_id);
 }
 
 $user_task = false;
@@ -363,12 +363,12 @@ 
 $course_id = api_get_course_int_id();
 
 if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
-	$task_id = (int)$_GET['task_id'];
+    $task_id = (int)$_GET['task_id'];
 } else {
-	$task_id = 0;
-	$tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+    $task_id = 0;
+    $tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 
-	$sql = "SELECT COUNT(*) as number
+    $sql = "SELECT COUNT(*) as number
 			FROM ".$tbl_blogs_tasks_rel_user."
 			WHERE
 			    c_id = $course_id AND
@@ -376,120 +376,120 @@ 
 				user_id = ".api_get_user_id()." AND
 				task_id = ".$task_id;
 
-	$result = Database::query($sql);
-	$row = Database::fetch_array($result);
+    $result = Database::query($sql);
+    $row = Database::fetch_array($result);
 
-	if ($row['number'] == 1)
-		$user_task = true;
+    if ($row['number'] == 1)
+        $user_task = true;
 }
 
 switch ($action) {
-	case 'new_post':
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
-			// we show the form if
-			// 1. no post data
-			// 2. there is post data and the required field is empty
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
-				// if there is post data there is certainly an error in the form
-				if ($_POST) {
-					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
-				}
-			Blog :: display_form_new_post($blog_id);
-		} else {
-				if (isset($_GET['filter']) && !empty($_GET['filter'])) {
-					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
-				} else {
-					Blog :: display_blog_posts($blog_id);
-				}
-			}
-		} else {
-			api_not_allowed();
-		}
-		break;
-	case 'view_post' :
-		Blog :: display_post($blog_id, intval($_GET['post_id']));
-		break;
-	case 'edit_post' :
-		$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
-
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
-			// we show the form if
-			// 1. no post data
-			// 2. there is post data and the required field is empty
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
-				// if there is post data there is certainly an error in the form
-				if ($_POST) {
-					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
-				}
+    case 'new_post':
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
+            // we show the form if
+            // 1. no post data
+            // 2. there is post data and the required field is empty
+            if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
+                // if there is post data there is certainly an error in the form
+                if ($_POST) {
+                    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
+                }
+            Blog :: display_form_new_post($blog_id);
+        } else {
+                if (isset($_GET['filter']) && !empty($_GET['filter'])) {
+                    Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
+                } else {
+                    Blog :: display_blog_posts($blog_id);
+                }
+            }
+        } else {
+            api_not_allowed();
+        }
+        break;
+    case 'view_post' :
+        Blog :: display_post($blog_id, intval($_GET['post_id']));
+        break;
+    case 'edit_post' :
+        $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
+
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
+            // we show the form if
+            // 1. no post data
+            // 2. there is post data and the required field is empty
+            if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
+                // if there is post data there is certainly an error in the form
+                if ($_POST) {
+                    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
+                }
                 Blog :: display_form_edit_post($blog_id, intval($_GET['post_id']));
-			} else {
-				if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
-					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
-				} else {
-					Blog :: display_blog_posts($blog_id);
-				}
-			}
-		} else {
-			api_not_allowed();
-		}
-
-		break;
-	case 'manage_members' :
-		if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
-			Blog :: display_form_user_subscribe($blog_id);
-			echo '<br /><br />';
-			Blog :: display_form_user_unsubscribe($blog_id);
-		} else {
-			api_not_allowed();
+            } else {
+                if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
+                    Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
+                } else {
+                    Blog :: display_blog_posts($blog_id);
+                }
+            }
+        } else {
+            api_not_allowed();
+        }
+
+        break;
+    case 'manage_members' :
+        if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
+            Blog :: display_form_user_subscribe($blog_id);
+            echo '<br /><br />';
+            Blog :: display_form_user_unsubscribe($blog_id);
+        } else {
+            api_not_allowed();
         }
 
-		break;
-	case 'manage_rights' :
-		Blog :: display_form_user_rights($blog_id);
-		break;
-	case 'manage_tasks' :
-		if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
-			if (isset($_GET['do']) && $_GET['do'] == 'add') {
-				Blog:: display_new_task_form($blog_id);
-			}
-			if (isset($_GET['do']) && $_GET['do'] == 'assign') {
-				Blog:: display_assign_task_form($blog_id);
-			}
-			if (isset($_GET['do']) && $_GET['do'] == 'edit') {
-				Blog:: display_edit_task_form(
-					$blog_id,
-					intval($_GET['task_id'])
-				);
-			}
-			if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
-				Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
-			}
-			Blog :: display_task_list($blog_id);
-			echo '<br /><br />';
-			Blog :: display_assigned_task_list($blog_id);
-			echo '<br /><br />';
-		}
-		else
-			api_not_allowed();
-
-		break;
-	case 'execute_task' :
-		if (isset ($_GET['post_id']))
-			Blog :: display_post($blog_id, intval($_GET['post_id']));
-		else
-			Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
-
-		break;
-	case 'view_search_result' :
-		Blog :: display_search_results($blog_id, Database::escape_string($_GET['q']));
-		break;
-	case '' :
-	default :
-		if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
-			Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
-		} else {
-			Blog :: display_blog_posts($blog_id);
-		}
+        break;
+    case 'manage_rights' :
+        Blog :: display_form_user_rights($blog_id);
+        break;
+    case 'manage_tasks' :
+        if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
+            if (isset($_GET['do']) && $_GET['do'] == 'add') {
+                Blog:: display_new_task_form($blog_id);
+            }
+            if (isset($_GET['do']) && $_GET['do'] == 'assign') {
+                Blog:: display_assign_task_form($blog_id);
+            }
+            if (isset($_GET['do']) && $_GET['do'] == 'edit') {
+                Blog:: display_edit_task_form(
+                    $blog_id,
+                    intval($_GET['task_id'])
+                );
+            }
+            if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
+                Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
+            }
+            Blog :: display_task_list($blog_id);
+            echo '<br /><br />';
+            Blog :: display_assigned_task_list($blog_id);
+            echo '<br /><br />';
+        }
+        else
+            api_not_allowed();
+
+        break;
+    case 'execute_task' :
+        if (isset ($_GET['post_id']))
+            Blog :: display_post($blog_id, intval($_GET['post_id']));
+        else
+            Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
+
+        break;
+    case 'view_search_result' :
+        Blog :: display_search_results($blog_id, Database::escape_string($_GET['q']));
+        break;
+    case '' :
+    default :
+        if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
+            Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
+        } else {
+            Blog :: display_blog_posts($blog_id);
+        }
 }
 ?>
 </div>

Spacing +23 added lines, -23 removed lines

@@ -21,7 +21,7 @@ 
 api_protect_course_script(true);
 
 $lib_path = api_get_path(LIBRARY_PATH);
-$blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
 $nameTools  = get_lang('Blogs');
 $DaysShort  = api_get_week_days_short();
@@ -134,7 +134,7 @@ 
 		$safe_comment_title,
 		$safe_comment_text,
 		$blog_id,
-		(int)$_GET['post_id'],
+		(int) $_GET['post_id'],
 		$_POST['comment_parent_id'],
 		$_POST['task_id']
 	);
@@ -146,29 +146,29 @@ 
 if (!empty($_POST['register'])) {
 	if (is_array($_POST['user'])) {
 		foreach ($_POST['user'] as $index => $user_id) {
-			Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
+			Blog :: set_user_subscribed((int) $_GET['blog_id'], $user_id);
 		}
 	}
 }
 if (!empty($_POST['unregister'])) {
 	if (is_array($_POST['user'])) {
 		foreach ($_POST['user'] as $index => $user_id) {
-			Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
+			Blog :: set_user_unsubscribed((int) $_GET['blog_id'], $user_id);
 		}
 	}
 }
 if (!empty($_GET['register'])) {
-	Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
+	Blog :: set_user_subscribed((int) $_GET['blog_id'], (int) $_GET['user_id']);
 	$return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
 	$flag = 1;
 }
 if (!empty($_GET['unregister'])) {
-	Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
+	Blog :: set_user_unsubscribed((int) $_GET['blog_id'], (int) $_GET['user_id']);
 }
 
 if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
 	if (isset($_GET['do']) && $_GET['do'] == 'delete') {
-		Blog :: delete_task($blog_id, (int)$_GET['task_id']);
+		Blog :: delete_task($blog_id, (int) $_GET['task_id']);
 		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
 	}
 
@@ -181,9 +181,9 @@ 
 if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
 	$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
 
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
+	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment') {
 		if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
-			Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
+			Blog :: delete_comment($blog_id, (int) $_GET['post_id'], (int) $_GET['comment_id']);
 			$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
 		} else {
 			$error = true;
@@ -191,9 +191,9 @@ 
 		}
 	}
 
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
+	if (isset($_GET['do']) && $_GET['do'] == 'delete_article') {
 		if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
-			Blog :: delete_post($blog_id, (int)$_GET['article_id']);
+			Blog :: delete_post($blog_id, (int) $_GET['article_id']);
 			$action = ''; // Article is gone, go to blog home
 			$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
 		} else {
@@ -204,13 +204,13 @@ 
 	if (isset($_GET['do']) && $_GET['do'] == 'rate') {
 		if (isset($_GET['type']) && $_GET['type'] == 'post') {
 			if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
-				Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
+				Blog :: add_rating('post', $blog_id, (int) $_GET['post_id'], (int) $_GET['rating']);
 				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
 			}
 		}
 		if (isset($_GET['type']) && $_GET['type'] == 'comment') {
 			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
-				Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
+				Blog :: add_rating('comment', $blog_id, (int) $_GET['comment_id'], (int) $_GET['rating']);
 				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
 			}
 		}
@@ -289,16 +289,16 @@ 
 echo '<div class=actions>';
 ?>
 	<a href="<?php echo api_get_self(); ?>?blog_id=<?php echo $blog_id ?>&<?php echo api_get_cidreq(); ?>" title="<?php echo get_lang('Home') ?>">
-    <?php echo Display::return_icon('blog.png', get_lang('Home'),'',ICON_SIZE_MEDIUM); ?></a>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'article_add')) { ?>
+    <?php echo Display::return_icon('blog.png', get_lang('Home'), '', ICON_SIZE_MEDIUM); ?></a>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=new_post&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('NewPost') ?>">
-    <?php echo Display::return_icon('new_article.png', get_lang('NewPost'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'task_management')) { ?>
+    <?php echo Display::return_icon('new_article.png', get_lang('NewPost'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=manage_tasks&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageTasks') ?>">
-    <?php echo Display::return_icon('blog_tasks.png', get_lang('TaskManager'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
-	<?php if(api_is_allowed('BLOG_'.$blog_id, 'member_management')) { ?>
+    <?php echo Display::return_icon('blog_tasks.png', get_lang('TaskManager'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
+	<?php if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) { ?>
     <a href="<?php echo api_get_self(); ?>?action=manage_members&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageMembers') ?>">
-    <?php echo Display::return_icon('blog_admin_users.png', get_lang('MemberManager'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?>
+    <?php echo Display::return_icon('blog_admin_users.png', get_lang('MemberManager'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?>
 <?php
 echo '</div>';
 
@@ -316,8 +316,8 @@ 
                 <div class="panel-heading"><?php echo get_lang('Calendar') ?></div>
                 <div class="panel-body">
                     <?php
-                        $month = isset($_GET['month']) ? (int)$_GET['month'] : (int) date('m');
-                        $year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
+                        $month = isset($_GET['month']) ? (int) $_GET['month'] : (int) date('m');
+                        $year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y');
                         Blog::display_minimonthcalendar($month, $year, $blog_id);
                     ?>
                 </div>
@@ -362,7 +362,7 @@ 
 $course_id = api_get_course_int_id();
 
 if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
-	$task_id = (int)$_GET['task_id'];
+	$task_id = (int) $_GET['task_id'];
 } else {
 	$task_id = 0;
 	$tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);

main/gradebook/gradebook_showlog_eval.php

Spacing +7 added lines, -7 removed lines

@@ -9,15 +9,15 @@ 
 api_block_anonymous_users();
 GradebookUtils::block_students();
 
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'].'?',
     'name' => get_lang('Gradebook'
 ));
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']),
     'name' => get_lang('Details'
 ));
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => 'gradebook_showlog_eval.php?visiblelog='.Security::remove_XSS($_GET['visiblelog']).'&selectcat='.Security::remove_XSS($_GET['selectcat']),
     'name' => get_lang('GradebookQualifyLog')
 );
@@ -28,7 +28,7 @@ 
 
 $t_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
 $t_user = Database :: get_main_table(TABLE_MAIN_USER);
-$visible_log=Security::remove_XSS($_GET['visiblelog']);
+$visible_log = Security::remove_XSS($_GET['visiblelog']);
 
 $evaledit = Evaluation :: load($visible_log);
 $sql = "SELECT le.name,le.description,le.weight,le.visible,le.type,le.created_at,us.username
@@ -42,9 +42,9 @@ 
     $list_info[] = $row;
 }
 
-foreach($list_info as $key => $info_log) {
-    $list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
-    $list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
+foreach ($list_info as $key => $info_log) {
+    $list_info[$key][5] = ($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
+    $list_info[$key][3] = ($info_log[3] == 1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
 }
 
 $parameters = array(

main/gradebook/gradebook_edit_cat.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
         $cat->setGenerateCertificates(false);
     }
 
-    if ($values['hid_parent_id'] == 0 ) {
+    if ($values['hid_parent_id'] == 0) {
         $cat->set_certificate_min_score($values['certif_min_score']);
     }
 
@@ -81,12 +81,12 @@ 
     }
 
     $cat->save();
-    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat=' . $cat->get_parent_id().'&'.api_get_cidreq());
+    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat='.$cat->get_parent_id().'&'.api_get_cidreq());
     exit;
 }
 $selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
 $interbreadcrumb[] = array(
-    'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $selectcat . '&' . api_get_cidreq(),
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat.'&'.api_get_cidreq(),
     'name' => get_lang('Gradebook')
 );
 $this_section = SECTION_COURSES;

main/gradebook/gradebook_edit_eval.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
     null,
     'edit_eval_form',
     null,
-    api_get_self() . '?editeval=' . Security::remove_XSS($_GET['editeval'])
+    api_get_self().'?editeval='.Security::remove_XSS($_GET['editeval'])
 );
 if ($form->validate()) {
     $values = $form->exportValues();
@@ -45,11 +45,11 @@ 
     }
     $eval->set_visible($visible);
     $eval->save();
-    header('Location: '.$_SESSION['gradebook_dest'].'?editeval=&selectcat=' . $eval->get_category_id());
+    header('Location: '.$_SESSION['gradebook_dest'].'?editeval=&selectcat='.$eval->get_category_id());
     exit;
 }
-$selectcat_inter=isset($_GET['selectcat'])?Security::remove_XSS($_GET['selectcat']):'';
-$interbreadcrumb[] = array (
+$selectcat_inter = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'].'?selectcat='.$selectcat_inter,
     'name' => get_lang('Gradebook'
     ));

main/gradebook/index.php

Spacing +109 added lines, -109 removed lines

@@ -11,7 +11,7 @@ 
 //$cidReset = false;
 $_in_course = true;
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 
@@ -80,9 +80,9 @@ 
 });
 </script>';
 api_block_anonymous_users();
-$htmlHeadXtra[]= '<script type="text/javascript">
+$htmlHeadXtra[] = '<script type="text/javascript">
 function confirmation() {
-	if (confirm("' . get_lang('DeleteAll') . '?")) {
+	if (confirm("' . get_lang('DeleteAll').'?")) {
 		return true;
 	} else {
 		return false;
@@ -109,13 +109,13 @@ 
 $_GET['selectcat'] = $cats[0]->get_id();
 
 if (isset($_GET['isStudentView'])) {
-    if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) {
-        $interbreadcrumb[]= array ('url' => 'index.php'.'?selectcat=0&amp;isStudentView='.$_GET['isStudentView'],'name' => get_lang('ToolGradebook'));
+    if ((isset($_GET['selectcat']) && $_GET['selectcat'] > 0) && (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'studentview')) {
+        $interbreadcrumb[] = array('url' => 'index.php'.'?selectcat=0&amp;isStudentView='.$_GET['isStudentView'], 'name' => get_lang('ToolGradebook'));
     }
 }
 
-if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) &&
-    (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview')
+if ((isset($_GET['selectcat']) && $_GET['selectcat'] > 0) &&
+    (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'studentview')
 ) {
     /*Display :: display_header();
     //Introduction tool: student view
@@ -132,19 +132,19 @@ 
     exit;*/
 } else {
     if (!isset($_GET['selectcat']) &&
-        ($_SESSION['studentview']=='studentview') ||
-        (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true')
+        ($_SESSION['studentview'] == 'studentview') ||
+        (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true')
     ) {
         Display :: display_header(get_lang('Gradebook'));
 
         //Introduction tool: student view
         Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
-        $addparams=array();
-        $cats = Category :: load (0, null, null, null, null, null, false);
-        $allcat= $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-        $alleval= $cats[0]->get_evaluations($stud_id);
-        $alllink= $cats[0]->get_links($stud_id);
-        $gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
+        $addparams = array();
+        $cats = Category :: load(0, null, null, null, null, null, false);
+        $allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
+        $alleval = $cats[0]->get_evaluations($stud_id);
+        $alllink = $cats[0]->get_links($stud_id);
+        $gradebooktable = new GradebookTable($cats[0], $allcat, $alleval, $alllink, $addparams);
         $gradebooktable->display();
         Display :: display_footer();
         exit;
@@ -155,10 +155,10 @@ 
 //this is called when there is no data for the course admin
 if (isset($_GET['createallcategories'])) {
     GradebookUtils::block_students();
-    $coursecat= Category :: get_not_created_course_categories($stud_id);
+    $coursecat = Category :: get_not_created_course_categories($stud_id);
     if (!count($coursecat) == 0) {
         foreach ($coursecat as $row) {
-            $cat= new Category();
+            $cat = new Category();
             $cat->set_name($row[1]);
             $cat->set_course_code($row[0]);
             $cat->set_description(null);
@@ -176,25 +176,25 @@ 
 
 //show logs evaluations
 if (isset($_GET['visiblelog'])) {
-    header('Location: ' . api_get_self().'/gradebook_showlog_eval.php');
+    header('Location: '.api_get_self().'/gradebook_showlog_eval.php');
     exit;
 }
 
 //move a category
 if (isset($_GET['movecat'])) {
     GradebookUtils::block_students();
-    $cats= Category :: load($_GET['movecat']);
+    $cats = Category :: load($_GET['movecat']);
     if (!isset ($_GET['targetcat'])) {
-        $move_form= new CatForm(CatForm :: TYPE_MOVE,
+        $move_form = new CatForm(CatForm :: TYPE_MOVE,
             $cats[0],
             'move_cat_form',
             null,
-            api_get_self() . '?movecat=' . Security::remove_XSS($_GET['movecat'])
-            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            api_get_self().'?movecat='.Security::remove_XSS($_GET['movecat'])
+            . '&selectcat='.Security::remove_XSS($_GET['selectcat']));
         if ($move_form->validate()) {
-            header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                . '&movecat=' . Security::remove_XSS($_GET['movecat'])
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                . '&movecat='.Security::remove_XSS($_GET['movecat'])
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
@@ -203,7 +203,7 @@ 
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $cats[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            header('Location: '.api_get_self().'?categorymoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
             exit;
         }
         unset ($targetcat);
@@ -214,30 +214,30 @@ 
 //move an evaluation
 if (isset($_GET['moveeval'])) {
     GradebookUtils::block_students();
-    $evals= Evaluation :: load($_GET['moveeval']);
+    $evals = Evaluation :: load($_GET['moveeval']);
     if (!isset ($_GET['targetcat'])) {
 
-        $move_form= new EvalForm(EvalForm :: TYPE_MOVE,
+        $move_form = new EvalForm(EvalForm :: TYPE_MOVE,
             $evals[0],
             null,
             'move_eval_form',
             null,
-            api_get_self() . '?moveeval=' . Security::remove_XSS($_GET['moveeval'])
-            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            api_get_self().'?moveeval='.Security::remove_XSS($_GET['moveeval'])
+            . '&selectcat='.Security::remove_XSS($_GET['selectcat']));
 
         if ($move_form->validate()) {
-            header('Location: ' .api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                . '&moveeval=' . Security::remove_XSS($_GET['moveeval'])
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                . '&moveeval='.Security::remove_XSS($_GET['moveeval'])
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
-        $targetcat= Category :: load($_GET['targetcat']);
+        $targetcat = Category :: load($_GET['targetcat']);
         $course_to_crsind = ($evals[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $evals[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?evaluationmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            header('Location: '.api_get_self().'?evaluationmoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
             exit;
         }
         unset ($targetcat);
@@ -248,21 +248,21 @@ 
 //move a link
 if (isset($_GET['movelink'])) {
     GradebookUtils::block_students();
-    $link= LinkFactory :: load($_GET['movelink']);
+    $link = LinkFactory :: load($_GET['movelink']);
     $move_form = new LinkForm(
         LinkForm :: TYPE_MOVE,
         null,
         $link[0],
         'move_link_form',
         null,
-        api_get_self() . '?movelink=' . $_GET['movelink'] . '&selectcat=' . Security::remove_XSS($_GET['selectcat'])
+        api_get_self().'?movelink='.$_GET['movelink'].'&selectcat='.Security::remove_XSS($_GET['selectcat'])
     );
 
     if ($move_form->validate()) {
-        $targetcat= Category :: load($move_form->exportValue('move_cat'));
+        $targetcat = Category :: load($move_form->exportValue('move_cat'));
         $link[0]->move_to_cat($targetcat[0]);
         unset ($link);
-        header('Location: ' . api_get_self(). '?linkmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+        header('Location: '.api_get_self().'?linkmoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
         exit;
     }
 }
@@ -272,9 +272,9 @@ 
     GradebookUtils::block_students();
 
     if (isset($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
     $cats = Category :: load($_GET['visiblecat']);
     $cats[0]->set_visible($visibility_command);
@@ -309,11 +309,11 @@ 
 if (isset($_GET['visibleeval'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
-    $eval= Evaluation :: load($_GET['visibleeval']);
+    $eval = Evaluation :: load($_GET['visibleeval']);
     $eval[0]->set_visible($visibility_command);
     $eval[0]->save();
     unset ($eval);
@@ -330,7 +330,7 @@ 
 if (isset($_GET['lockedeval'])) {
     GradebookUtils::block_students();
     $locked = Security::remove_XSS($_GET['lockedeval']);
-    if (isset($_GET['typelocked']) && api_is_platform_admin()){
+    if (isset($_GET['typelocked']) && api_is_platform_admin()) {
         $type_locked = 0;
         $confirmation_message = get_lang('EvaluationHasBeenUnLocked');
     } else {
@@ -347,7 +347,7 @@ 
 
 if (isset($_GET['deleteeval'])) {
     GradebookUtils::block_students();
-    $eval= Evaluation :: load($_GET['deleteeval']);
+    $eval = Evaluation :: load($_GET['deleteeval']);
     if ($eval[0] != null) {
         $eval[0]->delete_with_results();
     }
@@ -359,11 +359,11 @@ 
 if (isset($_GET['visiblelink'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
-    $link= LinkFactory :: load($_GET['visiblelink']);
+    $link = LinkFactory :: load($_GET['visiblelink']);
     if (isset($link) && isset($link[0])) {
         $link[0]->set_visible($visibility_command);
         $link[0]->save();
@@ -385,7 +385,7 @@ 
     $get_delete_link = intval($_GET['deletelink']);
     //fixing #5229
     if (!empty($get_delete_link)) {
-        $link= LinkFactory :: load($get_delete_link);
+        $link = LinkFactory :: load($get_delete_link);
         if ($link[0] != null) {
             // Clean forum qualify
             $sql = 'UPDATE '.$tbl_forum_thread.' SET
@@ -420,11 +420,11 @@ 
     if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
         die ('Error: movecat or moveeval not defined');
     }
-    $button = '<form name="confirm" method="post" action="'.api_get_self() .'?confirm='
-        .(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
-            : '&moveeval=' . Security::remove_XSS($_GET['moveeval']) )
-        .'&selectcat=' . Security::remove_XSS($_GET['selectcat'])
-        .'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
+    $button = '<form name="confirm" method="post" action="'.api_get_self().'?confirm='
+        .(isset($_GET['movecat']) ? '&movecat='.Security::remove_XSS($_GET['movecat'])
+            : '&moveeval='.Security::remove_XSS($_GET['moveeval']))
+        .'&selectcat='.Security::remove_XSS($_GET['selectcat'])
+        .'&targetcat='.Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.get_lang('Ok').'">
 			   </form>';
     $warning_message = get_lang('MoveWarning').'<br><br>'.$button;
@@ -455,7 +455,7 @@ 
 //actions on the sortabletable
 if (isset($_POST['action'])) {
     GradebookUtils::block_students();
-    $number_of_selected_items= count($_POST['id']);
+    $number_of_selected_items = count($_POST['id']);
 
     if ($number_of_selected_items == '0') {
         $warning_message = get_lang('NoItemsSelected');
@@ -463,19 +463,19 @@ 
     } else {
         switch ($_POST['action']) {
             case 'deleted':
-                $number_of_deleted_categories= 0;
-                $number_of_deleted_evaluations= 0;
-                $number_of_deleted_links= 0;
+                $number_of_deleted_categories = 0;
+                $number_of_deleted_evaluations = 0;
+                $number_of_deleted_links = 0;
                 foreach ($_POST['id'] as $indexstr) {
                     if (substr($indexstr, 0, 4) == 'CATE') {
-                        $cats= Category :: load(substr($indexstr, 4));
+                        $cats = Category :: load(substr($indexstr, 4));
                         if ($cats[0] != null) {
                             $cats[0]->delete_all();
                         }
                         $number_of_deleted_categories++;
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         if ($eval[0] != null) {
                             $eval[0]->delete_with_results();
                         }
@@ -486,7 +486,7 @@ 
                         //fixing #5229
                         $id = substr($indexstr, 4);
                         if (!empty($id)) {
-                            $link= LinkFactory :: load($id);
+                            $link = LinkFactory :: load($id);
                             if ($link[0] != null) {
                                 $link[0]->delete();
                             }
@@ -494,7 +494,7 @@ 
                         }
                     }
                 }
-                $confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
+                $confirmation_message = get_lang('DeletedCategories').' : <b>'.$number_of_deleted_categories.'</b><br />'.get_lang('DeletedEvaluations').' : <b>'.$number_of_deleted_evaluations.'</b><br />'.get_lang('DeletedLinks').' : <b>'.$number_of_deleted_links.'</b><br /><br />'.get_lang('TotalItems').' : <b>'.$number_of_selected_items.'</b>';
                 $filter_confirm_msg = false;
                 break;
             case 'setvisible':
@@ -506,12 +506,12 @@ 
                         $cats[0]->apply_visibility_to_children();
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         $eval[0]->set_visible(1);
                         $eval[0]->save();
                     }
                     if (substr($indexstr, 0, 4) == 'LINK') {
-                        $link= LinkFactory :: load(substr($indexstr, 4));
+                        $link = LinkFactory :: load(substr($indexstr, 4));
                         $link[0]->set_visible(1);
                         $link[0]->save();
                     }
@@ -528,12 +528,12 @@ 
                         $cats[0]->apply_visibility_to_children();
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         $eval[0]->set_visible(0);
                         $eval[0]->save();
                     }
                     if (substr($indexstr, 0, 4) == 'LINK') {
-                        $link= LinkFactory :: load(substr($indexstr, 4));
+                        $link = LinkFactory :: load(substr($indexstr, 4));
                         $link[0]->set_visible(0);
                         $link[0]->save();
                     }
@@ -546,7 +546,7 @@ 
 }
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-    header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+    header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
         . '&search='.Security::remove_XSS($_POST['keyword']));
     exit;
 }
@@ -554,13 +554,13 @@ 
 // DISPLAY HEADERS AND MESSAGES
 if (!isset($_GET['exportpdf'])) {
     if (isset ($_GET['studentoverview'])) {
-        $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
+        $interbreadcrumb[] = array('url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('ToolGradebook'));
         Display :: display_header(get_lang('FlatView'));
     } elseif (isset ($_GET['search'])) {
-        $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
+        $interbreadcrumb[] = array('url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('ToolGradebook'));
         Display :: display_header(get_lang('SearchResults'));
-    } elseif(isset ($_GET['selectcat'])) {
-        $interbreadcrumb[]= array (	'url' =>'#','name' => get_lang('ToolGradebook'));
+    } elseif (isset ($_GET['selectcat'])) {
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('ToolGradebook'));
         if (!isset($_GET['gradebooklist_direction'])) {
             //$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));
         }
@@ -571,46 +571,46 @@ 
 }
 
 if (isset ($_GET['categorymoved'])) {
-    Display :: display_confirmation_message(get_lang('CategoryMoved'),false);
+    Display :: display_confirmation_message(get_lang('CategoryMoved'), false);
 }
 if (isset ($_GET['evaluationmoved'])) {
-    Display :: display_confirmation_message(get_lang('EvaluationMoved'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationMoved'), false);
 }
 if (isset ($_GET['linkmoved'])) {
-    Display :: display_confirmation_message(get_lang('LinkMoved'),false);
+    Display :: display_confirmation_message(get_lang('LinkMoved'), false);
 }
 if (isset ($_GET['addcat'])) {
-    Display :: display_confirmation_message(get_lang('CategoryAdded'),false);
+    Display :: display_confirmation_message(get_lang('CategoryAdded'), false);
 }
 if (isset ($_GET['linkadded'])) {
-    Display :: display_confirmation_message(get_lang('LinkAdded'),false);
+    Display :: display_confirmation_message(get_lang('LinkAdded'), false);
 }
 if (isset ($_GET['addresult'])) {
-    Display :: display_confirmation_message(get_lang('ResultAdded'),false);
+    Display :: display_confirmation_message(get_lang('ResultAdded'), false);
 }
 if (isset ($_GET['editcat'])) {
-    Display :: display_confirmation_message(get_lang('CategoryEdited'),false);
+    Display :: display_confirmation_message(get_lang('CategoryEdited'), false);
 }
 if (isset ($_GET['editeval'])) {
-    Display :: display_confirmation_message(get_lang('EvaluationEdited'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationEdited'), false);
 }
 if (isset ($_GET['linkedited'])) {
-    Display :: display_confirmation_message(get_lang('LinkEdited'),false);
+    Display :: display_confirmation_message(get_lang('LinkEdited'), false);
 }
-if (isset ($_GET['nolinkitems'])){
-    Display :: display_warning_message(get_lang('NoLinkItems'),false);
+if (isset ($_GET['nolinkitems'])) {
+    Display :: display_warning_message(get_lang('NoLinkItems'), false);
 }
-if (isset ($_GET['addallcat'])){
-    Display :: display_normal_message(get_lang('AddAllCat'),false);
+if (isset ($_GET['addallcat'])) {
+    Display :: display_normal_message(get_lang('AddAllCat'), false);
 }
-if (isset ($confirmation_message)){
-    Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
+if (isset ($confirmation_message)) {
+    Display :: display_confirmation_message($confirmation_message, $filter_confirm_msg);
 }
-if (isset ($warning_message)){
-    Display :: display_warning_message($warning_message,$filter_warning_msg);
+if (isset ($warning_message)) {
+    Display :: display_warning_message($warning_message, $filter_warning_msg);
 }
-if (isset ($move_form)){
-    Display :: display_normal_message($move_form->toHtml(),false);
+if (isset ($move_form)) {
+    Display :: display_normal_message($move_form->toHtml(), false);
 }
 
 // LOAD DATA & DISPLAY TABLE
@@ -624,17 +624,17 @@ 
 } else {
     $category = $_GET['selectcat'];
 }
-$simple_search_form='';
+$simple_search_form = '';
 
 if (isset($_GET['studentoverview'])) {
     //@todo this code also seems to be deprecated ...
     $cats = Category :: load($category);
-    $stud_id= (api_is_allowed_to_edit() ? null : $stud_id);
+    $stud_id = (api_is_allowed_to_edit() ? null : $stud_id);
     $allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-    $alleval= $cats[0]->get_evaluations($stud_id, true);
-    $alllink= $cats[0]->get_links($stud_id, true);
+    $alleval = $cats[0]->get_evaluations($stud_id, true);
+    $alllink = $cats[0]->get_links($stud_id, true);
     if (isset ($_GET['exportpdf'])) {
-        $datagen = new GradebookDataGenerator($allcat,$alleval, $alllink);
+        $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
         $header_names = array(
             get_lang('Name'),
             get_lang('Description'),
@@ -642,18 +642,18 @@ 
             get_lang('Date'),
             get_lang('Results'),
         );
-        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
+        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME, 0, null, true);
         $newarray = array();
         foreach ($data_array as $data) {
             $newarray[] = array_slice($data, 1);
         }
-        $pdf= new Cezpdf();
+        $pdf = new Cezpdf();
         $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
         $pdf->ezSetMargins(30, 30, 50, 30);
         $pdf->ezSetY(810);
-        $pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
-        $pdf->line(50,790,550,790);
-        $pdf->line(50,40,550,40);
+        $pdf->ezText(get_lang('FlatView').' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')', 12, array('justification'=>'center'));
+        $pdf->line(50, 790, 550, 790);
+        $pdf->line(50, 40, 550, 40);
         $pdf->ezSetY(750);
         $pdf->ezTable(
             $newarray,
@@ -744,10 +744,10 @@ 
     $addparams['studentoverview'] = '';
 }
 //$addparams['cidReq']='';
-if (isset($_GET['cidReq']) && $_GET['cidReq']!='') {
+if (isset($_GET['cidReq']) && $_GET['cidReq'] != '') {
     $addparams['cidReq'] = Security::remove_XSS($_GET['cidReq']);
 } else {
-    $addparams['cidReq']='';
+    $addparams['cidReq'] = '';
 }
 
 $no_qualification = false;
@@ -771,7 +771,7 @@ 
                 $stud_id
             );
             if (isset($certificate['pdf_url'])) {
-                $actionsLeft .= Display::url(Display::returnFontAwesomeIcon('file-pdf-o') .
+                $actionsLeft .= Display::url(Display::returnFontAwesomeIcon('file-pdf-o').
                     get_lang('DownloadCertificatePdf'),
                     $certificate['pdf_url'],
                     ['class' => 'btn btn-default']
@@ -786,7 +786,7 @@ 
 
 if (!api_is_allowed_to_edit(null, true)) {
     $actionsLeft .= Display::url(
-            Display::returnFontAwesomeIcon('file-pdf-o') . get_lang('DownloadReportPdf'),
+            Display::returnFontAwesomeIcon('file-pdf-o').get_lang('DownloadReportPdf'),
             api_get_self()."?".api_get_self()."&action=export_table",
             ['class' => 'btn btn-default']
     );
@@ -798,7 +798,7 @@ 
     // Tool introduction
     Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
 
-    if ((isset ($_GET['selectcat']) && $_GET['selectcat']<>0)) {
+    if ((isset ($_GET['selectcat']) && $_GET['selectcat'] <> 0)) {
         //
     } else {
         if ((
@@ -820,7 +820,7 @@ 
     }
 }
 
-if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
+if (isset($first_time) && $first_time == 1 && api_is_allowed_to_edit(null, true)) {
     echo '<meta http-equiv="refresh" content="0;url='.api_get_self().'?cidReq='.$course_code.'" />';
 } else {
     $cats = Category::load(null, null, $course_code, null, null, $session_id, false);
@@ -857,7 +857,7 @@ 
                         $components = $obj->get_components($value);
 
                         foreach ($components as $component) {
-                            $gradebook =  new Gradebook();
+                            $gradebook = new Gradebook();
                             $params = array();
 
                             $params['name'] = $component['acronym'];
@@ -905,7 +905,7 @@ 
                     $certificate
                 );
 
-                if (api_is_allowed_to_edit(null,true) &&
+                if (api_is_allowed_to_edit(null, true) &&
                     api_get_setting('gradebook_enable_grade_model') == 'true'
                 ) {
                     //Showing the grading system

main/gradebook/gradebook_display_certificate.php

Indentation +9 added lines, -9 removed lines

@@ -162,17 +162,17 @@
 
     if ($form->validate()) {
         $officialCode = $form->getSubmitValue('filter');
-         if ($officialCode == 'all') {
+            if ($officialCode == 'all') {
             $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
         } else {
-             $userList = UserManager::getUsersByOfficialCode($officialCode);
-             if (!empty($userList)) {
-                 $certificate_list = GradebookUtils::get_list_users_certificates(
-                     $cat_id,
-                     $userList
-                 );
-             }
-         }
+                $userList = UserManager::getUsersByOfficialCode($officialCode);
+                if (!empty($userList)) {
+                    $certificate_list = GradebookUtils::get_list_users_certificates(
+                        $cat_id,
+                        $userList
+                    );
+                }
+            }
     } else {
         $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
     }

Spacing +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
  * @package chamilo.gradebook
  */
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 if (!api_is_student_boss()) {
     api_protect_course_script(true);
@@ -16,9 +16,9 @@ 
 ini_set('max_execution_time', 0);
 
 //extra javascript functions for in html head:
-$htmlHeadXtra[] ="<script>
+$htmlHeadXtra[] = "<script>
 function confirmation() {
-	if (confirm(\" " . trim(get_lang('AreYouSureToDelete')) . " ?\")) {
+	if (confirm(\" " . trim(get_lang('AreYouSureToDelete'))." ?\")) {
 	    return true;
 	} else {
 	    return false;
@@ -31,7 +31,7 @@ 
     api_not_allowed(true);
 }
 
-$cat_id = isset($_GET['cat_id']) ? (int)$_GET['cat_id'] : null;
+$cat_id = isset($_GET['cat_id']) ? (int) $_GET['cat_id'] : null;
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
 $filterOfficialCode = isset($_POST['filter']) ? Security::remove_XSS($_POST['filter']) : null;
 $filterOfficialCodeGet = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
@@ -72,8 +72,8 @@ 
 
 $course_code = api_get_course_id();
 
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsCertificates'));
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsCertificates'));
 
 $this_section = SECTION_COURSES;
 
@@ -85,7 +85,7 @@ 
         $certificate = new Certificate($_GET['certificate_id']);
         $result = $certificate->delete(true);
         Security::clear_token();
-        if ($result ==true) {
+        if ($result == true) {
             Display::display_confirmation_message(get_lang('CertificateRemoved'));
         } else {
             Display::display_error_message(get_lang('CertificateNotRemoved'));
@@ -104,9 +104,9 @@ 
 
     //with this fix the teacher only can view 1 gradebook
     if (api_is_platform_admin()) {
-        $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
+        $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
     } else {
-        $stud_id= api_get_user_id();
+        $stud_id = api_get_user_id();
     }
 
     $total_weight = $cats[0]->get_weight();
@@ -115,7 +115,7 @@ 
     $alleval = $cats[0]->get_evaluations($stud_id);
     $alllink = $cats[0]->get_links($stud_id);
 
-    $datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
+    $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
 
     $total_resource_weight = 0;
     if (!empty($datagen)) {
@@ -132,7 +132,7 @@ 
                 $newarray[] = array_slice($data, 1);
             }
 
-            foreach($newarray as $item) {
+            foreach ($newarray as $item) {
                 $total_resource_weight = $total_resource_weight + $item['2'];
             }
         }
@@ -150,7 +150,7 @@ 
 if ($filter === 'true') {
     echo '<br />';
     $options = UserManager::getOfficialCodeGrouped();
-    $options =array_merge(array('all' => get_lang('All')), $options);
+    $options = array_merge(array('all' => get_lang('All')), $options);
     $form = new FormValidator(
         'official_code_filter',
         'POST',
@@ -196,7 +196,7 @@ 
 
 echo $filterForm;
 
-if (count($certificate_list) == 0 ) {
+if (count($certificate_list) == 0) {
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
 } else {
 
@@ -219,7 +219,7 @@ 
             $certificates = Display::url(get_lang('Certificate'), $url, array('target'=>'_blank', 'class' => 'btn btn-default'));
             echo $certificates;
             echo '<a onclick="return confirmation();" href="gradebook_display_certificate.php?sec_token='.$token.'&cidReq='.$course_code.'&action=delete&cat_id='.$cat_id.'&certificate_id='.$value_certificate['id'].'">
-                    '.Display::return_icon('delete.png',get_lang('Delete')).'
+                    '.Display::return_icon('delete.png', get_lang('Delete')).'
                   </a>';
             echo '</td></tr>';
         }

main/gradebook/gradebook_display_summary.php

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script();
 
@@ -21,7 +21,7 @@ 
     api_not_allowed(true);
 }
 
-$cat_id = isset($_GET['selectcat']) ? (int)$_GET['selectcat'] : null;
+$cat_id = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : null;
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
 
 $userList = CourseManager::get_user_list_from_course_code(
@@ -113,8 +113,8 @@ 
 
 $course_code = api_get_course_id();
 
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsReports'));
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsReports'));
 
 $this_section = SECTION_COURSES;
 
@@ -131,7 +131,7 @@ 
 }
 echo '</div>';
 
-if (count($userList) == 0 ) {
+if (count($userList) == 0) {
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
 } else {
     echo '<br /><br /><table class="data_table">';

main/gradebook/gradebook_scoring_system.php

Spacing +13 added lines, -13 removed lines

@@ -13,7 +13,7 @@ 
     api_not_allowed();
 }
 
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 function plusItem(item) {
     document.getElementById(item).style.display = "inline";
     document.getElementById("plus-"+item).style.display = "none";
@@ -45,10 +45,10 @@ 
 );
 
 $select_cat = intval($_GET['selectcat']);
-$displayscore= ScoreDisplay :: instance();
+$displayscore = ScoreDisplay :: instance();
 $customdisplays = $displayscore->get_custom_score_display_settings();
 
-$nr_items = (count($customdisplays) != '0' )? count($customdisplays) : '1';
+$nr_items = (count($customdisplays) != '0') ? count($customdisplays) : '1';
 $scoreform = new ScoreDisplayForm(
     'scoring_system_form',
     api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
@@ -57,18 +57,18 @@ 
 if ($scoreform->validate()) {
     $value_export = '';
     $value_export = $scoreform->exportValues();
-    $value_export = isset($value_export) ? $scoreform->exportValues(): '';
+    $value_export = isset($value_export) ? $scoreform->exportValues() : '';
     $values = $value_export;
 
     // create new array of custom display settings
     // this loop also checks if all score ranges are unique
 
-    $scoringdisplay= array ();
+    $scoringdisplay = array();
     $ranges_ok = true;
-    $endscore= isset($values['endscore']) ? $values['endscore'] : null;
-    $displaytext=isset($values['displaytext']) ? $values['displaytext'] : null;
-    for ($counter= 1; $ranges_ok && $counter <= 20; $counter++) {
-        $setting= array ();
+    $endscore = isset($values['endscore']) ? $values['endscore'] : null;
+    $displaytext = isset($values['displaytext']) ? $values['displaytext'] : null;
+    for ($counter = 1; $ranges_ok && $counter <= 20; $counter++) {
+        $setting = array();
         $setting['score'] = $endscore[$counter];
         $setting['display'] = $displaytext[$counter];
         if (!empty($setting['score'])) {
@@ -77,12 +77,12 @@ 
                     $ranges_ok = false;
                 }
             }
-            $scoringdisplay[]= $setting;
+            $scoringdisplay[] = $setting;
         }
     }
 
     if (!$ranges_ok) {
-        header('Location: ' . api_get_self() . '?nouniqueranges=&selectcat=' . $select_cat.'&'.api_get_cidreq());
+        header('Location: '.api_get_self().'?nouniqueranges=&selectcat='.$select_cat.'&'.api_get_cidreq());
         exit;
     }
 
@@ -102,8 +102,8 @@ 
 $this_section = SECTION_COURSES;
 Display :: display_header(get_lang('ScoreEdit'));
 
-if (((isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') ||
-    (isset($_GET['selectcat']) && ($_SESSION['studentview']=='teacherview')))
+if (((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') ||
+    (isset($_GET['selectcat']) && ($_SESSION['studentview'] == 'teacherview')))
 ) {
     if (isset ($_GET['scoringupdated'])) {
         Display::display_confirmation_message(get_lang('ScoringUpdated'), false);