chamilo / chamilo-lms

main/user/resume_session.php

Indentation +49 added lines, -49 removed lines

@@ -60,9 +60,9 @@ 
     $session_category = '';
 
     if (Database::num_rows($rs)>0) {
-    	$rows_session_category = Database::store_result($rs);
-    	$rows_session_category = $rows_session_category[0];
-    	$session_category = $rows_session_category['name'];
+        $rows_session_category = Database::store_result($rs);
+        $rows_session_category = $rows_session_category[0];
+        $session_category = $rows_session_category['name'];
     }
 
     $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -147,22 +147,22 @@ 
     	<td><?php echo get_lang('Date'); ?> :</td>
     	<td>
     	<?php
-    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
-    		    echo get_lang('NoTimeLimits');
+            if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
+                echo get_lang('NoTimeLimits');
             }
-    		else {
+            else {
                 if ($session['access_start_date'] != '00-00-0000') {
-                	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
+                    //$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
                     $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
                 } else {
-                	$session['access_start_date'] = '';
+                    $session['access_start_date'] = '';
                 }
                 if ($session['access_end_date'] == '00-00-0000') {
                     $session['access_end_date'] ='';
                 } else {
-                	$session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
+                    $session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
                 }
-    			echo $session['access_start_date'].' '.$session['access_end_date'];
+                echo $session['access_start_date'].' '.$session['access_end_date'];
             }
             ?>
     	</td>
@@ -221,22 +221,22 @@ 
     </tr>
     <?php
     if ($session['nbr_courses'] == 0) {
-    	echo '<tr>
+        echo '<tr>
             <td colspan="4">'.get_lang('NoCoursesForThisSession').'</td>
     		</tr>';
     } else {
-    	// select the courses
-    	$sql = "SELECT c.id, code,title,visual_code, nbr_users
+        // select the courses
+        $sql = "SELECT c.id, code,title,visual_code, nbr_users
     			FROM $tbl_course c,$tbl_session_rel_course sc
     			WHERE c.id = sc.c_id
     			AND	session_id='$id_session'
     			ORDER BY title";
-    	$result=Database::query($sql);
-    	$courses=Database::store_result($result);
-    	foreach ($courses as $course) {
-    		//select the number of users
+        $result=Database::query($sql);
+        $courses=Database::store_result($result);
+        foreach ($courses as $course) {
+            //select the number of users
 
-    		$sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
+            $sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
                     WHERE
                         srcru.user_id = sru.user_id AND
                         srcru.session_id = sru.session_id AND
@@ -244,49 +244,49 @@ 
                         sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
                         srcru.session_id = '".intval($id_session)."'";
 
-    		$rs = Database::query($sql);
-    		$course['nbr_users'] = Database::result($rs,0,0);
+            $rs = Database::query($sql);
+            $course['nbr_users'] = Database::result($rs,0,0);
 
-    		// Get coachs of the courses in session
+            // Get coachs of the courses in session
 
-    		$sql = "SELECT user.lastname,user.firstname,user.username
+            $sql = "SELECT user.lastname,user.firstname,user.username
     		        FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
     				WHERE
     				    session_rcru.user_id = user.user_id AND
     				    session_rcru.session_id = '".intval($id_session)."' AND
     				    session_rcru.c_id ='".Database::escape_string($course['id'])."' AND
     				    session_rcru.status=2";
-    		$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-    		$coachs = array();
-    		if (Database::num_rows($rs) > 0) {
-    			while ($info_coach = Database::fetch_array($rs)) {
+            $coachs = array();
+            if (Database::num_rows($rs) > 0) {
+                while ($info_coach = Database::fetch_array($rs)) {
                     $coachs[] = api_get_person_name(
                             $info_coach['firstname'],
                             $info_coach['lastname']
                         ).' ('.$info_coach['username'].')';
-    			}
-    		} else {
-    			$coach = get_lang('None');
-    		}
-
-    		if (count($coachs) > 0) {
-    			$coach = implode('<br />',$coachs);
-    		} else {
-    			$coach = get_lang('None');
-    		}
-
-    		$orig_param = '&origin=resume_session';
-    		//hide_course_breadcrumb the parameter has been added to hide the
+                }
+            } else {
+                $coach = get_lang('None');
+            }
+
+            if (count($coachs) > 0) {
+                $coach = implode('<br />',$coachs);
+            } else {
+                $coach = get_lang('None');
+            }
+
+            $orig_param = '&origin=resume_session';
+            //hide_course_breadcrumb the parameter has been added to hide the
             // name of the course, that appeared in the default $interbreadcrumb
-    		echo '
+            echo '
     		<tr>
     			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),'</td>
     			<td>'.$coach.'</td>
     			<td>'.$course['nbr_users'].'</td>
 
     		</tr>';
-    	}
+        }
     }
     ?>
     </table>
@@ -307,11 +307,11 @@ 
     <?php
 
     if ($session['nbr_users']==0) {
-    	echo '<tr>
+        echo '<tr>
     			<td colspan="2">'.get_lang('NoUsersForThisSession').'</td>
     		</tr>';
     } else {
-    	$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+        $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 
         if ($multiple_url_is_on) {
             $sql = "SELECT u.user_id, lastname, firstname, username, access_url_id
@@ -329,11 +329,11 @@ 
                     AND su.session_id = ".$id_session.$order_clause;
         }
 
-    	$result = Database::query($sql);
-    	$users  = Database::store_result($result);
+        $result = Database::query($sql);
+        $users  = Database::store_result($result);
         // change breadcrumb in destination page
-    	$orig_param = '&origin=resume_session&id_session='.$id_session;
-    	foreach ($users as $user) {
+        $orig_param = '&origin=resume_session&id_session='.$id_session;
+        foreach ($users as $user) {
             $user_link = '';
             if (!empty($user['user_id'])) {
                 $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
@@ -350,7 +350,7 @@ 
                 }
             }
 
-    		echo '<tr>
+            echo '<tr>
                     <td width="90%">
                         '.$user_link.'
                     </td>
@@ -361,7 +361,7 @@ 
                         '.$link_to_add_user_in_url.'
                     </td>
                     </tr>';
-    	}
+        }
     }
     ?>
     </table>

Spacing +23 added lines, -23 removed lines

@@ -11,7 +11,7 @@ 
 
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
-$id_session = (int)$_GET['id_session'];
+$id_session = (int) $_GET['id_session'];
 SessionManager::protect_teacher_session_edit($id_session);
 
 $tool_name = get_lang('SessionOverview');
@@ -59,7 +59,7 @@ 
     $rs = Database::query($sql);
     $session_category = '';
 
