Changeset 240 for branches/1.0/coverager/coverager.php

Timestamp:

10/11/2006 05:42:41 AM (2 years ago)

Author:

moo

Message:

trunk->1.0: merged coverager

• [184] fix tplcov
• [176] leaked by outfilename (efree by zend_mm tho)
• [175] remove double Content-Language
• [174] avoid double slash
• [173] make dir ended with dir sep
• [172] DIRECTORY_SEPARATOR for coverager config example

Files:

• branches/1.0/coverager/coverager.php (modified) (2 diffs)

branches/1.0/coverager/coverager.php

@@ -58 +58 @@
         $this->path = isset($_GET['path']) ? $_GET['path'] : '';
         $this->path = preg_replace('!\.{2,}!', '.', $this->path);
-        $this->path = preg_replace('![\\\\/]{2,}!', '/', $this->path);
+        $qsep = preg_quote(DIRECTORY_SEPARATOR, '!');
+        $this->path = preg_replace("![\\\\$qsep]{2,}!", DIRECTORY_SEPARATOR, $this->path);
+        $this->path = preg_replace("!$qsep$!", '', $this->path);
         if ($this->path == '/') {
             $this->path = '';
@@ -114 +116 @@
             list($tplfile, $tpllines, $tplcov) = $this->loadTplCov($fileinfo['cov'], substr($this->outpath, $this->datadir_len));
             if ($tplfile) {
-                $tplcov = sprint_cov($tplinfo['tplcov'], $tpllines);
+                $tplcov = sprint_cov($tplcov, $tpllines);
                 unset($tpllines);
             }