adding php5 public and static keywords to functions

removing php4 constructorrs
jmturner · Jul 5, 2010 · 333d456 · 333d456
1 parent 702156b
commit 333d456
Show file tree

Hide file tree

Showing 46 changed files with 166 additions and 599 deletions.
diff --git a/eventQueue.php b/eventQueue.php
@@ -54,15 +54,6 @@ class eventQueue {
 	 */
 	var $listenersByFilterType;
 
-	/**
-	 * PHP4 Constructor
-	 *
-	 */
-	function eventQueue() {
-
-		return eventQueue::__construct();	
-	}
-
 	/**
 	 * Constructor
 	 *
@@ -139,17 +130,20 @@ function notify($event) {
 		owa_coreAPI::debug("Notifying listeners of ".$event->getEventType());
 		//print_r($this->listenersByEventType[$event_type] );
 		//print $event->getEventType();
-		$list = $this->listenersByEventType[$event->getEventType()];
-		//print_r($list);
-		if (!empty($list)) {
-			foreach ($this->listenersByEventType[$event->getEventType()] as $k => $observer_id) {
-				//print_r($list);
-				call_user_func_array($this->listeners[$observer_id], array($event));
-				//owa_coreAPI::debug(print_r($event, true));
-				owa_coreAPI::debug(sprintf("%s event handled by %s.",$event->getEventType(), get_class($this->listeners[$observer_id][0])));
+		if (array_key_exists($event->getEventType(), $this->listenersByEventType)) {
+			$list = $this->listenersByEventType[$event->getEventType()];
+			//print_r($list);
+			if (!empty($list)) {
+				foreach ($this->listenersByEventType[$event->getEventType()] as $k => $observer_id) {
+					//print_r($list);
+					call_user_func_array($this->listeners[$observer_id], array($event));
+					//owa_coreAPI::debug(print_r($event, true));
+					owa_coreAPI::debug(sprintf("%s event handled by %s.",$event->getEventType(), get_class($this->listeners[$observer_id][0])));
+				}
 			}
-		}
-
+		} else {
+			owa_coreAPI::debug("no listeners registered for this event type.");
+		}		
 
 	}
 
@@ -318,7 +312,7 @@ function makeEvent($type = '') {
 	 * @return 	object
 	 * @access 	public
 	 */
-	function &get_instance() {
+	public static function &get_instance() {
 
 		static $eq;
 

diff --git a/includes/template_class.php b/includes/template_class.php
@@ -80,7 +80,8 @@ function set_template($file = null) {
     function set($name, $value) {
 
     	if (is_object($value)) {
-    		if (is_a($value, 'Template')) {
+    		$class  = 'Template';
+    		if ($value instanceof $this) {
     			$value = $value->fetch();
     		}
     	} 

diff --git a/modules/base/classes/browscap.php b/modules/base/classes/browscap.php
@@ -60,11 +60,6 @@ class owa_browscap extends owa_base {
 	var $cache;
 	var $cacheExpiration;
 
-	function owa_browscap($ua = '') {
-
-		return owa_browscap::__construct($ua);
-	}
-
 	function __construct($ua = '') {
 
 		parent::__construct();

diff --git a/modules/base/classes/cache.php b/modules/base/classes/cache.php
@@ -67,13 +67,6 @@ function __construct($cache_dir = '') {
 		}
 	}
 
-	function owa_cache($cache_dir = '') {
-
-		register_shutdown_function(array(&$this, "__destruct"));
-		return $this->__construct($cache_dir);
-
-	}
-
 	function setGlobalCollection($collection) {
 
 		return $this->global_collections[] = $collection;

diff --git a/modules/base/classes/date.php b/modules/base/classes/date.php
@@ -56,11 +56,6 @@ function __construct() {
 		return;
 	}
 
-	function owa_date() {
-
-		return owa_date::__construct();
-	}
-
 	function set($date, $format = 'yyyymmdd') {
 
 		switch ($format) {

diff --git a/modules/base/classes/error.php b/modules/base/classes/error.php
@@ -54,17 +54,6 @@ class owa_error {
 
 	var $c;
 
-
-	/**
-	 * PHP4 Constructor
-	 *
-	 */
-	function owa_error() {
-
-		return owa_error::__construct();
-	}
-
-
 	/**
 	 * Constructor
 	 *

diff --git a/modules/base/classes/event.php b/modules/base/classes/event.php
@@ -74,12 +74,7 @@ class owa_event {
 	/**
 	 * Constructor
 	 * @access public
-	 */
-	function owa_event() {
-
-		return owa_event::__construct();
-	}
-
+	 */	
 	function __construct() {
 
 		// Set GUID for event

diff --git a/modules/base/classes/mailer.php b/modules/base/classes/mailer.php
@@ -34,11 +34,6 @@ class owa_mailer extends owa_base {
 
 	var $mailer;
 
-	function owa_mailer() {
-
-		return owa_mailer::__construct();
-	}
-
 	/**
 	 * Constructor
 	 *

diff --git a/modules/base/classes/resultSetManager.php b/modules/base/classes/resultSetManager.php
@@ -97,6 +97,7 @@ class owa_resultSetManager extends owa_base {
 	var $query_params = array();
 	var $baseEntity;
 	var $metricObjectsByEntityMap = array();
+	var $errors = array();
 
 	function __construct($db = '') {
 

diff --git a/modules/base/classes/service.php b/modules/base/classes/service.php
@@ -47,11 +47,6 @@ class owa_service extends owa_base {
 	var $denormalizedDimensions = array();
 	var $browscap;
 
-	function owa_service() {
-
-		return owa_service::__construct();
-	}
-
 	function __construct() {
 		owa_coreAPI::profile($this, __FUNCTION__, __LINE__);
 

diff --git a/modules/base/classes/serviceUser.php b/modules/base/classes/serviceUser.php
@@ -40,13 +40,6 @@ function __construct() {
 
 		//parent::__construct();
 		$this->user = owa_coreApi::entityFactory('base.user');
-
-		return;
-	}
-
-	function owa_serviceUser() {
-
-		return owa_serviceUser::__construct();
 	}
 
 	function load($user_id) {

diff --git a/modules/base/classes/state.php b/modules/base/classes/state.php
@@ -45,13 +45,7 @@ function __destruct() {
 
 		$this->persistState();
 	}
-
-	function owa_state() {
 
-		register_shutdown_function(array(&$this, "__destruct"));
-		return owa_state::__construct();
-	}
-
 	function persistState() {
 
 		return false;

diff --git a/modules/base/entities/click.php b/modules/base/entities/click.php
@@ -29,11 +29,6 @@
  */
 
 class owa_click extends owa_entity {
-
-	function owa_click() {
-
-		return owa_click::__construct();
-	}
 
 	function __construct() {
 

diff --git a/modules/base/entities/configuration.php b/modules/base/entities/configuration.php
@@ -39,17 +39,7 @@ function __construct() {
 		$this->properties['settings'] = new owa_dbColumn;
 		$this->properties['settings']->setDataType(OWA_DTD_TEXT);
 		$this->setCachable();
-
-		return;
-
-	}
-
-	function owa_configuration() {
-		return owa_configuration::__construct(); 
-	}
-
+	}	
 }
 
-
-
 ?>
diff --git a/modules/base/entities/exit.php b/modules/base/entities/exit.php
@@ -29,19 +29,7 @@
  */
 
 class owa_exit extends owa_entity {
-
-	//var $id = array('data_type' => OWA_DTD_BIGINT, 'is_primary_key' => true); // BIGINT,
-	//var $url = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	//var $site_name = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	//var $site = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	//var $exit_anchortext = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	//var $page_title = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-
-	function owa_exit() {
 
-		return owa_exit::__construct();	
-	}
-
 	function __construct() {
 
 		$this->setTableName('exit');

diff --git a/modules/base/entities/host.php b/modules/base/entities/host.php
@@ -30,20 +30,6 @@
 
 class owa_host extends owa_entity {
 
-	//var $id = array('data_type' => OWA_DTD_BIGINT, 'is_primary_key' => true); // BIGINT,
-	//var $ip_address = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	//var $host = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	//var $full_host = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	//var $city = array('data_type' => OWA_DTD_VARCHAR255); // varchar(255),
-	//var $country = array('data_type' => OWA_DTD_VARCHAR255); // varchar(255),
-	//var $latitude = array('data_type' => OWA_DTD_VARCHAR255); // varchar(255),
-	//var $longitude = array('data_type' => OWA_DTD_VARCHAR255); // varchar(255),
-
-	function owa_host() {
-
-		return owa_host::__construct();
-	}
-
 	function __construct() {
 
 		$this->setTableName('host');

diff --git a/modules/base/entities/impression.php b/modules/base/entities/impression.php
@@ -29,39 +29,6 @@
  */
 
 class owa_impression extends owa_entity {
-	/*
-
-	var $id = array('data_type' => OWA_DTD_BIGINT, 'is_primary_key' => true); // BIGINT,
-	var $visitor_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $session_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $tag_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $placement_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $campaign_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $ad_group_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $ad_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $site_id = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	var $last_impression_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $last_impression_timestamp = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $timestamp = array('data_type' => OWA_DTD_BIGINT); // BIGINT,
-	var $year = array('data_type' => OWA_DTD_INT); // INT,
-	var $month = array('data_type' => OWA_DTD_INT); // INT,
-	var $day = array('data_type' => OWA_DTD_INT); // INT,
-	var $dayofyear = array('data_type' => OWA_DTD_INT); // INT,
-	var $weekofyear = array('data_type' => OWA_DTD_INT); // INT,
-	var $hour = array('data_type' => OWA_DTD_TINYINT2); // tinyINT,
-	var $minute = array('data_type' => OWA_DTD_TINYINT2); // tinyINT,
-	var $msec = array('data_type' => OWA_DTD_BIGINT); // INT,
-	var $url = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	var $ua_id = array('data_type' => OWA_DTD_BIGINT); // BIGINT
-	var $ip_address = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	var $host = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	var $host_id = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-	
-	*/
-	function owa_impression() {
-
-		return owa_impression::__construct();	
-	}
 
 	function __construct() {
 

diff --git a/modules/base/entities/os.php b/modules/base/entities/os.php
@@ -30,14 +30,6 @@
 
 class owa_os extends owa_entity {
 
-	//var $id = array('data_type' => OWA_DTD_BIGINT, 'is_primary_key' => true); // BIGINT,
-	//var $name = array('data_type' => OWA_DTD_VARCHAR255); // VARCHAR(255),
-
-	function owa_os() {
-
-		return owa_os::__construct();
-	}
-
 	function __construct() {
 
 		$this->setTableName('os');

diff --git a/modules/base/entities/session.php b/modules/base/entities/session.php
@@ -30,11 +30,6 @@
 
 class owa_session extends owa_entity {
 
-	function owa_session() {
-
-		return owa_session::__construct();			
-	}
-
 	function __construct() {
 
 		// table name

diff --git a/modules/base/entities/site.php b/modules/base/entities/site.php
@@ -32,11 +32,6 @@
 
 class owa_site extends owa_entity {
 
-	function owa_site() {
-
-		return owa_site::__construct();
-	}
-
 	function __construct() {
 
 		$this->setTableName('site');

diff --git a/modules/base/entities/ua.php b/modules/base/entities/ua.php
@@ -29,12 +29,7 @@
  */
 
 class owa_ua extends owa_entity {
-
-	function owa_ua() {
 
-		return owa_ua::__construct();
-	}
-
 	function __construct() {
 
 		$this->setTableName('ua');
@@ -53,6 +48,4 @@ function __construct() {
 	}
 }
 
-
-
 ?>
diff --git a/modules/base/handlers/clickHandlers.php b/modules/base/handlers/clickHandlers.php
@@ -29,14 +29,6 @@
  */
 class owa_clickHandlers extends owa_observer {
 
-	/**
-	 * Constructor
-	 * 
-	 */   
-    function __construct() {
-
-    	return parent::__construct();
-    }
     /**
      * Notify Handler
      *