chamilo / chamilo-lms

main/social/group_waiting_list.php

Spacing +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@ 
 require_once '../inc/global.inc.php';
 
 api_block_anonymous_users();
-if (api_get_setting('allow_social_tool') !='true') {
+if (api_get_setting('allow_social_tool') != 'true') {
     api_not_allowed();
 }
 
 $this_section = SECTION_SOCIAL;
 
-$group_id= intval($_GET['id']);
+$group_id = intval($_GET['id']);
 $usergroup = new UserGroup();
 
 //todo @this validation could be in a function in group_portal_manager
@@ -35,9 +35,9 @@ 
     }
 }
 
-$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
 $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => $group_info['name']);
-$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('WaitingList'));
+$interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('WaitingList'));
 
 // Group information
 $admins = $usergroup->get_users_by_group(
@@ -49,7 +49,7 @@ 
 );
 $show_message = '';
 
-if (isset($_GET['action']) && $_GET['action']=='accept') {
+if (isset($_GET['action']) && $_GET['action'] == 'accept') {
     // we add a user only if is a open group
     $user_join = intval($_GET['u']);
     //if i'm a moderator
@@ -59,7 +59,7 @@ 
     }
 }
 
-if (isset($_GET['action']) && $_GET['action']=='deny') {
+if (isset($_GET['action']) && $_GET['action'] == 'deny') {
     // we add a user only if is a open group
     $user_join = intval($_GET['u']);
     //if i'm a moderator
@@ -69,9 +69,9 @@ 
     }
 }
 
