chamilo / chamilo-lms

main/permissions/blog_permissions.inc.php

Indentation +71 added lines, -71 removed lines

@@ -49,7 +49,7 @@ 
 		WHERE status = '1' AND c_id = '".api_get_course_int_id()."'";
 $result = Database::query($sql);
 while ($user = Database::fetch_assoc($result)) {
-	unset($blog_users[$user['user_id']]);
+    unset($blog_users[$user['user_id']]);
 }
 
 //$user_id=$userIdViewed;
@@ -84,30 +84,30 @@ 
 // 			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;
+    }
 }
 
 echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
@@ -118,12 +118,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 />';
 }
 
 // ---------------------------------------------------
@@ -133,59 +133,59 @@ 
 
 // the header
 echo "\t<tr>\n";
-	echo "\t\t<th rowspan=\"2\">".get_lang('Module')."</th>\n";
-	echo "\t\t<th colspan=\"4\">".get_lang('ArticleManager')."</th>\n";
-	echo "\t\t<th colspan=\"3\">".get_lang('CommentManager')."</th>\n";
-	echo "\t\t<th colspan=\"3\">".get_lang('BlogManager')."</th>\n";
+    echo "\t\t<th rowspan=\"2\">".get_lang('Module')."</th>\n";
+    echo "\t\t<th colspan=\"4\">".get_lang('ArticleManager')."</th>\n";
+    echo "\t\t<th colspan=\"3\">".get_lang('CommentManager')."</th>\n";
+    echo "\t\t<th colspan=\"3\">".get_lang('BlogManager')."</th>\n";
 echo "\t</tr>\n";
 
 // Subheader
 echo "\t<tr>\n";
-	echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Edit')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Tasks')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Members')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Roles')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Edit')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Tasks')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Members')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Roles')."</th>\n";
 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
