deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Changed null to NULL

Browse Source
This commit is contained in:
Deon George 2012-07-05 13:06:17 +10:00
parent c8fb3253aa
commit 326eb7bef3
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/classes/lnapp/headimages.php
View File

@ -36,7 +36,7 @@ class lnApp_HeadImages extends HTMLRender {
foreach (static::$_data as $value) { foreach (static::$_data as $value) {
$i = HTML::image($mediapath->uri(array('file'=>$value['img'])),array('alt'=>isset($value['attrs']['title']) ? $value['attrs']['title'] : '')); $i = HTML::image($mediapath->uri(array('file'=>$value['img'])),array('alt'=>isset($value['attrs']['title']) ? $value['attrs']['title'] : ''));
if (isset($value['url'])) 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 else
$output .= $i; $output .= $i;
$output .= static::$_spacer; $output .= static::$_spacer;

2
application/classes/lnapp/meta.php
View File

@ -19,7 +19,7 @@ class lnApp_Meta {
return array(); return array();
if (empty($this->_data[$key])) if (empty($this->_data[$key]))
return null; return NULL;
else else
return $this->_data[$key]; return $this->_data[$key];
} }

4
application/views/login.php
View File

@ -2,10 +2,10 @@
<?php echo Form::open(); ?> <?php echo Form::open(); ?>
<table class="login"> <table class="login">
<tr><td><b>User Name:</b></td></tr> <tr><td><b>User Name:</b></td></tr>
<tr><td><?php echo Form::input('username',null,array('id'=>'login-uid','size'=>40));?></td></tr> <tr><td><?php echo Form::input('username',NULL,array('id'=>'login-uid','size'=>40));?></td></tr>
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr><td><b>Password:</b></td></tr> <tr><td><b>Password:</b></td></tr>
<tr><td><?php echo Form::password('password',null,array('id'=>'login-pwd','size'=>40));?></td></tr> <tr><td><?php echo Form::password('password',NULL,array('id'=>'login-pwd','size'=>40));?></td></tr>
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<!-- @todo Password reset ability should be a config option (or auto detected) --> <!-- @todo Password reset ability should be a config option (or auto detected) -->
<tr><td colspan="2"><?php echo HTML::anchor('login/reset',_('Forgot your password?')); ?></td></tr> <tr><td colspan="2"><?php echo HTML::anchor('login/reset',_('Forgot your password?')); ?></td></tr>

2
application/views/login_reset.php
View File

@ -6,7 +6,7 @@
<?php echo Form::open(); ?> <?php echo Form::open(); ?>
<table class="login"> <table class="login">
<tr><td><b>Username</b></td></tr> <tr><td><b>Username</b></td></tr>
<tr><td><?php echo Form::input('username',null,array('id'=>'login-uid','size'=>40));?></td></tr> <tr><td><?php echo Form::input('username',NULL,array('id'=>'login-uid','size'=>40));?></td></tr>
<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'),array('class'=>'form_button'));?></td></tr> <tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'),array('class'=>'form_button'));?></td></tr>
</table> </table>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>

2
application/views/login_reset_sent.php
View File

@ -5,7 +5,7 @@
<?php echo Form::open(); ?> <?php echo Form::open(); ?>
<table class="login"> <table class="login">
<tr><td><b>Pass code</b></td></tr> <tr><td><b>Pass code</b></td></tr>
<tr><td><?php echo Form::input('token',null,array('id'=>'login-pwd','size'=>40));?></td></tr> <tr><td><?php echo Form::input('token',NULL,array('id'=>'login-pwd','size'=>40));?></td></tr>
<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'),array('class'=>'form_button'));?></td></tr> <tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'),array('class'=>'form_button'));?></td></tr>
</table> </table>
<?php echo Form::close(); ?> <?php echo Form::close(); ?>

4
application/views/register.php
View File

@ -8,11 +8,11 @@
</tr> </tr>
<tr> <tr>
<td>Password</td> <td>Password</td>
<td><?php echo Form::password('password',null,array('id'=>'login-pwd','size'=>16));?></td> <td><?php echo Form::password('password',NULL,array('id'=>'login-pwd','size'=>16));?></td>
</tr> </tr>
<tr> <tr>
<td>Confirm Password</td> <td>Confirm Password</td>
<td><?php echo Form::password('password_confirm',null,array('id'=>'login-pwd-confirm','size'=>16));?></td> <td><?php echo Form::password('password_confirm',NULL,array('id'=>'login-pwd-confirm','size'=>16));?></td>
</tr> </tr>
<tr> <tr>
<td>Email Address</td> <td>Email Address</td>