-if (isset($_GET['action']) && $_GET['action']=='set_moderator') {
+if (isset($_GET['action']) && $_GET['action'] == 'set_moderator') {
     // we add a user only if is a open group
-    $user_moderator= intval($_GET['u']);
+    $user_moderator = intval($_GET['u']);
     //if i'm the admin
     if ($usergroup->is_group_admin($group_id)) {
         $usergroup->update_user_role($user_moderator, $group_id, GROUP_USER_PERMISSION_MODERATOR);
@@ -91,7 +91,7 @@ 
 $social_left_content = SocialManager::show_social_menu('waiting_list', $group_id);
 
 // Display form
-foreach($users as $user) {
+foreach ($users as $user) {
     switch ($user['relation_type']) {
         case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
             $user['link']  = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.

main/social/friends.php

Spacing +5 added lines, -5 removed lines

@@ -132,15 +132,15 @@
 
                 $friend_html .= '
                     <div class="col-md-3">
-                        <div class="thumbnail text-center" id="div_' . $friends[$j]['friend_user_id'] . '">
-                            <img src="' . $userPicture . '" class="img-responsive" id="imgfriend_' . $friend['friend_user_id'] . '" title="'.$user_name.'">
+                        <div class="thumbnail text-center" id="div_' . $friends[$j]['friend_user_id'].'">
+                            <img src="' . $userPicture.'" class="img-responsive" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$user_name.'">
                             <div class="caption">
                                 <h3>
-                                    <a href="profile.php?u=' . $friend['friend_user_id'] . '">' . $user_name . '</a>
+                                    <a href="profile.php?u=' . $friend['friend_user_id'].'">'.$user_name.'</a>
                                 </h3>
                                 <p>
-                                    <button class="btn btn-danger" onclick="delete_friend(this)" id=img_' . $friend['friend_user_id'] . '>
-                                        ' . get_lang('Delete') . '
+                                    <button class="btn btn-danger" onclick="delete_friend(this)" id=img_' . $friend['friend_user_id'].'>
+                                        ' . get_lang('Delete').'
                                     </button>
                                 </p>
                             </div>

main/permissions/group_permissions.inc.php

Spacing +26 added lines, -26 removed lines

@@ -13,9 +13,9 @@ 
 // ---------------------------------------------------
 // 			ACTIONS
 // ---------------------------------------------------
-if ($_POST['StoreGroupPermissions'] and $setting_visualisation=='checkbox')
+if ($_POST['StoreGroupPermissions'] and $setting_visualisation == 'checkbox')
 {
-	$result_message=store_permissions('group', $group_id);
+	$result_message = store_permissions('group', $group_id);
 	if ($result_message)
 	{
 		Display::display_normal_message($result_message);
@@ -23,13 +23,13 @@ 
 }
 if (isset($_GET['action']))
 {
-	if (($_GET['action']=='grant' OR $_GET['action']=='revoke')  AND isset($_GET['permission']) AND isset($_GET['tool']))
+	if (($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke') AND isset($_GET['permission']) AND isset($_GET['tool']))
 	{
-		$result_message=store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
+		$result_message = store_one_permission('group', $_GET['action'], $group_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('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
+		$result_message = assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
 		echo 'hier';
 	}
 }
@@ -41,41 +41,41 @@ 
 // ---------------------------------------------------
 // 			RETRIEVING THE PERMISSIONS
 // ---------------------------------------------------
-$current_group_permissions=array();
-$current_group_permissions=get_permissions('group',$group_id);
+$current_group_permissions = array();
+$current_group_permissions = get_permissions('group', $group_id);
 // @todo current group permissions and current role permissions
 
 // ---------------------------------------------------
 //   INHERITED PERMISSIONS (group roles)
 // ---------------------------------------------------
-$group_course_roles_permissions=get_roles_permissions('group',$group_id, 'course');
-$group_platform_roles_permissions=get_roles_permissions('group',$group_id, 'platform');
-$inherited_permissions=permission_array_merge($group_course_roles_permissions,$group_platform_roles_permissions);
+$group_course_roles_permissions = get_roles_permissions('group', $group_id, 'course');
+$group_platform_roles_permissions = get_roles_permissions('group', $group_id, 'platform');
+$inherited_permissions = permission_array_merge($group_course_roles_permissions, $group_platform_roles_permissions);
 
 // ---------------------------------------------------
 // 			LIMITED OR FULL
 // ---------------------------------------------------
-$current_group_permissions=limited_or_full($current_group_permissions);
-$inherited_permissions=limited_or_full($inherited_permissions);
-if (api_get_setting('permissions')=='limited')
+$current_group_permissions = limited_or_full($current_group_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;
 }
 
 echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
 // ---------------------------------------------------
 // 		DISPLAYING THE ROLES LIST
 // ---------------------------------------------------
-if (api_get_setting('group_roles')=='true')
+if (api_get_setting('group_roles') == 'true')
 {
 	// the list of the roles for the user
 	echo '<strong>'.get_lang('GroupRoles').'</strong><br />';
-	$current_group_course_roles=get_roles('group',$group_id);
-	$current_group_platform_roles=get_roles('group',$group_id, 'platform');
+	$current_group_course_roles = get_roles('group', $group_id);
+	$current_group_platform_roles = get_roles('group', $group_id, 'platform');
 	display_role_list($current_group_course_roles, $current_group_platform_roles);
 	echo '<br />';
 }
@@ -107,17 +107,17 @@ 
 	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_group_permissions, $tool, $value);
-				display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions,$course_admin);
+				display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions, $course_admin);
 			}
-			if ($setting_visualisation=='image')
+			if ($setting_visualisation == 'image')
 			{
 				//display_image_matrix($current_group_permissions, $tool, $value);
-				display_image_matrix($current_group_permissions, $tool, $value,$inherited_permissions, $course_admin);
+				display_image_matrix($current_group_permissions, $tool, $value, $inherited_permissions, $course_admin);
 			}
 		}
 		// note: in a later stage this part will be replaced by a function
@@ -130,7 +130,7 @@ 
 }
 
 echo "</table>\n";
-if ($setting_visualisation=='checkbox')
+if ($setting_visualisation == 'checkbox')
 {
 	echo "<input type=\"Submit\" name=\"StoreGroupPermissions\" value=\"".get_lang('StorePermissions')."\">";
 }

main/permissions/all_permissions.inc.php

Spacing +7 added lines, -7 removed lines

@@ -10,15 +10,15 @@ 
  * Code
  */
 // possible permissions
-$rights_full=array("View","Add","Edit","Delete","Visibility","Move");
-$rights_limited=array("Add","Edit","Delete");
+$rights_full = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
+$rights_limited = array("Add", "Edit", "Delete");
 
 
 // first we determine what can be done in each tool. We do this for each tool.
-$tool_rights[TOOL_LINK]=array("View","Add","Edit","Delete","Visibility", "Move");
-$tool_rights[TOOL_DOCUMENT]=array("View","Add","Edit","Delete","Visibility","Move");
+$tool_rights[TOOL_LINK] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
+$tool_rights[TOOL_DOCUMENT] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
 //$tool_rights[TOOL_CALENDAR_EVENT]=array("View","Add","Edit","Delete","Visibility");
-$tool_rights[TOOL_ANNOUNCEMENT]=array("View","Add","Edit","Delete","Visibility", "Move");
+$tool_rights[TOOL_ANNOUNCEMENT] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
 //$tool_rights[TOOL_STUDENTPUBLICATION]=array("View","Edit","Delete","Visibility");
 //$tool_rights[TOOL_COURSE_DESCRIPTION]=array("View","Add","Edit","Delete","Visibility");
 //$tool_rights[TOOL_LEARNPATH]=array("View","Add","Edit","Delete","Visibility");
@@ -26,13 +26,13 @@ 
 //$tool_rights[TOOL_BB_POST]=array("View","Add","Edit","Delete");
 //$tool_rights[TOOL_DROPBOX]=array("View","Add","Delete");
 //$tool_rights[TOOL_QUIZ]=array("View","Add","Edit","Delete","Visibility");
-$tool_rights[TOOL_USER]=array("View","Add","Edit","Delete");
+$tool_rights[TOOL_USER] = array("View", "Add", "Edit", "Delete");
 //$tool_rights[TOOL_GROUP]=array("View","Add","Edit","Delete");
 //$tool_rights[TOOL_CHAT]=array("View","Delete");
 //$tool_rights[TOOL_CONFERENCE]=array("View","Add","Edit","Delete");
 //$tool_rights[TOOL_STUDENTPUBLICATION]=array("View","Add","Edit","Delete");
 
 // this value can be checkbox or image
-$setting_visualisation='image';
+$setting_visualisation = 'image';
 
 ?>

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