Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.x

Author: AngelFQC

main/blog/blog.php

@@ -77,10 +77,10 @@
 		$blog_id,
 		$safe_task_name,
 		$safe_task_description,
-		$_POST['chkArticleDelete'],
-		$_POST['chkArticleEdit'],
-		$_POST['chkCommentsDelete'],
-		$_POST['task_color']
+		(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'));
 }

main/blog/blog_admin.php

@@ -29,7 +29,7 @@
     // showing the header if we are not in the learning path, if we are in
     // the learning path, we do not include the banner so we have to explicitly
     // include the stylesheet, which is normally done in the header
-    if ($_GET['origin'] != 'learnpath') {
+    if (empty($_GET['origin']) || $_GET['origin'] != 'learnpath') {
         $interbreadcrumb[]= array ('url' => 'blog_admin.php?','name' => $nameTools);
         $my_url='';
         if (isset($_GET['action']) && $_GET['action']=='add') {

main/permissions/blog_permissions.inc.php

@@ -53,7 +53,7 @@
 }
 
 //$user_id=$userIdViewed;
-if ($mainUserInfo['status'] == 1) {
+if (isset($mainUserInfo) && isset($mainUserInfo['status']) && $mainUserInfo['status'] == 1) {
     $course_admin = 1;
 }
 
@@ -154,8 +154,7 @@
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
-foreach ($blog_users as $user_id => $user_name) // $blog_users contains all the users in this blog
-{
+foreach ($blog_users as $user_id => $user_name) { // $blog_users contains all the users in this blog
 	// ---------------------------------------------------
 	// 			RETRIEVING THE PERMISSIONS OF THE USER
 	// ---------------------------------------------------
@@ -164,16 +163,21 @@
 
 	echo "\t<tr>\n";
 	echo "\t\t<td>\n";
-		echo $user_name;
+	echo $user_name;
 	echo "\t\t</td>\n";
 
-	foreach ($rights_full as $key => $value)
-	{
+	foreach ($rights_full as $key => $value) {
 
 		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights_blog))
-		{
-			display_image_matrix_for_blogs($current_user_permissions, $user_id, 'BLOG_'.$blog_id, $value,$inherited_permissions, $course_admin);
+		if (in_array($value,$rights_blog)) {
+			display_image_matrix_for_blogs(
+				$current_user_permissions,
+				$user_id,
+				'BLOG_'.$blog_id,
+				$value,
+				(isset($inherited_permissions) ? $inherited_permissions : null),
+				(isset($course_admin) ? $course_admin : null)
+			);
 		}
 		// note: in a later stage this part will be replaced by a function
 		// so that we can easily switch between a checkbox approach or an image approach