-	// ---------------------------------------------------
-	// 			RETRIEVING THE PERMISSIONS OF THE USER
-	// ---------------------------------------------------
-	$current_user_permissions = array();
-	$current_user_permissions = get_permissions('user', $user_id);
-
-	echo "\t<tr>\n";
-	echo "\t\t<td>\n";
-	echo $user_name;
-	echo "\t\t</td>\n";
-
-	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,
-				(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
-		// 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";
+    // ---------------------------------------------------
+    // 			RETRIEVING THE PERMISSIONS OF THE USER
+    // ---------------------------------------------------
+    $current_user_permissions = array();
+    $current_user_permissions = get_permissions('user', $user_id);
+
+    echo "\t<tr>\n";
+    echo "\t\t<td>\n";
+    echo $user_name;
+    echo "\t\t</td>\n";
+
+    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,
+                (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
+        // 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";

main/permissions/roles.php

Indentation +179 added lines, -179 removed lines

@@ -18,56 +18,56 @@ 
 // storing all the permission for a given role when the checkbox approach is used
 if ($_POST['StoreRolePermissions'])
 {
-	if (!empty($_POST['role_name']))
-	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
-		$sql="INSERT INTO $table_role (role_name, role_comment, default_role)
+    if (!empty($_POST['role_name']))
+    {
+        $table_role=Database::get_course_table(TABLE_ROLE);
+        $sql="INSERT INTO $table_role (role_name, role_comment, default_role)
 					VALUES ('".Database::escape_string($_POST['role_name'])."','".Database::escape_string($_POST['role_comment'])."','".Database::escape_string($_POST['default_role'])."')";
-		$result=Database::query($sql);
-		$role_id=Database::insert_id();
-		$result_message=store_permissions('role', $role_id);
-	}
-	else
-	{
-		$result_message=get_lang('ErrorPleaseGiveRoleName');
-	}
+        $result=Database::query($sql);
+        $role_id=Database::insert_id();
+        $result_message=store_permissions('role', $role_id);
+    }
+    else
+    {
+        $result_message=get_lang('ErrorPleaseGiveRoleName');
+    }
 }
 // storing a permission for a given role when the image approach is used
 if (isset($_GET['action']) AND isset($_GET['permission']) AND isset($_GET['tool']))
 {
-	if ($_GET['action']=='grant' OR $_GET['action']=='revoke')
-	{
-		$result_message=store_one_permission('role', $_GET['action'], $role_id, $_GET['tool'], $_GET['permission']);
-	}
+    if ($_GET['action']=='grant' OR $_GET['action']=='revoke')
+    {
+        $result_message=store_one_permission('role', $_GET['action'], $role_id, $_GET['tool'], $_GET['permission']);
+    }
 }
 
 // deleting a role
 if (isset($_GET['action']) AND isset($_GET['role_id']) AND $_GET['action']=='delete') {
-	//deleting the assignments fo this role: users
-	$table=Database::get_course_table(TABLE_ROLE_USER);
-	$sql="DELETE FROM $table WHERE role_id='".intval($_GET['role_id'])."'";
-	$result=Database::query($sql);
+    //deleting the assignments fo this role: users
+    $table=Database::get_course_table(TABLE_ROLE_USER);
+    $sql="DELETE FROM $table WHERE role_id='".intval($_GET['role_id'])."'";
+    $result=Database::query($sql);
 
-	// deleting the assignments of this role: groups
-	$table=Database::get_course_table(TABLE_ROLE_GROUP);
-	$sql="DELETE FROM $table WHERE role_id='".intval($_GET['role_id'])."'";
-	$result=Database::query($sql);
+    // deleting the assignments of this role: groups
+    $table=Database::get_course_table(TABLE_ROLE_GROUP);
+    $sql="DELETE FROM $table WHERE role_id='".intval($_GET['role_id'])."'";
+    $result=Database::query($sql);
 
-	// deleting the permissions of this role
-	$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-	$sql="DELETE FROM $table WHERE role_id='".intval($_GET['role_id'])."'";
-	$result=Database::query($sql);
+    // deleting the permissions of this role
+    $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+    $sql="DELETE FROM $table WHERE role_id='".intval($_GET['role_id'])."'";
+    $result=Database::query($sql);
 
-	// deleting the role
-	$table_role=Database::get_course_table(TABLE_ROLE);
-	$sql="DELETE FROM $table_role WHERE role_id='".intval($_GET['role_id'])."'";
-	$result=Database::query($sql);
-	$result_message=get_lang('RoleDeleted');
+    // deleting the role
+    $table_role=Database::get_course_table(TABLE_ROLE);
+    $sql="DELETE FROM $table_role WHERE role_id='".intval($_GET['role_id'])."'";
+    $result=Database::query($sql);
+    $result_message=get_lang('RoleDeleted');
 }
 
 // displaying the return message of the actions
 if (isset($result_message)) {
-	Display::display_normal_message($result_message);
+    Display::display_normal_message($result_message);
 }
 
 // 		ADDING A NEW ROLE (FORM AND LINK)
@@ -75,73 +75,73 @@ 
 
 if ($_GET['action']=='add')
 {
-	echo "<form method=\"post\" action=\"".api_get_self()."\">";
-	echo "\n<table>";
-	echo "\n\t<tr>";
-	echo "\n\t\t<td>";
-	echo get_lang('RoleName');
-	echo "\n\t\t</td>";
-	echo "\n\t\t<td>";
-	echo "\n\t\t\t<input type='text' name='role_name'>";
-	echo "\n\t\t</td>";
-	echo "\n\t</tr>";
-	echo "\n\t<tr>";
-	echo "\n\t\t<td>";
-	echo get_lang('RoleComment');
-	echo "\n\t\t</td>";
-	echo "\n\t\t<td>";
-	echo "\n\t\t\t<textarea name='role_comment'></textarea>";
-	echo "\n\t\t</td>";
-	echo "\n\t</tr>";
-	echo "\n\t<tr>";
-	echo "\n\t\t<td>";
-	echo get_lang('DefaultRole');
-	echo "\n\t\t</td>";
-	echo "\n\t\t<td>";
-	echo "\n\t\t\t<input type=\"checkbox\" name=\"default_role\" value=\"1\">";
-	echo "\n\t\t</td>";
-	echo "\n\t</tr>";
-	echo "\n</table>";
-	echo "<table class=\"data_table\">\n";
+    echo "<form method=\"post\" action=\"".api_get_self()."\">";
+    echo "\n<table>";
+    echo "\n\t<tr>";
+    echo "\n\t\t<td>";
+    echo get_lang('RoleName');
+    echo "\n\t\t</td>";
+    echo "\n\t\t<td>";
+    echo "\n\t\t\t<input type='text' name='role_name'>";
+    echo "\n\t\t</td>";
+    echo "\n\t</tr>";
+    echo "\n\t<tr>";
+    echo "\n\t\t<td>";
+    echo get_lang('RoleComment');
+    echo "\n\t\t</td>";
+    echo "\n\t\t<td>";
+    echo "\n\t\t\t<textarea name='role_comment'></textarea>";
+    echo "\n\t\t</td>";
+    echo "\n\t</tr>";
+    echo "\n\t<tr>";
+    echo "\n\t\t<td>";
+    echo get_lang('DefaultRole');
+    echo "\n\t\t</td>";
+    echo "\n\t\t<td>";
+    echo "\n\t\t\t<input type=\"checkbox\" name=\"default_role\" value=\"1\">";
+    echo "\n\t\t</td>";
+    echo "\n\t</tr>";
+    echo "\n</table>";
+    echo "<table class=\"data_table\">\n";
 
-	// the header
-	if (api_get_setting('permissions')=='limited')
-	{
-		$header_array=$rights_limited;
-	}
-	if (api_get_setting('permissions')=='full')
-	{
-		$header_array=$rights_full;
-	}
-	echo "\t<tr>\n";
-	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</tr>\n";
+    // the header
+    if (api_get_setting('permissions')=='limited')
+    {
+        $header_array=$rights_limited;
+    }
+    if (api_get_setting('permissions')=='full')
+    {
+        $header_array=$rights_full;
+    }
+    echo "\t<tr>\n";
+    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</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";
-		echo get_lang($tool);
-		echo "\t\t</td>\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";
+        echo get_lang($tool);
+        echo "\t\t</td>\n";
 
-		foreach ($header_array as $key=>$value)
-		{
-			echo "\t\t<td align='center'>\n";
-			display_checkbox_matrix(array(), $tool, $value);
-			echo "\t\t</td>\n";
-		}
-		echo "\t</tr>\n";
-	}
+        foreach ($header_array as $key=>$value)
+        {
+            echo "\t\t<td align='center'>\n";
+            display_checkbox_matrix(array(), $tool, $value);
+            echo "\t\t</td>\n";
+        }
+        echo "\t</tr>\n";
+    }
 
