Some sweeping syntax changes for consistency:

(! foo) changed to ( ! foo)
|| changed to OR
changed newline standardization code in various places from preg_replace to str_replace

4 files changed, 19 insertions, 19 deletions

diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index 4511592bb..48a143271 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -1,4 +1,4 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');

 /**

  * CodeIgniter

  *

@@ -152,7 +152,7 @@ class CI_DB_odbc_driver extends CI_DB {
 	 */	

 	function trans_begin($test_mode = FALSE)

 	{

-		if (! $this->trans_enabled)

+		if ( ! $this->trans_enabled)

 		{

 			return TRUE;

 		}

@@ -181,7 +181,7 @@ class CI_DB_odbc_driver extends CI_DB {
 	 */	

 	function trans_commit()

 	{

-		if (! $this->trans_enabled)

+		if ( ! $this->trans_enabled)

 		{

 			return TRUE;

 		}

@@ -207,7 +207,7 @@ class CI_DB_odbc_driver extends CI_DB {
 	 */	

 	function trans_rollback()

 	{

-		if (! $this->trans_enabled)

+		if ( ! $this->trans_enabled)

 		{

 			return TRUE;

 		}

@@ -464,7 +464,7 @@ class CI_DB_odbc_driver extends CI_DB {
 	 */

 	function _from_tables($tables)

 	{

-		if (! is_array($tables))

+		if ( ! is_array($tables))

 		{

 			$tables = array($tables);

 		}

@@ -512,7 +512,7 @@ class CI_DB_odbc_driver extends CI_DB {
 			$valstr[] = $key." = ".$val;

 		}

 		

-		$limit = (!$limit) ? '' : ' LIMIT '.$limit;

+		$limit = ( ! $limit) ? '' : ' LIMIT '.$limit;

 		

 		$orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):'';

 	

@@ -559,7 +559,7 @@ class CI_DB_odbc_driver extends CI_DB {
 	{

 		$conditions = '';

 

-		if (count($where) > 0 || count($like) > 0)

+		if (count($where) > 0 OR count($like) > 0)

 		{

 			$conditions = "\nWHERE ";

 			$conditions .= implode("\n", $this->ar_where);

@@ -571,7 +571,7 @@ class CI_DB_odbc_driver extends CI_DB {
 			$conditions .= implode("\n", $like);

 		}

 

-		$limit = (!$limit) ? '' : ' LIMIT '.$limit;

+		$limit = ( ! $limit) ? '' : ' LIMIT '.$limit;

 	

 		return "DELETE FROM ".$table.$conditions.$limit;

 	}

@@ -613,6 +613,6 @@ class CI_DB_odbc_driver extends CI_DB {
 }

 

 

-
-/* End of file odbc_driver.php */
+

+/* End of file odbc_driver.php */

 /* Location: ./system/database/drivers/odbc/odbc_driver.php */
\ No newline at end of file
diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php
index fb011f298..60df616c3 100644
--- a/system/database/drivers/odbc/odbc_forge.php
+++ b/system/database/drivers/odbc/odbc_forge.php
@@ -1,4 +1,4 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');

 /**

  * CodeIgniter

  *

@@ -253,6 +253,6 @@ class CI_DB_odbc_forge extends CI_DB_forge {
 

 

 }

-
-/* End of file odbc_forge.php */
+

+/* End of file odbc_forge.php */

 /* Location: ./system/database/drivers/odbc/odbc_forge.php */
\ No newline at end of file
diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php
index 4acfb056e..809887a43 100644
--- a/system/database/drivers/odbc/odbc_result.php
+++ b/system/database/drivers/odbc/odbc_result.php
@@ -1,4 +1,4 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');

 /**

  * CodeIgniter

  *

@@ -229,6 +229,6 @@ class CI_DB_odbc_result extends CI_DB_result {
 

 }

 

-
-/* End of file odbc_result.php */
+

+/* End of file odbc_result.php */

 /* Location: ./system/database/drivers/odbc/odbc_result.php */
\ No newline at end of file
diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php
index ac8b5d808..5d9010506 100644
--- a/system/database/drivers/odbc/odbc_utility.php
+++ b/system/database/drivers/odbc/odbc_utility.php
@@ -1,4 +1,4 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');

 /**

  * CodeIgniter

  *

@@ -143,6 +143,6 @@ class CI_DB_odbc_utility extends CI_DB_utility {
 		return FALSE;

 	}

 }

-
-/* End of file odbc_utility.php */
+

+/* End of file odbc_utility.php */

 /* Location: ./system/database/drivers/odbc/odbc_utility.php */
\ No newline at end of file