@@ -80,11 +80,11 @@ |
||
80 | 80 | $forward = @$_SERVER['HTTP_X_FORWARDED_FOR']; |
81 | 81 | $remote = $_SERVER['REMOTE_ADDR']; |
82 | 82 | |
83 | - if(filter_var($client, FILTER_VALIDATE_IP)) |
|
83 | + if (filter_var($client, FILTER_VALIDATE_IP)) |
|
84 | 84 | { |
85 | 85 | $ip = $client; |
86 | 86 | } |
87 | - elseif(filter_var($forward, FILTER_VALIDATE_IP)) |
|
87 | + elseif (filter_var($forward, FILTER_VALIDATE_IP)) |
|
88 | 88 | { |
89 | 89 | $ip = $forward; |
90 | 90 | } |
@@ -83,12 +83,10 @@ |
||
83 | 83 | if(filter_var($client, FILTER_VALIDATE_IP)) |
84 | 84 | { |
85 | 85 | $ip = $client; |
86 | - } |
|
87 | - elseif(filter_var($forward, FILTER_VALIDATE_IP)) |
|
86 | + } elseif(filter_var($forward, FILTER_VALIDATE_IP)) |
|
88 | 87 | { |
89 | 88 | $ip = $forward; |
90 | - } |
|
91 | - else |
|
89 | + } else |
|
92 | 90 | { |
93 | 91 | $ip = $remote; |
94 | 92 | } |
@@ -43,13 +43,13 @@ discard block |
||
43 | 43 | * @param delimiter string The values delimiter (e.g. ";" or ","). |
44 | 44 | * @return array |
45 | 45 | */ |
46 | - public function parse($filepath=FALSE, $column_headers=FALSE, $detect_line_endings=FALSE, $initial_line=FALSE, $delimiter=FALSE) |
|
46 | + public function parse($filepath = FALSE, $column_headers = FALSE, $detect_line_endings = FALSE, $initial_line = FALSE, $delimiter = FALSE) |
|
47 | 47 | { |
48 | 48 | // Raise memory limit (for big files) |
49 | 49 | ini_set('memory_limit', '128M'); |
50 | 50 | |
51 | 51 | // File path |
52 | - if(! $filepath) |
|
52 | + if ( ! $filepath) |
|
53 | 53 | { |
54 | 54 | $filepath = $this->_get_filepath(); |
55 | 55 | } |
@@ -60,13 +60,13 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | // If file doesn't exists, return false |
63 | - if(! file_exists($filepath)) |
|
63 | + if ( ! file_exists($filepath)) |
|
64 | 64 | { |
65 | 65 | return FALSE; |
66 | 66 | } |
67 | 67 | |
68 | 68 | // auto detect row endings |
69 | - if(! $detect_line_endings) |
|
69 | + if ( ! $detect_line_endings) |
|
70 | 70 | { |
71 | 71 | $detect_line_endings = $this->_get_detect_line_endings(); |
72 | 72 | } |
@@ -77,13 +77,13 @@ discard block |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | // If true, auto detect row endings |
80 | - if($detect_line_endings) |
|
80 | + if ($detect_line_endings) |
|
81 | 81 | { |
82 | 82 | ini_set("auto_detect_line_endings", TRUE); |
83 | 83 | } |
84 | 84 | |
85 | 85 | // Parse from this line on |
86 | - if(! $initial_line) |
|
86 | + if ( ! $initial_line) |
|
87 | 87 | { |
88 | 88 | $initial_line = $this->_get_initial_line(); |
89 | 89 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } |
94 | 94 | |
95 | 95 | // Delimiter |
96 | - if(! $delimiter) |
|
96 | + if ( ! $delimiter) |
|
97 | 97 | { |
98 | 98 | $delimiter = $this->_get_delimiter(); |
99 | 99 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | } |
105 | 105 | |
106 | 106 | // Column headers |
107 | - if(! $column_headers) |
|
107 | + if ( ! $column_headers) |
|
108 | 108 | { |
109 | 109 | $column_headers = $this->_get_column_headers(); |
110 | 110 | } |
@@ -123,17 +123,17 @@ discard block |
||
123 | 123 | { |
124 | 124 | if ($data[0] != NULL) |
125 | 125 | { |
126 | - if($row < $this->initial_line) |
|
126 | + if ($row < $this->initial_line) |
|
127 | 127 | { |
128 | 128 | $row++; |
129 | 129 | continue; |
130 | 130 | } |
131 | 131 | |
132 | 132 | // If first row, parse for column_headers |
133 | - if($row == $this->initial_line) |
|
133 | + if ($row == $this->initial_line) |
|
134 | 134 | { |
135 | 135 | // If column_headers already provided, use them |
136 | - if($this->column_headers) |
|
136 | + if ($this->column_headers) |
|
137 | 137 | { |
138 | 138 | foreach ($this->column_headers as $key => $value) |
139 | 139 | { |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | else |
152 | 152 | { |
153 | 153 | $new_row = $row - $this->initial_line - 1; // needed so that the returned array starts at 0 instead of 1 |
154 | - foreach($column_headers as $key => $value) // assumes there are as many columns as their are title columns |
|
154 | + foreach ($column_headers as $key => $value) // assumes there are as many columns as their are title columns |
|
155 | 155 | { |
156 | 156 | $result[$new_row][$value] = utf8_encode(trim($data[$key])); |
157 | 157 | } |
@@ -321,9 +321,9 @@ discard block |
||
321 | 321 | * @param column_headers array Alternate column_headers that will be used instead of first line of CSV |
322 | 322 | * @return void |
323 | 323 | */ |
324 | - private function _set_column_headers($column_headers='') |
|
324 | + private function _set_column_headers($column_headers = '') |
|
325 | 325 | { |
326 | - if(is_array($column_headers) && !empty($column_headers)) |
|
326 | + if (is_array($column_headers) && ! empty($column_headers)) |
|
327 | 327 | { |
328 | 328 | $this->column_headers = $column_headers; |
329 | 329 | } |
@@ -52,8 +52,7 @@ discard block |
||
52 | 52 | if(! $filepath) |
53 | 53 | { |
54 | 54 | $filepath = $this->_get_filepath(); |
55 | - } |
|
56 | - else |
|
55 | + } else |
|
57 | 56 | { |
58 | 57 | // If filepath provided, set it |
59 | 58 | $this->_set_filepath($filepath); |
@@ -69,8 +68,7 @@ discard block |
||
69 | 68 | if(! $detect_line_endings) |
70 | 69 | { |
71 | 70 | $detect_line_endings = $this->_get_detect_line_endings(); |
72 | - } |
|
73 | - else |
|
71 | + } else |
|
74 | 72 | { |
75 | 73 | // If detect_line_endings provided, set it |
76 | 74 | $this->_set_detect_line_endings($detect_line_endings); |
@@ -86,8 +84,7 @@ discard block |
||
86 | 84 | if(! $initial_line) |
87 | 85 | { |
88 | 86 | $initial_line = $this->_get_initial_line(); |
89 | - } |
|
90 | - else |
|
87 | + } else |
|
91 | 88 | { |
92 | 89 | $this->_set_initial_line($initial_line); |
93 | 90 | } |
@@ -96,8 +93,7 @@ discard block |
||
96 | 93 | if(! $delimiter) |
97 | 94 | { |
98 | 95 | $delimiter = $this->_get_delimiter(); |
99 | - } |
|
100 | - else |
|
96 | + } else |
|
101 | 97 | { |
102 | 98 | // If delimiter provided, set it |
103 | 99 | $this->_set_delimiter($delimiter); |
@@ -107,8 +103,7 @@ discard block |
||
107 | 103 | if(! $column_headers) |
108 | 104 | { |
109 | 105 | $column_headers = $this->_get_column_headers(); |
110 | - } |
|
111 | - else |
|
106 | + } else |
|
112 | 107 | { |
113 | 108 | // If column headers provided, set them |
114 | 109 | $this->_set_column_headers($column_headers); |
@@ -139,22 +134,22 @@ discard block |
||
139 | 134 | { |
140 | 135 | $column_headers[$key] = trim($value); |
141 | 136 | } |
142 | - } |
|
143 | - else // Parse first row for column_headers to use |
|
137 | + } else // Parse first row for column_headers to use |
|
144 | 138 | { |
145 | 139 | foreach ($data as $key => $value) |
146 | 140 | { |
147 | 141 | $column_headers[$key] = trim($value); |
148 | 142 | } |
149 | 143 | } |
150 | - } |
|
151 | - else |
|
144 | + } else |
|
152 | 145 | { |
153 | 146 | $new_row = $row - $this->initial_line - 1; // needed so that the returned array starts at 0 instead of 1 |
154 | - foreach($column_headers as $key => $value) // assumes there are as many columns as their are title columns |
|
147 | + foreach($column_headers as $key => $value) { |
|
148 | + // assumes there are as many columns as their are title columns |
|
155 | 149 | { |
156 | 150 | $result[$new_row][$value] = utf8_encode(trim($data[$key])); |
157 | 151 | } |
152 | + } |
|
158 | 153 | } |
159 | 154 | |
160 | 155 | unset($data); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | * |
188 | 188 | * @access public |
189 | 189 | * @param detect_line_endings bool The flag bit |
190 | - * @return void |
|
190 | + * @return CsvParser |
|
191 | 191 | */ |
192 | 192 | public function detect_line_endings($detect_line_endings) |
193 | 193 | { |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | * |
212 | 212 | * @access private |
213 | 213 | * @param initial_line int Start parse from this line |
214 | - * @return void |
|
214 | + * @return integer |
|
215 | 215 | */ |
216 | 216 | private function _set_initial_line($initial_line) |
217 | 217 | { |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | * |
224 | 224 | * @access public |
225 | 225 | * @param initial_line int Start parse from this line |
226 | - * @return void |
|
226 | + * @return CsvParser |
|
227 | 227 | */ |
228 | 228 | public function initial_line($initial_line) |
229 | 229 | { |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | * |
260 | 260 | * @access public |
261 | 261 | * @param initial_line string The values delimiter (eg. "," or ";") |
262 | - * @return void |
|
262 | + * @return CsvParser |
|
263 | 263 | */ |
264 | 264 | public function delimiter($delimiter) |
265 | 265 | { |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | * |
296 | 296 | * @access public |
297 | 297 | * @param filepath string Location of the CSV file |
298 | - * @return void |
|
298 | + * @return CsvParser |
|
299 | 299 | */ |
300 | 300 | public function filepath($filepath) |
301 | 301 | { |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | * Gets the filepath of a given CSV file |
308 | 308 | * |
309 | 309 | * @access private |
310 | - * @return string |
|
310 | + * @return boolean |
|
311 | 311 | */ |
312 | 312 | private function _get_filepath() |
313 | 313 | { |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | * |
335 | 335 | * @access public |
336 | 336 | * @param column_headers array Alternate column_headers that will be used instead of first line of CSV |
337 | - * @return void |
|
337 | + * @return CsvParser |
|
338 | 338 | */ |
339 | 339 | public function column_headers($column_headers) |
340 | 340 | { |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | * Gets the alternate column headers that will be used when creating the array |
347 | 347 | * |
348 | 348 | * @access private |
349 | - * @return mixed |
|
349 | + * @return boolean |
|
350 | 350 | */ |
351 | 351 | private function _get_column_headers() |
352 | 352 | { |
@@ -233,8 +233,7 @@ discard block |
||
233 | 233 | if ($output == OBJECT) |
234 | 234 | { |
235 | 235 | return $this->last_result; |
236 | - } |
|
237 | - elseif ($output == ARRAY_A || $output == ARRAY_N) |
|
236 | + } elseif ($output == ARRAY_A || $output == ARRAY_N) |
|
238 | 237 | { |
239 | 238 | if ($this->last_result) |
240 | 239 | { |
@@ -306,8 +305,7 @@ discard block |
||
306 | 305 | { |
307 | 306 | $this->register_error("Could not open cache dir: $this->cache_dir"); |
308 | 307 | $this->show_errors ? trigger_error("Could not open cache dir: $this->cache_dir", E_USER_WARNING) : null; |
309 | - } |
|
310 | - else |
|
308 | + } else |
|
311 | 309 | { |
312 | 310 | // Cache all result values |
313 | 311 | $result_cache = array( |
@@ -317,8 +315,9 @@ discard block |
||
317 | 315 | 'return_value' => $this->num_rows, |
318 | 316 | ); |
319 | 317 | file_put_contents($cache_file, serialize($result_cache)); |
320 | - if (file_exists($cache_file.".updating")) |
|
321 | - unlink($cache_file.".updating"); |
|
318 | + if (file_exists($cache_file.".updating")) { |
|
319 | + unlink($cache_file.".updating"); |
|
320 | + } |
|
322 | 321 | } |
323 | 322 | } |
324 | 323 | |
@@ -342,8 +341,7 @@ discard block |
||
342 | 341 | ! (file_exists($cache_file.".updating") && (time() - filemtime($cache_file.".updating") < 60))) |
343 | 342 | { |
344 | 343 | touch($cache_file.".updating"); // Show that we in the process of updating the cache |
345 | - } |
|
346 | - else |
|
344 | + } else |
|
347 | 345 | { |
348 | 346 | $result_cache = unserialize(file_get_contents($cache_file)); |
349 | 347 | |
@@ -598,10 +596,12 @@ discard block |
||
598 | 596 | $sql = array(); |
599 | 597 | foreach ($params as $field => $val) |
600 | 598 | { |
601 | - if ($val === 'true' || $val === true) |
|
602 | - $val = 1; |
|
603 | - if ($val === 'false' || $val === false) |
|
604 | - $val = 0; |
|
599 | + if ($val === 'true' || $val === true) { |
|
600 | + $val = 1; |
|
601 | + } |
|
602 | + if ($val === 'false' || $val === false) { |
|
603 | + $val = 0; |
|
604 | + } |
|
605 | 605 | |
606 | 606 | switch ($val) { |
607 | 607 | case 'NOW()' : |
@@ -68,6 +68,9 @@ discard block |
||
68 | 68 | * Returns array of host and port. If port is omitted, returns $default |
69 | 69 | */ |
70 | 70 | |
71 | + /** |
|
72 | + * @param string $host |
|
73 | + */ |
|
71 | 74 | function get_host_port($host, $default = false) |
72 | 75 | { |
73 | 76 | $port = $default; |
@@ -217,6 +220,9 @@ discard block |
||
217 | 220 | * Return the the query as a result set - see docs for more details |
218 | 221 | */ |
219 | 222 | |
223 | + /** |
|
224 | + * @param string $output |
|
225 | + */ |
|
220 | 226 | function get_results($query = null, $output = OBJECT) |
221 | 227 | { |
222 | 228 | |
@@ -293,6 +299,10 @@ discard block |
||
293 | 299 | * store_cache |
294 | 300 | */ |
295 | 301 | |
302 | + /** |
|
303 | + * @param string $query |
|
304 | + * @param boolean $is_insert |
|
305 | + */ |
|
296 | 306 | function store_cache($query, $is_insert) |
297 | 307 | { |
298 | 308 | |
@@ -328,6 +338,9 @@ discard block |
||
328 | 338 | * get_cache |
329 | 339 | */ |
330 | 340 | |
341 | + /** |
|
342 | + * @param string $query |
|
343 | + */ |
|
331 | 344 | function get_cache($query) |
332 | 345 | { |
333 | 346 | |
@@ -557,6 +570,9 @@ discard block |
||
557 | 570 | return round($this->timer_get_cur() - $this->timers[$timer_name], 2); |
558 | 571 | } |
559 | 572 | |
573 | + /** |
|
574 | + * @param integer $timer_name |
|
575 | + */ |
|
560 | 576 | function timer_update_global($timer_name) |
561 | 577 | { |
562 | 578 | if ($this->do_profile) |
@@ -178,13 +178,13 @@ |
||
178 | 178 | function escape($str) |
179 | 179 | { |
180 | 180 | // If there is no existing database connection then try to connect |
181 | - if ( ! isset($this->dbh) || ! $this->dbh ) |
|
181 | + if ( ! isset($this->dbh) || ! $this->dbh) |
|
182 | 182 | { |
183 | 183 | $this->connect($this->dbuser, $this->dbpassword, $this->dbhost, $this->dbport); |
184 | 184 | $this->select($this->dbname, $this->encoding); |
185 | 185 | } |
186 | 186 | |
187 | - if ( get_magic_quotes_gpc() ) { |
|
187 | + if (get_magic_quotes_gpc()) { |
|
188 | 188 | $str = stripslashes($str); |
189 | 189 | } |
190 | 190 |
@@ -26,8 +26,12 @@ discard block |
||
26 | 26 | * ezSQL Database specific class - mySQLi |
27 | 27 | */ |
28 | 28 | |
29 | - if ( ! function_exists('mysqli_connect')) die('<b>Fatal Error:</b> ezSQL_mysql requires mySQLi Lib to be compiled and or linked in to the PHP engine'); |
|
30 | - if ( ! class_exists('ezSQLcore')) die('<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used'); |
|
29 | + if ( ! function_exists('mysqli_connect')) { |
|
30 | + die('<b>Fatal Error:</b> ezSQL_mysql requires mySQLi Lib to be compiled and or linked in to the PHP engine'); |
|
31 | + } |
|
32 | + if ( ! class_exists('ezSQLcore')) { |
|
33 | + die('<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used'); |
|
34 | + } |
|
31 | 35 | |
32 | 36 | class ezSQL_mysqli extends ezSQLcore |
33 | 37 | { |
@@ -64,7 +68,9 @@ discard block |
||
64 | 68 | $return_val = false; |
65 | 69 | if ( ! $this->connect($dbuser, $dbpassword, $dbhost, $dbport)); |
66 | 70 | else if ( ! $this->select($dbname, $encoding)); |
67 | - else $return_val = true; |
|
71 | + else { |
|
72 | + $return_val = true; |
|
73 | + } |
|
68 | 74 | return $return_val; |
69 | 75 | } |
70 | 76 | |
@@ -99,8 +105,7 @@ discard block |
||
99 | 105 | { |
100 | 106 | $this->register_error($ezsql_mysqli_str[2].' in '.__FILE__.' on line '.__LINE__); |
101 | 107 | $this->show_errors ? trigger_error($ezsql_mysqli_str[2], E_USER_WARNING) : null; |
102 | - } |
|
103 | - else |
|
108 | + } else |
|
104 | 109 | { |
105 | 110 | $this->dbuser = $dbuser; |
106 | 111 | $this->dbpassword = $dbpassword; |
@@ -141,13 +146,13 @@ discard block |
||
141 | 146 | else if ( ! @$this->dbh->select_db($dbname)) |
142 | 147 | { |
143 | 148 | // Try to get error supplied by mysql if not use our own |
144 | - if ( ! $str = @$this->dbh->error) |
|
145 | - $str = $ezsql_mysqli_str[5]; |
|
149 | + if ( ! $str = @$this->dbh->error) { |
|
150 | + $str = $ezsql_mysqli_str[5]; |
|
151 | + } |
|
146 | 152 | |
147 | 153 | $this->register_error($str.' in '.__FILE__.' on line '.__LINE__); |
148 | 154 | $this->show_errors ? trigger_error($str, E_USER_WARNING) : null; |
149 | - } |
|
150 | - else |
|
155 | + } else |
|
151 | 156 | { |
152 | 157 | $this->dbname = $dbname; |
153 | 158 | if ($encoding != '') |
@@ -257,8 +262,9 @@ discard block |
||
257 | 262 | $this->connect($this->dbuser, $this->dbpassword, $this->dbhost, $this->dbport); |
258 | 263 | $this->select($this->dbname, $this->encoding); |
259 | 264 | // No existing connection at this point means the server is unreachable |
260 | - if ( ! isset($this->dbh) || ! $this->dbh || $this->dbh->connect_errno) |
|
261 | - return false; |
|
265 | + if ( ! isset($this->dbh) || ! $this->dbh || $this->dbh->connect_errno) { |
|
266 | + return false; |
|
267 | + } |
|
262 | 268 | } |
263 | 269 | |
264 | 270 | // Perform the query via std mysql_query function.. |
@@ -205,6 +205,9 @@ |
||
205 | 205 | * Perform mySQL query and try to determine result value |
206 | 206 | */ |
207 | 207 | |
208 | + /** |
|
209 | + * @param string $query |
|
210 | + */ |
|
208 | 211 | function query($query) |
209 | 212 | { |
210 | 213 |
@@ -133,13 +133,13 @@ |
||
133 | 133 | public function wc_api_connect() { |
134 | 134 | static $connection; |
135 | 135 | |
136 | - if ( isset( $connection ) ) { |
|
136 | + if (isset($connection)) { |
|
137 | 137 | return $connection; |
138 | 138 | } |
139 | 139 | |
140 | 140 | $keys = $this->getUserKeys(); |
141 | 141 | |
142 | - if ( ! $keys ) { |
|
142 | + if ( ! $keys) { |
|
143 | 143 | $connection = false; |
144 | 144 | |
145 | 145 | return $connection; |
@@ -104,20 +104,16 @@ discard block |
||
104 | 104 | if ($order->amount_paid > 0 AND $order->order_status == 'Refunded') |
105 | 105 | { |
106 | 106 | $number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix').sprintf("%04s", $order->order_number) : get_option('credit_note_prefix').sprintf("%04s", $order->order_number); |
107 | - } |
|
108 | - elseif ($order->order_status == 'Refunded') |
|
107 | + } elseif ($order->order_status == 'Refunded') |
|
109 | 108 | { |
110 | 109 | $number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix').sprintf("%04s", $order->order_number) : get_option('credit_note_prefix').sprintf("%04s", $order->order_number); |
111 | - } |
|
112 | - elseif ($order->amount_paid > 0 AND $order->amount_due > 0 AND $order->order_status !== 'Paid') |
|
110 | + } elseif ($order->amount_paid > 0 AND $order->amount_due > 0 AND $order->order_status !== 'Paid') |
|
113 | 111 | { |
114 | 112 | $number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number); |
115 | - } |
|
116 | - elseif ($order->order_status == 'Expired' || $order->order_status == 'Open' || $order->order_status == 'Pending' || $order->order_status == 'Failed') |
|
113 | + } elseif ($order->order_status == 'Expired' || $order->order_status == 'Open' || $order->order_status == 'Pending' || $order->order_status == 'Failed') |
|
117 | 114 | { |
118 | 115 | $number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number); |
119 | - } |
|
120 | - else |
|
116 | + } else |
|
121 | 117 | { |
122 | 118 | $number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number); |
123 | 119 | } |
@@ -156,8 +152,7 @@ discard block |
||
156 | 152 | if (isset($client->client_address1) && $client->client_postcode && $client->client_city && $client->client_country) |
157 | 153 | { |
158 | 154 | $address = $client->client_address1.' '.$client->client_postcode.' '.$client->client_city.' '.get_countries($client->client_country); |
159 | - } |
|
160 | - else |
|
155 | + } else |
|
161 | 156 | { |
162 | 157 | $address = false; |
163 | 158 | } |
@@ -37,6 +37,11 @@ discard block |
||
37 | 37 | public function __construct(HelperFunctionsInterface $functions) { |
38 | 38 | $this->functions = $functions; |
39 | 39 | } |
40 | + |
|
41 | + /** |
|
42 | + * @param string $entity |
|
43 | + * @param boolean $serverSidePagination |
|
44 | + */ |
|
40 | 45 | final public function prepareList($entity, $serverSidePagination) |
41 | 46 | { |
42 | 47 | $return = []; |
@@ -62,6 +67,10 @@ discard block |
||
62 | 67 | } |
63 | 68 | return $return; |
64 | 69 | } |
70 | + |
|
71 | + /** |
|
72 | + * @param string $entity |
|
73 | + */ |
|
65 | 74 | final public function fetchData($entity, $params) |
66 | 75 | { |
67 | 76 | $return = []; |
@@ -114,15 +114,15 @@ discard block |
||
114 | 114 | * Config file, tuned-up for merged verion |
115 | 115 | */ |
116 | 116 | |
117 | - define('QR_CACHEABLE', false); // use cache - more disk reads but less CPU power, masks and format templates are stored there |
|
118 | - define('QR_CACHE_DIR', false); // used when QR_CACHEABLE === true |
|
119 | - define('QR_LOG_DIR', false); // default error logs dir |
|
117 | + define('QR_CACHEABLE', false); // use cache - more disk reads but less CPU power, masks and format templates are stored there |
|
118 | + define('QR_CACHE_DIR', false); // used when QR_CACHEABLE === true |
|
119 | + define('QR_LOG_DIR', false); // default error logs dir |
|
120 | 120 | |
121 | - define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code |
|
122 | - define('QR_FIND_FROM_RANDOM', 2); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly |
|
123 | - define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false |
|
121 | + define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code |
|
122 | + define('QR_FIND_FROM_RANDOM', 2); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly |
|
123 | + define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false |
|
124 | 124 | |
125 | - define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images |
|
125 | + define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images |
|
126 | 126 | |
127 | 127 | |
128 | 128 | |
@@ -163,8 +163,8 @@ discard block |
||
163 | 163 | $len = count($frame); |
164 | 164 | foreach ($frame as &$frameLine) { |
165 | 165 | |
166 | - for($i=0; $i<$len; $i++) { |
|
167 | - $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0'; |
|
166 | + for ($i = 0; $i < $len; $i++) { |
|
167 | + $frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0'; |
|
168 | 168 | } |
169 | 169 | } |
170 | 170 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | { |
177 | 177 | $barcode_array = array(); |
178 | 178 | |
179 | - if (!is_array($mode)) |
|
179 | + if ( ! is_array($mode)) |
|
180 | 180 | $mode = explode(',', $mode); |
181 | 181 | |
182 | 182 | $eccLevel = 'L'; |
@@ -194,8 +194,8 @@ discard block |
||
194 | 194 | |
195 | 195 | foreach ($qrTab as $line) { |
196 | 196 | $arrAdd = array(); |
197 | - foreach(str_split($line) as $char) |
|
198 | - $arrAdd[] = ($char=='1')?1:0; |
|
197 | + foreach (str_split($line) as $char) |
|
198 | + $arrAdd[] = ($char == '1') ? 1 : 0; |
|
199 | 199 | $barcode_array['bcode'][] = $arrAdd; |
200 | 200 | } |
201 | 201 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | QRtools::markTime('before_build_cache'); |
215 | 215 | |
216 | 216 | $mask = new QRmask(); |
217 | - for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) { |
|
217 | + for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) { |
|
218 | 218 | $frame = QRspec::newFrame($a); |
219 | 219 | if (QR_IMAGE) { |
220 | 220 | $fileName = QR_CACHE_DIR.'frame_'.$a.'.png'; |
@@ -248,8 +248,8 @@ discard block |
||
248 | 248 | public static function dumpMask($frame) |
249 | 249 | { |
250 | 250 | $width = count($frame); |
251 | - for($y=0;$y<$width;$y++) { |
|
252 | - for($x=0;$x<$width;$x++) { |
|
251 | + for ($y = 0; $y < $width; $y++) { |
|
252 | + for ($x = 0; $x < $width; $x++) { |
|
253 | 253 | echo ord($frame[$y][$x]).','; |
254 | 254 | } |
255 | 255 | } |
@@ -259,9 +259,9 @@ discard block |
||
259 | 259 | public static function markTime($markerId) |
260 | 260 | { |
261 | 261 | list($usec, $sec) = explode(" ", microtime()); |
262 | - $time = ((float)$usec + (float)$sec); |
|
262 | + $time = ((float) $usec + (float) $sec); |
|
263 | 263 | |
264 | - if (!isset($GLOBALS['qr_time_bench'])) |
|
264 | + if ( ! isset($GLOBALS['qr_time_bench'])) |
|
265 | 265 | $GLOBALS['qr_time_bench'] = array(); |
266 | 266 | |
267 | 267 | $GLOBALS['qr_time_bench'][$markerId] = $time; |
@@ -280,9 +280,9 @@ discard block |
||
280 | 280 | <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead> |
281 | 281 | <tbody>'; |
282 | 282 | |
283 | - foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) { |
|
283 | + foreach ($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) { |
|
284 | 284 | if ($p > 0) { |
285 | - echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>'; |
|
285 | + echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime - $lastTime, 6).'s</td></tr>'; |
|
286 | 286 | } else { |
287 | 287 | $startTime = $thisTime; |
288 | 288 | } |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | } |
293 | 293 | |
294 | 294 | echo '</tbody><tfoot> |
295 | - <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr> |
|
295 | + <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime - $startTime, 6).'s</td></tr> |
|
296 | 296 | </tfoot> |
297 | 297 | </table>'; |
298 | 298 | } |
@@ -344,57 +344,57 @@ discard block |
||
344 | 344 | */ |
345 | 345 | |
346 | 346 | define('QRSPEC_VERSION_MAX', 40); |
347 | - define('QRSPEC_WIDTH_MAX', 177); |
|
347 | + define('QRSPEC_WIDTH_MAX', 177); |
|
348 | 348 | |
349 | - define('QRCAP_WIDTH', 0); |
|
350 | - define('QRCAP_WORDS', 1); |
|
351 | - define('QRCAP_REMINDER', 2); |
|
352 | - define('QRCAP_EC', 3); |
|
349 | + define('QRCAP_WIDTH', 0); |
|
350 | + define('QRCAP_WORDS', 1); |
|
351 | + define('QRCAP_REMINDER', 2); |
|
352 | + define('QRCAP_EC', 3); |
|
353 | 353 | |
354 | 354 | class QRspec { |
355 | 355 | |
356 | 356 | public static $capacity = array( |
357 | - array( 0, 0, 0, array( 0, 0, 0, 0)), |
|
358 | - array( 21, 26, 0, array( 7, 10, 13, 17)), // 1 |
|
359 | - array( 25, 44, 7, array( 10, 16, 22, 28)), |
|
360 | - array( 29, 70, 7, array( 15, 26, 36, 44)), |
|
361 | - array( 33, 100, 7, array( 20, 36, 52, 64)), |
|
362 | - array( 37, 134, 7, array( 26, 48, 72, 88)), // 5 |
|
363 | - array( 41, 172, 7, array( 36, 64, 96, 112)), |
|
364 | - array( 45, 196, 0, array( 40, 72, 108, 130)), |
|
365 | - array( 49, 242, 0, array( 48, 88, 132, 156)), |
|
366 | - array( 53, 292, 0, array( 60, 110, 160, 192)), |
|
367 | - array( 57, 346, 0, array( 72, 130, 192, 224)), //10 |
|
368 | - array( 61, 404, 0, array( 80, 150, 224, 264)), |
|
369 | - array( 65, 466, 0, array( 96, 176, 260, 308)), |
|
370 | - array( 69, 532, 0, array( 104, 198, 288, 352)), |
|
371 | - array( 73, 581, 3, array( 120, 216, 320, 384)), |
|
372 | - array( 77, 655, 3, array( 132, 240, 360, 432)), //15 |
|
373 | - array( 81, 733, 3, array( 144, 280, 408, 480)), |
|
374 | - array( 85, 815, 3, array( 168, 308, 448, 532)), |
|
375 | - array( 89, 901, 3, array( 180, 338, 504, 588)), |
|
376 | - array( 93, 991, 3, array( 196, 364, 546, 650)), |
|
377 | - array( 97, 1085, 3, array( 224, 416, 600, 700)), //20 |
|
378 | - array(101, 1156, 4, array( 224, 442, 644, 750)), |
|
379 | - array(105, 1258, 4, array( 252, 476, 690, 816)), |
|
380 | - array(109, 1364, 4, array( 270, 504, 750, 900)), |
|
381 | - array(113, 1474, 4, array( 300, 560, 810, 960)), |
|
382 | - array(117, 1588, 4, array( 312, 588, 870, 1050)), //25 |
|
383 | - array(121, 1706, 4, array( 336, 644, 952, 1110)), |
|
384 | - array(125, 1828, 4, array( 360, 700, 1020, 1200)), |
|
385 | - array(129, 1921, 3, array( 390, 728, 1050, 1260)), |
|
386 | - array(133, 2051, 3, array( 420, 784, 1140, 1350)), |
|
387 | - array(137, 2185, 3, array( 450, 812, 1200, 1440)), //30 |
|
388 | - array(141, 2323, 3, array( 480, 868, 1290, 1530)), |
|
389 | - array(145, 2465, 3, array( 510, 924, 1350, 1620)), |
|
390 | - array(149, 2611, 3, array( 540, 980, 1440, 1710)), |
|
391 | - array(153, 2761, 3, array( 570, 1036, 1530, 1800)), |
|
392 | - array(157, 2876, 0, array( 570, 1064, 1590, 1890)), //35 |
|
393 | - array(161, 3034, 0, array( 600, 1120, 1680, 1980)), |
|
394 | - array(165, 3196, 0, array( 630, 1204, 1770, 2100)), |
|
395 | - array(169, 3362, 0, array( 660, 1260, 1860, 2220)), |
|
396 | - array(173, 3532, 0, array( 720, 1316, 1950, 2310)), |
|
397 | - array(177, 3706, 0, array( 750, 1372, 2040, 2430)) //40 |
|
357 | + array(0, 0, 0, array(0, 0, 0, 0)), |
|
358 | + array(21, 26, 0, array(7, 10, 13, 17)), // 1 |
|
359 | + array(25, 44, 7, array(10, 16, 22, 28)), |
|
360 | + array(29, 70, 7, array(15, 26, 36, 44)), |
|
361 | + array(33, 100, 7, array(20, 36, 52, 64)), |
|
362 | + array(37, 134, 7, array(26, 48, 72, 88)), // 5 |
|
363 | + array(41, 172, 7, array(36, 64, 96, 112)), |
|
364 | + array(45, 196, 0, array(40, 72, 108, 130)), |
|
365 | + array(49, 242, 0, array(48, 88, 132, 156)), |
|
366 | + array(53, 292, 0, array(60, 110, 160, 192)), |
|
367 | + array(57, 346, 0, array(72, 130, 192, 224)), //10 |
|
368 | + array(61, 404, 0, array(80, 150, 224, 264)), |
|
369 | + array(65, 466, 0, array(96, 176, 260, 308)), |
|
370 | + array(69, 532, 0, array(104, 198, 288, 352)), |
|
371 | + array(73, 581, 3, array(120, 216, 320, 384)), |
|
372 | + array(77, 655, 3, array(132, 240, 360, 432)), //15 |
|
373 | + array(81, 733, 3, array(144, 280, 408, 480)), |
|
374 | + array(85, 815, 3, array(168, 308, 448, 532)), |
|
375 | + array(89, 901, 3, array(180, 338, 504, 588)), |
|
376 | + array(93, 991, 3, array(196, 364, 546, 650)), |
|
377 | + array(97, 1085, 3, array(224, 416, 600, 700)), //20 |
|
378 | + array(101, 1156, 4, array(224, 442, 644, 750)), |
|
379 | + array(105, 1258, 4, array(252, 476, 690, 816)), |
|
380 | + array(109, 1364, 4, array(270, 504, 750, 900)), |
|
381 | + array(113, 1474, 4, array(300, 560, 810, 960)), |
|
382 | + array(117, 1588, 4, array(312, 588, 870, 1050)), //25 |
|
383 | + array(121, 1706, 4, array(336, 644, 952, 1110)), |
|
384 | + array(125, 1828, 4, array(360, 700, 1020, 1200)), |
|
385 | + array(129, 1921, 3, array(390, 728, 1050, 1260)), |
|
386 | + array(133, 2051, 3, array(420, 784, 1140, 1350)), |
|
387 | + array(137, 2185, 3, array(450, 812, 1200, 1440)), //30 |
|
388 | + array(141, 2323, 3, array(480, 868, 1290, 1530)), |
|
389 | + array(145, 2465, 3, array(510, 924, 1350, 1620)), |
|
390 | + array(149, 2611, 3, array(540, 980, 1440, 1710)), |
|
391 | + array(153, 2761, 3, array(570, 1036, 1530, 1800)), |
|
392 | + array(157, 2876, 0, array(570, 1064, 1590, 1890)), //35 |
|
393 | + array(161, 3034, 0, array(600, 1120, 1680, 1980)), |
|
394 | + array(165, 3196, 0, array(630, 1204, 1770, 2100)), |
|
395 | + array(169, 3362, 0, array(660, 1260, 1860, 2220)), |
|
396 | + array(173, 3532, 0, array(720, 1316, 1950, 2310)), |
|
397 | + array(177, 3706, 0, array(750, 1372, 2040, 2430)) //40 |
|
398 | 398 | ); |
399 | 399 | |
400 | 400 | //---------------------------------------------------------------------- |
@@ -425,9 +425,9 @@ discard block |
||
425 | 425 | public static function getMinimumVersion($size, $level) |
426 | 426 | { |
427 | 427 | |
428 | - for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) { |
|
429 | - $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level]; |
|
430 | - if($words >= $size) |
|
428 | + for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) { |
|
429 | + $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level]; |
|
430 | + if ($words >= $size) |
|
431 | 431 | return $i; |
432 | 432 | } |
433 | 433 | |
@@ -438,9 +438,9 @@ discard block |
||
438 | 438 | |
439 | 439 | public static $lengthTableBits = array( |
440 | 440 | array(10, 12, 14), |
441 | - array( 9, 11, 13), |
|
442 | - array( 8, 16, 16), |
|
443 | - array( 8, 10, 12) |
|
441 | + array(9, 11, 13), |
|
442 | + array(8, 16, 16), |
|
443 | + array(8, 10, 12) |
|
444 | 444 | ); |
445 | 445 | |
446 | 446 | //---------------------------------------------------------------------- |
@@ -463,12 +463,12 @@ discard block |
||
463 | 463 | //---------------------------------------------------------------------- |
464 | 464 | public static function maximumWords($mode, $version) |
465 | 465 | { |
466 | - if($mode == QR_MODE_STRUCTURE) |
|
466 | + if ($mode == QR_MODE_STRUCTURE) |
|
467 | 467 | return 3; |
468 | 468 | |
469 | - if($version <= 9) { |
|
469 | + if ($version <= 9) { |
|
470 | 470 | $l = 0; |
471 | - } else if($version <= 26) { |
|
471 | + } else if ($version <= 26) { |
|
472 | 472 | $l = 1; |
473 | 473 | } else { |
474 | 474 | $l = 2; |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | $bits = self::$lengthTableBits[$mode][$l]; |
478 | 478 | $words = (1 << $bits) - 1; |
479 | 479 | |
480 | - if($mode == QR_MODE_KANJI) { |
|
480 | + if ($mode == QR_MODE_KANJI) { |
|
481 | 481 | $words *= 2; // the number of bytes is required |
482 | 482 | } |
483 | 483 | |
@@ -489,47 +489,47 @@ discard block |
||
489 | 489 | // See Table 12-16 (pp.30-36), JIS X0510:2004. |
490 | 490 | |
491 | 491 | public static $eccTable = array( |
492 | - array(array( 0, 0), array( 0, 0), array( 0, 0), array( 0, 0)), |
|
493 | - array(array( 1, 0), array( 1, 0), array( 1, 0), array( 1, 0)), // 1 |
|
494 | - array(array( 1, 0), array( 1, 0), array( 1, 0), array( 1, 0)), |
|
495 | - array(array( 1, 0), array( 1, 0), array( 2, 0), array( 2, 0)), |
|
496 | - array(array( 1, 0), array( 2, 0), array( 2, 0), array( 4, 0)), |
|
497 | - array(array( 1, 0), array( 2, 0), array( 2, 2), array( 2, 2)), // 5 |
|
498 | - array(array( 2, 0), array( 4, 0), array( 4, 0), array( 4, 0)), |
|
499 | - array(array( 2, 0), array( 4, 0), array( 2, 4), array( 4, 1)), |
|
500 | - array(array( 2, 0), array( 2, 2), array( 4, 2), array( 4, 2)), |
|
501 | - array(array( 2, 0), array( 3, 2), array( 4, 4), array( 4, 4)), |
|
502 | - array(array( 2, 2), array( 4, 1), array( 6, 2), array( 6, 2)), //10 |
|
503 | - array(array( 4, 0), array( 1, 4), array( 4, 4), array( 3, 8)), |
|
504 | - array(array( 2, 2), array( 6, 2), array( 4, 6), array( 7, 4)), |
|
505 | - array(array( 4, 0), array( 8, 1), array( 8, 4), array(12, 4)), |
|
506 | - array(array( 3, 1), array( 4, 5), array(11, 5), array(11, 5)), |
|
507 | - array(array( 5, 1), array( 5, 5), array( 5, 7), array(11, 7)), //15 |
|
508 | - array(array( 5, 1), array( 7, 3), array(15, 2), array( 3, 13)), |
|
509 | - array(array( 1, 5), array(10, 1), array( 1, 15), array( 2, 17)), |
|
510 | - array(array( 5, 1), array( 9, 4), array(17, 1), array( 2, 19)), |
|
511 | - array(array( 3, 4), array( 3, 11), array(17, 4), array( 9, 16)), |
|
512 | - array(array( 3, 5), array( 3, 13), array(15, 5), array(15, 10)), //20 |
|
513 | - array(array( 4, 4), array(17, 0), array(17, 6), array(19, 6)), |
|
514 | - array(array( 2, 7), array(17, 0), array( 7, 16), array(34, 0)), |
|
515 | - array(array( 4, 5), array( 4, 14), array(11, 14), array(16, 14)), |
|
516 | - array(array( 6, 4), array( 6, 14), array(11, 16), array(30, 2)), |
|
517 | - array(array( 8, 4), array( 8, 13), array( 7, 22), array(22, 13)), //25 |
|
518 | - array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)), |
|
519 | - array(array( 8, 4), array(22, 3), array( 8, 26), array(12, 28)), |
|
520 | - array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)), |
|
521 | - array(array( 7, 7), array(21, 7), array( 1, 37), array(19, 26)), |
|
522 | - array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), //30 |
|
523 | - array(array(13, 3), array( 2, 29), array(42, 1), array(23, 28)), |
|
524 | - array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)), |
|
525 | - array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)), |
|
526 | - array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)), |
|
527 | - array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), //35 |
|
528 | - array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)), |
|
529 | - array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)), |
|
530 | - array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)), |
|
531 | - array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)), |
|
532 | - array(array(19, 6), array(18, 31), array(34, 34), array(20, 61)),//40 |
|
492 | + array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)), |
|
493 | + array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), // 1 |
|
494 | + array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), |
|
495 | + array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)), |
|
496 | + array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)), |
|
497 | + array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), // 5 |
|
498 | + array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)), |
|
499 | + array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)), |
|
500 | + array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)), |
|
501 | + array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)), |
|
502 | + array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), //10 |
|
503 | + array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)), |
|
504 | + array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)), |
|
505 | + array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)), |
|
506 | + array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)), |
|
507 | + array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), //15 |
|
508 | + array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)), |
|
509 | + array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)), |
|
510 | + array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)), |
|
511 | + array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)), |
|
512 | + array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), //20 |
|
513 | + array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)), |
|
514 | + array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)), |
|
515 | + array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)), |
|
516 | + array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)), |
|
517 | + array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), //25 |
|
518 | + array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)), |
|
519 | + array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)), |
|
520 | + array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)), |
|
521 | + array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)), |
|
522 | + array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), //30 |
|
523 | + array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)), |
|
524 | + array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)), |
|
525 | + array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)), |
|
526 | + array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)), |
|
527 | + array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), //35 |
|
528 | + array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)), |
|
529 | + array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)), |
|
530 | + array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)), |
|
531 | + array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)), |
|
532 | + array(array(19, 6), array(18, 31), array(34, 34), array(20, 61)), //40 |
|
533 | 533 | ); |
534 | 534 | |
535 | 535 | //---------------------------------------------------------------------- |
@@ -538,7 +538,7 @@ discard block |
||
538 | 538 | public static function getEccSpec($version, $level, array &$spec) |
539 | 539 | { |
540 | 540 | if (count($spec) < 5) { |
541 | - $spec = array(0,0,0,0,0); |
|
541 | + $spec = array(0, 0, 0, 0, 0); |
|
542 | 542 | } |
543 | 543 | |
544 | 544 | $b1 = self::$eccTable[$version][$level][0]; |
@@ -546,16 +546,16 @@ discard block |
||
546 | 546 | $data = self::getDataLength($version, $level); |
547 | 547 | $ecc = self::getECCLength($version, $level); |
548 | 548 | |
549 | - if($b2 == 0) { |
|
549 | + if ($b2 == 0) { |
|
550 | 550 | $spec[0] = $b1; |
551 | - $spec[1] = (int)($data / $b1); |
|
552 | - $spec[2] = (int)($ecc / $b1); |
|
551 | + $spec[1] = (int) ($data / $b1); |
|
552 | + $spec[2] = (int) ($ecc / $b1); |
|
553 | 553 | $spec[3] = 0; |
554 | 554 | $spec[4] = 0; |
555 | 555 | } else { |
556 | 556 | $spec[0] = $b1; |
557 | - $spec[1] = (int)($data / ($b1 + $b2)); |
|
558 | - $spec[2] = (int)($ecc / ($b1 + $b2)); |
|
557 | + $spec[1] = (int) ($data / ($b1 + $b2)); |
|
558 | + $spec[2] = (int) ($ecc / ($b1 + $b2)); |
|
559 | 559 | $spec[3] = $b2; |
560 | 560 | $spec[4] = $spec[1] + 1; |
561 | 561 | } |
@@ -571,9 +571,9 @@ discard block |
||
571 | 571 | // See Table 1 in Appendix E (pp.71) of JIS X0510:2004. |
572 | 572 | |
573 | 573 | public static $alignmentPattern = array( |
574 | - array( 0, 0), |
|
575 | - array( 0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), // 1- 5 |
|
576 | - array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10 |
|
574 | + array(0, 0), |
|
575 | + array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), // 1- 5 |
|
576 | + array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10 |
|
577 | 577 | array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), //11-15 |
578 | 578 | array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), //16-20 |
579 | 579 | array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), //21-25 |
@@ -599,28 +599,28 @@ discard block |
||
599 | 599 | "\xa1\xa1\xa1\xa1\xa1" |
600 | 600 | ); |
601 | 601 | |
602 | - $yStart = $oy-2; |
|
603 | - $xStart = $ox-2; |
|
602 | + $yStart = $oy - 2; |
|
603 | + $xStart = $ox - 2; |
|
604 | 604 | |
605 | - for($y=0; $y<5; $y++) { |
|
606 | - QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]); |
|
605 | + for ($y = 0; $y < 5; $y++) { |
|
606 | + QRstr::set($frame, $xStart, $yStart + $y, $finder[$y]); |
|
607 | 607 | } |
608 | 608 | } |
609 | 609 | |
610 | 610 | //---------------------------------------------------------------------- |
611 | 611 | public static function putAlignmentPattern($version, &$frame, $width) |
612 | 612 | { |
613 | - if($version < 2) |
|
613 | + if ($version < 2) |
|
614 | 614 | return; |
615 | 615 | |
616 | 616 | $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0]; |
617 | - if($d < 0) { |
|
617 | + if ($d < 0) { |
|
618 | 618 | $w = 2; |
619 | 619 | } else { |
620 | - $w = (int)(($width - self::$alignmentPattern[$version][0]) / $d + 2); |
|
620 | + $w = (int) (($width - self::$alignmentPattern[$version][0]) / $d + 2); |
|
621 | 621 | } |
622 | 622 | |
623 | - if($w * $w - 3 == 1) { |
|
623 | + if ($w * $w - 3 == 1) { |
|
624 | 624 | $x = self::$alignmentPattern[$version][0]; |
625 | 625 | $y = self::$alignmentPattern[$version][0]; |
626 | 626 | self::putAlignmentMarker($frame, $x, $y); |
@@ -628,16 +628,16 @@ discard block |
||
628 | 628 | } |
629 | 629 | |
630 | 630 | $cx = self::$alignmentPattern[$version][0]; |
631 | - for($x=1; $x<$w - 1; $x++) { |
|
631 | + for ($x = 1; $x < $w - 1; $x++) { |
|
632 | 632 | self::putAlignmentMarker($frame, 6, $cx); |
633 | - self::putAlignmentMarker($frame, $cx, 6); |
|
633 | + self::putAlignmentMarker($frame, $cx, 6); |
|
634 | 634 | $cx += $d; |
635 | 635 | } |
636 | 636 | |
637 | 637 | $cy = self::$alignmentPattern[$version][0]; |
638 | - for($y=0; $y<$w-1; $y++) { |
|
638 | + for ($y = 0; $y < $w - 1; $y++) { |
|
639 | 639 | $cx = self::$alignmentPattern[$version][0]; |
640 | - for($x=0; $x<$w-1; $x++) { |
|
640 | + for ($x = 0; $x < $w - 1; $x++) { |
|
641 | 641 | self::putAlignmentMarker($frame, $cx, $cy); |
642 | 642 | $cx += $d; |
643 | 643 | } |
@@ -663,10 +663,10 @@ discard block |
||
663 | 663 | //---------------------------------------------------------------------- |
664 | 664 | public static function getVersionPattern($version) |
665 | 665 | { |
666 | - if($version < 7 || $version > QRSPEC_VERSION_MAX) |
|
666 | + if ($version < 7 || $version > QRSPEC_VERSION_MAX) |
|
667 | 667 | return 0; |
668 | 668 | |
669 | - return self::$versionPattern[$version -7]; |
|
669 | + return self::$versionPattern[$version - 7]; |
|
670 | 670 | } |
671 | 671 | |
672 | 672 | // Format information -------------------------------------------------- |
@@ -681,10 +681,10 @@ discard block |
||
681 | 681 | |
682 | 682 | public static function getFormatInfo($mask, $level) |
683 | 683 | { |
684 | - if($mask < 0 || $mask > 7) |
|
684 | + if ($mask < 0 || $mask > 7) |
|
685 | 685 | return 0; |
686 | 686 | |
687 | - if($level < 0 || $level > 3) |
|
687 | + if ($level < 0 || $level > 3) |
|
688 | 688 | return 0; |
689 | 689 | |
690 | 690 | return self::$formatInfo[$level][$mask]; |
@@ -713,8 +713,8 @@ discard block |
||
713 | 713 | "\xc1\xc1\xc1\xc1\xc1\xc1\xc1" |
714 | 714 | ); |
715 | 715 | |
716 | - for($y=0; $y<7; $y++) { |
|
717 | - QRstr::set($frame, $ox, $oy+$y, $finder[$y]); |
|
716 | + for ($y = 0; $y < 7; $y++) { |
|
717 | + QRstr::set($frame, $ox, $oy + $y, $finder[$y]); |
|
718 | 718 | } |
719 | 719 | } |
720 | 720 | |
@@ -722,7 +722,7 @@ discard block |
||
722 | 722 | public static function createFrame($version) |
723 | 723 | { |
724 | 724 | $width = self::$capacity[$version][QRCAP_WIDTH]; |
725 | - $frameLine = str_repeat ("\0", $width); |
|
725 | + $frameLine = str_repeat("\0", $width); |
|
726 | 726 | $frame = array_fill(0, $width, $frameLine); |
727 | 727 | |
728 | 728 | // Finder pattern |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | // Separator |
734 | 734 | $yOffset = $width - 7; |
735 | 735 | |
736 | - for($y=0; $y<7; $y++) { |
|
736 | + for ($y = 0; $y < 7; $y++) { |
|
737 | 737 | $frame[$y][7] = "\xc0"; |
738 | 738 | $frame[$y][$width - 8] = "\xc0"; |
739 | 739 | $frame[$yOffset][7] = "\xc0"; |
@@ -743,7 +743,7 @@ discard block |
||
743 | 743 | $setPattern = str_repeat("\xc0", 8); |
744 | 744 | |
745 | 745 | QRstr::set($frame, 0, 7, $setPattern); |
746 | - QRstr::set($frame, $width-8, 7, $setPattern); |
|
746 | + QRstr::set($frame, $width - 8, 7, $setPattern); |
|
747 | 747 | QRstr::set($frame, 0, $width - 8, $setPattern); |
748 | 748 | |
749 | 749 | // Format info |
@@ -753,38 +753,38 @@ discard block |
||
753 | 753 | |
754 | 754 | $yOffset = $width - 8; |
755 | 755 | |
756 | - for($y=0; $y<8; $y++,$yOffset++) { |
|
756 | + for ($y = 0; $y < 8; $y++, $yOffset++) { |
|
757 | 757 | $frame[$y][8] = "\x84"; |
758 | 758 | $frame[$yOffset][8] = "\x84"; |
759 | 759 | } |
760 | 760 | |
761 | 761 | // Timing pattern |
762 | 762 | |
763 | - for($i=1; $i<$width-15; $i++) { |
|
764 | - $frame[6][7+$i] = chr(0x90 | ($i & 1)); |
|
765 | - $frame[7+$i][6] = chr(0x90 | ($i & 1)); |
|
763 | + for ($i = 1; $i < $width - 15; $i++) { |
|
764 | + $frame[6][7 + $i] = chr(0x90 | ($i & 1)); |
|
765 | + $frame[7 + $i][6] = chr(0x90 | ($i & 1)); |
|
766 | 766 | } |
767 | 767 | |
768 | 768 | // Alignment pattern |
769 | 769 | self::putAlignmentPattern($version, $frame, $width); |
770 | 770 | |
771 | 771 | // Version information |
772 | - if($version >= 7) { |
|
772 | + if ($version >= 7) { |
|
773 | 773 | $vinf = self::getVersionPattern($version); |
774 | 774 | |
775 | 775 | $v = $vinf; |
776 | 776 | |
777 | - for($x=0; $x<6; $x++) { |
|
778 | - for($y=0; $y<3; $y++) { |
|
779 | - $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1)); |
|
777 | + for ($x = 0; $x < 6; $x++) { |
|
778 | + for ($y = 0; $y < 3; $y++) { |
|
779 | + $frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1)); |
|
780 | 780 | $v = $v >> 1; |
781 | 781 | } |
782 | 782 | } |
783 | 783 | |
784 | 784 | $v = $vinf; |
785 | - for($y=0; $y<6; $y++) { |
|
786 | - for($x=0; $x<3; $x++) { |
|
787 | - $frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1)); |
|
785 | + for ($y = 0; $y < 6; $y++) { |
|
786 | + for ($x = 0; $x < 3; $x++) { |
|
787 | + $frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1)); |
|
788 | 788 | $v = $v >> 1; |
789 | 789 | } |
790 | 790 | } |
@@ -818,16 +818,16 @@ discard block |
||
818 | 818 | } else { |
819 | 819 | |
820 | 820 | foreach ($frame as &$frameLine) { |
821 | - $frameLine = join('<span class="m"> </span>', explode("\xc0", $frameLine)); |
|
821 | + $frameLine = join('<span class="m"> </span>', explode("\xc0", $frameLine)); |
|
822 | 822 | $frameLine = join('<span class="m">▒</span>', explode("\xc1", $frameLine)); |
823 | - $frameLine = join('<span class="p"> </span>', explode("\xa0", $frameLine)); |
|
823 | + $frameLine = join('<span class="p"> </span>', explode("\xa0", $frameLine)); |
|
824 | 824 | $frameLine = join('<span class="p">▒</span>', explode("\xa1", $frameLine)); |
825 | 825 | $frameLine = join('<span class="s">◇</span>', explode("\x84", $frameLine)); //format 0 |
826 | 826 | $frameLine = join('<span class="s">◆</span>', explode("\x85", $frameLine)); //format 1 |
827 | 827 | $frameLine = join('<span class="x">☢</span>', explode("\x81", $frameLine)); //special bit |
828 | - $frameLine = join('<span class="c"> </span>', explode("\x90", $frameLine)); //clock 0 |
|
828 | + $frameLine = join('<span class="c"> </span>', explode("\x90", $frameLine)); //clock 0 |
|
829 | 829 | $frameLine = join('<span class="c">◷</span>', explode("\x91", $frameLine)); //clock 1 |
830 | - $frameLine = join('<span class="f"> </span>', explode("\x88", $frameLine)); //version |
|
830 | + $frameLine = join('<span class="f"> </span>', explode("\x88", $frameLine)); //version |
|
831 | 831 | $frameLine = join('<span class="f">▒</span>', explode("\x89", $frameLine)); //version |
832 | 832 | $frameLine = join('♦', explode("\x01", $frameLine)); |
833 | 833 | $frameLine = join('⋅', explode("\0", $frameLine)); |
@@ -865,10 +865,10 @@ discard block |
||
865 | 865 | //---------------------------------------------------------------------- |
866 | 866 | public static function newFrame($version) |
867 | 867 | { |
868 | - if($version < 1 || $version > QRSPEC_VERSION_MAX) |
|
868 | + if ($version < 1 || $version > QRSPEC_VERSION_MAX) |
|
869 | 869 | return null; |
870 | 870 | |
871 | - if(!isset(self::$frames[$version])) { |
|
871 | + if ( ! isset(self::$frames[$version])) { |
|
872 | 872 | |
873 | 873 | $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat'; |
874 | 874 | |
@@ -884,22 +884,22 @@ discard block |
||
884 | 884 | } |
885 | 885 | } |
886 | 886 | |
887 | - if(is_null(self::$frames[$version])) |
|
887 | + if (is_null(self::$frames[$version])) |
|
888 | 888 | return null; |
889 | 889 | |
890 | 890 | return self::$frames[$version]; |
891 | 891 | } |
892 | 892 | |
893 | 893 | //---------------------------------------------------------------------- |
894 | - public static function rsBlockNum($spec) { return $spec[0] + $spec[3]; } |
|
895 | - public static function rsBlockNum1($spec) { return $spec[0]; } |
|
896 | - public static function rsDataCodes1($spec) { return $spec[1]; } |
|
897 | - public static function rsEccCodes1($spec) { return $spec[2]; } |
|
898 | - public static function rsBlockNum2($spec) { return $spec[3]; } |
|
899 | - public static function rsDataCodes2($spec) { return $spec[4]; } |
|
900 | - public static function rsEccCodes2($spec) { return $spec[2]; } |
|
901 | - public static function rsDataLength($spec) { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]); } |
|
902 | - public static function rsEccLength($spec) { return ($spec[0] + $spec[3]) * $spec[2]; } |
|
894 | + public static function rsBlockNum($spec) { return $spec[0] + $spec[3]; } |
|
895 | + public static function rsBlockNum1($spec) { return $spec[0]; } |
|
896 | + public static function rsDataCodes1($spec) { return $spec[1]; } |
|
897 | + public static function rsEccCodes1($spec) { return $spec[2]; } |
|
898 | + public static function rsBlockNum2($spec) { return $spec[3]; } |
|
899 | + public static function rsDataCodes2($spec) { return $spec[4]; } |
|
900 | + public static function rsEccCodes2($spec) { return $spec[2]; } |
|
901 | + public static function rsDataLength($spec) { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]); } |
|
902 | + public static function rsEccLength($spec) { return ($spec[0] + $spec[3]) * $spec[2]; } |
|
903 | 903 | |
904 | 904 | } |
905 | 905 | |
@@ -938,7 +938,7 @@ discard block |
||
938 | 938 | class QRimage { |
939 | 939 | |
940 | 940 | //---------------------------------------------------------------------- |
941 | - public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE) |
|
941 | + public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = FALSE) |
|
942 | 942 | { |
943 | 943 | $image = self::image($frame, $pixelPerPoint, $outerFrame); |
944 | 944 | |
@@ -946,11 +946,11 @@ discard block |
||
946 | 946 | Header("Content-type: image/png"); |
947 | 947 | ImagePng($image); |
948 | 948 | } else { |
949 | - if($saveandprint===TRUE){ |
|
949 | + if ($saveandprint === TRUE) { |
|
950 | 950 | ImagePng($image, $filename); |
951 | 951 | header("Content-type: image/png"); |
952 | 952 | ImagePng($image); |
953 | - }else{ |
|
953 | + } else { |
|
954 | 954 | ImagePng($image, $filename); |
955 | 955 | } |
956 | 956 | } |
@@ -979,25 +979,25 @@ discard block |
||
979 | 979 | $h = count($frame); |
980 | 980 | $w = strlen($frame[0]); |
981 | 981 | |
982 | - $imgW = $w + 2*$outerFrame; |
|
983 | - $imgH = $h + 2*$outerFrame; |
|
982 | + $imgW = $w + 2 * $outerFrame; |
|
983 | + $imgH = $h + 2 * $outerFrame; |
|
984 | 984 | |
985 | - $base_image =ImageCreate($imgW, $imgH); |
|
985 | + $base_image = ImageCreate($imgW, $imgH); |
|
986 | 986 | |
987 | - $col[0] = ImageColorAllocate($base_image,255,255,255); |
|
988 | - $col[1] = ImageColorAllocate($base_image,0,0,0); |
|
987 | + $col[0] = ImageColorAllocate($base_image, 255, 255, 255); |
|
988 | + $col[1] = ImageColorAllocate($base_image, 0, 0, 0); |
|
989 | 989 | |
990 | 990 | imagefill($base_image, 0, 0, $col[0]); |
991 | 991 | |
992 | - for($y=0; $y<$h; $y++) { |
|
993 | - for($x=0; $x<$w; $x++) { |
|
992 | + for ($y = 0; $y < $h; $y++) { |
|
993 | + for ($x = 0; $x < $w; $x++) { |
|
994 | 994 | if ($frame[$y][$x] == '1') { |
995 | - ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); |
|
995 | + ImageSetPixel($base_image, $x + $outerFrame, $y + $outerFrame, $col[1]); |
|
996 | 996 | } |
997 | 997 | } |
998 | 998 | } |
999 | 999 | |
1000 | - $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint); |
|
1000 | + $target_image = ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint); |
|
1001 | 1001 | ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH); |
1002 | 1002 | ImageDestroy($base_image); |
1003 | 1003 | |
@@ -1038,7 +1038,7 @@ discard block |
||
1038 | 1038 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
1039 | 1039 | */ |
1040 | 1040 | |
1041 | - define('STRUCTURE_HEADER_BITS', 20); |
|
1041 | + define('STRUCTURE_HEADER_BITS', 20); |
|
1042 | 1042 | define('MAX_STRUCTURED_SYMBOLS', 16); |
1043 | 1043 | |
1044 | 1044 | class QRinputItem { |
@@ -1053,11 +1053,11 @@ discard block |
||
1053 | 1053 | $setData = array_slice($data, 0, $size); |
1054 | 1054 | |
1055 | 1055 | if (count($setData) < $size) { |
1056 | - $setData = array_merge($setData, array_fill(0,$size-count($setData),0)); |
|
1056 | + $setData = array_merge($setData, array_fill(0, $size - count($setData), 0)); |
|
1057 | 1057 | } |
1058 | 1058 | |
1059 | - if(!QRinput::check($mode, $size, $setData)) { |
|
1060 | - throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData)); |
|
1059 | + if ( ! QRinput::check($mode, $size, $setData)) { |
|
1060 | + throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',', $setData)); |
|
1061 | 1061 | return null; |
1062 | 1062 | } |
1063 | 1063 | |
@@ -1072,26 +1072,26 @@ discard block |
||
1072 | 1072 | { |
1073 | 1073 | try { |
1074 | 1074 | |
1075 | - $words = (int)($this->size / 3); |
|
1075 | + $words = (int) ($this->size / 3); |
|
1076 | 1076 | $bs = new QRbitstream(); |
1077 | 1077 | |
1078 | 1078 | $val = 0x1; |
1079 | 1079 | $bs->appendNum(4, $val); |
1080 | 1080 | $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size); |
1081 | 1081 | |
1082 | - for($i=0; $i<$words; $i++) { |
|
1083 | - $val = (ord($this->data[$i*3 ]) - ord('0')) * 100; |
|
1084 | - $val += (ord($this->data[$i*3+1]) - ord('0')) * 10; |
|
1085 | - $val += (ord($this->data[$i*3+2]) - ord('0')); |
|
1082 | + for ($i = 0; $i < $words; $i++) { |
|
1083 | + $val = (ord($this->data[$i * 3]) - ord('0')) * 100; |
|
1084 | + $val += (ord($this->data[$i * 3 + 1]) - ord('0')) * 10; |
|
1085 | + $val += (ord($this->data[$i * 3 + 2]) - ord('0')); |
|
1086 | 1086 | $bs->appendNum(10, $val); |
1087 | 1087 | } |
1088 | 1088 | |
1089 | - if($this->size - $words * 3 == 1) { |
|
1090 | - $val = ord($this->data[$words*3]) - ord('0'); |
|
1089 | + if ($this->size - $words * 3 == 1) { |
|
1090 | + $val = ord($this->data[$words * 3]) - ord('0'); |
|
1091 | 1091 | $bs->appendNum(4, $val); |
1092 | - } else if($this->size - $words * 3 == 2) { |
|
1093 | - $val = (ord($this->data[$words*3 ]) - ord('0')) * 10; |
|
1094 | - $val += (ord($this->data[$words*3+1]) - ord('0')); |
|
1092 | + } else if ($this->size - $words * 3 == 2) { |
|
1093 | + $val = (ord($this->data[$words * 3]) - ord('0')) * 10; |
|
1094 | + $val += (ord($this->data[$words * 3 + 1]) - ord('0')); |
|
1095 | 1095 | $bs->appendNum(7, $val); |
1096 | 1096 | } |
1097 | 1097 | |
@@ -1107,20 +1107,20 @@ discard block |
||
1107 | 1107 | public function encodeModeAn($version) |
1108 | 1108 | { |
1109 | 1109 | try { |
1110 | - $words = (int)($this->size / 2); |
|
1110 | + $words = (int) ($this->size / 2); |
|
1111 | 1111 | $bs = new QRbitstream(); |
1112 | 1112 | |
1113 | 1113 | $bs->appendNum(4, 0x02); |
1114 | 1114 | $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size); |
1115 | 1115 | |
1116 | - for($i=0; $i<$words; $i++) { |
|
1117 | - $val = (int)QRinput::lookAnTable(ord($this->data[$i*2 ])) * 45; |
|
1118 | - $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1])); |
|
1116 | + for ($i = 0; $i < $words; $i++) { |
|
1117 | + $val = (int) QRinput::lookAnTable(ord($this->data[$i * 2])) * 45; |
|
1118 | + $val += (int) QRinput::lookAnTable(ord($this->data[$i * 2 + 1])); |
|
1119 | 1119 | |
1120 | 1120 | $bs->appendNum(11, $val); |
1121 | 1121 | } |
1122 | 1122 | |
1123 | - if($this->size & 1) { |
|
1123 | + if ($this->size & 1) { |
|
1124 | 1124 | $val = QRinput::lookAnTable(ord($this->data[$words * 2])); |
1125 | 1125 | $bs->appendNum(6, $val); |
1126 | 1126 | } |
@@ -1142,7 +1142,7 @@ discard block |
||
1142 | 1142 | $bs->appendNum(4, 0x4); |
1143 | 1143 | $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size); |
1144 | 1144 | |
1145 | - for($i=0; $i<$this->size; $i++) { |
|
1145 | + for ($i = 0; $i < $this->size; $i++) { |
|
1146 | 1146 | $bs->appendNum(8, ord($this->data[$i])); |
1147 | 1147 | } |
1148 | 1148 | |
@@ -1162,11 +1162,11 @@ discard block |
||
1162 | 1162 | $bs = new QRbitrtream(); |
1163 | 1163 | |
1164 | 1164 | $bs->appendNum(4, 0x8); |
1165 | - $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2)); |
|
1165 | + $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int) ($this->size / 2)); |
|
1166 | 1166 | |
1167 | - for($i=0; $i<$this->size; $i+=2) { |
|
1168 | - $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]); |
|
1169 | - if($val <= 0x9ffc) { |
|
1167 | + for ($i = 0; $i < $this->size; $i += 2) { |
|
1168 | + $val = (ord($this->data[$i]) << 8) | ord($this->data[$i + 1]); |
|
1169 | + if ($val <= 0x9ffc) { |
|
1170 | 1170 | $val -= 0x8140; |
1171 | 1171 | } else { |
1172 | 1172 | $val -= 0xc140; |
@@ -1190,7 +1190,7 @@ discard block |
||
1190 | 1190 | public function encodeModeStructure() |
1191 | 1191 | { |
1192 | 1192 | try { |
1193 | - $bs = new QRbitstream(); |
|
1193 | + $bs = new QRbitstream(); |
|
1194 | 1194 | |
1195 | 1195 | $bs->appendNum(4, 0x03); |
1196 | 1196 | $bs->appendNum(4, ord($this->data[1]) - 1); |
@@ -1210,14 +1210,14 @@ discard block |
||
1210 | 1210 | { |
1211 | 1211 | $bits = 0; |
1212 | 1212 | |
1213 | - if($version == 0) |
|
1213 | + if ($version == 0) |
|
1214 | 1214 | $version = 1; |
1215 | 1215 | |
1216 | - switch($this->mode) { |
|
1217 | - case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
|
1218 | - case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break; |
|
1219 | - case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break; |
|
1220 | - case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size);break; |
|
1216 | + switch ($this->mode) { |
|
1217 | + case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
|
1218 | + case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break; |
|
1219 | + case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break; |
|
1220 | + case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size); break; |
|
1221 | 1221 | case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS; |
1222 | 1222 | default: |
1223 | 1223 | return 0; |
@@ -1225,7 +1225,7 @@ discard block |
||
1225 | 1225 | |
1226 | 1226 | $l = QRspec::lengthIndicator($this->mode, $version); |
1227 | 1227 | $m = 1 << $l; |
1228 | - $num = (int)(($this->size + $m - 1) / $m); |
|
1228 | + $num = (int) (($this->size + $m - 1) / $m); |
|
1229 | 1229 | |
1230 | 1230 | $bits += $num * (4 + $l); |
1231 | 1231 | |
@@ -1240,7 +1240,7 @@ discard block |
||
1240 | 1240 | unset($this->bstream); |
1241 | 1241 | $words = QRspec::maximumWords($this->mode, $version); |
1242 | 1242 | |
1243 | - if($this->size > $words) { |
|
1243 | + if ($this->size > $words) { |
|
1244 | 1244 | |
1245 | 1245 | $st1 = new QRinputItem($this->mode, $words, $this->data); |
1246 | 1246 | $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words)); |
@@ -1259,18 +1259,18 @@ discard block |
||
1259 | 1259 | |
1260 | 1260 | $ret = 0; |
1261 | 1261 | |
1262 | - switch($this->mode) { |
|
1263 | - case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break; |
|
1264 | - case QR_MODE_AN: $ret = $this->encodeModeAn($version); break; |
|
1265 | - case QR_MODE_8: $ret = $this->encodeMode8($version); break; |
|
1266 | - case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version);break; |
|
1267 | - case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break; |
|
1262 | + switch ($this->mode) { |
|
1263 | + case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break; |
|
1264 | + case QR_MODE_AN: $ret = $this->encodeModeAn($version); break; |
|
1265 | + case QR_MODE_8: $ret = $this->encodeMode8($version); break; |
|
1266 | + case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version); break; |
|
1267 | + case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break; |
|
1268 | 1268 | |
1269 | 1269 | default: |
1270 | 1270 | break; |
1271 | 1271 | } |
1272 | 1272 | |
1273 | - if($ret < 0) |
|
1273 | + if ($ret < 0) |
|
1274 | 1274 | return -1; |
1275 | 1275 | } |
1276 | 1276 | |
@@ -1312,7 +1312,7 @@ discard block |
||
1312 | 1312 | //---------------------------------------------------------------------- |
1313 | 1313 | public function setVersion($version) |
1314 | 1314 | { |
1315 | - if($version < 0 || $version > QRSPEC_VERSION_MAX) { |
|
1315 | + if ($version < 0 || $version > QRSPEC_VERSION_MAX) { |
|
1316 | 1316 | throw new Exception('Invalid version no'); |
1317 | 1317 | return -1; |
1318 | 1318 | } |
@@ -1331,7 +1331,7 @@ discard block |
||
1331 | 1331 | //---------------------------------------------------------------------- |
1332 | 1332 | public function setErrorCorrectionLevel($level) |
1333 | 1333 | { |
1334 | - if($level > QR_ECLEVEL_H) { |
|
1334 | + if ($level > QR_ECLEVEL_H) { |
|
1335 | 1335 | throw new Exception('Invalid ECLEVEL'); |
1336 | 1336 | return -1; |
1337 | 1337 | } |
@@ -1363,11 +1363,11 @@ discard block |
||
1363 | 1363 | |
1364 | 1364 | public function insertStructuredAppendHeader($size, $index, $parity) |
1365 | 1365 | { |
1366 | - if( $size > MAX_STRUCTURED_SYMBOLS ) { |
|
1366 | + if ($size > MAX_STRUCTURED_SYMBOLS) { |
|
1367 | 1367 | throw new Exception('insertStructuredAppendHeader wrong size'); |
1368 | 1368 | } |
1369 | 1369 | |
1370 | - if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) { |
|
1370 | + if ($index <= 0 || $index > MAX_STRUCTURED_SYMBOLS) { |
|
1371 | 1371 | throw new Exception('insertStructuredAppendHeader wrong index'); |
1372 | 1372 | } |
1373 | 1373 | |
@@ -1387,9 +1387,9 @@ discard block |
||
1387 | 1387 | { |
1388 | 1388 | $parity = 0; |
1389 | 1389 | |
1390 | - foreach($this->items as $item) { |
|
1391 | - if($item->mode != QR_MODE_STRUCTURE) { |
|
1392 | - for($i=$item->size-1; $i>=0; $i--) { |
|
1390 | + foreach ($this->items as $item) { |
|
1391 | + if ($item->mode != QR_MODE_STRUCTURE) { |
|
1392 | + for ($i = $item->size - 1; $i >= 0; $i--) { |
|
1393 | 1393 | $parity ^= $item->data[$i]; |
1394 | 1394 | } |
1395 | 1395 | } |
@@ -1401,8 +1401,8 @@ discard block |
||
1401 | 1401 | //---------------------------------------------------------------------- |
1402 | 1402 | public static function checkModeNum($size, $data) |
1403 | 1403 | { |
1404 | - for($i=0; $i<$size; $i++) { |
|
1405 | - if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){ |
|
1404 | + for ($i = 0; $i < $size; $i++) { |
|
1405 | + if ((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))) { |
|
1406 | 1406 | return false; |
1407 | 1407 | } |
1408 | 1408 | } |
@@ -1413,10 +1413,10 @@ discard block |
||
1413 | 1413 | //---------------------------------------------------------------------- |
1414 | 1414 | public static function estimateBitsModeNum($size) |
1415 | 1415 | { |
1416 | - $w = (int)$size / 3; |
|
1416 | + $w = (int) $size / 3; |
|
1417 | 1417 | $bits = $w * 10; |
1418 | 1418 | |
1419 | - switch($size - $w * 3) { |
|
1419 | + switch ($size - $w * 3) { |
|
1420 | 1420 | case 1: |
1421 | 1421 | $bits += 4; |
1422 | 1422 | break; |
@@ -1435,7 +1435,7 @@ discard block |
||
1435 | 1435 | -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, |
1436 | 1436 | -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, |
1437 | 1437 | 36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, |
1438 | - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, |
|
1438 | + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, |
|
1439 | 1439 | -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, |
1440 | 1440 | 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, |
1441 | 1441 | -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, |
@@ -1445,13 +1445,13 @@ discard block |
||
1445 | 1445 | //---------------------------------------------------------------------- |
1446 | 1446 | public static function lookAnTable($c) |
1447 | 1447 | { |
1448 | - return (($c > 127)?-1:self::$anTable[$c]); |
|
1448 | + return (($c > 127) ?-1 : self::$anTable[$c]); |
|
1449 | 1449 | } |
1450 | 1450 | |
1451 | 1451 | //---------------------------------------------------------------------- |
1452 | 1452 | public static function checkModeAn($size, $data) |
1453 | 1453 | { |
1454 | - for($i=0; $i<$size; $i++) { |
|
1454 | + for ($i = 0; $i < $size; $i++) { |
|
1455 | 1455 | if (self::lookAnTable(ord($data[$i])) == -1) { |
1456 | 1456 | return false; |
1457 | 1457 | } |
@@ -1463,10 +1463,10 @@ discard block |
||
1463 | 1463 | //---------------------------------------------------------------------- |
1464 | 1464 | public static function estimateBitsModeAn($size) |
1465 | 1465 | { |
1466 | - $w = (int)($size / 2); |
|
1466 | + $w = (int) ($size / 2); |
|
1467 | 1467 | $bits = $w * 11; |
1468 | 1468 | |
1469 | - if($size & 1) { |
|
1469 | + if ($size & 1) { |
|
1470 | 1470 | $bits += 6; |
1471 | 1471 | } |
1472 | 1472 | |
@@ -1482,18 +1482,18 @@ discard block |
||
1482 | 1482 | //---------------------------------------------------------------------- |
1483 | 1483 | public function estimateBitsModeKanji($size) |
1484 | 1484 | { |
1485 | - return (int)(($size / 2) * 13); |
|
1485 | + return (int) (($size / 2) * 13); |
|
1486 | 1486 | } |
1487 | 1487 | |
1488 | 1488 | //---------------------------------------------------------------------- |
1489 | 1489 | public static function checkModeKanji($size, $data) |
1490 | 1490 | { |
1491 | - if($size & 1) |
|
1491 | + if ($size & 1) |
|
1492 | 1492 | return false; |
1493 | 1493 | |
1494 | - for($i=0; $i<$size; $i+=2) { |
|
1495 | - $val = (ord($data[$i]) << 8) | ord($data[$i+1]); |
|
1496 | - if( $val < 0x8140 |
|
1494 | + for ($i = 0; $i < $size; $i += 2) { |
|
1495 | + $val = (ord($data[$i]) << 8) | ord($data[$i + 1]); |
|
1496 | + if ($val < 0x8140 |
|
1497 | 1497 | || ($val > 0x9ffc && $val < 0xe040) |
1498 | 1498 | || $val > 0xebbf) { |
1499 | 1499 | return false; |
@@ -1509,12 +1509,12 @@ discard block |
||
1509 | 1509 | |
1510 | 1510 | public static function check($mode, $size, $data) |
1511 | 1511 | { |
1512 | - if($size <= 0) |
|
1512 | + if ($size <= 0) |
|
1513 | 1513 | return false; |
1514 | 1514 | |
1515 | - switch($mode) { |
|
1516 | - case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
|
1517 | - case QR_MODE_AN: return self::checkModeAn($size, $data); break; |
|
1515 | + switch ($mode) { |
|
1516 | + case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
|
1517 | + case QR_MODE_AN: return self::checkModeAn($size, $data); break; |
|
1518 | 1518 | case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break; |
1519 | 1519 | case QR_MODE_8: return true; break; |
1520 | 1520 | case QR_MODE_STRUCTURE: return true; break; |
@@ -1532,7 +1532,7 @@ discard block |
||
1532 | 1532 | { |
1533 | 1533 | $bits = 0; |
1534 | 1534 | |
1535 | - foreach($this->items as $item) { |
|
1535 | + foreach ($this->items as $item) { |
|
1536 | 1536 | $bits += $item->estimateBitStreamSizeOfEntry($version); |
1537 | 1537 | } |
1538 | 1538 | |
@@ -1547,7 +1547,7 @@ discard block |
||
1547 | 1547 | do { |
1548 | 1548 | $prev = $version; |
1549 | 1549 | $bits = $this->estimateBitStreamSize($prev); |
1550 | - $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level); |
|
1550 | + $version = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level); |
|
1551 | 1551 | if ($version < 0) { |
1552 | 1552 | return -1; |
1553 | 1553 | } |
@@ -1560,32 +1560,32 @@ discard block |
||
1560 | 1560 | public static function lengthOfCode($mode, $version, $bits) |
1561 | 1561 | { |
1562 | 1562 | $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version); |
1563 | - switch($mode) { |
|
1563 | + switch ($mode) { |
|
1564 | 1564 | case QR_MODE_NUM: |
1565 | - $chunks = (int)($payload / 10); |
|
1565 | + $chunks = (int) ($payload / 10); |
|
1566 | 1566 | $remain = $payload - $chunks * 10; |
1567 | 1567 | $size = $chunks * 3; |
1568 | - if($remain >= 7) { |
|
1568 | + if ($remain >= 7) { |
|
1569 | 1569 | $size += 2; |
1570 | - } else if($remain >= 4) { |
|
1570 | + } else if ($remain >= 4) { |
|
1571 | 1571 | $size += 1; |
1572 | 1572 | } |
1573 | 1573 | break; |
1574 | 1574 | case QR_MODE_AN: |
1575 | - $chunks = (int)($payload / 11); |
|
1575 | + $chunks = (int) ($payload / 11); |
|
1576 | 1576 | $remain = $payload - $chunks * 11; |
1577 | 1577 | $size = $chunks * 2; |
1578 | - if($remain >= 6) |
|
1578 | + if ($remain >= 6) |
|
1579 | 1579 | $size++; |
1580 | 1580 | break; |
1581 | 1581 | case QR_MODE_8: |
1582 | - $size = (int)($payload / 8); |
|
1582 | + $size = (int) ($payload / 8); |
|
1583 | 1583 | break; |
1584 | 1584 | case QR_MODE_KANJI: |
1585 | - $size = (int)(($payload / 13) * 2); |
|
1585 | + $size = (int) (($payload / 13) * 2); |
|
1586 | 1586 | break; |
1587 | 1587 | case QR_MODE_STRUCTURE: |
1588 | - $size = (int)($payload / 8); |
|
1588 | + $size = (int) ($payload / 8); |
|
1589 | 1589 | break; |
1590 | 1590 | default: |
1591 | 1591 | $size = 0; |
@@ -1593,8 +1593,8 @@ discard block |
||
1593 | 1593 | } |
1594 | 1594 | |
1595 | 1595 | $maxsize = QRspec::maximumWords($mode, $version); |
1596 | - if($size < 0) $size = 0; |
|
1597 | - if($size > $maxsize) $size = $maxsize; |
|
1596 | + if ($size < 0) $size = 0; |
|
1597 | + if ($size > $maxsize) $size = $maxsize; |
|
1598 | 1598 | |
1599 | 1599 | return $size; |
1600 | 1600 | } |
@@ -1604,10 +1604,10 @@ discard block |
||
1604 | 1604 | { |
1605 | 1605 | $total = 0; |
1606 | 1606 | |
1607 | - foreach($this->items as $item) { |
|
1607 | + foreach ($this->items as $item) { |
|
1608 | 1608 | $bits = $item->encodeBitStream($this->version); |
1609 | 1609 | |
1610 | - if($bits < 0) |
|
1610 | + if ($bits < 0) |
|
1611 | 1611 | return -1; |
1612 | 1612 | |
1613 | 1613 | $total += $bits; |
@@ -1620,21 +1620,21 @@ discard block |
||
1620 | 1620 | public function convertData() |
1621 | 1621 | { |
1622 | 1622 | $ver = $this->estimateVersion(); |
1623 | - if($ver > $this->getVersion()) { |
|
1623 | + if ($ver > $this->getVersion()) { |
|
1624 | 1624 | $this->setVersion($ver); |
1625 | 1625 | } |
1626 | 1626 | |
1627 | - for(;;) { |
|
1627 | + for (;;) { |
|
1628 | 1628 | $bits = $this->createBitStream(); |
1629 | 1629 | |
1630 | - if($bits < 0) |
|
1630 | + if ($bits < 0) |
|
1631 | 1631 | return -1; |
1632 | 1632 | |
1633 | - $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level); |
|
1634 | - if($ver < 0) { |
|
1633 | + $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level); |
|
1634 | + if ($ver < 0) { |
|
1635 | 1635 | throw new Exception('WRONG VERSION'); |
1636 | 1636 | return -1; |
1637 | - } else if($ver > $this->getVersion()) { |
|
1637 | + } else if ($ver > $this->getVersion()) { |
|
1638 | 1638 | $this->setVersion($ver); |
1639 | 1639 | } else { |
1640 | 1640 | break; |
@@ -1660,26 +1660,26 @@ discard block |
||
1660 | 1660 | } |
1661 | 1661 | |
1662 | 1662 | $bits += 4; |
1663 | - $words = (int)(($bits + 7) / 8); |
|
1663 | + $words = (int) (($bits + 7) / 8); |
|
1664 | 1664 | |
1665 | 1665 | $padding = new QRbitstream(); |
1666 | 1666 | $ret = $padding->appendNum($words * 8 - $bits + 4, 0); |
1667 | 1667 | |
1668 | - if($ret < 0) |
|
1668 | + if ($ret < 0) |
|
1669 | 1669 | return $ret; |
1670 | 1670 | |
1671 | 1671 | $padlen = $maxwords - $words; |
1672 | 1672 | |
1673 | - if($padlen > 0) { |
|
1673 | + if ($padlen > 0) { |
|
1674 | 1674 | |
1675 | 1675 | $padbuf = array(); |
1676 | - for($i=0; $i<$padlen; $i++) { |
|
1677 | - $padbuf[$i] = ($i&1)?0x11:0xec; |
|
1676 | + for ($i = 0; $i < $padlen; $i++) { |
|
1677 | + $padbuf[$i] = ($i & 1) ? 0x11 : 0xec; |
|
1678 | 1678 | } |
1679 | 1679 | |
1680 | 1680 | $ret = $padding->appendBytes($padlen, $padbuf); |
1681 | 1681 | |
1682 | - if($ret < 0) |
|
1682 | + if ($ret < 0) |
|
1683 | 1683 | return $ret; |
1684 | 1684 | |
1685 | 1685 | } |
@@ -1692,15 +1692,15 @@ discard block |
||
1692 | 1692 | //---------------------------------------------------------------------- |
1693 | 1693 | public function mergeBitStream() |
1694 | 1694 | { |
1695 | - if($this->convertData() < 0) { |
|
1695 | + if ($this->convertData() < 0) { |
|
1696 | 1696 | return null; |
1697 | 1697 | } |
1698 | 1698 | |
1699 | 1699 | $bstream = new QRbitstream(); |
1700 | 1700 | |
1701 | - foreach($this->items as $item) { |
|
1701 | + foreach ($this->items as $item) { |
|
1702 | 1702 | $ret = $bstream->append($item->bstream); |
1703 | - if($ret < 0) { |
|
1703 | + if ($ret < 0) { |
|
1704 | 1704 | return null; |
1705 | 1705 | } |
1706 | 1706 | } |
@@ -1714,12 +1714,12 @@ discard block |
||
1714 | 1714 | |
1715 | 1715 | $bstream = $this->mergeBitStream(); |
1716 | 1716 | |
1717 | - if($bstream == null) { |
|
1717 | + if ($bstream == null) { |
|
1718 | 1718 | return null; |
1719 | 1719 | } |
1720 | 1720 | |
1721 | 1721 | $ret = $this->appendPaddingBit($bstream); |
1722 | - if($ret < 0) { |
|
1722 | + if ($ret < 0) { |
|
1723 | 1723 | return null; |
1724 | 1724 | } |
1725 | 1725 | |
@@ -1730,7 +1730,7 @@ discard block |
||
1730 | 1730 | public function getByteStream() |
1731 | 1731 | { |
1732 | 1732 | $bstream = $this->getBitStream(); |
1733 | - if($bstream == null) { |
|
1733 | + if ($bstream == null) { |
|
1734 | 1734 | return null; |
1735 | 1735 | } |
1736 | 1736 | |
@@ -1798,8 +1798,8 @@ discard block |
||
1798 | 1798 | $bstream->allocate($bits); |
1799 | 1799 | |
1800 | 1800 | $mask = 1 << ($bits - 1); |
1801 | - for($i=0; $i<$bits; $i++) { |
|
1802 | - if($num & $mask) { |
|
1801 | + for ($i = 0; $i < $bits; $i++) { |
|
1802 | + if ($num & $mask) { |
|
1803 | 1803 | $bstream->data[$i] = 1; |
1804 | 1804 | } else { |
1805 | 1805 | $bstream->data[$i] = 0; |
@@ -1815,12 +1815,12 @@ discard block |
||
1815 | 1815 | { |
1816 | 1816 | $bstream = new QRbitstream(); |
1817 | 1817 | $bstream->allocate($size * 8); |
1818 | - $p=0; |
|
1818 | + $p = 0; |
|
1819 | 1819 | |
1820 | - for($i=0; $i<$size; $i++) { |
|
1820 | + for ($i = 0; $i < $size; $i++) { |
|
1821 | 1821 | $mask = 0x80; |
1822 | - for($j=0; $j<8; $j++) { |
|
1823 | - if($data[$i] & $mask) { |
|
1822 | + for ($j = 0; $j < 8; $j++) { |
|
1823 | + if ($data[$i] & $mask) { |
|
1824 | 1824 | $bstream->data[$p] = 1; |
1825 | 1825 | } else { |
1826 | 1826 | $bstream->data[$p] = 0; |
@@ -1840,11 +1840,11 @@ discard block |
||
1840 | 1840 | return -1; |
1841 | 1841 | } |
1842 | 1842 | |
1843 | - if($arg->size() == 0) { |
|
1843 | + if ($arg->size() == 0) { |
|
1844 | 1844 | return 0; |
1845 | 1845 | } |
1846 | 1846 | |
1847 | - if($this->size() == 0) { |
|
1847 | + if ($this->size() == 0) { |
|
1848 | 1848 | $this->data = $arg->data; |
1849 | 1849 | return 0; |
1850 | 1850 | } |
@@ -1862,7 +1862,7 @@ discard block |
||
1862 | 1862 | |
1863 | 1863 | $b = QRbitstream::newFromNum($bits, $num); |
1864 | 1864 | |
1865 | - if(is_null($b)) |
|
1865 | + if (is_null($b)) |
|
1866 | 1866 | return -1; |
1867 | 1867 | |
1868 | 1868 | $ret = $this->append($b); |
@@ -1879,7 +1879,7 @@ discard block |
||
1879 | 1879 | |
1880 | 1880 | $b = QRbitstream::newFromBytes($size, $data); |
1881 | 1881 | |
1882 | - if(is_null($b)) |
|
1882 | + if (is_null($b)) |
|
1883 | 1883 | return -1; |
1884 | 1884 | |
1885 | 1885 | $ret = $this->append($b); |
@@ -1894,18 +1894,18 @@ discard block |
||
1894 | 1894 | |
1895 | 1895 | $size = $this->size(); |
1896 | 1896 | |
1897 | - if($size == 0) { |
|
1897 | + if ($size == 0) { |
|
1898 | 1898 | return array(); |
1899 | 1899 | } |
1900 | 1900 | |
1901 | - $data = array_fill(0, (int)(($size + 7) / 8), 0); |
|
1902 | - $bytes = (int)($size / 8); |
|
1901 | + $data = array_fill(0, (int) (($size + 7) / 8), 0); |
|
1902 | + $bytes = (int) ($size / 8); |
|
1903 | 1903 | |
1904 | 1904 | $p = 0; |
1905 | 1905 | |
1906 | - for($i=0; $i<$bytes; $i++) { |
|
1906 | + for ($i = 0; $i < $bytes; $i++) { |
|
1907 | 1907 | $v = 0; |
1908 | - for($j=0; $j<8; $j++) { |
|
1908 | + for ($j = 0; $j < 8; $j++) { |
|
1909 | 1909 | $v = $v << 1; |
1910 | 1910 | $v |= $this->data[$p]; |
1911 | 1911 | $p++; |
@@ -1913,9 +1913,9 @@ discard block |
||
1913 | 1913 | $data[$i] = $v; |
1914 | 1914 | } |
1915 | 1915 | |
1916 | - if($size & 7) { |
|
1916 | + if ($size & 7) { |
|
1917 | 1917 | $v = 0; |
1918 | - for($j=0; $j<($size & 7); $j++) { |
|
1918 | + for ($j = 0; $j < ($size & 7); $j++) { |
|
1919 | 1919 | $v = $v << 1; |
1920 | 1920 | $v |= $this->data[$p]; |
1921 | 1921 | $p++; |
@@ -1987,7 +1987,7 @@ discard block |
||
1987 | 1987 | if ($pos >= strlen($str)) |
1988 | 1988 | return false; |
1989 | 1989 | |
1990 | - return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9'))); |
|
1990 | + return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9'))); |
|
1991 | 1991 | } |
1992 | 1992 | |
1993 | 1993 | //---------------------------------------------------------------------- |
@@ -2007,17 +2007,17 @@ discard block |
||
2007 | 2007 | |
2008 | 2008 | $c = $this->dataStr[$pos]; |
2009 | 2009 | |
2010 | - if(self::isdigitat($this->dataStr, $pos)) { |
|
2010 | + if (self::isdigitat($this->dataStr, $pos)) { |
|
2011 | 2011 | return QR_MODE_NUM; |
2012 | - } else if(self::isalnumat($this->dataStr, $pos)) { |
|
2012 | + } else if (self::isalnumat($this->dataStr, $pos)) { |
|
2013 | 2013 | return QR_MODE_AN; |
2014 | - } else if($this->modeHint == QR_MODE_KANJI) { |
|
2014 | + } else if ($this->modeHint == QR_MODE_KANJI) { |
|
2015 | 2015 | |
2016 | - if ($pos+1 < strlen($this->dataStr)) |
|
2016 | + if ($pos + 1 < strlen($this->dataStr)) |
|
2017 | 2017 | { |
2018 | - $d = $this->dataStr[$pos+1]; |
|
2018 | + $d = $this->dataStr[$pos + 1]; |
|
2019 | 2019 | $word = (ord($c) << 8) | ord($d); |
2020 | - if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) { |
|
2020 | + if (($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) { |
|
2021 | 2021 | return QR_MODE_KANJI; |
2022 | 2022 | } |
2023 | 2023 | } |
@@ -2032,32 +2032,32 @@ discard block |
||
2032 | 2032 | $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion()); |
2033 | 2033 | |
2034 | 2034 | $p = 0; |
2035 | - while(self::isdigitat($this->dataStr, $p)) { |
|
2035 | + while (self::isdigitat($this->dataStr, $p)) { |
|
2036 | 2036 | $p++; |
2037 | 2037 | } |
2038 | 2038 | |
2039 | 2039 | $run = $p; |
2040 | 2040 | $mode = $this->identifyMode($p); |
2041 | 2041 | |
2042 | - if($mode == QR_MODE_8) { |
|
2042 | + if ($mode == QR_MODE_8) { |
|
2043 | 2043 | $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln |
2044 | 2044 | + QRinput::estimateBitsMode8(1) // + 4 + l8 |
2045 | 2045 | - QRinput::estimateBitsMode8($run + 1); // - 4 - l8 |
2046 | - if($dif > 0) { |
|
2046 | + if ($dif > 0) { |
|
2047 | 2047 | return $this->eat8(); |
2048 | 2048 | } |
2049 | 2049 | } |
2050 | - if($mode == QR_MODE_AN) { |
|
2050 | + if ($mode == QR_MODE_AN) { |
|
2051 | 2051 | $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln |
2052 | 2052 | + QRinput::estimateBitsModeAn(1) // + 4 + la |
2053 | - - QRinput::estimateBitsModeAn($run + 1);// - 4 - la |
|
2054 | - if($dif > 0) { |
|
2053 | + - QRinput::estimateBitsModeAn($run + 1); // - 4 - la |
|
2054 | + if ($dif > 0) { |
|
2055 | 2055 | return $this->eatAn(); |
2056 | 2056 | } |
2057 | 2057 | } |
2058 | 2058 | |
2059 | 2059 | $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr)); |
2060 | - if($ret < 0) |
|
2060 | + if ($ret < 0) |
|
2061 | 2061 | return -1; |
2062 | 2062 | |
2063 | 2063 | return $run; |
@@ -2066,15 +2066,15 @@ discard block |
||
2066 | 2066 | //---------------------------------------------------------------------- |
2067 | 2067 | public function eatAn() |
2068 | 2068 | { |
2069 | - $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion()); |
|
2069 | + $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion()); |
|
2070 | 2070 | $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion()); |
2071 | 2071 | |
2072 | 2072 | $p = 0; |
2073 | 2073 | |
2074 | - while(self::isalnumat($this->dataStr, $p)) { |
|
2075 | - if(self::isdigitat($this->dataStr, $p)) { |
|
2074 | + while (self::isalnumat($this->dataStr, $p)) { |
|
2075 | + if (self::isdigitat($this->dataStr, $p)) { |
|
2076 | 2076 | $q = $p; |
2077 | - while(self::isdigitat($this->dataStr, $q)) { |
|
2077 | + while (self::isdigitat($this->dataStr, $q)) { |
|
2078 | 2078 | $q++; |
2079 | 2079 | } |
2080 | 2080 | |
@@ -2082,7 +2082,7 @@ discard block |
||
2082 | 2082 | + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln |
2083 | 2083 | - QRinput::estimateBitsModeAn($q); // - 4 - la |
2084 | 2084 | |
2085 | - if($dif < 0) { |
|
2085 | + if ($dif < 0) { |
|
2086 | 2086 | break; |
2087 | 2087 | } else { |
2088 | 2088 | $p = $q; |
@@ -2094,17 +2094,17 @@ discard block |
||
2094 | 2094 | |
2095 | 2095 | $run = $p; |
2096 | 2096 | |
2097 | - if(!self::isalnumat($this->dataStr, $p)) { |
|
2097 | + if ( ! self::isalnumat($this->dataStr, $p)) { |
|
2098 | 2098 | $dif = QRinput::estimateBitsModeAn($run) + 4 + $la |
2099 | 2099 | + QRinput::estimateBitsMode8(1) // + 4 + l8 |
2100 | 2100 | - QRinput::estimateBitsMode8($run + 1); // - 4 - l8 |
2101 | - if($dif > 0) { |
|
2101 | + if ($dif > 0) { |
|
2102 | 2102 | return $this->eat8(); |
2103 | 2103 | } |
2104 | 2104 | } |
2105 | 2105 | |
2106 | 2106 | $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr)); |
2107 | - if($ret < 0) |
|
2107 | + if ($ret < 0) |
|
2108 | 2108 | return -1; |
2109 | 2109 | |
2110 | 2110 | return $run; |
@@ -2115,12 +2115,12 @@ discard block |
||
2115 | 2115 | { |
2116 | 2116 | $p = 0; |
2117 | 2117 | |
2118 | - while($this->identifyMode($p) == QR_MODE_KANJI) { |
|
2118 | + while ($this->identifyMode($p) == QR_MODE_KANJI) { |
|
2119 | 2119 | $p += 2; |
2120 | 2120 | } |
2121 | 2121 | |
2122 | 2122 | $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr)); |
2123 | - if($ret < 0) |
|
2123 | + if ($ret < 0) |
|
2124 | 2124 | return -1; |
2125 | 2125 | |
2126 | 2126 | return $run; |
@@ -2135,34 +2135,34 @@ discard block |
||
2135 | 2135 | $p = 1; |
2136 | 2136 | $dataStrLen = strlen($this->dataStr); |
2137 | 2137 | |
2138 | - while($p < $dataStrLen) { |
|
2138 | + while ($p < $dataStrLen) { |
|
2139 | 2139 | |
2140 | 2140 | $mode = $this->identifyMode($p); |
2141 | - if($mode == QR_MODE_KANJI) { |
|
2141 | + if ($mode == QR_MODE_KANJI) { |
|
2142 | 2142 | break; |
2143 | 2143 | } |
2144 | - if($mode == QR_MODE_NUM) { |
|
2144 | + if ($mode == QR_MODE_NUM) { |
|
2145 | 2145 | $q = $p; |
2146 | - while(self::isdigitat($this->dataStr, $q)) { |
|
2146 | + while (self::isdigitat($this->dataStr, $q)) { |
|
2147 | 2147 | $q++; |
2148 | 2148 | } |
2149 | 2149 | $dif = QRinput::estimateBitsMode8($p) // + 4 + l8 |
2150 | 2150 | + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln |
2151 | 2151 | - QRinput::estimateBitsMode8($q); // - 4 - l8 |
2152 | - if($dif < 0) { |
|
2152 | + if ($dif < 0) { |
|
2153 | 2153 | break; |
2154 | 2154 | } else { |
2155 | 2155 | $p = $q; |
2156 | 2156 | } |
2157 | - } else if($mode == QR_MODE_AN) { |
|
2157 | + } else if ($mode == QR_MODE_AN) { |
|
2158 | 2158 | $q = $p; |
2159 | - while(self::isalnumat($this->dataStr, $q)) { |
|
2159 | + while (self::isalnumat($this->dataStr, $q)) { |
|
2160 | 2160 | $q++; |
2161 | 2161 | } |
2162 | 2162 | $dif = QRinput::estimateBitsMode8($p) // + 4 + l8 |
2163 | 2163 | + QRinput::estimateBitsModeAn($q - $p) + 4 + $la |
2164 | 2164 | - QRinput::estimateBitsMode8($q); // - 4 - l8 |
2165 | - if($dif < 0) { |
|
2165 | + if ($dif < 0) { |
|
2166 | 2166 | break; |
2167 | 2167 | } else { |
2168 | 2168 | $p = $q; |
@@ -2175,7 +2175,7 @@ discard block |
||
2175 | 2175 | $run = $p; |
2176 | 2176 | $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr)); |
2177 | 2177 | |
2178 | - if($ret < 0) |
|
2178 | + if ($ret < 0) |
|
2179 | 2179 | return -1; |
2180 | 2180 | |
2181 | 2181 | return $run; |
@@ -2186,7 +2186,7 @@ discard block |
||
2186 | 2186 | { |
2187 | 2187 | while (strlen($this->dataStr) > 0) |
2188 | 2188 | { |
2189 | - if($this->dataStr == '') |
|
2189 | + if ($this->dataStr == '') |
|
2190 | 2190 | return 0; |
2191 | 2191 | |
2192 | 2192 | $mode = $this->identifyMode(0); |
@@ -2203,8 +2203,8 @@ discard block |
||
2203 | 2203 | |
2204 | 2204 | } |
2205 | 2205 | |
2206 | - if($length == 0) return 0; |
|
2207 | - if($length < 0) return -1; |
|
2206 | + if ($length == 0) return 0; |
|
2207 | + if ($length < 0) return -1; |
|
2208 | 2208 | |
2209 | 2209 | $this->dataStr = substr($this->dataStr, $length); |
2210 | 2210 | } |
@@ -2216,9 +2216,9 @@ discard block |
||
2216 | 2216 | $stringLen = strlen($this->dataStr); |
2217 | 2217 | $p = 0; |
2218 | 2218 | |
2219 | - while ($p<$stringLen) { |
|
2219 | + while ($p < $stringLen) { |
|
2220 | 2220 | $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint); |
2221 | - if($mode == QR_MODE_KANJI) { |
|
2221 | + if ($mode == QR_MODE_KANJI) { |
|
2222 | 2222 | $p += 2; |
2223 | 2223 | } else { |
2224 | 2224 | if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) { |
@@ -2234,13 +2234,13 @@ discard block |
||
2234 | 2234 | //---------------------------------------------------------------------- |
2235 | 2235 | public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true) |
2236 | 2236 | { |
2237 | - if(is_null($string) || $string == '\0' || $string == '') { |
|
2237 | + if (is_null($string) || $string == '\0' || $string == '') { |
|
2238 | 2238 | throw new Exception('empty string!!!'); |
2239 | 2239 | } |
2240 | 2240 | |
2241 | 2241 | $split = new QRsplit($string, $input, $modeHint); |
2242 | 2242 | |
2243 | - if(!$casesensitive) |
|
2243 | + if ( ! $casesensitive) |
|
2244 | 2244 | $split->toUpper(); |
2245 | 2245 | |
2246 | 2246 | return $split->splitString(); |
@@ -2285,16 +2285,16 @@ discard block |
||
2285 | 2285 | |
2286 | 2286 | class QRrsItem { |
2287 | 2287 | |
2288 | - public $mm; // Bits per symbol |
|
2289 | - public $nn; // Symbols per block (= (1<<mm)-1) |
|
2290 | - public $alpha_to = array(); // log lookup table |
|
2291 | - public $index_of = array(); // Antilog lookup table |
|
2292 | - public $genpoly = array(); // Generator polynomial |
|
2293 | - public $nroots; // Number of generator roots = number of parity symbols |
|
2294 | - public $fcr; // First consecutive root, index form |
|
2295 | - public $prim; // Primitive element, index form |
|
2296 | - public $iprim; // prim-th root of 1, index form |
|
2297 | - public $pad; // Padding bytes in shortened block |
|
2288 | + public $mm; // Bits per symbol |
|
2289 | + public $nn; // Symbols per block (= (1<<mm)-1) |
|
2290 | + public $alpha_to = array(); // log lookup table |
|
2291 | + public $index_of = array(); // Antilog lookup table |
|
2292 | + public $genpoly = array(); // Generator polynomial |
|
2293 | + public $nroots; // Number of generator roots = number of parity symbols |
|
2294 | + public $fcr; // First consecutive root, index form |
|
2295 | + public $prim; // Primitive element, index form |
|
2296 | + public $iprim; // prim-th root of 1, index form |
|
2297 | + public $pad; // Padding bytes in shortened block |
|
2298 | 2298 | public $gfpoly; |
2299 | 2299 | |
2300 | 2300 | //---------------------------------------------------------------------- |
@@ -2318,47 +2318,47 @@ discard block |
||
2318 | 2318 | $rs = null; |
2319 | 2319 | |
2320 | 2320 | // Check parameter ranges |
2321 | - if($symsize < 0 || $symsize > 8) return $rs; |
|
2322 | - if($fcr < 0 || $fcr >= (1<<$symsize)) return $rs; |
|
2323 | - if($prim <= 0 || $prim >= (1<<$symsize)) return $rs; |
|
2324 | - if($nroots < 0 || $nroots >= (1<<$symsize)) return $rs; // Can't have more roots than symbol values! |
|
2325 | - if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding |
|
2321 | + if ($symsize < 0 || $symsize > 8) return $rs; |
|
2322 | + if ($fcr < 0 || $fcr >= (1 << $symsize)) return $rs; |
|
2323 | + if ($prim <= 0 || $prim >= (1 << $symsize)) return $rs; |
|
2324 | + if ($nroots < 0 || $nroots >= (1 << $symsize)) return $rs; // Can't have more roots than symbol values! |
|
2325 | + if ($pad < 0 || $pad >= ((1 << $symsize) - 1 - $nroots)) return $rs; // Too much padding |
|
2326 | 2326 | |
2327 | 2327 | $rs = new QRrsItem(); |
2328 | 2328 | $rs->mm = $symsize; |
2329 | - $rs->nn = (1<<$symsize)-1; |
|
2329 | + $rs->nn = (1 << $symsize) - 1; |
|
2330 | 2330 | $rs->pad = $pad; |
2331 | 2331 | |
2332 | - $rs->alpha_to = array_fill(0, $rs->nn+1, 0); |
|
2333 | - $rs->index_of = array_fill(0, $rs->nn+1, 0); |
|
2332 | + $rs->alpha_to = array_fill(0, $rs->nn + 1, 0); |
|
2333 | + $rs->index_of = array_fill(0, $rs->nn + 1, 0); |
|
2334 | 2334 | |
2335 | 2335 | // PHP style macro replacement ;) |
2336 | - $NN =& $rs->nn; |
|
2337 | - $A0 =& $NN; |
|
2336 | + $NN = & $rs->nn; |
|
2337 | + $A0 = & $NN; |
|
2338 | 2338 | |
2339 | 2339 | // Generate Galois field lookup tables |
2340 | 2340 | $rs->index_of[0] = $A0; // log(zero) = -inf |
2341 | 2341 | $rs->alpha_to[$A0] = 0; // alpha**-inf = 0 |
2342 | 2342 | $sr = 1; |
2343 | 2343 | |
2344 | - for($i=0; $i<$rs->nn; $i++) { |
|
2344 | + for ($i = 0; $i < $rs->nn; $i++) { |
|
2345 | 2345 | $rs->index_of[$sr] = $i; |
2346 | 2346 | $rs->alpha_to[$i] = $sr; |
2347 | 2347 | $sr <<= 1; |
2348 | - if($sr & (1<<$symsize)) { |
|
2348 | + if ($sr & (1 << $symsize)) { |
|
2349 | 2349 | $sr ^= $gfpoly; |
2350 | 2350 | } |
2351 | 2351 | $sr &= $rs->nn; |
2352 | 2352 | } |
2353 | 2353 | |
2354 | - if($sr != 1){ |
|
2354 | + if ($sr != 1) { |
|
2355 | 2355 | // field generator polynomial is not primitive! |
2356 | 2356 | $rs = NULL; |
2357 | 2357 | return $rs; |
2358 | 2358 | } |
2359 | 2359 | |
2360 | 2360 | /* Form RS code generator polynomial from its roots */ |
2361 | - $rs->genpoly = array_fill(0, $nroots+1, 0); |
|
2361 | + $rs->genpoly = array_fill(0, $nroots + 1, 0); |
|
2362 | 2362 | |
2363 | 2363 | $rs->fcr = $fcr; |
2364 | 2364 | $rs->prim = $prim; |
@@ -2366,21 +2366,21 @@ discard block |
||
2366 | 2366 | $rs->gfpoly = $gfpoly; |
2367 | 2367 | |
2368 | 2368 | /* Find prim-th root of 1, used in decoding */ |
2369 | - for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn) |
|
2369 | + for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs->nn) |
|
2370 | 2370 | ; // intentional empty-body loop! |
2371 | 2371 | |
2372 | - $rs->iprim = (int)($iprim / $prim); |
|
2372 | + $rs->iprim = (int) ($iprim / $prim); |
|
2373 | 2373 | $rs->genpoly[0] = 1; |
2374 | 2374 | |
2375 | - for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) { |
|
2376 | - $rs->genpoly[$i+1] = 1; |
|
2375 | + for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) { |
|
2376 | + $rs->genpoly[$i + 1] = 1; |
|
2377 | 2377 | |
2378 | 2378 | // Multiply rs->genpoly[] by @**(root + x) |
2379 | 2379 | for ($j = $i; $j > 0; $j--) { |
2380 | 2380 | if ($rs->genpoly[$j] != 0) { |
2381 | - $rs->genpoly[$j] = $rs->genpoly[$j-1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)]; |
|
2381 | + $rs->genpoly[$j] = $rs->genpoly[$j - 1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)]; |
|
2382 | 2382 | } else { |
2383 | - $rs->genpoly[$j] = $rs->genpoly[$j-1]; |
|
2383 | + $rs->genpoly[$j] = $rs->genpoly[$j - 1]; |
|
2384 | 2384 | } |
2385 | 2385 | } |
2386 | 2386 | // rs->genpoly[0] can never be zero |
@@ -2397,38 +2397,38 @@ discard block |
||
2397 | 2397 | //---------------------------------------------------------------------- |
2398 | 2398 | public function encode_rs_char($data, &$parity) |
2399 | 2399 | { |
2400 | - $MM =& $this->mm; |
|
2401 | - $NN =& $this->nn; |
|
2402 | - $ALPHA_TO =& $this->alpha_to; |
|
2403 | - $INDEX_OF =& $this->index_of; |
|
2404 | - $GENPOLY =& $this->genpoly; |
|
2405 | - $NROOTS =& $this->nroots; |
|
2406 | - $FCR =& $this->fcr; |
|
2407 | - $PRIM =& $this->prim; |
|
2408 | - $IPRIM =& $this->iprim; |
|
2409 | - $PAD =& $this->pad; |
|
2410 | - $A0 =& $NN; |
|
2400 | + $MM = & $this->mm; |
|
2401 | + $NN = & $this->nn; |
|
2402 | + $ALPHA_TO = & $this->alpha_to; |
|
2403 | + $INDEX_OF = & $this->index_of; |
|
2404 | + $GENPOLY = & $this->genpoly; |
|
2405 | + $NROOTS = & $this->nroots; |
|
2406 | + $FCR = & $this->fcr; |
|
2407 | + $PRIM = & $this->prim; |
|
2408 | + $IPRIM = & $this->iprim; |
|
2409 | + $PAD = & $this->pad; |
|
2410 | + $A0 = & $NN; |
|
2411 | 2411 | |
2412 | 2412 | $parity = array_fill(0, $NROOTS, 0); |
2413 | 2413 | |
2414 | - for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) { |
|
2414 | + for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) { |
|
2415 | 2415 | |
2416 | 2416 | $feedback = $INDEX_OF[$data[$i] ^ $parity[0]]; |
2417 | - if($feedback != $A0) { |
|
2417 | + if ($feedback != $A0) { |
|
2418 | 2418 | // feedback term is non-zero |
2419 | 2419 | |
2420 | 2420 | // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must |
2421 | 2421 | // always be for the polynomials constructed by init_rs() |
2422 | 2422 | $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback); |
2423 | 2423 | |
2424 | - for($j=1;$j<$NROOTS;$j++) { |
|
2425 | - $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])]; |
|
2424 | + for ($j = 1; $j < $NROOTS; $j++) { |
|
2425 | + $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS - $j])]; |
|
2426 | 2426 | } |
2427 | 2427 | } |
2428 | 2428 | |
2429 | 2429 | // Shift |
2430 | 2430 | array_shift($parity); |
2431 | - if($feedback != $A0) { |
|
2431 | + if ($feedback != $A0) { |
|
2432 | 2432 | array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]); |
2433 | 2433 | } else { |
2434 | 2434 | array_push($parity, 0); |
@@ -2446,13 +2446,13 @@ discard block |
||
2446 | 2446 | //---------------------------------------------------------------------- |
2447 | 2447 | public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) |
2448 | 2448 | { |
2449 | - foreach(self::$items as $rs) { |
|
2450 | - if($rs->pad != $pad) continue; |
|
2451 | - if($rs->nroots != $nroots) continue; |
|
2452 | - if($rs->mm != $symsize) continue; |
|
2453 | - if($rs->gfpoly != $gfpoly) continue; |
|
2454 | - if($rs->fcr != $fcr) continue; |
|
2455 | - if($rs->prim != $prim) continue; |
|
2449 | + foreach (self::$items as $rs) { |
|
2450 | + if ($rs->pad != $pad) continue; |
|
2451 | + if ($rs->nroots != $nroots) continue; |
|
2452 | + if ($rs->mm != $symsize) continue; |
|
2453 | + if ($rs->gfpoly != $gfpoly) continue; |
|
2454 | + if ($rs->fcr != $fcr) continue; |
|
2455 | + if ($rs->prim != $prim) continue; |
|
2456 | 2456 | |
2457 | 2457 | return $rs; |
2458 | 2458 | } |
@@ -2516,10 +2516,10 @@ discard block |
||
2516 | 2516 | public function writeFormatInformation($width, &$frame, $mask, $level) |
2517 | 2517 | { |
2518 | 2518 | $blacks = 0; |
2519 | - $format = QRspec::getFormatInfo($mask, $level); |
|
2519 | + $format = QRspec::getFormatInfo($mask, $level); |
|
2520 | 2520 | |
2521 | - for($i=0; $i<8; $i++) { |
|
2522 | - if($format & 1) { |
|
2521 | + for ($i = 0; $i < 8; $i++) { |
|
2522 | + if ($format & 1) { |
|
2523 | 2523 | $blacks += 2; |
2524 | 2524 | $v = 0x85; |
2525 | 2525 | } else { |
@@ -2527,7 +2527,7 @@ discard block |
||
2527 | 2527 | } |
2528 | 2528 | |
2529 | 2529 | $frame[8][$width - 1 - $i] = chr($v); |
2530 | - if($i < 6) { |
|
2530 | + if ($i < 6) { |
|
2531 | 2531 | $frame[$i][8] = chr($v); |
2532 | 2532 | } else { |
2533 | 2533 | $frame[$i + 1][8] = chr($v); |
@@ -2535,8 +2535,8 @@ discard block |
||
2535 | 2535 | $format = $format >> 1; |
2536 | 2536 | } |
2537 | 2537 | |
2538 | - for($i=0; $i<7; $i++) { |
|
2539 | - if($format & 1) { |
|
2538 | + for ($i = 0; $i < 7; $i++) { |
|
2539 | + if ($format & 1) { |
|
2540 | 2540 | $blacks += 2; |
2541 | 2541 | $v = 0x85; |
2542 | 2542 | } else { |
@@ -2544,7 +2544,7 @@ discard block |
||
2544 | 2544 | } |
2545 | 2545 | |
2546 | 2546 | $frame[$width - 7 + $i][8] = chr($v); |
2547 | - if($i == 0) { |
|
2547 | + if ($i == 0) { |
|
2548 | 2548 | $frame[8][7] = chr($v); |
2549 | 2549 | } else { |
2550 | 2550 | $frame[8][6 - $i] = chr($v); |
@@ -2557,27 +2557,27 @@ discard block |
||
2557 | 2557 | } |
2558 | 2558 | |
2559 | 2559 | //---------------------------------------------------------------------- |
2560 | - public function mask0($x, $y) { return ($x+$y)&1; } |
|
2561 | - public function mask1($x, $y) { return ($y&1); } |
|
2562 | - public function mask2($x, $y) { return ($x%3); } |
|
2563 | - public function mask3($x, $y) { return ($x+$y)%3; } |
|
2564 | - public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; } |
|
2565 | - public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3; } |
|
2566 | - public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1; } |
|
2567 | - public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1; } |
|
2560 | + public function mask0($x, $y) { return ($x + $y) & 1; } |
|
2561 | + public function mask1($x, $y) { return ($y & 1); } |
|
2562 | + public function mask2($x, $y) { return ($x % 3); } |
|
2563 | + public function mask3($x, $y) { return ($x + $y) % 3; } |
|
2564 | + public function mask4($x, $y) { return (((int) ($y / 2)) + ((int) ($x / 3))) & 1; } |
|
2565 | + public function mask5($x, $y) { return (($x * $y) & 1) + ($x * $y) % 3; } |
|
2566 | + public function mask6($x, $y) { return ((($x * $y) & 1) + ($x * $y) % 3) & 1; } |
|
2567 | + public function mask7($x, $y) { return ((($x * $y) % 3) + (($x + $y) & 1)) & 1; } |
|
2568 | 2568 | |
2569 | 2569 | //---------------------------------------------------------------------- |
2570 | 2570 | private function generateMaskNo($maskNo, $width, $frame) |
2571 | 2571 | { |
2572 | 2572 | $bitMask = array_fill(0, $width, array_fill(0, $width, 0)); |
2573 | 2573 | |
2574 | - for($y=0; $y<$width; $y++) { |
|
2575 | - for($x=0; $x<$width; $x++) { |
|
2576 | - if(ord($frame[$y][$x]) & 0x80) { |
|
2574 | + for ($y = 0; $y < $width; $y++) { |
|
2575 | + for ($x = 0; $x < $width; $x++) { |
|
2576 | + if (ord($frame[$y][$x]) & 0x80) { |
|
2577 | 2577 | $bitMask[$y][$x] = 0; |
2578 | 2578 | } else { |
2579 | 2579 | $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y); |
2580 | - $bitMask[$y][$x] = ($maskFunc == 0)?1:0; |
|
2580 | + $bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0; |
|
2581 | 2581 | } |
2582 | 2582 | |
2583 | 2583 | } |
@@ -2622,7 +2622,7 @@ discard block |
||
2622 | 2622 | $bitMask = self::unserial(file_get_contents($fileName)); |
2623 | 2623 | } else { |
2624 | 2624 | $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d); |
2625 | - if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) |
|
2625 | + if ( ! file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) |
|
2626 | 2626 | mkdir(QR_CACHE_DIR.'mask_'.$maskNo); |
2627 | 2627 | file_put_contents($fileName, self::serial($bitMask)); |
2628 | 2628 | } |
@@ -2635,12 +2635,12 @@ discard block |
||
2635 | 2635 | |
2636 | 2636 | $d = $s; |
2637 | 2637 | |
2638 | - for($y=0; $y<$width; $y++) { |
|
2639 | - for($x=0; $x<$width; $x++) { |
|
2640 | - if($bitMask[$y][$x] == 1) { |
|
2641 | - $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]); |
|
2638 | + for ($y = 0; $y < $width; $y++) { |
|
2639 | + for ($x = 0; $x < $width; $x++) { |
|
2640 | + if ($bitMask[$y][$x] == 1) { |
|
2641 | + $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]); |
|
2642 | 2642 | } |
2643 | - $b += (int)(ord($d[$y][$x]) & 1); |
|
2643 | + $b += (int) (ord($d[$y][$x]) & 1); |
|
2644 | 2644 | } |
2645 | 2645 | } |
2646 | 2646 | |
@@ -2662,21 +2662,21 @@ discard block |
||
2662 | 2662 | { |
2663 | 2663 | $demerit = 0; |
2664 | 2664 | |
2665 | - for($i=0; $i<$length; $i++) { |
|
2665 | + for ($i = 0; $i < $length; $i++) { |
|
2666 | 2666 | |
2667 | - if($this->runLength[$i] >= 5) { |
|
2667 | + if ($this->runLength[$i] >= 5) { |
|
2668 | 2668 | $demerit += (N1 + ($this->runLength[$i] - 5)); |
2669 | 2669 | } |
2670 | - if($i & 1) { |
|
2671 | - if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) { |
|
2672 | - $fact = (int)($this->runLength[$i] / 3); |
|
2673 | - if(($this->runLength[$i-2] == $fact) && |
|
2674 | - ($this->runLength[$i-1] == $fact) && |
|
2675 | - ($this->runLength[$i+1] == $fact) && |
|
2676 | - ($this->runLength[$i+2] == $fact)) { |
|
2677 | - if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) { |
|
2670 | + if ($i & 1) { |
|
2671 | + if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 == 0)) { |
|
2672 | + $fact = (int) ($this->runLength[$i] / 3); |
|
2673 | + if (($this->runLength[$i - 2] == $fact) && |
|
2674 | + ($this->runLength[$i - 1] == $fact) && |
|
2675 | + ($this->runLength[$i + 1] == $fact) && |
|
2676 | + ($this->runLength[$i + 2] == $fact)) { |
|
2677 | + if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) { |
|
2678 | 2678 | $demerit += N3; |
2679 | - } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) { |
|
2679 | + } else if ((($i + 3) >= $length) || ($this->runLength[$i + 3] >= (4 * $fact))) { |
|
2680 | 2680 | $demerit += N3; |
2681 | 2681 | } |
2682 | 2682 | } |
@@ -2692,30 +2692,30 @@ discard block |
||
2692 | 2692 | $head = 0; |
2693 | 2693 | $demerit = 0; |
2694 | 2694 | |
2695 | - for($y=0; $y<$width; $y++) { |
|
2695 | + for ($y = 0; $y < $width; $y++) { |
|
2696 | 2696 | $head = 0; |
2697 | 2697 | $this->runLength[0] = 1; |
2698 | 2698 | |
2699 | 2699 | $frameY = $frame[$y]; |
2700 | 2700 | |
2701 | - if ($y>0) |
|
2702 | - $frameYM = $frame[$y-1]; |
|
2701 | + if ($y > 0) |
|
2702 | + $frameYM = $frame[$y - 1]; |
|
2703 | 2703 | |
2704 | - for($x=0; $x<$width; $x++) { |
|
2705 | - if(($x > 0) && ($y > 0)) { |
|
2706 | - $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]); |
|
2707 | - $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]); |
|
2704 | + for ($x = 0; $x < $width; $x++) { |
|
2705 | + if (($x > 0) && ($y > 0)) { |
|
2706 | + $b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]); |
|
2707 | + $w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]); |
|
2708 | 2708 | |
2709 | - if(($b22 | ($w22 ^ 1))&1) { |
|
2709 | + if (($b22 | ($w22 ^ 1)) & 1) { |
|
2710 | 2710 | $demerit += N2; |
2711 | 2711 | } |
2712 | 2712 | } |
2713 | - if(($x == 0) && (ord($frameY[$x]) & 1)) { |
|
2713 | + if (($x == 0) && (ord($frameY[$x]) & 1)) { |
|
2714 | 2714 | $this->runLength[0] = -1; |
2715 | 2715 | $head = 1; |
2716 | 2716 | $this->runLength[$head] = 1; |
2717 | - } else if($x > 0) { |
|
2718 | - if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) { |
|
2717 | + } else if ($x > 0) { |
|
2718 | + if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) { |
|
2719 | 2719 | $head++; |
2720 | 2720 | $this->runLength[$head] = 1; |
2721 | 2721 | } else { |
@@ -2724,20 +2724,20 @@ discard block |
||
2724 | 2724 | } |
2725 | 2725 | } |
2726 | 2726 | |
2727 | - $demerit += $this->calcN1N3($head+1); |
|
2727 | + $demerit += $this->calcN1N3($head + 1); |
|
2728 | 2728 | } |
2729 | 2729 | |
2730 | - for($x=0; $x<$width; $x++) { |
|
2730 | + for ($x = 0; $x < $width; $x++) { |
|
2731 | 2731 | $head = 0; |
2732 | 2732 | $this->runLength[0] = 1; |
2733 | 2733 | |
2734 | - for($y=0; $y<$width; $y++) { |
|
2735 | - if($y == 0 && (ord($frame[$y][$x]) & 1)) { |
|
2734 | + for ($y = 0; $y < $width; $y++) { |
|
2735 | + if ($y == 0 && (ord($frame[$y][$x]) & 1)) { |
|
2736 | 2736 | $this->runLength[0] = -1; |
2737 | 2737 | $head = 1; |
2738 | 2738 | $this->runLength[$head] = 1; |
2739 | - } else if($y > 0) { |
|
2740 | - if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) { |
|
2739 | + } else if ($y > 0) { |
|
2740 | + if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) { |
|
2741 | 2741 | $head++; |
2742 | 2742 | $this->runLength[$head] = 1; |
2743 | 2743 | } else { |
@@ -2746,7 +2746,7 @@ discard block |
||
2746 | 2746 | } |
2747 | 2747 | } |
2748 | 2748 | |
2749 | - $demerit += $this->calcN1N3($head+1); |
|
2749 | + $demerit += $this->calcN1N3($head + 1); |
|
2750 | 2750 | } |
2751 | 2751 | |
2752 | 2752 | return $demerit; |
@@ -2760,13 +2760,13 @@ discard block |
||
2760 | 2760 | $bestMaskNum = 0; |
2761 | 2761 | $bestMask = array(); |
2762 | 2762 | |
2763 | - $checked_masks = array(0,1,2,3,4,5,6,7); |
|
2763 | + $checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7); |
|
2764 | 2764 | |
2765 | 2765 | if (QR_FIND_FROM_RANDOM !== false) { |
2766 | 2766 | |
2767 | - $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9); |
|
2768 | - for ($i = 0; $i < $howManuOut; $i++) { |
|
2769 | - $remPos = rand (0, count($checked_masks)-1); |
|
2767 | + $howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9); |
|
2768 | + for ($i = 0; $i < $howManuOut; $i++) { |
|
2769 | + $remPos = rand(0, count($checked_masks) - 1); |
|
2770 | 2770 | unset($checked_masks[$remPos]); |
2771 | 2771 | $checked_masks = array_values($checked_masks); |
2772 | 2772 | } |
@@ -2775,18 +2775,18 @@ discard block |
||
2775 | 2775 | |
2776 | 2776 | $bestMask = $frame; |
2777 | 2777 | |
2778 | - foreach($checked_masks as $i) { |
|
2778 | + foreach ($checked_masks as $i) { |
|
2779 | 2779 | $mask = array_fill(0, $width, str_repeat("\0", $width)); |
2780 | 2780 | |
2781 | 2781 | $demerit = 0; |
2782 | 2782 | $blacks = 0; |
2783 | 2783 | $blacks = $this->makeMaskNo($i, $width, $frame, $mask); |
2784 | 2784 | $blacks += $this->writeFormatInformation($width, $mask, $i, $level); |
2785 | - $blacks = (int)(100 * $blacks / ($width * $width)); |
|
2786 | - $demerit = (int)((int)(abs($blacks - 50) / 5) * N4); |
|
2785 | + $blacks = (int) (100 * $blacks / ($width * $width)); |
|
2786 | + $demerit = (int) ((int) (abs($blacks - 50) / 5) * N4); |
|
2787 | 2787 | $demerit += $this->evaluateSymbol($width, $mask); |
2788 | 2788 | |
2789 | - if($demerit < $minDemerit) { |
|
2789 | + if ($demerit < $minDemerit) { |
|
2790 | 2790 | $minDemerit = $demerit; |
2791 | 2791 | $bestMask = $mask; |
2792 | 2792 | $bestMaskNum = $i; |
@@ -2866,10 +2866,10 @@ discard block |
||
2866 | 2866 | //---------------------------------------------------------------------- |
2867 | 2867 | public function __construct(QRinput $input) |
2868 | 2868 | { |
2869 | - $spec = array(0,0,0,0,0); |
|
2869 | + $spec = array(0, 0, 0, 0, 0); |
|
2870 | 2870 | |
2871 | 2871 | $this->datacode = $input->getByteStream(); |
2872 | - if(is_null($this->datacode)) { |
|
2872 | + if (is_null($this->datacode)) { |
|
2873 | 2873 | throw new Exception('null imput string'); |
2874 | 2874 | } |
2875 | 2875 | |
@@ -2883,7 +2883,7 @@ discard block |
||
2883 | 2883 | $this->blocks = QRspec::rsBlockNum($spec); |
2884 | 2884 | |
2885 | 2885 | $ret = $this->init($spec); |
2886 | - if($ret < 0) { |
|
2886 | + if ($ret < 0) { |
|
2887 | 2887 | throw new Exception('block alloc error'); |
2888 | 2888 | return null; |
2889 | 2889 | } |
@@ -2902,29 +2902,29 @@ discard block |
||
2902 | 2902 | $blockNo = 0; |
2903 | 2903 | $dataPos = 0; |
2904 | 2904 | $eccPos = 0; |
2905 | - for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) { |
|
2906 | - $ecc = array_slice($this->ecccode,$eccPos); |
|
2907 | - $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs); |
|
2908 | - $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc); |
|
2905 | + for ($i = 0; $i < QRspec::rsBlockNum1($spec); $i++) { |
|
2906 | + $ecc = array_slice($this->ecccode, $eccPos); |
|
2907 | + $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs); |
|
2908 | + $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc); |
|
2909 | 2909 | |
2910 | 2910 | $dataPos += $dl; |
2911 | 2911 | $eccPos += $el; |
2912 | 2912 | $blockNo++; |
2913 | 2913 | } |
2914 | 2914 | |
2915 | - if(QRspec::rsBlockNum2($spec) == 0) |
|
2915 | + if (QRspec::rsBlockNum2($spec) == 0) |
|
2916 | 2916 | return 0; |
2917 | 2917 | |
2918 | 2918 | $dl = QRspec::rsDataCodes2($spec); |
2919 | 2919 | $el = QRspec::rsEccCodes2($spec); |
2920 | 2920 | $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el); |
2921 | 2921 | |
2922 | - if($rs == NULL) return -1; |
|
2922 | + if ($rs == NULL) return -1; |
|
2923 | 2923 | |
2924 | - for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) { |
|
2925 | - $ecc = array_slice($this->ecccode,$eccPos); |
|
2924 | + for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) { |
|
2925 | + $ecc = array_slice($this->ecccode, $eccPos); |
|
2926 | 2926 | $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs); |
2927 | - $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc); |
|
2927 | + $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc); |
|
2928 | 2928 | |
2929 | 2929 | $dataPos += $dl; |
2930 | 2930 | $eccPos += $el; |
@@ -2939,14 +2939,14 @@ discard block |
||
2939 | 2939 | { |
2940 | 2940 | $ret; |
2941 | 2941 | |
2942 | - if($this->count < $this->dataLength) { |
|
2942 | + if ($this->count < $this->dataLength) { |
|
2943 | 2943 | $row = $this->count % $this->blocks; |
2944 | 2944 | $col = $this->count / $this->blocks; |
2945 | - if($col >= $this->rsblocks[0]->dataLength) { |
|
2945 | + if ($col >= $this->rsblocks[0]->dataLength) { |
|
2946 | 2946 | $row += $this->b1; |
2947 | 2947 | } |
2948 | 2948 | $ret = $this->rsblocks[$row]->data[$col]; |
2949 | - } else if($this->count < $this->dataLength + $this->eccLength) { |
|
2949 | + } else if ($this->count < $this->dataLength + $this->eccLength) { |
|
2950 | 2950 | $row = ($this->count - $this->dataLength) % $this->blocks; |
2951 | 2951 | $col = ($this->count - $this->dataLength) / $this->blocks; |
2952 | 2952 | $ret = $this->rsblocks[$row]->ecc[$col]; |
@@ -2970,10 +2970,10 @@ discard block |
||
2970 | 2970 | //---------------------------------------------------------------------- |
2971 | 2971 | public function encodeMask(QRinput $input, $mask) |
2972 | 2972 | { |
2973 | - if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) { |
|
2973 | + if ($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) { |
|
2974 | 2974 | throw new Exception('wrong version'); |
2975 | 2975 | } |
2976 | - if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) { |
|
2976 | + if ($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) { |
|
2977 | 2977 | throw new Exception('wrong level'); |
2978 | 2978 | } |
2979 | 2979 | |
@@ -2986,15 +2986,15 @@ discard block |
||
2986 | 2986 | $frame = QRspec::newFrame($version); |
2987 | 2987 | |
2988 | 2988 | $filler = new FrameFiller($width, $frame); |
2989 | - if(is_null($filler)) { |
|
2989 | + if (is_null($filler)) { |
|
2990 | 2990 | return NULL; |
2991 | 2991 | } |
2992 | 2992 | |
2993 | 2993 | // inteleaved data and ecc codes |
2994 | - for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) { |
|
2994 | + for ($i = 0; $i < $raw->dataLength + $raw->eccLength; $i++) { |
|
2995 | 2995 | $code = $raw->getCode(); |
2996 | 2996 | $bit = 0x80; |
2997 | - for($j=0; $j<8; $j++) { |
|
2997 | + for ($j = 0; $j < 8; $j++) { |
|
2998 | 2998 | $addr = $filler->next(); |
2999 | 2999 | $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0)); |
3000 | 3000 | $bit = $bit >> 1; |
@@ -3007,7 +3007,7 @@ discard block |
||
3007 | 3007 | |
3008 | 3008 | // remainder bits |
3009 | 3009 | $j = QRspec::getRemainder($version); |
3010 | - for($i=0; $i<$j; $i++) { |
|
3010 | + for ($i = 0; $i < $j; $i++) { |
|
3011 | 3011 | $addr = $filler->next(); |
3012 | 3012 | $filler->setFrameAt($addr, 0x02); |
3013 | 3013 | } |
@@ -3018,7 +3018,7 @@ discard block |
||
3018 | 3018 | |
3019 | 3019 | // masking |
3020 | 3020 | $maskObj = new QRmask(); |
3021 | - if($mask < 0) { |
|
3021 | + if ($mask < 0) { |
|
3022 | 3022 | |
3023 | 3023 | if (QR_FIND_BEST_MASK) { |
3024 | 3024 | $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel()); |
@@ -3029,7 +3029,7 @@ discard block |
||
3029 | 3029 | $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel()); |
3030 | 3030 | } |
3031 | 3031 | |
3032 | - if($masked == NULL) { |
|
3032 | + if ($masked == NULL) { |
|
3033 | 3033 | return NULL; |
3034 | 3034 | } |
3035 | 3035 | |
@@ -3051,16 +3051,16 @@ discard block |
||
3051 | 3051 | //---------------------------------------------------------------------- |
3052 | 3052 | public function encodeString8bit($string, $version, $level) |
3053 | 3053 | { |
3054 | - if(string == NULL) { |
|
3054 | + if (string == NULL) { |
|
3055 | 3055 | throw new Exception('empty string!'); |
3056 | 3056 | return NULL; |
3057 | 3057 | } |
3058 | 3058 | |
3059 | 3059 | $input = new QRinput($version, $level); |
3060 | - if($input == NULL) return NULL; |
|
3060 | + if ($input == NULL) return NULL; |
|
3061 | 3061 | |
3062 | 3062 | $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string)); |
3063 | - if($ret < 0) { |
|
3063 | + if ($ret < 0) { |
|
3064 | 3064 | unset($input); |
3065 | 3065 | return NULL; |
3066 | 3066 | } |
@@ -3071,16 +3071,16 @@ discard block |
||
3071 | 3071 | public function encodeString($string, $version, $level, $hint, $casesensitive) |
3072 | 3072 | { |
3073 | 3073 | |
3074 | - if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) { |
|
3074 | + if ($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) { |
|
3075 | 3075 | throw new Exception('bad hint'); |
3076 | 3076 | return NULL; |
3077 | 3077 | } |
3078 | 3078 | |
3079 | 3079 | $input = new QRinput($version, $level); |
3080 | - if($input == NULL) return NULL; |
|
3080 | + if ($input == NULL) return NULL; |
|
3081 | 3081 | |
3082 | 3082 | $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive); |
3083 | - if($ret < 0) { |
|
3083 | + if ($ret < 0) { |
|
3084 | 3084 | return NULL; |
3085 | 3085 | } |
3086 | 3086 | |
@@ -3088,10 +3088,10 @@ discard block |
||
3088 | 3088 | } |
3089 | 3089 | |
3090 | 3090 | //---------------------------------------------------------------------- |
3091 | - public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) |
|
3091 | + public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint = false) |
|
3092 | 3092 | { |
3093 | 3093 | $enc = QRencode::factory($level, $size, $margin); |
3094 | - return $enc->encodePNG($text, $outfile, $saveandprint=false); |
|
3094 | + return $enc->encodePNG($text, $outfile, $saveandprint = false); |
|
3095 | 3095 | } |
3096 | 3096 | |
3097 | 3097 | //---------------------------------------------------------------------- |
@@ -3148,7 +3148,7 @@ discard block |
||
3148 | 3148 | { |
3149 | 3149 | do { |
3150 | 3150 | |
3151 | - if($this->bit == -1) { |
|
3151 | + if ($this->bit == -1) { |
|
3152 | 3152 | $this->bit = 0; |
3153 | 3153 | return array('x'=>$this->x, 'y'=>$this->y); |
3154 | 3154 | } |
@@ -3157,7 +3157,7 @@ discard block |
||
3157 | 3157 | $y = $this->y; |
3158 | 3158 | $w = $this->width; |
3159 | 3159 | |
3160 | - if($this->bit == 0) { |
|
3160 | + if ($this->bit == 0) { |
|
3161 | 3161 | $x--; |
3162 | 3162 | $this->bit++; |
3163 | 3163 | } else { |
@@ -3166,33 +3166,33 @@ discard block |
||
3166 | 3166 | $this->bit--; |
3167 | 3167 | } |
3168 | 3168 | |
3169 | - if($this->dir < 0) { |
|
3170 | - if($y < 0) { |
|
3169 | + if ($this->dir < 0) { |
|
3170 | + if ($y < 0) { |
|
3171 | 3171 | $y = 0; |
3172 | 3172 | $x -= 2; |
3173 | 3173 | $this->dir = 1; |
3174 | - if($x == 6) { |
|
3174 | + if ($x == 6) { |
|
3175 | 3175 | $x--; |
3176 | 3176 | $y = 9; |
3177 | 3177 | } |
3178 | 3178 | } |
3179 | 3179 | } else { |
3180 | - if($y == $w) { |
|
3180 | + if ($y == $w) { |
|
3181 | 3181 | $y = $w - 1; |
3182 | 3182 | $x -= 2; |
3183 | 3183 | $this->dir = -1; |
3184 | - if($x == 6) { |
|
3184 | + if ($x == 6) { |
|
3185 | 3185 | $x--; |
3186 | 3186 | $y -= 8; |
3187 | 3187 | } |
3188 | 3188 | } |
3189 | 3189 | } |
3190 | - if($x < 0 || $y < 0) return null; |
|
3190 | + if ($x < 0 || $y < 0) return null; |
|
3191 | 3191 | |
3192 | 3192 | $this->x = $x; |
3193 | 3193 | $this->y = $y; |
3194 | 3194 | |
3195 | - } while(ord($this->frame[$y][$x]) & 0x80); |
|
3195 | + } while (ord($this->frame[$y][$x]) & 0x80); |
|
3196 | 3196 | |
3197 | 3197 | return array('x'=>$x, 'y'=>$y); |
3198 | 3198 | } |
@@ -3255,7 +3255,7 @@ discard block |
||
3255 | 3255 | { |
3256 | 3256 | $code = new QRcode(); |
3257 | 3257 | |
3258 | - if($this->eightbit) { |
|
3258 | + if ($this->eightbit) { |
|
3259 | 3259 | $code->encodeString8bit($intext, $this->version, $this->level); |
3260 | 3260 | } else { |
3261 | 3261 | $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive); |
@@ -3269,7 +3269,7 @@ discard block |
||
3269 | 3269 | { |
3270 | 3270 | $code = new QRcode(); |
3271 | 3271 | |
3272 | - if($this->eightbit) { |
|
3272 | + if ($this->eightbit) { |
|
3273 | 3273 | $code->encodeString8bit($intext, $this->version, $this->level); |
3274 | 3274 | } else { |
3275 | 3275 | $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive); |
@@ -3277,7 +3277,7 @@ discard block |
||
3277 | 3277 | |
3278 | 3278 | QRtools::markTime('after_encode'); |
3279 | 3279 | |
3280 | - if ($outfile!== false) { |
|
3280 | + if ($outfile !== false) { |
|
3281 | 3281 | file_put_contents($outfile, join("\n", QRtools::binarize($code->data))); |
3282 | 3282 | } else { |
3283 | 3283 | return QRtools::binarize($code->data); |
@@ -3285,7 +3285,7 @@ discard block |
||
3285 | 3285 | } |
3286 | 3286 | |
3287 | 3287 | //---------------------------------------------------------------------- |
3288 | - public function encodePNG($intext, $outfile = false,$saveandprint=false) |
|
3288 | + public function encodePNG($intext, $outfile = false, $saveandprint = false) |
|
3289 | 3289 | { |
3290 | 3290 | try { |
3291 | 3291 | |
@@ -3297,9 +3297,9 @@ discard block |
||
3297 | 3297 | if ($err != '') |
3298 | 3298 | QRtools::log($outfile, $err); |
3299 | 3299 | |
3300 | - $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin)); |
|
3300 | + $maxSize = (int) (QR_PNG_MAXIMUM_SIZE / (count($tab) + 2 * $this->margin)); |
|
3301 | 3301 | |
3302 | - QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint); |
|
3302 | + QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin, $saveandprint); |
|
3303 | 3303 | |
3304 | 3304 | } catch (Exception $e) { |
3305 | 3305 |
@@ -176,8 +176,9 @@ discard block |
||
176 | 176 | { |
177 | 177 | $barcode_array = array(); |
178 | 178 | |
179 | - if (!is_array($mode)) |
|
180 | - $mode = explode(',', $mode); |
|
179 | + if (!is_array($mode)) { |
|
180 | + $mode = explode(',', $mode); |
|
181 | + } |
|
181 | 182 | |
182 | 183 | $eccLevel = 'L'; |
183 | 184 | |
@@ -194,8 +195,9 @@ discard block |
||
194 | 195 | |
195 | 196 | foreach ($qrTab as $line) { |
196 | 197 | $arrAdd = array(); |
197 | - foreach(str_split($line) as $char) |
|
198 | - $arrAdd[] = ($char=='1')?1:0; |
|
198 | + foreach(str_split($line) as $char) { |
|
199 | + $arrAdd[] = ($char=='1')?1:0; |
|
200 | + } |
|
199 | 201 | $barcode_array['bcode'][] = $arrAdd; |
200 | 202 | } |
201 | 203 | |
@@ -223,8 +225,9 @@ discard block |
||
223 | 225 | |
224 | 226 | $width = count($frame); |
225 | 227 | $bitMask = array_fill(0, $width, array_fill(0, $width, 0)); |
226 | - for ($maskNo = 0; $maskNo < 8; $maskNo++) |
|
227 | - $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true); |
|
228 | + for ($maskNo = 0; $maskNo < 8; $maskNo++) { |
|
229 | + $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true); |
|
230 | + } |
|
228 | 231 | } |
229 | 232 | |
230 | 233 | QRtools::markTime('after_build_cache'); |
@@ -261,8 +264,9 @@ discard block |
||
261 | 264 | list($usec, $sec) = explode(" ", microtime()); |
262 | 265 | $time = ((float)$usec + (float)$sec); |
263 | 266 | |
264 | - if (!isset($GLOBALS['qr_time_bench'])) |
|
265 | - $GLOBALS['qr_time_bench'] = array(); |
|
267 | + if (!isset($GLOBALS['qr_time_bench'])) { |
|
268 | + $GLOBALS['qr_time_bench'] = array(); |
|
269 | + } |
|
266 | 270 | |
267 | 271 | $GLOBALS['qr_time_bench'][$markerId] = $time; |
268 | 272 | } |
@@ -427,8 +431,9 @@ discard block |
||
427 | 431 | |
428 | 432 | for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) { |
429 | 433 | $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level]; |
430 | - if($words >= $size) |
|
431 | - return $i; |
|
434 | + if($words >= $size) { |
|
435 | + return $i; |
|
436 | + } |
|
432 | 437 | } |
433 | 438 | |
434 | 439 | return -1; |
@@ -446,8 +451,9 @@ discard block |
||
446 | 451 | //---------------------------------------------------------------------- |
447 | 452 | public static function lengthIndicator($mode, $version) |
448 | 453 | { |
449 | - if ($mode == QR_MODE_STRUCTURE) |
|
450 | - return 0; |
|
454 | + if ($mode == QR_MODE_STRUCTURE) { |
|
455 | + return 0; |
|
456 | + } |
|
451 | 457 | |
452 | 458 | if ($version <= 9) { |
453 | 459 | $l = 0; |
@@ -463,8 +469,9 @@ discard block |
||
463 | 469 | //---------------------------------------------------------------------- |
464 | 470 | public static function maximumWords($mode, $version) |
465 | 471 | { |
466 | - if($mode == QR_MODE_STRUCTURE) |
|
467 | - return 3; |
|
472 | + if($mode == QR_MODE_STRUCTURE) { |
|
473 | + return 3; |
|
474 | + } |
|
468 | 475 | |
469 | 476 | if($version <= 9) { |
470 | 477 | $l = 0; |
@@ -610,8 +617,9 @@ discard block |
||
610 | 617 | //---------------------------------------------------------------------- |
611 | 618 | public static function putAlignmentPattern($version, &$frame, $width) |
612 | 619 | { |
613 | - if($version < 2) |
|
614 | - return; |
|
620 | + if($version < 2) { |
|
621 | + return; |
|
622 | + } |
|
615 | 623 | |
616 | 624 | $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0]; |
617 | 625 | if($d < 0) { |
@@ -663,8 +671,9 @@ discard block |
||
663 | 671 | //---------------------------------------------------------------------- |
664 | 672 | public static function getVersionPattern($version) |
665 | 673 | { |
666 | - if($version < 7 || $version > QRSPEC_VERSION_MAX) |
|
667 | - return 0; |
|
674 | + if($version < 7 || $version > QRSPEC_VERSION_MAX) { |
|
675 | + return 0; |
|
676 | + } |
|
668 | 677 | |
669 | 678 | return self::$versionPattern[$version -7]; |
670 | 679 | } |
@@ -681,11 +690,13 @@ discard block |
||
681 | 690 | |
682 | 691 | public static function getFormatInfo($mask, $level) |
683 | 692 | { |
684 | - if($mask < 0 || $mask > 7) |
|
685 | - return 0; |
|
693 | + if($mask < 0 || $mask > 7) { |
|
694 | + return 0; |
|
695 | + } |
|
686 | 696 | |
687 | - if($level < 0 || $level > 3) |
|
688 | - return 0; |
|
697 | + if($level < 0 || $level > 3) { |
|
698 | + return 0; |
|
699 | + } |
|
689 | 700 | |
690 | 701 | return self::$formatInfo[$level][$mask]; |
691 | 702 | } |
@@ -865,8 +876,9 @@ discard block |
||
865 | 876 | //---------------------------------------------------------------------- |
866 | 877 | public static function newFrame($version) |
867 | 878 | { |
868 | - if($version < 1 || $version > QRSPEC_VERSION_MAX) |
|
869 | - return null; |
|
879 | + if($version < 1 || $version > QRSPEC_VERSION_MAX) { |
|
880 | + return null; |
|
881 | + } |
|
870 | 882 | |
871 | 883 | if(!isset(self::$frames[$version])) { |
872 | 884 | |
@@ -884,8 +896,9 @@ discard block |
||
884 | 896 | } |
885 | 897 | } |
886 | 898 | |
887 | - if(is_null(self::$frames[$version])) |
|
888 | - return null; |
|
899 | + if(is_null(self::$frames[$version])) { |
|
900 | + return null; |
|
901 | + } |
|
889 | 902 | |
890 | 903 | return self::$frames[$version]; |
891 | 904 | } |
@@ -950,7 +963,7 @@ discard block |
||
950 | 963 | ImagePng($image, $filename); |
951 | 964 | header("Content-type: image/png"); |
952 | 965 | ImagePng($image); |
953 | - }else{ |
|
966 | + } else{ |
|
954 | 967 | ImagePng($image, $filename); |
955 | 968 | } |
956 | 969 | } |
@@ -1210,8 +1223,9 @@ discard block |
||
1210 | 1223 | { |
1211 | 1224 | $bits = 0; |
1212 | 1225 | |
1213 | - if($version == 0) |
|
1214 | - $version = 1; |
|
1226 | + if($version == 0) { |
|
1227 | + $version = 1; |
|
1228 | + } |
|
1215 | 1229 | |
1216 | 1230 | switch($this->mode) { |
1217 | 1231 | case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
@@ -1270,8 +1284,9 @@ discard block |
||
1270 | 1284 | break; |
1271 | 1285 | } |
1272 | 1286 | |
1273 | - if($ret < 0) |
|
1274 | - return -1; |
|
1287 | + if($ret < 0) { |
|
1288 | + return -1; |
|
1289 | + } |
|
1275 | 1290 | } |
1276 | 1291 | |
1277 | 1292 | return $this->bstream->size(); |
@@ -1488,8 +1503,9 @@ discard block |
||
1488 | 1503 | //---------------------------------------------------------------------- |
1489 | 1504 | public static function checkModeKanji($size, $data) |
1490 | 1505 | { |
1491 | - if($size & 1) |
|
1492 | - return false; |
|
1506 | + if($size & 1) { |
|
1507 | + return false; |
|
1508 | + } |
|
1493 | 1509 | |
1494 | 1510 | for($i=0; $i<$size; $i+=2) { |
1495 | 1511 | $val = (ord($data[$i]) << 8) | ord($data[$i+1]); |
@@ -1509,8 +1525,9 @@ discard block |
||
1509 | 1525 | |
1510 | 1526 | public static function check($mode, $size, $data) |
1511 | 1527 | { |
1512 | - if($size <= 0) |
|
1513 | - return false; |
|
1528 | + if($size <= 0) { |
|
1529 | + return false; |
|
1530 | + } |
|
1514 | 1531 | |
1515 | 1532 | switch($mode) { |
1516 | 1533 | case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
@@ -1575,8 +1592,9 @@ discard block |
||
1575 | 1592 | $chunks = (int)($payload / 11); |
1576 | 1593 | $remain = $payload - $chunks * 11; |
1577 | 1594 | $size = $chunks * 2; |
1578 | - if($remain >= 6) |
|
1579 | - $size++; |
|
1595 | + if($remain >= 6) { |
|
1596 | + $size++; |
|
1597 | + } |
|
1580 | 1598 | break; |
1581 | 1599 | case QR_MODE_8: |
1582 | 1600 | $size = (int)($payload / 8); |
@@ -1593,8 +1611,12 @@ discard block |
||
1593 | 1611 | } |
1594 | 1612 | |
1595 | 1613 | $maxsize = QRspec::maximumWords($mode, $version); |
1596 | - if($size < 0) $size = 0; |
|
1597 | - if($size > $maxsize) $size = $maxsize; |
|
1614 | + if($size < 0) { |
|
1615 | + $size = 0; |
|
1616 | + } |
|
1617 | + if($size > $maxsize) { |
|
1618 | + $size = $maxsize; |
|
1619 | + } |
|
1598 | 1620 | |
1599 | 1621 | return $size; |
1600 | 1622 | } |
@@ -1607,8 +1629,9 @@ discard block |
||
1607 | 1629 | foreach($this->items as $item) { |
1608 | 1630 | $bits = $item->encodeBitStream($this->version); |
1609 | 1631 | |
1610 | - if($bits < 0) |
|
1611 | - return -1; |
|
1632 | + if($bits < 0) { |
|
1633 | + return -1; |
|
1634 | + } |
|
1612 | 1635 | |
1613 | 1636 | $total += $bits; |
1614 | 1637 | } |
@@ -1627,8 +1650,9 @@ discard block |
||
1627 | 1650 | for(;;) { |
1628 | 1651 | $bits = $this->createBitStream(); |
1629 | 1652 | |
1630 | - if($bits < 0) |
|
1631 | - return -1; |
|
1653 | + if($bits < 0) { |
|
1654 | + return -1; |
|
1655 | + } |
|
1632 | 1656 | |
1633 | 1657 | $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level); |
1634 | 1658 | if($ver < 0) { |
@@ -1665,8 +1689,9 @@ discard block |
||
1665 | 1689 | $padding = new QRbitstream(); |
1666 | 1690 | $ret = $padding->appendNum($words * 8 - $bits + 4, 0); |
1667 | 1691 | |
1668 | - if($ret < 0) |
|
1669 | - return $ret; |
|
1692 | + if($ret < 0) { |
|
1693 | + return $ret; |
|
1694 | + } |
|
1670 | 1695 | |
1671 | 1696 | $padlen = $maxwords - $words; |
1672 | 1697 | |
@@ -1679,8 +1704,9 @@ discard block |
||
1679 | 1704 | |
1680 | 1705 | $ret = $padding->appendBytes($padlen, $padbuf); |
1681 | 1706 | |
1682 | - if($ret < 0) |
|
1683 | - return $ret; |
|
1707 | + if($ret < 0) { |
|
1708 | + return $ret; |
|
1709 | + } |
|
1684 | 1710 | |
1685 | 1711 | } |
1686 | 1712 | |
@@ -1857,13 +1883,15 @@ discard block |
||
1857 | 1883 | //---------------------------------------------------------------------- |
1858 | 1884 | public function appendNum($bits, $num) |
1859 | 1885 | { |
1860 | - if ($bits == 0) |
|
1861 | - return 0; |
|
1886 | + if ($bits == 0) { |
|
1887 | + return 0; |
|
1888 | + } |
|
1862 | 1889 | |
1863 | 1890 | $b = QRbitstream::newFromNum($bits, $num); |
1864 | 1891 | |
1865 | - if(is_null($b)) |
|
1866 | - return -1; |
|
1892 | + if(is_null($b)) { |
|
1893 | + return -1; |
|
1894 | + } |
|
1867 | 1895 | |
1868 | 1896 | $ret = $this->append($b); |
1869 | 1897 | unset($b); |
@@ -1874,13 +1902,15 @@ discard block |
||
1874 | 1902 | //---------------------------------------------------------------------- |
1875 | 1903 | public function appendBytes($size, $data) |
1876 | 1904 | { |
1877 | - if ($size == 0) |
|
1878 | - return 0; |
|
1905 | + if ($size == 0) { |
|
1906 | + return 0; |
|
1907 | + } |
|
1879 | 1908 | |
1880 | 1909 | $b = QRbitstream::newFromBytes($size, $data); |
1881 | 1910 | |
1882 | - if(is_null($b)) |
|
1883 | - return -1; |
|
1911 | + if(is_null($b)) { |
|
1912 | + return -1; |
|
1913 | + } |
|
1884 | 1914 | |
1885 | 1915 | $ret = $this->append($b); |
1886 | 1916 | unset($b); |
@@ -1984,8 +2014,9 @@ discard block |
||
1984 | 2014 | //---------------------------------------------------------------------- |
1985 | 2015 | public static function isdigitat($str, $pos) |
1986 | 2016 | { |
1987 | - if ($pos >= strlen($str)) |
|
1988 | - return false; |
|
2017 | + if ($pos >= strlen($str)) { |
|
2018 | + return false; |
|
2019 | + } |
|
1989 | 2020 | |
1990 | 2021 | return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9'))); |
1991 | 2022 | } |
@@ -1993,8 +2024,9 @@ discard block |
||
1993 | 2024 | //---------------------------------------------------------------------- |
1994 | 2025 | public static function isalnumat($str, $pos) |
1995 | 2026 | { |
1996 | - if ($pos >= strlen($str)) |
|
1997 | - return false; |
|
2027 | + if ($pos >= strlen($str)) { |
|
2028 | + return false; |
|
2029 | + } |
|
1998 | 2030 | |
1999 | 2031 | return (QRinput::lookAnTable(ord($str[$pos])) >= 0); |
2000 | 2032 | } |
@@ -2002,8 +2034,9 @@ discard block |
||
2002 | 2034 | //---------------------------------------------------------------------- |
2003 | 2035 | public function identifyMode($pos) |
2004 | 2036 | { |
2005 | - if ($pos >= strlen($this->dataStr)) |
|
2006 | - return QR_MODE_NUL; |
|
2037 | + if ($pos >= strlen($this->dataStr)) { |
|
2038 | + return QR_MODE_NUL; |
|
2039 | + } |
|
2007 | 2040 | |
2008 | 2041 | $c = $this->dataStr[$pos]; |
2009 | 2042 | |
@@ -2057,8 +2090,9 @@ discard block |
||
2057 | 2090 | } |
2058 | 2091 | |
2059 | 2092 | $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr)); |
2060 | - if($ret < 0) |
|
2061 | - return -1; |
|
2093 | + if($ret < 0) { |
|
2094 | + return -1; |
|
2095 | + } |
|
2062 | 2096 | |
2063 | 2097 | return $run; |
2064 | 2098 | } |
@@ -2104,8 +2138,9 @@ discard block |
||
2104 | 2138 | } |
2105 | 2139 | |
2106 | 2140 | $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr)); |
2107 | - if($ret < 0) |
|
2108 | - return -1; |
|
2141 | + if($ret < 0) { |
|
2142 | + return -1; |
|
2143 | + } |
|
2109 | 2144 | |
2110 | 2145 | return $run; |
2111 | 2146 | } |
@@ -2120,8 +2155,9 @@ discard block |
||
2120 | 2155 | } |
2121 | 2156 | |
2122 | 2157 | $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr)); |
2123 | - if($ret < 0) |
|
2124 | - return -1; |
|
2158 | + if($ret < 0) { |
|
2159 | + return -1; |
|
2160 | + } |
|
2125 | 2161 | |
2126 | 2162 | return $run; |
2127 | 2163 | } |
@@ -2175,8 +2211,9 @@ discard block |
||
2175 | 2211 | $run = $p; |
2176 | 2212 | $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr)); |
2177 | 2213 | |
2178 | - if($ret < 0) |
|
2179 | - return -1; |
|
2214 | + if($ret < 0) { |
|
2215 | + return -1; |
|
2216 | + } |
|
2180 | 2217 | |
2181 | 2218 | return $run; |
2182 | 2219 | } |
@@ -2186,8 +2223,9 @@ discard block |
||
2186 | 2223 | { |
2187 | 2224 | while (strlen($this->dataStr) > 0) |
2188 | 2225 | { |
2189 | - if($this->dataStr == '') |
|
2190 | - return 0; |
|
2226 | + if($this->dataStr == '') { |
|
2227 | + return 0; |
|
2228 | + } |
|
2191 | 2229 | |
2192 | 2230 | $mode = $this->identifyMode(0); |
2193 | 2231 | |
@@ -2195,16 +2233,22 @@ discard block |
||
2195 | 2233 | case QR_MODE_NUM: $length = $this->eatNum(); break; |
2196 | 2234 | case QR_MODE_AN: $length = $this->eatAn(); break; |
2197 | 2235 | case QR_MODE_KANJI: |
2198 | - if ($hint == QR_MODE_KANJI) |
|
2199 | - $length = $this->eatKanji(); |
|
2200 | - else $length = $this->eat8(); |
|
2236 | + if ($hint == QR_MODE_KANJI) { |
|
2237 | + $length = $this->eatKanji(); |
|
2238 | + } else { |
|
2239 | + $length = $this->eat8(); |
|
2240 | + } |
|
2201 | 2241 | break; |
2202 | 2242 | default: $length = $this->eat8(); break; |
2203 | 2243 | |
2204 | 2244 | } |
2205 | 2245 | |
2206 | - if($length == 0) return 0; |
|
2207 | - if($length < 0) return -1; |
|
2246 | + if($length == 0) { |
|
2247 | + return 0; |
|
2248 | + } |
|
2249 | + if($length < 0) { |
|
2250 | + return -1; |
|
2251 | + } |
|
2208 | 2252 | |
2209 | 2253 | $this->dataStr = substr($this->dataStr, $length); |
2210 | 2254 | } |
@@ -2240,8 +2284,9 @@ discard block |
||
2240 | 2284 | |
2241 | 2285 | $split = new QRsplit($string, $input, $modeHint); |
2242 | 2286 | |
2243 | - if(!$casesensitive) |
|
2244 | - $split->toUpper(); |
|
2287 | + if(!$casesensitive) { |
|
2288 | + $split->toUpper(); |
|
2289 | + } |
|
2245 | 2290 | |
2246 | 2291 | return $split->splitString(); |
2247 | 2292 | } |
@@ -2318,11 +2363,23 @@ discard block |
||
2318 | 2363 | $rs = null; |
2319 | 2364 | |
2320 | 2365 | // Check parameter ranges |
2321 | - if($symsize < 0 || $symsize > 8) return $rs; |
|
2322 | - if($fcr < 0 || $fcr >= (1<<$symsize)) return $rs; |
|
2323 | - if($prim <= 0 || $prim >= (1<<$symsize)) return $rs; |
|
2324 | - if($nroots < 0 || $nroots >= (1<<$symsize)) return $rs; // Can't have more roots than symbol values! |
|
2325 | - if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding |
|
2366 | + if($symsize < 0 || $symsize > 8) { |
|
2367 | + return $rs; |
|
2368 | + } |
|
2369 | + if($fcr < 0 || $fcr >= (1<<$symsize)) { |
|
2370 | + return $rs; |
|
2371 | + } |
|
2372 | + if($prim <= 0 || $prim >= (1<<$symsize)) { |
|
2373 | + return $rs; |
|
2374 | + } |
|
2375 | + if($nroots < 0 || $nroots >= (1<<$symsize)) { |
|
2376 | + return $rs; |
|
2377 | + } |
|
2378 | + // Can't have more roots than symbol values! |
|
2379 | + if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) { |
|
2380 | + return $rs; |
|
2381 | + } |
|
2382 | + // Too much padding |
|
2326 | 2383 | |
2327 | 2384 | $rs = new QRrsItem(); |
2328 | 2385 | $rs->mm = $symsize; |
@@ -2388,8 +2445,9 @@ discard block |
||
2388 | 2445 | } |
2389 | 2446 | |
2390 | 2447 | // convert rs->genpoly[] to index form for quicker encoding |
2391 | - for ($i = 0; $i <= $nroots; $i++) |
|
2392 | - $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]]; |
|
2448 | + for ($i = 0; $i <= $nroots; $i++) { |
|
2449 | + $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]]; |
|
2450 | + } |
|
2393 | 2451 | |
2394 | 2452 | return $rs; |
2395 | 2453 | } |
@@ -2447,12 +2505,24 @@ discard block |
||
2447 | 2505 | public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) |
2448 | 2506 | { |
2449 | 2507 | foreach(self::$items as $rs) { |
2450 | - if($rs->pad != $pad) continue; |
|
2451 | - if($rs->nroots != $nroots) continue; |
|
2452 | - if($rs->mm != $symsize) continue; |
|
2453 | - if($rs->gfpoly != $gfpoly) continue; |
|
2454 | - if($rs->fcr != $fcr) continue; |
|
2455 | - if($rs->prim != $prim) continue; |
|
2508 | + if($rs->pad != $pad) { |
|
2509 | + continue; |
|
2510 | + } |
|
2511 | + if($rs->nroots != $nroots) { |
|
2512 | + continue; |
|
2513 | + } |
|
2514 | + if($rs->mm != $symsize) { |
|
2515 | + continue; |
|
2516 | + } |
|
2517 | + if($rs->gfpoly != $gfpoly) { |
|
2518 | + continue; |
|
2519 | + } |
|
2520 | + if($rs->fcr != $fcr) { |
|
2521 | + continue; |
|
2522 | + } |
|
2523 | + if($rs->prim != $prim) { |
|
2524 | + continue; |
|
2525 | + } |
|
2456 | 2526 | |
2457 | 2527 | return $rs; |
2458 | 2528 | } |
@@ -2591,8 +2661,9 @@ discard block |
||
2591 | 2661 | { |
2592 | 2662 | $codeArr = array(); |
2593 | 2663 | |
2594 | - foreach ($bitFrame as $line) |
|
2595 | - $codeArr[] = join('', $line); |
|
2664 | + foreach ($bitFrame as $line) { |
|
2665 | + $codeArr[] = join('', $line); |
|
2666 | + } |
|
2596 | 2667 | |
2597 | 2668 | return gzcompress(join("\n", $codeArr), 9); |
2598 | 2669 | } |
@@ -2603,8 +2674,9 @@ discard block |
||
2603 | 2674 | $codeArr = array(); |
2604 | 2675 | |
2605 | 2676 | $codeLines = explode("\n", gzuncompress($code)); |
2606 | - foreach ($codeLines as $line) |
|
2607 | - $codeArr[] = str_split($line); |
|
2677 | + foreach ($codeLines as $line) { |
|
2678 | + $codeArr[] = str_split($line); |
|
2679 | + } |
|
2608 | 2680 | |
2609 | 2681 | return $codeArr; |
2610 | 2682 | } |
@@ -2622,16 +2694,18 @@ discard block |
||
2622 | 2694 | $bitMask = self::unserial(file_get_contents($fileName)); |
2623 | 2695 | } else { |
2624 | 2696 | $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d); |
2625 | - if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) |
|
2626 | - mkdir(QR_CACHE_DIR.'mask_'.$maskNo); |
|
2697 | + if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) { |
|
2698 | + mkdir(QR_CACHE_DIR.'mask_'.$maskNo); |
|
2699 | + } |
|
2627 | 2700 | file_put_contents($fileName, self::serial($bitMask)); |
2628 | 2701 | } |
2629 | 2702 | } else { |
2630 | 2703 | $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d); |
2631 | 2704 | } |
2632 | 2705 | |
2633 | - if ($maskGenOnly) |
|
2634 | - return; |
|
2706 | + if ($maskGenOnly) { |
|
2707 | + return; |
|
2708 | + } |
|
2635 | 2709 | |
2636 | 2710 | $d = $s; |
2637 | 2711 | |
@@ -2698,8 +2772,9 @@ discard block |
||
2698 | 2772 | |
2699 | 2773 | $frameY = $frame[$y]; |
2700 | 2774 | |
2701 | - if ($y>0) |
|
2702 | - $frameYM = $frame[$y-1]; |
|
2775 | + if ($y>0) { |
|
2776 | + $frameYM = $frame[$y-1]; |
|
2777 | + } |
|
2703 | 2778 | |
2704 | 2779 | for($x=0; $x<$width; $x++) { |
2705 | 2780 | if(($x > 0) && ($y > 0)) { |
@@ -2912,14 +2987,17 @@ discard block |
||
2912 | 2987 | $blockNo++; |
2913 | 2988 | } |
2914 | 2989 | |
2915 | - if(QRspec::rsBlockNum2($spec) == 0) |
|
2916 | - return 0; |
|
2990 | + if(QRspec::rsBlockNum2($spec) == 0) { |
|
2991 | + return 0; |
|
2992 | + } |
|
2917 | 2993 | |
2918 | 2994 | $dl = QRspec::rsDataCodes2($spec); |
2919 | 2995 | $el = QRspec::rsEccCodes2($spec); |
2920 | 2996 | $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el); |
2921 | 2997 | |
2922 | - if($rs == NULL) return -1; |
|
2998 | + if($rs == NULL) { |
|
2999 | + return -1; |
|
3000 | + } |
|
2923 | 3001 | |
2924 | 3002 | for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) { |
2925 | 3003 | $ecc = array_slice($this->ecccode,$eccPos); |
@@ -3057,7 +3135,9 @@ discard block |
||
3057 | 3135 | } |
3058 | 3136 | |
3059 | 3137 | $input = new QRinput($version, $level); |
3060 | - if($input == NULL) return NULL; |
|
3138 | + if($input == NULL) { |
|
3139 | + return NULL; |
|
3140 | + } |
|
3061 | 3141 | |
3062 | 3142 | $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string)); |
3063 | 3143 | if($ret < 0) { |
@@ -3077,7 +3157,9 @@ discard block |
||
3077 | 3157 | } |
3078 | 3158 | |
3079 | 3159 | $input = new QRinput($version, $level); |
3080 | - if($input == NULL) return NULL; |
|
3160 | + if($input == NULL) { |
|
3161 | + return NULL; |
|
3162 | + } |
|
3081 | 3163 | |
3082 | 3164 | $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive); |
3083 | 3165 | if($ret < 0) { |
@@ -3187,7 +3269,9 @@ discard block |
||
3187 | 3269 | } |
3188 | 3270 | } |
3189 | 3271 | } |
3190 | - if($x < 0 || $y < 0) return null; |
|
3272 | + if($x < 0 || $y < 0) { |
|
3273 | + return null; |
|
3274 | + } |
|
3191 | 3275 | |
3192 | 3276 | $this->x = $x; |
3193 | 3277 | $this->y = $y; |
@@ -3294,8 +3378,9 @@ discard block |
||
3294 | 3378 | $err = ob_get_contents(); |
3295 | 3379 | ob_end_clean(); |
3296 | 3380 | |
3297 | - if ($err != '') |
|
3298 | - QRtools::log($outfile, $err); |
|
3381 | + if ($err != '') { |
|
3382 | + QRtools::log($outfile, $err); |
|
3383 | + } |
|
3299 | 3384 | |
3300 | 3385 | $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin)); |
3301 | 3386 |
@@ -96,6 +96,10 @@ discard block |
||
96 | 96 | define('QR_FORMAT_PNG', 1); |
97 | 97 | |
98 | 98 | class qrstr { |
99 | + |
|
100 | + /** |
|
101 | + * @param string $repl |
|
102 | + */ |
|
99 | 103 | public static function set(&$srctab, $x, $y, $repl, $replLen = false) { |
100 | 104 | $srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl)); |
101 | 105 | } |
@@ -231,6 +235,11 @@ discard block |
||
231 | 235 | } |
232 | 236 | |
233 | 237 | //---------------------------------------------------------------------- |
238 | + |
|
239 | + /** |
|
240 | + * @param boolean $outfile |
|
241 | + * @param string $err |
|
242 | + */ |
|
234 | 243 | public static function log($outfile, $err) |
235 | 244 | { |
236 | 245 | if (QR_LOG_DIR !== false) { |
@@ -256,6 +265,10 @@ discard block |
||
256 | 265 | } |
257 | 266 | |
258 | 267 | //---------------------------------------------------------------------- |
268 | + |
|
269 | + /** |
|
270 | + * @param string $markerId |
|
271 | + */ |
|
259 | 272 | public static function markTime($markerId) |
260 | 273 | { |
261 | 274 | list($usec, $sec) = explode(" ", microtime()); |
@@ -410,18 +423,30 @@ discard block |
||
410 | 423 | } |
411 | 424 | |
412 | 425 | //---------------------------------------------------------------------- |
426 | + |
|
427 | + /** |
|
428 | + * @param integer $version |
|
429 | + */ |
|
413 | 430 | public static function getWidth($version) |
414 | 431 | { |
415 | 432 | return self::$capacity[$version][QRCAP_WIDTH]; |
416 | 433 | } |
417 | 434 | |
418 | 435 | //---------------------------------------------------------------------- |
436 | + |
|
437 | + /** |
|
438 | + * @param integer $version |
|
439 | + */ |
|
419 | 440 | public static function getRemainder($version) |
420 | 441 | { |
421 | 442 | return self::$capacity[$version][QRCAP_REMINDER]; |
422 | 443 | } |
423 | 444 | |
424 | 445 | //---------------------------------------------------------------------- |
446 | + |
|
447 | + /** |
|
448 | + * @param integer $size |
|
449 | + */ |
|
425 | 450 | public static function getMinimumVersion($size, $level) |
426 | 451 | { |
427 | 452 | |
@@ -535,6 +560,9 @@ discard block |
||
535 | 560 | //---------------------------------------------------------------------- |
536 | 561 | // CACHEABLE!!! |
537 | 562 | |
563 | + /** |
|
564 | + * @param integer $version |
|
565 | + */ |
|
538 | 566 | public static function getEccSpec($version, $level, array &$spec) |
539 | 567 | { |
540 | 568 | if (count($spec) < 5) { |
@@ -857,12 +885,20 @@ discard block |
||
857 | 885 | } |
858 | 886 | |
859 | 887 | //---------------------------------------------------------------------- |
888 | + |
|
889 | + /** |
|
890 | + * @param string $code |
|
891 | + */ |
|
860 | 892 | public static function unserial($code) |
861 | 893 | { |
862 | 894 | return explode("\n", gzuncompress($code)); |
863 | 895 | } |
864 | 896 | |
865 | 897 | //---------------------------------------------------------------------- |
898 | + |
|
899 | + /** |
|
900 | + * @param integer $version |
|
901 | + */ |
|
866 | 902 | public static function newFrame($version) |
867 | 903 | { |
868 | 904 | if($version < 1 || $version > QRSPEC_VERSION_MAX) |
@@ -1233,6 +1269,10 @@ discard block |
||
1233 | 1269 | } |
1234 | 1270 | |
1235 | 1271 | //---------------------------------------------------------------------- |
1272 | + |
|
1273 | + /** |
|
1274 | + * @param integer $version |
|
1275 | + */ |
|
1236 | 1276 | public function encodeBitStream($version) |
1237 | 1277 | { |
1238 | 1278 | try { |
@@ -1310,6 +1350,10 @@ discard block |
||
1310 | 1350 | } |
1311 | 1351 | |
1312 | 1352 | //---------------------------------------------------------------------- |
1353 | + |
|
1354 | + /** |
|
1355 | + * @param integer $version |
|
1356 | + */ |
|
1313 | 1357 | public function setVersion($version) |
1314 | 1358 | { |
1315 | 1359 | if($version < 0 || $version > QRSPEC_VERSION_MAX) { |
@@ -1348,6 +1392,12 @@ discard block |
||
1348 | 1392 | } |
1349 | 1393 | |
1350 | 1394 | //---------------------------------------------------------------------- |
1395 | + |
|
1396 | + /** |
|
1397 | + * @param QRinput $mode |
|
1398 | + * @param integer $size |
|
1399 | + * @param integer $data |
|
1400 | + */ |
|
1351 | 1401 | public function append($mode, $size, $data) |
1352 | 1402 | { |
1353 | 1403 | try { |
@@ -1443,6 +1493,10 @@ discard block |
||
1443 | 1493 | ); |
1444 | 1494 | |
1445 | 1495 | //---------------------------------------------------------------------- |
1496 | + |
|
1497 | + /** |
|
1498 | + * @param integer $c |
|
1499 | + */ |
|
1446 | 1500 | public static function lookAnTable($c) |
1447 | 1501 | { |
1448 | 1502 | return (($c > 127)?-1:self::$anTable[$c]); |
@@ -1528,6 +1582,10 @@ discard block |
||
1528 | 1582 | |
1529 | 1583 | |
1530 | 1584 | //---------------------------------------------------------------------- |
1585 | + |
|
1586 | + /** |
|
1587 | + * @param integer $version |
|
1588 | + */ |
|
1531 | 1589 | public function estimateBitStreamSize($version) |
1532 | 1590 | { |
1533 | 1591 | $bits = 0; |
@@ -1645,6 +1703,10 @@ discard block |
||
1645 | 1703 | } |
1646 | 1704 | |
1647 | 1705 | //---------------------------------------------------------------------- |
1706 | + |
|
1707 | + /** |
|
1708 | + * @param QRbitstream $bstream |
|
1709 | + */ |
|
1648 | 1710 | public function appendPaddingBit(&$bstream) |
1649 | 1711 | { |
1650 | 1712 | $bits = $bstream->size(); |
@@ -1974,6 +2036,10 @@ discard block |
||
1974 | 2036 | public $modeHint; |
1975 | 2037 | |
1976 | 2038 | //---------------------------------------------------------------------- |
2039 | + |
|
2040 | + /** |
|
2041 | + * @param QRinput $input |
|
2042 | + */ |
|
1977 | 2043 | public function __construct($dataStr, $input, $modeHint) |
1978 | 2044 | { |
1979 | 2045 | $this->dataStr = $dataStr; |
@@ -1982,6 +2048,10 @@ discard block |
||
1982 | 2048 | } |
1983 | 2049 | |
1984 | 2050 | //---------------------------------------------------------------------- |
2051 | + |
|
2052 | + /** |
|
2053 | + * @param string $str |
|
2054 | + */ |
|
1985 | 2055 | public static function isdigitat($str, $pos) |
1986 | 2056 | { |
1987 | 2057 | if ($pos >= strlen($str)) |
@@ -1991,6 +2061,10 @@ discard block |
||
1991 | 2061 | } |
1992 | 2062 | |
1993 | 2063 | //---------------------------------------------------------------------- |
2064 | + |
|
2065 | + /** |
|
2066 | + * @param string $str |
|
2067 | + */ |
|
1994 | 2068 | public static function isalnumat($str, $pos) |
1995 | 2069 | { |
1996 | 2070 | if ($pos >= strlen($str)) |
@@ -2111,6 +2185,10 @@ discard block |
||
2111 | 2185 | } |
2112 | 2186 | |
2113 | 2187 | //---------------------------------------------------------------------- |
2188 | + |
|
2189 | + /** |
|
2190 | + * @return integer |
|
2191 | + */ |
|
2114 | 2192 | public function eatKanji() |
2115 | 2193 | { |
2116 | 2194 | $p = 0; |
@@ -2444,6 +2522,13 @@ discard block |
||
2444 | 2522 | public static $items = array(); |
2445 | 2523 | |
2446 | 2524 | //---------------------------------------------------------------------- |
2525 | + |
|
2526 | + /** |
|
2527 | + * @param integer $symsize |
|
2528 | + * @param integer $gfpoly |
|
2529 | + * @param integer $fcr |
|
2530 | + * @param integer $prim |
|
2531 | + */ |
|
2447 | 2532 | public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) |
2448 | 2533 | { |
2449 | 2534 | foreach(self::$items as $rs) { |
@@ -2598,6 +2683,10 @@ discard block |
||
2598 | 2683 | } |
2599 | 2684 | |
2600 | 2685 | //---------------------------------------------------------------------- |
2686 | + |
|
2687 | + /** |
|
2688 | + * @param string $code |
|
2689 | + */ |
|
2601 | 2690 | public static function unserial($code) |
2602 | 2691 | { |
2603 | 2692 | $codeArr = array(); |
@@ -2658,6 +2747,10 @@ discard block |
||
2658 | 2747 | } |
2659 | 2748 | |
2660 | 2749 | //---------------------------------------------------------------------- |
2750 | + |
|
2751 | + /** |
|
2752 | + * @param integer $length |
|
2753 | + */ |
|
2661 | 2754 | public function calcN1N3($length) |
2662 | 2755 | { |
2663 | 2756 | $demerit = 0; |
@@ -2968,6 +3061,10 @@ discard block |
||
2968 | 3061 | public $data; |
2969 | 3062 | |
2970 | 3063 | //---------------------------------------------------------------------- |
3064 | + |
|
3065 | + /** |
|
3066 | + * @param integer $mask |
|
3067 | + */ |
|
2971 | 3068 | public function encodeMask(QRinput $input, $mask) |
2972 | 3069 | { |
2973 | 3070 | if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) { |
@@ -3049,6 +3146,11 @@ discard block |
||
3049 | 3146 | } |
3050 | 3147 | |
3051 | 3148 | //---------------------------------------------------------------------- |
3149 | + |
|
3150 | + /** |
|
3151 | + * @param integer $version |
|
3152 | + * @param integer $level |
|
3153 | + */ |
|
3052 | 3154 | public function encodeString8bit($string, $version, $level) |
3053 | 3155 | { |
3054 | 3156 | if(string == NULL) { |
@@ -3068,6 +3170,12 @@ discard block |
||
3068 | 3170 | } |
3069 | 3171 | |
3070 | 3172 | //---------------------------------------------------------------------- |
3173 | + |
|
3174 | + /** |
|
3175 | + * @param integer $version |
|
3176 | + * @param integer $level |
|
3177 | + * @param boolean $casesensitive |
|
3178 | + */ |
|
3071 | 3179 | public function encodeString($string, $version, $level, $hint, $casesensitive) |
3072 | 3180 | { |
3073 | 3181 |
@@ -34,6 +34,6 @@ |
||
34 | 34 | |
35 | 35 | public function log(string $message) |
36 | 36 | { |
37 | - file_put_contents($this->filePath, $message . PHP_EOL, FILE_APPEND); |
|
37 | + file_put_contents($this->filePath, $message.PHP_EOL, FILE_APPEND); |
|
38 | 38 | } |
39 | 39 | } |
@@ -59,25 +59,25 @@ |
||
59 | 59 | public static function expire() { |
60 | 60 | $validity = self::isValidLicense(); |
61 | 61 | if ($validity == 1) { |
62 | - return '<span style="color:green">'. strtoupper(__('label_never')).'</span>'; |
|
62 | + return '<span style="color:green">'.strtoupper(__('label_never')).'</span>'; |
|
63 | 63 | } else { |
64 | 64 | return '<span style="color:red">'.strtoupper(__('message_contact_reseller_support')).'</span>'; |
65 | 65 | } |
66 | 66 | } |
67 | 67 | public static function LicenseDetails() { |
68 | - return '<p><span><strong>'. __('label_license_details'). '</strong></span><ul><li>'.__('label_domain'). rtrim(base_url(), '/').'</li><li>Status: '. is_valid_license(self::isValidLicense()).'</li><li>Expires: '. self::expire().'</li></ul></em></p>'; |
|
68 | + return '<p><span><strong>'.__('label_license_details').'</strong></span><ul><li>'.__('label_domain').rtrim(base_url(), '/').'</li><li>Status: '.is_valid_license(self::isValidLicense()).'</li><li>Expires: '.self::expire().'</li></ul></em></p>'; |
|
69 | 69 | } |
70 | 70 | public static function render($module, $view_file, $data = null, $return = false) { |
71 | 71 | return __render($module, $view_file, $data, $return); |
72 | 72 | } |
73 | 73 | public static function write_log($log_msg, $folder, $extension) |
74 | 74 | { |
75 | - if (!file_exists($folder)) |
|
75 | + if ( ! file_exists($folder)) |
|
76 | 76 | { |
77 | 77 | // create directory. |
78 | 78 | mkdir($folder, 0777, true); |
79 | 79 | } |
80 | - $filePath = $folder.'/log-' . date('Y-m-d') . '.'.$extension; |
|
80 | + $filePath = $folder.'/log-'.date('Y-m-d').'.'.$extension; |
|
81 | 81 | |
82 | 82 | $loggerFactory = new FileLoggerFactory($filePath); |
83 | 83 | $logger = $loggerFactory->createLogger(); |
@@ -42,6 +42,10 @@ discard block |
||
42 | 42 | { |
43 | 43 | return $this->user_id; |
44 | 44 | } |
45 | + |
|
46 | + /** |
|
47 | + * @param string $request_url |
|
48 | + */ |
|
45 | 49 | public static function getUrl($request_url) { |
46 | 50 | $ch = curl_init(); |
47 | 51 | curl_setopt($ch, CURLOPT_URL, $request_url); |
@@ -70,6 +74,12 @@ discard block |
||
70 | 74 | public static function render($module, $view_file, $data = null, $return = false) { |
71 | 75 | return __render($module, $view_file, $data, $return); |
72 | 76 | } |
77 | + |
|
78 | + /** |
|
79 | + * @param string $log_msg |
|
80 | + * @param string $folder |
|
81 | + * @param string $extension |
|
82 | + */ |
|
73 | 83 | public static function write_log($log_msg, $folder, $extension) |
74 | 84 | { |
75 | 85 | if (!file_exists($folder)) |
@@ -22,7 +22,6 @@ |
||
22 | 22 | use Mmanager\Domain\Repository\Customer\CustomerRepository; |
23 | 23 | use Mmanager\Domain\Repository\Invoice\InvoiceRepository; |
24 | 24 | use Mmanager\Persistence\Adapter\CodeIgniter\CIQueryBuilder; |
25 | -use Mmanager\Logger\FileLogger; |
|
26 | 25 | use Mmanager\Logger\FileLoggerFactory; |
27 | 26 | |
28 | 27 | class Mmanager |