chamilo / chamilo-lms

main/permissions/user_permissions.inc.php

Indentation +93 added lines, -93 removed lines

@@ -8,7 +8,7 @@ 
 $user_id=$userIdViewed;
 if ($mainUserInfo['status']==1)
 {
-	$course_admin=1;
+    $course_admin=1;
 }
 include_once('permissions_functions.inc.php');
 include_once('all_permissions.inc.php');
@@ -19,26 +19,26 @@ 
 // ---------------------------------------------------
 if ($_POST['StoreUserPermissions'] and $setting_visualisation=='checkbox')
 {
-	$result_message=store_permissions('user', $user_id);
-	if ($result_message)
-	{
-		Display::display_normal_message($result_message);
-	}
+    $result_message=store_permissions('user', $user_id);
+    if ($result_message)
+    {
+        Display::display_normal_message($result_message);
+    }
 }
 if (isset($_GET['action']))
 {
-	if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
-	{
-		$result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
-	}
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
-	{
-		$result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
-	}
+    if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+    {
+        $result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
+    }
+    if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+    {
+        $result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
+    }
 }
 if (isset($result_message))
 {
-	Display::display_normal_message($result_message);
+    Display::display_normal_message($result_message);
 }
 
 // ---------------------------------------------------
@@ -55,43 +55,43 @@ 
 $groups_of_user=GroupManager::get_group_ids($_course['real_id'],$user_id);
 foreach ($groups_of_user as $group)
 {
-	$this_group_permissions=get_permissions('group',$group);
-	foreach ($this_group_permissions as $tool=>$permissions)
-	{
-		foreach ($permissions as $permission)
-		{
-			$inherited_group_permissions[$tool][]=$permission;
-		}
-	}
+    $this_group_permissions=get_permissions('group',$group);
+    foreach ($this_group_permissions as $tool=>$permissions)
+    {
+        foreach ($permissions as $permission)
+        {
+            $inherited_group_permissions[$tool][]=$permission;
+        }
+    }
 }
 $inherited_permissions=$inherited_group_permissions;
 
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
 if (api_get_setting('user_roles')=='true') {
-	// course roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
-	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
-	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
-	// groepsge�rfde permissions in beschouwing worden genomen
-	// dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
-	// en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
-	// omvatten.
-	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
-	// ophalen.
-	// platform roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+    // course roles that are assigned to the user
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+    // NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
+    // (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
+    // groepsge�rfde permissions in beschouwing worden genomen
+    // dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
+    // en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
+    // omvatten.
+    // NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
+    // ophalen.
+    // platform roles that are assigned to the user
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
 }
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
 if (api_get_setting('group_roles')=='true')
 {
-	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
-	foreach ($groups_of_user as $group)
-	{
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
-		//$inherited_permissions[$tool][]=$permission;
-	}
+    // NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
+    foreach ($groups_of_user as $group)
+    {
+        $this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
+        //$inherited_permissions[$tool][]=$permission;
+    }
 }
 
 // ---------------------------------------------------
@@ -101,11 +101,11 @@ 
 $inherited_permissions=limited_or_full($inherited_permissions);
 if (api_get_setting('permissions')=='limited')
 {
-	$header_array=$rights_limited;
+    $header_array=$rights_limited;
 }
 if (api_get_setting('permissions')=='full')
 {
-	$header_array=$rights_full;
+    $header_array=$rights_full;
 }
 
 
@@ -116,12 +116,12 @@ 
 // ---------------------------------------------------
 if (api_get_setting('user_roles')=='true')
 {
-	// the list of the roles for the user
-	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
-	$current_user_course_roles=get_roles('user',$user_id);
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
-	display_role_list($current_user_course_roles, $current_user_platform_roles);
-	echo '<br />';
+    // the list of the roles for the user
+    echo '<strong>'.get_lang('UserRoles').'</strong><br />';
+    $current_user_course_roles=get_roles('user',$user_id);
+    $current_user_platform_roles=get_roles('user',$user_id, 'platform');
+    display_role_list($current_user_course_roles, $current_user_platform_roles);
+    echo '<br />';
 }
 
 // ---------------------------------------------------
