chamilo / chamilo-lms

main/permissions/blog_permissions.inc.php

Spacing +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
 
 // Remove the blog creater because he has all the rights automatically
 // and we want to keep it that way.
-$tbl_course_rel_user = $table=Database::get_main_table(TABLE_MAIN_COURSE_USER);
+$tbl_course_rel_user = $table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 $sql = "SELECT user_id
 		FROM $tbl_course_rel_user
 		WHERE status = '1' AND c_id = '".api_get_course_int_id()."'";
@@ -83,10 +83,10 @@ 
 // ------------------------------------------------------------------
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
 // ------------------------------------------------------------------
-if (api_get_setting('user_roles')=='true') {
+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);
+	$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
@@ -96,16 +96,16 @@ 
 	// 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);
+	$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') {
+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);
+		$this_current_group_role_permissions_of_user = get_roles_permissions('user', $user_id);
 		//$inherited_permissions[$tool][]=$permission;
 	}
 }
@@ -116,12 +116,12 @@ 
 // 		DISPLAYING THE ROLES LIST
 // ---------------------------------------------------
 
-if (api_get_setting('user_roles')=='true')
+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');
+	$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 />';
 }
@@ -169,7 +169,7 @@ 
 	foreach ($rights_full as $key => $value) {
 
 		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights_blog)) {
+		if (in_array($value, $rights_blog)) {
 			display_image_matrix_for_blogs(
 				$current_user_permissions,
 				$user_id,

main/permissions/user_permissions.inc.php

Spacing +41 added lines, -41 removed lines

@@ -5,10 +5,10 @@ 
 /**
  * Code
  */
-$user_id=$userIdViewed;
-if ($mainUserInfo['status']==1)
+$user_id = $userIdViewed;
+if ($mainUserInfo['status'] == 1)
 {
-	$course_admin=1;
+	$course_admin = 1;
 }
 include_once('permissions_functions.inc.php');
 include_once('all_permissions.inc.php');
@@ -17,9 +17,9 @@ 
 // ---------------------------------------------------
 // 			ACTIONS
 // ---------------------------------------------------
-if ($_POST['StoreUserPermissions'] and $setting_visualisation=='checkbox')
+if ($_POST['StoreUserPermissions'] and $setting_visualisation == 'checkbox')
 {
-	$result_message=store_permissions('user', $user_id);
+	$result_message = store_permissions('user', $user_id);
 	if ($result_message)
 	{
 		Display::display_normal_message($result_message);
@@ -27,13 +27,13 @@ 
 }
 if (isset($_GET['action']))
 {
-	if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+	if (isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke'))
 	{
-		$result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
+		$result_message = store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
 	}
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+	if (isset($_GET['role']) AND ($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke'))
 	{
-		$result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
+		$result_message = assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
 	}
 }
 if (isset($result_message))
@@ -44,33 +44,33 @@ 
 // ---------------------------------------------------
 // 			RETRIEVING THE PERMISSIONS OF THE USER
 // ---------------------------------------------------
-$current_user_permissions=array();
-$current_user_permissions=get_permissions('user',$user_id);
+$current_user_permissions = array();
+$current_user_permissions = get_permissions('user', $user_id);
 
 
 //   INHERITED PERMISSIONS (group permissions, user roles, group roles)
 
 // 			RETRIEVING THE PERMISSIONS OF THE GROUPS OF THE USER
-$groups_of_user=array();
-$groups_of_user=GroupManager::get_group_ids($_course['real_id'],$user_id);
+$groups_of_user = array();
+$groups_of_user = GroupManager::get_group_ids($_course['real_id'], $user_id);
 foreach ($groups_of_user as $group)
 {
-	$this_group_permissions=get_permissions('group',$group);
+	$this_group_permissions = get_permissions('group', $group);
 	foreach ($this_group_permissions as $tool=>$permissions)
 	{
 		foreach ($permissions as $permission)
 		{
-			$inherited_group_permissions[$tool][]=$permission;
+			$inherited_group_permissions[$tool][] = $permission;
 		}
 	}
 }
-$inherited_permissions=$inherited_group_permissions;
+$inherited_permissions = $inherited_group_permissions;
 
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
-if (api_get_setting('user_roles')=='true') {
+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);
+	$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
@@ -80,16 +80,16 @@ 
 	// 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);
+	$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')
+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);
+		$this_current_group_role_permissions_of_user = get_roles_permissions('user', $user_id);
 		//$inherited_permissions[$tool][]=$permission;
 	}
 }
@@ -97,15 +97,15 @@ 
 // ---------------------------------------------------
 // 			LIMITED OR FULL
 // ---------------------------------------------------
-$current_user_permissions=limited_or_full($current_user_permissions);
-$inherited_permissions=limited_or_full($inherited_permissions);
-if (api_get_setting('permissions')=='limited')
+$current_user_permissions = limited_or_full($current_user_permissions);
+$inherited_permissions = limited_or_full($inherited_permissions);
+if (api_get_setting('permissions') == 'limited')
 {
-	$header_array=$rights_limited;
+	$header_array = $rights_limited;
 }
-if (api_get_setting('permissions')=='full')
+if (api_get_setting('permissions') == 'full')
 {
-	$header_array=$rights_full;
+	$header_array = $rights_full;
 }
 
 
@@ -114,12 +114,12 @@ 
 // ---------------------------------------------------
 // 		DISPLAYING THE ROLES LIST
 // ---------------------------------------------------
-if (api_get_setting('user_roles')=='true')
+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');
+	$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 />';
 }
@@ -144,12 +144,12 @@ 
 {
 	echo "\t<tr>\n";
 	echo "\t\t<td>\n";
-	if (strstr($tool,'BLOG'))
+	if (strstr($tool, 'BLOG'))
 	{
 		// Not dealing with a real tool here, get name of this blog
 		// Strip blog id
-		$tmp = strpos($tool,'_')+1;
-		$blog_id = substr($tool,$tmp,strlen($tool));
+		$tmp = strpos($tool, '_') + 1;
+		$blog_id = substr($tool, $tmp, strlen($tool));
 		// Get title
 		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
 	}
@@ -164,15 +164,15 @@ 
 	{
 
 		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_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
+				display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions, $course_admin);
 			}
-			if ($setting_visualisation=='image')
+			if ($setting_visualisation == 'image')
 			{
-				display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
+				display_image_matrix($current_user_permissions, $tool, $value, $inherited_permissions, $course_admin);
 			}
 		}
 		// note: in a later stage this part will be replaced by a function
@@ -185,7 +185,7 @@ 
 }
 
 echo "</table>\n";
-if ($setting_visualisation=='checkbox')
+if ($setting_visualisation == 'checkbox')
 {
 	echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
 }

main/permissions/roles.php

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')."\">";
 	}