-	echo "</table>\n";
+    echo "</table>\n";
 
-	echo "<input type=\"Submit\" name=\"StoreRolePermissions\" value=\"".get_lang('StorePermissions')."\">";
-	echo "</form>";
+    echo "<input type=\"Submit\" name=\"StoreRolePermissions\" value=\"".get_lang('StorePermissions')."\">";
+    echo "</form>";
 
 }
 
@@ -154,23 +154,23 @@ 
 $all_roles=get_all_roles('platform');
 foreach ($all_roles as $role)
 {
-	echo '<div><a href="roles.php?action=view&amp;role_id='.$role['role_id'].'&amp;scope=platform">'.$role['role_name'].'</a></div>';
-	echo '<div>'.$role['role_comment'].'</div><br />';
-	if ($role['role_id']==$_GET['role_id'])
-	{
-		$current_role_info=$role;
-	}
+    echo '<div><a href="roles.php?action=view&amp;role_id='.$role['role_id'].'&amp;scope=platform">'.$role['role_name'].'</a></div>';
+    echo '<div>'.$role['role_comment'].'</div><br />';
+    if ($role['role_id']==$_GET['role_id'])
+    {
+        $current_role_info=$role;
+    }
 }
 // course roles
 $all_roles=get_all_roles();
 foreach ($all_roles as $role)
 {
-	echo '<div><a href="roles.php?action=view&amp;role_id='.$role['role_id'].'">'.$role['role_name'].'</a><a href="roles.php?action=delete&amp;role_id='.$role['role_id'].'"><img src="../img/delete.gif" /></a></div>';
-	echo '<div>'.$role['role_comment'].'</div><br />';
-	if ($role['role_id']==$_GET['role_id'])
-	{
-		$current_role_info=$role;
-	}
+    echo '<div><a href="roles.php?action=view&amp;role_id='.$role['role_id'].'">'.$role['role_name'].'</a><a href="roles.php?action=delete&amp;role_id='.$role['role_id'].'"><img src="../img/delete.gif" /></a></div>';
+    echo '<div>'.$role['role_comment'].'</div><br />';
+    if ($role['role_id']==$_GET['role_id'])
+    {
+        $current_role_info=$role;
+    }
 }
 
 // ===================================================
