From 326eb7bef31dcb405c59f04820cf76b9db72d13c Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 5 Jul 2012 13:06:17 +1000 Subject: [PATCH] Changed null to NULL --- application/classes/lnapp/headimages.php | 2 +- application/classes/lnapp/meta.php | 2 +- application/views/login.php | 4 ++-- application/views/login_reset.php | 2 +- application/views/login_reset_sent.php | 2 +- application/views/register.php | 4 ++-- application/views/setup/admin/edit.php | 2 +- modules/adsl/classes/service/traffic/adsl/iinetadsl.php | 2 +- modules/adsl/classes/service/traffic/adsl/peopleagent.php | 2 +- modules/adsl/views/service/user/plugin/adsl/view.php | 2 +- modules/host/classes/host/plugin/plesk.php | 4 ++-- modules/invoice/classes/controller/task/invoice.php | 6 +++--- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/application/classes/lnapp/headimages.php b/application/classes/lnapp/headimages.php index 6e0751fb..8e846f6e 100644 --- a/application/classes/lnapp/headimages.php +++ b/application/classes/lnapp/headimages.php @@ -36,7 +36,7 @@ class lnApp_HeadImages extends HTMLRender { foreach (static::$_data as $value) { $i = HTML::image($mediapath->uri(array('file'=>$value['img'])),array('alt'=>isset($value['attrs']['title']) ? $value['attrs']['title'] : '')); if (isset($value['url'])) - $output .= HTML::anchor($value['url'],$i,(isset($value['attrs']) && is_array($value['attrs'])) ? $value['attrs'] : null); + $output .= HTML::anchor($value['url'],$i,(isset($value['attrs']) && is_array($value['attrs'])) ? $value['attrs'] : NULL); else $output .= $i; $output .= static::$_spacer; diff --git a/application/classes/lnapp/meta.php b/application/classes/lnapp/meta.php index 4fcce6da..65846d87 100644 --- a/application/classes/lnapp/meta.php +++ b/application/classes/lnapp/meta.php @@ -19,7 +19,7 @@ class lnApp_Meta { return array(); if (empty($this->_data[$key])) - return null; + return NULL; else return $this->_data[$key]; } diff --git a/application/views/login.php b/application/views/login.php index a66bb5fd..e957cc25 100644 --- a/application/views/login.php +++ b/application/views/login.php @@ -2,10 +2,10 @@ - + - + diff --git a/application/views/login_reset.php b/application/views/login_reset.php index 38a14819..68ee051d 100644 --- a/application/views/login_reset.php +++ b/application/views/login_reset.php @@ -6,7 +6,7 @@
User Name:
'login-uid','size'=>40));?>
'login-uid','size'=>40));?>
 
Password:
'login-pwd','size'=>40));?>
'login-pwd','size'=>40));?>
 
