Completed
Push — 1.10.x ( a26f23...c6c321 )
by Julito
59:04
created
main/link/link.php 2 patches
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,6 @@
 block discarded – undo
16 16
  * @author Patrick Cool
17 17
  * @author René Haentjens, added CSV file import (October 2004)
18 18
  * @package chamilo.link
19
-
20 19
  */
21 20
 
22 21
 // Including libraries
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 // Including libraries
23 23
 require_once '../inc/global.inc.php';
24
-$current_course_tool  = TOOL_LINK;
24
+$current_course_tool = TOOL_LINK;
25 25
 
26 26
 $this_section = SECTION_COURSES;
27 27
 api_protect_course_script();
Please login to merge, or discard this patch.
main/link/link_goto.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@
 block discarded – undo
25 25
 // Launch event
26 26
 Event::event_link($linkId);
27 27
 
28
-header("Cache-Control: no-store, no-cache, must-revalidate");   // HTTP/1.1
28
+header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
29 29
 header("Cache-Control: post-check=0, pre-check=0", false);
30
-header("Pragma: no-cache");                                     // HTTP/1.0
30
+header("Pragma: no-cache"); // HTTP/1.0
31 31
 header("Location: $linkUrl");
32 32
 exit;
Please login to merge, or discard this patch.
main/course_description/listing.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -18,27 +18,27 @@  discard block
 block discarded – undo
18 18
     }
19 19
     $categories[ADD_BLOCK] = get_lang('NewBloc');
20 20
 
21
-	$i=1;
22
-	echo '<div class="actions" style="margin-bottom:30px">';
23
-	ksort($categories);
24
-	foreach ($categories as $id => $title) {
25
-		if ($i==ADD_BLOCK) {
26
-			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
21
+    $i=1;
22
+    echo '<div class="actions" style="margin-bottom:30px">';
23
+    ksort($categories);
24
+    foreach ($categories as $id => $title) {
25
+        if ($i==ADD_BLOCK) {
26
+            echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
27 27
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
28
-			break;
29
-		} else {
30
-			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
28
+            break;
29
+        } else {
30
+            echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
31 31
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
32
-			$i++;
33
-		}
34
-	}
35
-	echo '</div>';
32
+            $i++;
33
+        }
34
+    }
35
+    echo '</div>';
36 36
 }
37 37
 $history = isset($history) ? $history : null;
38 38
 
39 39
 // display course description list
