Completed
Push — 1.11.x ( 6904fa...6a92e6 )
by José
525:44 queued 484:20
created
main/admin/dashboard_add_courses_to_user.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -36,20 +36,20 @@  discard block
 block discarded – undo
36 36
 
37 37
 // setting the name of the tool
38 38
 if (UserManager::is_admin($user_id)) {
39
-	$tool_name= get_lang('AssignCoursesToPlatformAdministrator');
39
+    $tool_name= get_lang('AssignCoursesToPlatformAdministrator');
40 40
 } else if ($user_info['status'] == SESSIONADMIN) {
41
-	$tool_name= get_lang('AssignCoursesToSessionsAdministrator');
41
+    $tool_name= get_lang('AssignCoursesToSessionsAdministrator');
42 42
 } else {
43
-	$tool_name= get_lang('AssignCoursesToHumanResourcesManager');
43
+    $tool_name= get_lang('AssignCoursesToHumanResourcesManager');
44 44
 }
45 45
 
46 46
 $add_type = 'multiple';
47 47
 if(isset($_GET['add_type']) && $_GET['add_type']!='') {
48
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
48
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
49 49
 }
50 50
 
51 51
 if (!api_is_platform_admin()) {
52
-	api_not_allowed(true);
52
+    api_not_allowed(true);
53 53
 }
54 54
 
55 55
 function search_courses($needle, $type)
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
     $return = '';
61 61
     if (!empty($needle) && !empty($type)) {
62 62
         // xajax send utf8 datas... datas in db can be non-utf8 datas
63
-		$needle = Database::escape_string($needle);
63
+        $needle = Database::escape_string($needle);
64 64
 
65 65
         $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
66 66
         $assigned_courses_code = array_keys($assigned_courses_to_hrm);
@@ -88,16 +88,16 @@  discard block
 block discarded – undo
88 88
                 		$without_assigned_courses ";
89 89
         }
90 90
 
91
-		$rs	= Database::query($sql);
91
+        $rs	= Database::query($sql);
92 92
 
93
-		$return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
94
-		while($course = Database :: fetch_array($rs)) {
95
-			$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
96
-		}
97
-		$return .= '</select>';
98
-		$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
99
-	}
100
-	return $xajax_response;
93
+        $return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
94
+        while($course = Database :: fetch_array($rs)) {
95
+            $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
96
+        }
97
+        $return .= '</select>';
98
+        $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
99
+    }
100
+    return $xajax_response;
101 101
 }
102 102
 
103 103
 $xajax->processRequests();
@@ -181,23 +181,23 @@  discard block
 block discarded – undo
181 181
 $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
182 182
 $assigned_courses_code = array_keys($assigned_courses_to_hrm);
183 183
 foreach ($assigned_courses_code as &$value) {
184
-	$value = "'".$value."'";
184
+    $value = "'".$value."'";
185 185
 }
186 186
 
187 187
 $without_assigned_courses = '';
188 188
 if (count($assigned_courses_code) > 0) {
189
-	$without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
189
+    $without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
190 190
 }
191 191
 
192 192
 $needle = '%';
193 193
 $firstLetter = null;
194 194
 if (isset($_POST['firstLetterCourse'])) {
195
-	$firstLetter = $_POST['firstLetterCourse'];
196
-	$needle = Database::escape_string($firstLetter.'%');
195
+    $firstLetter = $_POST['firstLetterCourse'];
196
+    $needle = Database::escape_string($firstLetter.'%');
197 197
 }
198 198
 