-    if (Database::num_rows($rs)>0) {
+    if (Database::num_rows($rs) > 0) {
     	$rows_session_category = Database::store_result($rs);
     	$rows_session_category = $rows_session_category[0];
     	$session_category = $rows_session_category['name'];
@@ -83,25 +83,25 @@ 
             break;
         case 'delete':
             $idChecked = $_GET['idChecked'];
-            if(is_array($idChecked)) {
+            if (is_array($idChecked)) {
                 $my_temp = array();
-                foreach ($idChecked as $id){
+                foreach ($idChecked as $id) {
                     $courseInfo = api_get_course_info($id);
-                    $my_temp[]= $courseInfo['real_id'];// forcing the escape_string
+                    $my_temp[] = $courseInfo['real_id']; // forcing the escape_string
                 }
                 $idChecked = $my_temp;
                 $idChecked = "'".implode("','", $idChecked)."'";
 
                 $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
-                $nbr_affected_rows=Database::affected_rows($result);
+                $nbr_affected_rows = Database::affected_rows($result);
 
                 Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
                 Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
             }
 
-            if (!empty($_GET['class'])){
+            if (!empty($_GET['class'])) {
                 $result = Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$id_session' AND class_id=".intval($_GET['class']));
-                $nbr_affected_rows=Database::affected_rows($result);
+                $nbr_affected_rows = Database::affected_rows($result);
                 Database::query("UPDATE $tbl_session SET nbr_classes=nbr_classes-$nbr_affected_rows WHERE id='$id_session'");
             }
 
@@ -111,7 +111,7 @@ 
                 Database::query("UPDATE $tbl_session SET nbr_users=nbr_users-$nbr_affected_rows WHERE id='$id_session'");
 
                 $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id ='$id_session' AND user_id=".intval($_GET['user']));
-                $nbr_affected_rows=Database::affected_rows($result);
+                $nbr_affected_rows = Database::affected_rows($result);
 
                 Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE session_id ='$id_session'");
             }
@@ -137,28 +137,28 @@ 
     	<td><?php echo get_lang('GeneralCoach'); ?> :</td>
     	<td><?php echo api_get_person_name($session['firstname'], $session['lastname']).' ('.$session['username'].')' ?></td>
     </tr>
-    <?php if(!empty($session_category)) { ?>
+    <?php if (!empty($session_category)) { ?>
     <tr>
     	<td><?php echo get_lang('SessionCategory') ?></td>
-    	<td><?php echo $session_category;  ?></td>
+    	<td><?php echo $session_category; ?></td>
     </tr>
     <?php } ?>
     <tr>
     	<td><?php echo get_lang('Date'); ?> :</td>
     	<td>
     	<?php
-    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
+    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date'] == '00-00-0000') {
     		    echo get_lang('NoTimeLimits');
             }
     		else {
                 if ($session['access_start_date'] != '00-00-0000') {
                 	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
-                    $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
+                    $session['access_start_date'] = get_lang('From').' '.$session['access_start_date'];
                 } else {
                 	$session['access_start_date'] = '';
                 }
                 if ($session['access_end_date'] == '00-00-0000') {
-                    $session['access_end_date'] ='';
+                    $session['access_end_date'] = '';
                 } else {
                 	$session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
                 }
@@ -189,7 +189,7 @@ 
     		<?php echo api_ucfirst(get_lang('SessionVisibility')) ?> :
     	</td>
     	<td>
-    		<?php if ($session['visibility']==1) echo get_lang('ReadOnly'); elseif($session['visibility']==2) echo get_lang('Visible');elseif($session['visibility']==3) echo api_ucfirst(get_lang('Invisible'))  ?>
+    		<?php if ($session['visibility'] == 1) echo get_lang('ReadOnly'); elseif ($session['visibility'] == 2) echo get_lang('Visible'); elseif ($session['visibility'] == 3) echo api_ucfirst(get_lang('Invisible'))  ?>
     	</td>
     </tr>
     <?php
@@ -201,7 +201,7 @@ 
         echo '</td>';
         echo '<td>';
         $url_list = UrlManager::get_access_url_from_session($id_session);
-        foreach($url_list as $url_data) {
+        foreach ($url_list as $url_data) {
             echo $url_data['url'].'<br />';
         }
         echo '</td></tr>';
@@ -231,8 +231,8 @@ 
     			WHERE c.id = sc.c_id
     			AND	session_id='$id_session'
     			ORDER BY title";
-    	$result=Database::query($sql);
-    	$courses=Database::store_result($result);
+    	$result = Database::query($sql);
+    	$courses = Database::store_result($result);
     	foreach ($courses as $course) {
     		//select the number of users
 
@@ -245,7 +245,7 @@ 
                         srcru.session_id = '".intval($id_session)."'";
 
     		$rs = Database::query($sql);
-    		$course['nbr_users'] = Database::result($rs,0,0);
+    		$course['nbr_users'] = Database::result($rs, 0, 0);
 
     		// Get coachs of the courses in session
 
@@ -271,7 +271,7 @@ 
     		}
 
     		if (count($coachs) > 0) {
-    			$coach = implode('<br />',$coachs);
+    			$coach = implode('<br />', $coachs);
     		} else {
     			$coach = get_lang('None');
     		}
@@ -281,7 +281,7 @@ 
             // name of the course, that appeared in the default $interbreadcrumb
     		echo '
     		<tr>
-    			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),'</td>
+    			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session), '</td>
     			<td>'.$coach.'</td>
     			<td>'.$course['nbr_users'].'</td>
 
@@ -306,7 +306,7 @@ 
         </tr>
     <?php
 
-    if ($session['nbr_users']==0) {
+    if ($session['nbr_users'] == 0) {
     	echo '<tr>
     			<td colspan="2">'.get_lang('NoUsersForThisSession').'</td>
     		</tr>';
@@ -337,7 +337,7 @@ 
             $user_link = '';
             if (!empty($user['user_id'])) {
                 $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
-                    api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']),ENT_QUOTES,$charset).' ('.$user['username'].')</a>';
+                    api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']), ENT_QUOTES, $charset).' ('.$user['username'].')</a>';
             }
 
             $link_to_add_user_in_url = '';

Braces +8 added lines, -3 removed lines

@@ -149,8 +149,7 @@ 
     	<?php
     		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
     		    echo get_lang('NoTimeLimits');
-            }
-    		else {
+            } else {
                 if ($session['access_start_date'] != '00-00-0000') {
                 	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
                     $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
@@ -189,12 +188,18 @@ 
     		<?php echo api_ucfirst(get_lang('SessionVisibility')) ?> :
     	</td>
     	<td>
-    		<?php if ($session['visibility']==1) echo get_lang('ReadOnly'); elseif($session['visibility']==2) echo get_lang('Visible');elseif($session['visibility']==3) echo api_ucfirst(get_lang('Invisible'))  ?>
+    		<?php if ($session['visibility']==1) {
+    echo get_lang('ReadOnly');
+} elseif($session['visibility']==2) {
+    echo get_lang('Visible');
+} elseif($session['visibility']==3) {
+    echo api_ucfirst(get_lang('Invisible'))  ?>
     	</td>
     </tr>
     <?php
 
     $multiple_url_is_on = api_get_multiple_access_url();
+}
     if ($multiple_url_is_on) {
         echo '<tr><td>';
         echo 'URL';

main/user/add_users_to_session.php

Braces +8 added lines, -2 removed lines

@@ -477,7 +477,10 @@ 
     <div class="actions">
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
     </div>
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) {
+    echo '&add=true' ;
+}
+?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
     <?php
     if ($add_type == 'multiple') {
@@ -545,7 +548,10 @@ 
                   <?php
                   foreach ($nosessionUsersList as $uid => $enreg) {
                   ?>
-                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
+                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) {
+    echo 'selected="selected"';
+}
+?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
                   <?php
                   }
                   ?>

Indentation +104 added lines, -104 removed lines

@@ -49,29 +49,29 @@ 
     $extra_field_list = UserManager::get_extra_fields();
     $new_field_list = array();
     if (is_array($extra_field_list)) {
-    	foreach ($extra_field_list as $extra_field) {
-    		//if is enabled to filter and is a "<select>" field type
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
+        foreach ($extra_field_list as $extra_field) {
+            //if is enabled to filter and is a "<select>" field type
+            if ($extra_field[8]==1 && $extra_field[2]==4 ) {
                 $new_field_list[] = array(
                     'name' => $extra_field[3],
                     'variable' => $extra_field[1],
                     'data' => $extra_field[9],
                 );
-    		}
-    	}
+            }
+        }
     }
 
     function search_users($needle, $type)
     {
-    	global $id_session;
+        global $id_session;
 
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
         $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
 
-    	$xajax_response = new xajaxResponse();
-    	$return = '';
+        $xajax_response = new xajaxResponse();
+        $return = '';
 
-    	if (!empty($needle) && !empty($type)) {
+        if (!empty($needle) && !empty($type)) {
 
             //normal behaviour
             if ($type == 'any_session' && $needle == 'false')  {
@@ -79,32 +79,32 @@ 
                 $needle = '';
             }
 
-    		// xajax send utf8 datas... datas in db can be non-utf8 datas
-    		$charset = api_get_system_encoding();
-    		$needle = Database::escape_string($needle);
-    		$needle = api_convert_encoding($needle, $charset, 'utf-8');
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = Database::escape_string($needle);
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
 
-    		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
-    		$cond_user_id = '';
+            $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+            $cond_user_id = '';
 
             //Only for single & multiple
             if (in_array($type, array('single','multiple'))) {
-        		if (!empty($id_session)) {
-        		    $id_session = intval($id_session);
-        			// check id_user from session_rel_user table
-        			$sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
+                if (!empty($id_session)) {
+                    $id_session = intval($id_session);
+                    // check id_user from session_rel_user table
+                    $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
         			        WHERE session_id ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
-        			$res = Database::query($sql);
-        			$user_ids = array();
-        			if (Database::num_rows($res) > 0) {
-        				while ($row = Database::fetch_row($res)) {
-        					$user_ids[] = (int)$row[0];
-        				}
-        			}
-        			if (count($user_ids) > 0) {
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
-        			}
-        		}
+                    $res = Database::query($sql);
+                    $user_ids = array();
+                    if (Database::num_rows($res) > 0) {
+                        while ($row = Database::fetch_row($res)) {
+                            $user_ids[] = (int)$row[0];
+                        }
+                    }
+                    if (count($user_ids) > 0) {
+                        $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
+                    }
+                }
             }
 
             switch ($type) {
@@ -136,11 +136,11 @@ 
                                 user.status <> 6 '.$cond_user_id.
                             $order_clause;
                     break;
-    		}
-    		if (api_is_multiple_url_enabled()) {
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-    			$access_url_id = api_get_current_access_url_id();
-    			if ($access_url_id != -1) {
+            }
+            if (api_is_multiple_url_enabled()) {
+                $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                $access_url_id = api_get_current_access_url_id();
+                if ($access_url_id != -1) {
                     switch ($type) {
                         case 'single':
                             $sql = 'SELECT user.user_id, username, lastname, firstname
@@ -178,36 +178,36 @@ 
                                         user.status<>6 '.$cond_user_id.
                             $order_clause;
                             break;
-    				}
-    			}
-    		}
+                    }
+                }
+            }
 
-    		$rs = Database::query($sql);
+            $rs = Database::query($sql);
             $i=0;
-    		if ($type == 'single') {
-    			while ($user = Database::fetch_array($rs)) {
-    	            $i++;
-    	            if ($i<=10) {
-                		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
-    					$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
-    	            } else {
-    	            	$return .= '...<br />';
-    	            }
-    			}
-
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
-    		} else {
-    			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
-    			while ($user = Database :: fetch_array($rs)) {
-    				$person_name = api_get_person_name($user['firstname'], $user['lastname']);
-    	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
-    			}
-    			$return .= '</select>';
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
-    		}
-    	}
+            if ($type == 'single') {
+                while ($user = Database::fetch_array($rs)) {
+                    $i++;
+                    if ($i<=10) {
+                        $person_name = api_get_person_name($user['firstname'], $user['lastname']);
+                        $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
+                    } else {
+                        $return .= '...<br />';
+                    }
+                }
+
+                $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+            } else {
+                $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
+                while ($user = Database :: fetch_array($rs)) {
+                    $person_name = api_get_person_name($user['firstname'], $user['lastname']);
+                    $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
+                }
+                $return .= '</select>';
+                $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+            }
+        }
 
-    	return $xajax_response;
+        return $xajax_response;
     }
 
     $xajax -> processRequests();
@@ -347,8 +347,8 @@ 
 
         if ($use_extra_fields) {
             $final_result = array();
-           	if (count($extra_field_result)>1) {
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
+                if (count($extra_field_result)>1) {
+            for($i=0;$i<count($extra_field_result)-1;$i++) {
                     if (is_array($extra_field_result[$i+1])) {
                         $final_result = array_intersect(
                             $extra_field_result[$i],
@@ -426,7 +426,7 @@ 
                     'un' => $user['username']
                 );
                 unset($users[$uid]);
-    	}
+        }
         }
         unset($users); //clean to free memory
 
@@ -471,13 +471,13 @@ 
     }
 
     if ($add_type === 'multiple') {
-    	$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
-    	$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
+        $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
+        $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
     } else {
-    	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
-    	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
+        $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
+        $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
     }
-    	$link_add_group = '<a href="usergroups.php">'.
+        $link_add_group = '<a href="usergroups.php">'.
             Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
     ?>
     <div class="actions">
@@ -487,30 +487,30 @@ 
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
     <?php
     if ($add_type === 'multiple') {
-    	if (is_array($extra_field_list)) {
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
-    			echo '<h3>'.get_lang('FilterUsers').'</h3>';
-    			foreach ($new_field_list as $new_field) {
-    				echo $new_field['name'];
-    				$varname = 'field_'.$new_field['variable'];
-    				echo '&nbsp;<select name="'.$varname.'">';
-    				echo '<option value="0">--'.get_lang('Select').'--</option>';
-    				foreach	($new_field['data'] as $option) {
-    					$checked='';
-    					if (isset($_POST[$varname])) {
-    						if ($_POST[$varname] == $option[1]) {
-    							$checked = 'selected="true"';
-    						}
-    					}
-    					echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
-    				}
-    				echo '</select>';
-    				echo '&nbsp;&nbsp;';
-    			}
-    			echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
-    			echo '<br /><br />';
-    		}
-    	}
+        if (is_array($extra_field_list)) {
+            if (is_array($new_field_list) && count($new_field_list)>0 ) {
+                echo '<h3>'.get_lang('FilterUsers').'</h3>';
+                foreach ($new_field_list as $new_field) {
+                    echo $new_field['name'];
+                    $varname = 'field_'.$new_field['variable'];
+                    echo '&nbsp;<select name="'.$varname.'">';
+                    echo '<option value="0">--'.get_lang('Select').'--</option>';
+                    foreach	($new_field['data'] as $option) {
+                        $checked='';
+                        if (isset($_POST[$varname])) {
+                            if ($_POST[$varname] == $option[1]) {
+                                $checked = 'selected="true"';
+                            }
+                        }
+                        echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
+                    }
+                    echo '</select>';
+                    echo '&nbsp;&nbsp;';
+                }
+                echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
+                echo '<br /><br />';
+            }
+        }
     }
     ?>
     <input type="hidden" name="form_sent" value="1" />
@@ -533,7 +533,7 @@ 
                 <div id="content_source">
                 <?php
                 if (!($add_type == 'multiple')) {
-                  ?>
+                    ?>
                   <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
                   <div id="ajax_list_users_single"></div>
                   <?php
@@ -542,12 +542,12 @@ 
                 <div id="ajax_list_users_multiple">
                 <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="span5">
                   <?php
-                  foreach ($nosessionUsersList as $uid => $enreg) {
-                  ?>
+                    foreach ($nosessionUsersList as $uid => $enreg) {
+                    ?>
                       <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
                   <?php
-                  }
-                  ?>
+                    }
+                    ?>
                 </select>
                 </div>
                     <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
@@ -555,7 +555,7 @@ 
                 <?php
                 }
                 unset($nosessionUsersList);
-               ?>
+                ?>
             </div>
         </div>
 
@@ -582,13 +582,13 @@ 
             <br />
             <br />
     		<?php
-    		if (isset($_GET['add'])) {
-    			echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
+            if (isset($_GET['add'])) {
+                echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
             } else {
                 //@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed)
-    			echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
+                echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
             }
-    		?>
+            ?>
         </div>
         <div class="span5">
             <div class="multiple_select_header">

Spacing +39 added lines, -39 removed lines

@@ -22,9 +22,9 @@ 
 
 // setting breadcrumbs
 if (api_is_platform_admin()) {
-    $interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
-    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
+    $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session, "name" => get_lang('SessionOverview'));
 }
 $allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
 $extra_field_list = [];
@@ -39,7 +39,7 @@ 
     $tool_name = get_lang('SubscribeUsersToSession');
     $add_type = 'unique';
 
-    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
+    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
         $add_type = Security::remove_XSS($_REQUEST['add_type']);
     }
 
@@ -51,7 +51,7 @@ 
     if (is_array($extra_field_list)) {
     	foreach ($extra_field_list as $extra_field) {
     		//if is enabled to filter and is a "<select>" field type
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
+    		if ($extra_field[8] == 1 && $extra_field[2] == 4) {
                 $new_field_list[] = array(
                     'name' => $extra_field[3],
                     'variable' => $extra_field[1],
@@ -74,7 +74,7 @@ 
     	if (!empty($needle) && !empty($type)) {
 
             //normal behaviour
-            if ($type == 'any_session' && $needle == 'false')  {
+            if ($type == 'any_session' && $needle == 'false') {
                 $type = 'multiple';
                 $needle = '';
             }
@@ -88,7 +88,7 @@ 
     		$cond_user_id = '';
 
             //Only for single & multiple
-            if (in_array($type, array('single','multiple'))) {
+            if (in_array($type, array('single', 'multiple'))) {
         		if (!empty($id_session)) {
         		    $id_session = intval($id_session);
         			// check id_user from session_rel_user table
@@ -98,11 +98,11 @@ 
         			$user_ids = array();
         			if (Database::num_rows($res) > 0) {
         				while ($row = Database::fetch_row($res)) {
-        					$user_ids[] = (int)$row[0];
+        					$user_ids[] = (int) $row[0];
         				}
         			}
         			if (count($user_ids) > 0) {
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
+        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",", $user_ids).')';
         			}
         		}
             }
@@ -138,7 +138,7 @@ 
                     break;
     		}
     		if (api_is_multiple_url_enabled()) {
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+    			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
     			$access_url_id = api_get_current_access_url_id();
     			if ($access_url_id != -1) {
                     switch ($type) {
@@ -183,11 +183,11 @@ 
     		}
 
     		$rs = Database::query($sql);
-            $i=0;
+            $i = 0;
     		if ($type == 'single') {
     			while ($user = Database::fetch_array($rs)) {
     	            $i++;
-    	            if ($i<=10) {
+    	            if ($i <= 10) {
                 		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
     					$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
     	            } else {
@@ -195,7 +195,7 @@ 
     	            }
     			}
 
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+    			$xajax_response -> addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
     		} else {
     			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
     			while ($user = Database :: fetch_array($rs)) {
@@ -203,7 +203,7 @@ 
     	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
     			}
     			$return .= '</select>';
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+    			$xajax_response -> addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
     		}
     	}
 
@@ -260,7 +260,7 @@ 
     </script>';
 
     $form_sent = 0;
-    $firstLetterUser = $firstLetterSession='';
+    $firstLetterUser = $firstLetterSession = '';
     $UserList = $SessionList = array();
     $sessions = array();
     $noPHP_SELF = true;
@@ -272,7 +272,7 @@ 
         $UserList = $_POST['sessionUsersList'];
 
         if (!is_array($UserList)) {
-            $UserList=array();
+            $UserList = array();
         }
 
         if ($form_sent == 1) {
@@ -302,7 +302,7 @@ 
                 WHERE u.status <> ".DRH." AND u.status<>6 $order_clause";
 
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = "SELECT u.user_id, lastname, firstname, username, session_id
@@ -321,7 +321,7 @@ 
         $result = Database::query($sql);
         $users = Database::store_result($result);
         foreach ($users as $user) {
-            $sessionUsersList[$user['user_id']] = $user ;
+            $sessionUsersList[$user['user_id']] = $user;
         }
         unset($users); //clean to free memory
     } else {
@@ -333,7 +333,7 @@ 
                 foreach ($new_field_list as $new_field) {
                     $varname = 'field_'.$new_field['variable'];
                     if (UserManager::is_extra_field_available($new_field['variable'])) {
-                        if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
+                        if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
                             $use_extra_fields = true;
                             $extra_field_result[] = UserManager::get_extra_user_data_by_value(
                                 $new_field['variable'],
@@ -347,9 +347,9 @@ 
 
         if ($use_extra_fields) {
             $final_result = array();
-           	if (count($extra_field_result)>1) {
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
-                    if (is_array($extra_field_result[$i+1])) {
+           	if (count($extra_field_result) > 1) {
+    	    for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
+                    if (is_array($extra_field_result[$i + 1])) {
                         $final_result = array_intersect(
                             $extra_field_result[$i],
                             $extra_field_result[$i + 1]
@@ -360,17 +360,17 @@ 
                 $final_result = $extra_field_result[0];
             }
 
-            $where_filter ='';
+            $where_filter = '';
             if (api_is_multiple_url_enabled()) {
-                if (is_array($final_result) && count($final_result)>0) {
-                    $where_filter = " AND u.user_id IN  ('".implode("','",$final_result)."') ";
+                if (is_array($final_result) && count($final_result) > 0) {
+                    $where_filter = " AND u.user_id IN  ('".implode("','", $final_result)."') ";
                 } else {
                     //no results
                     $where_filter = " AND u.user_id  = -1";
                 }
             } else {
-                if (is_array($final_result) && count($final_result)>0) {
-                    $where_filter = " WHERE u.user_id IN  ('".implode("','",$final_result)."') ";
+                if (is_array($final_result) && count($final_result) > 0) {
+                    $where_filter = " WHERE u.user_id IN  ('".implode("','", $final_result)."') ";
                 } else {
                     //no results
                     $where_filter = " WHERE u.user_id  = -1";
@@ -399,7 +399,7 @@ 
                     $order_clause";
         }
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
@@ -416,7 +416,7 @@ 
         }
 
         $result = Database::query($sql);
-        $users = Database::store_result($result,'ASSOC');
+        $users = Database::store_result($result, 'ASSOC');
 
         foreach ($users as $uid => $user) {
             if ($user['session_id'] != $id_session) {
@@ -441,7 +441,7 @@ 
                 WHERE u.status <> ".DRH." AND u.status<>6 $order_clause";
 
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
@@ -457,11 +457,11 @@ 
             }
         }
         $result = Database::query($sql);
-        $users = Database::store_result($result,'ASSOC');
+        $users = Database::store_result($result, 'ASSOC');
         foreach ($users as $uid => $user) {
             if ($user['session_id'] == $id_session) {
                 $sessionUsersList[$user['user_id']] = $user;
-                if (array_key_exists($user['user_id'],$nosessionUsersList)) {
+                if (array_key_exists($user['user_id'], $nosessionUsersList)) {
                     unset($nosessionUsersList[$user['user_id']]);
                 }
             }
@@ -483,20 +483,20 @@ 
     <div class="actions">
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
     </div>
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
-    <?php echo '<legend>'.$tool_name.' (' . $session->getName() . ') </legend>'; ?>
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
+    <?php echo '<legend>'.$tool_name.' ('.$session->getName().') </legend>'; ?>
     <?php
     if ($add_type === 'multiple') {
     	if (is_array($extra_field_list)) {
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
+    		if (is_array($new_field_list) && count($new_field_list) > 0) {
     			echo '<h3>'.get_lang('FilterUsers').'</h3>';
     			foreach ($new_field_list as $new_field) {
     				echo $new_field['name'];
     				$varname = 'field_'.$new_field['variable'];
     				echo '&nbsp;<select name="'.$varname.'">';
     				echo '<option value="0">--'.get_lang('Select').'--</option>';
-    				foreach	($new_field['data'] as $option) {
-    					$checked='';
+    				foreach ($new_field['data'] as $option) {
+    					$checked = '';
     					if (isset($_POST[$varname])) {
     						if ($_POST[$varname] == $option[1]) {
     							$checked = 'selected="true"';
@@ -544,7 +544,7 @@ 
                   <?php
                   foreach ($nosessionUsersList as $uid => $enreg) {
                   ?>
-                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
+                      <option value="<?php echo $uid; ?>" <?php if (in_array($uid, $UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
                   <?php
                   }
                   ?>
@@ -596,7 +596,7 @@ 
             </div>
             <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="span5">
             <?php
-            foreach($sessionUsersList as $enreg) {
+            foreach ($sessionUsersList as $enreg) {
             ?>
                 <option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
             <?php

main/user/session_list.php

Indentation +4 added lines, -4 removed lines

@@ -65,13 +65,13 @@ 
         array('name'=>'access_end_date',       'index'=>'access_end_date',      'width'=>'40',   'align'=>'left', 'search' => 'true'),
         array('name'=>'coach_name',     'index'=>'coach_name',    'width'=>'80',   'align'=>'left', 'search' => 'false'),
         array('name'=>'status',         'index'=>'session_active','width'=>'40',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
-          //for the bottom bar
+            //for the bottom bar
             'searchoptions' => array(
                 'defaultValue' => '1',
                 'value' => '1:'.get_lang('Active').';0:'.get_lang('Inactive')
             ),
-          //for the top bar
-          'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
+            //for the top bar
+            'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
         array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
         array('name'=>'actions',        'index'=>'actions',         'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false')
     );
@@ -86,7 +86,7 @@ 
     //With this function we can add actions to the jgrid (edit, delete, etc)
     $action_links = 'function action_formatter(cellvalue, options, rowObject) {
          return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).'</a>'.
-         '\';
+            '\';
     }';
     ?>
     <script>

Spacing +16 added lines, -16 removed lines

@@ -56,15 +56,15 @@ 
     );
 
     //Column config
-    $column_model   = array(
-        array('name'=>'name',           'index'=>'name',          'width'=>'160',  'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
-        array('name'=>'nbr_courses',    'index'=>'nbr_courses',   'width'=>'30',   'align'=>'left', 'search' => 'true'),
-        array('name'=>'nbr_users',      'index'=>'nbr_users',     'width'=>'30',   'align'=>'left', 'search' => 'true'),
-        array('name'=>'category_name',  'index'=>'category_name', 'width'=>'70',   'align'=>'left', 'search' => 'true'),
-        array('name'=>'access_start_date',     'index'=>'access_start_date',    'width'=>'40',   'align'=>'left', 'search' => 'true'),
-        array('name'=>'access_end_date',       'index'=>'access_end_date',      'width'=>'40',   'align'=>'left', 'search' => 'true'),
-        array('name'=>'coach_name',     'index'=>'coach_name',    'width'=>'80',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'status',         'index'=>'session_active','width'=>'40',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
+    $column_model = array(
+        array('name'=>'name', 'index'=>'name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
+        array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
+        array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
+        array('name'=>'category_name', 'index'=>'category_name', 'width'=>'70', 'align'=>'left', 'search' => 'true'),
+        array('name'=>'access_start_date', 'index'=>'access_start_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
+        array('name'=>'access_end_date', 'index'=>'access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
+        array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'status', 'index'=>'session_active', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select',
           //for the bottom bar
             'searchoptions' => array(
                 'defaultValue' => '1',
@@ -72,8 +72,8 @@ 
             ),
           //for the top bar
           'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
-        array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
-        array('name'=>'actions',        'index'=>'actions',         'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false')
+        array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
+        array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false', 'search' => 'false')
     );
     //Autowidth
     $extra_params['autowidth'] = 'true';
@@ -85,7 +85,7 @@ 
 
     //With this function we can add actions to the jgrid (edit, delete, etc)
     $action_links = 'function action_formatter(cellvalue, options, rowObject) {
-         return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).'</a>'.
+         return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png', get_lang('SubscribeUsersToSession'), '', ICON_SIZE_SMALL).'</a>'.
          '\';
     }';
     ?>
@@ -106,7 +106,7 @@ 
 
     $(function() {
         <?php
-            echo Display::grid_js('sessions', $url,$columns,$column_model,$extra_params, array(), $action_links,true);
+            echo Display::grid_js('sessions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
         ?>
 
         setSearchSelect("status");
@@ -148,9 +148,9 @@ 
     <?php if (api_is_platform_admin()) {?>
         <div class="actions">
         <?php
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'',ICON_SIZE_MEDIUM).'</a>';
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'',ICON_SIZE_MEDIUM).'</a>';
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png',get_lang('ListSessionCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png', get_lang('AddSession'), '', ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png', get_lang('AddSessionsInCategories'), '', ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png', get_lang('ListSessionCategory'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
     }
 } else {

main/user/class.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 $(function() {
 <?php
     // grid definition see the $usergroup>display() function
-    echo Display::grid_js('usergroups',  $url, $columns, $columnModel, $extraParams, array(), '', true);
+    echo Display::grid_js('usergroups', $url, $columns, $columnModel, $extraParams, array(), '', true);
 ?>
 });
 </script>

main/user/classes.php

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 
 $this_section = SECTION_COURSES;
 
-$interbreadcrumb[]= array ('url' =>'classes.php','name' => get_lang('Classes'));
+$interbreadcrumb[] = array('url' =>'classes.php', 'name' => get_lang('Classes'));
 if (isset($_GET['id'])) {
-    $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Groups'));
+    $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Groups'));
 }
 
 Display :: display_header($tool_name, 'Classes');

main/user/user_import.php

Spacing +8 added lines, -8 removed lines

@@ -15,8 +15,8 @@ 
 
 $tool_name = get_lang('ImportUsersToACourse');
 
-$interbreadcrumb[] = array ("url" => "user.php", "name" => get_lang("Users"));
-$interbreadcrumb[] = array ("url" => "#", "name" => get_lang("ImportUsersToACourse"));
+$interbreadcrumb[] = array("url" => "user.php", "name" => get_lang("Users"));
+$interbreadcrumb[] = array("url" => "#", "name" => get_lang("ImportUsersToACourse"));
 
 $form = new FormValidator('user_import', 'post', 'user_import.php');
 $form->addElement('header', $tool_name);
@@ -42,7 +42,7 @@ 
     if (isset($_FILES['import_file']['size']) && $_FILES['import_file']['size'] !== 0) {
         $unsubscribe_users = isset($_POST['unsubscribe_users']) ? true : false;
         //@todo : csvToArray deprecated
-        $users  = Import::csvToArray($_FILES['import_file']['tmp_name']);
+        $users = Import::csvToArray($_FILES['import_file']['tmp_name']);
         $invalid_users  = array();
         $clean_users    = array();
 
@@ -79,7 +79,7 @@ 
                         $user_ids = array();
                         foreach ($current_user_list as $user) {
                             if (!CourseManager::is_course_teacher($user['user_id'], $course_code)) {
-                                $user_ids[]= $user['user_id'];
+                                $user_ids[] = $user['user_id'];
                             }
                         }
                         CourseManager::unsubscribe_user($user_ids, $course_code, $session_id);
@@ -92,12 +92,12 @@ 
                     if (empty($session_id)) {
                         //just to make sure
                         if (CourseManager :: is_user_subscribed_in_course($userId, $course_code)) {
-                            $user_to_show[]= $userInfo['complete_name'];
+                            $user_to_show[] = $userInfo['complete_name'];
                         }
                     } else {
                         //just to make sure
                         if (CourseManager::is_user_subscribed_in_course($userId, $course_code, true, $session_id)) {
-                            $user_to_show[]= $userInfo['complete_name'];
+                            $user_to_show[] = $userInfo['complete_name'];
                         }
                     }
                 }
@@ -105,7 +105,7 @@ 
                 $message = get_lang('CheckUsersWithId');
                 $type = 'warning';
                 foreach ($invalid_users as $invalid_user) {
-                    $user_to_show[]= $invalid_user;
+                    $user_to_show[] = $invalid_user;
                 }
             }
         }
@@ -130,7 +130,7 @@ 
             Display::display_warning_message($message.':  <br />'.$userMessage, false);
         }
     } else {
-        $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile'): get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
+        $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile') : get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
         Display::display_error_message($empty_line_msg);
     }
 }

main/coursecopy/copy_course_session.php

Doc Comments +3 added lines

@@ -65,6 +65,9 @@
 
 /* FUNCTIONS */
 
+/**
+ * @param string $name
+ */
 function make_select_session_list($name, $sessions, $attr = array())
 {
 

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
 
 function display_form()
 {
-    $html  = '';
+    $html = '';
     $sessions = SessionManager::get_sessions_list(array(), array('name', 'ASC'));
 
     // Link back to the documents overview
@@ -109,7 +109,7 @@ 
 
     //destination
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-2 control-label">' . get_lang('DestinationCoursesFromSession') . ': </label>';
+    $html .= '<label class="col-sm-2 control-label">'.get_lang('DestinationCoursesFromSession').': </label>';
     $html .= '<div class="col-sm-5" id="ajax_sessions_list_destination">';
     $html .= '<select class="form-control" name="sessions_list_destination" onchange="javascript: xajax_search_courses(this.value,\'destination\');">';
     $html .= '<option value = "0">'.get_lang('ThereIsNotStillASession').'</option></select ></div>';
@@ -131,7 +131,7 @@ 
     $html .= '<button class="btn btn-success" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;"><em class="fa fa-files-o"></em> '.get_lang('CopyCourse').'</button>';
 
     // Add Security token
-    $html .= '<input type="hidden" value="' . Security::get_token() . '" name="sec_token">';
+    $html .= '<input type="hidden" value="'.Security::get_token().'" name="sec_token">';
     $html .= '</div></div>';
     $html .= '</form>';
 
@@ -227,7 +227,7 @@ 
 
 /* HTML head extra */
 
-$htmlHeadXtra[] = $xajax->getJavascript( api_get_path(WEB_LIBRARY_PATH).'xajax/');
+$htmlHeadXtra[] = $xajax->getJavascript(api_get_path(WEB_LIBRARY_PATH).'xajax/');
 $htmlHeadXtra[] = '<script>
 function checkSelected(id_select,id_radio,id_title,id_destination) {
    var num=0;

main/user/subscribe_user.php

Doc Comments -1 removed lines

@@ -735,7 +735,6 @@
  * lock = the user can no longer use this account
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @param int $active the current state of the account
- * @param int $user_id The user id
  * @param string $urlParams
  *
  * @return string Some HTML-code with the lock/unlock button

Spacing +47 added lines, -47 removed lines

@@ -11,7 +11,7 @@ 
 */
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_USER;
+$current_course_tool = TOOL_USER;
 
 // the section (for the tabs)
 $this_section = SECTION_COURSES;
@@ -54,8 +54,8 @@ 
 }
 
 $sessionId = api_get_session_id();
-$list_register_user='';
-$list_not_register_user='';
+$list_register_user = '';
+$list_not_register_user = '';
 
 if (isset($_REQUEST['register'])) {
     $userInfo = api_get_user_info($_REQUEST['user_id']);
@@ -154,10 +154,10 @@ 
     $table->set_column_filter($col - 1, 'email_filter');
 }
 $table->set_header($col++, get_lang('Active'), false);
-$table->set_column_filter($col -1, 'active_filter');
+$table->set_column_filter($col - 1, 'active_filter');
 $table->set_header($col++, get_lang('Actions'), false);
-$table->set_column_filter($col -1, 'reg_filter');
-$table->set_form_actions(array ('subscribe' => get_lang('reg')), 'user');
+$table->set_column_filter($col - 1, 'reg_filter');
+$table->set_form_actions(array('subscribe' => get_lang('reg')), 'user');
 
 if (!empty($_POST['keyword'])) {
     $keyword_name = Security::remove_XSS($_POST['keyword']);
@@ -245,7 +245,7 @@ 
 
             if (api_is_multiple_url_enabled()) {
                 $url_access_id = api_get_current_access_url_id();
-                if ($url_access_id !=-1) {
+                if ($url_access_id != -1) {
                     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
                     $sql = "SELECT COUNT(u.id)
                             FROM $user_table u
@@ -272,7 +272,7 @@ 
 
             if (api_is_multiple_url_enabled()) {
                 $url_access_id = api_get_current_access_url_id();
-                if ($url_access_id !=-1) {
+                if ($url_access_id != -1) {
                     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
                     $sql = "SELECT COUNT(u.id)
@@ -302,7 +302,7 @@ 
 
             if (api_is_multiple_url_enabled()) {
                 $url_access_id = api_get_current_access_url_id();
-                if ($url_access_id !=-1) {
+                if ($url_access_id != -1) {
                     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
                     $sql = "SELECT COUNT(u.id)
                             FROM $user_table u
@@ -330,9 +330,9 @@ 
             if (isset($_GET['subscribe_user_filter_value']) &&
                 !empty($_GET['subscribe_user_filter_value']) &&
                 api_get_setting('ProfilingFilterAddingUsers') === 'true'
-            ){
-                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-                $sql .=	"
+            ) {
+                $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                $sql .= "
                     LEFT JOIN $table_user_field_values field_values
                     ON field_values.item_id = u.user_id
                     WHERE
@@ -341,14 +341,14 @@ 
                         field_values.field_id = '".intval($field_identification[0])."' AND
                         field_values.value = '".Database::escape_string($field_identification[1])."'
                     ";
-            } else	{
-                $sql .=	"WHERE cu.user_id IS NULL AND u.status <> ".DRH." ";
+            } else {
+                $sql .= "WHERE cu.user_id IS NULL AND u.status <> ".DRH." ";
             }
 
             if (api_is_multiple_url_enabled()) {
                 $url_access_id = api_get_current_access_url_id();
 
-                if ($url_access_id !=-1) {
+                if ($url_access_id != -1) {
                     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
                     $sql = "SELECT COUNT(u.id)
                             FROM $user_table u
@@ -394,7 +394,7 @@ 
             $users_of_course[] = $course_user['user_id'];
         }
     }
-    $sql .=" AND u.status <> ".ANONYMOUS." ";
+    $sql .= " AND u.status <> ".ANONYMOUS." ";
     $res = Database::query($sql);
     $count_user = 0;
 
@@ -465,8 +465,8 @@ 
 				!empty($_GET['subscribe_user_filter_value']) &&
 				api_get_setting('ProfilingFilterAddingUsers') == 'true'
 			) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+				$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+				$sql .= "
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -476,10 +476,10 @@ 
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
             } else {
-                $sql .=	"WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
+                $sql .= "WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
             }
 
-            $sql .=	" AND access_url_id = $url_access_id";
+            $sql .= " AND access_url_id = $url_access_id";
 		} else {
 		     // adding a teacher NOT through a session
 			$sql = "SELECT $select_fields
@@ -492,21 +492,21 @@ 
 					!empty($_GET['subscribe_user_filter_value']) &&
 					api_get_setting('ProfilingFilterAddingUsers') == 'true'
 				) {
-					$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-					$sql .=	"
+					$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+					$sql .= "
 						LEFT JOIN $table_user_field_values field_values
 							ON field_values.item_id = u.user_id
 						WHERE
 							cu.user_id IS NULL AND u.status<>".DRH." AND
 							field_values.field_id = '".intval($field_identification[0])."' AND
 							field_values.value = '".Database::escape_string($field_identification[1])."'";
-				} else	{
-					$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+				} else {
+					$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
 				}
 
 				// adding a teacher NOT trough a session on a portal with multiple URLs
 				if (api_is_multiple_url_enabled()) {
-					if ($url_access_id !=-1) {
+					if ($url_access_id != -1) {
 						$sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
@@ -518,9 +518,9 @@ 
 					if (isset($_GET['subscribe_user_filter_value']) &&
 						!empty($_GET['subscribe_user_filter_value']) &&
 						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
+					) {
 						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+						$sql .= "
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -528,8 +528,8 @@ 
 							 	u.status<>".DRH." AND
 							 	field_values.field_id = '".intval($field_identification[0])."' AND
 							 	field_values.value = '".Database::escape_string($field_identification[1])."'";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+					} else {
+						$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
 					}
 				}
 			}
@@ -550,9 +550,9 @@ 
             }
 
             // applying the filter of the additional user profile fields
-            if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])){
-                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-                $sql .=	"
+            if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])) {
+                $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                $sql .= "
                     LEFT JOIN $table_user_field_values field_values
                         ON field_values.item_id = u.user_id
                     WHERE
@@ -561,15 +561,15 @@ 
                     	(u.official_code <> 'ADMIN' OR u.official_code IS NULL) AND
                     	field_values.field_id = '".intval($field_identification[0])."' AND
                     	field_values.value = '".Database::escape_string($field_identification[1])."'";
-            } else	{
-                $sql .=	"WHERE
+            } else {
+                $sql .= "WHERE
                 			cu.user_id IS NULL AND
                 			u.status<>".DRH." AND
                 			(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
             }
 
             if (api_is_multiple_url_enabled()) {
-                $sql .=  "AND access_url_id = $url_access_id";
+                $sql .= "AND access_url_id = $url_access_id";
             }
 
 		} else {
@@ -582,8 +582,8 @@ 
 
 			// applying the filter of the additional user profile fields
 			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+				$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+				$sql .= "
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -591,14 +591,14 @@ 
 						u.status<>".DRH." AND
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+			} else {
+				$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
 			}
 
 			//showing only the courses of the current Chamilo access_url_id
 
 			if (api_is_multiple_url_enabled()) {
-				if ($url_access_id !=-1) {
+				if ($url_access_id != -1) {
 					$sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
@@ -610,9 +610,9 @@ 
 					if (isset($_GET['subscribe_user_filter_value']) &&
 						!empty($_GET['subscribe_user_filter_value']) &&
 						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
+					) {
 						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+						$sql .= "
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -622,8 +622,8 @@ 
 								field_values.value = '".Database::escape_string($field_identification[1])."' AND
 								access_url_id = $url_access_id
                             ";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+					} else {
+						$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
 					}
 				}
 			}
@@ -660,7 +660,7 @@ 
 		}
 	}
 
-	$sql .=" AND u.status != ".ANONYMOUS." ";
+	$sql .= " AND u.status != ".ANONYMOUS." ";
 
 	// Sorting and pagination (used by the sortable table)
 	$sql .= " ORDER BY col$column $direction ";
@@ -669,7 +669,7 @@ 
 	$sql .= " LIMIT $from, $number_of_items";
 
 	$res = Database::query($sql);
-	$users = array ();
+	$users = array();
 	while ($user = Database::fetch_row($res)) {
 		$users[] = $user;
 	}
@@ -730,7 +730,7 @@ 
     if ($row['0'] <> $_user['user_id']) {
 	// you cannot lock yourself out otherwise you could disable all the accounts
 	// including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
+		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array(), ICON_SIZE_TINY);
 	}
 
 	return $result;

Indentation +197 added lines, -197 removed lines

@@ -27,7 +27,7 @@ 
 
 // Access restriction
 if (!api_is_allowed_to_edit()) {
-	 api_not_allowed(true);
+        api_not_allowed(true);
 }
 
 $tool_name = get_lang("SubscribeUserToCourse");
@@ -37,7 +37,7 @@ 
 $courseInfo = api_get_course_info();
 
 if ($type == COURSEMANAGER) {
-	$tool_name = get_lang("SubscribeUserToCourseAsTeacher");
+    $tool_name = get_lang("SubscribeUserToCourseAsTeacher");
 }
 
 //extra entries in breadcrumb
@@ -50,7 +50,7 @@ 
         "url" => "subscribe_user.php?type=".$type.'&'.api_get_cidreq(),
         "name" => $tool_name
     );
-	$tool_name = get_lang('SearchResults');
+    $tool_name = get_lang('SearchResults');
 }
 
 $sessionId = api_get_session_id();
@@ -130,10 +130,10 @@ 
 
 // Build table
 $table = new SortableTable(
-	'subscribe_users',
-	'get_number_of_users',
-	'get_user_data',
-	($is_western_name_order xor $sort_by_first_name) ? 3 : 2
+    'subscribe_users',
+    'get_number_of_users',
+    'get_user_data',
+    ($is_western_name_order xor $sort_by_first_name) ? 3 : 2
 );
 $parameters['keyword'] = $keyword;
 $parameters['type'] = $type;
@@ -220,18 +220,18 @@ 
  */
 function get_number_of_users()
 {
-	// Database table definition
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-	$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // Database table definition
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+    $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
 
     $courseCode = api_get_course_id();
     $sessionId = api_get_session_id();
 
-	if (isset($_REQUEST['type']) && $_REQUEST['type'] === 'teacher') {
-		if (api_get_session_id() != 0) {
-			$sql = "SELECT COUNT(u.id)
+    if (isset($_REQUEST['type']) && $_REQUEST['type'] === 'teacher') {
+        if (api_get_session_id() != 0) {
+            $sql = "SELECT COUNT(u.id)
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -399,11 +399,11 @@ 
     $count_user = 0;
 
     if ($res) {
-       $row = Database::fetch_row($res);
-       $count_user = $row[0];
+        $row = Database::fetch_row($res);
+        $count_user = $row[0];
     }
 
-	return $count_user;
+    return $count_user;
 }
 /**
  * Get the users to display on the current page.
@@ -413,17 +413,17 @@ 
     $url_access_id = api_get_current_access_url_id();
     $course_code = api_get_course_id();
     $sessionId = api_get_session_id();
-	$courseId = api_get_course_int_id();
+    $courseId = api_get_course_int_id();
 
-	// Database table definitions
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-	$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // Database table definitions
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+    $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
     // adding teachers
-	$is_western_name_order = api_is_western_name_order();
+    $is_western_name_order = api_is_western_name_order();
 
     if (api_get_setting('show_email_addresses') === 'true') {
         $select_fields = "u.id              AS col0,
@@ -447,10 +447,10 @@ 
                 u.active               AS col4,
                 u.user_id              AS col5";
     }
-	if (isset($_REQUEST['type']) && $_REQUEST['type'] == COURSEMANAGER) {
-		// adding a teacher through a session
-		if (!empty($sessionId)) {
-			$sql = "SELECT $select_fields
+    if (isset($_REQUEST['type']) && $_REQUEST['type'] == COURSEMANAGER) {
+        // adding a teacher through a session
+        if (!empty($sessionId)) {
+            $sql = "SELECT $select_fields
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -460,13 +460,13 @@ 
                     INNER JOIN  $tbl_url_rel_user as url_rel_user
                     ON (url_rel_user.user_id = u.user_id) ";
 
-			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) &&
-				!empty($_GET['subscribe_user_filter_value']) &&
-				api_get_setting('ProfilingFilterAddingUsers') == 'true'
-			) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            // applying the filter of the additional user profile fields
+            if (isset($_GET['subscribe_user_filter_value']) &&
+                !empty($_GET['subscribe_user_filter_value']) &&
+                api_get_setting('ProfilingFilterAddingUsers') == 'true'
+            ) {
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -480,47 +480,47 @@ 
             }
 
             $sql .=	" AND access_url_id = $url_access_id";
-		} else {
-		     // adding a teacher NOT through a session
-			$sql = "SELECT $select_fields
+        } else {
+                // adding a teacher NOT through a session
+            $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
                     ON u.user_id = cu.user_id AND c_id = '".$courseId."'";
 
-				// applying the filter of the additional user profile fields
-				if (isset($_GET['subscribe_user_filter_value']) &&
-					!empty($_GET['subscribe_user_filter_value']) &&
-					api_get_setting('ProfilingFilterAddingUsers') == 'true'
-				) {
-					$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-					$sql .=	"
+                // applying the filter of the additional user profile fields
+                if (isset($_GET['subscribe_user_filter_value']) &&
+                    !empty($_GET['subscribe_user_filter_value']) &&
+                    api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                ) {
+                    $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                    $sql .=	"
 						LEFT JOIN $table_user_field_values field_values
 							ON field_values.item_id = u.user_id
 						WHERE
 							cu.user_id IS NULL AND u.status<>".DRH." AND
 							field_values.field_id = '".intval($field_identification[0])."' AND
 							field_values.value = '".Database::escape_string($field_identification[1])."'";
-				} else	{
-					$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-				}
-
-				// adding a teacher NOT trough a session on a portal with multiple URLs
-				if (api_is_multiple_url_enabled()) {
-					if ($url_access_id !=-1) {
-						$sql = "SELECT $select_fields
+                } else	{
+                    $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+                }
+
+                // adding a teacher NOT trough a session on a portal with multiple URLs
+                if (api_is_multiple_url_enabled()) {
+                    if ($url_access_id !=-1) {
+                        $sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id and c_id='".$courseId."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id) ";
 
-					// applying the filter of the additional user profile fields
-					if (isset($_GET['subscribe_user_filter_value']) &&
-						!empty($_GET['subscribe_user_filter_value']) &&
-						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
-						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+                    // applying the filter of the additional user profile fields
+                    if (isset($_GET['subscribe_user_filter_value']) &&
+                        !empty($_GET['subscribe_user_filter_value']) &&
+                        api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                    ){
+                        $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                        $sql .=	"
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -528,16 +528,16 @@ 
 							 	u.status<>".DRH." AND
 							 	field_values.field_id = '".intval($field_identification[0])."' AND
 							 	field_values.value = '".Database::escape_string($field_identification[1])."'";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-					}
-				}
-			}
-		}
-	} else {
-		// adding a student
-		if (!empty($sessionId)) {
-			$sql = "SELECT $select_fields
+                    } else	{
+                        $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+                    }
+                }
+            }
+        }
+    } else {
+        // adding a student
+        if (!empty($sessionId)) {
+            $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $tbl_session_rel_course_user cu
                     ON
@@ -572,7 +572,7 @@ 
                 $sql .=  "AND access_url_id = $url_access_id";
             }
 
-		} else {
+        } else {
             $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
@@ -580,10 +580,10 @@ 
                     	u.user_id = cu.user_id AND
                     	c_id ='".$courseId."'";
 
-			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            // applying the filter of the additional user profile fields
+            if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -591,28 +591,28 @@ 
 						u.status<>".DRH." AND
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-			}
+            } else	{
+                $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+            }
 
-			//showing only the courses of the current Chamilo access_url_id
+            //showing only the courses of the current Chamilo access_url_id
 
-			if (api_is_multiple_url_enabled()) {
-				if ($url_access_id !=-1) {
-					$sql = "SELECT $select_fields
+            if (api_is_multiple_url_enabled()) {
+                if ($url_access_id !=-1) {
+                    $sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id AND c_id='".$courseId."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id) ";
 
-					// applying the filter of the additional user profile fields
-					if (isset($_GET['subscribe_user_filter_value']) &&
-						!empty($_GET['subscribe_user_filter_value']) &&
-						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
-						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+                    // applying the filter of the additional user profile fields
+                    if (isset($_GET['subscribe_user_filter_value']) &&
+                        !empty($_GET['subscribe_user_filter_value']) &&
+                        api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                    ){
+                        $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                        $sql .=	"
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -622,18 +622,18 @@ 
 								field_values.value = '".Database::escape_string($field_identification[1])."' AND
 								access_url_id = $url_access_id
                             ";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-					}
-				}
-			}
-		}
-	}
-
-	// adding additional WHERE statements to the SQL for the search functionality
-	if (isset($_REQUEST['keyword'])) {
-		$keyword = Database::escape_string(trim($_REQUEST['keyword']));
-		$sql .= " AND (
+                    } else	{
+                        $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+                    }
+                }
+            }
+        }
+    }
+
+    // adding additional WHERE statements to the SQL for the search functionality
+    if (isset($_REQUEST['keyword'])) {
+        $keyword = Database::escape_string(trim($_REQUEST['keyword']));
+        $sql .= " AND (
 					firstname LIKE '%".$keyword."%' OR
 					lastname LIKE '%".$keyword."%' OR
 					email LIKE '%".$keyword."%' OR
@@ -642,39 +642,39 @@ 
 					)
 				";
 
-		if (api_get_setting('ProfilingFilterAddingUsers') === 'true') {
-			// we also want to search for users who have something in
-			// their profile fields that matches the keyword
-			$additional_users = search_additional_profile_fields($keyword);
-		}
-
-		// getting all the users of the course (to make sure that we do not
-		// display users that are already in the course)
-		if (!empty($sessionId)) {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $sessionId);
-		} else {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, 0);
-	    }
-		foreach ($a_course_users as $user_id=>$course_user) {
-			$users_of_course[] = $course_user['user_id'];
-		}
-	}
-
-	$sql .=" AND u.status != ".ANONYMOUS." ";
-
-	// Sorting and pagination (used by the sortable table)
-	$sql .= " ORDER BY col$column $direction ";
+        if (api_get_setting('ProfilingFilterAddingUsers') === 'true') {
+            // we also want to search for users who have something in
+            // their profile fields that matches the keyword
+            $additional_users = search_additional_profile_fields($keyword);
+        }
+
+        // getting all the users of the course (to make sure that we do not
+        // display users that are already in the course)
+        if (!empty($sessionId)) {
+            $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $sessionId);
+        } else {
+            $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, 0);
+        }
+        foreach ($a_course_users as $user_id=>$course_user) {
+            $users_of_course[] = $course_user['user_id'];
+        }
+    }
+
+    $sql .=" AND u.status != ".ANONYMOUS." ";
+
+    // Sorting and pagination (used by the sortable table)
+    $sql .= " ORDER BY col$column $direction ";
     $from = (int) $from;
     $number_of_items = (int) $number_of_items;
-	$sql .= " LIMIT $from, $number_of_items";
+    $sql .= " LIMIT $from, $number_of_items";
 
-	$res = Database::query($sql);
-	$users = array ();
-	while ($user = Database::fetch_row($res)) {
-		$users[] = $user;
-	}
+    $res = Database::query($sql);
+    $users = array ();
+    while ($user = Database::fetch_row($res)) {
+        $users[] = $user;
+    }
 
-	return $users;
+    return $users;
 }
 /**
 * Returns a mailto-link
@@ -683,7 +683,7 @@ 
 */
 function email_filter($email)
 {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 /**
  * Build the reg-column of the table
@@ -699,10 +699,10 @@ 
     }
     $user_id = (int) $user_id;
 
-	$result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?'.api_get_cidreq().'&register=yes&type='.$type.'&user_id='.$user_id.'">'.
+    $result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?'.api_get_cidreq().'&register=yes&type='.$type.'&user_id='.$user_id.'">'.
         get_lang("reg").'</a>';
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -716,7 +716,7 @@ 
  */
 function active_filter($active, $url_params, $row)
 {
-	$_user = api_get_user_info();
+    $_user = api_get_user_info();
     if ($active == '1') {
         $action = 'AccountActive';
         $image = 'accept';
@@ -725,15 +725,15 @@ 
     if ($active == '0') {
         $action = 'AccountInactive';
         $image = 'error';
-	}
+    }
     $result = '';
     if ($row['0'] <> $_user['user_id']) {
-	// you cannot lock yourself out otherwise you could disable all the accounts
-	// including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
-	}
+    // you cannot lock yourself out otherwise you could disable all the accounts
+    // including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -751,30 +751,30 @@ 
  */
 function search_additional_profile_fields($keyword)
 {
-	// database table definitions
-	$table_user_field_options = Database :: get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // database table definitions
+    $table_user_field_options = Database :: get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
     $tableExtraField = Database::get_main_table(TABLE_EXTRA_FIELD);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
     $keyword = Database::escape_string($keyword);
-	// getting the field option text that match this keyword (for radio buttons and checkboxes)
-	$sql = "SELECT * FROM $table_user_field_options
+    // getting the field option text that match this keyword (for radio buttons and checkboxes)
+    $sql = "SELECT * FROM $table_user_field_options
 	        WHERE display_text LIKE '%".$keyword."%'";
-	$result_profiling = Database::query($sql);
-	while ($profiling_field_options = Database::fetch_array($result_profiling)) {
-		$profiling_field_options_exact_values[] = $profiling_field_options;
-	}
+    $result_profiling = Database::query($sql);
+    while ($profiling_field_options = Database::fetch_array($result_profiling)) {
+        $profiling_field_options_exact_values[] = $profiling_field_options;
+    }
     $profiling_field_options_exact_values_sql = '';
-	foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue) {
-		$profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
-	}
+    foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue) {
+        $profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
+    }
 
     $extraFieldType = ExtraField::USER_FIELD_TYPE;
 
-	// getting all the user ids of the users who have chosen on of the predefined fields that contain the keyword
-	// or all the users who have entered the keyword in a free-form field
-	$sql = "SELECT
+    // getting all the user ids of the users who have chosen on of the predefined fields that contain the keyword
+    // or all the users who have entered the keyword in a free-form field
+    $sql = "SELECT
 	            user.user_id as col0,
 	            user.official_code as col1,
 	            user.lastname as col2,
@@ -788,13 +788,13 @@ 
                 user_values.field_id = e.id AND
                 e.extra_field_type = $extraFieldType AND
                 (value LIKE '%".$keyword."%'".$profiling_field_options_exact_values_sql.")";
-	$result = Database::query($sql);
+    $result = Database::query($sql);
     $additional_users = array();
-	while ($profiled_users = Database::fetch_array($result)) {
-		$additional_users[$profiled_users['col0']] = $profiled_users;
-	}
+    while ($profiled_users = Database::fetch_array($result)) {
+        $additional_users[$profiled_users['col0']] = $profiled_users;
+    }
 
-	return $additional_users;
+    return $additional_users;
 }
 
 /**
@@ -806,44 +806,44 @@ 
  */
 function display_extra_profile_fields_filter()
 {
-	// getting all the additional user profile fields
+    // getting all the additional user profile fields
     $extra = UserManager::get_extra_fields(0, 50, 5, 'ASC');
-	$return = '<option value="">'.get_lang('SelectFilter').'</option>';
-
-	// looping through the additional user profile fields
-	foreach ($extra as $id => $field_details) {
-		// $field_details[2] contains the type of the additional user profile field
-		switch ($field_details[2]) {
-			// text fields cannot be used as a filter
-			case ExtraFieldModel::FIELD_TYPE_TEXT:
-				break;
-			// text area fields cannot be used as a filter
-			case ExtraFieldModel::FIELD_TYPE_TEXTAREA:
-				break;
-			case ExtraFieldModel::FIELD_TYPE_RADIO:
-			case ExtraFieldModel::FIELD_TYPE_SELECT:
-			case ExtraFieldModel::FIELD_TYPE_SELECT_MULTIPLE:
-				$return .= '<optgroup label="'.$field_details[3].'">';
-				foreach ($field_details[9] as $option_id => $option_details) {
-					if (isset($_GET['subscribe_user_filter_value']) &&
+    $return = '<option value="">'.get_lang('SelectFilter').'</option>';
+
+    // looping through the additional user profile fields
+    foreach ($extra as $id => $field_details) {
+        // $field_details[2] contains the type of the additional user profile field
+        switch ($field_details[2]) {
+            // text fields cannot be used as a filter
+            case ExtraFieldModel::FIELD_TYPE_TEXT:
+                break;
+            // text area fields cannot be used as a filter
+            case ExtraFieldModel::FIELD_TYPE_TEXTAREA:
+                break;
+            case ExtraFieldModel::FIELD_TYPE_RADIO:
+            case ExtraFieldModel::FIELD_TYPE_SELECT:
+            case ExtraFieldModel::FIELD_TYPE_SELECT_MULTIPLE:
+                $return .= '<optgroup label="'.$field_details[3].'">';
+                foreach ($field_details[9] as $option_id => $option_details) {
+                    if (isset($_GET['subscribe_user_filter_value']) &&
                         $_GET['subscribe_user_filter_value'] == $field_details[0].'*'.$option_details[1]
                     ) {
-						$selected = 'selected="selected"';
-					} else {
-						$selected = false;
-					}
-					$return .= '<option value="'.$field_details[0].'*'.$option_details[1].'" '.$selected.'>'.$option_details[2].'</option>';
-				}
-				$return .= '</optgroup>';
-				break;
-		}
-	}
-
-	$html = '<form class="form-inline" id="subscribe_user_filter" name="subscribe_user_filter" method="get" action="'.api_get_self().'?'.api_get_cidreq().'">';
-	$html .= '<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_REQUEST['type']).'" />';
-	$html .= '<select name="subscribe_user_filter_value" id="subscribe_user_filter_value">'.$return.'</select>';
-	$html .= '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
-	$html .= '</form>';
+                        $selected = 'selected="selected"';
+                    } else {
+                        $selected = false;
+                    }
+                    $return .= '<option value="'.$field_details[0].'*'.$option_details[1].'" '.$selected.'>'.$option_details[2].'</option>';
+                }
+                $return .= '</optgroup>';
+                break;
+        }
+    }
+
+    $html = '<form class="form-inline" id="subscribe_user_filter" name="subscribe_user_filter" method="get" action="'.api_get_self().'?'.api_get_cidreq().'">';
+    $html .= '<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_REQUEST['type']).'" />';
+    $html .= '<select name="subscribe_user_filter_value" id="subscribe_user_filter_value">'.$return.'</select>';
+    $html .= '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
+    $html .= '</form>';
 
     return $html;
 }

main/webservices/webservice_course.php

Doc Comments +1 added lines

@@ -453,6 +453,7 @@
 	 * @param string Session id field name
 	 * @param string Session id value
 	 * @param int State (1 to subscribe, 0 to unsubscribe)
+	 * @param integer $state
 	 * @return mixed True on success, WSError otherwise
 	 */
 	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {

Indentation +455 added lines, -455 removed lines

@@ -12,490 +12,490 @@
  */
 class WSCourse extends WS
 {
-	/**
-	 * Deletes a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed True if the course was successfully deleted, WSError otherwise
-	 */
-	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) {
-			return $course_id;
-		} else {
-			$course_code = CourseManager::get_course_code_from_course_id($course_id);
-			CourseManager::delete_course($course_code);
-			return true;
-		}
-	}
+    /**
+     * Deletes a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed True if the course was successfully deleted, WSError otherwise
+     */
+    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) {
+            return $course_id;
+        } else {
+            $course_code = CourseManager::get_course_code_from_course_id($course_id);
+            CourseManager::delete_course($course_code);
+            return true;
+        }
+    }
 
-	/**
-	 * Deletes a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 */
-	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     */
+    public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Deletes multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
-	 * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteCourses($secret_key, $courses) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			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) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+    /**
+     * Deletes multiple courses
+     *
+     * @param string API secret key
+     * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
+     * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteCourses($secret_key, $courses) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            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) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Creates a course (helper method)
-	 *
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return mixed Generated id if creation was successful, WSError otherwise
-	 */
-	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") {
-			$extras_associative[$course_id_field_name] = $course_id_value;
-		}
-		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) {
-			return $course_admin_id;
-		}
-		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);
-		if (!$result) {
-			return new WSError(202, 'There was an error creating the course');
-		} else {
-			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
-			}
-			// Get course id
-			$course_info = CourseManager::get_course_information($result);
-			return $course_info['real_id'];
-		}
-	}
+    /**
+     * Creates a course (helper method)
+     *
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return mixed Generated id if creation was successful, WSError otherwise
+     */
+    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") {
+            $extras_associative[$course_id_field_name] = $course_id_value;
+        }
+        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) {
+            return $course_admin_id;
+        }
+        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);
+        if (!$result) {
+            return new WSError(202, 'There was an error creating the course');
+        } else {
+            // Update extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
+            }
+            // Get course id
+            $course_info = CourseManager::get_course_information($result);
+            return $course_info['real_id'];
+        }
+    }
 
-	/**
-	 * Creates a course
-	 *
-	 * @param string API secret key
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return int Course id generated
-	 */
-	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) {
-			$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) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
+    /**
+     * Creates a course
+     *
+     * @param string API secret key
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return int Course id generated
+     */
+    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) {
+            $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) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Create multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Courses to be created, with elements following the structure presented in CreateCourse
-	 * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateCourses($secret_key, $courses) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
+    /**
+     * Create multiple courses
+     *
+     * @param string API secret key
+     * @param array Courses to be created, with elements following the structure presented in CreateCourse
+     * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateCourses($secret_key, $courses) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            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) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                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) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Edits a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	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) {
-			return $course_id;
-		} else {
-			$attributes = array();
-			if(!empty($title)) {
-				$attributes['title'] = $title;
-			}
-			if(!empty($category_code)) {
-				$attributes['category_code'] = $category_code;
-			}
-			if(!empty($department_name)) {
-				$attributes['department_name'] = $department_name;
-			}
-			if(!empty($department_url)) {
-				$attributes['department_url'] = $department_url;
-			}
-			if(!empty($language)) {
-				$attributes['course_language'] = $language;
-			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
-			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
-			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
-			}
-			if(!empty($visual_code)) {
-				$attributes['visual_code'] = $visual_code;
-			}
-			if(!empty($attributes)) {
-				CourseManager::update_attributes($course_id, $attributes);
-			}
-			if(!empty($extras)) {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				$extras_associative = array();
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-				foreach($extras_associative as $fname => $fvalue) {
-					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
-				}
-			}
-			return true;
-		}
-	}
+    /**
+     * Edits a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     * @return mixed True in case of success, WSError otherwise
+     */
+    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) {
+            return $course_id;
+        } else {
+            $attributes = array();
+            if(!empty($title)) {
+                $attributes['title'] = $title;
+            }
+            if(!empty($category_code)) {
+                $attributes['category_code'] = $category_code;
+            }
+            if(!empty($department_name)) {
+                $attributes['department_name'] = $department_name;
+            }
+            if(!empty($department_url)) {
+                $attributes['department_url'] = $department_url;
+            }
+            if(!empty($language)) {
+                $attributes['course_language'] = $language;
+            }
+            if($visibility != '') {
+                $attributes['visibility'] = (int)$visibility;
+            }
+            if($subscribe != '') {
+                $attributes['subscribe'] = (int)$subscribe;
+            }
+            if($unsubscribe != '') {
+                $attributes['unsubscribe'] = (int)$unsubscribe;
+            }
+            if(!empty($visual_code)) {
+                $attributes['visual_code'] = $visual_code;
+            }
+            if(!empty($attributes)) {
+                CourseManager::update_attributes($course_id, $attributes);
+            }
+            if(!empty($extras)) {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                $extras_associative = array();
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+                foreach($extras_associative as $fname => $fvalue) {
+                    CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
+                }
+            }
+            return true;
+        }
+    }
 
-	/**
-	 * Edits a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 */
-	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) {
-			$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) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Edits a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     */
+    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) {
+            $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) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * List courses
-	 *
-	 * @param string API secret key
-	 * @param string A list of visibility filter we want to apply
-	 * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
-	 * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
-	 */
-	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
+    /**
+     * List courses
+     *
+     * @param string API secret key
+     * @param string A list of visibility filter we want to apply
+     * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
+     * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
+     */
+    public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
             $visibilities = split(',',$visibility);
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
             foreach ($visibilities as $p => $visibility) {
                 $visibilities[$p] = $vis[$visibility];
             }
-			$courses_result = array();
-			$category_names = array();
+            $courses_result = array();
+            $category_names = array();
 
-			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+            $courses = CourseManager::get_courses_list();
+            foreach($courses as $course) {
                 //skip elements that do not match required visibility
                 if (!in_array($course['visibility'],$visibilities)) { continue; }
-				$course_tmp = array();
-				$course_tmp['id'] = $course['id'];
-				$course_tmp['code'] = $course['code'];
-				$course_tmp['title'] = $course['title'];
-				$course_tmp['language'] = $course['course_language'];
-				$course_tmp['visibility'] = $course['visibility'];
+                $course_tmp = array();
+                $course_tmp['id'] = $course['id'];
+                $course_tmp['code'] = $course['code'];
+                $course_tmp['title'] = $course['title'];
+                $course_tmp['language'] = $course['course_language'];
+                $course_tmp['visibility'] = $course['visibility'];
 
-				// Determining category name
-				if($category_names[$course['category_code']]) {
-					$course_tmp['category_name'] = $category_names[$course['category_code']];
-				} else {
-					$category = CourseManager::get_course_category($course['category_code']);
-					$category_names[$course['category_code']] = $category['name'];
-					$course_tmp['category_name'] = $category['name'];
-				}
+                // Determining category name
+                if($category_names[$course['category_code']]) {
+                    $course_tmp['category_name'] = $category_names[$course['category_code']];
+                } else {
+                    $category = CourseManager::get_course_category($course['category_code']);
+                    $category_names[$course['category_code']] = $category['name'];
+                    $course_tmp['category_name'] = $category['name'];
+                }
 
-				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
-				$course_tmp['number_students'] = count($user_list);
+                // Determining number of students registered in course
+                $user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
+                $course_tmp['number_students'] = count($user_list);
 
-				// Determining external course id - this code misses the external course id field name
-				// $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
+                // Determining external course id - this code misses the external course id field name
+                // $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
 
 
-				$courses_result[] = $course_tmp;
-			}
+                $courses_result[] = $course_tmp;
+            }
 
-			return $courses_result;
-		}
-	}
+            return $courses_result;
+        }
+    }
 
-	/**
-	 * Subscribe or unsubscribe user to a course (helper method)
-	 *
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Set to 1 to subscribe, 0 to unsubscribe
-	 * @param int Status (STUDENT or TEACHER) Used for subscription only
-	 * @return mixed True if subscription or unsubscription was successful, false otherwise
-	 */
-	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) {
-			return $course_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				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)) {
-						return true;
-					} else {
-						return new WSError(203, 'An error occured subscribing to this course');
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Subscribe or unsubscribe user to a course (helper method)
+     *
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Set to 1 to subscribe, 0 to unsubscribe
+     * @param int Status (STUDENT or TEACHER) Used for subscription only
+     * @return mixed True if subscription or unsubscription was successful, false otherwise
+     */
+    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) {
+            return $course_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                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)) {
+                        return true;
+                    } else {
+                        return new WSError(203, 'An error occured subscribing to this course');
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Status (1 = Teacher, 5 = Student)
-	 */
-	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) {
-			$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) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Status (1 = Teacher, 5 = Student)
+     */
+    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) {
+            $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) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Unsusbscribe user from course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 */
-	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) {
-			$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) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Unsusbscribe user from course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     */
+    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) {
+            $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) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Returns the descriptions of a course, along with their id
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
-	 */
-	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			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) {
-					$results[] = array('course_desc_id' => $description->get_description_type(),
-										'course_desc_title' => $description->get_title(),
-										'course_desc_content' => $description->get_content());
-				}
-				return $results;
-			}
-		}
-	}
+    /**
+     * Returns the descriptions of a course, along with their id
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
+     */
+    public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            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) {
+                    $results[] = array('course_desc_id' => $description->get_description_type(),
+                                        'course_desc_title' => $description->get_title(),
+                                        'course_desc_content' => $description->get_content());
+                }
+                return $results;
+            }
+        }
+    }
 
 
-	/**
-	 * Edit course description
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param int Category id from course description
-	 * @param string Description title
-	 * @param string Course description content
-	 */
-	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) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Create the new course description
-				$cd = new CourseDescription();
-				$cd->set_description_type($course_desc_id);
-				$cd->set_title($course_desc_title);
-				$cd->set_content($course_desc_content);
-				$cd->set_session_id(0);
-				// Get course info
-				$course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
+    /**
+     * Edit course description
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param int Category id from course description
+     * @param string Description title
+     * @param string Course description content
+     */
+    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) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Create the new course description
+                $cd = new CourseDescription();
+                $cd->set_description_type($course_desc_id);
+                $cd->set_title($course_desc_title);
+                $cd->set_content($course_desc_content);
+                $cd->set_session_id(0);
+                // Get course info
+                $course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
                 $cd->set_course_id($course_info['real_id']);
-				// 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) {
-						$exists = true;
-					}
-				}
-				if (!$exists) {
-					$cd->set_progress(0);
-					$cd->insert();
-				} else {
-					$cd->update();
-				}
-			}
-		}
-	}
+                // 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) {
+                        $exists = true;
+                    }
+                }
+                if (!$exists) {
+                    $cd->set_progress(0);
+                    $cd->insert();
+                } else {
+                    $cd->update();
+                }
+            }
+        }
+    }
 }

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(!empty($title)) {
+			if (!empty($title)) {
 				$attributes['title'] = $title;
 			}
-			if(!empty($category_code)) {
+			if (!empty($category_code)) {
 				$attributes['category_code'] = $category_code;
 			}
-			if(!empty($department_name)) {
+			if (!empty($department_name)) {
 				$attributes['department_name'] = $department_name;
 			}
-			if(!empty($department_url)) {
+			if (!empty($department_url)) {
 				$attributes['department_url'] = $department_url;
 			}
-			if(!empty($language)) {
+			if (!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(!empty($visual_code)) {
+			if (!empty($visual_code)) {
 				$attributes['visual_code'] = $visual_code;
 			}
-			if(!empty($attributes)) {
+			if (!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;
 					}
 				}