@@ -135,59 +135,59 @@ 
 echo "\t\t<th>".get_lang('Module')."</th>\n";
 foreach ($header_array as $header_key=>$header_value)
 {
-	echo "\t\t<th>".get_lang($header_value)."</th>\n";
+    echo "\t\t<th>".get_lang($header_value)."</th>\n";
 }
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
 foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
 {
-	echo "\t<tr>\n";
-	echo "\t\t<td>\n";
-	if (strstr($tool,'BLOG'))
-	{
-		// Not dealing with a real tool here, get name of this blog
-		// Strip blog id
-		$tmp = strpos($tool,'_')+1;
-		$blog_id = substr($tool,$tmp,strlen($tool));
-		// Get title
-		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
-	}
-	else
-	{
-		echo get_lang($tool);
-	}
-
-	echo "\t\t</td>\n";
-
-	foreach ($header_array as $key=>$value)
-	{
-
-		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights))
-		{
-			if ($setting_visualisation=='checkbox')
-			{
-				display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
-			}
-			if ($setting_visualisation=='image')
-			{
-				display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
-			}
-		}
-		// 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
-		// where every click is in fact a change of status. In the checkbox approach you first have to
-		// do the changes and then store them by clicking the submit button.
-		echo "\t\t</td>\n";
-	}
-	echo "\t</tr>\n";
+    echo "\t<tr>\n";
+    echo "\t\t<td>\n";
+    if (strstr($tool,'BLOG'))
+    {
+        // Not dealing with a real tool here, get name of this blog
+        // Strip blog id
+        $tmp = strpos($tool,'_')+1;
+        $blog_id = substr($tool,$tmp,strlen($tool));
+        // Get title
+        echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
+    }
+    else
+    {
+        echo get_lang($tool);
+    }
+
+    echo "\t\t</td>\n";
+
+    foreach ($header_array as $key=>$value)
+    {
+
+        echo "\t\t<td align='center'>\n";
+        if (in_array($value,$rights))
+        {
+            if ($setting_visualisation=='checkbox')
+            {
+                display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
+            }
+            if ($setting_visualisation=='image')
+            {
+                display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
+            }
+        }
+        // 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
+        // where every click is in fact a change of status. In the checkbox approach you first have to
+        // do the changes and then store them by clicking the submit button.
+        echo "\t\t</td>\n";
+    }
+    echo "\t</tr>\n";
 }
 
 echo "</table>\n";
 if ($setting_visualisation=='checkbox')
 {
-	echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
+    echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
 }
 echo "</form><br />";
 

main/blog/blog.php

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>

main/webservices/courses_list.soap.php

Indentation +20 added lines, -20 removed lines

@@ -28,11 +28,11 @@ 
         'all',
         '',
         array(
-          'name'=>'code'  , 'type'=>'xsd:string',
-          'name'=>'title'  , 'type'=>'xsd:string',
-          'name'=>'url'    , 'type'=>'xsd:string',
-          'name'=>'teacher', 'type'=>'xsd:string',
-          'name'=>'language','type'=>'xsd:string',
+            'name'=>'code'  , 'type'=>'xsd:string',
+            'name'=>'title'  , 'type'=>'xsd:string',
+            'name'=>'url'    , 'type'=>'xsd:string',
+            'name'=>'teacher', 'type'=>'xsd:string',
+            'name'=>'language','type'=>'xsd:string',
         )
 );
 
@@ -53,8 +53,8 @@ 
 // Register the method to expose
 $server->register('WSCourseList',         // method name
     array('username' => 'xsd:string',
-          'signature' => 'xsd:string',
-          'visibilities' => 'xsd:string'),      // input parameters
+            'signature' => 'xsd:string',
+            'visibilities' => 'xsd:string'),      // input parameters
     array('return' => 'xsd:Array'),             // output parameters
     'urn:WSCourseList',                         // namespace
     'urn:WSCourseList#WSCourseList',      // soapaction
@@ -97,19 +97,19 @@ 
 
     $courses_list = array();
 
-	if (!is_array($visibilities)) {
-		$visibilities = split(',', $visibilities);
-	}
-	foreach ($visibilities as $visibility) {
-		if (!in_array($visibility, array_keys($vis))) {
-   			return array('error_msg' => 'Security check failed');
-		}
-		$courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
-		foreach ($courses_list_tmp as $index => $course) {
-			$course_info = CourseManager::get_course_information($course['code']);
-			$courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
-		}
-	}
+    if (!is_array($visibilities)) {
+        $visibilities = split(',', $visibilities);
+    }
+    foreach ($visibilities as $visibility) {
+        if (!in_array($visibility, array_keys($vis))) {
+                return array('error_msg' => 'Security check failed');
+        }
+        $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
+        foreach ($courses_list_tmp as $index => $course) {
+            $course_info = CourseManager::get_course_information($course['code']);
+            $courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
+        }
+    }
     return $courses_list;
 }
 