2
application/views/setup/admin/edit.php
View File

@ -26,7 +26,7 @@
</tr> </tr>
<tr> <tr>
<td class="head">Country</td> <td class="head">Country</td>
<td><?php echo StaticList_Module::form('country_id','country',61,'id','name',array(),null,array('class'=>'form_button'));?></td> <td><?php echo StaticList_Module::form('country_id','country',61,'id','name',array(),NULL,array('class'=>'form_button'));?></td>
</tr> </tr>
<tr> <tr>
<td class="spacer" colspan="2">&nbsp;</td> <td class="spacer" colspan="2">&nbsp;</td>

2
modules/adsl/classes/service/traffic/adsl/iinetadsl.php
View File

@ -79,7 +79,7 @@ class Service_Traffic_ADSL_iiNetADSL extends Service_Traffic_ADSL {
} }
$return = array(); $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(); $attrs = array();
$period = $day_hour->attributes(); $period = $day_hour->attributes();

2
modules/adsl/classes/service/traffic/adsl/peopleagent.php
View File

@ -34,7 +34,7 @@ class Service_Traffic_ADSL_PeopleAgent extends Service_Traffic_ADSL {
} }
$this->fetchresult = TRUE; $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(); $attrs = array();
$userattrs = $user->attributes(); $userattrs = $user->attributes();

2
modules/adsl/views/service/user/plugin/adsl/view.php
View File

@ -53,7 +53,7 @@
<table> <table>
<tr> <tr>
<td style="width: 40%;">Traffic Used This Month</td> <td style="width: 40%;">Traffic Used This Month</td>
<td style="width: 60%;" class="data"><?php echo $so->traffic_month(null); ?></td> <td style="width: 60%;" class="data"><?php echo $so->traffic_month(NULL); ?></td>
</tr> </tr>
<tr> <tr>
<td>Traffic Used Last Month</td> <td>Traffic Used Last Month</td>

4
modules/host/classes/host/plugin/plesk.php
View File

@ -55,7 +55,7 @@ abstract class Host_Plugin_Plesk extends Host_Plugin {
protected function init() { protected function init() {
$this->_loaded = FALSE; $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)); $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(); $response = $request->execute();
$result = XML::factory(null,'plesk',$response->body()); $result = XML::factory(NULL,'plesk',$response->body());
if ($result->status->value() == 'ok') if ($result->status->value() == 'ok')
$this->_loaded = TRUE; $this->_loaded = TRUE;

6
modules/invoice/classes/controller/task/invoice.php
View File

@ -199,7 +199,7 @@ class Controller_Task_Invoice extends Controller_Task {
$iio->product_id = $so->product_id; $iio->product_id = $so->product_id;
$iio->quantity = $pdata['prorata']; $iio->quantity = $pdata['prorata'];
$iio->item_type = 0; // Service Billing $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_type = $so->product->price_type;
$iio->price_base = $so->price(); $iio->price_base = $so->price();
$iio->recurring_schedule = $so->recur_schedule; $iio->recurring_schedule = $so->recur_schedule;
@ -222,7 +222,7 @@ class Controller_Task_Invoice extends Controller_Task {
$iio->charge_id = $co->id; $iio->charge_id = $co->id;
$iio->quantity = $co->quantity; $iio->quantity = $co->quantity;
$iio->item_type = 5; // @todo This probably should not be hard coded as "5". $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->price_base = $co->amount;
$iio->date_start = $co->date_orig; $iio->date_start = $co->date_orig;
$iio->date_stop = $co->date_orig; // @todo $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) { foreach (ORM::factory('invoice_item')->find_all() as $iio) {
if ($iio->product_name AND $iio->product_id) { if ($iio->product_name AND $iio->product_id) {
if (md5(strtoupper($iio->product_name)) == md5(strtoupper($iio->product->name()))) { if (md5(strtoupper($iio->product_name)) == md5(strtoupper($iio->product->name()))) {
$iio->product_name = null; $iio->product_name = NULL;
$iio->save(); $iio->save();
} else { } 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()))); 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())));