BUG: Heatmap & domstream fixes

.htaccess

@@ -1 +1,9 @@
 AddHandler application/x-httpd-php .tpl
+
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule api/(.*)$ api/index.php?owa_rest_params=$1 [QSA,NC,L]
+</IfModule>
+

modules/base/classes/resultSetManager.php

@@ -1604,12 +1604,7 @@ function makeResultSetUrls() {
 	   		 $query_params['do'] = 'reports';
 	   		 $query_params['module'] = 'base';
 	   		 $query_params['version'] = 'v1';
-	   		 $query_params['apiKey'] = owa_coreAPI::getCurrentUser()->getUserData('api_key');
-        } else {
-	        $api_url = owa_coreAPI::getSetting('base', 'api_url');
-			// add api command
-			$query_params['do'] = 'getResultSet';
-		}
+        }
 
 
         //add format

modules/base/classes/settings.php

@@ -770,7 +770,6 @@ private function setupPaths() {
         $this->set('base','images_url', $modules_url);
         $this->set('base','images_absolute_url',$modules_url);
         $this->set('base','log_url',$public_url.'log.php');
-        $this->set('base','api_url',$public_url.'api.php');
         $this->set('base','rest_api_url',$public_url.'api/index.php');
 
         $this->set('base', 'error_log_file', OWA_DATA_DIR . 'logs/errors_'. owa_coreAPI::generateInstanceSpecificHash() .'.txt');

modules/base/controllers/reportsRestController.php

@@ -21,6 +21,12 @@
  */
 class owa_reportsRestController extends owa_reportController {
 
+	function __construct($params) {
+
+        parent::__construct($params);
+        $this->setRequiredCapability('view_reports');
+    }
+
 	function validate() {
 
 		// if no report name is specified do these validations necesary for generic resultSet.

modules/base/js/owa.js

@@ -137,7 +137,7 @@
     },
 
     getApiEndpoint : function() {
-        return this.config['api_endpoint'] || this.getSetting('baseUrl') + 'api.php';
+        return this.config['rest_api_endpoint'] || this.getSetting('baseUrl') + 'api/';
     },
 
     loadHeatmap: function(p) {

modules/base/js/owa.player.js

@@ -59,8 +59,8 @@ OWA.player.prototype = {
     },
 
     load : function(data) {
-
-        this.stream = data;
+		
+        this.stream = data.data;
         // count the events in the queue
         this.queue_count = this.stream.events.length;
     },
@@ -72,7 +72,10 @@ OWA.player.prototype = {
 
         var p = unescape(OWA.state.getStateFromCookie('overlay'));
         var params = JSON.parse(p);
-        params.action = 'getDomstream';
+        params.action = 'domstreams';
+        params.module = 'domstream';
+        params.version = 'v1';
+
         //alert(params.action);
         //alert(unescape(JSON.stringify(params)));
         //closure
@@ -160,9 +163,13 @@ OWA.player.prototype = {
 
         // change control static color
            jQuery('#owa_overlay_start').removeClass('active');
-        if (!this.timer) return false;
-          clearInterval(this.timer);
-          this.setStatus('Ready.');
+        if (!this.timer) {
+	        return false;
+	    }
+
+        clearInterval(this.timer);
+
+        this.setStatus('Ready.');
 
     },
 

modules/base/js/owa.tracker.js

@@ -763,10 +763,11 @@ OWA.tracker.prototype = {
     logEvent : function (properties, block, callback) {
 
         if (this.active) {
-
+			
             var url = this._assembleRequestUrl(properties);
             var limit = this.getOption('getRequestCharacterLimit');
             if ( url.length > limit ) {
+
                 //this.cdPost( this.prepareRequestData( properties ) );
                 var data = this.prepareRequestData( properties );
                 this.cdPost( data );
@@ -1423,9 +1424,9 @@ OWA.tracker.prototype = {
 
             if (event != undefined) {
                 this.event_queue.push(event.getProperties());
-                //console.debug("Now logging %s for: %d", event.get('event_type'), now);
+                console.debug("Now logging %s for: %d", event.get('event_type'), now);
             } else {
-                //console.debug("No event properties to log");
+                console.debug("No event properties to log");
             }
 
         }
@@ -2289,7 +2290,7 @@ OWA.tracker.prototype = {
     logDomStream : function() {
 
         var domstream = new OWA.event;
-
+		
         if ( this.event_queue.length > this.options.domstreamEventThreshold ) {
 
             // make an domstream_id if one does not exist. needed for upstream processing

modules/base/module.php

@@ -570,7 +570,7 @@ function registerApiMethods() {
         $this->registerRestApiRoute( 'v1', 'users', 'POST', 'owa_addUserRestController', 'controllers/addUserRestController.php' );
 		$this->registerRestApiRoute( 'v1', 'users', 'DELETE', 'owa_deleteUserRestController', 'controllers/deleteUserRestController.php' );
 		$this->registerRestApiRoute( 'v1', 'siteUsers', 'POST', 'owa_siteAddAllowedUserRestController', 'controllers/siteAddAllowedUserRestController.php' );
-		$this->registerRestApiRoute( 'v1', 'reports', 'GET', 'owa_reportsRestController', 'controllers/reportsRestController.php' );
+		$this->registerRestApiRoute( 'v1', 'reports', 'GET', 'owa_reportsRestController', 'controllers/reportsRestController.php', [ 'params_order' => ['report_name'] ] );
     }
 
     /**