chamilo / chamilo-lms

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

Spacing +48 added lines, -48 removed lines

@@ -20,49 +20,49 @@ 
 {
 	if (!empty($_POST['role_name']))
 	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
-		$sql="INSERT INTO $table_role (role_name, role_comment, default_role)
+		$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);
+		$result = Database::query($sql);
+		$role_id = Database::insert_id();
+		$result_message = store_permissions('role', $role_id);
 	}
 	else
 	{
-		$result_message=get_lang('ErrorPleaseGiveRoleName');
+		$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')
+	if ($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke')
 	{
-		$result_message=store_one_permission('role', $_GET['action'], $role_id, $_GET['tool'], $_GET['permission']);
+		$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') {
+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);
+	$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);
+	$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);
+	$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');
+	$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
@@ -73,7 +73,7 @@ 
 // 		ADDING A NEW ROLE (FORM AND LINK)
 echo '<img src="../img/add.png" /> <a href="roles.php?action=add">'.get_lang('AddRole').'</a>';
 
-if ($_GET['action']=='add')
+if ($_GET['action'] == 'add')
 {
 	echo "<form method=\"post\" action=\"".api_get_self()."\">";
 	echo "\n<table>";
@@ -105,13 +105,13 @@ 
 	echo "<table class=\"data_table\">\n";
 
 	// the header
-	if (api_get_setting('permissions')=='limited')
+	if (api_get_setting('permissions') == 'limited')
 	{
-		$header_array=$rights_limited;
+		$header_array = $rights_limited;
 	}
-	if (api_get_setting('permissions')=='full')
+	if (api_get_setting('permissions') == 'full')
 	{
-		$header_array=$rights_full;
+		$header_array = $rights_full;
 	}
 	echo "\t<tr>\n";
 	echo "\t\t<th>".get_lang('Module')."</th>\n";
@@ -151,25 +151,25 @@ 
 // 		DISPLAYING THE EXISTING ROLES
 // ===================================================
 // platform roles
-$all_roles=get_all_roles('platform');
+$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'])
+	if ($role['role_id'] == $_GET['role_id'])
 	{
-		$current_role_info=$role;
+		$current_role_info = $role;
 	}
 }
 // course roles
-$all_roles=get_all_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'])
+	if ($role['role_id'] == $_GET['role_id'])
 	{
-		$current_role_info=$role;
+		$current_role_info = $role;
 	}
 }
 
@@ -178,19 +178,19 @@ 
 // ===================================================
 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')
+	$current_role_permissions = limited_or_full($current_role_permissions);
+	if (api_get_setting('permissions') == 'limited')
 	{
-		$header_array=$rights_limited;
+		$header_array = $rights_limited;
 	}
-	if (api_get_setting('permissions')=='full')
+	if (api_get_setting('permissions') == 'full')
 	{
-		$header_array=$rights_full;
+		$header_array = $rights_full;
 	}
 	// ---------------------------------------------------
 	// 			DISPLAYING THE MATRIX
@@ -199,7 +199,7 @@ 
 
 	// the list of the roles for the user
 	echo get_lang('PermissionsOfRole').':'.$current_role_info['role_name'].'<br />';
-	if ($_GET['scope']=='platform')
+	if ($_GET['scope'] == 'platform')
 	{
 		echo get_lang('IsPlatformRoleNotEditable').'<br />';
 	}
@@ -226,23 +226,23 @@ 
 		foreach ($header_array as $key=>$value)
 		{
 			echo "\t\t<td align='center'>\n";
-			if (in_array($value,$rights))
+			if (in_array($value, $rights))
 			{
-				if ($setting_visualisation=='checkbox')
+				if ($setting_visualisation == 'checkbox')
 				{
 					display_checkbox_matrix($current_role_permissions, $tool, $value);
 				}
-				if ($setting_visualisation=='image')
+				if ($setting_visualisation == 'image')
 				{
-					if ($_GET['scope']=='platform')
+					if ($_GET['scope'] == 'platform')
 					{
-						$roles_editable=false;
+						$roles_editable = false;
 					}
 					else
 					{
-						$roles_editable=true;
+						$roles_editable = true;
 					}
-					display_image_matrix($current_role_permissions, $tool, $value, '','',$roles_editable);
+					display_image_matrix($current_role_permissions, $tool, $value, '', '', $roles_editable);
 				}
 			}
 			echo "\t\t</td>\n";
@@ -251,7 +251,7 @@ 
 	}
 
 	echo "</table>\n";
