Skip to content
Permalink
Browse files

adding php5 public and static keywords to functions

removing php4 constructorrs
  • Loading branch information...
padams
padams committed Jul 5, 2010
1 parent 702156b commit 333d456f135e0eb05e3409b021a25120d59de05e
Showing with 166 additions and 599 deletions.
  1. +14 −20 eventQueue.php
  2. +2 −1 includes/template_class.php
  3. +0 −5 modules/base/classes/browscap.php
  4. +0 −7 modules/base/classes/cache.php
  5. +0 −5 modules/base/classes/date.php
  6. +0 −11 modules/base/classes/error.php
  7. +1 −6 modules/base/classes/event.php
  8. +0 −5 modules/base/classes/mailer.php
  9. +1 −0 modules/base/classes/resultSetManager.php
  10. +0 −5 modules/base/classes/service.php
  11. +0 −7 modules/base/classes/serviceUser.php
  12. +0 −6 modules/base/classes/state.php
  13. +0 −5 modules/base/entities/click.php
  14. +1 −11 modules/base/entities/configuration.php
  15. +0 −12 modules/base/entities/exit.php
  16. +0 −14 modules/base/entities/host.php
  17. +0 −33 modules/base/entities/impression.php
  18. +0 −8 modules/base/entities/os.php
  19. +0 −5 modules/base/entities/session.php
  20. +0 −5 modules/base/entities/site.php
  21. +0 −7 modules/base/entities/ua.php
  22. +0 −8 modules/base/handlers/clickHandlers.php
  23. +0 −12 modules/base/handlers/documentHandlers.php
  24. +0 −12 modules/base/handlers/domstreamHandlers.php
  25. +1 −14 modules/base/handlers/feedRequestHandlers.php
  26. +0 −17 modules/base/handlers/hostHandlers.php
  27. +0 −17 modules/base/handlers/notifyHandlers.php
  28. +1 −15 modules/base/handlers/refererHandlers.php
  29. +0 −13 modules/base/handlers/requestHandlers.php
  30. +1 −13 modules/base/handlers/sessionHandlers.php
  31. +1 −18 modules/base/handlers/userAgentHandlers.php
  32. +1 −15 modules/base/handlers/userHandlers.php
  33. +1 −13 modules/base/handlers/visitorHandlers.php
  34. +0 −20 modules/base/helperPageTags.php
  35. +1 −1 modules/base/module.php
  36. +7 −6 modules/base/processEvent.php
  37. +1 −4 owa_base.php
  38. +1 −11 owa_controller.php
  39. +75 −124 owa_coreAPI.php
  40. +3 −1 owa_entity.php
  41. +0 −5 owa_httpRequest.php
  42. +44 −42 owa_lib.php
  43. +1 −5 owa_observer.php
  44. +1 −1 owa_template.php
  45. +0 −30 owa_view.php
  46. +7 −4 wp_plugin.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;
@@ -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();
}
}
@@ -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();
@@ -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;
@@ -56,11 +56,6 @@ function __construct() {
return;
}
function owa_date() {
return owa_date::__construct();
}
function set($date, $format = 'yyyymmdd') {
switch ($format) {
@@ -54,17 +54,6 @@ class owa_error {
var $c;
/**
* PHP4 Constructor
*
*/
function owa_error() {
return owa_error::__construct();
}
/**
* Constructor
*
@@ -74,12 +74,7 @@ class owa_event {
/**
* Constructor
* @access public
*/
function owa_event() {
return owa_event::__construct();
}
*/
function __construct() {
// Set GUID for event
@@ -34,11 +34,6 @@ class owa_mailer extends owa_base {
var $mailer;
function owa_mailer() {
return owa_mailer::__construct();
}
/**
* Constructor
*
@@ -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 = '') {
@@ -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__);
@@ -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) {
@@ -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;
@@ -29,11 +29,6 @@
*/
class owa_click extends owa_entity {
function owa_click() {
return owa_click::__construct();
}
function __construct() {
@@ -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();
}
}
}
?>
@@ -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');
@@ -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');
@@ -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() {
@@ -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');
@@ -30,11 +30,6 @@
class owa_session extends owa_entity {
function owa_session() {
return owa_session::__construct();
}
function __construct() {
// table name
@@ -32,11 +32,6 @@
class owa_site extends owa_entity {
function owa_site() {
return owa_site::__construct();
}
function __construct() {
$this->setTableName('site');
@@ -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() {
}
}
?>
@@ -29,14 +29,6 @@
*/
class owa_clickHandlers extends owa_observer {
/**
* Constructor
*
*/
function __construct() {
return parent::__construct();
}
/**
* Notify Handler
*
Oops, something went wrong.

0 comments on commit 333d456

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.