@@ -178,83 +178,83 @@ 
 // ===================================================
 if ($_GET['role_id'])
 {
-	$current_role_permissions=get_permissions('role',$_GET['role_id']);
+    $current_role_permissions=get_permissions('role',$_GET['role_id']);
 
-	// ---------------------------------------------------
-	// 			LIMITED OR FULL
-	// ---------------------------------------------------
-	$current_role_permissions=limited_or_full($current_role_permissions);
-	if (api_get_setting('permissions')=='limited')
-	{
-		$header_array=$rights_limited;
-	}
-	if (api_get_setting('permissions')=='full')
-	{
-		$header_array=$rights_full;
-	}
-	// ---------------------------------------------------
-	// 			DISPLAYING THE MATRIX
-	// ---------------------------------------------------
-	echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
+    // ---------------------------------------------------
+    // 			LIMITED OR FULL
+    // ---------------------------------------------------
+    $current_role_permissions=limited_or_full($current_role_permissions);
+    if (api_get_setting('permissions')=='limited')
+    {
+        $header_array=$rights_limited;
+    }
+    if (api_get_setting('permissions')=='full')
+    {
+        $header_array=$rights_full;
+    }
+    // ---------------------------------------------------
+    // 			DISPLAYING THE MATRIX
+    // ---------------------------------------------------
+    echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
 
-	// the list of the roles for the user
-	echo get_lang('PermissionsOfRole').':'.$current_role_info['role_name'].'<br />';
-	if ($_GET['scope']=='platform')
-	{
-		echo get_lang('IsPlatformRoleNotEditable').'<br />';
-	}
+    // the list of the roles for the user
+    echo get_lang('PermissionsOfRole').':'.$current_role_info['role_name'].'<br />';
+    if ($_GET['scope']=='platform')
+    {
+        echo get_lang('IsPlatformRoleNotEditable').'<br />';
+    }
 
-	echo "<table class=\"data_table\">\n";
+    echo "<table class=\"data_table\">\n";
 
-	// the header
-	echo "\t<tr>\n";
-	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</tr>\n";
+    // the header
+    echo "\t<tr>\n";
+    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</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";
-		echo get_lang($tool);
-		echo "\t\t</td>\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";
+        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_role_permissions, $tool, $value);
-				}
-				if ($setting_visualisation=='image')
-				{
-					if ($_GET['scope']=='platform')
-					{
-						$roles_editable=false;
-					}
-					else
-					{
-						$roles_editable=true;
-					}
-					display_image_matrix($current_role_permissions, $tool, $value, '','',$roles_editable);
-				}
-			}
-			echo "\t\t</td>\n";
-		}
-		echo "\t</tr>\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_role_permissions, $tool, $value);
+                }
+                if ($setting_visualisation=='image')
+                {
+                    if ($_GET['scope']=='platform')
+                    {
+                        $roles_editable=false;
+                    }
+                    else
+                    {
+                        $roles_editable=true;
+                    }
+                    display_image_matrix($current_role_permissions, $tool, $value, '','',$roles_editable);
+                }
+            }
+            echo "\t\t</td>\n";
+        }
+        echo "\t</tr>\n";
+    }
 
-	echo "</table>\n";
-	if ($setting_visualisation=='checkbox')
-	{
-		echo "<input type=\"Submit\" name=\"StoreRolePermissions\" value=\"".get_lang('StorePermissions')."\">";
-	}
-	echo "</form>";
+    echo "</table>\n";
+    if ($setting_visualisation=='checkbox')
+    {
+        echo "<input type=\"Submit\" name=\"StoreRolePermissions\" value=\"".get_lang('StorePermissions')."\">";
+    }
+    echo "</form>";
 }
 Display::display_footer();
\ No newline at end of file

main/webservices/testip.php

Indentation +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@
  */
 $ip = trim($_SERVER['REMOTE_ADDR']);
 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-  list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
-  $ip = trim($ip1);
+    list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+    $ip = trim($ip1);
 }
 echo htmlentities($ip);

main/webservices/webservice_report.php

Indentation +25 added lines, -25 removed lines

@@ -11,32 +11,32 @@ 
  */
 class WSReport extends WS {
 
-	/**
-	 * Gets the time spent on the platform by a given user
-	 *
-	 * @param string User id field name
-	 * @param string User id value
+    /**
+     * Gets the time spent on the platform by a given user
+     *
+     * @param string User id field name
+     * @param string User id value
      * @return array Array of results
-	 */
-	public function GetTimeSpentOnPlatform($user_id_field_name, $user_id_value) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
+     */
+    public function GetTimeSpentOnPlatform($user_id_field_name, $user_id_value) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
             return Tracking::get_time_spent_on_the_platform($user_id);
-		}
-	}
+        }
+    }
 
