Graphs

app/Config/Migration/1376824296_add_extra_columns_to_incidents_table.php

@@ -0,0 +1,55 @@
+<?php
+class AddExtraColumnsToIncidentsTable extends CakeMigration {
+
+/**
+ * Migration description
+ *
+ * @var string
+ * @access public
+ */
+	public $description = 'Add two extra columns to the incidents table';
+
+/**
+ * Actions to be performed
+ *
+ * @var array $migration
+ * @access public
+ */
+	public $migration = array(
+		'up' => array(
+			'create_field' => array(
+				'incidents' => array(
+					'script_name' => array('type' => 'string', 'null' => true, 'default' => NULL, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'after' => 'server_software'),
+					'configuration_storage' => array('type' => 'string', 'null' => true, 'default' => NULL, 'length' => 30, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'after' => 'server_software'),
+				),
+			),
+		),
+		'down' => array(
+			'drop_field' => array(
+				'incidents' => array('script_name', 'configuration_storage',),
+			),
+		),
+	);
+
+/**
+ * Before migration callback
+ *
+ * @param string $direction, up or down direction of migration process
+ * @return boolean Should process continue
+ * @access public
+ */
+	public function before($direction) {
+		return true;
+	}
+
+/**
+ * After migration callback
+ *
+ * @param string $direction, up or down direction of migration process
+ * @return boolean Should process continue
+ * @access public
+ */
+	public function after($direction) {
+		return true;
+	}
+}

app/Controller/ReportsController.php

