Changeset 463

Timestamp:

01/13/08 20:20:48 (12 months ago)

Author:

padams

Message:

addded in missing site_id param into first hit url.
modified called to set the site_id from params if it's there.

Location:

trunk

Files:

• modules/base/processRequest.php (modified) (1 diff)
• modules/base/templates/js_helper_tags.tpl (modified) (1 diff)
• owa_caller.php (modified) (3 diffs)

trunk/modules/base/processRequest.php

@@ -50 +50 @@
                 
                 // Do not log if the first_hit cookie is still present.
-        if (!empty($this->params[$this->config['first_hit_param'].'_'.$this->config['site_id']])):
+        if (!empty($this->params[$this->config['first_hit_param'].'_'.$this->params['site_id']])):
                 $this->e->debug('Aborting request processing due to finding first hit cookie.');
                         return;

trunk/modules/base/templates/js_helper_tags.tpl

@@ -4 +4 @@
 <script type="text/javascript">
 //<![CDATA[
-document.write('<img src="<?=$this->makeAbsolutelink(array('action' => 'base.processFirstRequest'), '', $this->config['action_url']);?>">');
+document.write('<img src="<?=$this->makeAbsolutelink(array('action' => 'base.processFirstRequest', 'site_id' => $this->config['site_id']), '', $this->config['action_url']);?>">');
 //]]>
 </script>

trunk/owa_caller.php

@@ -212 +212 @@
                 $this->api->setupFramework();
                 
+                // needed in standalone installs where site_id is not set in config file.
+                if ($this->params['site_id']):
+                        $this->c->set('base', 'site_id', $this->params['site_id']);
+                endif;
+                
                 return;
         
@@ -251 +256 @@
                                 $this->config['site_id'] = $caller_params['site_id'];
                                 $this->c->set('base', 'site_id', $caller_params['site_id']);
+                        else:
+                                $caller_params['site_id'] = $this->c->get('base', 'site_id');
                         endif;
                 
@@ -283 +290 @@
                 if ($this->config['log_robots'] != true):
                         if ($bcap->robotCheck() == true):
+                                $this->e->debug("ABORTING: request appears to be from a robot");
                                 return;
                         endif;