Changeset 1053 for trunk/htdocs/coverager/coverager.php

Timestamp:

07/27/2012 09:17:42 AM (10 months ago)

Author:

moo

Message:

refactor: move htdocs, bin, lib for easier installation

Files:

• trunk/htdocs/coverager/coverager.php (modified) (11 diffs)

trunk/htdocs/coverager/coverager.php

@@ -2 +2 @@
 
 include("./common.php");
-
-class Cycle
-{
-    var $values;
-    var $i;
-    var $count;
-
-    function Cycle($v)
-    {
-        $this->values = func_get_args();
-        $this->i = -1;
-        $this->count = count($this->values);
-    }
-
-    function next()
-    {
-        $this->i = ($this->i + 1) % $this->count;
-        return $this->values[$this->i];
-    }
-
-    function cur()
-    {
-        return $this->values[$this->i];
-    }
-
-    function reset()
-    {
-        $this->i = -1;
-    }
-}
 
 class XcacheCoverageViewer
 {
-    var $syntaxhiglight = true;
-    var $usecache = false;
+    var $syntax_higlight = true;
+    var $use_cache = false;
     var $include_paths = array();
     var $exclude_paths = array();
@@ -50 +20 @@
         $this->datadir = ini_get('xcache.coveragedump_directory');
 
-        // copy config
-        foreach (array('charset', 'include_paths', 'exclude_paths', 'syntaxhiglight', 'usecache', 'datadir', 'lang') as $k) {
-            if (isset($GLOBALS[$k])) {
-                $this->{$k} = $GLOBALS[$k];
+        global $config;
+        foreach (array('charset', 'include_paths', 'exclude_paths', 'syntax_higlight', 'use_cache', 'datadir', 'lang') as $k) {
+            if (isset($config[$k])) {
+                $this->{$k} = $config[$k];
             }
         }
@@ -79 +49 @@
             $prefix_len = strlen($path) + 1;
             $dirinfo = $this->loadDir($this->outpath);
-            if (!$this->usecache) {
+            if (!$this->use_cache) {
                 ksort($dirinfo['subdirs']);
                 ksort($dirinfo['files']);
@@ -104 +74 @@
                 }
             }
-            if ($this->syntaxhiglight) {
+            if ($this->syntax_higlight) {
                 $source = implode('', $lines);
                 ob_start();
@@ -130 +100 @@
         else if (!$this->datadir) {
             $action = 'error';
-            $error  = 'require `ini:xcache.coveragedump_directory` or `config:$datadir` to be set';
+            $error  = 'require `xcache.coveragedump_directory` in ini or `$datadir` in config to be set';
         }
         else {
@@ -137 +107 @@
         }
 
-        $xcache_version = defined('XCACHE_VERSION') ? XCACHE_VERSION : '';
+        global $config;
         include("coverager.tpl.php");
     }
@@ -143 +113 @@
     function loadDir($outdir, $addtodo = null)
     {
-        if ($this->usecache) {
+        if ($this->use_cache) {
             $cachefile = $outdir . "/.pcovcache";
             if (file_exists($cachefile)) {
@@ -210 +180 @@
         }
 
-        if ($this->usecache) {
+        if ($this->use_cache) {
             ksort($subdirs);
             ksort($files);
@@ -223 +193 @@
                 );
 
-        if ($this->usecache) {
+        if ($this->use_cache) {
             $fp = fopen($cachefile, "wb");
             fwrite($fp, serialize($info));
@@ -233 +203 @@
     function loadFile($file)
     {
-        if ($this->usecache) {
+        if ($this->use_cache) {
             $cachefile = $file . "cache";
             if (file_exists($cachefile)) {
@@ -243 +213 @@
         unset($info['cov']);
 
-        if ($this->usecache) {
+        if ($this->use_cache) {
             $fp = fopen($cachefile, "wb");
             fwrite($fp, serialize($info));