-	/**
+    /**
      * Gets the time spent in a course by a given user
-	 *
+     *
      * @param string User id field name
      * @param string User id value
      * @param string Course id field name
      * @param string Course id value
-	 * @return array Array of results
-	 */
-	public function GetTimeSpentOnCourse($user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value) {
+     * @return array Array of results
+     */
+    public function GetTimeSpentOnCourse($user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value) {
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
         if($user_id instanceof WSError) {
             return $user_id;
@@ -48,7 +48,7 @@ 
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
         }
         return Tracking::get_time_spent_on_the_course($user_id, $course_id);
-	}
+    }
 
     /**
      * Gets the time spent in a course by a given user
@@ -128,8 +128,8 @@ 
         }
         $lp = new learnpath($course_code, $learnpath_id, $user_id);
         $return = array(
-          'progress_bar_mode' => $lp->progress_bar_mode,
-          'progress_db' => $lp->progress_db,
+            'progress_bar_mode' => $lp->progress_bar_mode,
+            'progress_db' => $lp->progress_db,
         );
         return $return;
     }
@@ -191,10 +191,10 @@ 
 
         $lp = new learnpath($course_code, $learnpath_id, $user_id);
         $return = array(
-          'min_score' => $lp->items[$learnpath_item_id]->min_score,
-          'max_score' => $lp->items[$learnpath_item_id]->max_score,
-          'mastery_score' => $lp->items[$learnpath_item_id]->mastery_score,
-          'current_score' => $lp->items[$learnpath_item_id]->current_score,
+            'min_score' => $lp->items[$learnpath_item_id]->min_score,
+            'max_score' => $lp->items[$learnpath_item_id]->max_score,
+            'mastery_score' => $lp->items[$learnpath_item_id]->mastery_score,
+            'current_score' => $lp->items[$learnpath_item_id]->current_score,
         );
         return $return;
     }

main/webservices/lp.php

Indentation +1 added lines, -1 removed lines

@@ -581,7 +581,7 @@
     /*$sessionIdName = isset($params['session_id_name']) ? $params['session_id_name'] : null;
     $sessionIdValue = isset($params['session_id_value']) ? $params['session_id_value'] : null;*/
 
