fix a parse error with php4 I introduced when implemented feature request #922471...
authorioguix <ioguix>
Fri, 20 Apr 2007 15:56:39 +0000 (15:56 +0000)
committerioguix <ioguix>
Fri, 20 Apr 2007 15:56:39 +0000 (15:56 +0000)
database.php

index 5792311de4d74b4ebd5718783e0ac69fff9425ca..4fa97f1c965faa44b02e6ccca5563488a394cd96 100755 (executable)
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.92 2007/04/18 13:29:25 ioguix Exp $
+        * $Id: database.php,v 1.93 2007/04/20 15:56:39 ioguix Exp $
         */
 
        // Include application functions
                                                
                                        switch ($curr) {
                                                case 'SCHEMA':                                          
-                                                       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";
+                                                       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";
                                                        break;
                                                case 'TABLE':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"tables.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"tables.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"redirect.php?subject=table&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'VIEW':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"views.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"views.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"redirect.php?subject=view&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;view=", 
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'SEQUENCE':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"sequences.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"sequences.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"sequences.php?subject=sequence&amp;action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), 
                                                                "&amp;sequence=", urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'COLUMNTABLE':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
-                                                       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>.";
+                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
+                                                       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>.";
                                                        echo "<a href=\"colproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;table=", 
                                                                urlencode($rs->fields['relname']), "&amp;column=", urlencode($rs->fields['name']), "\">", 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                case 'COLUMNVIEW':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
-                                                        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>.";
+                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
+                                                        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>.";
                                                        echo "<a href=\"colproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;view=", 
                                                                urlencode($rs->fields['relname']), "&amp;column=", urlencode($rs->fields['name']), "\">", 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                case 'INDEX':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
-                                                       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>.";
+                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "}</a>.";
+                                                       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>.";
                                                        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";
                                                        break;
                                                case 'CONSTRAINTTABLE':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
-                                                       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>.";
+                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
+                                                       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>.";
                                                        echo "<a href=\"constraints.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";
                                                        break;
                                                case 'CONSTRAINTDOMAIN':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"domains.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"domains.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"domains.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;domain=", urlencode($rs->fields['relname']), "\">", 
                                                                $misc->printVal($rs->fields['relname']), '.', _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'TRIGGER':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($prefix)}</a>.";
-                                                       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>.";
+                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), "</a>.";
+                                                       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>.";
                                                        echo "<a href=\"triggers.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";
                                                        break;
                                                case 'RULETABLE':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($prefix)}</a>.";
-                                                       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>.";
+                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), "</a>.";
+                                                       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>.";
                                                        echo "<a href=\"rules.php?subject=table&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;reltype=table&amp;table=", 
                                                                urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'RULEVIEW':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">{$misc->printVal($prefix)}</a>.";
-                                                       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>.";
+                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">", $misc->printVal($prefix), "</a>.";
+                                                       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>.";
                                                        echo "<a href=\"rules.php?subject=view&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;reltype=view&amp;view=", 
                                                                urlencode($rs->fields['relname']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'FUNCTION':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"functions.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"functions.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"functions.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;function=", 
                                                                urlencode($rs->fields['name']), "&amp;function_oid=", urlencode($rs->fields['oid']), "\">", 
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                case 'TYPE':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"types.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"types.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"types.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;type=", 
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'DOMAIN':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"domains.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"domains.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"domains.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;domain=", 
                                                                urlencode($rs->fields['name']), "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'OPERATOR':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"operators.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"operators.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"operators.php?action=properties&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "&amp;operator=", 
                                                                urlencode($rs->fields['name']), "&amp;operator_oid=", urlencode($rs->fields['oid']) ,"\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'CONVERSION':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"conversions.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"conversions.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"conversions.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), 
                                                                "\">", _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'AGGREGATE':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"aggregates.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"aggregates.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"aggregates.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">",
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;
                                                case 'OPCLASS':
                                                        echo "<li>";
                                                        if (!empty($prefix))
-                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">{$misc->printVal($prefix)}</a>.";
+                                                               echo "<a href=\"redirect.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($prefix), "\">", $misc->printVal($prefix), "</a>.";
                                                        echo "<a href=\"opclasses.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), "\">",
                                                                _highlight($misc->printVal($rs->fields['name']), $_GET['term']), "</a></li>\n";
                                                        break;