199 199
 if (api_is_multiple_url_enabled()) {
200
-	$sql = " SELECT c.code, c.title
200
+    $sql = " SELECT c.code, c.title
201 201
             FROM $tbl_course c
202 202
             LEFT JOIN $tbl_course_rel_access_url a
203 203
             ON (a.c_id = c.id)
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             ORDER BY c.title";
208 208
 
209 209
 } else {
210
-	$sql= " SELECT c.code, c.title
210
+    $sql= " SELECT c.code, c.title
211 211
 	        FROM $tbl_course c
212 212
             WHERE  c.code LIKE '$needle' $without_assigned_courses
213 213
             ORDER BY c.title";
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 <input type="hidden" name="formSent" value="1" />
222 222
 <?php
223 223
 if(!empty($msg)) {
224
-	Display::display_normal_message($msg); //main API
224
+    Display::display_normal_message($msg); //main API
225 225
 }
226 226
 ?>
227 227
 
@@ -269,13 +269,13 @@  discard block
 block discarded – undo
269 269
     </div>
270 270
     <div class="col-md-4">
271 271
         <h5><?php
272
-	  	if (UserManager::is_admin($user_id)) {
273
-			echo get_lang('AssignedCoursesListToPlatformAdministrator');
274
-		} else if ($user_info['status'] == SESSIONADMIN) {
275
-			echo get_lang('AssignedCoursesListToSessionsAdministrator');
276
-		} else {
277
-			echo get_lang('AssignedCoursesListToHumanResourcesManager');
278
-		}
272
+            if (UserManager::is_admin($user_id)) {
273
+            echo get_lang('AssignedCoursesListToPlatformAdministrator');
274
+        } else if ($user_info['status'] == SESSIONADMIN) {
275
+            echo get_lang('AssignedCoursesListToSessionsAdministrator');
276
+        } else {
277
+            echo get_lang('AssignedCoursesListToHumanResourcesManager');
278
+        }
279 279
             ?>: </h5>
280 280
         
281 281
         <select id='destination' name="CoursesList[]" multiple="multiple" size="20" style="width:320px;">
Please login to merge, or discard this patch.
main/admin/access_url_edit_usergroup_to_url.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         $userGroupList[$item['id']] = $item;
122 122
     }
123 123
 } else {
124
-	$userGroups = UrlManager::get_url_rel_usergroup_data();
124
+    $userGroups = UrlManager::get_url_rel_usergroup_data();
125 125
 
126 126
     foreach ($userGroups as $item) {
127 127
         if ($item['access_url_id'] == $access_url_id) {
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 }
133 133
 
134 134
 if ($add_type == 'multiple') {
135
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
136
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
135
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
136
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
137 137
 } else {
138
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
139
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
138
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
139
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
140 140
 }
141 141
 
142 142
 $url_list = UrlManager::get_url_data();
@@ -200,30 +200,30 @@  discard block
 block discarded – undo
200 200
     <?php } else { ?>
201 201
 	  <select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
202 202
 		<?php
203
-		foreach ($noUserGroupList as $noItem) {
204
-		?>
203
+        foreach ($noUserGroupList as $noItem) {
204
+        ?>
205 205
 			<option value="<?php echo $noItem['id']; ?>">
206 206
                 <?php echo $noItem['name']; ?>
207 207
             </option>
208 208
 		<?php
209
-		}
210
-		?>
209
+        }
210
+        ?>
211 211
 	  </select>
212 212
 	<?php
213
-  	  }
214
-  	 ?>
213
+        }
214
+        ?>
215 215
   </div>
216 216
   </td>
217 217
   <td width="10%" valign="middle" align="center">
218 218
   <?php
219
-  if ($ajax_search) {
220
-	?>
219
+    if ($ajax_search) {
220
+    ?>
221 221
 	<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
222 222
         <em class="fa fa-arrow-left"></em>
223 223
 	</button>
224 224
   	<?php
225
-  } else {
226
-  	?>
225
+    } else {
226
+        ?>
227 227
 	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
228 228
         <em class="fa fa-arrow-right"></em>
229 229
 	</button>
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
232 232
         <em class="fa fa-arrow-left"></em>
233 233
 	</button>
234 234
 	<?php
235
-  }
236
-  ?>
235
+    }
236
+    ?>
237 237
 	<br /><br /><br /><br /><br /><br />