-     $courseInfo = CourseManager::getCourseInfoFromOriginalId(
+        $courseInfo = CourseManager::getCourseInfoFromOriginalId(
         $courseIdValue,
         $courseIdName
     );

main/webservices/cm_soap_course.php

Indentation +195 added lines, -195 removed lines

@@ -9,255 +9,255 @@ 
 $s = WSCMSoapServer::singleton();
 
 $s->wsdl->addComplexType(
-	'course_id',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string')
-	)
+    'course_id',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'course_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_result[]')),
-	'tns:course_result'
+    'course_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_result[]')),
+    'tns:course_result'
 );
 
 $s->register(
-	'WSCMCourse.DeleteCourse',
-	array('secret_key' => 'xsd:string', 'course_id_field_name' => 'xsd:string', 'course_id_value' => 'xsd:string')
+    'WSCMCourse.DeleteCourse',
+    array('secret_key' => 'xsd:string', 'course_id_field_name' => 'xsd:string', 'course_id_value' => 'xsd:string')
 );
 
 $s->register(
-	'WSCMCourse.DeleteCourses',
-	array('secret_key' => 'xsd:string', 'courses' => 'tns:course_id[]'),
-	array('return' => 'tns:course_result_array')
+    'WSCMCourse.DeleteCourses',
+    array('secret_key' => 'xsd:string', 'courses' => 'tns:course_id[]'),
+    array('return' => 'tns:course_result_array')
 );
 
 $s->register(
-	'WSCMCourse.CreateCourse',
-	array(
-		'secret_key' => 'xsd:string',
-		'title' => 'xsd:string',
-		'category_code' => 'xsd:string',
-		'wanted_code' => 'xsd:string',
-		'tutor_name' => 'xsd:string',
-		'course_admin_user_id_field_name' => 'xsd:string',
-		'course_admin_user_id_value' => 'xsd:string',
-		'language' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'extras' => 'tns:extra_field[]'
-	),
-	array('return' => 'xsd:int')
+    'WSCMCourse.CreateCourse',
+    array(
+        'secret_key' => 'xsd:string',
+        'title' => 'xsd:string',
+        'category_code' => 'xsd:string',
+        'wanted_code' => 'xsd:string',
+        'tutor_name' => 'xsd:string',
+        'course_admin_user_id_field_name' => 'xsd:string',
+        'course_admin_user_id_value' => 'xsd:string',
+        'language' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'extras' => 'tns:extra_field[]'
+    ),
+    array('return' => 'xsd:int')
 );
 
 $s->wsdl->addComplexType(
-	'course_create',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'title' => array('name' => 'title', 'type' => 'xsd:string'),
-		'category_code' => array('name' => 'category_code', 'type' => 'xsd:string'),
-		'wanted_code' => array('name' => 'wanted_code', 'type' => 'xsd:int'),
-		'tutor_name' => array('name' => 'tutor_name', 'type' => 'xsd:string'),
-		'course_admin_user_id_field_name' => array('name' => 'course_admin_user_id_field_name', 'type' => 'xsd:string'),
-		'course_admin_user_id_value' => array('name' => 'course_admin_user_id_value', 'type' => 'xsd:string'),
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
-		'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field[]')
-	)
+    'course_create',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
+        'category_code' => array('name' => 'category_code', 'type' => 'xsd:string'),
+        'wanted_code' => array('name' => 'wanted_code', 'type' => 'xsd:int'),
+        'tutor_name' => array('name' => 'tutor_name', 'type' => 'xsd:string'),
+        'course_admin_user_id_field_name' => array('name' => 'course_admin_user_id_field_name', 'type' => 'xsd:string'),
+        'course_admin_user_id_value' => array('name' => 'course_admin_user_id_value', 'type' => 'xsd:string'),
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
+        'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field[]')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_create_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
-		'course_id_generated' => array('name' => 'course_id_generated', 'type' => 'xsd:int'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'course_create_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
+        'course_id_generated' => array('name' => 'course_id_generated', 'type' => 'xsd:int'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_create_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_create_result[]')),
-	'tns:course_create_result'
+    'course_create_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_create_result[]')),
+    'tns:course_create_result'
 );
 
 $s->register(
-	'WSCMCourse.CreateCourses',
-	array(
-		'secret_key' => 'xsd:string',
-		'courses' => 'tns:course_create[]'
-	),
-	array('return' => 'tns:course_create_result_array')
+    'WSCMCourse.CreateCourses',
+    array(
+        'secret_key' => 'xsd:string',
+        'courses' => 'tns:course_create[]'
+    ),
+    array('return' => 'tns:course_create_result_array')
 );
 
 $s->register(
-	'WSCMCourse.EditCourse',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'title' => 'xsd:string',
-		'category_code' => 'xsd:string',
-		'department_name' => 'xsd:string',
-		'department_url' => 'xsd:string',
-		'language' => 'xsd:string',
-		'visibility' => 'xsd:int',
-		'subscribe' => 'xsd:int',
-		'unsubscribe' => 'xsd:int',
-		'visual_code' => 'xsd:string',
-		'extras' => 'tns:extra_field[]'
-	)
+    'WSCMCourse.EditCourse',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'title' => 'xsd:string',
+        'category_code' => 'xsd:string',
+        'department_name' => 'xsd:string',
+        'department_url' => 'xsd:string',
+        'language' => 'xsd:string',
+        'visibility' => 'xsd:int',
+        'subscribe' => 'xsd:int',
+        'unsubscribe' => 'xsd:int',
+        'visual_code' => 'xsd:string',
+        'extras' => 'tns:extra_field[]'
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'id' => array('name' => 'id', 'type' => 'xsd:int'),
-		'code' => array('name' => 'code', 'type' => 'xsd:string'),
-		'title' => array('name' => 'title', 'type' => 'xsd:string'),
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
-		'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
-		'category_name' => array('name' => 'category_name', 'type' => 'xsd:string'),
-		'number_students' => array('name' => 'number_students', 'type' => 'xsd:int'),
-		'external_course_id' => array('name' => 'external_course_id', 'type' => 'xsd:string'),
-	)
+    'course',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'id' => array('name' => 'id', 'type' => 'xsd:int'),
+        'code' => array('name' => 'code', 'type' => 'xsd:string'),
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
+        'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
+        'category_name' => array('name' => 'category_name', 'type' => 'xsd:string'),
+        'number_students' => array('name' => 'number_students', 'type' => 'xsd:int'),
+        'external_course_id' => array('name' => 'external_course_id', 'type' => 'xsd:string'),
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course[]')),
-	'tns:course'
+    'course_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course[]')),
+    'tns:course'
 );
 
 $s->register(
-	'WSCMCourse.ListCourses',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string'
-	),
-	array('return' => 'tns:course_array')
+    'WSCMCourse.ListCourses',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string'
+    ),
+    array('return' => 'tns:course_array')
 );
 
 $s->register(
-	'WSCMCourse.SubscribeUserToCourse',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'user_id_field_name' => 'xsd:string',
-		'user_id_value' => 'xsd:string',
-		'status' => 'xsd:int'
-	)
+    'WSCMCourse.SubscribeUserToCourse',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'user_id_field_name' => 'xsd:string',
+        'user_id_value' => 'xsd:string',
+        'status' => 'xsd:int'
+    )
 );
 
 $s->register(
-	'WSCMCourse.UnsubscribeUserFromCourse',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'user_id_field_name' => 'xsd:string',
-		'user_id_value' => 'xsd:string'
-	)
+    'WSCMCourse.UnsubscribeUserFromCourse',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'user_id_field_name' => 'xsd:string',
+        'user_id_value' => 'xsd:string'
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_description',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'course_desc_id' => array('name' => 'course_desc_id', 'type' => 'xsd:int'),
-		'course_desc_title' => array('name' => 'course_desc_title', 'type' => 'xsd:string'),
-		'course_desc_content' => array('name' => 'course_desc_content', 'type' => 'xsd:string')
-	)
+    'course_description',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'course_desc_id' => array('name' => 'course_desc_id', 'type' => 'xsd:int'),
+        'course_desc_title' => array('name' => 'course_desc_title', 'type' => 'xsd:string'),
+        'course_desc_content' => array('name' => 'course_desc_content', 'type' => 'xsd:string')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_description_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_description[]')),
-	'tns:course_description'
+    'course_description_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_description[]')),
+    'tns:course_description'
 );
 
 $s->register(
-	'WSCMCourse.GetCourseDescriptions',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string'
-	),
-	array('return' => 'tns:course_description_array')
+    'WSCMCourse.GetCourseDescriptions',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string'
+    ),
+    array('return' => 'tns:course_description_array')
 );
 
 $s->register(
-	'WSCMCourse.EditCourseDescription',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'course_desc_id' => 'xsd:int',
-		'course_desc_title' => 'xsd:string',
-		'course_desc_content' => 'xsd:string'
-	)
+    'WSCMCourse.EditCourseDescription',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'course_desc_id' => 'xsd:int',
+        'course_desc_title' => 'xsd:string',
+        'course_desc_content' => 'xsd:string'
+    )
 );
 
 $s->register(
-	'WSCMCourse.unreadMessage',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
-	),
-	array('return' => 'xsd:string'),
+    'WSCMCourse.unreadMessage',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -268,12 +268,12 @@ 
 
 
 $s->register(
-	'WSCMCourse.getIdMessage',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
-	),
-	array('return' => 'xsd:string'),
+    'WSCMCourse.getIdMessage',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',