main/webservices/webservice.php

Indentation +220 added lines, -220 removed lines

@@ -11,237 +11,237 @@
  */
 class WSError
 {
-	/**
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
-	 *
-	 * @var WSErrorHandler
-	 */
-	protected static $_handler;
-
-	/**
-	 * Error code
-	 *
-	 * @var int
-	 */
-	public $code;
-
-	/**
-	 * Error message
-	 *
-	 * @var string
-	 */
-	public $message;
-
-	/**
-	 * Constructor
-	 *
-	 * @param int Error code
-	 * @param string Error message
-	 */
-	public function __construct($code, $message) {
-		$this->code = $code;
-		$this->message = $message;
-	}
-
-	/**
-	 * Sets the error handler
-	 *
-	 * @param WSErrorHandler Error handler
-	 */
-	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
-			self::$_handler = $handler;
-		}
-	}
-
-	/**
-	 * Returns the error handler
-	 *
-	 * @return WSErrorHandler Error handler
-	 */
-	public static function getErrorHandler() {
-		return self::$_handler;
-	}
-
-	/**
-	 * Transforms the error into an array
-	 *
-	 * @return array Associative array with code and message
-	 */
-	public function toArray() {
-		return array('code' => $this->code, 'message' => $this->message);
-	}
+    /**
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
+     *
+     * @var WSErrorHandler
+     */
+    protected static $_handler;
+
+    /**
+     * Error code
+     *
+     * @var int
+     */
+    public $code;
+
+    /**
+     * Error message
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * Constructor
+     *
+     * @param int Error code
+     * @param string Error message
+     */
+    public function __construct($code, $message) {
+        $this->code = $code;
+        $this->message = $message;
+    }
+
+    /**
+     * Sets the error handler
+     *
+     * @param WSErrorHandler Error handler
+     */
+    public static function setErrorHandler($handler) {
+        if($handler instanceof WSErrorHandler) {
+            self::$_handler = $handler;
+        }
+    }
+
+    /**
+     * Returns the error handler
+     *
+     * @return WSErrorHandler Error handler
+     */
+    public static function getErrorHandler() {
+        return self::$_handler;
+    }
+
+    /**
+     * Transforms the error into an array
+     *
+     * @return array Associative array with code and message
+     */
+    public function toArray() {
+        return array('code' => $this->code, 'message' => $this->message);
+    }
 }
 
 /**
  * Interface that must be implemented by any error handler
  */
 interface WSErrorHandler {
-	/**
-	 * Handle method
-	 *
-	 * @param WSError Error
-	 */
-	public function handle($error);
+    /**
+     * Handle method
+     *
+     * @param WSError Error
+     */
+    public function handle($error);
 }
 
 /**
  * Main class of the webservice. Webservice classes extend this class
  */
 class WS {
-	/**
-	 * Chamilo configuration
-	 *
-	 * @var array
-	 */
-	protected $_configuration;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->_configuration = $GLOBALS['_configuration'];
-	}
-
-	/**
-	 * Verifies the API key
-	 *
-	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
-	 */
-	protected function verifyKey($secret_key) {
-		$ip = trim($_SERVER['REMOTE_ADDR']);
-		// if we are behind a reverse proxy, assume it will send the
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
-			$ip = trim($ip1);
-		}
-		$security_key = $ip.$this->_configuration['security_key'];
-
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
-			return new WSError(1, "API key is invalid");
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Gets the real user id based on the user id field name and value.
-	 * Note that if the user id field name is "chamilo_user_id", it will use the user id
-	 * in the system database
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @return mixed System user id if the user was found, WSError otherwise
-	 */
-	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
-				return intval($user_id_value);
-			} else {
-				return new WSError(100, "User not found");
-			}
-		} else {
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
-				return new WSError(100, "User not found");
-			} else {
-				return $user_id;
-			}
-		}
-	}
-
-	/**
-	 * Gets the real course id based on the course id field name and value.
-	 * Note that if the course id field name is "chamilo_course_id", it will use the course id
-	 * in the system database
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed System course id if the course was found, WSError otherwise
-	 */
-	protected function getCourseId($course_id_field_name, $course_id_value)
-	{
-		if ($course_id_field_name == "chamilo_course_id") {
-			if (CourseManager::get_course_code_from_course_id(
-					intval($course_id_value)
-				) != null
-			) {
-				return intval($course_id_value);
-			} else {
-				return new WSError(200, "Course not found");
-			}
-		} else {
-			$courseId = CourseManager::get_course_code_from_original_id(
-				$course_id_value,
-				$course_id_field_name
-			);
-			if (!empty($courseId)) {
-				return $courseId;
-			} else {
-				return new WSError(200, "Course not found");
-			}
-		}
-	}
-
-	/**
-	 * Gets the real session id based on the session id field name and value.
-	 * Note that if the session id field name is "chamilo_session_id", it will use the session id
-	 * in the system database
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed System session id if the session was found, WSError otherwise
-	 */
-	protected function getSessionId($session_id_field_name, $session_id_value)
-	{
-		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
-			if (!empty($session)) {
-				return intval($session_id_value);
-			} else {
-				return new WSError(300, "Session not found");
-			}
-		} else {
-			$session_id = SessionManager::getSessionIdFromOriginalId(
-				$session_id_value,
-				$session_id_field_name
-			);
-			if ($session_id == 0) {
-				return new WSError(300, "Session not found");
-			} else {
-				return $session_id;
-			}
-		}
-	}
-
-	/**
-	 * Handles an error by calling the WSError error handler
-	 *
-	 * @param WSError Error
-	 */
-	protected function handleError($error) {
-		$handler = WSError::getErrorHandler();
-		$handler->handle($error);
-	}
-
-	/**
-	 * Gets a successful result
-	 *
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
-	 */
-	protected function getSuccessfulResult() {
-		return array('code' => 0, 'message' => 'Operation was successful');
-	}
-
-	/**
-	 * Test function. Returns the string success
-	 *
-	 * @return string Success
-	 */
-	public function test() {
-		return "success";
-	}
+    /**
+     * Chamilo configuration
+     *
+     * @var array
+     */
+    protected $_configuration;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->_configuration = $GLOBALS['_configuration'];
+    }
+
+    /**
+     * Verifies the API key
+     *
+     * @param string Secret key
+     * @return mixed WSError in case of failure, null in case of success
+     */
+    protected function verifyKey($secret_key) {
+        $ip = trim($_SERVER['REMOTE_ADDR']);
+        // if we are behind a reverse proxy, assume it will send the
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+            $ip = trim($ip1);
+        }
+        $security_key = $ip.$this->_configuration['security_key'];
+
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
+            return new WSError(1, "API key is invalid");
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Gets the real user id based on the user id field name and value.
+     * Note that if the user id field name is "chamilo_user_id", it will use the user id
+     * in the system database
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @return mixed System user id if the user was found, WSError otherwise
+     */
+    protected function getUserId($user_id_field_name, $user_id_value) {
+        if($user_id_field_name == "chamilo_user_id") {
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
+                return intval($user_id_value);
+            } else {
+                return new WSError(100, "User not found");
+            }
+        } else {
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
+            if($user_id == 0) {
+                return new WSError(100, "User not found");
+            } else {
+                return $user_id;
+            }
+        }
+    }
+
+    /**
+     * Gets the real course id based on the course id field name and value.
+     * Note that if the course id field name is "chamilo_course_id", it will use the course id
+     * in the system database
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed System course id if the course was found, WSError otherwise
+     */
+    protected function getCourseId($course_id_field_name, $course_id_value)
+    {
+        if ($course_id_field_name == "chamilo_course_id") {
+            if (CourseManager::get_course_code_from_course_id(
+                    intval($course_id_value)
+                ) != null
+            ) {
+                return intval($course_id_value);
+            } else {
+                return new WSError(200, "Course not found");
+            }
+        } else {
+            $courseId = CourseManager::get_course_code_from_original_id(
+                $course_id_value,
+                $course_id_field_name
+            );
+            if (!empty($courseId)) {
+                return $courseId;
+            } else {
+                return new WSError(200, "Course not found");
+            }
+        }
+    }
+
+    /**
+     * Gets the real session id based on the session id field name and value.
+     * Note that if the session id field name is "chamilo_session_id", it will use the session id
+     * in the system database
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed System session id if the session was found, WSError otherwise
+     */
+    protected function getSessionId($session_id_field_name, $session_id_value)
+    {
+        if ($session_id_field_name == "chamilo_session_id") {
+            $session = SessionManager::fetch((int)$session_id_value);
+            if (!empty($session)) {
+                return intval($session_id_value);
+            } else {
+                return new WSError(300, "Session not found");
+            }
+        } else {
+            $session_id = SessionManager::getSessionIdFromOriginalId(
+                $session_id_value,
+                $session_id_field_name
+            );
+            if ($session_id == 0) {
+                return new WSError(300, "Session not found");
+            } else {
+                return $session_id;
+            }
+        }
+    }
+
+    /**
+     * Handles an error by calling the WSError error handler
+     *
+     * @param WSError Error
+     */
+    protected function handleError($error) {
+        $handler = WSError::getErrorHandler();
+        $handler->handle($error);
+    }
+
+    /**
+     * Gets a successful result
+     *
+     * @return array Array with a code of 0 and a message 'Operation was successful'
+     */
+    protected function getSuccessfulResult() {
+        return array('code' => 0, 'message' => 'Operation was successful');
+    }
+
+    /**
+     * Test function. Returns the string success
+     *
+     * @return string Success
+     */
+    public function test() {
+        return "success";
+    }
 }
 