- +
Username
'login-uid','size'=>40));?>
'login-uid','size'=>40));?>
'form_button'));?>
diff --git a/application/views/login_reset_sent.php b/application/views/login_reset_sent.php index b08f6f39..53fec64b 100644 --- a/application/views/login_reset_sent.php +++ b/application/views/login_reset_sent.php @@ -5,7 +5,7 @@ - +
Pass code
'login-pwd','size'=>40));?>
'login-pwd','size'=>40));?>
'form_button'));?>
diff --git a/application/views/register.php b/application/views/register.php index 3fb356fc..0164d34e 100644 --- a/application/views/register.php +++ b/application/views/register.php @@ -8,11 +8,11 @@ Password - 'login-pwd','size'=>16));?> + 'login-pwd','size'=>16));?> Confirm Password - 'login-pwd-confirm','size'=>16));?> + 'login-pwd-confirm','size'=>16));?> Email Address diff --git a/application/views/setup/admin/edit.php b/application/views/setup/admin/edit.php index 50fc90bc..71e03ffb 100644 --- a/application/views/setup/admin/edit.php +++ b/application/views/setup/admin/edit.php @@ -26,7 +26,7 @@ Country - 'form_button'));?> + 'form_button'));?>   diff --git a/modules/adsl/classes/service/traffic/adsl/iinetadsl.php b/modules/adsl/classes/service/traffic/adsl/iinetadsl.php index b59c7c75..3fd4bb36 100644 --- a/modules/adsl/classes/service/traffic/adsl/iinetadsl.php +++ b/modules/adsl/classes/service/traffic/adsl/iinetadsl.php @@ -79,7 +79,7 @@ class Service_Traffic_ADSL_iiNetADSL extends Service_Traffic_ADSL { } $return = array(); - foreach (XML::factory(null,'ii_feed',$data)->volume_usage->volume_usage->get('day_hour') as $day_hour) { + foreach (XML::factory(NULL,'ii_feed',$data)->volume_usage->volume_usage->get('day_hour') as $day_hour) { $attrs = array(); $period = $day_hour->attributes(); diff --git a/modules/adsl/classes/service/traffic/adsl/peopleagent.php b/modules/adsl/classes/service/traffic/adsl/peopleagent.php index 43fdc863..078ef276 100644 --- a/modules/adsl/classes/service/traffic/adsl/peopleagent.php +++ b/modules/adsl/classes/service/traffic/adsl/peopleagent.php @@ -34,7 +34,7 @@ class Service_Traffic_ADSL_PeopleAgent extends Service_Traffic_ADSL { } $this->fetchresult = TRUE; - foreach (XML::factory(null,null,$data)->get('user') as $user) { + foreach (XML::factory(NULL,NULL,$data)->get('user') as $user) { $attrs = array(); $userattrs = $user->attributes(); diff --git a/modules/adsl/views/service/user/plugin/adsl/view.php b/modules/adsl/views/service/user/plugin/adsl/view.php index 63d71000..dfb9c162 100644 --- a/modules/adsl/views/service/user/plugin/adsl/view.php +++ b/modules/adsl/views/service/user/plugin/adsl/view.php @@ -53,7 +53,7 @@ - + diff --git a/modules/host/classes/host/plugin/plesk.php b/modules/host/classes/host/plugin/plesk.php index f0e12e8f..f6755fdb 100644 --- a/modules/host/classes/host/plugin/plesk.php +++ b/modules/host/classes/host/plugin/plesk.php @@ -55,7 +55,7 @@ abstract class Host_Plugin_Plesk extends Host_Plugin { protected function init() { $this->_loaded = FALSE; - $this->xml = XML::factory(null,'plesk'); + $this->xml = XML::factory(NULL,'plesk'); $this->packet = $this->xml->add_node('packet','',array('version'=>$this->protocol)); } @@ -82,7 +82,7 @@ abstract class Host_Plugin_Plesk extends Host_Plugin { $response = $request->execute(); - $result = XML::factory(null,'plesk',$response->body()); + $result = XML::factory(NULL,'plesk',$response->body()); if ($result->status->value() == 'ok') $this->_loaded = TRUE; diff --git a/modules/invoice/classes/controller/task/invoice.php b/modules/invoice/classes/controller/task/invoice.php index 3b04f54c..25447866 100644 --- a/modules/invoice/classes/controller/task/invoice.php +++ b/modules/invoice/classes/controller/task/invoice.php @@ -199,7 +199,7 @@ class Controller_Task_Invoice extends Controller_Task { $iio->product_id = $so->product_id; $iio->quantity = $pdata['prorata']; $iio->item_type = 0; // Service Billing - $iio->discount_amt = null; // @todo + $iio->discount_amt = NULL; // @todo $iio->price_type = $so->product->price_type; $iio->price_base = $so->price(); $iio->recurring_schedule = $so->recur_schedule; @@ -222,7 +222,7 @@ class Controller_Task_Invoice extends Controller_Task { $iio->charge_id = $co->id; $iio->quantity = $co->quantity; $iio->item_type = 5; // @todo This probably should not be hard coded as "5". - $iio->discount_amt = null; // @todo + $iio->discount_amt = NULL; // @todo $iio->price_base = $co->amount; $iio->date_start = $co->date_orig; $iio->date_stop = $co->date_orig; // @todo @@ -327,7 +327,7 @@ class Controller_Task_Invoice extends Controller_Task { foreach (ORM::factory('invoice_item')->find_all() as $iio) { if ($iio->product_name AND $iio->product_id) { if (md5(strtoupper($iio->product_name)) == md5(strtoupper($iio->product->name()))) { - $iio->product_name = null; + $iio->product_name = NULL; $iio->save(); } else { print_r(array("DIFF",'id'=>$iio->id,'pn'=>serialize($iio->product_name),'ppn'=>serialize($iio->product->name()),'pid'=>$iio->product_id,'test'=>strcasecmp($iio->product_name,$iio->product->name())));
Traffic Used This Monthtraffic_month(null); ?>traffic_month(NULL); ?>
Traffic Used Last Month