main/webservices/user_info.soap.php

Indentation +11 added lines, -11 removed lines

@@ -26,11 +26,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',
         )
 );
 
@@ -51,7 +51,7 @@ 
 // Register the method to expose
 $server->register('WSCourseListOfUser',   // method name
     array('username' => 'xsd:string',
-          'signature' => 'xsd:string'),         // input parameters
+            'signature' => 'xsd:string'),         // input parameters
     array('return' => 'xsd:Array'),             // output parameters
     'urn:WSUserInfo',                           // namespace
     'urn:WSUserInfo#WSUserInfo',          // soapaction
@@ -77,7 +77,7 @@ 
     $list = UserManager::get_api_keys($user_id, 'dokeos');
     $key = '';
     foreach ($list as $key) {
-    	break;
+        break;
     }
 
     $local_key = $username.$key;
@@ -129,9 +129,9 @@ 
 // Register the method to expose
 $server->register('WSEventsList',       // method name
     array('username' => 'xsd:string',
-          'signature' => 'xsd:string',
-          'datestart' => 'xsd:int',
-          'dateend'   => 'xsd:int'),          // input parameters
+            'signature' => 'xsd:string',
+            'datestart' => 'xsd:int',
+            'dateend'   => 'xsd:int'),          // input parameters
     array('return' => 'xsd:Array'),           // output parameters
     'urn:WSUserInfo',                         // namespace
     'urn:WSUserInfo#WSEventsList',      // soapaction
@@ -159,7 +159,7 @@ 
     $list = UserManager::get_api_keys($user_id, 'dokeos');
     $key = '';
     foreach ($list as $key) {
-    	break;
+        break;
     }
 
     $local_key = $username.$key;

main/webservices/soap.php

Indentation +61 added lines, -61 removed lines

