← Back to branch summary

~ubuntu-branches/ubuntu/karmic/phppgadmin/karmic

« back to all changes in this revision

Viewing changes to database.php

  • Committer: Bazaar Package Importer
  • Author(s): Peter Eisentraut
  • Date: 2008-12-31 19:32:22 UTC
  • mfrom: (1.3.1 upstream) (8.1.2 sid)
  • mto: (8.1.4 sid)
  • mto: This revision was merged to the branch mainline in revision 17.
  • Revision ID: james.westby@ubuntu.com-20081231193222-swr5hb1fie1enl4l
http://bugs.debian.org/508026
http://bugs.debian.org/508026
* New upstream release
  - Fixes local file inclusion vulnerability (CVE-2008-5587) (closes: #508026)
* Removed register_globals from debian/apache.conf (closes: #508026)

Show diffs side-by-side

added added

removed removed

Lines of Context:
database.php
36
36
                global $data, $misc;
37
37
                global $lang, $conf;
38
38
 
39
 
                if (!isset($_GET['term'])) $_GET['term'] = '';
40
 
                if (!isset($_GET['filter'])) $_GET['filter'] = '';
 
39
                if (!isset($_REQUEST['term'])) $_REQUEST['term'] = '';
 
40
                if (!isset($_REQUEST['filter'])) $_REQUEST['filter'] = '';
41
41
 
42
42
                $misc->printTrail('database');
43
43
                $misc->printTabs('database','find');
44
44
                $misc->printMsg($msg);
45
45
                
46
 
                echo "<form action=\"database.php\" method=\"get\">\n";
47
 
                echo "<p><input name=\"term\" value=\"", htmlspecialchars($_GET['term']), 
 
46
                echo "<form action=\"database.php\" method=\"post\">\n";
 
47
                echo "<p><input name=\"term\" value=\"", htmlspecialchars($_REQUEST['term']), 
48
48
                        "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />\n";
49
49
                // Output list of filters.  This is complex due to all the 'has' and 'conf' feature possibilities
50
50
                echo "<select name=\"filter\">\n";
51
 
                echo "\t<option value=\"\"", ($_GET['filter'] == '') ? ' selected="selected"' : '', ">{$lang['strallobjects']}</option>\n";
 
51
                echo "\t<option value=\"\"", ($_REQUEST['filter'] == '') ? ' selected="selected"' : '', ">{$lang['strallobjects']}</option>\n";
52
52
                if ($data->hasSchemas())
53
 
                        echo "\t<option value=\"SCHEMA\"", ($_GET['filter'] == 'SCHEMA') ? ' selected="selected"' : '', ">{$lang['strschemas']}</option>\n";
54
 
                echo "\t<option value=\"TABLE\"", ($_GET['filter'] == 'TABLE') ? ' selected="selected"' : '', ">{$lang['strtables']}</option>\n";
55
 
                echo "\t<option value=\"VIEW\"", ($_GET['filter'] == 'VIEW') ? ' selected="selected"' : '', ">{$lang['strviews']}</option>\n";
56
 
                echo "\t<option value=\"SEQUENCE\"", ($_GET['filter'] == 'SEQUENCE') ? ' selected="selected"' : '', ">{$lang['strsequences']}</option>\n";
57
 
                echo "\t<option value=\"COLUMN\"", ($_GET['filter'] == 'COLUMN') ? ' selected="selected"' : '', ">{$lang['strcolumns']}</option>\n";
58
 
                echo "\t<option value=\"RULE\"", ($_GET['filter'] == 'RULE') ? ' selected="selected"' : '', ">{$lang['strrules']}</option>\n";
59
 
                echo "\t<option value=\"INDEX\"", ($_GET['filter'] == 'INDEX') ? ' selected="selected"' : '', ">{$lang['strindexes']}</option>\n";
60
 
                echo "\t<option value=\"TRIGGER\"", ($_GET['filter'] == 'TRIGGER') ? ' selected="selected"' : '', ">{$lang['strtriggers']}</option>\n";
61
 
                echo "\t<option value=\"CONSTRAINT\"", ($_GET['filter'] == 'CONSTRAINT') ? ' selected="selected"' : '', ">{$lang['strconstraints']}</option>\n";
62
 
                echo "\t<option value=\"FUNCTION\"", ($_GET['filter'] == 'FUNCTION') ? ' selected="selected"' : '', ">{$lang['strfunctions']}</option>\n";
 
53
                        echo "\t<option value=\"SCHEMA\"", ($_REQUEST['filter'] == 'SCHEMA') ? ' selected="selected"' : '', ">{$lang['strschemas']}</option>\n";
 
54
                echo "\t<option value=\"TABLE\"", ($_REQUEST['filter'] == 'TABLE') ? ' selected="selected"' : '', ">{$lang['strtables']}</option>\n";
 
55
                echo "\t<option value=\"VIEW\"", ($_REQUEST['filter'] == 'VIEW') ? ' selected="selected"' : '', ">{$lang['strviews']}</option>\n";
 
56
                echo "\t<option value=\"SEQUENCE\"", ($_REQUEST['filter'] == 'SEQUENCE') ? ' selected="selected"' : '', ">{$lang['strsequences']}</option>\n";
 
57
                echo "\t<option value=\"COLUMN\"", ($_REQUEST['filter'] == 'COLUMN') ? ' selected="selected"' : '', ">{$lang['strcolumns']}</option>\n";
 
58
                echo "\t<option value=\"RULE\"", ($_REQUEST['filter'] == 'RULE') ? ' selected="selected"' : '', ">{$lang['strrules']}</option>\n";
 
59
                echo "\t<option value=\"INDEX\"", ($_REQUEST['filter'] == 'INDEX') ? ' selected="selected"' : '', ">{$lang['strindexes']}</option>\n";
 
60
                echo "\t<option value=\"TRIGGER\"", ($_REQUEST['filter'] == 'TRIGGER') ? ' selected="selected"' : '', ">{$lang['strtriggers']}</option>\n";
 
61
                echo "\t<option value=\"CONSTRAINT\"", ($_REQUEST['filter'] == 'CONSTRAINT') ? ' selected="selected"' : '', ">{$lang['strconstraints']}</option>\n";
 
62
                echo "\t<option value=\"FUNCTION\"", ($_REQUEST['filter'] == 'FUNCTION') ? ' selected="selected"' : '', ">{$lang['strfunctions']}</option>\n";
63
63
                if ($data->hasDomains())
64
 
                        echo "\t<option value=\"DOMAIN\"", ($_GET['filter'] == 'DOMAIN') ? ' selected="selected"' : '', ">{$lang['strdomains']}</option>\n";
 
64
                        echo "\t<option value=\"DOMAIN\"", ($_REQUEST['filter'] == 'DOMAIN') ? ' selected="selected"' : '', ">{$lang['strdomains']}</option>\n";
65
65
                if ($conf['show_advanced']) {
66
 
                        echo "\t<option value=\"AGGREGATE\"", ($_GET['filter'] == 'AGGREGATE') ? ' selected="selected"' : '', ">{$lang['straggregates']}</option>\n";
67
 
                        echo "\t<option value=\"TYPE\"", ($_GET['filter'] == 'TYPE') ? ' selected="selected"' : '', ">{$lang['strtypes']}</option>\n";
68
 
                        echo "\t<option value=\"OPERATOR\"", ($_GET['filter'] == 'OPERATOR') ? ' selected="selected"' : '', ">{$lang['stroperators']}</option>\n";
69
 
                        echo "\t<option value=\"OPCLASS\"", ($_GET['filter'] == 'OPCLASS') ? ' selected="selected"' : '', ">{$lang['stropclasses']}</option>\n";
 
66
                        echo "\t<option value=\"AGGREGATE\"", ($_REQUEST['filter'] == 'AGGREGATE') ? ' selected="selected"' : '', ">{$lang['straggregates']}</option>\n";
 
67
                        echo "\t<option value=\"TYPE\"", ($_REQUEST['filter'] == 'TYPE') ? ' selected="selected"' : '', ">{$lang['strtypes']}</option>\n";
 
68
                        echo "\t<option value=\"OPERATOR\"", ($_REQUEST['filter'] == 'OPERATOR') ? ' selected="selected"' : '', ">{$lang['stroperators']}</option>\n";
 
69
                        echo "\t<option value=\"OPCLASS\"", ($_REQUEST['filter'] == 'OPCLASS') ? ' selected="selected"' : '', ">{$lang['stropclasses']}</option>\n";
70
70
                        if ($data->hasConversions())
71
 
                                echo "\t<option value=\"CONVERSION\"", ($_GET['filter'] == 'CONVERSION') ? ' selected="selected"' : '', ">{$lang['strconversions']}</option>\n";
72
 
                        echo "\t<option value=\"LANGUAGE\"", ($_GET['filter'] == 'LANGUAGE') ? ' selected="selected"' : '', ">{$lang['strlanguages']}</option>\n";
 
71
                                echo "\t<option value=\"CONVERSION\"", ($_REQUEST['filter'] == 'CONVERSION') ? ' selected="selected"' : '', ">{$lang['strconversions']}</option>\n";
 
72
                        echo "\t<option value=\"LANGUAGE\"", ($_REQUEST['filter'] == 'LANGUAGE') ? ' selected="selected"' : '', ">{$lang['strlanguages']}</option>\n";
73
73
                }
74
74
                echo "</select>\n";
75
75
                echo "<input type=\"submit\" value=\"{$lang['strfind']}\" />\n";
82
82
 
83
83
                // If a search term has been specified, then perform the search
84
84
                // and display the results, grouped by object type
85
 
                if ($_GET['term'] != '') {
86
 
                        $rs = $data->findObject($_GET['term'], $_GET['filter']);
 
85
                if ($_REQUEST['term'] != '') {
 
86
                        $rs = $data->findObject($_REQUEST['term'], $_REQUEST['filter']);
87
87
                        if ($rs->recordCount() > 0) {
88
88
                                $curr = '';
89
89
                                while (!$rs->EOF) {
173
173
                                                
174
174
                                        switch ($curr) {
175
175
                                                case 'SCHEMA':                                          
176
 
                                                        echo "<li><a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", $misc->printVal($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
176
                                                        echo "<li><a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", $misc->printVal($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
177
177
                                                        break;
178
178
                                                case 'TABLE':
179
179
                                                        echo "<li>";
180
180
                                                        if (!empty($prefix))
181
181
                                                                echo "<a href=\"tables.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
182
182
                                                        echo "<a href=\"redirect.php?subject=table&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
183
 
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
183
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
184
184
                                                        break;
185
185
                                                case 'VIEW':
186
186
                                                        echo "<li>";
187
187
                                                        if (!empty($prefix))
188
188
                                                                echo "<a href=\"views.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
189
189
                                                        echo "<a href=\"redirect.php?subject=view&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;view=", 
190
 
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
190
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
191
191
                                                        break;
192
192
                                                case 'SEQUENCE':
193
193
                                                        echo "<li>";
194
194
                                                        if (!empty($prefix))
195
195
                                                                echo "<a href=\"sequences.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
196
196
                                                        echo "<a href=\"sequences.php?subject=sequence&amp;action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), 
197
 
                                                                "&amp;sequence=", urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
197
                                                                "&amp;sequence=", urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
198
198
                                                        break;
199
199
                                                case 'COLUMNTABLE':
200
200
                                                        echo "<li>";
203
203
                                                        echo "<a href=\"tblproperties.php?subject=table&amp;{$misc->href}&amp;table=", urlencode($rs->fields['relname']), "&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), "</a>.";
204
204
                                                        echo "<a href=\"colproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
205
205
                                                                urlencode($rs->fields['relname']), "&amp;column=", urlencode($rs->fields['name']), "\">", 
206
 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
206
                                                                _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
207
207
                                                        break;
208
208
                                                case 'COLUMNVIEW':
209
209
                                                        echo "<li>";
212
212
                                                         echo "<a href=\"viewproperties.php?subject=view&amp;{$misc->href}&amp;view=", urlencode($rs->fields['relname']), "&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), "</a>.";
213
213
                                                        echo "<a href=\"colproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;view=", 
214
214
                                                                urlencode($rs->fields['relname']), "&amp;column=", urlencode($rs->fields['name']), "\">", 
215
 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
215
                                                                _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
216
216
                                                        break;
217
217
                                                case 'INDEX':
218
218
                                                        echo "<li>";
219
219
                                                        if (!empty($prefix))
220
220
                                                                echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "}</a>.";
221
221
                                                        echo "<a href=\"redirect.php?subject=table&amp;{$misc->href}&amp;table=", urlencode($rs->fields['relname']), "&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), "</a>.";
222
 
                                                        echo "<a href=\"indexes.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
222
                                                        echo "<a href=\"indexes.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
223
223
                                                        break;
224
224
                                                case 'CONSTRAINTTABLE':
225
225
                                                        echo "<li>";
227
227
                                                                echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
228
228
                                                        echo "<a href=\"redirect.php?subject=table&amp;{$misc->href}&amp;table=", urlencode($rs->fields['relname']), "&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), "</a>.";
229
229
                                                        echo "<a href=\"constraints.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
230
 
                                                                urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
230
                                                                urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
231
231
                                                        break;
232
232
                                                case 'CONSTRAINTDOMAIN':
233
233
                                                        echo "<li>";
234
234
                                                        if (!empty($prefix))
235
235
                                                                echo "<a href=\"domains.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), "</a>.";
236
236
                                                        echo "<a href=\"domains.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;domain=", urlencode($rs->fields['relname']), "\">", 
237
 
                                                                $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
237
                                                                $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
238
238
                                                        break;
239
239
                                                case 'TRIGGER':
240
240
                                                        echo "<li>";
242
242
                                                                echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), "</a>.";
243
243
                                                        echo "<a href=\"redirect.php?subject=table&amp;{$misc->href}&amp;table=", urlencode($rs->fields['relname']), "&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), "</a>.";
244
244
                                                        echo "<a href=\"triggers.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", urlencode($rs->fields['relname']), "\">", 
245
 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
245
                                                                _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
246
246
                                                        break;
247
247
                                                case 'RULETABLE':
248
248
                                                        echo "<li>";
250
250
                                                                echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), "</a>.";
251
251
                                                        echo "<a href=\"redirect.php?subject=table&amp;{$misc->href}&amp;table=", urlencode($rs->fields['relname']), "&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), "</a>.";
252
252
                                                        echo "<a href=\"rules.php?subject=table&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;reltype=table&amp;table=", 
253
 
                                                                urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
253
                                                                urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
254
254
                                                        break;
255
255
                                                case 'RULEVIEW':
256
256
                                                        echo "<li>";
258
258
                                                                echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), "</a>.";
259
259
                                                        echo "<a href=\"redirect.php?subject=view&amp;{$misc->href}&amp;view=", urlencode($rs->fields['relname']), "&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($rs->fields['relname']), "</a>.";
260
260
                                                        echo "<a href=\"rules.php?subject=view&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;reltype=view&amp;view=", 
261
 
                                                                urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
261
                                                                urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
262
262
                                                        break;
263
263
                                                case 'FUNCTION':
264
264
                                                        echo "<li>";
266
266
                                                                echo "<a href=\"functions.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
267
267
                                                        echo "<a href=\"functions.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;function=", 
268
268
                                                                urlencode($rs->fields['name']), "&amp;function_oid=", urlencode($rs->fields['oid']), "\">", 
269
 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
269
                                                                _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
270
270
                                                        break;
271
271
                                                case 'TYPE':
272
272
                                                        echo "<li>";
273
273
                                                        if (!empty($prefix))
274
274
                                                                echo "<a href=\"types.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
275
275
                                                        echo "<a href=\"types.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;type=", 
276
 
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
276
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
277
277
                                                        break;
278
278
                                                case 'DOMAIN':
279
279
                                                        echo "<li>";
280
280
                                                        if (!empty($prefix))
281
281
                                                                echo "<a href=\"domains.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
282
282
                                                        echo "<a href=\"domains.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;domain=", 
283
 
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
283
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
284
284
                                                        break;
285
285
                                                case 'OPERATOR':
286
286
                                                        echo "<li>";
287
287
                                                        if (!empty($prefix))
288
288
                                                                echo "<a href=\"operators.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
289
289
                                                        echo "<a href=\"operators.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;operator=", 
290
 
                                                                urlencode($rs->fields['name']), "&amp;operator_oid=", urlencode($rs->fields['oid']) ,"\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
290
                                                                urlencode($rs->fields['name']), "&amp;operator_oid=", urlencode($rs->fields['oid']) ,"\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
291
291
                                                        break;
292
292
                                                case 'CONVERSION':
293
293
                                                        echo "<li>";
294
294
                                                        if (!empty($prefix))
295
295
                                                                echo "<a href=\"conversions.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
296
296
                                                        echo "<a href=\"conversions.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), 
297
 
                                                                "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
297
                                                                "\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
298
298
                                                        break;
299
299
                                                case 'LANGUAGE':
300
 
                                                        echo "<li><a href=\"languages.php?{$misc->href}\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
300
                                                        echo "<li><a href=\"languages.php?{$misc->href}\">", _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
301
301
                                                        break;
302
302
                                                case 'AGGREGATE':
303
303
                                                        echo "<li>";
304
304
                                                        if (!empty($prefix))
305
305
                                                                echo "<a href=\"aggregates.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
306
306
                                                        echo "<a href=\"aggregates.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">",
307
 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
307
                                                                _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
308
308
                                                        break;
309
309
                                                case 'OPCLASS':
310
310
                                                        echo "<li>";
311
311
                                                        if (!empty($prefix))
312
312
                                                                echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
313
313
                                                        echo "<a href=\"opclasses.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">",
314
 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
 
314
                                                                _highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
315
315
                                                        break;
316
316
                                        }
317
317
                                        $rs->moveNext();        
921
921
 
922
922
        switch ($action) {
923
923
                case 'find':
924
 
                        if (isset($_GET['term'])) doFind(false);
 
924
                        if (isset($_REQUEST['term'])) doFind(false);
925
925
                        else doFind(true);
926
926
                        break;
927
927
                case 'recluster':