main/webservices/courses_list.rest.php

Indentation +33 added lines, -33 removed lines

@@ -22,32 +22,32 @@ 
  */
 function courses_list($security_key, $visibilities = 'public') {
 
-	global $_configuration;
+    global $_configuration;
 
-   	// Check if this script is launch by server and if security key is ok.
-   	if ($security_key != $_configuration['security_key']) {
-   		return array('error_msg' => 'Security check failed');
-   	}
+        // Check if this script is launch by server and if security key is ok.
+        if ($security_key != $_configuration['security_key']) {
+            return array('error_msg' => 'Security check failed');
+        }
 
-	$vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
+    $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
 
-	$courses_list = array();
+    $courses_list = array();
 
-	if (!is_array($visibilities)) {
-		$tmp = $visibilities;
-		$visibilities = array($tmp);
-	}
-	foreach ($visibilities as $visibility) {
-		if (!in_array($visibility, array_keys($vis))) {
-   			return array('error_msg' => 'Security check failed');
-		}
-		$courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
-		foreach ($courses_list_tmp as $index => $course) {
-			$course_info = CourseManager::get_course_information($course['code']);
-			$courses_list[$course['code']] = array('title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
-		}
-	}
-	return $courses_list;
+    if (!is_array($visibilities)) {
+        $tmp = $visibilities;
+        $visibilities = array($tmp);
+    }
+    foreach ($visibilities as $visibility) {
+        if (!in_array($visibility, array_keys($vis))) {
+                return array('error_msg' => 'Security check failed');
+        }
+        $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
+        foreach ($courses_list_tmp as $index => $course) {
+            $course_info = CourseManager::get_course_information($course['code']);
+            $courses_list[$course['code']] = array('title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
+        }
+    }
+    return $courses_list;
 }
 
 header('Content-Type: text/xml; charset=utf-8');
@@ -55,17 +55,17 @@ 
 echo '<courseslist>';
 
 if (empty($_POST['security-key']) || empty($_POST['visibility'])) {
-	echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>';
+    echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>';
 } else {
-	$courses_list = courses_list($_POST['security-key'], $_POST['visibility']);
-	foreach ($courses_list as $code => $cd) {
-		echo '<course>';
-		echo '<code>' , $code , '</code>';
-		echo '<title>' , $cd['title'] , '</title>';
-		echo '<url>' , $cd['url'] , '</url>';
-		echo '<teacher>' , $cd['teacher'] , '</teacher>';
-		echo '<language>' , $cd['language'] , '</language>';
-		echo '</course>';
-	}
+    $courses_list = courses_list($_POST['security-key'], $_POST['visibility']);
+    foreach ($courses_list as $code => $cd) {
+        echo '<course>';
+        echo '<code>' , $code , '</code>';
+        echo '<title>' , $cd['title'] , '</title>';
+        echo '<url>' , $cd['url'] , '</url>';
+        echo '<teacher>' , $cd['teacher'] , '</teacher>';
+        echo '<language>' , $cd['language'] , '</language>';
+        echo '</course>';
+    }
 }
 echo '</courseslist>';

main/coursecopy/recycle_course.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 $result = $objExercise->read($exercise_id);
 
 if (!$result) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $interbreadcrumb[] = array(

main/document/save_pixlr.php

Indentation +58 added lines, -58 removed lines

@@ -17,18 +17,18 @@ 
 api_block_anonymous_users();
 
 if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) {
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 //pixlr return
@@ -72,22 +72,22 @@ 
 $filename = disable_dangerous_file($filename);
 
 if (strlen(trim($filename))==0) {
-	 echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
-	 exit;
+        echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
+        exit;
 }
 
 //check file_get_contents
 if ($contents === false) {
-	echo "I cannot read: ".$urlcontents;
+    echo "I cannot read: ".$urlcontents;
     exit;
 }
 
 // Extension security
 if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){
-	die();
+    die();
 }
 if($extension=='pxd') {
-	echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
+    echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
     exit;
 }
 
@@ -95,8 +95,8 @@ 
 $headers = get_headers($urlcontents, 1);
 $content_type = explode("/", $headers['Content-Type']);
 if ($content_type[0] != "image") {
-	echo "Invalid file type";
-	exit;
+    echo "Invalid file type";
+    exit;
 }
 
 //Verify that the file is an image. Fileinfo method
@@ -114,49 +114,49 @@ 
 $title = $title.'.'.$extension;
 
 if($currentTool=='document/createpaint'){
-	//check save as and prevent rewrite an older file with same name
-	if (0 != $groupId){
+    //check save as and prevent rewrite an older file with same name
+    if (0 != $groupId){
         $group_properties  = GroupManager :: get_group_properties($groupId);
         $groupPath = $group_properties['directory'];
-	} else {
-		$groupPath ='';
-	}
-
-	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
-		$i = 1;
-		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
-		$paintFileName = $filename . '_' . $i . '.'.$extension;
-		$title = $filename . '_' . $i . '.'.$extension;
-	}
-
-	//
-	$documentPath = $saveDir.'/'.$paintFileName;
-	//add new document to disk
-	file_put_contents( $documentPath, $contents );
-	//add document to database
-	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
-	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    } else {
+        $groupPath ='';
+    }
+
+    if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
+        $i = 1;
+        while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
+        $paintFileName = $filename . '_' . $i . '.'.$extension;
+        $title = $filename . '_' . $i . '.'.$extension;
+    }
+
+    //
+    $documentPath = $saveDir.'/'.$paintFileName;
+    //add new document to disk
+    file_put_contents( $documentPath, $contents );
+    //add document to database
+    $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
+    api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 
 }elseif($currentTool=='document/editpaint'){
 
-	$documentPath = $saveDir.'/'.$paintFileName;
-	//add new document to disk
-	file_put_contents( $documentPath, $contents );
-
-	//check path
-	if(!isset($_SESSION['paint_file'])){
-		api_not_allowed();
-		die();
-	}
-	if($_SESSION['paint_file']==$paintFileName){
-		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
-		update_existing_document($_course, $document_id, filesize($documentPath), null);
-		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}else{
-		//add a new document
-		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
-		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}
+    $documentPath = $saveDir.'/'.$paintFileName;
+    //add new document to disk
+    file_put_contents( $documentPath, $contents );
+
+    //check path
+    if(!isset($_SESSION['paint_file'])){
+        api_not_allowed();
+        die();
+    }
+    if($_SESSION['paint_file']==$paintFileName){
+        $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
+        update_existing_document($_course, $document_id, filesize($documentPath), null);
+        api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    }else{
+        //add a new document
+        $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
+        api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    }
 }
 
 
@@ -171,12 +171,12 @@ 
 unset($_SESSION['temp_realpath_image']);
 
 if (!isset($_SESSION['exit_pixlr'])) {
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
-	api_not_allowed(true);
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php';
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
+    api_not_allowed(true);
 } else {
-	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
-	unset($_SESSION['exit_pixlr']);
+    echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
+    unset($_SESSION['exit_pixlr']);
 }

main/document/document_quota.php

Indentation +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
         }
     }
     if ($quota_bytes != 0) {
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+        $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
     }
 
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -103,7 +103,7 @@ 
         }
         $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
 
-   }
+    }
 }
 
 $quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;

main/upload/index.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 $result = $objExercise->read($exercise_id);
 
 if (!$result) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $interbreadcrumb[] = array(