@@ -15,6 +15,9 @@ |
||
| 15 | 15 | |
| 16 | 16 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ |
| 17 | 17 | |
| 18 | +/** |
|
| 19 | + * @param string $config |
|
| 20 | + */ |
|
| 18 | 21 | function displayPqp($output, $config) { |
| 19 | 22 | |
| 20 | 23 | $cssUrl = $config.'css/pQp.css'; |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | function displayPqp($output, $config) { |
| 19 | 19 | |
| 20 | -$css = file_get_contents(__DIR__ . '/css/pQp.css'); |
|
| 20 | +$css = file_get_contents(__DIR__.'/css/pQp.css'); |
|
| 21 | 21 | |
| 22 | 22 | echo <<<JAVASCRIPT |
| 23 | 23 | <!-- JavaScript --> |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | echo '<div id="pqp-console" class="pqp-box">'; |
| 163 | 163 | |
| 164 | -if($logCount == 0) { |
|
| 164 | +if ($logCount == 0) { |
|
| 165 | 165 | echo '<h3>This panel has no log items.</h3>'; |
| 166 | 166 | } |
| 167 | 167 | else { |
@@ -179,25 +179,25 @@ discard block |
||
| 179 | 179 | <table class="main" cellspacing="0">'; |
| 180 | 180 | |
| 181 | 181 | $class = ''; |
| 182 | - foreach($output['logs']['console']['messages'] as $log) { |
|
| 182 | + foreach ($output['logs']['console']['messages'] as $log) { |
|
| 183 | 183 | echo '<tr class="log-'.$log['type'].'"> |
| 184 | 184 | <td class="type">'.$log['type'].'</td> |
| 185 | 185 | <td class="'.$class.'">'; |
| 186 | - if($log['type'] == 'log') { |
|
| 186 | + if ($log['type'] == 'log') { |
|
| 187 | 187 | echo '<div><pre>'.$log['data'].'</pre></div>'; |
| 188 | 188 | } |
| 189 | - elseif($log['type'] == 'memory') { |
|
| 189 | + elseif ($log['type'] == 'memory') { |
|
| 190 | 190 | echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['data_type'].'</em>: '.$log['name'].' </div>'; |
| 191 | 191 | } |
| 192 | - elseif($log['type'] == 'speed') { |
|
| 192 | + elseif ($log['type'] == 'speed') { |
|
| 193 | 193 | echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>'; |
| 194 | 194 | } |
| 195 | - elseif($log['type'] == 'error') { |
|
| 195 | + elseif ($log['type'] == 'error') { |
|
| 196 | 196 | echo '<div><em>Line '.$log['line'].'</em> : '.$log['data'].' <pre>'.$log['file'].'</pre></div>'; |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | echo '</td></tr>'; |
| 200 | - if($class == '') $class = 'alt'; |
|
| 200 | + if ($class == '') $class = 'alt'; |
|
| 201 | 201 | else $class = ''; |
| 202 | 202 | } |
| 203 | 203 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | |
| 209 | 209 | echo '<div id="pqp-speed" class="pqp-box">'; |
| 210 | 210 | |
| 211 | -if($output['logs']['speedCount'] == 0) { |
|
| 211 | +if ($output['logs']['speedCount'] == 0) { |
|
| 212 | 212 | echo '<h3>This panel has no log items.</h3>'; |
| 213 | 213 | } |
| 214 | 214 | else { |
@@ -219,13 +219,13 @@ discard block |
||
| 219 | 219 | <table class="main" cellspacing="0">'; |
| 220 | 220 | |
| 221 | 221 | $class = ''; |
| 222 | - foreach($output['logs']['console'] as $log) { |
|
| 223 | - if($log['type'] == 'speed') { |
|
| 222 | + foreach ($output['logs']['console'] as $log) { |
|
| 223 | + if ($log['type'] == 'speed') { |
|
| 224 | 224 | echo '<tr class="log-'.$log['type'].'"> |
| 225 | 225 | <td class="'.$class.'">'; |
| 226 | 226 | echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>'; |
| 227 | 227 | echo '</td></tr>'; |
| 228 | - if($class == '') $class = 'alt'; |
|
| 228 | + if ($class == '') $class = 'alt'; |
|
| 229 | 229 | else $class = ''; |
| 230 | 230 | } |
| 231 | 231 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | |
| 238 | 238 | echo '<div id="pqp-queries" class="pqp-box">'; |
| 239 | 239 | |
| 240 | -if($output['queryTotals']['count'] == 0) { |
|
| 240 | +if ($output['queryTotals']['count'] == 0) { |
|
| 241 | 241 | echo '<h3>This panel has no log items.</h3>'; |
| 242 | 242 | } |
| 243 | 243 | else { |
@@ -249,10 +249,10 @@ discard block |
||
| 249 | 249 | <table class="main" cellspacing="0">'; |
| 250 | 250 | |
| 251 | 251 | $class = ''; |
| 252 | - foreach($output['queries'] as $query) { |
|
| 252 | + foreach ($output['queries'] as $query) { |
|
| 253 | 253 | echo '<tr> |
| 254 | 254 | <td class="'.$class.'">'.$query['sql']; |
| 255 | - if($query['explain']) { |
|
| 255 | + if ($query['explain']) { |
|
| 256 | 256 | echo '<em> |
| 257 | 257 | Possible keys: <b>'.$query['explain']['possible_keys'].'</b> · |
| 258 | 258 | Key Used: <b>'.$query['explain']['key'].'</b> · |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | </em>'; |
| 263 | 263 | } |
| 264 | 264 | echo '</td></tr>'; |
| 265 | - if($class == '') $class = 'alt'; |
|
| 265 | + if ($class == '') $class = 'alt'; |
|
| 266 | 266 | else $class = ''; |
| 267 | 267 | } |
| 268 | 268 | |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | echo '<div id="pqp-memory" class="pqp-box">'; |
| 275 | 275 | |
| 276 | -if($output['logs']['memoryCount'] == 0) { |
|
| 276 | +if ($output['logs']['memoryCount'] == 0) { |
|
| 277 | 277 | echo '<h3>This panel has no log items.</h3>'; |
| 278 | 278 | } |
| 279 | 279 | else { |
@@ -284,12 +284,12 @@ discard block |
||
| 284 | 284 | <table class="main" cellspacing="0">'; |
| 285 | 285 | |
| 286 | 286 | $class = ''; |
| 287 | - foreach($output['logs']['console'] as $log) { |
|
| 288 | - if($log['type'] == 'memory') { |
|
| 287 | + foreach ($output['logs']['console'] as $log) { |
|
| 288 | + if ($log['type'] == 'memory') { |
|
| 289 | 289 | echo '<tr class="log-'.$log['type'].'">'; |
| 290 | 290 | echo '<td class="'.$class.'"><b>'.$log['data'].'</b> <em>'.$log['dataType'].'</em>: '.$log['name'].'</td>'; |
| 291 | 291 | echo '</tr>'; |
| 292 | - if($class == '') $class = 'alt'; |
|
| 292 | + if ($class == '') $class = 'alt'; |
|
| 293 | 293 | else $class = ''; |
| 294 | 294 | } |
| 295 | 295 | } |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | |
| 302 | 302 | echo '<div id="pqp-files" class="pqp-box">'; |
| 303 | 303 | |
| 304 | -if($output['fileTotals']['count'] == 0) { |
|
| 304 | +if ($output['fileTotals']['count'] == 0) { |
|
| 305 | 305 | echo '<h3>This panel has no log items.</h3>'; |
| 306 | 306 | } |
| 307 | 307 | else { |
@@ -312,10 +312,10 @@ discard block |
||
| 312 | 312 | </table> |
| 313 | 313 | <table class="main" cellspacing="0">'; |
| 314 | 314 | |
| 315 | - $class =''; |
|
| 316 | - foreach($output['files'] as $file) { |
|
| 315 | + $class = ''; |
|
| 316 | + foreach ($output['files'] as $file) { |
|
| 317 | 317 | echo '<tr><td class="'.$class.'"><b>'.$file['size'].'</b> '.$file['name'].'</td></tr>'; |
| 318 | - if($class == '') $class = 'alt'; |
|
| 318 | + if ($class == '') $class = 'alt'; |
|
| 319 | 319 | else $class = ''; |
| 320 | 320 | } |
| 321 | 321 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | Console::log('Ending log below with a sample error.'); |
| 50 | 50 | throw new Exception('Unable to write to log!'); |
| 51 | 51 | } |
| 52 | - catch(Exception $e) { |
|
| 52 | + catch (Exception $e) { |
|
| 53 | 53 | Console::logError($e, 'Sample error logging.'); |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -84,8 +84,8 @@ discard block |
||
| 84 | 84 | $ret = ''; |
| 85 | 85 | $longString = 'This is a really long string that when appended with the . symbol |
| 86 | 86 | will cause memory to be duplicated in order to create the new string.'; |
| 87 | - for($i = 0; $i < 10; $i++) { |
|
| 88 | - $ret = $ret . $longString; |
|
| 87 | + for ($i = 0; $i < 10; $i++) { |
|
| 88 | + $ret = $ret.$longString; |
|
| 89 | 89 | Console::logMemory($ret, 'Watch memory leak -- iteration '.$i); |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -37,15 +37,15 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | function connect($new = false) { |
| 39 | 39 | $this->conn = mysql_connect($this->host, $this->user, $this->password, $new); |
| 40 | - if(!$this->conn) { |
|
| 40 | + if (!$this->conn) { |
|
| 41 | 41 | throw new Exception('We\'re working on a few connection issues.'); |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | function changeDatabase($database) { |
| 46 | 46 | $this->database = $database; |
| 47 | - if($this->conn) { |
|
| 48 | - if(!mysql_select_db($database, $this->conn)) { |
|
| 47 | + if ($this->conn) { |
|
| 48 | + if (!mysql_select_db($database, $this->conn)) { |
|
| 49 | 49 | throw new CustomException('We\'re working on a few connection issues.'); |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | function lazyLoadConnection() { |
| 55 | 55 | $this->connect(true); |
| 56 | - if($this->database) $this->changeDatabase($this->database); |
|
| 56 | + if ($this->database) $this->changeDatabase($this->database); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /*----------------------------------- |
@@ -61,12 +61,12 @@ discard block |
||
| 61 | 61 | ------------------------------------*/ |
| 62 | 62 | |
| 63 | 63 | function query($sql) { |
| 64 | - if(!$this->conn) $this->lazyLoadConnection(); |
|
| 64 | + if (!$this->conn) $this->lazyLoadConnection(); |
|
| 65 | 65 | $start = $this->getTime(); |
| 66 | 66 | $rs = mysql_query($sql, $this->conn); |
| 67 | 67 | $this->queryCount += 1; |
| 68 | 68 | $this->logQuery($sql, $start); |
| 69 | - if(!$rs) { |
|
| 69 | + if (!$rs) { |
|
| 70 | 70 | throw new Exception('Could not execute query.'); |
| 71 | 71 | } |
| 72 | 72 | return $rs; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | function logQuery($sql, $start) { |
| 80 | 80 | $query = array( |
| 81 | 81 | 'sql' => $sql, |
| 82 | - 'time' => ($this->getTime() - $start)*1000 |
|
| 82 | + 'time' => ($this->getTime() - $start) * 1000 |
|
| 83 | 83 | ); |
| 84 | 84 | array_push($this->queries, $query); |
| 85 | 85 | } |
@@ -96,19 +96,19 @@ discard block |
||
| 96 | 96 | $ret = $time; |
| 97 | 97 | $formatter = 0; |
| 98 | 98 | $formats = array('ms', 's', 'm'); |
| 99 | - if($time >= 1000 && $time < 60000) { |
|
| 99 | + if ($time >= 1000 && $time < 60000) { |
|
| 100 | 100 | $formatter = 1; |
| 101 | 101 | $ret = ($time / 1000); |
| 102 | 102 | } |
| 103 | - if($time >= 60000) { |
|
| 103 | + if ($time >= 60000) { |
|
| 104 | 104 | $formatter = 2; |
| 105 | 105 | $ret = ($time / 1000) / 60; |
| 106 | 106 | } |
| 107 | - $ret = number_format($ret,3,'.','') . ' ' . $formats[$formatter]; |
|
| 107 | + $ret = number_format($ret, 3, '.', '').' '.$formats[$formatter]; |
|
| 108 | 108 | return $ret; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - function __destruct() { |
|
| 111 | + function __destruct() { |
|
| 112 | 112 | @mysql_close($this->conn); |
| 113 | 113 | } |
| 114 | 114 | |
@@ -44,15 +44,15 @@ discard block |
||
| 44 | 44 | 'speed' => 0 |
| 45 | 45 | )); |
| 46 | 46 | $logs = $this->console->getLogs(); |
| 47 | - foreach($logs as $log) { |
|
| 48 | - if($log['type'] == 'log') { |
|
| 47 | + foreach ($logs as $log) { |
|
| 48 | + if ($log['type'] == 'log') { |
|
| 49 | 49 | $message = array( |
| 50 | 50 | 'data' => print_r($log['data'], true), |
| 51 | 51 | 'type' => 'log' |
| 52 | 52 | ); |
| 53 | 53 | $console['totals']['log']++; |
| 54 | 54 | } |
| 55 | - elseif($log['type'] == 'memory') { |
|
| 55 | + elseif ($log['type'] == 'memory') { |
|
| 56 | 56 | $message = array( |
| 57 | 57 | 'name' => $log['name'], |
| 58 | 58 | 'data_type' => $log['data_type'], |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | ); |
| 62 | 62 | $console['totals']['memory']++; |
| 63 | 63 | } |
| 64 | - elseif($log['type'] == 'speed') { |
|
| 64 | + elseif ($log['type'] == 'speed') { |
|
| 65 | 65 | $message = array( |
| 66 | 66 | 'name' => $log['name'], |
| 67 | 67 | 'data' => $this->getReadableTime(($log['data'] - $this->startTime) * 1000), |
@@ -95,14 +95,14 @@ discard block |
||
| 95 | 95 | "largest" => 0, |
| 96 | 96 | ); |
| 97 | 97 | |
| 98 | - foreach($files as $key => $file) { |
|
| 98 | + foreach ($files as $key => $file) { |
|
| 99 | 99 | $size = filesize($file); |
| 100 | 100 | $fileList[] = array( |
| 101 | 101 | 'name' => $file, |
| 102 | 102 | 'size' => $this->getReadableFileSize($size) |
| 103 | 103 | ); |
| 104 | 104 | $fileTotals['size'] += $size; |
| 105 | - if($size > $fileTotals['largest']) $fileTotals['largest'] = $size; |
|
| 105 | + if ($size > $fileTotals['largest']) $fileTotals['largest'] = $size; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | $fileTotals['size'] = $this->getReadableFileSize($fileTotals['size']); |
@@ -132,9 +132,9 @@ discard block |
||
| 132 | 132 | $queryTotals['time'] = 0; |
| 133 | 133 | $queries = array(); |
| 134 | 134 | |
| 135 | - if($this->db != '') { |
|
| 135 | + if ($this->db != '') { |
|
| 136 | 136 | $queryTotals['count'] += $this->db->queryCount; |
| 137 | - foreach($this->db->queries as $key => $query) { |
|
| 137 | + foreach ($this->db->queries as $key => $query) { |
|
| 138 | 138 | $query = $this->attemptToExplainQuery($query); |
| 139 | 139 | $queryTotals['time'] += $query['time']; |
| 140 | 140 | $query['time'] = $this->getReadableTime($query['time']); |
@@ -156,8 +156,8 @@ discard block |
||
| 156 | 156 | $sql = 'EXPLAIN '.$query['sql']; |
| 157 | 157 | $rs = $this->db->query($sql); |
| 158 | 158 | } |
| 159 | - catch(Exception $e) {} |
|
| 160 | - if($rs) { |
|
| 159 | + catch (Exception $e) {} |
|
| 160 | + if ($rs) { |
|
| 161 | 161 | $row = mysql_fetch_array($rs, MYSQL_ASSOC); |
| 162 | 162 | $query['explain'] = $row; |
| 163 | 163 | } |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | public function gatherSpeedData() { |
| 172 | 172 | $speedTotals = array(); |
| 173 | - $speedTotals['total'] = $this->getReadableTime(($this->getMicroTime() - $this->startTime)*1000); |
|
| 173 | + $speedTotals['total'] = $this->getReadableTime(($this->getMicroTime() - $this->startTime) * 1000); |
|
| 174 | 174 | $speedTotals['allowed'] = ini_get("max_execution_time"); |
| 175 | 175 | $this->output['speedTotals'] = $speedTotals; |
| 176 | 176 | } |
@@ -205,15 +205,15 @@ discard block |
||
| 205 | 205 | $ret = $time; |
| 206 | 206 | $formatter = 0; |
| 207 | 207 | $formats = array('ms', 's', 'm'); |
| 208 | - if($time >= 1000 && $time < 60000) { |
|
| 208 | + if ($time >= 1000 && $time < 60000) { |
|
| 209 | 209 | $formatter = 1; |
| 210 | 210 | $ret = ($time / 1000); |
| 211 | 211 | } |
| 212 | - if($time >= 60000) { |
|
| 212 | + if ($time >= 60000) { |
|
| 213 | 213 | $formatter = 2; |
| 214 | 214 | $ret = ($time / 1000) / 60; |
| 215 | 215 | } |
| 216 | - $ret = number_format($ret,3,'.','') . ' ' . $formats[$formatter]; |
|
| 216 | + $ret = number_format($ret, 3, '.', '').' '.$formats[$formatter]; |
|
| 217 | 217 | return $ret; |
| 218 | 218 | } |
| 219 | 219 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | $this->gatherMemoryData(); |
| 230 | 230 | $this->gatherQueryData(); |
| 231 | 231 | $this->gatherSpeedData(); |
| 232 | - require_once __DIR__ . '/../display.php'; |
|
| 232 | + require_once __DIR__.'/../display.php'; |
|
| 233 | 233 | displayPqp($this->output, $this->config); |
| 234 | 234 | } |
| 235 | 235 | |