238 238
   </td>
239 239
   <td align="center">
@@ -254,11 +254,11 @@  discard block
 block discarded – undo
254 254
 	<td colspan="3" align="center">
255 255
 		<br />
256 256
 		<?php
257
-		if(isset($_GET['add']))
258
-			echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
259
-		else
260
-			echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
261
-		?>
257
+        if(isset($_GET['add']))
258
+            echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
259
+        else
260
+            echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
261
+        ?>
262 262
 	</td>
263 263
 </tr>
264 264
 </table>
Please login to merge, or discard this patch.
main/admin/promotions.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
 <script>
113 113
 $(function() {
114 114
 <?php
115
-     echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
115
+        echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
116 116
 ?>
117 117
 });
118 118
 </script>
Please login to merge, or discard this patch.
main/admin/access_url_add_courses_to_url.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
       <?php
108 108
         echo Display :: get_alphabet_options($first_letter_course);
109 109
         echo Display :: get_numeric_options(0,9,$first_letter_course);
110
-      ?>
110
+        ?>
111 111
      </select>
112 112
     </td>
113 113
         <td width="20%">&nbsp;</td>
Please login to merge, or discard this patch.
main/admin/access_url_add_users_to_url.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
 
14 14
 api_protect_global_admin_script();
15 15
 if (!api_get_multiple_access_url()) {
16
-	header('Location: index.php');
17
-	exit;
16
+    header('Location: index.php');
17
+    exit;
18 18
 }
19 19
 
20 20
 $form_sent = 0;
@@ -44,36 +44,36 @@  discard block
 block discarded – undo
44 44
 api_display_tool_title($tool_name);
45 45
 
46 46
 if ($_POST['form_sent']) {
47
-	$form_sent = $_POST['form_sent'];
48
-	$users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
49
-	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
50
-	$first_letter_user = $_POST['first_letter_user'];
47
+    $form_sent = $_POST['form_sent'];
48
+    $users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
49
+    $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
50
+    $first_letter_user = $_POST['first_letter_user'];
51 51
 
52
-	foreach($users as $key => $value) {
53
-		$users[$key] = intval($value);
54
-	}
52
+    foreach($users as $key => $value) {
53
+        $users[$key] = intval($value);
54
+    }
55 55
 
56
-	if ($form_sent == 1) {
57
-		if (count($users) == 0 || count($url_list) == 0) {
58
-			Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
59
-		} else {
60
-			UrlManager::add_users_to_urls($users,$url_list);
61
-			Display :: display_confirmation_message(get_lang('UsersBelongURL'));
62
-		}
63
-	}
56
+    if ($form_sent == 1) {
57
+        if (count($users) == 0 || count($url_list) == 0) {
58
+            Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
59
+        } else {
60
+            UrlManager::add_users_to_urls($users,$url_list);
61
+            Display :: display_confirmation_message(get_lang('UsersBelongURL'));
62
+        }
63
+    }
64 64
 }
65 65
 
66 66
 /*	Display GUI	*/
67 67
 if (empty($first_letter_user)) {
68
-	$sql = "SELECT count(*) as nb_users FROM $tbl_user";
69
-	$result = Database::query($sql);
70
-	$num_row = Database::fetch_array($result);
68
+    $sql = "SELECT count(*) as nb_users FROM $tbl_user";
69
+    $result = Database::query($sql);
70
+    $num_row = Database::fetch_array($result);
71 71
     if ($num_row['nb_users']>1000) {
72 72
         //if there are too much users to gracefully handle with the HTML select list,
73 73
         // assign a default filter on users names
74 74
         $first_letter_user = 'A';
75 75
     }
76
-	unset($result);
76
+    unset($result);
77 77
 }
78 78
 $first_letter_user_lower = Database::escape_string(api_strtolower($first_letter_user));
