@@ -240,10 +240,11 @@ |
||
240 | 240 | <td colspan="3" align="center"> |
241 | 241 | <br /> |
242 | 242 | <?php |
243 | - if(isset($_GET['add'])) |
|
244 | - echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>'; |
|
245 | - else |
|
246 | - echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>'; |
|
243 | + if(isset($_GET['add'])) { |
|
244 | + echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>'; |
|
245 | + } else { |
|
246 | + echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>'; |
|
247 | + } |
|
247 | 248 | ?> |
248 | 249 | </td> |
249 | 250 | </tr> |
@@ -120,12 +120,12 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | if ($add_type == 'multiple') { |
123 | - $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'. |
|
123 | + $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'. |
|
124 | 124 | get_lang('SessionAddTypeUnique').'</a>'; |
125 | - $link_add_type_multiple = get_lang('SessionAddTypeMultiple'); |
|
125 | + $link_add_type_multiple = get_lang('SessionAddTypeMultiple'); |
|
126 | 126 | } else { |
127 | - $link_add_type_unique = get_lang('SessionAddTypeUnique'); |
|
128 | - $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'. |
|
127 | + $link_add_type_unique = get_lang('SessionAddTypeUnique'); |
|
128 | + $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'. |
|
129 | 129 | get_lang('SessionAddTypeMultiple').'</a>'; |
130 | 130 | } |
131 | 131 | |
@@ -223,11 +223,11 @@ discard block |
||
223 | 223 | <td colspan="3" align="center"> |
224 | 224 | <br /> |
225 | 225 | <?php |
226 | - if(isset($_GET['add'])) |
|
227 | - echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>'; |
|
228 | - else |
|
229 | - echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>'; |
|
230 | - ?> |
|
226 | + if(isset($_GET['add'])) |
|
227 | + echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>'; |
|
228 | + else |
|
229 | + echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>'; |
|
230 | + ?> |
|
231 | 231 | </td> |
232 | 232 | </tr> |
233 | 233 | </table> |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | foreach ($userGroups as $item) { |
115 | 115 | if ($item['access_url_id'] == $access_url_id) { |
116 | - $userGroupList[$item['id']] = $item ; |
|
116 | + $userGroupList[$item['id']] = $item; |
|
117 | 117 | } |
118 | 118 | } |
119 | 119 | $noUserGroupList = CourseCategory::getCourseCategoryNotInList(array_keys($userGroupList)); |
@@ -151,11 +151,11 @@ discard block |
||
151 | 151 | if (!empty($access_url_id)) { |
152 | 152 | if ($url_obj[0] == $access_url_id) { |
153 | 153 | $checked = 'selected=true'; |
154 | - $url_selected=$url_obj[1]; |
|
154 | + $url_selected = $url_obj[1]; |
|
155 | 155 | } |
156 | 156 | } |
157 | - if ($url_obj['active']==1) { ?> |
|
158 | - <option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?> |
|
157 | + if ($url_obj['active'] == 1) { ?> |
|
158 | + <option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?> |
|
159 | 159 | </option> |
160 | 160 | <?php |
161 | 161 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | <td align="center"><b><?php echo get_lang('CourseCategoryInPlatform') ?> :</b> |
172 | 172 | </td> |
173 | 173 | <td></td> |
174 | - <td align="center"><b><?php printf(get_lang('CourseCategoryListInX'),$url_selected); ?></b></td> |
|
174 | + <td align="center"><b><?php printf(get_lang('CourseCategoryListInX'), $url_selected); ?></b></td> |
|
175 | 175 | </tr> |
176 | 176 | |
177 | 177 | <tr> |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | <td align="center"> |
209 | 209 | <select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;"> |
210 | 210 | <?php |
211 | -foreach($userGroupList as $item) { |
|
211 | +foreach ($userGroupList as $item) { |
|
212 | 212 | ?> |
213 | 213 | <option value="<?php echo $item['id']; ?>"> |
214 | 214 | <?php echo $item['name']; ?> |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | <td colspan="3" align="center"> |
224 | 224 | <br /> |
225 | 225 | <?php |
226 | - if(isset($_GET['add'])) |
|
226 | + if (isset($_GET['add'])) |
|
227 | 227 | echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>'; |
228 | 228 | else |
229 | 229 | echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>'; |
@@ -43,15 +43,15 @@ discard block |
||
43 | 43 | $table->set_column_filter(3, 'edit_filter'); |
44 | 44 | |
45 | 45 | function edit_filter($id,$url_params,$row) { |
46 | - global $charset; |
|
47 | - $return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>'; |
|
48 | - $return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>'; |
|
49 | - return $return; |
|
46 | + global $charset; |
|
47 | + $return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>'; |
|
48 | + $return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>'; |
|
49 | + return $return; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | if ($_REQUEST['action'] == 'delete') { |
53 | - delete_specific_field($_REQUEST['field_id']); |
|
54 | - header('Location: specific_fields.php?message='.get_lang('FieldRemoved')); |
|
53 | + delete_specific_field($_REQUEST['field_id']); |
|
54 | + header('Location: specific_fields.php?message='.get_lang('FieldRemoved')); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | // Start output |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro')); |
62 | 62 | |
63 | 63 | if(!empty($_GET['message'])) { |
64 | - Display::display_confirmation_message($_GET['message']); |
|
64 | + Display::display_confirmation_message($_GET['message']); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | echo '<div class="actions">'; |
@@ -15,36 +15,36 @@ discard block |
||
15 | 15 | api_protect_admin_script(); |
16 | 16 | |
17 | 17 | // Breadcrumb |
18 | -$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
19 | -$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings')); |
|
18 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
19 | +$interbreadcrumb[] = array('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings')); |
|
20 | 20 | |
21 | 21 | $libpath = api_get_path(LIBRARY_PATH); |
22 | 22 | |
23 | 23 | include_once $libpath.'specific_fields_manager.lib.php'; |
24 | 24 | |
25 | 25 | // Create an add-field box |
26 | -$form = new FormValidator('add_field','post','','',null,false); |
|
27 | -$renderer =& $form->defaultRenderer(); |
|
26 | +$form = new FormValidator('add_field', 'post', '', '', null, false); |
|
27 | +$renderer = & $form->defaultRenderer(); |
|
28 | 28 | $renderer->setCustomElementTemplate('<span>{element}</span> '); |
29 | -$form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>'); |
|
29 | +$form->addElement('static', 'search_advanced_link', null, '<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>'); |
|
30 | 30 | |
31 | 31 | // Create a sortable table with specific fields data |
32 | -$column_show = array(1,1,1); |
|
33 | -$column_order = array(3,2,1); |
|
32 | +$column_show = array(1, 1, 1); |
|
33 | +$column_order = array(3, 2, 1); |
|
34 | 34 | $extra_fields = get_specific_field_list(); |
35 | 35 | $number_of_extra_fields = count($extra_fields); |
36 | 36 | |
37 | -$table = new SortableTableFromArrayConfig($extra_fields,2,50,'',$column_show,$column_order); |
|
38 | -$table->set_header(0, ' ', false,null,'width="2%"', 'style="display:none"'); |
|
37 | +$table = new SortableTableFromArrayConfig($extra_fields, 2, 50, '', $column_show, $column_order); |
|
38 | +$table->set_header(0, ' ', false, null, 'width="2%"', 'style="display:none"'); |
|
39 | 39 | $table->set_header(1, get_lang('Code'), TRUE, 'width="10%"'); |
40 | 40 | $table->set_header(2, get_lang('Name')); |
41 | -$table->set_header(3, get_lang('Modify'),false,'width="10%"'); |
|
41 | +$table->set_header(3, get_lang('Modify'), false, 'width="10%"'); |
|
42 | 42 | $table->set_column_filter(3, 'edit_filter'); |
43 | 43 | |
44 | -function edit_filter($id,$url_params,$row) { |
|
44 | +function edit_filter($id, $url_params, $row) { |
|
45 | 45 | global $charset; |
46 | - $return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>'; |
|
47 | - $return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>'; |
|
46 | + $return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>'; |
|
47 | + $return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>'; |
|
48 | 48 | return $return; |
49 | 49 | } |
50 | 50 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | Display::display_header(get_lang('SpecificSearchFields')); |
61 | 61 | echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro')); |
62 | 62 | |
63 | -if(!empty($_GET['message'])) { |
|
63 | +if (!empty($_GET['message'])) { |
|
64 | 64 | Display::display_confirmation_message($_GET['message']); |
65 | 65 | } |
66 | 66 |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | $htmlHeadXtra[] = api_get_jqgrid_js(); |
19 | 19 | |
20 | 20 | // setting breadcrumbs |
21 | -$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
21 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
22 | 22 | |
23 | 23 | $tool_name = null; |
24 | 24 | |
@@ -39,23 +39,23 @@ discard block |
||
39 | 39 | $token = Security::get_token(); |
40 | 40 | |
41 | 41 | if ($action == 'add') { |
42 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName); |
|
43 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['display_text']); |
|
44 | - $interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions')); |
|
45 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add')); |
|
42 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName); |
|
43 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], 'name' => $extra_field_info['display_text']); |
|
44 | + $interbreadcrumb[] = array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions')); |
|
45 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add')); |
|
46 | 46 | } elseif ($action == 'edit') { |
47 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName); |
|
48 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['display_text']); |
|
49 | - $interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions')); |
|
47 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName); |
|
48 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], 'name' => $extra_field_info['display_text']); |
|
49 | + $interbreadcrumb[] = array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions')); |
|
50 | 50 | |
51 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit')); |
|
51 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit')); |
|
52 | 52 | } else { |
53 | - $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName); |
|
54 | - $interbreadcrumb[]=array( |
|
53 | + $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName); |
|
54 | + $interbreadcrumb[] = array( |
|
55 | 55 | 'url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], |
56 | 56 | 'name' => $extra_field_info['display_text'] |
57 | 57 | ); |
58 | - $interbreadcrumb[]=array('url' => '#','name' => get_lang('EditExtraFieldOptions')); |
|
58 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditExtraFieldOptions')); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | //jqgrid will use this URL to do the selects |
@@ -108,12 +108,12 @@ discard block |
||
108 | 108 | |
109 | 109 | //With this function we can add actions to the jgrid (edit, delete, etc) |
110 | 110 | $action_links = 'function action_formatter(cellvalue, options, rowObject) { |
111 | - return \'<a href="?action=edit&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'. |
|
112 | - ' <a onclick="javascript:if(!confirm('."\'".addslashes(get_lang("ConfirmYourChoice"))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'. |
|
111 | + return \'<a href="?action=edit&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'. |
|
112 | + ' <a onclick="javascript:if(!confirm('."\'".addslashes(get_lang("ConfirmYourChoice"))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'. |
|
113 | 113 | '\'; |
114 | 114 | }'; |
115 | 115 | |
116 | -$htmlHeadXtra[]='<script> |
|
116 | +$htmlHeadXtra[] = '<script> |
|
117 | 117 | $(function() { |
118 | 118 | // grid definition see the $obj->display() function |
119 | 119 | '.Display::grid_js( |
@@ -345,7 +345,10 @@ discard block |
||
345 | 345 | $searchForm->display(); |
346 | 346 | echo '</div>'; |
347 | 347 | ?> |
348 | -<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;"> |
|
348 | +<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) { |
|
349 | + echo '&add=true' ; |
|
350 | +} |
|
351 | +?>" style="margin:0px;"> |
|
349 | 352 | <?php |
350 | 353 | echo '<legend>'.$tool_name.': '.$data['name'].'</legend>'; |
351 | 354 | |
@@ -420,7 +423,10 @@ discard block |
||
420 | 423 | ?> |
421 | 424 | <br /> |
422 | 425 | <label class="control-label"> |
423 | - <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"';?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id"> |
|
426 | + <input type="checkbox" <?php if ($user_with_any_group) { |
|
427 | + echo 'checked="checked"'; |
|
428 | +} |
|
429 | +?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id"> |
|
424 | 430 | <?php echo get_lang('UsersRegisteredInAnyGroup'); ?> |
425 | 431 | </label> |
426 | 432 | </div> |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | api_protect_admin_script(true); |
19 | 19 | |
20 | 20 | // setting breadcrumbs |
21 | -$interbreadcrumb[]= array('url' => 'index.php','name' => get_lang('PlatformAdmin')); |
|
22 | -$interbreadcrumb[]= array('url' => 'usergroups.php','name' => get_lang('Classes')); |
|
21 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
22 | +$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes')); |
|
23 | 23 | |
24 | 24 | // Database Table Definitions |
25 | 25 | |
@@ -91,14 +91,14 @@ discard block |
||
91 | 91 | |
92 | 92 | </script>'; |
93 | 93 | |
94 | -$form_sent = 0; |
|
94 | +$form_sent = 0; |
|
95 | 95 | |
96 | 96 | $extra_field_list = UserManager::get_extra_fields(); |
97 | 97 | $new_field_list = array(); |
98 | 98 | if (is_array($extra_field_list)) { |
99 | 99 | foreach ($extra_field_list as $extra_field) { |
100 | 100 | //if is enabled to filter and is a "<select>" field type |
101 | - if ($extra_field[8]==1 && $extra_field[2]==4 ) { |
|
101 | + if ($extra_field[8] == 1 && $extra_field[2] == 4) { |
|
102 | 102 | $new_field_list[] = array( |
103 | 103 | 'name'=> $extra_field[3], |
104 | 104 | 'variable' => $extra_field[1], 'data'=> $extra_field[9] |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | foreach ($users as $user) { |
147 | 147 | $data[] = array($user['username'], $groupInfo['name']); |
148 | 148 | } |
149 | - $filename = 'export_user_class_' . api_get_local_time(); |
|
149 | + $filename = 'export_user_class_'.api_get_local_time(); |
|
150 | 150 | Export::arrayToCsv($data, $filename); |
151 | 151 | exit; |
152 | 152 | } |
@@ -156,11 +156,11 @@ discard block |
||
156 | 156 | // Filter by Extra Fields |
157 | 157 | $use_extra_fields = false; |
158 | 158 | if (is_array($extra_field_list)) { |
159 | - if (is_array($new_field_list) && count($new_field_list)>0 ) { |
|
159 | + if (is_array($new_field_list) && count($new_field_list) > 0) { |
|
160 | 160 | foreach ($new_field_list as $new_field) { |
161 | 161 | $varname = 'field_'.$new_field['variable']; |
162 | 162 | if (UserManager::is_extra_field_available($new_field['variable'])) { |
163 | - if (isset($_POST[$varname]) && $_POST[$varname]!='0') { |
|
163 | + if (isset($_POST[$varname]) && $_POST[$varname] != '0') { |
|
164 | 164 | $use_extra_fields = true; |
165 | 165 | $extra_field_result[] = UserManager::get_extra_user_data_by_value( |
166 | 166 | $new_field['variable'], |
@@ -174,10 +174,10 @@ discard block |
||
174 | 174 | |
175 | 175 | if ($use_extra_fields) { |
176 | 176 | $final_result = array(); |
177 | - if (count($extra_field_result)>1) { |
|
178 | - for ($i=0; $i<count($extra_field_result)-1; $i++) { |
|
179 | - if (is_array($extra_field_result[$i+1])) { |
|
180 | - $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i+1]); |
|
177 | + if (count($extra_field_result) > 1) { |
|
178 | + for ($i = 0; $i < count($extra_field_result) - 1; $i++) { |
|
179 | + if (is_array($extra_field_result[$i + 1])) { |
|
180 | + $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i + 1]); |
|
181 | 181 | } |
182 | 182 | } |
183 | 183 | } else { |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | |
197 | 197 | $searchForm = new FormValidator('search', 'get', api_get_self().'?id='.$id); |
198 | 198 | $searchForm->addHeader(get_lang('AdvancedSearch')); |
199 | -$renderer =& $searchForm->defaultRenderer(); |
|
199 | +$renderer = & $searchForm->defaultRenderer(); |
|
200 | 200 | |
201 | 201 | $searchForm->addElement('hidden', 'id', $id); |
202 | 202 | foreach ($filters as $param) { |
@@ -345,13 +345,13 @@ discard block |
||
345 | 345 | $searchForm->display(); |
346 | 346 | echo '</div>'; |
347 | 347 | ?> |
348 | -<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;"> |
|
348 | +<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;"> |
|
349 | 349 | <?php |
350 | 350 | echo '<legend>'.$tool_name.': '.$data['name'].'</legend>'; |
351 | 351 | |
352 | 352 | |
353 | 353 | if (is_array($extra_field_list)) { |
354 | - if (is_array($new_field_list) && count($new_field_list)>0) { |
|
354 | + if (is_array($new_field_list) && count($new_field_list) > 0) { |
|
355 | 355 | echo '<h3>'.get_lang('FilterByUser').'</h3>'; |
356 | 356 | foreach ($new_field_list as $new_field) { |
357 | 357 | echo $new_field['name']; |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | echo ' <select name="'.$varname.'">'; |
360 | 360 | echo '<option value="0">--'.get_lang('Select').'--</option>'; |
361 | 361 | foreach ($new_field['data'] as $option) { |
362 | - $checked=''; |
|
362 | + $checked = ''; |
|
363 | 363 | if (isset($_POST[$varname])) { |
364 | 364 | if ($_POST[$varname] == $option[1]) { |
365 | 365 | $checked = 'selected="true"'; |
@@ -386,15 +386,15 @@ discard block |
||
386 | 386 | <?php if ($data['group_type'] == UserGroup::SOCIAL_CLASS) { ?> |
387 | 387 | <select name="relation" id="relation"> |
388 | 388 | <option value=""><?php echo get_lang('SelectARelationType')?></option> |
389 | - <option value="<?php echo GROUP_USER_PERMISSION_ADMIN ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_ADMIN)?'selected=selected':'') ?> > |
|
389 | + <option value="<?php echo GROUP_USER_PERMISSION_ADMIN ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_ADMIN) ? 'selected=selected' : '') ?> > |
|
390 | 390 | <?php echo get_lang('Admin') ?></option> |
391 | - <option value="<?php echo GROUP_USER_PERMISSION_READER ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_READER)?'selected=selected':'') ?> > |
|
391 | + <option value="<?php echo GROUP_USER_PERMISSION_READER ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_READER) ? 'selected=selected' : '') ?> > |
|
392 | 392 | <?php echo get_lang('Reader') ?></option> |
393 | - <option value="<?php echo GROUP_USER_PERMISSION_PENDING_INVITATION ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_PENDING_INVITATION)?'selected=selected':'') ?> > |
|
393 | + <option value="<?php echo GROUP_USER_PERMISSION_PENDING_INVITATION ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_PENDING_INVITATION) ? 'selected=selected' : '') ?> > |
|
394 | 394 | <?php echo get_lang('PendingInvitation') ?></option> |
395 | - <option value="<?php echo GROUP_USER_PERMISSION_MODERATOR ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_MODERATOR)?'selected=selected':'') ?> > |
|
395 | + <option value="<?php echo GROUP_USER_PERMISSION_MODERATOR ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_MODERATOR) ? 'selected=selected' : '') ?> > |
|
396 | 396 | <?php echo get_lang('Moderator') ?></option> |
397 | - <option value="<?php echo GROUP_USER_PERMISSION_HRM ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_HRM)?'selected=selected':'') ?> > |
|
397 | + <option value="<?php echo GROUP_USER_PERMISSION_HRM ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_HRM) ? 'selected=selected' : '') ?> > |
|
398 | 398 | <?php echo get_lang('Drh') ?></option> |
399 | 399 | </select> |
400 | 400 | <?php } ?> |
@@ -414,13 +414,13 @@ discard block |
||
414 | 414 | 'elements_not_in_name', |
415 | 415 | $elements_not_in, |
416 | 416 | '', |
417 | - array('class'=>'col-md-7', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'), |
|
417 | + array('class'=>'col-md-7', 'multiple'=>'multiple', 'id'=>'elements_not_in', 'size'=>'15px'), |
|
418 | 418 | false |
419 | 419 | ); |
420 | 420 | ?> |
421 | 421 | <br /> |
422 | 422 | <label class="control-label"> |
423 | - <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"';?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id"> |
|
423 | + <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"'; ?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id"> |
|
424 | 424 | <?php echo get_lang('UsersRegisteredInAnyGroup'); ?> |
425 | 425 | </label> |
426 | 426 | </div> |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | 'elements_in_name[]', |
445 | 445 | $elements_in, |
446 | 446 | '', |
447 | - array('class'=>'col-md-7', 'multiple'=>'multiple','id'=>'elements_in','size'=>'15px'), |
|
447 | + array('class'=>'col-md-7', 'multiple'=>'multiple', 'id'=>'elements_in', 'size'=>'15px'), |
|
448 | 448 | false |
449 | 449 | ); |
450 | 450 | unset($sessionUsersList); |
@@ -11,7 +11,7 @@ |
||
11 | 11 | $this_section = SECTION_PLATFORM_ADMIN; |
12 | 12 | // User permissions |
13 | 13 | api_protect_admin_script(); |
14 | -$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
14 | +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); |
|
15 | 15 | Display :: display_header(get_lang('SystemStatus')); |
16 | 16 | $diag = new Diagnoser(); |
17 | 17 | $diag->show_html(); |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | // Including the global initialization file |
11 | 11 | require_once '../inc/global.inc.php'; |
12 | 12 | |
13 | -$current_course_tool = TOOL_NOTEBOOK; |
|
13 | +$current_course_tool = TOOL_NOTEBOOK; |
|
14 | 14 | |
15 | 15 | // The section (tabs) |
16 | 16 | $this_section = SECTION_COURSES; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | NotebookManager::display_notes(); |
97 | 97 | } else { |
98 | 98 | echo '<div class="actions">'; |
99 | - echo '<a href="index.php">'.Display::return_icon('back.png',get_lang('BackToNotesList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
99 | + echo '<a href="index.php">'.Display::return_icon('back.png', get_lang('BackToNotesList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
100 | 100 | echo '</div>'; |
101 | 101 | $token = Security::get_token(); |
102 | 102 | $form->addElement('hidden', 'sec_token'); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | } else { |
148 | 148 | echo '<div class="actions">'; |
149 | 149 | echo '<a href="index.php">'. |
150 | - Display::return_icon('back.png',get_lang('BackToNotesList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
150 | + Display::return_icon('back.png', get_lang('BackToNotesList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
151 | 151 | echo '</div>'; |
152 | 152 | $token = Security::get_token(); |
153 | 153 | $form->addElement('hidden', 'sec_token'); |
@@ -38,12 +38,12 @@ discard block |
||
38 | 38 | |
39 | 39 | // Tool name |
40 | 40 | if ($action === 'addnote') { |
41 | - $tool = 'NoteAddNew'; |
|
42 | - $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq(), 'name' => get_lang('ToolNotebook')); |
|
41 | + $tool = 'NoteAddNew'; |
|
42 | + $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq(), 'name' => get_lang('ToolNotebook')); |
|
43 | 43 | } |
44 | 44 | if ($action === 'editnote') { |
45 | - $tool = 'ModifyNote'; |
|
46 | - $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq(), 'name' => get_lang('ToolNotebook')); |
|
45 | + $tool = 'ModifyNote'; |
|
46 | + $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq(), 'name' => get_lang('ToolNotebook')); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | // Displaying the header |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | exit; |
64 | 64 | } |
65 | 65 | |
66 | - $_SESSION['notebook_view'] = 'creation_date'; |
|
66 | + $_SESSION['notebook_view'] = 'creation_date'; |
|
67 | 67 | |
68 | 68 | $form = new FormValidator( |
69 | 69 | 'note', |
@@ -43,7 +43,9 @@ |
||
43 | 43 | //remove last slash if present |
44 | 44 | //$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url; |
45 | 45 | //mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René) |
46 | - while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul); |
|
46 | + while ($doc_url{$dul = strlen($doc_url)-1}=='/') { |
|
47 | + $doc_url = substr($doc_url,0,$dul); |
|
48 | + } |
|
47 | 49 | //create the path |
48 | 50 | $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path |
49 | 51 | //redirect |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $doc_url = str_replace(' ', '+', $doc_url); |
29 | 29 | $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url; |
30 | 30 | |
31 | -if (strpos($doc_url,'../') OR strpos($doc_url,'/..')) { |
|
31 | +if (strpos($doc_url, '../') OR strpos($doc_url, '/..')) { |
|
32 | 32 | $doc_url = ''; |
33 | 33 | } |
34 | 34 | |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | //remove last slash if present |
44 | 44 | //$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url; |
45 | 45 | //mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René) |
46 | - while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul); |
|
46 | + while ($doc_url{$dul = strlen($doc_url) - 1} == '/') $doc_url = substr($doc_url, 0, $dul); |
|
47 | 47 | //create the path |
48 | 48 | $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path |
49 | 49 | //redirect |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | |
65 | 65 | $result = Database::query($sql); |
66 | 66 | if (Database::num_rows($result) > 0) { |
67 | - $row= Database::fetch_array($result); |
|
68 | - $title = str_replace(' ','_', $row['filename']); |
|
67 | + $row = Database::fetch_array($result); |
|
68 | + $title = str_replace(' ', '_', $row['filename']); |
|
69 | 69 | if (Security::check_abs_path($full_file_name, |
70 | - api_get_path(SYS_COURSE_PATH) . api_get_course_path() . '/upload/announcements/') |
|
70 | + api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/announcements/') |
|
71 | 71 | ) { |
72 | 72 | $result = DocumentManager::file_send_for_download($full_file_name, true, $title); |
73 | 73 | if ($result === false) { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $tool_name = get_lang('SurveyPublication'); |
65 | 65 | |
66 | 66 | // Displaying the header |
67 | -Display::display_header($tool_name,'Survey'); |
|
67 | +Display::display_header($tool_name, 'Survey'); |
|
68 | 68 | |
69 | 69 | echo '<script> |
70 | 70 | $(function() { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | ); |
133 | 133 | |
134 | 134 | $form->addElement('html', '<div id="check_mail">'); |
135 | -$form->addElement('checkbox', 'send_mail','', get_lang('SendMail')); |
|
135 | +$form->addElement('checkbox', 'send_mail', '', get_lang('SendMail')); |
|
136 | 136 | $form->addElement('html', '</div>'); |
137 | 137 | |
138 | 138 | $form->addElement('html', '<div id="mail_text_wrapper">'); |
@@ -219,8 +219,8 @@ discard block |
||
219 | 219 | ); |
220 | 220 | |
221 | 221 | // Saving the invitations for the additional users |
222 | - $values['additional_users'] = $values['additional_users'].';'; // This is for the case when you enter only one email |
|
223 | - $temp = str_replace(',', ';', $values['additional_users']); // This is to allow , and ; as email separators |
|
222 | + $values['additional_users'] = $values['additional_users'].';'; // This is for the case when you enter only one email |
|
223 | + $temp = str_replace(',', ';', $values['additional_users']); // This is to allow , and ; as email separators |
|
224 | 224 | $additional_users = explode(';', $temp); |
225 | 225 | for ($i = 0; $i < count($additional_users); $i++) { |
226 | 226 | $additional_users[$i] = trim($additional_users[$i]); |
@@ -18,10 +18,10 @@ discard block |
||
18 | 18 | $this_section = SECTION_COURSES; |
19 | 19 | |
20 | 20 | if (!api_is_allowed_to_edit(false, true)) { |
21 | - Display :: display_header(get_lang('ToolSurvey')); |
|
22 | - Display :: display_error_message(get_lang('NotAllowed'), false); |
|
23 | - Display :: display_footer(); |
|
24 | - exit; |
|
21 | + Display :: display_header(get_lang('ToolSurvey')); |
|
22 | + Display :: display_error_message(get_lang('NotAllowed'), false); |
|
23 | + Display :: display_footer(); |
|
24 | + exit; |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | // Database table definitions |
@@ -37,15 +37,15 @@ discard block |
||
37 | 37 | $survey_id = Security::remove_XSS($_GET['survey_id']); |
38 | 38 | $survey_data = SurveyManager::get_survey($survey_id); |
39 | 39 | if (empty($survey_data)) { |
40 | - Display :: display_header(get_lang('ToolSurvey')); |
|
41 | - Display :: display_error_message(get_lang('InvallidSurvey'), false); |
|
42 | - Display :: display_footer(); |
|
43 | - exit; |
|
40 | + Display :: display_header(get_lang('ToolSurvey')); |
|
41 | + Display :: display_error_message(get_lang('InvallidSurvey'), false); |
|
42 | + Display :: display_footer(); |
|
43 | + exit; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40)); |
47 | 47 | if (api_strlen(strip_tags($survey_data['title'])) > 40) { |
48 | - $urlname .= '...'; |
|
48 | + $urlname .= '...'; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | // Breadcrumbs |
@@ -80,23 +80,23 @@ discard block |
||
80 | 80 | WHERE c_id = $course_id AND code='".Database::escape_string($survey_data['code'])."'"; |
81 | 81 | $result = Database::query($sql); |
82 | 82 | if (Database::num_rows($result) > 1) { |
83 | - Display::display_warning_message(get_lang('IdenticalSurveycodeWarning')); |
|
83 | + Display::display_warning_message(get_lang('IdenticalSurveycodeWarning')); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | // Invited / answered message |
87 | 87 | if ($survey_data['invited'] > 0 && !isset($_POST['submit'])) { |
88 | - $message = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> '; |
|
89 | - $message .= get_lang('HaveAnswered').' '; |
|
90 | - $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> '; |
|
91 | - $message .= get_lang('WereInvited'); |
|
92 | - Display::display_normal_message($message, false); |
|
88 | + $message = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> '; |
|
89 | + $message .= get_lang('HaveAnswered').' '; |
|
90 | + $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> '; |
|
91 | + $message .= get_lang('WereInvited'); |
|
92 | + Display::display_normal_message($message, false); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | // Building the form for publishing the survey |
96 | 96 | $form = new FormValidator( |
97 | - 'publish_form', |
|
98 | - 'post', |
|
99 | - api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq() |
|
97 | + 'publish_form', |
|
98 | + 'post', |
|
99 | + api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq() |
|
100 | 100 | ); |
101 | 101 | $form->addElement('header', '', $tool_name); |
102 | 102 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | ); |
110 | 110 | $possible_users = array(); |
111 | 111 | foreach ($complete_user_list as & $user) { |
112 | - $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']); |
|
112 | + $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | |
@@ -125,10 +125,10 @@ discard block |
||
125 | 125 | |
126 | 126 | // Additional users |
127 | 127 | $form->addElement( |
128 | - 'textarea', |
|
129 | - 'additional_users', |
|
130 | - array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')), |
|
131 | - array('rows' => 5) |
|
128 | + 'textarea', |
|
129 | + 'additional_users', |
|
130 | + array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')), |
|
131 | + array('rows' => 5) |
|
132 | 132 | ); |
133 | 133 | |
134 | 134 | $form->addElement('html', '<div id="check_mail">'); |
@@ -141,15 +141,15 @@ discard block |
||
141 | 141 | $form->addText('mail_title', get_lang('MailTitle'), false); |
142 | 142 | // The text of the mail |
143 | 143 | $form->addHtmlEditor( |
144 | - 'mail_text', |
|
145 | - array(get_lang('MailText'), get_lang('UseLinkSyntax')), |
|
146 | - false, |
|
147 | - array('ToolbarSet' => 'Survey', 'Height' => '150') |
|
144 | + 'mail_text', |
|
145 | + array(get_lang('MailText'), get_lang('UseLinkSyntax')), |
|
146 | + false, |
|
147 | + array('ToolbarSet' => 'Survey', 'Height' => '150') |
|
148 | 148 | ); |
149 | 149 | $form->addElement('html', '</div>'); |
150 | 150 | // You cab send a reminder to unanswered people if the survey is not anonymous |
151 | 151 | if ($survey_data['anonymous'] != 1) { |
152 | - $form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered')); |
|
152 | + $form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered')); |
|
153 | 153 | } |
154 | 154 | // Allow resending to all selected users |
155 | 155 | $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers')); |
@@ -163,11 +163,11 @@ discard block |
||
163 | 163 | }*/ |
164 | 164 | $portal_url = api_get_path(WEB_PATH); |
165 | 165 | if (api_is_multiple_url_enabled()) { |
166 | - $access_url_id = api_get_current_access_url_id(); |
|
167 | - if ($access_url_id != -1) { |
|
168 | - $url = api_get_access_url($access_url_id); |
|
169 | - $portal_url = $url['url']; |
|
170 | - } |
|
166 | + $access_url_id = api_get_current_access_url_id(); |
|
167 | + if ($access_url_id != -1) { |
|
168 | + $url = api_get_access_url($access_url_id); |
|
169 | + $portal_url = $url['url']; |
|
170 | + } |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | // Show the URL that can be used by users to fill a survey without invitation |
@@ -177,56 +177,56 @@ discard block |
||
177 | 177 | $form->addElement('label', null, $auto_survey_link); |
178 | 178 | |
179 | 179 | if ($form->validate()) { |
180 | - $values = $form->exportValues(); |
|
180 | + $values = $form->exportValues(); |
|
181 | 181 | if (isset($values['send_mail']) && $values['send_mail'] == 1) { |
182 | 182 | if (empty($values['mail_title']) || empty($values['mail_text'])) { |
183 | 183 | Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete')); |
184 | 184 | // Getting the invited users |
185 | - $defaults = SurveyUtil::get_invited_users($survey_data['code']); |
|
186 | - |
|
187 | - // Getting the survey mail text |
|
188 | - if (!empty($survey_data['reminder_mail'])) { |
|
189 | - $defaults['mail_text'] = $survey_data['reminder_mail']; |
|
190 | - } else { |
|
191 | - $defaults['mail_text'] = $survey_data['invite_mail']; |
|
192 | - } |
|
193 | - $defaults['mail_title'] = $survey_data['mail_subject']; |
|
194 | - $defaults['send_mail'] = 1; |
|
195 | - $form->setDefaults($defaults); |
|
185 | + $defaults = SurveyUtil::get_invited_users($survey_data['code']); |
|
186 | + |
|
187 | + // Getting the survey mail text |
|
188 | + if (!empty($survey_data['reminder_mail'])) { |
|
189 | + $defaults['mail_text'] = $survey_data['reminder_mail']; |
|
190 | + } else { |
|
191 | + $defaults['mail_text'] = $survey_data['invite_mail']; |
|
192 | + } |
|
193 | + $defaults['mail_title'] = $survey_data['mail_subject']; |
|
194 | + $defaults['send_mail'] = 1; |
|
195 | + $form->setDefaults($defaults); |
|
196 | 196 | $form->display(); |
197 | 197 | return; |
198 | 198 | } |
199 | 199 | } |
200 | 200 | // Save the invitation mail |
201 | - SurveyUtil::save_invite_mail( |
|
202 | - $values['mail_text'], |
|
203 | - $values['mail_title'], |
|
204 | - !empty($survey_data['invite_mail']) |
|
205 | - ); |
|
201 | + SurveyUtil::save_invite_mail( |
|
202 | + $values['mail_text'], |
|
203 | + $values['mail_title'], |
|
204 | + !empty($survey_data['invite_mail']) |
|
205 | + ); |
|
206 | 206 | |
207 | 207 | $resendAll = isset($values['resend_to_all']) ? $values['resend_to_all'] : ''; |
208 | 208 | $sendMail = isset($values['send_mail']) ? $values['send_mail'] : ''; |
209 | 209 | $remindUnAnswered = isset($values['remindUnAnswered']) ? $values['remindUnAnswered'] : ''; |
210 | 210 | |
211 | - // Saving the invitations for the course users |
|
212 | - $count_course_users = SurveyUtil::saveInvitations( |
|
213 | - $values['users'], |
|
214 | - $values['mail_title'], |
|
215 | - $values['mail_text'], |
|
211 | + // Saving the invitations for the course users |
|
212 | + $count_course_users = SurveyUtil::saveInvitations( |
|
213 | + $values['users'], |
|
214 | + $values['mail_title'], |
|
215 | + $values['mail_text'], |
|
216 | 216 | $resendAll, |
217 | 217 | $sendMail, |
218 | 218 | $remindUnAnswered |
219 | - ); |
|
219 | + ); |
|
220 | 220 | |
221 | - // Saving the invitations for the additional users |
|
222 | - $values['additional_users'] = $values['additional_users'].';'; // This is for the case when you enter only one email |
|
223 | - $temp = str_replace(',', ';', $values['additional_users']); // This is to allow , and ; as email separators |
|
224 | - $additional_users = explode(';', $temp); |
|
225 | - for ($i = 0; $i < count($additional_users); $i++) { |
|
226 | - $additional_users[$i] = trim($additional_users[$i]); |
|
227 | - } |
|
221 | + // Saving the invitations for the additional users |
|
222 | + $values['additional_users'] = $values['additional_users'].';'; // This is for the case when you enter only one email |
|
223 | + $temp = str_replace(',', ';', $values['additional_users']); // This is to allow , and ; as email separators |
|
224 | + $additional_users = explode(';', $temp); |
|
225 | + for ($i = 0; $i < count($additional_users); $i++) { |
|
226 | + $additional_users[$i] = trim($additional_users[$i]); |
|
227 | + } |
|
228 | 228 | |
229 | - $counter_additional_users = SurveyUtil::saveInvitations( |
|
229 | + $counter_additional_users = SurveyUtil::saveInvitations( |
|
230 | 230 | $additional_users, |
231 | 231 | $values['mail_title'], |
232 | 232 | $values['mail_text'], |
@@ -235,43 +235,43 @@ discard block |
||
235 | 235 | $remindUnAnswered |
236 | 236 | ); |
237 | 237 | |
238 | - // Updating the invited field in the survey table |
|
239 | - SurveyUtil::update_count_invited($survey_data['code']); |
|
240 | - $total_count = $count_course_users + $counter_additional_users; |
|
238 | + // Updating the invited field in the survey table |
|
239 | + SurveyUtil::update_count_invited($survey_data['code']); |
|
240 | + $total_count = $count_course_users + $counter_additional_users; |
|
241 | 241 | $table_survey = Database :: get_course_table(TABLE_SURVEY); |
242 | - // Counting the number of people that are invited |
|
243 | - $sql = "SELECT * FROM $table_survey |
|
242 | + // Counting the number of people that are invited |
|
243 | + $sql = "SELECT * FROM $table_survey |
|
244 | 244 | WHERE |
245 | 245 | c_id = $course_id AND |
246 | 246 | code = '".Database::escape_string($survey_data['code'])."' |
247 | 247 | "; |
248 | - $result = Database::query($sql); |
|
249 | - $row = Database::fetch_array($result); |
|
250 | - $total_invited = $row['invited']; |
|
248 | + $result = Database::query($sql); |
|
249 | + $row = Database::fetch_array($result); |
|
250 | + $total_invited = $row['invited']; |
|
251 | 251 | if ($total_invited > 0) { |
252 | - $message = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'. |
|
253 | - $survey_data['answered'].'</a> '; |
|
254 | - $message .= get_lang('HaveAnswered').' '; |
|
255 | - $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'. |
|
256 | - $total_invited.'</a> '; |
|
257 | - $message .= get_lang('WereInvited'); |
|
258 | - Display::display_normal_message($message, false); |
|
259 | - Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend')); |
|
252 | + $message = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'. |
|
253 | + $survey_data['answered'].'</a> '; |
|
254 | + $message .= get_lang('HaveAnswered').' '; |
|
255 | + $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'. |
|
256 | + $total_invited.'</a> '; |
|
257 | + $message .= get_lang('WereInvited'); |
|
258 | + Display::display_normal_message($message, false); |
|
259 | + Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend')); |
|
260 | 260 | } |
261 | 261 | } else { |
262 | - // Getting the invited users |
|
263 | - $defaults = SurveyUtil::get_invited_users($survey_data['code']); |
|
264 | - |
|
265 | - // Getting the survey mail text |
|
266 | - if (!empty($survey_data['reminder_mail'])) { |
|
267 | - $defaults['mail_text'] = $survey_data['reminder_mail']; |
|
268 | - } else { |
|
269 | - $defaults['mail_text'] = $survey_data['invite_mail']; |
|
270 | - } |
|
271 | - $defaults['mail_title'] = $survey_data['mail_subject']; |
|
272 | - $defaults['send_mail'] = 1; |
|
273 | - |
|
274 | - $form->setDefaults($defaults); |
|
262 | + // Getting the invited users |
|
263 | + $defaults = SurveyUtil::get_invited_users($survey_data['code']); |
|
264 | + |
|
265 | + // Getting the survey mail text |
|
266 | + if (!empty($survey_data['reminder_mail'])) { |
|
267 | + $defaults['mail_text'] = $survey_data['reminder_mail']; |
|
268 | + } else { |
|
269 | + $defaults['mail_text'] = $survey_data['invite_mail']; |
|
270 | + } |
|
271 | + $defaults['mail_title'] = $survey_data['mail_subject']; |
|
272 | + $defaults['send_mail'] = 1; |
|
273 | + |
|
274 | + $form->setDefaults($defaults); |
|
275 | 275 | $form->display(); |
276 | 276 | } |
277 | 277 | Display :: display_footer(); |
@@ -6,8 +6,7 @@ |
||
6 | 6 | * @author unknown, the initial survey that did not make it in 1.8 because of bad code |
7 | 7 | * @author Patrick Cool <[email protected]>, Ghent University: cleanup, refactoring and rewriting large parts of the code |
8 | 8 | * @author Julio Montoya Armas <[email protected]>, Chamilo: Personality Test modification and rewriting large parts of the code as well |
9 | - |
|
10 | -* @todo check if the user already filled the survey and if this is the case then the answers have to be updated and not stored again. |
|
9 | + * @todo check if the user already filled the survey and if this is the case then the answers have to be updated and not stored again. |
|
11 | 10 | * @todo performance could be improved if not the survey_id was stored with the invitation but the survey_code |
12 | 11 | */ |
13 | 12 | // Unsetting the course id (because it is in the URL) |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $now = api_get_utc_datetime(); |
113 | 113 | if (Database :: num_rows($result) == 0) { |
114 | 114 | $params = [ |
115 | - 'c_id' => $course_id , |
|
115 | + 'c_id' => $course_id, |
|
116 | 116 | 'survey_code' => $surveyCode, |
117 | 117 | 'user' => $userid, |
118 | 118 | 'invitation_code' => $autoInvitationcode, |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | $jquery_ready_content = $returnParams['jquery_ready_content']; |
472 | 472 | |
473 | 473 | // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function |
474 | - $htmlHeadXtra[] ='<script> |
|
474 | + $htmlHeadXtra[] = '<script> |
|
475 | 475 | $(document).ready(function(){ |
476 | 476 | '.$jquery_ready_content.' |
477 | 477 | }); |
@@ -904,16 +904,16 @@ discard block |
||
904 | 904 | $group2 = $groups[0]; |
905 | 905 | $secondary .= " OR ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') "; |
906 | 906 | $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) "; |
907 | - $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
907 | + $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
908 | 908 | } else { |
909 | 909 | if ($i != 0) { |
910 | 910 | $secondary .= " OR ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') "; |
911 | 911 | $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) "; |
912 | - $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
912 | + $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
913 | 913 | } else { |
914 | 914 | $secondary .= " ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') "; |
915 | 915 | $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) "; |
916 | - $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
916 | + $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />'; |
|
917 | 917 | } |
918 | 918 | } |
919 | 919 | } |
@@ -1132,7 +1132,7 @@ discard block |
||
1132 | 1132 | $questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1']; |
1133 | 1133 | $questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2']; |
1134 | 1134 | $questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri']; |
1135 | - } else { |
|
1135 | + } else { |
|
1136 | 1136 | // If the type is a page break we are finished loading the questions for this page |
1137 | 1137 | break; |
1138 | 1138 | } |
@@ -1132,7 +1132,7 @@ |
||
1132 | 1132 | $questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1']; |
1133 | 1133 | $questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2']; |
1134 | 1134 | $questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri']; |
1135 | - } else { |
|
1135 | + } else { |
|
1136 | 1136 | // If the type is a page break we are finished loading the questions for this page |
1137 | 1137 | break; |
1138 | 1138 | } |