Changeset 9184 for trunk/MagicSoft

Timestamp:

12/01/08 12:13:54 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/include.php (modified) (1 diff)
• datacenter/db/menu.php (modified) (1 diff)
• datacenter/db/queryrbk.php (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
      - added check if script is executed with the full path
      - added check if rc-files are existing
+
+   * datacenter/db/menu.php:
+     - removed not needed lines
+
+   * datacenter/db/include.php:
+     - valign='top' for queryrbk.php
+
+   * datacenter/db/queryrbk.php:
+     - added print button
 
 

trunk/MagicSoft/Mars/datacenter/db/include.php

@@ -519 +519 @@
         {
             if (empty($rightalign[$key]))
-                printf("  <td align='left'>");
+                printf("  <td align='left' valign='top'>");
             else
-                printf("  <td align='right'>");
+                printf("  <td align='right' valign='top'>");
 
             $colour='#000000';

trunk/MagicSoft/Mars/datacenter/db/menu.php

@@ -595 +595 @@
 //    printf("<p>");
     if (strchr($_SERVER["REQUEST_URI"], '?')!=FALSE)
+    {
         printf("<input class='Width' type='button' value='Get .txt' onClick='self.location.href=\"%s&amp;fSendTxt=1\"'>&nbsp;&nbsp;&nbsp;\n", htmlspecialchars($_SERVER["REQUEST_URI"]));
-    if (strchr($_SERVER["REQUEST_URI"], '?')!=FALSE)
-    {
         printf("<input class='Width' type='button' value='Print' onClick='self.location.href=\"%s&amp;fPrintTable=1\"'>&nbsp;&nbsp;&nbsp;\n", htmlspecialchars($_SERVER["REQUEST_URI"]));
         printf("MySqlQuery: <img id='showquerybutton' src='../plus.png' alt='+' onClick='showhide(\"showquery\")'>\n");

trunk/MagicSoft/Mars/datacenter/db/queryrbk.php

@@ -23 +23 @@
         printf("%s\">   \n", $_GET["fNight"]);
 
+
         printf("<input class='Width' type='submit' value='Query Table'>&nbsp;&nbsp;&nbsp;\n");
         printf("<input class='Width' type='button' value='Reset' onClick='self.location.href=\"queryrbk.php\"'>&nbsp;&nbsp;&nbsp;\n");
         if (strchr($_SERVER["REQUEST_URI"], '?')!=FALSE)
+        {
             printf("<input class='Width' type='button' value='Get .txt' onClick='self.location.href=\"%s&fSendTxt=1\"'>&nbsp;&nbsp;&nbsp;\n", $_SERVER["REQUEST_URI"]);
+            printf("<input class='Width' type='button' value='Print' onClick='self.location.href=\"%s&amp;fPrintTable=1\"'>&nbsp;&nbsp;&nbsp;\n", htmlspecialchars($_SERVER["REQUEST_URI"]));
+        }
+
         printf("</form>\n");
         printf("</center>\n");
@@ -61 +66 @@
         if ($result0)
         {
-            if ($html=="1")
+            if ($html=="1" || $html=="2")
             {
                 $alias = array
@@ -98 +103 @@
     else
     {
-        echo (file_get_contents("index-header.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-header.html"));
 
         $environment = sizeof($_GET);
 
-        PrintForm($_GET);
+        if (empty($_GET["fPrintTable"]))
+            PrintForm($_GET);
 
         if ($environment==0)
             printf("No query submitted yet.<BR>");
         else
-            PrintPage("1", $host, $user, $pw, $db);
+        {
+            if (empty($_GET["fPrintTable"]))
+                PrintPage("1", $host, $user, $pw, $db);
+            else
+                PrintPage("2", $host, $user, $pw, $db);
+        }
 
-        echo (file_get_contents("index-footer.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-footer.html"));
     }