79 79
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
       <option value="">--</option>
105 105
       <?php
106 106
         echo Display :: get_alphabet_options($first_letter_user);
107
-      ?>
107
+        ?>
108 108
      </select>
109 109
     </td>
110 110
         <td width="20%">&nbsp;</td>
@@ -116,14 +116,14 @@  discard block
 block discarded – undo
116 116
     <td width="40%" align="center">
117 117
      <select name="user_list[]" multiple="multiple" size="20" style="width:380px;">
118 118
 		<?php
119
-		foreach ($db_users as $user) {
120
-		?>
119
+        foreach ($db_users as $user) {
120
+        ?>
121 121
             <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
122 122
                 <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
123 123
             </option>
124 124
 		<?php
125
-		}
126
-		?>
125
+        }
126
+        ?>
127 127
     </select>
128 128
    </td>
129 129
    <td width="20%" valign="middle" align="center">
@@ -132,14 +132,14 @@  discard block
 block discarded – undo
132 132
    <td width="40%" align="center">
133 133
     <select name="url_list[]" multiple="multiple" size="20" style="width:230px;">
134 134
 		<?php
135
-		foreach ($db_urls as $url_obj) {
136
-			?>
135
+        foreach ($db_urls as $url_obj) {
136
+            ?>
137 137
 			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>>
138 138
                 <?php echo $url_obj['url']; ?>
139 139
 			</option>
140 140
 			<?php
141
-		}
142
-		?>
141
+        }
142
+        ?>
143 143
     </select>
144 144
    </td>
145 145
   </tr>
Please login to merge, or discard this patch.
main/admin/filler.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
 $output = array();
31 31
 if (!empty($_GET['fill'])) {
32 32
     switch ($_GET['fill']) {
33
-    	case 'users':
34
-        	require api_get_path(SYS_TEST_PATH).'datafiller/fill_users.php';
33
+        case 'users':
34
+            require api_get_path(SYS_TEST_PATH).'datafiller/fill_users.php';
35 35
             $output = fill_users();
36 36
             break;
37 37
         case 'courses':
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
     $result .= '<table>';
54 54
     foreach ($output as $line) {
55 55
         $result .= '<tr>';
56
-	    $result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td><td class="filler-report-data">'.$line['line-info'].'</td>';
57
-	    $result .= '</tr>';
56
+        $result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td><td class="filler-report-data">'.$line['line-info'].'</td>';
57
+        $result .= '</tr>';
58 58
     }
59 59
     $result .= '</table>';
60 60
     $result .= '</div>';
Please login to merge, or discard this patch.
main/admin/access_url_edit_course_category_to_url.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
124 124
 }
125 125
 
126 126
 if ($add_type == 'multiple') {
127
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
128
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
127
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
128
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
129 129
 } else {
130
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
131
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
130
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
131
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
132 132
 }
133 133
 
134 134
 $url_list = UrlManager::get_url_data();
@@ -192,34 +192,34 @@  discard block
 block discarded – undo
192 192
     <?php } else { ?>
193 193
 	  <select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
194 194
 		<?php
195
-		foreach ($noUserGroupList as $noItem) {
196
-		?>
195
+        foreach ($noUserGroupList as $noItem) {
196
+        ?>
197 197
 			<option value="<?php echo $noItem['id']; ?>">
198 198
                 <?php echo $noItem['name']; ?>
199 199
             </option>
200 200
 		<?php
201
-		}
202
-		?>
201
+        }
202
+        ?>
203 203
 	  </select>
204 204
 	<?php
205
-  	  }
206
-  	 ?>
205
+        }
206
+        ?>
207 207
   </div>
208 208
   </td>
209 209
   <td width="10%" valign="middle" align="center">
210 210
   <?php
