X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=profileinfo.php;h=ecf69e50e1693f13ade7340182ea5732e4d1d10f;hb=3f3e6617a4666e9d8867248166027d02e46ad75e;hp=fcce6d71c6de33e3affc108e79a5f637fa396c41;hpb=58beeaa183056256fdcd42faefe05d0242db9f88;p=lhc%2Fweb%2Fwiklou.git

diff --git a/profileinfo.php b/profileinfo.php
index fcce6d71c6..ecf69e50e1 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -1,36 +1,39 @@
 <?php
+/**
+ * Show profiling data.
+ *
+ * Copyright 2005 Kate Turner.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * @file
+ */
+
 ini_set( 'zlib.output_compression', 'off' );
 
 $wgEnableProfileInfo = $wgProfileToDatabase = false;
 
 require_once( './includes/WebStart.php' );
-@include_once( './AdminSettings.php' );
+
+header( 'Content-Type: text/html; charset=utf-8' );
 
 ?>
-<!--
-     Show profiling data.
-
-     Copyright 2005 Kate Turner.
-
-     Permission is hereby granted, free of charge, to any person obtaining a copy
-     of this software and associated documentation files (the "Software"), to deal
-     in the Software without restriction, including without limitation the rights
-     to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     copies of the Software, and to permit persons to whom the Software is
-     furnished to do so, subject to the following conditions:
-
-     The above copyright notice and this permission notice shall be included in
-     all copies or substantial portions of the Software.
-
-     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     SOFTWARE.
-
--->
 <html>
 <head>
 <title>Profiling data</title>
@@ -66,7 +69,8 @@ require_once( './includes/WebStart.php' );
 <?php
 
 if ( !$wgEnableProfileInfo ) {
-	echo "disabled\n";
+	echo "<p>Disabled</p>\n";
+	echo "</body></html>";
 	exit( 1 );
 }
 
@@ -81,7 +85,9 @@ class profile_point {
 	var $time;
 	var $children;
 
-	function profile_point( $name, $count, $time, $memory ) {
+	static $totaltime, $totalmemory, $totalcount;
+
+	function __construct( $name, $count, $time, $memory ) {
 		$this->name = $name;
 		$this->count = $count;
 		$this->time = $time;
@@ -93,45 +99,46 @@ class profile_point {
 		$this->children[] = $child;
 	}
 
-	function display($indent = 0.0) {
-		global $expand, $totaltime, $totalmemory, $totalcount;
+	function display( $expand, $indent = 0.0 ) {
 		usort( $this->children, 'compare_point' );
 
-		$extet = '';
-		if ( isset( $expand[$this->name()] ) )
-			$ex = true;
-		else	$ex = false;
+		$ex = isset( $expand[$this->name()] );
+
 		if ( !$ex ) {
 			if ( count( $this->children ) ) {
-				$url = makeurl( false, false, $expand + array( $this->name() => true ) );
+				$url = getEscapedProfileUrl( false, false, $expand + array( $this->name() => true ) );
 				$extet = " <a href=\"$url\">[+]</a>";
-			} else $extet = '';
+			} else {
+				$extet = '';
+			}
 		} else {
 			$e = array();
-			foreach ( $expand as $name => $ep )
-				if ( $name != $this->name() )
+			foreach ( $expand as $name => $ep ) {
+				if ( $name != $this->name() ) {
 					$e += array( $name => $ep );
+				}
+			}
 
-			$extet = " <a href=\"" . makeurl( false, false, $e ) . "\">[&ndash;]</a>";
+			$extet = " <a href=\"" . getEscapedProfileUrl( false, false, $e ) . "\">[â]</a>";
 		}
 		?>
 		<tr>
 		<td class="name" style="padding-left: <?php echo $indent ?>em;">
 			<?php echo htmlspecialchars( $this->name() ) . $extet ?>
 		</td>
-		<td class="timep"><?php echo @wfPercent( $this->time() / $totaltime * 100 ) ?></td>
-		<td class="memoryp"><?php echo @wfPercent( $this->memory() / $totalmemory * 100 ) ?></td>
+		<td class="timep"><?php echo @wfPercent( $this->time() / self::$totaltime * 100 ) ?></td>
+		<td class="memoryp"><?php echo @wfPercent( $this->memory() / self::$totalmemory * 100 ) ?></td>
 		<td class="count"><?php echo $this->count() ?></td>
 		<td class="cpr"><?php echo round( sprintf( '%.2f', $this->callsPerRequest() ), 2 ) ?></td>
 		<td class="tpc"><?php echo round( sprintf( '%.2f', $this->timePerCall() ), 2 ) ?></td>
 		<td class="mpc"><?php echo round( sprintf( '%.2f' ,$this->memoryPerCall() / 1024 ), 2 ) ?></td>
-		<td class="tpr"><?php echo @round( sprintf( '%.2f', $this->time() / $totalcount ), 2 ) ?></td>
-		<td class="mpr"><?php echo @round( sprintf( '%.2f' ,$this->memory() / $totalcount / 1024 ), 2 ) ?></td>
+		<td class="tpr"><?php echo @round( sprintf( '%.2f', $this->time() / self::$totalcount ), 2 ) ?></td>
+		<td class="mpr"><?php echo @round( sprintf( '%.2f' ,$this->memory() / self::$totalcount / 1024 ), 2 ) ?></td>
 		</tr>
 		<?php
 		if ( $ex ) {
 			foreach ( $this->children as $child ) {
-				$child->display( $indent + 2 );
+				$child->display( $expand, $indent + 2 );
 			}
 		}
 	}
@@ -161,18 +168,15 @@ class profile_point {
 	}
 	
 	function callsPerRequest() {
-		global $totalcount;
-		return @( $this->count / $totalcount );
+		return @( $this->count / self::$totalcount );
 	}
 	
 	function timePerRequest() {
-		global $totalcount;
-		return @( $this->time / $totalcount );
+		return @( $this->time / self::$totalcount );
 	}
 	
 	function memoryPerRequest() {
-		global $totalcount;
-		return @( $this->memory / $totalcount );
+		return @( $this->memory / self::$totalcount );
 	}
 
 	function fmttime() {
@@ -231,31 +235,35 @@ else
 
 <table cellspacing="0" border="1">
 <tr id="top">
-<th><a href="<?php echo makeurl( false, 'name' ) ?>">Name</a></th>
-<th><a href="<?php echo makeurl( false, 'time' ) ?>">Time (%)</a></th>
-<th><a href="<?php echo makeurl( false, 'memory' ) ?>">Memory (%)</a></th>
-<th><a href="<?php echo makeurl( false, 'count' ) ?>">Count</a></th>
-<th><a href="<?php echo makeurl( false, 'calls_per_req' ) ?>">Calls/req</a></th>
-<th><a href="<?php echo makeurl( false, 'time_per_call' ) ?>">ms/call</a></th>
-<th><a href="<?php echo makeurl( false, 'memory_per_call' ) ?>">kb/call</a></th>
-<th><a href="<?php echo makeurl( false, 'time_per_req' ) ?>">ms/req</a></th>
-<th><a href="<?php echo makeurl( false, 'memory_per_req' ) ?>">kb/req</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'name' ) ?>">Name</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'time' ) ?>">Time (%)</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'memory' ) ?>">Memory (%)</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'count' ) ?>">Count</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'calls_per_req' ) ?>">Calls/req</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'time_per_call' ) ?>">ms/call</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'memory_per_call' ) ?>">kb/call</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'time_per_req' ) ?>">ms/req</a></th>
+<th><a href="<?php echo getEscapedProfileUrl( false, 'memory_per_req' ) ?>">kb/req</a></th>
 </tr>
 <?php
