Load the local file relative to index.php as otherwise you can end up with a "Cannot redeclare error"

"PHP Fatal error:  Cannot redeclare class Config in /usr/local/Config.php on line 44"

1 files changed, 143 insertions, 143 deletions

diff --git a/index.php b/index.php
index 1a87aa8..36b31f2 100644
--- a/index.php
+++ b/index.php
@@ -9,8 +9,8 @@ class Webgrind_MasterConfig
     static $webgrindVersion = '1.1';
 }
 
-require 'config.php';
-require 'library/FileHandler.php';
+require './config.php';
+require './library/FileHandler.php';
 
 // TODO: Errorhandling:
 // 		No files, outputdir not writable
@@ -23,149 +23,149 @@ if (ini_get('date.timezone') == '')
 
 try {
     switch(get('op')){
-    	case 'file_list':
-    		echo json_encode(Webgrind_FileHandler::getInstance()->getTraceList());
-    		break;	
-    	case 'function_list':	    
-    		$dataFile = get('dataFile');
-    		if($dataFile=='0'){
-    			$files = Webgrind_FileHandler::getInstance()->getTraceList();
-    			$dataFile = $files[0]['filename'];
-    		}
-    		$reader = Webgrind_FileHandler::getInstance()->getTraceReader($dataFile, get('costFormat', Webgrind_Config::$defaultCostformat));
-    		$functions = array();
+        case 'file_list':
+            echo json_encode(Webgrind_FileHandler::getInstance()->getTraceList());
+            break;
+        case 'function_list':
+            $dataFile = get('dataFile');
+            if($dataFile=='0'){
+                $files = Webgrind_FileHandler::getInstance()->getTraceList();
+                $dataFile = $files[0]['filename'];
+            }
+            $reader = Webgrind_FileHandler::getInstance()->getTraceReader($dataFile, get('costFormat', Webgrind_Config::$defaultCostformat));
+            $functions = array();
             $shownTotal = 0;
             $breakdown = array('internal' => 0, 'procedural' => 0, 'class' => 0, 'include' => 0);
 
-    		for($i=0;$i<$reader->getFunctionCount();$i++) {
-    		    $functionInfo = $reader->getFunctionInfo($i);
-		    
-		    
-    		    if (false !== strpos($functionInfo['functionName'], 'php::')) {
-    		        $breakdown['internal'] += $functionInfo['summedSelfCost'];
-    		        $humanKind = 'internal';
-    		    } elseif (false !== strpos($functionInfo['functionName'], 'require_once::') ||
-        		          false !== strpos($functionInfo['functionName'], 'require::') || 
-        		          false !== strpos($functionInfo['functionName'], 'include_once::') ||
-        		          false !== strpos($functionInfo['functionName'], 'include::')) {
+            for($i=0;$i<$reader->getFunctionCount();$i++) {
+                $functionInfo = $reader->getFunctionInfo($i);
+
+
+                if (false !== strpos($functionInfo['functionName'], 'php::')) {
+                    $breakdown['internal'] += $functionInfo['summedSelfCost'];
+                    $humanKind = 'internal';
+                } elseif (false !== strpos($functionInfo['functionName'], 'require_once::') ||
+                          false !== strpos($functionInfo['functionName'], 'require::') ||
+                          false !== strpos($functionInfo['functionName'], 'include_once::') ||
+                          false !== strpos($functionInfo['functionName'], 'include::')) {
                     $breakdown['include'] += $functionInfo['summedSelfCost'];
-    		        $humanKind = 'include';
-    		    } else {
-    		        if (false !== strpos($functionInfo['functionName'], '->') || false !== strpos($functionInfo['functionName'], '::')) {
-    		            $breakdown['class'] += $functionInfo['summedSelfCost'];
-        		        $humanKind = 'class';
-    		        } else {
-    		            $breakdown['procedural'] += $functionInfo['summedSelfCost'];
-    		            $humanKind = 'procedural';
-        		    }
+                    $humanKind = 'include';
+                } else {
+                    if (false !== strpos($functionInfo['functionName'], '->') || false !== strpos($functionInfo['functionName'], '::')) {
+                        $breakdown['class'] += $functionInfo['summedSelfCost'];
+                        $humanKind = 'class';
+                    } else {
+                        $breakdown['procedural'] += $functionInfo['summedSelfCost'];
+                        $humanKind = 'procedural';
+                    }
                 }
-    			if (!(int)get('hideInternals', 0) || strpos($functionInfo['functionName'], 'php::') === false) {
-        			$shownTotal += $functionInfo['summedSelfCost'];
-    				$functions[$i] = $functionInfo;
-        			$functions[$i]['nr'] = $i;
-    				$functions[$i]['humanKind'] = $humanKind;
-        		} 
-
-    		}
-    		usort($functions,'costCmp');
-		
-    		$remainingCost = $shownTotal*get('showFraction');
-		
-    		$result['functions'] = array();
-    		foreach($functions as $function){
-				
-    			$remainingCost -= $function['summedSelfCost'];
-			$function['file'] = urlencode($function['file']);
-    			$result['functions'][] = $function;
-    			if($remainingCost<0)
-    				break;
-    		}
-    		$result['summedInvocationCount'] = $reader->getFunctionCount();
+                if (!(int)get('hideInternals', 0) || strpos($functionInfo['functionName'], 'php::') === false) {
+                    $shownTotal += $functionInfo['summedSelfCost'];
+                    $functions[$i] = $functionInfo;
+                    $functions[$i]['nr'] = $i;
+                    $functions[$i]['humanKind'] = $humanKind;
+                }
+
+            }
+            usort($functions,'costCmp');
+
+            $remainingCost = $shownTotal*get('showFraction');
+
+            $result['functions'] = array();
+            foreach($functions as $function){
+
+                $remainingCost -= $function['summedSelfCost'];
+                $function['file'] = urlencode($function['file']);
+                $result['functions'][] = $function;
+                if($remainingCost<0)
+                    break;
+            }
+            $result['summedInvocationCount'] = $reader->getFunctionCount();
             $result['summedRunTime'] = $reader->formatCost($reader->getHeader('summary'), 'msec');
-    		$result['dataFile'] = $dataFile;
-    		$result['invokeUrl'] = $reader->getHeader('cmd');
-    		$result['runs'] = $reader->getHeader('runs');
-    		$result['breakdown'] = $breakdown;
-    		$result['mtime'] = date(Webgrind_Config::$dateFormat,filemtime(Webgrind_Config::xdebugOutputDir().$dataFile));
-    		echo json_encode($result);
-    	break;
-    	case 'callinfo_list':
-    		$reader = Webgrind_FileHandler::getInstance()->getTraceReader(get('file'), get('costFormat', Webgrind_Config::$defaultCostformat));
-    		$functionNr = get('functionNr');
-     		$function = $reader->getFunctionInfo($functionNr);
-			
-		$result = array('calledFrom'=>array(), 'subCalls'=>array());
-		$foundInvocations = 0;
-		for($i=0;$i<$function['calledFromInfoCount'];$i++){
-			$invo = $reader->getCalledFromInfo($functionNr, $i);
-			$foundInvocations += $invo['callCount'];
-			$callerInfo = $reader->getFunctionInfo($invo['functionNr']);
-			$invo['file'] = urlencode($callerInfo['file']);
-			$invo['callerFunctionName'] = $callerInfo['functionName'];
-			$result['calledFrom'][] = $invo;
-		}
-		$result['calledByHost'] = ($foundInvocations<$function['invocationCount']);
-		
-    		for($i=0;$i<$function['subCallInfoCount'];$i++){
-			$invo = $reader->getSubCallInfo($functionNr, $i);
-			$callInfo = $reader->getFunctionInfo($invo['functionNr']);
-			$invo['file'] = urlencode($function['file']); // Sub call to $callInfo['file'] but from $function['file']
-			$invo['callerFunctionName'] = $callInfo['functionName'];
-			$result['subCalls'][] = $invo;
-		}
-		echo json_encode($result);		
-    	break;
-    	case 'fileviewer':
-    		$file = get('file');
-    		$line = get('line');
-	
-    		if($file && $file!=''){
-    			$message = '';
-    			if(!file_exists($file)){
-    				$message = $file.' does not exist.';
-    			} else if(!is_readable($file)){
-    				$message = $file.' is not readable.';
-    			} else if(is_dir($file)){
-    				$message = $file.' is a directory.';
-    			} 		
-    		} else {
-    			$message = 'No file to view';
-    		}
-    		require 'templates/fileviewer.phtml';
-	
-    	break;
-		case 'function_graph':
-			$dataFile = get('dataFile');
-			$showFraction = 100 - intval(get('showFraction') * 100);
-			if($dataFile == '0'){
-				$files = Webgrind_FileHandler::getInstance()->getTraceList();
-				$dataFile = $files[0]['filename'];
-			}
+            $result['dataFile'] = $dataFile;
+            $result['invokeUrl'] = $reader->getHeader('cmd');
+            $result['runs'] = $reader->getHeader('runs');
+            $result['breakdown'] = $breakdown;
+            $result['mtime'] = date(Webgrind_Config::$dateFormat,filemtime(Webgrind_Config::xdebugOutputDir().$dataFile));
+            echo json_encode($result);
+        break;
+        case 'callinfo_list':
+            $reader = Webgrind_FileHandler::getInstance()->getTraceReader(get('file'), get('costFormat', Webgrind_Config::$defaultCostformat));
+            $functionNr = get('functionNr');
+            $function = $reader->getFunctionInfo($functionNr);
+
+            $result = array('calledFrom'=>array(), 'subCalls'=>array());
+            $foundInvocations = 0;
+            for($i=0;$i<$function['calledFromInfoCount'];$i++){
+                $invo = $reader->getCalledFromInfo($functionNr, $i);
+                $foundInvocations += $invo['callCount'];
+                $callerInfo = $reader->getFunctionInfo($invo['functionNr']);
+                $invo['file'] = urlencode($callerInfo['file']);
+                $invo['callerFunctionName'] = $callerInfo['functionName'];
+                $result['calledFrom'][] = $invo;
+            }
+            $result['calledByHost'] = ($foundInvocations<$function['invocationCount']);
+
+            for($i=0;$i<$function['subCallInfoCount'];$i++){
+                $invo = $reader->getSubCallInfo($functionNr, $i);
+                $callInfo = $reader->getFunctionInfo($invo['functionNr']);
+                $invo['file'] = urlencode($function['file']); // Sub call to $callInfo['file'] but from $function['file']
+                $invo['callerFunctionName'] = $callInfo['functionName'];
+                $result['subCalls'][] = $invo;
+            }
+        echo json_encode($result);
+        break;
+        case 'fileviewer':
+            $file = get('file');
+            $line = get('line');
+
+            if($file && $file!=''){
+                $message = '';
+                if(!file_exists($file)){
+                    $message = $file.' does not exist.';
+                } else if(!is_readable($file)){
+                    $message = $file.' is not readable.';
+                } else if(is_dir($file)){
+                    $message = $file.' is a directory.';
+                }
+            } else {
+                $message = 'No file to view';
+            }
+            require 'templates/fileviewer.phtml';
+
+        break;
+        case 'function_graph':
+            $dataFile = get('dataFile');
+            $showFraction = 100 - intval(get('showFraction') * 100);
+            if($dataFile == '0'){
+                $files = Webgrind_FileHandler::getInstance()->getTraceList();
+                $dataFile = $files[0]['filename'];
+            }
             header("Content-Type: image/png");
             $filename = Webgrind_Config::storageDir().$dataFile.'-'.$showFraction.Webgrind_Config::$preprocessedSuffix.'.png';
-		    if (!file_exists($filename)) {
-			    $imageData = shell_exec(Webgrind_Config::$pythonExecutable.' library/gprof2dot.py -n '.$showFraction.' -f callgrind '.Webgrind_Config::xdebugOutputDir().''.$dataFile.' | '.Webgrind_Config::$dotExecutable.' -Tpng');
-			    file_put_contents($filename, $imageData);
-			}
-			readfile($filename);
-		break;
-    	case 'version_info':
-    		$response = @file_get_contents('http://jokke.dk/webgrindupdate.json?version='.Webgrind_Config::$webgrindVersion);
-    		echo $response;
-    	break;
-    	default:
+            if (!file_exists($filename)) {
+                $imageData = shell_exec(Webgrind_Config::$pythonExecutable.' library/gprof2dot.py -n '.$showFraction.' -f callgrind '.Webgrind_Config::xdebugOutputDir().''.$dataFile.' | '.Webgrind_Config::$dotExecutable.' -Tpng');
+                file_put_contents($filename, $imageData);
+            }
+            readfile($filename);
+        break;
+        case 'version_info':
+            $response = @file_get_contents('http://jokke.dk/webgrindupdate.json?version='.Webgrind_Config::$webgrindVersion);
+            echo $response;
+        break;
+        default:
             $welcome = '';
-    	    if (!file_exists(Webgrind_Config::storageDir()) || !is_writable(Webgrind_Config::storageDir())) {
-    	        $welcome .= 'Webgrind $storageDir does not exist or is not writeable: <code>'.Webgrind_Config::storageDir().'</code><br>';
-    	    }
-    	    if (!file_exists(Webgrind_Config::xdebugOutputDir()) || !is_readable(Webgrind_Config::xdebugOutputDir())) {
-    	        $welcome .= 'Webgrind $profilerDir does not exist or is not readable: <code>'.Webgrind_Config::xdebugOutputDir().'</code><br>';
-    	    }
-    	    
-    	    if ($welcome == '') {
-        	    $welcome = 'Select a cachegrind file above<br>(looking in <code>'.Webgrind_Config::xdebugOutputDir().'</code> for files matching <code>'.Webgrind_Config::xdebugOutputFormat().'</code>)';
-    	    }
-    		require 'templates/index.phtml';
+            if (!file_exists(Webgrind_Config::storageDir()) || !is_writable(Webgrind_Config::storageDir())) {
+                $welcome .= 'Webgrind $storageDir does not exist or is not writeable: <code>'.Webgrind_Config::storageDir().'</code><br>';
+            }
+            if (!file_exists(Webgrind_Config::xdebugOutputDir()) || !is_readable(Webgrind_Config::xdebugOutputDir())) {
+                $welcome .= 'Webgrind $profilerDir does not exist or is not readable: <code>'.Webgrind_Config::xdebugOutputDir().'</code><br>';
+            }
+
+            if ($welcome == '') {
+                $welcome = 'Select a cachegrind file above<br>(looking in <code>'.Webgrind_Config::xdebugOutputDir().'</code> for files matching <code>'.Webgrind_Config::xdebugOutputFormat().'</code>)';
+            }
+            require 'templates/index.phtml';
     }
 } catch (Exception $e) {
     echo json_encode(array('error' => $e->getMessage().'<br>'.$e->getFile().', line '.$e->getLine()));
@@ -173,15 +173,15 @@ try {
 }
 
 function get($param, $default=false){
-	return (isset($_GET[$param])? $_GET[$param] : $default);
+    return (isset($_GET[$param])? $_GET[$param] : $default);
 }
 
 function costCmp($a, $b){
-	$a = $a['summedSelfCost'];
-	$b = $b['summedSelfCost'];
+    $a = $a['summedSelfCost'];
+    $b = $b['summedSelfCost'];
 
-	if ($a == $b) {
-	    return 0;
-	}
-	return ($a > $b) ? -1 : 1;
+    if ($a == $b) {
+        return 0;
+    }
+    return ($a > $b) ? -1 : 1;
 }