40 40
 if ($history) {
41
-	echo '<div>
41
+    echo '<div>
42 42
         <table width="100%">
43 43
             <tr>
44 44
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 $user_info = api_get_user_info();
50 50
 
51 51
 if (isset($descriptions) && count($descriptions) > 0) {
52
-	foreach ($descriptions as $id => $description) {
52
+    foreach ($descriptions as $id => $description) {
53 53
         if (!empty($description)) {
54 54
             $actions = '';
55 55
             if (api_is_allowed_to_edit(null,true) && !$history) {
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -11,24 +11,24 @@  discard block
 block discarded – undo
11 11
 api_protect_course_script(true);
12 12
 
13 13
 // display actions menu
14
-if (api_is_allowed_to_edit(null,true)) {
14
+if (api_is_allowed_to_edit(null, true)) {
15 15
     $categories = array();
16 16
     foreach ($default_description_titles as $id => $title) {
17 17
         $categories[$id] = $title;
18 18
     }
19 19
     $categories[ADD_BLOCK] = get_lang('NewBloc');
20 20
 
21
-	$i=1;
21
+	$i = 1;
22 22
 	echo '<div class="actions" style="margin-bottom:30px">';
23 23
 	ksort($categories);
24 24
 	foreach ($categories as $id => $title) {
25
-		if ($i==ADD_BLOCK) {
25
+		if ($i == ADD_BLOCK) {
26 26
 			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
27
-                Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
27
+                Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
28 28
 			break;
29 29
 		} else {
30 30
 			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
31
-                Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
31
+                Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
32 32
 			$i++;
33 33
 		}
34 34
 	}
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
             <tr>
44 44
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
45 45
                 <td align="right"><a href="index.php?action=listing">'.
46
-                Display::return_icon('info.png',get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'),ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
46
+                Display::return_icon('info.png', get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'), ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
47 47
 }
48 48
 
49 49
 $user_info = api_get_user_info();
@@ -52,21 +52,21 @@  discard block
 block discarded – undo
52 52
 	foreach ($descriptions as $id => $description) {
53 53
         if (!empty($description)) {
54 54
             $actions = '';
55
-            if (api_is_allowed_to_edit(null,true) && !$history) {
55
+            if (api_is_allowed_to_edit(null, true) && !$history) {
56 56
                 if (api_get_session_id() == $description['session_id']) {
57 57
                     $description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
58 58
 
59 59
                     // delete
60
-                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&cidReq='.api_get_course_id().'&id_session='.$description['session_id'].'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding())).'\')) return false;">';
61
-                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
60
+                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&cidReq='.api_get_course_id().'&id_session='.$description['session_id'].'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding())).'\')) return false;">';
61
+                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
62 62
                     $actions .= '</a> ';
63 63
 
64 64
                     // edit
65 65
                     $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&cidReq='.api_get_course_id().'&id_session='.$description['session_id'].'&action=edit&description_type='.$description['description_type'].'">';
66
-                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL);
66
+                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'), ICON_SIZE_SMALL);
67 67
                     $actions .= '</a> ';
68 68
                 } else {
69
-                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
69
+                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
70 70
                 }
71 71
             }
72 72
             echo Display::panel(
Please login to merge, or discard this patch.
main/course_description/edit.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -10,67 +10,67 @@  discard block
 block discarded – undo
10 10
 // protect a course script
11 11
 api_protect_course_script(true);
12 12
 if (empty($id)) {
13
-	$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
14
-	if (empty($id)) {
15
-		// If the ID was not provided, find the first matching description item given the item type
16
-		$course_description = new CourseDescription();
17
-		$description = $course_description->get_data_by_description_type($description_type);
18
-		if (count($description) > 0) {
19
-			$id = $description['id'];
20
-		}
21
-		// If no corresponding description is found, edit a new one
22
-		unset($course_description);
23
-	}
13
+    $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
14
+    if (empty($id)) {
15
+        // If the ID was not provided, find the first matching description item given the item type
16
+        $course_description = new CourseDescription();
17
+        $description = $course_description->get_data_by_description_type($description_type);
18
+        if (count($description) > 0) {
19
+            $id = $description['id'];
20
+        }
21
+        // If no corresponding description is found, edit a new one
22
+        unset($course_description);
23
+    }
24 24
 }
25 25
 $original_id = $id;
26 26
 
27 27
 if (empty($error)) {
28
-	$token = Security::get_token();
28
+    $token = Security::get_token();
29 29
 }
30 30
 // display categories
31 31
 $categories = array();
32 32
 foreach ($default_description_titles as $id => $title) {
33
-	$categories[$id] = $title;
33
+    $categories[$id] = $title;
34 34
 }
35 35
 $categories[ADD_BLOCK] = get_lang('NewBloc');
36 36
 
37 37
 $i=1;
38 38
 echo '<div class="actions" style="margin-bottom:30px">';
39 39
 echo '<a href="index.php?'.api_get_cidreq().'">'.
40
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
41
-	'</a>';
40
+        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
41
+    '</a>';
42 42
 
43 43
 ksort($categories);
44 44
 foreach ($categories as $id => $title) {
45
-	if ($i==ADD_BLOCK) {
46
-		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
48
-		break;
49
-	} else {
50
-		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
52
-		$i++;
53
-	}
45
+    if ($i==ADD_BLOCK) {
46
+        echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
48
+        break;
49
+    } else {
50
+        echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
52
+        $i++;
53
+    }
54 54
 }
55 55
 echo '</div>';
56 56
 
57 57
 // error messages
58 58
 if (isset($error) && intval($error) == 1) {
59
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
59
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
60 60
 }
61 61
 
62 62
 // default header title form
63 63
 $description_type = intval($description_type);
64 64
 $header = $default_description_titles[$description_type];
65 65
 if ($description_type >= ADD_BLOCK) {
66
-	$header = $default_description_titles[ADD_BLOCK];
66
+    $header = $default_description_titles[ADD_BLOCK];
67 67
 }
68 68
 
69 69
 // display form
70 70
 $form = new FormValidator(
71
-	'course_description',
72
-	'POST',
73
-	'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
71
+    'course_description',
72
+    'POST',
73
+    'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
74 74
 );
75 75
 
76 76
 $form->addElement('header','',$header);
@@ -80,15 +80,15 @@  discard block
 block discarded – undo
80 80
 $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
81 81
 $form->applyFilter('title','html_filter');
82 82
 $form->addHtmlEditor(
83
-	'contentDescription',
84
-	get_lang('Content'),
85
-	true,
86
-	false,
87
-	array(
88
-		'ToolbarSet' => 'TrainingDescription',
89
-		'Width' => '100%',
90
-		'Height' => '200',
91
-	)
83
+    'contentDescription',
84
+    get_lang('Content'),
85
+    true,
86
+    false,
87
+    array(
88
+        'ToolbarSet' => 'TrainingDescription',
89
+        'Width' => '100%',
90
+        'Height' => '200',
91
+    )
92 92
 );
93 93
 $form->addButtonCreate(get_lang('Save'));
94 94
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 $form->setDefaults($default);
105 105
 
106 106
 if (isset ($question[$description_type])) {
107
-	$message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
108
-	$message .= $question[$description_type];
109
-	Display::display_normal_message($message, false);
107
+    $message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
108
+    $message .= $question[$description_type];
109
+    Display::display_normal_message($message, false);
110 110
 }
111 111
 $form->display();
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,21 +34,21 @@  discard block
 block discarded – undo
34 34
 }
35 35
 $categories[ADD_BLOCK] = get_lang('NewBloc');
36 36
 
37
-$i=1;
37
+$i = 1;
38 38
 echo '<div class="actions" style="margin-bottom:30px">';
39 39
 echo '<a href="index.php?'.api_get_cidreq().'">'.
40
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
40
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ToolCourseDescription'), '', ICON_SIZE_MEDIUM).
41 41
 	'</a>';
42 42
 
43 43
 ksort($categories);
44 44
 foreach ($categories as $id => $title) {
45
-	if ($i==ADD_BLOCK) {
45
+	if ($i == ADD_BLOCK) {
46 46
 		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
47
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
48 48
 		break;
49 49
 	} else {
50 50
 		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
51
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
52 52
 		$i++;
53 53
 	}
54 54
 }
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 // error messages
58 58
 if (isset($error) && intval($error) == 1) {
59
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
59
+	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
60 60
 }
61 61
 
62 62
 // default header title form
@@ -73,12 +73,12 @@  discard block
 block discarded – undo
73 73
 	'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
74 74
 );
75 75
 
76
-$form->addElement('header','',$header);
76
+$form->addElement('header', '', $header);
77 77
 $form->addElement('hidden', 'id', $original_id);
78
-$form->addElement('hidden', 'description_type',$description_type);
79
-$form->addElement('hidden', 'sec_token',$token);
78
+$form->addElement('hidden', 'description_type', $description_type);
79
+$form->addElement('hidden', 'sec_token', $token);
80 80
 $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
81
-$form->applyFilter('title','html_filter');
81
+$form->applyFilter('title', 'html_filter');
82 82
 $form->addHtmlEditor(
83 83
 	'contentDescription',
84 84
 	get_lang('Content'),
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
     $default['title'] = Security::remove_XSS($description_title);
98 98
 }
99 99
 if (!empty($description_content)) {
100
-    $default['contentDescription'] = Security::remove_XSS($description_content,COURSEMANAGERLOWSECURITY);
100
+    $default['contentDescription'] = Security::remove_XSS($description_content, COURSEMANAGERLOWSECURITY);
101 101
 }
102 102
 $default['description_type'] = $description_type;
103 103
 
Please login to merge, or discard this patch.
main/course_description/course_description_controller.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
                 if (isset($_GET['id_session'])) {
157 157
                     $session_id = intval($_GET['id_session']);
158 158
                 }
159
-		        $course_description_data = $course_description->get_data_by_id(
159
+                $course_description_data = $course_description->get_data_by_id(
160 160
                     $id,
161 161
                     null,
162 162
                     $session_id
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                 $data['description_title'] = $course_description_data['description_title'];
166 166
                 $data['description_content'] = $course_description_data['description_content'];
167 167
                 $data['progress'] = $course_description_data['progress'];
168
-		        $data['descriptions'] = $course_description->get_data_by_description_type(
168
+                $data['descriptions'] = $course_description->get_data_by_description_type(
169 169
                     $description_type,
170 170
                     null,
171 171
                     $session_id
Please login to merge, or discard this patch.
main/user/resume_session.php 3 patches
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
     $session_category = '';
61 61
 
62 62
     if (Database::num_rows($rs)>0) {
63
-    	$rows_session_category = Database::store_result($rs);
64
-    	$rows_session_category = $rows_session_category[0];
65
-    	$session_category = $rows_session_category['name'];
63
+        $rows_session_category = Database::store_result($rs);
64
+        $rows_session_category = $rows_session_category[0];
65
+        $session_category = $rows_session_category['name'];
66 66
     }
67 67
 
68 68
     $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -147,22 +147,22 @@  discard block
 block discarded – undo
147 147
     	<td><?php echo get_lang('Date'); ?> :</td>
148 148
     	<td>
149 149
     	<?php
150
-    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
151
-    		    echo get_lang('NoTimeLimits');
150
+            if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
151
+                echo get_lang('NoTimeLimits');
152 152
             }
153
-    		else {
153
+            else {
154 154
                 if ($session['access_start_date'] != '00-00-0000') {
155
-                	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
155
+                    //$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
156 156
                     $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
157 157
                 } else {
158
-                	$session['access_start_date'] = '';
158
+                    $session['access_start_date'] = '';
159 159
                 }
160 160
                 if ($session['access_end_date'] == '00-00-0000') {
161 161
                     $session['access_end_date'] ='';
162 162
                 } else {
163
-                	$session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
163
+                    $session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
164 164
                 }
165
-    			echo $session['access_start_date'].' '.$session['access_end_date'];
165
+                echo $session['access_start_date'].' '.$session['access_end_date'];
166 166
             }
167 167
             ?>
168 168
     	</td>
@@ -221,22 +221,22 @@  discard block
 block discarded – undo
221 221
     </tr>
222 222
     <?php
223 223
     if ($session['nbr_courses'] == 0) {
224
-    	echo '<tr>
224
+        echo '<tr>
225 225
             <td colspan="4">'.get_lang('NoCoursesForThisSession').'</td>
226 226
     		</tr>';
227 227
     } else {
228
-    	// select the courses
229
-    	$sql = "SELECT c.id, code,title,visual_code, nbr_users
228
+        // select the courses
229
+        $sql = "SELECT c.id, code,title,visual_code, nbr_users
230 230
     			FROM $tbl_course c,$tbl_session_rel_course sc
231 231
     			WHERE c.id = sc.c_id
232 232
     			AND	session_id='$id_session'
233 233
     			ORDER BY title";
234
-    	$result=Database::query($sql);
235
-    	$courses=Database::store_result($result);
236
-    	foreach ($courses as $course) {
237
-    		//select the number of users
234
+        $result=Database::query($sql);
235
+        $courses=Database::store_result($result);
236
+        foreach ($courses as $course) {
237
+            //select the number of users
238 238
 
239
-    		$sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
239
+            $sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
240 240
                     WHERE
241 241
                         srcru.user_id = sru.user_id AND
242 242
                         srcru.session_id = sru.session_id AND
@@ -244,49 +244,49 @@  discard block
 block discarded – undo
244 244
                         sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
245 245
                         srcru.session_id = '".intval($id_session)."'";
246 246
 
247
-    		$rs = Database::query($sql);
248
-    		$course['nbr_users'] = Database::result($rs,0,0);
247
+            $rs = Database::query($sql);
248
+            $course['nbr_users'] = Database::result($rs,0,0);
249 249
 
250
-    		// Get coachs of the courses in session
250
+            // Get coachs of the courses in session
251 251
 
252
-    		$sql = "SELECT user.lastname,user.firstname,user.username
252
+            $sql = "SELECT user.lastname,user.firstname,user.username
253 253
     		        FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
254 254
     				WHERE
255 255
     				    session_rcru.user_id = user.user_id AND
256 256
     				    session_rcru.session_id = '".intval($id_session)."' AND
257 257
     				    session_rcru.c_id ='".Database::escape_string($course['id'])."' AND
258 258
     				    session_rcru.status=2";
259
-    		$rs = Database::query($sql);
259
+            $rs = Database::query($sql);
260 260
 
261
-    		$coachs = array();
262
-    		if (Database::num_rows($rs) > 0) {
263
-    			while ($info_coach = Database::fetch_array($rs)) {
261
+            $coachs = array();
262
+            if (Database::num_rows($rs) > 0) {
263
+                while ($info_coach = Database::fetch_array($rs)) {
264 264
                     $coachs[] = api_get_person_name(
265 265
                             $info_coach['firstname'],
266 266
                             $info_coach['lastname']
267 267
                         ).' ('.$info_coach['username'].')';
268
-    			}
269
-    		} else {
270
-    			$coach = get_lang('None');
271
-    		}
272
-
273
-    		if (count($coachs) > 0) {
274
-    			$coach = implode('<br />',$coachs);
275
-    		} else {
276
-    			$coach = get_lang('None');
277
-    		}
278
-
279
-    		$orig_param = '&origin=resume_session';
280
-    		//hide_course_breadcrumb the parameter has been added to hide the
268
+                }
269
+            } else {
270
+                $coach = get_lang('None');
271
+            }
272
+
273
+            if (count($coachs) > 0) {
274
+                $coach = implode('<br />',$coachs);
275
+            } else {
276
+                $coach = get_lang('None');
277
+            }
278
+
279
+            $orig_param = '&origin=resume_session';
280
+            //hide_course_breadcrumb the parameter has been added to hide the
281 281
             // name of the course, that appeared in the default $interbreadcrumb
282
-    		echo '
282
+            echo '
283 283
     		<tr>
284 284
     			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),'</td>
285 285
     			<td>'.$coach.'</td>
286 286
     			<td>'.$course['nbr_users'].'</td>
287 287
 
288 288
     		</tr>';
289
-    	}
289
+        }
290 290
     }
291 291
     ?>
292 292
     </table>
@@ -307,11 +307,11 @@  discard block
 block discarded – undo
307 307
     <?php
308 308
 
309 309
     if ($session['nbr_users']==0) {
310
-    	echo '<tr>
310
+        echo '<tr>
311 311
     			<td colspan="2">'.get_lang('NoUsersForThisSession').'</td>
312 312
     		</tr>';
313 313
     } else {
314
-    	$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
314
+        $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
315 315
 
316 316
         if ($multiple_url_is_on) {
317 317
             $sql = "SELECT u.user_id, lastname, firstname, username, access_url_id
@@ -329,11 +329,11 @@  discard block
 block discarded – undo
329 329
                     AND su.session_id = ".$id_session.$order_clause;
330 330
         }
331 331
 
332
-    	$result = Database::query($sql);
333
-    	$users  = Database::store_result($result);
332
+        $result = Database::query($sql);
333
+        $users  = Database::store_result($result);
334 334
         // change breadcrumb in destination page
335
-    	$orig_param = '&origin=resume_session&id_session='.$id_session;
336
-    	foreach ($users as $user) {
335
+        $orig_param = '&origin=resume_session&id_session='.$id_session;
336
+        foreach ($users as $user) {
337 337
             $user_link = '';
338 338
             if (!empty($user['user_id'])) {
339 339
                 $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
                 }
351 351
             }
352 352
 
353
-    		echo '<tr>
353
+            echo '<tr>
354 354
                     <td width="90%">
355 355
                         '.$user_link.'
356 356
                     </td>
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
                         '.$link_to_add_user_in_url.'
362 362
                     </td>
363 363
                     </tr>';
364
-    	}
364
+        }
365 365
     }
366 366
     ?>
367 367
     </table>
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 // setting the section (for the tabs)
13 13
 $this_section = SECTION_PLATFORM_ADMIN;
14
-$id_session = (int)$_GET['id_session'];
14
+$id_session = (int) $_GET['id_session'];
15 15
 SessionManager::protect_teacher_session_edit($id_session);
16 16
 
17 17
 $tool_name = get_lang('SessionOverview');
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     $rs = Database::query($sql);
60 60
     $session_category = '';
61 61
 
62
-    if (Database::num_rows($rs)>0) {
62
+    if (Database::num_rows($rs) > 0) {
63 63
     	$rows_session_category = Database::store_result($rs);
64 64
     	$rows_session_category = $rows_session_category[0];
65 65
     	$session_category = $rows_session_category['name'];
@@ -83,25 +83,25 @@  discard block
 block discarded – undo
83 83
             break;
84 84
         case 'delete':
85 85
             $idChecked = $_GET['idChecked'];
86
-            if(is_array($idChecked)) {
86
+            if (is_array($idChecked)) {
87 87
                 $my_temp = array();
88
-                foreach ($idChecked as $id){
88
+                foreach ($idChecked as $id) {
89 89
                     $courseInfo = api_get_course_info($id);
90
-                    $my_temp[]= $courseInfo['real_id'];// forcing the escape_string
90
+                    $my_temp[] = $courseInfo['real_id']; // forcing the escape_string
91 91
                 }
92 92
                 $idChecked = $my_temp;
93 93
                 $idChecked = "'".implode("','", $idChecked)."'";
94 94
 
95 95
                 $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
96
-                $nbr_affected_rows=Database::affected_rows($result);
96
+                $nbr_affected_rows = Database::affected_rows($result);
97 97
 
98 98
                 Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
99 99
                 Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
100 100
             }
101 101
 
102
-            if (!empty($_GET['class'])){
102
+            if (!empty($_GET['class'])) {
103 103
                 $result = Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$id_session' AND class_id=".intval($_GET['class']));
104
-                $nbr_affected_rows=Database::affected_rows($result);
104
+                $nbr_affected_rows = Database::affected_rows($result);
105 105
                 Database::query("UPDATE $tbl_session SET nbr_classes=nbr_classes-$nbr_affected_rows WHERE id='$id_session'");
106 106
             }
107 107
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
                 Database::query("UPDATE $tbl_session SET nbr_users=nbr_users-$nbr_affected_rows WHERE id='$id_session'");
112 112
 
113 113
                 $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id ='$id_session' AND user_id=".intval($_GET['user']));
114
-                $nbr_affected_rows=Database::affected_rows($result);
114
+                $nbr_affected_rows = Database::affected_rows($result);
115 115
 
116 116
                 Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE session_id ='$id_session'");
117 117
             }
@@ -137,28 +137,28 @@  discard block
 block discarded – undo
137 137
     	<td><?php echo get_lang('GeneralCoach'); ?> :</td>
138 138
     	<td><?php echo api_get_person_name($session['firstname'], $session['lastname']).' ('.$session['username'].')' ?></td>
139 139
     </tr>
140
-    <?php if(!empty($session_category)) { ?>
140
+    <?php if (!empty($session_category)) { ?>
141 141
     <tr>
142 142
     	<td><?php echo get_lang('SessionCategory') ?></td>
143
-    	<td><?php echo $session_category;  ?></td>
143
+    	<td><?php echo $session_category; ?></td>
144 144
     </tr>
145 145
     <?php } ?>
146 146
     <tr>
147 147
     	<td><?php echo get_lang('Date'); ?> :</td>
148 148
     	<td>
149 149
     	<?php
150
-    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
150
+    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date'] == '00-00-0000') {
151 151
     		    echo get_lang('NoTimeLimits');
152 152
             }
153 153
     		else {
154 154
                 if ($session['access_start_date'] != '00-00-0000') {
155 155
                 	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
156
-                    $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
156
+                    $session['access_start_date'] = get_lang('From').' '.$session['access_start_date'];
157 157
                 } else {
158 158
                 	$session['access_start_date'] = '';
159 159
                 }
160 160
                 if ($session['access_end_date'] == '00-00-0000') {
161
-                    $session['access_end_date'] ='';
161
+                    $session['access_end_date'] = '';
162 162
                 } else {
163 163
                 	$session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
164 164
                 }
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
     		<?php echo api_ucfirst(get_lang('SessionVisibility')) ?> :
190 190
     	</td>
191 191
     	<td>
192
-    		<?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'))  ?>
192
+    		<?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'))  ?>
193 193
     	</td>
194 194
     </tr>
195 195
     <?php
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
         echo '</td>';
202 202
         echo '<td>';
203 203
         $url_list = UrlManager::get_access_url_from_session($id_session);
204
-        foreach($url_list as $url_data) {
204
+        foreach ($url_list as $url_data) {
205 205
             echo $url_data['url'].'<br />';
206 206
         }
207 207
         echo '</td></tr>';
@@ -231,8 +231,8 @@  discard block
 block discarded – undo
231 231
     			WHERE c.id = sc.c_id
232 232
     			AND	session_id='$id_session'
233 233
     			ORDER BY title";
234
-    	$result=Database::query($sql);
235
-    	$courses=Database::store_result($result);
234
+    	$result = Database::query($sql);
235
+    	$courses = Database::store_result($result);
236 236
     	foreach ($courses as $course) {
237 237
     		//select the number of users
238 238
 
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
                         srcru.session_id = '".intval($id_session)."'";
246 246
 
247 247
     		$rs = Database::query($sql);
248
-    		$course['nbr_users'] = Database::result($rs,0,0);
248
+    		$course['nbr_users'] = Database::result($rs, 0, 0);
249 249
 
250 250
     		// Get coachs of the courses in session
251 251
 
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
     		}
272 272
 
273 273
     		if (count($coachs) > 0) {
274
-    			$coach = implode('<br />',$coachs);
274
+    			$coach = implode('<br />', $coachs);
275 275
     		} else {
276 276
     			$coach = get_lang('None');
277 277
     		}
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
             // name of the course, that appeared in the default $interbreadcrumb
282 282
     		echo '
283 283
     		<tr>
284
-    			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),'</td>
284
+    			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session), '</td>
285 285
     			<td>'.$coach.'</td>
286 286
     			<td>'.$course['nbr_users'].'</td>
287 287
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
         </tr>
307 307
     <?php
308 308
 
309
-    if ($session['nbr_users']==0) {
309
+    if ($session['nbr_users'] == 0) {
310 310
     	echo '<tr>
311 311
     			<td colspan="2">'.get_lang('NoUsersForThisSession').'</td>
312 312
     		</tr>';
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
             $user_link = '';
338 338
             if (!empty($user['user_id'])) {
339 339
                 $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
340
-                    api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']),ENT_QUOTES,$charset).' ('.$user['username'].')</a>';
340
+                    api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']), ENT_QUOTES, $charset).' ('.$user['username'].')</a>';
341 341
             }
342 342
 
343 343
             $link_to_add_user_in_url = '';
Please login to merge, or discard this patch.
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -149,8 +149,7 @@  discard block
 block discarded – undo
149 149
     	<?php
150 150
     		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
151 151
     		    echo get_lang('NoTimeLimits');
152
-            }
153
-    		else {
152
+            } else {
154 153
                 if ($session['access_start_date'] != '00-00-0000') {
155 154
                 	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
156 155
                     $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
@@ -189,12 +188,18 @@  discard block
 block discarded – undo
189 188
     		<?php echo api_ucfirst(get_lang('SessionVisibility')) ?> :
190 189
     	</td>
191 190
     	<td>
192
-    		<?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'))  ?>
191
+    		<?php if ($session['visibility']==1) {
192
+    echo get_lang('ReadOnly');
193
+} elseif($session['visibility']==2) {
194
+    echo get_lang('Visible');
195
+} elseif($session['visibility']==3) {
196
+    echo api_ucfirst(get_lang('Invisible'))  ?>
193 197
     	</td>
194 198
     </tr>
195 199
     <?php
196 200
 
197 201
     $multiple_url_is_on = api_get_multiple_access_url();
202
+}
198 203
     if ($multiple_url_is_on) {
199 204
         echo '<tr><td>';
200 205
         echo 'URL';
Please login to merge, or discard this patch.
main/user/add_users_to_session.php 3 patches
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -48,29 +48,29 @@  discard block
 block discarded – undo
48 48
     $extra_field_list= UserManager::get_extra_fields();
49 49
     $new_field_list = array();
50 50
     if (is_array($extra_field_list)) {
51
-    	foreach ($extra_field_list as $extra_field) {
52
-    		//if is enabled to filter and is a "<select>" field type
53
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
51
+        foreach ($extra_field_list as $extra_field) {
52
+            //if is enabled to filter and is a "<select>" field type
53
+            if ($extra_field[8]==1 && $extra_field[2]==4 ) {
54 54
                 $new_field_list[] = array(
55 55
                     'name' => $extra_field[3],
56 56
                     'variable' => $extra_field[1],
57 57
                     'data' => $extra_field[9],
58 58
                 );
59
-    		}
60
-    	}
59
+            }
60
+        }
61 61
     }
62 62
 
63 63
     function search_users($needle, $type)
64 64
     {
65
-    	global $id_session;
65
+        global $id_session;
66 66
 
67 67
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
68 68
         $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
69 69
 
70
-    	$xajax_response = new xajaxResponse();
71
-    	$return = '';
70
+        $xajax_response = new xajaxResponse();
71
+        $return = '';
72 72
 
73
-    	if (!empty($needle) && !empty($type)) {
73
+        if (!empty($needle) && !empty($type)) {
74 74
 
75 75
             //normal behaviour
76 76
             if ($type == 'any_session' && $needle == 'false')  {
@@ -78,32 +78,32 @@  discard block
 block discarded – undo
78 78
                 $needle = '';
79 79
             }
80 80
 
81
-    		// xajax send utf8 datas... datas in db can be non-utf8 datas
82
-    		$charset = api_get_system_encoding();
83
-    		$needle = Database::escape_string($needle);
84
-    		$needle = api_convert_encoding($needle, $charset, 'utf-8');
81
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
82
+            $charset = api_get_system_encoding();
83
+            $needle = Database::escape_string($needle);
84
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
85 85
 
86
-    		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
87
-    		$cond_user_id = '';
86
+            $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
87
+            $cond_user_id = '';
88 88
 
89 89
             //Only for single & multiple
90 90
             if (in_array($type, array('single','multiple'))) {
91
-        		if (!empty($id_session)) {
92
-        		    $id_session = intval($id_session);
93
-        			// check id_user from session_rel_user table
94
-        			$sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
91
+                if (!empty($id_session)) {
92
+                    $id_session = intval($id_session);
93
+                    // check id_user from session_rel_user table
94
+                    $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
95 95
         			        WHERE session_id ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
96
-        			$res = Database::query($sql);
97
-        			$user_ids = array();
98
-        			if (Database::num_rows($res) > 0) {
99
-        				while ($row = Database::fetch_row($res)) {
100
-        					$user_ids[] = (int)$row[0];
101
-        				}
102
-        			}
103
-        			if (count($user_ids) > 0) {
104
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
105
-        			}
106
-        		}
96
+                    $res = Database::query($sql);
97
+                    $user_ids = array();
98
+                    if (Database::num_rows($res) > 0) {
99
+                        while ($row = Database::fetch_row($res)) {
100
+                            $user_ids[] = (int)$row[0];
101
+                        }
102
+                    }
103
+                    if (count($user_ids) > 0) {
104
+                        $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
105
+                    }
106
+                }
107 107
             }
108 108
 
109 109
             switch ($type) {
@@ -135,11 +135,11 @@  discard block
 block discarded – undo
135 135
                                 user.status <> 6 '.$cond_user_id.
136 136
                             $order_clause;
137 137
                     break;
138
-    		}
139
-    		if (api_is_multiple_url_enabled()) {
140
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
141
-    			$access_url_id = api_get_current_access_url_id();
142
-    			if ($access_url_id != -1) {
138
+            }
139
+            if (api_is_multiple_url_enabled()) {
140
+                $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
141
+                $access_url_id = api_get_current_access_url_id();
142
+                if ($access_url_id != -1) {
143 143
                     switch ($type) {
144 144
                         case 'single':
145 145
                             $sql = 'SELECT user.user_id, username, lastname, firstname
@@ -177,36 +177,36 @@  discard block
 block discarded – undo
177 177
                                         user.status<>6 '.$cond_user_id.
178 178
                             $order_clause;
179 179
                             break;
180
-    				}
181
-    			}
182
-    		}
180
+                    }
181
+                }
182
+            }
183 183
 
184
-    		$rs = Database::query($sql);
184
+            $rs = Database::query($sql);
185 185
             $i=0;
186
-    		if ($type == 'single') {
187
-    			while ($user = Database :: fetch_array($rs)) {
188
-    	            $i++;
189
-    	            if ($i<=10) {
190
-                		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
191
-    					$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 />';
192
-    	            } else {
193
-    	            	$return .= '...<br />';
194
-    	            }
195
-    			}
196
-
197
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
198
-    		} else {
199
-    			global $nosessionUsersList;
200
-    			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
201
-    			while ($user = Database :: fetch_array($rs)) {
202
-    				$person_name = api_get_person_name($user['firstname'], $user['lastname']);
203
-    	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
204
-    			}
205
-    			$return .= '</select>';
206
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
207
-    		}
208
-    	}
209
-    	return $xajax_response;
186
+            if ($type == 'single') {
187
+                while ($user = Database :: fetch_array($rs)) {
188
+                    $i++;
189
+                    if ($i<=10) {
190
+                        $person_name = api_get_person_name($user['firstname'], $user['lastname']);
191
+                        $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 />';
192
+                    } else {
193
+                        $return .= '...<br />';
194
+                    }
195
+                }
196
+
197
+                $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
198
+            } else {
199
+                global $nosessionUsersList;
200
+                $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
201
+                while ($user = Database :: fetch_array($rs)) {
202
+                    $person_name = api_get_person_name($user['firstname'], $user['lastname']);
203
+                    $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
204
+                }
205
+                $return .= '</select>';
206
+                $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
207
+            }
208
+        }
209
+        return $xajax_response;
210 210
     }
211 211
 
212 212
     $xajax -> processRequests();
@@ -342,8 +342,8 @@  discard block
 block discarded – undo
342 342
 
343 343
         if ($use_extra_fields) {
344 344
             $final_result = array();
345
-           	if (count($extra_field_result)>1) {
346
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
345
+                if (count($extra_field_result)>1) {
346
+            for($i=0;$i<count($extra_field_result)-1;$i++) {
347 347
                     if (is_array($extra_field_result[$i+1])) {
348 348
                         $final_result = array_intersect(
349 349
                             $extra_field_result[$i],
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
                     'un' => $user['username']
422 422
                 );
423 423
                 unset($users[$uid]);
424
-    	}
424
+        }
425 425
         }
426 426
         unset($users); //clean to free memory
427 427
 
@@ -466,13 +466,13 @@  discard block
 block discarded – undo
466 466
     }
467 467
 
468 468
     if ($add_type == 'multiple') {
469
-    	$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>';
470
-    	$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
469
+        $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>';
470
+        $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
471 471
     } else {
472
-    	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
473
-    	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.Security::remove_XSS($_GET['add']).'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
472
+        $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
473
+        $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.Security::remove_XSS($_GET['add']).'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
474 474
     }
475
-    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
475
+        $link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
476 476
     ?>
477 477
     <div class="actions">
478 478
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
@@ -481,30 +481,30 @@  discard block
 block discarded – undo
481 481
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
482 482
     <?php
483 483
     if ($add_type == 'multiple') {
484
-    	if (is_array($extra_field_list)) {
485
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
486
-    			echo '<h3>'.get_lang('FilterUsers').'</h3>';
487
-    			foreach ($new_field_list as $new_field) {
488
-    				echo $new_field['name'];
489
-    				$varname = 'field_'.$new_field['variable'];
490
-    				echo '&nbsp;<select name="'.$varname.'">';
491
-    				echo '<option value="0">--'.get_lang('Select').'--</option>';
492
-    				foreach	($new_field['data'] as $option) {
493
-    					$checked='';
494
-    					if (isset($_POST[$varname])) {
495
-    						if ($_POST[$varname] == $option[1]) {
496
-    							$checked = 'selected="true"';
497
-    						}
498
-    					}
499
-    					echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
500
-    				}
501
-    				echo '</select>';
502
-    				echo '&nbsp;&nbsp;';
503
-    			}
504
-    			echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
505
-    			echo '<br /><br />';
506
-    		}
507
-    	}
484
+        if (is_array($extra_field_list)) {
485
+            if (is_array($new_field_list) && count($new_field_list)>0 ) {
486
+                echo '<h3>'.get_lang('FilterUsers').'</h3>';
487
+                foreach ($new_field_list as $new_field) {
488
+                    echo $new_field['name'];
489
+                    $varname = 'field_'.$new_field['variable'];
490
+                    echo '&nbsp;<select name="'.$varname.'">';
491
+                    echo '<option value="0">--'.get_lang('Select').'--</option>';
492
+                    foreach	($new_field['data'] as $option) {
493
+                        $checked='';
494
+                        if (isset($_POST[$varname])) {
495
+                            if ($_POST[$varname] == $option[1]) {
496
+                                $checked = 'selected="true"';
497
+                            }
498
+                        }
499
+                        echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
500
+                    }
501
+                    echo '</select>';
502
+                    echo '&nbsp;&nbsp;';
503
+                }
504
+                echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
505
+                echo '<br /><br />';
506
+            }
507
+        }
508 508
     }
509 509
     ?>
510 510
 
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
 
514 514
     <?php
515 515
     if (!empty($errorMsg)) {
516
-    	Display::display_normal_message($errorMsg); //main API
516
+        Display::display_normal_message($errorMsg); //main API
517 517
     }
518 518
     ?>
519 519
     <div class="row">
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
                 <div id="content_source">
535 535
                 <?php
536 536
                 if (!($add_type == 'multiple')) {
537
-                  ?>
537
+                    ?>
538 538
                   <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
539 539
                   <div id="ajax_list_users_single"></div>
540 540
                   <?php
@@ -543,12 +543,12 @@  discard block
 block discarded – undo
543 543
                 <div id="ajax_list_users_multiple">
544 544
                 <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="span5">
545 545
                   <?php
546
-                  foreach ($nosessionUsersList as $uid => $enreg) {
547
-                  ?>
546
+                    foreach ($nosessionUsersList as $uid => $enreg) {
547
+                    ?>
548 548
                       <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>
549 549
                   <?php
550
-                  }
551
-                  ?>
550
+                    }
551
+                    ?>
552 552
                 </select>
553 553
                 </div>
554 554
                     <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
                 <?php
557 557
                 }
558 558
                 unset($nosessionUsersList);
559
-               ?>
559
+                ?>
560 560
             </div>
561 561
         </div>
562 562
 
@@ -583,13 +583,13 @@  discard block
 block discarded – undo
583 583
             <br />
584 584
             <br />
585 585
     		<?php
586
-    		if (isset($_GET['add'])) {
587
-    			echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
586
+            if (isset($_GET['add'])) {
587
+                echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
588 588
             } else {
589 589
                 //@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed)
590
-    			echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
590
+                echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
591 591
             }
592
-    		?>
592
+            ?>
593 593
         </div>
594 594
         <div class="span5">
595 595
             <div class="multiple_select_header">
Please login to merge, or discard this patch.
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 
23 23
 // setting breadcrumbs
24 24
 if (api_is_platform_admin()) {
25
-    $interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
26
-    $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
27
-    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
25
+    $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
26
+    $interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
27
+    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session, "name" => get_lang('SessionOverview'));
28 28
 }
29 29
 $allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
30
-if($allowTutors == 'true') {
30
+if ($allowTutors == 'true') {
31 31
     // Database Table Definitions
32 32
     $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
33 33
     $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
@@ -38,19 +38,19 @@  discard block
 block discarded – undo
38 38
     $tool_name = get_lang('SubscribeUsersToSession');
39 39
     $add_type = 'unique';
40 40
 
41
-    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
41
+    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
42 42
         $add_type = Security::remove_XSS($_REQUEST['add_type']);
43 43
     }
44 44
 
45 45
     $page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
46 46
 
47 47
     // Checking for extra field with filter on
48
-    $extra_field_list= UserManager::get_extra_fields();
48
+    $extra_field_list = UserManager::get_extra_fields();
49 49
     $new_field_list = array();
50 50
     if (is_array($extra_field_list)) {
51 51
     	foreach ($extra_field_list as $extra_field) {
52 52
     		//if is enabled to filter and is a "<select>" field type
53
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
53
+    		if ($extra_field[8] == 1 && $extra_field[2] == 4) {
54 54
                 $new_field_list[] = array(
55 55
                     'name' => $extra_field[3],
56 56
                     'variable' => $extra_field[1],
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
     	if (!empty($needle) && !empty($type)) {
74 74
 
75 75
             //normal behaviour
76
-            if ($type == 'any_session' && $needle == 'false')  {
76
+            if ($type == 'any_session' && $needle == 'false') {
77 77
                 $type = 'multiple';
78 78
                 $needle = '';
79 79
             }
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     		$cond_user_id = '';
88 88
 
89 89
             //Only for single & multiple
90
-            if (in_array($type, array('single','multiple'))) {
90
+            if (in_array($type, array('single', 'multiple'))) {
91 91
         		if (!empty($id_session)) {
92 92
         		    $id_session = intval($id_session);
93 93
         			// check id_user from session_rel_user table
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
         			$user_ids = array();
98 98
         			if (Database::num_rows($res) > 0) {
99 99
         				while ($row = Database::fetch_row($res)) {
100
-        					$user_ids[] = (int)$row[0];
100
+        					$user_ids[] = (int) $row[0];
101 101
         				}
102 102
         			}
103 103
         			if (count($user_ids) > 0) {
104
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
104
+        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",", $user_ids).')';
105 105
         			}
106 106
         		}
107 107
             }
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                     break;
138 138
     		}
139 139
     		if (api_is_multiple_url_enabled()) {
140
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
140
+    			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
141 141
     			$access_url_id = api_get_current_access_url_id();
142 142
     			if ($access_url_id != -1) {
143 143
                     switch ($type) {
@@ -182,11 +182,11 @@  discard block
 block discarded – undo
182 182
     		}
183 183
 
184 184
     		$rs = Database::query($sql);
185
-            $i=0;
185
+            $i = 0;
186 186
     		if ($type == 'single') {
187 187
     			while ($user = Database :: fetch_array($rs)) {
188 188
     	            $i++;
189
-    	            if ($i<=10) {
189
+    	            if ($i <= 10) {
190 190
                 		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
191 191
     					$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 />';
192 192
     	            } else {
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
     	            }
195 195
     			}
196 196
 
197
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
197
+    			$xajax_response -> addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
198 198
     		} else {
199 199
     			global $nosessionUsersList;
200 200
     			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
     	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
204 204
     			}
205 205
     			$return .= '</select>';
206
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
206
+    			$xajax_response -> addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
207 207
     		}
208 208
     	}
209 209
     	return $xajax_response;
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
     </script>';
261 261
 
262 262
     $form_sent = 0;
263
-    $errorMsg = $firstLetterUser = $firstLetterSession='';
263
+    $errorMsg = $firstLetterUser = $firstLetterSession = '';
264 264
     $UserList = $SessionList = array();
265 265
     $sessions = array();
266 266
     $noPHP_SELF = true;
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         $UserList = $_POST['sessionUsersList'];
273 273
 
274 274
         if (!is_array($UserList)) {
275
-            $UserList=array();
275
+            $UserList = array();
276 276
         }
277 277
 
278 278
         if ($form_sent == 1) {
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
                 WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
301 301
 
302 302
         if (api_is_multiple_url_enabled()) {
303
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
303
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
304 304
             $access_url_id = api_get_current_access_url_id();
305 305
             if ($access_url_id != -1) {
306 306
                 $sql = "SELECT u.user_id, lastname, firstname, username, session_id
@@ -316,19 +316,19 @@  discard block
 block discarded – undo
316 316
         $result = Database::query($sql);
317 317
         $users = Database::store_result($result);
318 318
         foreach ($users as $user) {
319
-            $sessionUsersList[$user['user_id']] = $user ;
319
+            $sessionUsersList[$user['user_id']] = $user;
320 320
         }
321 321
         unset($users); //clean to free memory
322 322
     } else {
323 323
         //Filter by Extra Fields
324 324
         $use_extra_fields = false;
325 325
         if (is_array($extra_field_list)) {
326
-            if (is_array($new_field_list) && count($new_field_list)>0 ) {
327
-                $result_list=array();
326
+            if (is_array($new_field_list) && count($new_field_list) > 0) {
327
+                $result_list = array();
328 328
                 foreach ($new_field_list as $new_field) {
329 329
                     $varname = 'field_'.$new_field['variable'];
330 330
                     if (UserManager::is_extra_field_available($new_field['variable'])) {
331
-                        if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
331
+                        if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
332 332
                             $use_extra_fields = true;
333 333
                             $extra_field_result[] = UserManager::get_extra_user_data_by_value(
334 334
                                 $new_field['variable'],
@@ -342,9 +342,9 @@  discard block
 block discarded – undo
342 342
 
343 343
         if ($use_extra_fields) {
344 344
             $final_result = array();
345
-           	if (count($extra_field_result)>1) {
346
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
347
-                    if (is_array($extra_field_result[$i+1])) {
345
+           	if (count($extra_field_result) > 1) {
346
+    	    for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
347
+                    if (is_array($extra_field_result[$i + 1])) {
348 348
                         $final_result = array_intersect(
349 349
                             $extra_field_result[$i],
350 350
                             $extra_field_result[$i + 1]
@@ -355,17 +355,17 @@  discard block
 block discarded – undo
355 355
                 $final_result = $extra_field_result[0];
356 356
             }
357 357
 
358
-            $where_filter ='';
358
+            $where_filter = '';
359 359
             if (api_is_multiple_url_enabled()) {
360
-                if (is_array($final_result) && count($final_result)>0) {
361
-                    $where_filter = " AND u.user_id IN  ('".implode("','",$final_result)."') ";
360
+                if (is_array($final_result) && count($final_result) > 0) {
361
+                    $where_filter = " AND u.user_id IN  ('".implode("','", $final_result)."') ";
362 362
                 } else {
363 363
                     //no results
364 364
                     $where_filter = " AND u.user_id  = -1";
365 365
                 }
366 366
             } else {
367
-                if (is_array($final_result) && count($final_result)>0) {
368
-                    $where_filter = " WHERE u.user_id IN  ('".implode("','",$final_result)."') ";
367
+                if (is_array($final_result) && count($final_result) > 0) {
368
+                    $where_filter = " WHERE u.user_id IN  ('".implode("','", $final_result)."') ";
369 369
                 } else {
370 370
                     //no results
371 371
                     $where_filter = " WHERE u.user_id  = -1";
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
                     $order_clause";
395 395
         }
396 396
         if (api_is_multiple_url_enabled()) {
397
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
397
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
398 398
             $access_url_id = api_get_current_access_url_id();
399 399
             if ($access_url_id != -1) {
400 400
                 $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
         }
412 412
 
413 413
         $result = Database::query($sql);
414
-        $users = Database::store_result($result,'ASSOC');
414
+        $users = Database::store_result($result, 'ASSOC');
415 415
 
416 416
         foreach ($users as $uid => $user) {
417 417
             if ($user['session_id'] != $id_session) {
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
         unset($users); //clean to free memory
427 427
 
428 428
         //filling the correct users in list
429
-        $sql="SELECT  user_id, lastname, firstname, username, session_id
429
+        $sql = "SELECT  user_id, lastname, firstname, username, session_id
430 430
               FROM $tbl_user u
431 431
               LEFT JOIN $tbl_session_rel_user
432 432
               ON
@@ -436,10 +436,10 @@  discard block
 block discarded – undo
436 436
               WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
437 437
 
438 438
         if (api_is_multiple_url_enabled()) {
439
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
439
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
440 440
             $access_url_id = api_get_current_access_url_id();
441 441
             if ($access_url_id != -1) {
442
-                $sql="SELECT  u.user_id, lastname, firstname, username, session_id
442
+                $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
443 443
                     FROM $tbl_user u
444 444
                     LEFT JOIN $tbl_session_rel_user
445 445
                     ON
@@ -452,11 +452,11 @@  discard block
 block discarded – undo
452 452
             }
453 453
         }
454 454
         $result = Database::query($sql);
455
-        $users = Database::store_result($result,'ASSOC');
455
+        $users = Database::store_result($result, 'ASSOC');
456 456
         foreach ($users as $uid => $user) {
457 457
             if ($user['session_id'] == $id_session) {
458 458
                 $sessionUsersList[$user['user_id']] = $user;
459
-                if (array_key_exists($user['user_id'],$nosessionUsersList)) {
459
+                if (array_key_exists($user['user_id'], $nosessionUsersList)) {
460 460
                     unset($nosessionUsersList[$user['user_id']]);
461 461
                 }
462 462
             }
@@ -472,25 +472,25 @@  discard block
 block discarded – undo
472 472
     	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
473 473
     	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.Security::remove_XSS($_GET['add']).'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
474 474
     }
475
-    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
475
+    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
476 476
     ?>
477 477
     <div class="actions">
478 478
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
479 479
     </div>
480
-    <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();"';}?>>
480
+    <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();"'; }?>>
481 481
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
482 482
     <?php
483 483
     if ($add_type == 'multiple') {
484 484
     	if (is_array($extra_field_list)) {
485
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
485
+    		if (is_array($new_field_list) && count($new_field_list) > 0) {
486 486
     			echo '<h3>'.get_lang('FilterUsers').'</h3>';
487 487
     			foreach ($new_field_list as $new_field) {
488 488
     				echo $new_field['name'];
489 489
     				$varname = 'field_'.$new_field['variable'];
490 490
     				echo '&nbsp;<select name="'.$varname.'">';
491 491
     				echo '<option value="0">--'.get_lang('Select').'--</option>';
492
-    				foreach	($new_field['data'] as $option) {
493
-    					$checked='';
492
+    				foreach ($new_field['data'] as $option) {
493
+    					$checked = '';
494 494
     					if (isset($_POST[$varname])) {
495 495
     						if ($_POST[$varname] == $option[1]) {
496 496
     							$checked = 'selected="true"';
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
                   <?php
546 546
                   foreach ($nosessionUsersList as $uid => $enreg) {
547 547
                   ?>
548
-                      <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>
548
+                      <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>
549 549
                   <?php
550 550
                   }
551 551
                   ?>
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
             </div>
598 598
             <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="span5">
599 599
             <?php
600
-            foreach($sessionUsersList as $enreg) {
600
+            foreach ($sessionUsersList as $enreg) {
601 601
             ?>
602 602
                 <option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
603 603
             <?php
Please login to merge, or discard this patch.
Braces   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -477,7 +477,10 @@  discard block
 block discarded – undo
477 477
     <div class="actions">
478 478
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
479 479
     </div>
480
-    <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();"';}?>>
480
+    <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'])) {
481
+    echo '&add=true' ;
482
+}
483
+?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
481 484
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
482 485
     <?php
483 486
     if ($add_type == 'multiple') {
@@ -545,7 +548,10 @@  discard block
 block discarded – undo
545 548
                   <?php
546 549
                   foreach ($nosessionUsersList as $uid => $enreg) {
547 550
                   ?>
548
-                      <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>
551
+                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) {
552
+    echo 'selected="selected"';
553
+}
554
+?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
549 555
                   <?php
550 556
                   }
551 557
                   ?>
Please login to merge, or discard this patch.
main/user/session_list.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,13 +65,13 @@  discard block
 block discarded – undo
65 65
         array('name'=>'access_end_date',       'index'=>'access_end_date',      'width'=>'40',   'align'=>'left', 'search' => 'true'),
66 66
         array('name'=>'coach_name',     'index'=>'coach_name',    'width'=>'80',   'align'=>'left', 'search' => 'false'),
67 67
         array('name'=>'status',         'index'=>'session_active','width'=>'40',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
68
-          //for the bottom bar
68
+            //for the bottom bar
69 69
             'searchoptions' => array(
70 70
                 'defaultValue' => '1',
71 71
                 'value' => '1:'.get_lang('Active').';0:'.get_lang('Inactive')
72 72
             ),
73
-          //for the top bar
74
-          'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
73
+            //for the top bar
74
+            'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
75 75
         array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
76 76
         array('name'=>'actions',        'index'=>'actions',         'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false')
77 77
     );
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     //With this function we can add actions to the jgrid (edit, delete, etc)
87 87
     $action_links = 'function action_formatter(cellvalue, options, rowObject) {
88 88
          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>'.
89
-         '\';
89
+            '\';
90 90
     }';
91 91
     ?>
92 92
     <script>
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -56,15 +56,15 @@  discard block
 block discarded – undo
56 56
     );
57 57
 
58 58
     //Column config
59
-    $column_model   = array(
60
-        array('name'=>'name',           'index'=>'name',          'width'=>'160',  'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
61
-        array('name'=>'nbr_courses',    'index'=>'nbr_courses',   'width'=>'30',   'align'=>'left', 'search' => 'true'),
62
-        array('name'=>'nbr_users',      'index'=>'nbr_users',     'width'=>'30',   'align'=>'left', 'search' => 'true'),
63
-        array('name'=>'category_name',  'index'=>'category_name', 'width'=>'70',   'align'=>'left', 'search' => 'true'),
64
-        array('name'=>'access_start_date',     'index'=>'access_start_date',    'width'=>'40',   'align'=>'left', 'search' => 'true'),
65
-        array('name'=>'access_end_date',       'index'=>'access_end_date',      'width'=>'40',   'align'=>'left', 'search' => 'true'),
66
-        array('name'=>'coach_name',     'index'=>'coach_name',    'width'=>'80',   'align'=>'left', 'search' => 'false'),
67
-        array('name'=>'status',         'index'=>'session_active','width'=>'40',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
59
+    $column_model = array(
60
+        array('name'=>'name', 'index'=>'name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
61
+        array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
62
+        array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
63
+        array('name'=>'category_name', 'index'=>'category_name', 'width'=>'70', 'align'=>'left', 'search' => 'true'),
64
+        array('name'=>'access_start_date', 'index'=>'access_start_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
65
+        array('name'=>'access_end_date', 'index'=>'access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
66
+        array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'),
67
+        array('name'=>'status', 'index'=>'session_active', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select',
68 68
           //for the bottom bar
69 69
             'searchoptions' => array(
70 70
                 'defaultValue' => '1',
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
             ),
73 73
           //for the top bar
74 74
           'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
75
-        array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
76
-        array('name'=>'actions',        'index'=>'actions',         'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false')
75
+        array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
76
+        array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false', 'search' => 'false')
77 77
     );
78 78
     //Autowidth
79 79
     $extra_params['autowidth'] = 'true';
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
     //With this function we can add actions to the jgrid (edit, delete, etc)
87 87
     $action_links = 'function action_formatter(cellvalue, options, rowObject) {
88
-         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>'.
88
+         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>'.
89 89
          '\';
90 90
     }';
91 91
     ?>
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
     $(function() {
108 108
         <?php
109
-            echo Display::grid_js('sessions', $url,$columns,$column_model,$extra_params, array(), $action_links,true);
109
+            echo Display::grid_js('sessions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
110 110
         ?>
111 111
 
112 112
         setSearchSelect("status");
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
     <?php if (api_is_platform_admin()) {?>
149 149
         <div class="actions">
150 150
         <?php
151
-        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>';
152
-        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>';
153
-        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>';
151
+        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>';
152
+        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>';
153
+        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>';
154 154
         echo '</div>';
155 155
     }
156 156
 } else {
Please login to merge, or discard this patch.
main/user/class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 $(function() {
147 147
 <?php
148 148
     // grid definition see the $usergroup>display() function
149
-    echo Display::grid_js('usergroups',  $url, $columns, $columnModel, $extraParams, array(), '', true);
149
+    echo Display::grid_js('usergroups', $url, $columns, $columnModel, $extraParams, array(), '', true);
150 150
 ?>
151 151
 });
152 152
 </script>
Please login to merge, or discard this patch.