@@ -126,16 +126,19 @@ public function unmark_related_to($reportId) {
 ## HELPERS
 	protected function _setSimilarFields($id) {
 		$fields = array('browser', 'pma_version', 'php_version', 'server_software',
-				'user_os');
+				'user_os', 'script_name', 'configuration_storage');
 
 		$this->Report->read(null, $id);
 
+		$this->set('columns', $fields);
+
 		foreach ($fields as $field) {
 			list($entriesWithCount, $totalEntries) =
 					$this->Report->getRelatedByField($field, 25, true);
-			$this->set("${field}_related_entries", $entriesWithCount);
+			$relatedEntries[$field] = $entriesWithCount;
 			$this->set("${field}_distinct_count", $totalEntries);
 		}
+		$this->set("related_entries", $relatedEntries);
 	}
 
 	protected function _getSearchConditions($aColumns) {

app/Model/Incident.php

@@ -41,7 +41,7 @@ class Incident extends AppModel {
 
 	public function createIncidentFromBugReport($bugReport) {
 		$schematizedIncident = $this->_getSchematizedIncident($bugReport);
-		$closestReport = $this->_getClosestReport($bugReport["exception"]);
+		$closestReport = $this->_getClosestReport($bugReport);
 
 		if($closestReport) {
 			$schematizedIncident["report_id"] = $closestReport["Report"]["id"];
@@ -75,9 +75,11 @@ protected function _hasDifferentStacktrace($newIncident, $incidents) {
 		return true;
 	}
 
-	protected function _getClosestReport($exception) {
-		List($location, $linenumber) = $this->_getIdentifyingLocation($exception["stack"]);
-		$report = $this->Report->findByLocationAndLinenumber($location, $linenumber);
+	protected function _getClosestReport($bugReport) {
+		List($location, $linenumber) =
+				$this->_getIdentifyingLocation($bugReport['exception']['stack']);
+		$report = $this->Report->findByLocationAndLinenumberAndPmaVersion(
+				$location, $linenumber, $bugReport['pma_version']);
 		return $report;
 	}
 
@@ -91,6 +93,7 @@ protected function _getReportDetails($bugReport) {
 			'status' => 'new',
 			'location' => $location,
 			'linenumber' => $linenumber,
+			'pma_version' => $bugReport['pma_version'],
 		);
 		return $reportDetails;
 	}
@@ -106,6 +109,8 @@ protected function _getSchematizedIncident($bugReport) {
 			'browser' => $bugReport['browser_name'] . " "
 					. $this->_getMajorVersion($bugReport['browser_version']),
 			'user_os' => $bugReport['user_os'],
+			'script_name' => $bugReport['script_name'],
+			'configuration_storage' => $bugReport['configuration_storage'],
 			'server_software' => $this->_getServer($bugReport['server_software']),
 			'full_report' => json_encode($bugReport),
 			'stacktrace' => json_encode($bugReport['exception']['stack']),
@@ -117,19 +122,25 @@ protected function _getSchematizedIncident($bugReport) {
 	protected function _getIdentifyingLocation($stacktrace) {
 		foreach ($stacktrace as $level) {
 			if (isset($level["filename"])) {
-				if ($level["filename"] !== "tracekit.js"
-						&& $level["filename"] !== "error_report.js") {
-					return array($level["filename"], $level["line"]);
-				} else {
+				// ignore unrelated files that sometimes appear in the error report
+				if ($level["filename"] === "tracekit.js") {
 					continue;
+				} elseif($level["filename"] === "error_report.js") {
+					// incase the error is in the error_report.js file
+					if(!isset($fallback)) {
+						$fallback = array($level["filename"], $level["line"]);
+					}
+					continue;
+				} else {
+					return array($level["filename"], $level["line"]);
 				}
-			}
-			if (isset($level["uri"])) {
-				return array($level["uri"], $level["line"]);
+			} elseif (isset($level["scriptname"])) {
+				return array($level["scriptname"], $level["line"]);
 			} else {
-				return array($level["url"], $level["line"]);
+				continue;
 			}
 		}
+		return $fallback;
 	}
 
 	protected function _getMajorVersion($fullVersion) {

app/View/Helper/IncidentsHelper.php

@@ -62,7 +62,7 @@ public function getStacktrace($incident, $divClass) {
 
 		foreach ($incident["Incident"]["stacktrace"] as $level) {
 			$html .= $this->_getStackLevelInfo($level);
-			$html .= "<pre>";
+			$html .= "<pre class='brush: js; tab-size: 2'>";
 			$html .= join("\n", Sanitize::clean($level["context"]));
 			$html .= "</pre>";
 		}

app/View/Helper/ReportsHelper.php

@@ -3,9 +3,10 @@
 App::uses('AppHelper', 'View/Helper');
 App::uses('IncidentsHelper', 'View/Helper');
 App::uses('Sanitize', 'Utility');
+App::uses('Inflector', 'Utility');
 
 class ReportsHelper extends AppHelper {
-  public $helpers = array('Incidents');
+	public $helpers = array('Incidents');
 
 	public function __construct(View $view, $settings = array()) {
 		parent::__construct($view, $settings);
@@ -59,6 +60,22 @@ public function getStacktracesForIncidents($incidents) {
 		return $html;
 	}
 
+	public function getChartArray($arrayName, $columns, $relatedEntries) {
+		$html = "var $arrayName = [], chart = {};";
+		foreach ($columns as $column) {
+			$html .= "chart = {};";
+			$html .= "chart.name = '$column';";
+			$html .= "chart.title = '" . Inflector::humanize($column) . "';";
+			$html .= "chart.labels = []; chart.values = [];";
+			foreach ($relatedEntries[$column] as $entry => $count) {
+				$html .= "chart.labels.push('$entry ($count)');";
+				$html .= "chart.values.push($count);";
+			}
+			$html .= "$arrayName.push(chart);";
+		}
+		return $html;
+	}
+
 	protected function _getStackLevelInfo($level) {
 		$html = "<span>";
 		$elements = array("filename", "scriptname", "line", "func", "column");

app/View/Incidents/view.ctp

@@ -66,7 +66,7 @@
   <tr>
     <td>Script name</td>
     <td>
-      <?php echo $incident["Incident"]["full_report"]["script_name"]; ?>
+      <?php echo $incident["Incident"]["script_name"]; ?>
     </td>
   </tr>
   <tr>
@@ -78,13 +78,7 @@
   <tr>
     <td>Configuration storage enabled</td>
     <td>
-      <?php
-        if ($incident["Incident"]["full_report"]["configuration_storage_enabled"]) {
-          echo "true";
-        } else {
-          echo "false";
-        }
-      ?>
+      <?php echo $incident["Incident"]["full_report"]["configuration_storage"]; ?>
     </td>
   </tr>
 </table>

app/View/Layouts/default.ctp

@@ -34,11 +34,20 @@
 		echo $this->Html->css('jquery.dataTables_themeroller');
 		echo $this->Html->css('bootstrap.min');
 		echo $this->Html->css('bootstrap-responsive.min');
+		echo $this->Html->css('shCore.css');
+		echo $this->Html->css('shThemeDefault.css');
 		echo $this->Html->css('custom');
 
 		echo $this->Html->script('jquery');
 		echo $this->Html->script('jquery.dataTables.min');
 		echo $this->Html->script('bootstrap');
+		echo $this->Html->script('shCore.js');
+		echo $this->Html->script('shBrushXml.js');
+		echo $this->Html->script('shBrushJScript.js');
+		echo $this->Html->script('raphael-min.js');
+		echo $this->Html->script('g.raphael-min.js');
+		echo $this->Html->script('g.pie-min.js');
+		echo $this->Html->script('pie.js');
 		echo $this->Html->script('custom');
 
 		echo $this->fetch('meta');

app/View/Reports/view.ctp

@@ -42,39 +42,55 @@
     <td>PMA Versions</td>
     <td>
       <?php echo $this->Reports->entriesFromIncidents(
-          $pma_version_related_entries, $pma_version_distinct_count);
+          $related_entries["pma_version"], $pma_version_distinct_count);
       ?>
     </td>
   </tr>
   <tr>
     <td>PHP Versions</td>
     <td>
       <?php echo $this->Reports->entriesFromIncidents(
-          $php_version_related_entries, $php_version_distinct_count);
+          $related_entries["php_version"], $php_version_distinct_count);
       ?>
     </td>
   </tr>
   <tr>
     <td>Browsers</td>
     <td>
       <?php echo $this->Reports->entriesFromIncidents(
-          $browser_related_entries, $browser_distinct_count);
+          $related_entries["browser"], $browser_distinct_count);
+      ?>
+    </td>
+  </tr>
+  <tr>
+    <td>Script Name</td>
+    <td>
+      <?php echo $this->Reports->entriesFromIncidents(
+          $related_entries["script_name"], $script_name_distinct_count);
+      ?>
+    </td>
+  </tr>
+  <tr>
+    <td>Configuration Storage</td>
+    <td>
+      <?php echo $this->Reports->entriesFromIncidents(
+          $related_entries["configuration_storage"], $configuration_storage_distinct_count);
       ?>
     </td>
   </tr>
   <tr>
     <td>Server Software</td>
     <td>
       <?php echo $this->Reports->entriesFromIncidents(
-          $server_software_related_entries, $server_software_distinct_count);
+          $related_entries["server_software"], $server_software_distinct_count);
       ?>
     </td>
   </tr>
   <tr>
     <td>User OS</td>
     <td>
       <?php echo $this->Reports->entriesFromIncidents(
-          $user_os_related_entries, $user_os_distinct_count);
+          $related_entries["user_os"], $user_os_distinct_count);
       ?>
     </td>
   </tr>
@@ -103,3 +119,17 @@
 
 <h4>Descriptions submited by users:</h4>
 <?php echo $this->Incidents->incidentsDescriptions($incidents_with_description); ?>
+<h4>Stats and Graphs</h4>
+<span id="graphs"></span>
+<script type="text/javascript">
+  <?php echo $this->Reports->getChartArray("chartArray", $columns,
+      $related_entries); ?>
+  window.onload = function () {
+    chartArray.forEach(function(chart) {
+      var span_id = "graph_" + chart.name;
+      var $span = $("<span class='span5'>").attr("id", span_id);
+      $("#graphs").append($span);
+      piechart(span_id, chart.title, chart.values, chart.labels);
+    });
+  };
+</script>