211
-  if ($ajax_search) {
212
-	?>
211
+    if ($ajax_search) {
212
+    ?>
213 213
 	<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" ></button>
214 214
   	<?php
215
-  } else {
216
-  	?>
215
+    } else {
216
+        ?>
217 217
 	<button class="arrowr" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" ></button>
218 218
 	<br /><br />
219 219
 	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" ></button>
220 220
 	<?php
221
-  }
222
-  ?>
221
+    }
222
+    ?>
223 223
 	<br /><br /><br /><br /><br /><br />
224 224
   </td>
225 225
   <td align="center">
@@ -240,11 +240,11 @@  discard block
 block discarded – undo
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>';
247
-		?>
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
+        ?>
248 248
 	</td>
249 249
 </tr>
250 250
 </table>
Please login to merge, or discard this patch.
main/admin/specific_fields.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -43,15 +43,15 @@  discard block
 block discarded – undo
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
 block discarded – undo
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">';
Please login to merge, or discard this patch.
main/admin/configure_extensions.php 1 patch
Indentation   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -14,24 +14,24 @@  discard block
 block discarded – undo
14 14
 $message = '';
15 15
 
16 16
 if (isset($_POST['activeExtension'])) {
17
-	switch ($_POST['extension_code']) {
18
-		case 'visio' :
19
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
17
+    switch ($_POST['extension_code']) {
18
+        case 'visio' :
19
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
20 20
 					selected_value="true"
21 21
 					WHERE variable="service_visio"
22 22
 					AND subkey="active"';
23
-			$rs = Database::query($sql);
24
-			if (Database::affected_rows($rs)>0) {
25
-				// select all the courses and insert the tool inside
26
-				$sql = 'SELECT id FROM '.Database::get_main_table(TABLE_MAIN_COURSE);
27
-				$rs = Database::query($sql);
28
-				while($row = Database::fetch_array($rs)){
29
-					if(!empty($_POST['visio_host'])) {
30
-						$tool_table = Database::get_course_table(TABLE_TOOL_LIST);
31
-						$select = "SELECT id FROM $tool_table WHERE c_id =".$row['id']." AND name='".TOOL_VISIO_CONFERENCE."'";
32
-						$selectres = Database::query($select);
33
-						if (Database::num_rows($selectres)<1) {
34
-							$sql = 'INSERT INTO '.$tool_table.' SET
23
+            $rs = Database::query($sql);
24
+            if (Database::affected_rows($rs)>0) {
25
+                // select all the courses and insert the tool inside
26
+                $sql = 'SELECT id FROM '.Database::get_main_table(TABLE_MAIN_COURSE);
27
+                $rs = Database::query($sql);
28
+                while($row = Database::fetch_array($rs)){
29
+                    if(!empty($_POST['visio_host'])) {
30
+                        $tool_table = Database::get_course_table(TABLE_TOOL_LIST);
31
+                        $select = "SELECT id FROM $tool_table WHERE c_id =".$row['id']." AND name='".TOOL_VISIO_CONFERENCE."'";
32
+                        $selectres = Database::query($select);
33
+                        if (Database::num_rows($selectres)<1) {
34
+                            $sql = 'INSERT INTO '.$tool_table.' SET
35 35
 							        c_id =  '.$row['id'].',
36 36
 									name="'.TOOL_VISIO_CONFERENCE.'",
37 37
 									link="conference/index.php?type=conference",
@@ -41,12 +41,12 @@  discard block
 block discarded – undo
41 41
 									address="squaregrey.gif",
42 42
 									target="_self",
43 43
 									category="interaction"';
44
-							Database::query($sql);
45
-						}
46
-						$select = "SELECT id FROM $tool_table WHERE c_id =".$row['id']." AND name='".TOOL_VISIO_CLASSROOM."'";
47
-						$selectres = Database::query($select);
48
-						if(Database::num_rows($selectres)<1) {
49
-							$sql = 'INSERT INTO '.$tool_table.' SET
44
+                            Database::query($sql);
45
+                        }
46
+                        $select = "SELECT id FROM $tool_table WHERE c_id =".$row['id']." AND name='".TOOL_VISIO_CLASSROOM."'";
47
+                        $selectres = Database::query($select);
48
+                        if(Database::num_rows($selectres)<1) {
49
+                            $sql = 'INSERT INTO '.$tool_table.' SET
50 50
 							        c_id =  '.$row['id'].',
51 51
 									name="'.TOOL_VISIO_CLASSROOM.'",
52 52
 									link="conference/index.php?type=classroom",
@@ -56,92 +56,92 @@  discard block
 block discarded – undo
56 56
 									address="squaregrey.gif",
57 57
 									target="_self",
58 58
 									category="authoring"';
59
-							Database::query($sql);
60
-						}
61
-					}
62
-				}
63
-				$message = get_lang('ServiceActivated');
64
-
65
-			}
66
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
59
+                            Database::query($sql);
60
+                        }
61
+                    }
62
+                }
63
+                $message = get_lang('ServiceActivated');
64
+
65
+            }
66
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
67 67
 					selected_value="'.Database::escape_string($_POST['visio_host']).'"
68 68
 					WHERE variable="service_visio"
69 69
 					AND subkey="visio_host"';
70
-			$rs = Database::query($sql);
70
+            $rs = Database::query($sql);
71 71
 
72
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
72
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
73 73
 					selected_value="'.Database::escape_string($_POST['visio_port']).'"
74 74
 					WHERE variable="service_visio"
75 75
 					AND subkey="visio_port"';
76
-			$rs = Database::query($sql);
76
+            $rs = Database::query($sql);
77 77
 
78
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
78
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
79 79
 					selected_value="'.Database::escape_string($_POST['visio_pass']).'"
80 80
 					WHERE variable="service_visio"
81 81
 					AND subkey="visio_pass"';
82
-			$rs = Database::query($sql);
82
+            $rs = Database::query($sql);
83 83
 
84
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
84
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
85 85
 					selected_value="'.($_POST['visio_use_rtmpt']=='true'?'true':'false').'"
86 86
 					WHERE variable="service_visio"
87 87
 					AND subkey="visio_use_rtmpt"';
88
-			$rs = Database::query($sql);
88
+            $rs = Database::query($sql);
89 89
 
90
-			if(empty($message)) {
91
-				$message = get_lang('ServiceReconfigured');
92
-			}
93
-			break;
90
+            if(empty($message)) {
91
+                $message = get_lang('ServiceReconfigured');
92
+            }
93
+            break;
94 94
 
95
-		case 'ppt2lp' :
96
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
95
+        case 'ppt2lp' :
96
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
97 97
 					selected_value="true"
98 98
 					WHERE variable="service_ppt2lp"
99 99
 					AND subkey="active"';
100 100
 
101
-			$rs = Database::query($sql);
101
+            $rs = Database::query($sql);
102 102
 
103
-			if (Database::affected_rows($rs)>0){
104
-				$message = get_lang('ServiceActivated');
105
-			}
103
+            if (Database::affected_rows($rs)>0){
104
+                $message = get_lang('ServiceActivated');
105
+            }
106 106
 
107
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
107
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
108 108
 					selected_value="'.addslashes($_POST['host']).'"
109 109
 					WHERE variable="service_ppt2lp"
110 110
 					AND subkey="host"';
111
-			Database::query($sql);
111
+            Database::query($sql);
112 112
 
113
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
113
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
114 114
 					selected_value="'.addslashes($_POST['port']).'"
115 115
 					WHERE variable="service_ppt2lp"
116 116
 					AND subkey="port"';
117
-			Database::query($sql);
117
+            Database::query($sql);
118 118
 
119
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
119
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
120 120
 					selected_value="'.addslashes($_POST['ftp_password']).'"
121 121
 					WHERE variable="service_ppt2lp"
122 122
 					AND subkey="ftp_password"';
123
-			Database::query($sql);
123
+            Database::query($sql);
124 124
 
125
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
125
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
126 126
 					selected_value="'.addslashes($_POST['user']).'"
127 127
 					WHERE variable="service_ppt2lp"
128 128
 					AND subkey="user"';
129
-			Database::query($sql);
129
+            Database::query($sql);
130 130
 
131
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
131
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
132 132
 					selected_value="'.addslashes($_POST['path_to_lzx']).'"
133 133
 					WHERE variable="service_ppt2lp"
134 134
 					AND subkey="path_to_lzx"';
135
-			Database::query($sql);
135
+            Database::query($sql);
136 136
 
137
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
137
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
138 138
 					selected_value="'.addslashes($_POST['size']).'"
139 139
 					WHERE variable="service_ppt2lp"
140 140
 					AND subkey="size"';
141
-			Database::query($sql);
141
+            Database::query($sql);
142 142
 
143
-			break;
144
-	}
143
+            break;
144
+    }
145 145
 
146 146
 }
