X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=blobdiff_plain;f=profileinfo.php;h=ef038c1153ce92e2cbe22fc6d51635b0ecbd71c6;hb=68808d7b9f238ddb1b5fb2aede4003a504885c91;hp=ccf59fecab358f6b0dbc6e2367bb1cf75792b0f5;hpb=8a0282e238f665c1f71eff5724c1961d7d38ec79;p=lhc%2Fweb%2Fwiklou.git

diff --git a/profileinfo.php b/profileinfo.php
index ccf59fecab..ef038c1153 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -28,8 +28,14 @@
 ini_set( 'zlib.output_compression', 'off' );
 
 $wgEnableProfileInfo = $wgProfileToDatabase = false;
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
+	require ( 'core/includes/WebStart.php' );
+} else {
+	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+}
+
 
-require_once( './includes/WebStart.php' );
+header( 'Content-Type: text/html; charset=utf-8' );
 
 ?>
 <html>
@@ -50,16 +56,20 @@ require_once( './includes/WebStart.php' );
 		text-align: right;
 	}
 	td.timep, td.tpc, td.tpr {
-		background-color: #fffff0;
+		background-color: #ffff80;
 	}
 	td.memoryp, td.mpc, td.mpr {
-		background-color: #f0f8ff;
+		background-color: #80f8ff;
 	}
 	td.count, td,cpr {
-		background-color: #f0fff0;
+		background-color: #80ff80;
 	}
 	td.name {
-		background-color: #f9f9f9;
+		background-color: #89f9f9;
+	}
+
+	tr:hover {
+		font-weight: bold;
 	}
 </style>
 </head>
@@ -72,6 +82,17 @@ if ( !$wgEnableProfileInfo ) {
 	exit( 1 );
 }
 
+$dbr = wfGetDB( DB_SLAVE );
+
+if( !$dbr->tableExists( 'profiling' ) ) {
+	echo "<p>No 'profiling' table exists, so we can't show you anything.</p>\n";
+	echo "<p>If you want to log profiling data, create the table using "
+		. "<tt>maintenance/archives/patch-profiling.sql</tt> and enable "
+		. "<tt>\$wgProfileToDatabase</tt>.</p>\n";
+	echo "</body></html>";
+	exit( 1 );
+}
+
 $expand = array();
 if ( isset( $_REQUEST['expand'] ) )
 	foreach( explode( ',', $_REQUEST['expand'] ) as $f )
@@ -100,20 +121,22 @@ class profile_point {
 	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 = 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=\"" . getEscapedProfileUrl( false, false, $e ) . "\">[â]</a>";
 		}
@@ -180,7 +203,7 @@ class profile_point {
 	}
 };
 
-function compare_point( $a, $b ) {
+function compare_point(profile_point $a, profile_point $b) {
 	global $sort;
 	switch ( $sort ) {
 	case "name":
@@ -210,8 +233,6 @@ $sort = 'time';
 if ( isset( $_REQUEST['sort'] ) && in_array( $_REQUEST['sort'], $sorts ) )
 	$sort = $_REQUEST['sort'];
 
-
-$dbr = wfGetDB( DB_SLAVE );
 $res = $dbr->select( 'profiling', '*', array(), 'profileinfo.php', array( 'ORDER BY' => 'pf_name ASC' ) );
 
 if (isset( $_REQUEST['filter'] ) )