-	if ($setting_visualisation=='checkbox')
+	if ($setting_visualisation == 'checkbox')
 	{
 		echo "<input type=\"Submit\" name=\"StoreRolePermissions\" value=\"".get_lang('StorePermissions')."\">";
 	}

Braces +8 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
 		$result=Database::query($sql);
 		$role_id=Database::insert_id();
 		$result_message=store_permissions('role', $role_id);
-	}
-	else
+	} else
 	{
 		$result_message=get_lang('ErrorPleaseGiveRoleName');
 	}
@@ -122,9 +121,11 @@ 
 	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
+	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";
@@ -216,9 +217,11 @@ 
 	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
+	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";
@@ -237,8 +240,7 @@ 
 					if ($_GET['scope']=='platform')
 					{
 						$roles_editable=false;
-					}
-					else
+					} else
 					{
 						$roles_editable=true;
 					}

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);

Spacing +1 added lines, -1 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']);
+  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;
     }

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
 	 */
 	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) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
             return Tracking::get_time_spent_on_the_platform($user_id);
@@ -38,11 +38,11 @@ 
 	 */
 	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) {
+        if ($user_id instanceof WSError) {
             return $user_id;
         }
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-        if($course_id instanceof WSError) {
+        if ($course_id instanceof WSError) {
             return $course_id;
         } else {
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -61,17 +61,17 @@ 
      */
     public function GetTimeSpentOnCourseInSession($user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
-        if($user_id instanceof WSError) {
+        if ($user_id instanceof WSError) {
             return $user_id;
         }
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-        if($course_id instanceof WSError) {
+        if ($course_id instanceof WSError) {
             return $course_id;
         } else {
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
         }
         $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-        if($session_id instanceof WSError) {
+        if ($session_id instanceof WSError) {
             return $session_id;
         }
         return Tracking::get_time_spent_on_the_course($user_id, $course_id, $session_id);
@@ -87,17 +87,17 @@ 
      */
     public function GetLearnpathsByCourse($secret_key, $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) {
+        if ($user_id instanceof WSError) {
             return $user_id;
         }
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-        if($course_id instanceof WSError) {
+        if ($course_id instanceof WSError) {
             return $course_id;
         } else {
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
         }
 
-        $lp = new LearnpathList($user_id,$course_code);
+        $lp = new LearnpathList($user_id, $course_code);
         $list = $lp->list;
         $return = array();
         foreach ($list as $id => $item) {
@@ -117,11 +117,11 @@ 
      */
     public function GetLearnpathProgress($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $learnpath_id) {
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
-        if($user_id instanceof WSError) {
+        if ($user_id instanceof WSError) {
             return $user_id;
         }
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-        if($course_id instanceof WSError) {
+        if ($course_id instanceof WSError) {
             return $course_id;
         } else {
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -150,11 +150,11 @@ 
      */
     public function GetLearnpathHighestLessonLocation($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $learnpath_id) {
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
-        if($user_id instanceof WSError) {
+        if ($user_id instanceof WSError) {
             return $user_id;
         }
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-        if($course_id instanceof WSError) {
+        if ($course_id instanceof WSError) {
             return $course_id;
         } else {
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -179,11 +179,11 @@ 
      */
     public function GetLearnpathScoreSingleItem($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $learnpath_id, $learnpath_item_id) {
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
-        if($user_id instanceof WSError) {
+        if ($user_id instanceof WSError) {
             return $user_id;
         }
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-        if($course_id instanceof WSError) {
+        if ($course_id instanceof WSError) {
             return $course_id;
         } else {
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -213,15 +213,15 @@ 
      */
     public function GetLearnpathStatusSingleItem($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $learnpath_id, $learnpath_item_id) {
         $verifKey = $this->verifyKey($secret_key);
-        if($verifKey instanceof WSError) {
+        if ($verifKey instanceof WSError) {
             $this->handleError($verifKey);
         } else {
             $user_id = $this->getUserId($user_id_field_name, $user_id_value);
-            if($user_id instanceof WSError) {
+            if ($user_id instanceof WSError) {
                 return $user_id;
             }
             $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-            if($course_id instanceof WSError) {
+            if ($course_id instanceof WSError) {
                 return $course_id;
             } else {
                 $course_code = CourseManager::get_course_code_from_course_id($course_id);

main/webservices/access_url.php

Spacing +51 added lines, -51 removed lines

@@ -75,7 +75,7 @@ 
     }
 
     if ($debug) {
-        error_log("checkip " . intval($check_ip));
+        error_log("checkip ".intval($check_ip));
     }
 
     if ($check_ip) {
@@ -131,7 +131,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:portalItem[]')),'tns:portalItem'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:portalItem[]')), 'tns:portalItem'
 );
 
 $server->wsdl->addComplexType(
@@ -146,13 +146,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSGetPortals',                   // method name
-    array('getPortals' => 'tns:getPortals'),    // input parameters
-    array('return' => 'tns:portalList'),                    // output parameters
-    'urn:WSAccessUrl',                               // namespace
-    'urn:WSAccessUrl#WSGetPortals',              // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSGetPortals', // method name
+    array('getPortals' => 'tns:getPortals'), // input parameters
+    array('return' => 'tns:portalList'), // output parameters
+    'urn:WSAccessUrl', // namespace
+    'urn:WSAccessUrl#WSGetPortals', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user to portal'               // documentation
 );
 
@@ -193,13 +193,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSAddUserToPortal',                   // method name
-    array('addUserToPortal' => 'tns:AddUserToPortal'),    // input parameters
-    array('return' => 'xsd:string'),                    // output parameters
-    'urn:WSAccessUrl',                               // namespace
-    'urn:WSAccessUrl#WSAddUserToPortal',              // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSAddUserToPortal', // method name
+    array('addUserToPortal' => 'tns:AddUserToPortal'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSAccessUrl', // namespace
+    'urn:WSAccessUrl#WSAddUserToPortal', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user to portal'               // documentation
 );
 
@@ -224,13 +224,13 @@ 
 }
 
 // Register the method to expose
-$server->register('WSRemoveUserFromPortal',                      // method name
-    array('removeUserFromPortal' => 'tns:AddUserToPortal'),  // input parameters
-    array('return' => 'xsd:string'),                            // output parameters
-    'urn:WSAccessUrl',                                       // namespace
-    'urn:WSAccessUrl#WSRemoveUserFromPortal',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSRemoveUserFromPortal', // method name
+    array('removeUserFromPortal' => 'tns:AddUserToPortal'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSAccessUrl', // namespace
+    'urn:WSAccessUrl#WSRemoveUserFromPortal', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service remove a user from a portal'                  // documentation
 );
 
@@ -267,13 +267,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSGetPortalListFromUser',                      // method name
-    array('getPortalListFromUser' => 'tns:getPortalListFromUser'),  // input parameters
-    array('return' => 'tns:portalList'),                            // output parameters
-    'urn:WSAccessUrl',                                       // namespace
-    'urn:WSAccessUrl#WSGetPortalListFromUser',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSGetPortalListFromUser', // method name
+    array('getPortalListFromUser' => 'tns:getPortalListFromUser'), // input parameters
+    array('return' => 'tns:portalList'), // output parameters
+    'urn:WSAccessUrl', // namespace
+    'urn:WSAccessUrl#WSGetPortalListFromUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service remove a user from a portal'                  // documentation
 );
 
@@ -311,13 +311,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSGetPortalListFromCourse',                      // method name
-    array('getPortalListFromCourse' => 'tns:getPortalListFromCourse'),  // input parameters
-    array('return' => 'tns:portalList'),                            // output parameters
-    'urn:WSAccessUrl',                                       // namespace
-    'urn:WSAccessUrl#getPortalListFromCourse',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSGetPortalListFromCourse', // method name
+    array('getPortalListFromCourse' => 'tns:getPortalListFromCourse'), // input parameters
+    array('return' => 'tns:portalList'), // output parameters
+    'urn:WSAccessUrl', // namespace
+    'urn:WSAccessUrl#getPortalListFromCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service remove a user from a portal'                  // documentation
 );
 
@@ -361,13 +361,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSAddCourseToPortal',                   // method name
-    array('addCourseToPortal' => 'tns:addCourseToPortal'),    // input parameters
-    array('return' => 'xsd:string'),                    // output parameters
-    'urn:WSAccessUrl',                               // namespace
-    'urn:WSAccessUrl#WSAddCourseToPortal',              // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSAddCourseToPortal', // method name
+    array('addCourseToPortal' => 'tns:addCourseToPortal'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSAccessUrl', // namespace
+    'urn:WSAccessUrl#WSAddCourseToPortal', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a course to portal'               // documentation
 );
 
@@ -394,13 +394,13 @@ 
 }
 
 // Register the method to expose
-$server->register('WSRemoveCourseFromPortal',                      // method name
-    array('removeCourseFromPortal' => 'tns:addCourseToPortal'),  // input parameters
-    array('return' => 'xsd:string'),                            // output parameters
-    'urn:WSAccessUrl',                                       // namespace
-    'urn:WSAccessUrl#WSRemoveCourseFromPortal',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSRemoveCourseFromPortal', // method name
+    array('removeCourseFromPortal' => 'tns:addCourseToPortal'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSAccessUrl', // namespace
+    'urn:WSAccessUrl#WSRemoveCourseFromPortal', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service remove a course from a portal'                  // documentation
 );
 

Braces +12 added lines, -8 removed lines

@@ -58,19 +58,22 @@ 
         list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -87,8 +90,9 @@ 
 
     $result = api_is_valid_secret_key($secret_key, $security_key);
     //error_log($secret_key.'-'.$security_key);
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 
 define('WS_ERROR_SECRET_KEY', 1);
 
+/**
+ * @param integer $code
+ */
 function return_error($code) {
     $fault = null;
     switch ($code) {

main/webservices/client_soap.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
 $soap_error = $client->getError();
 
 if (!empty($soap_error)) {
-    $error_message = 'Nusoap object creation failed: ' . $soap_error;
+    $error_message = 'Nusoap object creation failed: '.$soap_error;
     throw new Exception($error_message);
 }
 $client->setDebugLevel(10000);
@@ -45,7 +45,7 @@ 
 $ip_address = "127.0.0.1";
 
 //Secret key
-$secret_key = sha1($ip_address.$security_key);// Hash of the combination of IP Address + Chamilo security key
+$secret_key = sha1($ip_address.$security_key); // Hash of the combination of IP Address + Chamilo security key
 //$secret_key = sha1($security_key);
 
 //Creating a random user_id, this values need to be provided from your system
@@ -93,7 +93,7 @@ 
 
 if ($err) {
     // Display the error
-    echo '<h2>Constructor error</h2><pre>' . $err . '</pre>';
+    echo '<h2>Constructor error</h2><pre>'.$err.'</pre>';
 }
 
 
@@ -325,14 +325,14 @@ 
 
 if ($err) {
     // Display the error
-    echo '<h2>Constructor error</h2><pre>' . $err . '</pre>';
+    echo '<h2>Constructor error</h2><pre>'.$err.'</pre>';
 }
 
 
 //1. Create user webservice
 $result = $client->call(
     'WSGetPortals',
-    array('getPortals' => [    'secret_key'                => $secret_key])
+    array('getPortals' => ['secret_key'                => $secret_key])
 );
 
 $result = $client->call(
@@ -363,7 +363,7 @@ 
 );
 
 
-var_dump($user_id);exit;
+var_dump($user_id); exit;
 
 
 
@@ -382,7 +382,7 @@ 
     $err = $client->getError();
     if ($err) {
         // Display the error
-        echo '<h2>Error</h2><pre>' . $err . '</pre>';
+        echo '<h2>Error</h2><pre>'.$err.'</pre>';
     } else {
         // Display the result
         echo '<h2>There are no errors</h2>';

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/cm_webservice_forum.php

Braces +24 added lines, -16 removed lines

@@ -32,8 +32,9 @@ 
                 }
             }
             return $foruns_id;
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_forum_title($username, $password, $course_code, $forum_id)
@@ -54,8 +55,9 @@ 
 
             $forum_title = utf8_decode($forum_info['forum_title']);
             return $forum_title;
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_forum_threads_id($username, $password, $course_code, $forum_id)
@@ -73,8 +75,9 @@ 
 
             return $threads_id;
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_forum_thread_data($username, $password, $course_code, $thread_id, $field)
@@ -115,8 +118,9 @@ 
 
             return $thread_info[$field_table];
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_forum_thread_title($username, $password, $course_code, $thread_id)
@@ -139,8 +143,9 @@ 
 
             return $thread_info[$field_table];
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
 
@@ -184,8 +189,9 @@ 
                 }
             }
             return $posts_id;
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_post_data($username, $password, $course_code, $post_id, $field)
@@ -226,8 +232,9 @@ 
                     $field_table = "title";
             }
             return (htmlcode) ? html_entity_decode($post_info[$field_table]) : $post_info[$field_table];
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function send_post($username, $password, $course_code, $forum_id, $thread_id, $title, $content)
@@ -269,8 +276,9 @@ 
 
             //send_notification_mails($thread_id, $values);
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
     }
 

Spacing +31 added lines, -31 removed lines

@@ -19,14 +19,14 @@ 
 
     public function get_foruns_id($username, $password, $course_code)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
-            $foruns_info = get_forums($id='', $course_db['code']);
+            $foruns_info = get_forums($id = '', $course_db['code']);
             $foruns_id = '#';
             foreach ($foruns_info as $forum)
             {
-                if( isset($forum['forum_id']))
+                if (isset($forum['forum_id']))
                 {
                     $foruns_id .= $forum['forum_id']."#";
                 }
@@ -38,18 +38,18 @@ 
 
     public function get_forum_title($username, $password, $course_code, $forum_id)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
             $table_forums = Database :: get_course_table(TABLE_FORUM, $course_db['db_name']);
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
 
-            $sql="SELECT * FROM ".$table_forums." forums, ".$table_item_property." item_properties
+            $sql = "SELECT * FROM ".$table_forums." forums, ".$table_item_property." item_properties
                             WHERE item_properties.tool='".TOOL_FORUM."'
                             AND item_properties.ref='".Database::escape_string($forum_id)."'
                             AND forums.forum_id='".Database::escape_string($forum_id)."'";
-            $result=Database::query($sql);
-            $forum_info=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $forum_info = Database::fetch_array($result);
             $forum_info['approval_direct_post'] = 0; // we can't anymore change this option, so it should always be activated
 
             $forum_title = utf8_decode($forum_info['forum_title']);
@@ -60,12 +60,12 @@ 
 
     public function get_forum_threads_id($username, $password, $course_code, $forum_id)
     {
-        if($this->verifyUserPass($username, $password) == "valid") {
+        if ($this->verifyUserPass($username, $password) == "valid") {
             $threads_info = get_threads($forum_id, $course_code);
             $threads_id = '#';
             foreach ($threads_info as $thread)
             {
-                if( isset($thread['thread_id']))
+                if (isset($thread['thread_id']))
                 {
                     $threads_id .= $thread['thread_id']."#";
                 }
@@ -79,18 +79,18 @@ 
 
     public function get_forum_thread_data($username, $password, $course_code, $thread_id, $field)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
 
-            $sql="SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
+            $sql = "SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
                             WHERE item_properties.tool='".TOOL_FORUM_THREAD."'
                             AND item_properties.ref='".Database::escape_string($thread_id)."'
                             AND threads.thread_id='".Database::escape_string($thread_id)."'";
-            $result=Database::query($sql);
-            $thread_info=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $thread_info = Database::fetch_array($result);
 
             switch ($field)
             {
@@ -121,18 +121,18 @@ 
 
     public function get_forum_thread_title($username, $password, $course_code, $thread_id)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
 
-            $sql="SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
+            $sql = "SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
                             WHERE item_properties.tool='".TOOL_FORUM_THREAD."'
                             AND item_properties.ref='".Database::escape_string($thread_id)."'
                             AND threads.thread_id='".Database::escape_string($thread_id)."'";
-            $result=Database::query($sql);
-            $thread_info=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $thread_info = Database::fetch_array($result);
 
             $htmlcode = true;
             $field_table = "thread_title";
@@ -146,7 +146,7 @@ 
 
     public function get_posts_id($username, $password, $course_code, $thread_id)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
 
@@ -154,7 +154,7 @@ 
             $table_posts = Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
 
             // note: change these SQL so that only the relevant fields of the user table are used
-            if (api_is_allowed_to_edit(null,true)) {
+            if (api_is_allowed_to_edit(null, true)) {
                 $sql = "SELECT * FROM $table_posts posts
                                     LEFT JOIN  $table_users users
                                             ON posts.poster_id=users.user_id
@@ -169,16 +169,16 @@ 
                                     AND posts.visible='1'
                                     ORDER BY posts.post_id ASC";
             }
-            $result=Database::query($sql);
-            while ($row=Database::fetch_array($result)) {
-                $posts_info[]=$row;
+            $result = Database::query($sql);
+            while ($row = Database::fetch_array($result)) {
+                $posts_info[] = $row;
             }
 
             $posts_id = '#';
 
             foreach ($posts_info as $post)
             {
-                if( isset($post['post_id']))
+                if (isset($post['post_id']))
                 {
                     $posts_id .= $post['post_id']."#";
                 }
@@ -190,16 +190,16 @@ 
 
     public function get_post_data($username, $password, $course_code, $post_id, $field)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
 
             $table_posts 	= Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
             $table_users 	= Database :: get_main_table(TABLE_MAIN_USER);
 
-            $sql="SELECT * FROM ".$table_posts."posts, ".$table_users." users WHERE posts.poster_id=users.user_id AND posts.post_id='".Database::escape_string($post_id)."'";
-            $result=Database::query($sql);
-            $post_info =Database::fetch_array($result);
+            $sql = "SELECT * FROM ".$table_posts."posts, ".$table_users." users WHERE posts.poster_id=users.user_id AND posts.post_id='".Database::escape_string($post_id)."'";
+            $result = Database::query($sql);
+            $post_info = Database::fetch_array($result);
 
             $htmlcode = false;
             switch ($field)
@@ -232,7 +232,7 @@ 
 
     public function send_post($username, $password, $course_code, $forum_id, $thread_id, $title, $content)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $em = Database::getManager();
             $course_db = CourseManager::get_course_information($course_code);
@@ -241,9 +241,9 @@ 
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
             $forum_table_attachment = Database :: get_course_table(TABLE_FORUM_ATTACHMENT, $course_db['db_name']);
             $table_posts = Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
-            $post_date=date('Y-m-d H:i:s');
-            $visible=1;
-            $has_attachment=false;
+            $post_date = date('Y-m-d H:i:s');
+            $visible = 1;
+            $has_attachment = false;
             $my_post = '';
             $post_notification = '';
 

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;

Spacing +25 added lines, -25 removed lines

@@ -26,11 +26,11 @@ 
         'all',
         '',
         array(
-          'name'=>'code'  , 'type'=>'xsd:string',
-          'name'=>'title'  , 'type'=>'xsd:string',
-          'name'=>'url'    , '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',
+          'name'=>'language', 'type'=>'xsd:string',
         )
 );
 
@@ -49,14 +49,14 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCourseListOfUser',   // method name
+$server->register('WSCourseListOfUser', // method name
     array('username' => 'xsd:string',
-          'signature' => 'xsd:string'),         // input parameters
-    array('return' => 'xsd:Array'),             // output parameters
-    'urn:WSUserInfo',                           // namespace
-    'urn:WSUserInfo#WSUserInfo',          // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+          'signature' => 'xsd:string'), // input parameters
+    array('return' => 'xsd:Array'), // output parameters
+    'urn:WSUserInfo', // namespace
+    'urn:WSUserInfo#WSUserInfo', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service returns a list of courses'    // documentation
 );
 
@@ -104,11 +104,11 @@ 
     'all',
     '',
     array(
-        'name'=>'datestart','type'=>'xsd:string',
-        'name'=>'dateend','type'=>'xsd:string',
-        'name'=>'title','type'=>'xsd:string',
-        'name'=>'link','type'=>'xsd:string',
-        'name'=>'coursetitle','type'=>'xsd:string',
+        'name'=>'datestart', 'type'=>'xsd:string',
+        'name'=>'dateend', 'type'=>'xsd:string',
+        'name'=>'title', 'type'=>'xsd:string',
+        'name'=>'link', 'type'=>'xsd:string',
+        'name'=>'coursetitle', 'type'=>'xsd:string',
     )
 );
 
@@ -127,16 +127,16 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEventsList',       // method name
+$server->register('WSEventsList', // method name
     array('username' => 'xsd:string',
           'signature' => 'xsd:string',
           'datestart' => 'xsd:int',
-          'dateend'   => 'xsd:int'),          // input parameters
-    array('return' => 'xsd:Array'),           // output parameters
-    'urn:WSUserInfo',                         // namespace
-    'urn:WSUserInfo#WSEventsList',      // soapaction
-    'rpc',                                    // style
-    'encoded',                                // use
+          'dateend'   => 'xsd:int'), // input parameters
+    array('return' => 'xsd:Array'), // output parameters
+    'urn:WSUserInfo', // namespace
+    'urn:WSUserInfo#WSEventsList', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service returns a list of events of the courses the given user is subscribed to'      // documentation
 );
 
@@ -171,8 +171,8 @@ 
 
     $user_id = UserManager::get_user_id_from_username($username);
     if ($user_id === false) { return $events_list; } // Error in user id recovery.
-    $ds = substr($datestart,0,4).'-'.substr($datestart,4,2).'-'.substr($datestart,6,2).' 00:00:00';
-    $de = substr($dateend,0,4).'-'.substr($dateend,4,2).'-'.substr($dateend,6,2).' 00:00:00';
+    $ds = substr($datestart, 0, 4).'-'.substr($datestart, 4, 2).'-'.substr($datestart, 6, 2).' 00:00:00';
+    $de = substr($dateend, 0, 4).'-'.substr($dateend, 4, 2).'-'.substr($dateend, 6, 2).' 00:00:00';
     $events_list = Agenda::get_personal_agenda_items_between_dates($user_id, $ds, $de);
     return $events_list;
 }

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');

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	 * Singleton method
 	 */
 	public static function singleton() {
-		if(!isset(self::$_instance)) {
+		if (!isset(self::$_instance)) {
 			self::$_instance = new soap_server();
 			// Set the error handler
 			WSError::setErrorHandler(new WSSoapErrorHandler());
@@ -88,7 +88,7 @@ 
   '',
   'SOAP-ENC:Array',
   array(),
-  array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),'tns:extras'
+  array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:extras[]')), 'tns:extras'
 );
 
 /*