main/webservices/webservice_course.php

Spacing +55 added lines, -55 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
 		$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);
@@ -39,11 +39,11 @@ 
 	 */
 	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -59,15 +59,15 @@ 
 	 */
 	public function DeleteCourses($secret_key, $courses) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$result_tmp = array();
 				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
 				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {
@@ -97,17 +97,17 @@ 
 	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
 		// Add the original course id field name and value to the extra fields if needed
 		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
+		if ($course_id_field_name != "chamilo_course_id") {
 			$extras_associative[$course_id_field_name] = $course_id_value;
 		}
-		foreach($extras as $extra) {
+		foreach ($extras as $extra) {
 			$extras_associative[$extra['field_name']] = $extra['field_value'];
 		}
 		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
+		if ($course_admin_id instanceof WSError) {
 			return $course_admin_id;
 		}
-		if($wanted_code == '') {
+		if ($wanted_code == '') {
 			$wanted_code = CourseManager::generate_course_code($title);
 		}
 		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
@@ -115,7 +115,7 @@ 
 			return new WSError(202, 'There was an error creating the course');
 		} else {
 			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
+			foreach ($extras_associative as $fname => $fvalue) {
 				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
 			}
 			// Get course id
@@ -143,11 +143,11 @@ 
 	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			} else {
 				return $result;
@@ -165,17 +165,17 @@ 
 	public function CreateCourses($secret_key, $courses) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = 0;
 				extract($course);
 				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSError) {
+				if ($result instanceof WSError) {
 					$result_tmp['result'] = $result->toArray();
 					$result_tmp['course_id_value'] = $course_id_value;
 					$result_tmp['course_id_generated'] = 0;
@@ -209,47 +209,47 @@ 
 	 */
 	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
 		$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 {
 			$attributes = array();
-			if(!is_empty($title)) {
+			if (!is_empty($title)) {
 				$attributes['title'] = $title;
 			}
-			if(!is_empty($category_code)) {
+			if (!is_empty($category_code)) {
 				$attributes['category_code'] = $category_code;
 			}
-			if(!is_empty($department_name)) {
+			if (!is_empty($department_name)) {
 				$attributes['department_name'] = $department_name;
 			}
-			if(!is_empty($department_url)) {
+			if (!is_empty($department_url)) {
 				$attributes['department_url'] = $department_url;
 			}
-			if(!is_empty($language)) {
+			if (!is_empty($language)) {
 				$attributes['course_language'] = $language;
 			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
+			if ($visibility != '') {
+				$attributes['visibility'] = (int) $visibility;
 			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
+			if ($subscribe != '') {
+				$attributes['subscribe'] = (int) $subscribe;
 			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
+			if ($unsubscribe != '') {
+				$attributes['unsubscribe'] = (int) $unsubscribe;
 			}
-			if(!is_empty($visual_code)) {
+			if (!is_empty($visual_code)) {
 				$attributes['visual_code'] = $visual_code;
 			}
-			if(!is_empty($attributes)) {
+			if (!is_empty($attributes)) {
 				CourseManager::update_attributes($course_id, $attributes);
 			}
-			if(!empty($extras)) {
+			if (!empty($extras)) {
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
 				$extras_associative = array();
-				foreach($extras as $extra) {
+				foreach ($extras as $extra) {
 					$extras_associative[$extra['field_name']] = $extra['field_value'];
 				}
-				foreach($extras_associative as $fname => $fvalue) {
+				foreach ($extras_associative as $fname => $fvalue) {
 					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
 				}
 			}
@@ -276,11 +276,11 @@ 
 	 */
 	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -296,10 +296,10 @@ 
 	 */
 	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
-            $visibilities = split(',',$visibility);
+            $visibilities = split(',', $visibility);
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
             foreach ($visibilities as $p => $visibility) {
                 $visibilities[$p] = $vis[$visibility];
@@ -308,9 +308,9 @@ 
 			$category_names = array();
 
 			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
                 //skip elements that do not match required visibility
-                if (!in_array($course['visibility'],$visibilities)) { continue; }
+                if (!in_array($course['visibility'], $visibilities)) { continue; }
 				$course_tmp = array();
 				$course_tmp['id'] = $course['id'];
 				$course_tmp['code'] = $course['code'];
@@ -319,7 +319,7 @@ 
 				$course_tmp['visibility'] = $course['visibility'];
 
 				// Determining category name
-				if($category_names[$course['category_code']]) {
+				if ($category_names[$course['category_code']]) {
 					$course_tmp['category_name'] = $category_names[$course['category_code']];
 				} else {
 					$category = CourseManager::get_course_category($course['category_code']);
@@ -355,21 +355,21 @@ 
 	 */
 	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
 		$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 {
 			$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 {
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
+				if ($state == 0) {
 					// Unsubscribe user
 					CourseManager::unsubscribe_user($user_id, $course_code);
 					return true;
 				} else {
 					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+					if (CourseManager::subscribe_user($user_id, $course_code, $status)) {
 						return true;
 					} else {
 						return new WSError(203, 'An error occured subscribing to this course');
@@ -391,11 +391,11 @@ 
 	 */
 	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -412,11 +412,11 @@ 
 	 */
 	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -432,17 +432,17 @@ 
 	 */
 	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$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 exists, get its descriptions
 				$descriptions = CourseDescription::get_descriptions($course_id);
 				$results = array();
-				foreach($descriptions as $description) {
+				foreach ($descriptions as $description) {
 					$results[] = array('course_desc_id' => $description->get_description_type(),
 										'course_desc_title' => $description->get_title(),
 										'course_desc_content' => $description->get_content());
@@ -465,11 +465,11 @@ 
 	 */
 	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$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 {
 				// Create the new course description
@@ -484,8 +484,8 @@ 
 				// Check if this course description exists
 				$descriptions = CourseDescription::get_descriptions($course_id);
 				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
+				foreach ($descriptions as $description) {
+					if ($description->get_description_type() == $course_desc_id) {
 						$exists = true;
 					}
 				}

main/webservices/additional_webservices.php

Spacing +17 added lines, -17 removed lines

@@ -19,12 +19,12 @@ 
 {
     $fileData = $pptData['file_data'];
     $dataInfo = pathinfo($pptData['file_name']);
-    $fileName =  basename($pptData['file_name'], '.' . $dataInfo['extension']);
+    $fileName = basename($pptData['file_name'], '.'.$dataInfo['extension']);
     $fullFileName = $pptData['file_name'];
 
     $tempArchivePath = api_get_path(SYS_ARCHIVE_PATH);
-    $tempPath = $tempArchivePath . 'wsConvert/' . $fileName . '/';
-    $tempPathNewFiles = $tempArchivePath . 'wsConvert/' . $fileName . '-n/';
+    $tempPath = $tempArchivePath.'wsConvert/'.$fileName.'/';
+    $tempPathNewFiles = $tempArchivePath.'wsConvert/'.$fileName.'-n/';
 
     $perms = api_get_permissions_for_new_directories();
     if (!is_dir($tempPath)) {
@@ -33,28 +33,28 @@ 
     if (!is_dir($tempPathNewFiles)) {
         mkdir($tempPathNewFiles, $perms, true);
     }
-    if (!is_dir($tempPathNewFiles . $fileName)) {
-        mkdir($tempPathNewFiles . $fileName, $perms, true);
+    if (!is_dir($tempPathNewFiles.$fileName)) {
+        mkdir($tempPathNewFiles.$fileName, $perms, true);
     }
 
     $file = base64_decode($fileData);
-    file_put_contents($tempPath . $fullFileName, $file);
+    file_put_contents($tempPath.$fullFileName, $file);
 
     if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
-        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
-        $classPath = $converterPath . ';' . $converterPath . '/jodconverter-2.2.2.jar;' . $converterPath . '/jodconverter-cli-2.2.2.jar';
-        $cmd = 'java -Dfile.encoding=UTF-8 -cp "' . $classPath . '" DokeosConverter';
+        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
+        $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar';
+        $cmd = 'java -Dfile.encoding=UTF-8 -cp "'.$classPath.'" DokeosConverter';
     } else {
-        $converterPath = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
+        $converterPath = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
         $classPath = ' -Dfile.encoding=UTF-8 -cp .:jodconverter-2.2.2.jar:jodconverter-cli-2.2.2.jar';
-        $cmd = 'cd ' . $converterPath . ' && java ' . $classPath . ' DokeosConverter';
+        $cmd = 'cd '.$converterPath.' && java '.$classPath.' DokeosConverter';
     }
 
-    $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
-    $cmd .= ' -w 720 -h 540 -d oogie "' . $tempPath . $fullFileName.'"  "' . $tempPathNewFiles . $fileName . '.html"';
+    $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
+    $cmd .= ' -w 720 -h 540 -d oogie "'.$tempPath.$fullFileName.'"  "'.$tempPathNewFiles.$fileName.'.html"';
 
     $perms = api_get_permissions_for_new_files();
-    chmod($tempPathNewFiles . $fileName, $perms, true);
+    chmod($tempPathNewFiles.$fileName, $perms, true);
 
     $files = array();
     $return = 0;
@@ -64,7 +64,7 @@ 
         $images = array();
         foreach ($files as $file) {
             $imageData = explode('||', $file);
-            $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles . $fileName . '/' . $imageData[1]));
+            $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles.$fileName.'/'.$imageData[1]));
         }
         $data = array(
             'files' => $files,
@@ -89,7 +89,7 @@ 
  */
 function deleteDirectory($directoryPath)
 {
-    $files = array_diff(scandir($directoryPath), array('.','..'));
+    $files = array_diff(scandir($directoryPath), array('.', '..'));
     foreach ($files as $file) {
         if (is_dir("$directoryPath/$file")) {
             deleteDirectory("$directoryPath/$file");
@@ -106,7 +106,7 @@ 
 $webCodePath = api_get_path(WEB_CODE_PATH);
 $options = array(
     'uri' => $webPath,
-    'location' => $webCodePath . 'webservices/additional_webservices.php'
+    'location' => $webCodePath.'webservices/additional_webservices.php'
 );
 
 $soapServer = new SoapServer(NULL, $options);

main/webservices/testip.php

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

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

main/webservices/webservice.php

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param WSErrorHandler Error handler
 	 */
 	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
+		if ($handler instanceof WSErrorHandler) {
 			self::$_handler = $handler;
 		}
 	}
@@ -114,12 +114,12 @@ 
 		// if we are behind a reverse proxy, assume it will send the
 		// HTTP_X_FORWARDED_FOR header and use this IP instead
 		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+			list($ip1, $ip2) = preg_split('/,/', $_SERVER['HTTP_X_FORWARDED_FOR']);
 			$ip = trim($ip1);
 		}
 		$security_key = $ip.$this->_configuration['security_key'];
 
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
+		if (!api_is_valid_secret_key($secret_key, $security_key)) {
 			return new WSError(1, "API key is invalid");
 		} else {
 			return null;
@@ -136,15 +136,15 @@ 
 	 * @return mixed System user id if the user was found, WSError otherwise
 	 */
 	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
+		if ($user_id_field_name == "chamilo_user_id") {
+			if (UserManager::is_user_id_valid(intval($user_id_value))) {
 				return intval($user_id_value);
 			} else {
 				return new WSError(100, "User not found");
 			}
 		} else {
 			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
+			if ($user_id == 0) {
 				return new WSError(100, "User not found");
 			} else {
 				return $user_id;
@@ -197,7 +197,7 @@ 
 	protected function getSessionId($session_id_field_name, $session_id_value)
 	{
 		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
+			$session = SessionManager::fetch((int) $session_id_value);
 			if (!empty($session)) {
 				return intval($session_id_value);
 			} else {