-$totaltime = 0.0;
-$totalcount = 0;
-$totalmemory = 0.0;
+profile_point::$totaltime = 0.0;
+profile_point::$totalcount = 0;
+profile_point::$totalmemory = 0.0;
 
-function makeurl( $_filter = false, $_sort = false, $_expand = false ) {
+function getEscapedProfileUrl( $_filter = false, $_sort = false, $_expand = false ) {
 	global $filter, $sort, $expand;
 
 	if ( $_expand === false )
 		$_expand = $expand;
 
-	$nfilter = $_filter ? $_filter : $filter;
-	$nsort = $_sort ? $_sort : $sort;
-	$exp = urlencode( implode( ',', array_keys( $_expand ) ) );
-	return "?filter=$nfilter&amp;sort=$nsort&amp;expand=$exp";
+	return htmlspecialchars(
+		'?' . 
+		wfArrayToCGI( array(
+			'filter' => $_filter ? $_filter : $filter,
+			'sort' => $_sort ? $_sort : $sort,
+			'expand' => implode( ',', array_keys( $_expand ) ) 
+		) )
+	);
 }
 
 $points = array();
@@ -266,9 +274,9 @@ $last = false;
 foreach( $res as $o ) {
 	$next = new profile_point( $o->pf_name, $o->pf_count, $o->pf_time, $o->pf_memory );
 	if( $next->name() == '-total' ) {
-		$totaltime = $next->time();
-		$totalcount = $next->count();
-		$totalmemory = $next->memory();
+		profile_point::$totaltime = $next->time();
+		profile_point::$totalcount = $next->count();
+		profile_point::$totalmemory = $next->memory();
 	}
 	if ( $last !== false ) {
 		if ( preg_match( "/^".preg_quote( $last->name(), "/" )."/", $next->name() ) ) {
@@ -296,12 +304,12 @@ foreach ( $points as $point ) {
 	if ( strlen( $filter ) && !strstr( $point->name(), $filter ) )
 		continue;
 
-	$point->display();
+	$point->display( $expand );
 }
 ?>
 </table>
 
-<p>Total time: <tt><?php printf("%5.02f", $totaltime) ?></tt></p>
-<p>Total memory: <tt><?php printf("%5.02f", $totalmemory / 1024 ) ?></tt></p>
+<p>Total time: <tt><?php printf("%5.02f", profile_point::$totaltime) ?></tt></p>
+<p>Total memory: <tt><?php printf("%5.02f", profile_point::$totalmemory / 1024 ) ?></tt></p>
 </body>
 </html>
