@@ -69,28 +69,28 @@ |
||
69 | 69 | * |
70 | 70 | * @var array[] |
71 | 71 | */ |
72 | - public $result_array = array(); |
|
72 | + public $result_array = array(); |
|
73 | 73 | |
74 | 74 | /** |
75 | 75 | * Result Object |
76 | 76 | * |
77 | 77 | * @var object[] |
78 | 78 | */ |
79 | - public $result_object = array(); |
|
79 | + public $result_object = array(); |
|
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Custom Result Object |
83 | 83 | * |
84 | 84 | * @var object[] |
85 | 85 | */ |
86 | - public $custom_result_object = array(); |
|
86 | + public $custom_result_object = array(); |
|
87 | 87 | |
88 | 88 | /** |
89 | 89 | * Current Row index |
90 | 90 | * |
91 | 91 | * @var int |
92 | 92 | */ |
93 | - public $current_row = 0; |
|
93 | + public $current_row = 0; |
|
94 | 94 | |
95 | 95 | /** |
96 | 96 | * Number of rows |
@@ -60,21 +60,21 @@ discard block |
||
60 | 60 | * |
61 | 61 | * @var string |
62 | 62 | */ |
63 | - protected $_list_databases = FALSE; |
|
63 | + protected $_list_databases = FALSE; |
|
64 | 64 | |
65 | 65 | /** |
66 | 66 | * OPTIMIZE TABLE statement |
67 | 67 | * |
68 | 68 | * @var string |
69 | 69 | */ |
70 | - protected $_optimize_table = FALSE; |
|
70 | + protected $_optimize_table = FALSE; |
|
71 | 71 | |
72 | 72 | /** |
73 | 73 | * REPAIR TABLE statement |
74 | 74 | * |
75 | 75 | * @var string |
76 | 76 | */ |
77 | - protected $_repair_table = FALSE; |
|
77 | + protected $_repair_table = FALSE; |
|
78 | 78 | |
79 | 79 | // -------------------------------------------------------------------- |
80 | 80 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function __construct(&$db) |
88 | 88 | { |
89 | - $this->db =& $db; |
|
89 | + $this->db = & $db; |
|
90 | 90 | log_message('info', 'Database Utility Class Initialized'); |
91 | 91 | } |
92 | 92 | |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | } |
405 | 405 | |
406 | 406 | // Load the Zip class and output it |
407 | - $CI =& get_instance(); |
|
407 | + $CI = & get_instance(); |
|
408 | 408 | $CI->load->library('zip'); |
409 | 409 | $CI->zip->add_data($prefs['filename'], $this->_backup($prefs)); |
410 | 410 | return $CI->zip->get_zip(); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_database = FALSE; |
|
54 | + protected $_create_database = FALSE; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * CREATE TABLE keys flag |
@@ -61,28 +61,28 @@ discard block |
||
61 | 61 | * |
62 | 62 | * @var bool |
63 | 63 | */ |
64 | - protected $_create_table_keys = TRUE; |
|
64 | + protected $_create_table_keys = TRUE; |
|
65 | 65 | |
66 | 66 | /** |
67 | 67 | * DROP DATABASE statement |
68 | 68 | * |
69 | 69 | * @var string |
70 | 70 | */ |
71 | - protected $_drop_database = FALSE; |
|
71 | + protected $_drop_database = FALSE; |
|
72 | 72 | |
73 | 73 | /** |
74 | 74 | * CREATE TABLE IF statement |
75 | 75 | * |
76 | 76 | * @var string |
77 | 77 | */ |
78 | - protected $_create_table_if = FALSE; |
|
78 | + protected $_create_table_if = FALSE; |
|
79 | 79 | |
80 | 80 | /** |
81 | 81 | * UNSIGNED support |
82 | 82 | * |
83 | 83 | * @var array |
84 | 84 | */ |
85 | - protected $_unsigned = array( |
|
85 | + protected $_unsigned = array( |
|
86 | 86 | 'SHORT' => 'INTEGER', |
87 | 87 | 'SMALLINT' => 'INTEGER', |
88 | 88 | 'INT' => 'BIGINT', |
@@ -51,28 +51,28 @@ discard block |
||
51 | 51 | * |
52 | 52 | * @var string |
53 | 53 | */ |
54 | - protected $_create_table_if = FALSE; |
|
54 | + protected $_create_table_if = FALSE; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * RENAME TABLE statement |
58 | 58 | * |
59 | 59 | * @var string |
60 | 60 | */ |
61 | - protected $_rename_table = FALSE; |
|
61 | + protected $_rename_table = FALSE; |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * DROP TABLE IF statement |
65 | 65 | * |
66 | 66 | * @var string |
67 | 67 | */ |
68 | - protected $_drop_table_if = FALSE; |
|
68 | + protected $_drop_table_if = FALSE; |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * UNSIGNED support |
72 | 72 | * |
73 | 73 | * @var array |
74 | 74 | */ |
75 | - protected $_unsigned = array( |
|
75 | + protected $_unsigned = array( |
|
76 | 76 | 'SMALLINT' => 'INTEGER', |
77 | 77 | 'INTEGER' => 'INT64', |
78 | 78 | 'FLOAT' => 'DOUBLE PRECISION' |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * |
84 | 84 | * @var string |
85 | 85 | */ |
86 | - protected $_null = 'NULL'; |
|
86 | + protected $_null = 'NULL'; |
|
87 | 87 | |
88 | 88 | // -------------------------------------------------------------------- |
89 | 89 |
@@ -95,10 +95,10 @@ |
||
95 | 95 | { |
96 | 96 | $info = ibase_field_info($this->result_id, $i); |
97 | 97 | |
98 | - $retval[$i] = new stdClass(); |
|
98 | + $retval[$i] = new stdClass(); |
|
99 | 99 | $retval[$i]->name = $info['name']; |
100 | 100 | $retval[$i]->type = $info['type']; |
101 | - $retval[$i]->max_length = $info['length']; |
|
101 | + $retval[$i]->max_length = $info['length']; |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | return $retval; |
@@ -111,10 +111,10 @@ |
||
111 | 111 | { |
112 | 112 | $field = mssql_fetch_field($this->result_id, $i); |
113 | 113 | |
114 | - $retval[$i] = new stdClass(); |
|
114 | + $retval[$i] = new stdClass(); |
|
115 | 115 | $retval[$i]->name = $field->name; |
116 | 116 | $retval[$i]->type = $field->type; |
117 | - $retval[$i]->max_length = $field->max_length; |
|
117 | + $retval[$i]->max_length = $field->max_length; |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | return $retval; |
@@ -122,7 +122,7 @@ |
||
122 | 122 | $retval = array(); |
123 | 123 | for ($i = 0, $c = $this->num_fields(); $i < $c; $i++) |
124 | 124 | { |
125 | - $retval[$i] = new stdClass(); |
|
125 | + $retval[$i] = new stdClass(); |
|
126 | 126 | $retval[$i]->name = mysql_field_name($this->result_id, $i); |
127 | 127 | $retval[$i]->type = mysql_field_type($this->result_id, $i); |
128 | 128 | $retval[$i]->max_length = mysql_field_len($this->result_id, $i); |
@@ -134,9 +134,9 @@ discard block |
||
134 | 134 | if (is_array($this->encrypt)) |
135 | 135 | { |
136 | 136 | $ssl = array(); |
137 | - empty($this->encrypt['ssl_key']) OR $ssl['key'] = $this->encrypt['ssl_key']; |
|
138 | - empty($this->encrypt['ssl_cert']) OR $ssl['cert'] = $this->encrypt['ssl_cert']; |
|
139 | - empty($this->encrypt['ssl_ca']) OR $ssl['ca'] = $this->encrypt['ssl_ca']; |
|
137 | + empty($this->encrypt['ssl_key']) OR $ssl['key'] = $this->encrypt['ssl_key']; |
|
138 | + empty($this->encrypt['ssl_cert']) OR $ssl['cert'] = $this->encrypt['ssl_cert']; |
|
139 | + empty($this->encrypt['ssl_ca']) OR $ssl['ca'] = $this->encrypt['ssl_ca']; |
|
140 | 140 | empty($this->encrypt['ssl_capath']) OR $ssl['capath'] = $this->encrypt['ssl_capath']; |
141 | 141 | empty($this->encrypt['ssl_cipher']) OR $ssl['cipher'] = $this->encrypt['ssl_cipher']; |
142 | 142 | |
@@ -149,9 +149,9 @@ discard block |
||
149 | 149 | |
150 | 150 | $client_flags |= MYSQLI_CLIENT_SSL; |
151 | 151 | $mysqli->ssl_set( |
152 | - isset($ssl['key']) ? $ssl['key'] : NULL, |
|
153 | - isset($ssl['cert']) ? $ssl['cert'] : NULL, |
|
154 | - isset($ssl['ca']) ? $ssl['ca'] : NULL, |
|
152 | + isset($ssl['key']) ? $ssl['key'] : NULL, |
|
153 | + isset($ssl['cert']) ? $ssl['cert'] : NULL, |
|
154 | + isset($ssl['ca']) ? $ssl['ca'] : NULL, |
|
155 | 155 | isset($ssl['capath']) ? $ssl['capath'] : NULL, |
156 | 156 | isset($ssl['cipher']) ? $ssl['cipher'] : NULL |
157 | 157 | ); |
@@ -430,16 +430,16 @@ discard block |
||
430 | 430 | $retval = array(); |
431 | 431 | for ($i = 0, $c = count($query); $i < $c; $i++) |
432 | 432 | { |
433 | - $retval[$i] = new stdClass(); |
|
434 | - $retval[$i]->name = $query[$i]->Field; |
|
433 | + $retval[$i] = new stdClass(); |
|
434 | + $retval[$i]->name = $query[$i]->Field; |
|
435 | 435 | |
436 | 436 | sscanf($query[$i]->Type, '%[a-z](%d)', |
437 | 437 | $retval[$i]->type, |
438 | 438 | $retval[$i]->max_length |
439 | 439 | ); |
440 | 440 | |
441 | - $retval[$i]->default = $query[$i]->Default; |
|
442 | - $retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI'); |
|
441 | + $retval[$i]->default = $query[$i]->Default; |
|
442 | + $retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI'); |
|
443 | 443 | } |
444 | 444 | |
445 | 445 | return $retval; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | * |
54 | 54 | * @var string |
55 | 55 | */ |
56 | - protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s'; |
|
56 | + protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s'; |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * CREATE TABLE keys flag |
@@ -63,14 +63,14 @@ discard block |
||
63 | 63 | * |
64 | 64 | * @var bool |
65 | 65 | */ |
66 | - protected $_create_table_keys = TRUE; |
|
66 | + protected $_create_table_keys = TRUE; |
|
67 | 67 | |
68 | 68 | /** |
69 | 69 | * UNSIGNED support |
70 | 70 | * |
71 | 71 | * @var array |
72 | 72 | */ |
73 | - protected $_unsigned = array( |
|
73 | + protected $_unsigned = array( |
|
74 | 74 | 'TINYINT', |
75 | 75 | 'SMALLINT', |
76 | 76 | 'MEDIUMINT', |