147 147
 
@@ -154,14 +154,14 @@  discard block
 block discarded – undo
154 154
 
155 155
 $rs = Database::query($sql);
156 156
 while($row = Database::fetch_array($rs)){
157
-	$listActiveServices[] = $row['variable'];
157
+    $listActiveServices[] = $row['variable'];
158 158
 }
159 159
 
160 160
 // javascript to handle accordion behaviour
161 161
 $javascript_message = '';
162 162
 if(!empty($message)){
163
-	$javascript_message =
164
-	'
163
+    $javascript_message =
164
+    '
165 165
 	document.getElementById("message").style.display = "block";
166 166
 	var timer = setTimeout(hideMessage,5000);
167 167
 	';
@@ -215,9 +215,9 @@  discard block
 block discarded – undo
215 215
 ?>
216 216
 <div id="message" style="display: none">
217 217
 	<?php
218
-	if(!empty($message))
219
-		Display::display_normal_message($message)
220
-	?>
218
+    if(!empty($message))
219
+        Display::display_normal_message($message)
220
+    ?>
221 221
 </div>
222 222
 
223 223
 <div id="content" align="center">
@@ -303,63 +303,63 @@  discard block
 block discarded – undo
303 303
                     <form method="POST" class="form-horizontal" action="<?php echo api_get_self(); ?>">
304 304
 						<?php
305 305
 
306
-						$form = new FormValidator('ppt2lp');
307
-						$form -> addElement('text', 'host', get_lang('Host'));
308
-						//$form -> addElement('html','<br /><br />');
309
-						$form -> addElement('text', 'port', get_lang('Port'));
310
-						//$form -> addElement('html','<br /><br />');
311
-						$form -> addElement('text', 'user', get_lang('UserOnHost'));
312
-						//$form -> addElement('html','<br /><br />');
313
-						$form -> addElement('text', 'ftp_password', get_lang('FtpPassword'));
314
-						//$form -> addElement('html','<br /><br />');
315
-						$form -> addElement('text', 'path_to_lzx', get_lang('PathToLzx'));
316
-						//$form -> addElement('html','<br /><br />');
317
-						$options = array(
318
-									'540x405'=>'540x405',
319
-									'640x480'=>'640x480',
320
-									'720x540'=>'720x540',
321
-									'800x600'=>'800x600',
322
-									'1000x750'=>'1000x750'
323
-									);
324
-						$form -> addElement('select', 'size', get_lang('SlideSize'), $options);
325
-
326
-
327
-						$form -> addElement('hidden', 'extension_code', 'ppt2lp');
328
-
329
-						$defaults = array();
330
-						$renderer = $form -> defaultRenderer();
331
-						$renderer -> setElementTemplate('<div style="text-align:left">{label}</div><div style="text-align:left">{element}</div>');
332
-						//$form -> addElement('html','<br /><br />');
333
-						if(in_array('service_ppt2lp',$listActiveServices))
334
-						{
335
-							$sql = 'SELECT subkey, selected_value FROM '.$tbl_settings_current.'
306
+                        $form = new FormValidator('ppt2lp');
307
+                        $form -> addElement('text', 'host', get_lang('Host'));
308
+                        //$form -> addElement('html','<br /><br />');
309
+                        $form -> addElement('text', 'port', get_lang('Port'));
310
+                        //$form -> addElement('html','<br /><br />');
311
+                        $form -> addElement('text', 'user', get_lang('UserOnHost'));
312
+                        //$form -> addElement('html','<br /><br />');
313
+                        $form -> addElement('text', 'ftp_password', get_lang('FtpPassword'));
314
+                        //$form -> addElement('html','<br /><br />');
315
+                        $form -> addElement('text', 'path_to_lzx', get_lang('PathToLzx'));
316
+                        //$form -> addElement('html','<br /><br />');
317
+                        $options = array(
318
+                                    '540x405'=>'540x405',
319
+                                    '640x480'=>'640x480',
320
+                                    '720x540'=>'720x540',
321
+                                    '800x600'=>'800x600',
322
+                                    '1000x750'=>'1000x750'
323
+                                    );
324
+                        $form -> addElement('select', 'size', get_lang('SlideSize'), $options);
325
+
326
+
327
+                        $form -> addElement('hidden', 'extension_code', 'ppt2lp');
328
+
329
+                        $defaults = array();
330
+                        $renderer = $form -> defaultRenderer();
331
+                        $renderer -> setElementTemplate('<div style="text-align:left">{label}</div><div style="text-align:left">{element}</div>');
332
+                        //$form -> addElement('html','<br /><br />');
333
+                        if(in_array('service_ppt2lp',$listActiveServices))
334
+                        {
335
+                            $sql = 'SELECT subkey, selected_value FROM '.$tbl_settings_current.'
336 336
 									WHERE variable = "service_ppt2lp"
337 337
 									AND subkey <> "active"';
338
-							$rs = Database::query($sql);
339
-							while($row = Database::fetch_array($rs,'ASSOC'))
340
-							{
341
-								$defaults[$row['subkey']] = $row['selected_value'];
342
-							}
343
-							$form->addButtonSave(get_lang('ReconfigureExtension'), 'activeExtension');
344
-						}
345
-						else {
346
-							$defaults['host'] = 'localhost';
347
-							$defaults['port'] = '2002';
348
-							$defaults['size'] = '720x540';
349
-							$form->addButtonSave(get_lang('ActivateExtension'), 'activeExtension');
350
-						}
351
-
352
-						$form -> setDefaults($defaults);
353
-						$form -> display();
354
-						echo '<br />';
355
-						?>
338
+                            $rs = Database::query($sql);
339
+                            while($row = Database::fetch_array($rs,'ASSOC'))
340
+                            {
341
+                                $defaults[$row['subkey']] = $row['selected_value'];
342
+                            }
343
+                            $form->addButtonSave(get_lang('ReconfigureExtension'), 'activeExtension');
344
+                        }
345
+                        else {
346
+                            $defaults['host'] = 'localhost';
347
+                            $defaults['port'] = '2002';
348
+                            $defaults['size'] = '720x540';
349
+                            $form->addButtonSave(get_lang('ActivateExtension'), 'activeExtension');
350
+                        }
351
+
352
+                        $form -> setDefaults($defaults);
353
+                        $form -> display();
354
+                        echo '<br />';
355
+                        ?>
356 356
 						</form>
357 357
                 </div>
358 358
             </div>
359 359
         </div>
360 360
 	
361 361
 	<?php
362
-	/*
362
+    /*
363 363
 	<!-- EPHORUS -->
364 364
 	<div id="main_ephorus">
365 365
 		<div id="extension_header_ephorus" class="accordion_header">
Please login to merge, or discard this patch.