Merge pull request #583 from greezybacon/issue/579

Fix printing / attachment download issues

Reviewed-With: Peter Rotich <peter@osticket.com>

include/mysqli.php

@@ -229,4 +229,3 @@ function db_errno() {
     return $__db->errno;
 }
 ?>
-

include/staff/header.inc.php

@@ -100,4 +100,3 @@
         <?php }elseif($warn) { ?>
             <div id="msg_warning"><?php echo $warn; ?></div>
         <?php } ?>
-

setup/test/tests/class.test.php

@@ -62,5 +62,14 @@ class Test {
         }
     }
 
+    function line_number_for_offset($filename, $offset) {
+        $lines = file($filename);
+        $bytes = $line = 0;
+        while ($bytes < $offset) {
+            $bytes += strlen(array_shift($lines));
+            $line += 1;
+        }
+        return $line;
+    }
 }
 ?>

setup/test/tests/test.extra-whitespace.php

+<?php
+require_once "class.test.php";
+
+class ExtraWhitespace extends Test {
+    var $name = "PHP Leading and Trailing Whitespace";
+    
+    function testFindWhitespace() {
+        foreach ($this->getAllScripts() as $s) {
+            $matches = array();
+            if (preg_match_all('/^\s+<\?php|\?>\n\s+$/s',
+                    file_get_contents($s), $matches,
+                    PREG_OFFSET_CAPTURE) > 0) {
+                foreach ($matches[0] as $match)
+                    $this->fail(
+                        $s, $this->line_number_for_offset($s, $match[1]),
+                        (strpos('?>', $match[0]) !== false)
+                            ? 'Leading whitespace'
+                            : 'Trailing whitespace');
+            }
+            else $this->pass();
+        }
+    }
+}
+return 'ExtraWhitespace';
+
+?>

setup/test/tests/test.shortopentags.php

@@ -13,23 +13,12 @@ class ShortOpenTag extends Test {
                 foreach ($matches[0] as $match)
                     $this->fail(
                         $s,
-                        line_number_for_offset($s, $match[1]),
+                        $this->line_number_for_offset($s, $match[1]),
                         $match[0]);
             }
             else $this->pass();
         }
     }
 }
-
-function line_number_for_offset($filename, $offset) {
-    $lines = file($filename);
-    $bytes = $line = 0;
-    while ($bytes < $offset) {
-        $bytes += strlen(array_shift($lines));
-        $line += 1;
-    }
-    return $line;
-}
-
 return 'ShortOpenTag';
 ?>