@@ -11,84 +11,84 @@ 
  * SOAP error handler. Handles an error sending a SOAP fault
  */
 class WSSoapErrorHandler implements WSErrorHandler {
-	/**
-	 * Handles the error by sending a SOAP fault through the server
-	 *
-	 * @param WSError Error to handle
-	 */
-	public function handle($error) {
-		$server = WSSoapServer::singleton();
-		$server->fault(strval($error->code), $error->message);
-	}
+    /**
+     * Handles the error by sending a SOAP fault through the server
+     *
+     * @param WSError Error to handle
+     */
+    public function handle($error) {
+        $server = WSSoapServer::singleton();
+        $server->fault(strval($error->code), $error->message);
+    }
 }
 
 /**
  * SOAP server wrapper implementing a Singleton
  */
 class WSSoapServer {
-	/**
-	 * SOAP server instance
-	 *
-	 * @var soap_server
-	 */
-	private static $_instance;
+    /**
+     * SOAP server instance
+     *
+     * @var soap_server
+     */
+    private static $_instance;
 
-	/**
-	 * Private constructor
-	 */
-	private function __construct() {
-	}
+    /**
+     * Private constructor
+     */
+    private function __construct() {
+    }
 
-	/**
-	 * Singleton method
-	 */
-	public static function singleton() {
-		if(!isset(self::$_instance)) {
-			self::$_instance = new soap_server();
-			// Set the error handler
-			WSError::setErrorHandler(new WSSoapErrorHandler());
-			// Configure the service
-			self::$_instance->configureWSDL('WSService', 'urn:WSService');
-		}
+    /**
+     * Singleton method
+     */
+    public static function singleton() {
+        if(!isset(self::$_instance)) {
+            self::$_instance = new soap_server();
+            // Set the error handler
+            WSError::setErrorHandler(new WSSoapErrorHandler());
+            // Configure the service
+            self::$_instance->configureWSDL('WSService', 'urn:WSService');
+        }
 
-		return self::$_instance;
-	}
+        return self::$_instance;
+    }
 }
 
 $s = WSSoapServer::singleton();
 
 $s->wsdl->addComplexType(
-	'result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'code' => array('name' => 'code', 'type' => 'xsd:int'),
-		'message' => array('name' => 'message', 'type' => 'xsd:string')
-	)
+    'result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'code' => array('name' => 'code', 'type' => 'xsd:int'),
+        'message' => array('name' => 'message', 'type' => 'xsd:string')
+    )
 );
 
 $s->wsdl->addComplexType(
-  'extras',
-  'complexType',
-  'struct',
-  'all',
-  '',
-  array(
-          'field_name' => array('name' => 'field_name', 'type' => 'xsd:string'),
-          'field_value' => array('name' => 'field_value', 'type' => 'xsd:string')
-       )
+    'extras',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+            'field_name' => array('name' => 'field_name', 'type' => 'xsd:string'),
+            'field_value' => array('name' => 'field_value', 'type' => 'xsd:string')
+        )
 );
 
 $s->wsdl->addComplexType(
-  'extra_field',
-  'complexType',
-  'array',
-  '',
-  'SOAP-ENC:Array',
-  array(),
-  array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),'tns:extras'
+    'extra_field',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),'tns:extras'
 );
 
 /*
@@ -106,9 +106,9 @@ 
 */
 
 $s->register(
-	'WS.test',
-	array(),
-	array('return' => 'xsd:string')
+    'WS.test',
+    array(),
+    array('return' => 'xsd:string')
 );
 
 require_once(dirname(__FILE__).'/soap_user.php');

main/webservices/cm_soap_forum.php

Indentation +47 added lines, -47 removed lines

@@ -12,12 +12,12 @@ 
 
 $s->register(
         'WSCMForum.get_foruns_id',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -26,14 +26,14 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_forum_title',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_forum_title',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'forum_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -42,14 +42,14 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_forum_threads_id',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_forum_threads_id',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'forum_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -58,15 +58,15 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_forum_thread_data',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_forum_thread_data',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'thread_id' => 'xsd:string',
                 'field' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -75,14 +75,14 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_forum_thread_title',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_forum_thread_title',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'thread_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -92,14 +92,14 @@ 
 
 
 $s->register(
-	'WSCMForum.get_posts_id',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_posts_id',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'thread_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -108,15 +108,15 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_post_data',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_post_data',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'post_id' => 'xsd:string',
                 'field' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -126,17 +126,17 @@ 
 
 
 $s->register(
-	'WSCMForum.send_post',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.send_post',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'forum_id' => 'xsd:string',
                 'thread_id' => 'xsd:string',
                 'title' => 'xsd:string',
                 'content' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',