@@ -1011,7 +1011,7 @@ |
||
| 1011 | 1011 | } |
| 1012 | 1012 | $logs_restored = true; |
| 1013 | 1013 | } |
| 1014 | - // if it was not already restored by a later restore operation ... |
|
| 1014 | + // if it was not already restored by a later restore operation ... |
|
| 1015 | 1015 | } elseif (sql_value("SELECT `id` FROM `cache_logs` WHERE `id`='&1'", 0, $revert_logid) == 0) { |
| 1016 | 1016 | // id, uuid, date_created and last_modified are set automatically; |
| 1017 | 1017 | // picture will be updated automatically on picture-restore |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | 'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'], |
| 34 | 34 | 'DEBUG' => ($opt['debug'] & DEBUG_DEVELOPER != 0), |
| 35 | 35 | 'DEBUG_PREVENT_SEMAPHORES' |
| 36 | - => !$opt['php']['semaphores'], # not available on old developer system |
|
| 36 | + => !$opt['php']['semaphores'], # not available on old developer system |
|
| 37 | 37 | 'DB_SERVER' => $opt['db']['servername'], |
| 38 | 38 | 'DB_NAME' => $opt['db']['placeholder']['db'], |
| 39 | 39 | 'DB_USERNAME' => $opt['db']['username'], |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | 'OC_NODE_ID' => $opt['logic']['node']['id'], |
| 55 | 55 | 'OC_COOKIE_NAME' => $opt['session']['cookiename'] . 'data', |
| 56 | 56 | 'OCDE_HTML_PURIFIER_SETTINGS' |
| 57 | - => $opt['html_purifier'], |
|
| 57 | + => $opt['html_purifier'], |
|
| 58 | 58 | 'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'], |
| 59 | 59 | ); |
| 60 | 60 | } |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | - if (isset($_REQUEST['lang'])) { |
|
| 2 | + if (isset($_REQUEST['lang'])) { |
|
| 3 | 3 | $lang = $_REQUEST['lang']; |
| 4 | - } |
|
| 5 | - else { |
|
| 4 | + } |
|
| 5 | + else { |
|
| 6 | 6 | $lang = 'de'; |
| 7 | - } |
|
| 7 | + } |
|
| 8 | 8 | ?> |
| 9 | 9 | tinyMCE_GZ.init({ |
| 10 | 10 | plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table', |
@@ -1,16 +1,16 @@ |
||
| 1 | 1 | <?php |
| 2 | - if (isset($_REQUEST['cacheid'])) { |
|
| 2 | + if (isset($_REQUEST['cacheid'])) { |
|
| 3 | 3 | $cacheID = $_REQUEST['cacheid']; |
| 4 | - } |
|
| 5 | - else { |
|
| 4 | + } |
|
| 5 | + else { |
|
| 6 | 6 | $cacheID = 0; |
| 7 | - } |
|
| 8 | - if (isset($_REQUEST['lang'])) { |
|
| 7 | + } |
|
| 8 | + if (isset($_REQUEST['lang'])) { |
|
| 9 | 9 | $lang = $_REQUEST['lang']; |
| 10 | - } |
|
| 11 | - else { |
|
| 10 | + } |
|
| 11 | + else { |
|
| 12 | 12 | $lang = 'de'; |
| 13 | - } |
|
| 13 | + } |
|
| 14 | 14 | ?> |
| 15 | 15 | tinyMCE_GZ.init({ |
| 16 | 16 | plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table', |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | - if (isset($_REQUEST['lang'])) |
|
| 2 | + if (isset($_REQUEST['lang'])) |
|
| 3 | 3 | $lang = $_REQUEST['lang']; |
| 4 | - else |
|
| 4 | + else |
|
| 5 | 5 | $lang = 'de'; |
| 6 | 6 | ?> |
| 7 | 7 | |
@@ -86,69 +86,69 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | switch ($action) { |
| 89 | - case 'selectlang': |
|
| 90 | - break; |
|
| 89 | + case 'selectlang': |
|
| 90 | + break; |
|
| 91 | 91 | |
| 92 | - case 'verify': |
|
| 93 | - verify(); |
|
| 94 | - break; |
|
| 92 | + case 'verify': |
|
| 93 | + verify(); |
|
| 94 | + break; |
|
| 95 | 95 | |
| 96 | - case 'resetids': |
|
| 97 | - resetIds(); |
|
| 98 | - break; |
|
| 96 | + case 'resetids': |
|
| 97 | + resetIds(); |
|
| 98 | + break; |
|
| 99 | 99 | |
| 100 | - case 'clearcache': |
|
| 101 | - clearCache(); |
|
| 102 | - break; |
|
| 100 | + case 'clearcache': |
|
| 101 | + clearCache(); |
|
| 102 | + break; |
|
| 103 | 103 | |
| 104 | - case 'export': |
|
| 105 | - export(); |
|
| 106 | - break; |
|
| 104 | + case 'export': |
|
| 105 | + export(); |
|
| 106 | + break; |
|
| 107 | 107 | |
| 108 | - case 'xmlexport': |
|
| 109 | - xmlexport(); |
|
| 110 | - break; |
|
| 108 | + case 'xmlexport': |
|
| 109 | + xmlexport(); |
|
| 110 | + break; |
|
| 111 | 111 | |
| 112 | - case 'xmlimport': |
|
| 113 | - break; |
|
| 112 | + case 'xmlimport': |
|
| 113 | + break; |
|
| 114 | 114 | |
| 115 | - case 'xmlimport2': |
|
| 116 | - xmlimport2(); |
|
| 117 | - break; |
|
| 115 | + case 'xmlimport2': |
|
| 116 | + xmlimport2(); |
|
| 117 | + break; |
|
| 118 | 118 | |
| 119 | - case 'xmlimport3': |
|
| 120 | - xmlimport3(); |
|
| 121 | - break; |
|
| 119 | + case 'xmlimport3': |
|
| 120 | + xmlimport3(); |
|
| 121 | + break; |
|
| 122 | 122 | |
| 123 | - case 'textexportnew': |
|
| 124 | - textexport($translang, false); |
|
| 125 | - break; |
|
| 123 | + case 'textexportnew': |
|
| 124 | + textexport($translang, false); |
|
| 125 | + break; |
|
| 126 | 126 | |
| 127 | - case 'textexportall': |
|
| 128 | - textexport($translang, true); |
|
| 129 | - break; |
|
| 127 | + case 'textexportall': |
|
| 128 | + textexport($translang, true); |
|
| 129 | + break; |
|
| 130 | 130 | |
| 131 | - case 'textimport': |
|
| 132 | - break; |
|
| 131 | + case 'textimport': |
|
| 132 | + break; |
|
| 133 | 133 | |
| 134 | - case 'textimport2': |
|
| 135 | - textimport($translang); |
|
| 136 | - break; |
|
| 134 | + case 'textimport2': |
|
| 135 | + textimport($translang); |
|
| 136 | + break; |
|
| 137 | 137 | |
| 138 | - case 'edit': |
|
| 139 | - if (!$access->mayTranslate($translang)) { |
|
| 140 | - $tpl->error(ERROR_NO_ACCESS); |
|
| 141 | - } |
|
| 142 | - edit(); |
|
| 143 | - break; |
|
| 138 | + case 'edit': |
|
| 139 | + if (!$access->mayTranslate($translang)) { |
|
| 140 | + $tpl->error(ERROR_NO_ACCESS); |
|
| 141 | + } |
|
| 142 | + edit(); |
|
| 143 | + break; |
|
| 144 | 144 | |
| 145 | - case 'copy_en': |
|
| 146 | - copy_english_texts(); |
|
| 147 | - break; |
|
| 145 | + case 'copy_en': |
|
| 146 | + copy_english_texts(); |
|
| 147 | + break; |
|
| 148 | 148 | |
| 149 | - case 'listfaults': |
|
| 150 | - $trans = sql( |
|
| 151 | - "SELECT |
|
| 149 | + case 'listfaults': |
|
| 150 | + $trans = sql( |
|
| 151 | + "SELECT |
|
| 152 | 152 | `sys_trans`.`id`, |
| 153 | 153 | `sys_trans`.`text` |
| 154 | 154 | FROM `sys_trans` |
@@ -156,14 +156,14 @@ discard block |
||
| 156 | 156 | ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id` |
| 157 | 157 | WHERE ISNULL(`sys_trans_ref`.`trans_id`) |
| 158 | 158 | ORDER BY `sys_trans`.`id` DESC" |
| 159 | - ); |
|
| 160 | - $tpl->assign_rs('trans', $trans); |
|
| 161 | - sql_free_result($trans); |
|
| 162 | - break; |
|
| 159 | + ); |
|
| 160 | + $tpl->assign_rs('trans', $trans); |
|
| 161 | + sql_free_result($trans); |
|
| 162 | + break; |
|
| 163 | 163 | |
| 164 | - case 'listall': |
|
| 165 | - $trans = sql( |
|
| 166 | - "SELECT |
|
| 164 | + case 'listall': |
|
| 165 | + $trans = sql( |
|
| 166 | + "SELECT |
|
| 167 | 167 | `sys_trans`.`id`, |
| 168 | 168 | `sys_trans`.`text`, |
| 169 | 169 | `sys_trans_text`.`text` AS `trans` |
@@ -172,48 +172,48 @@ discard block |
||
| 172 | 172 | ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` |
| 173 | 173 | AND `sys_trans_text`.`lang`='&1' |
| 174 | 174 | ORDER BY `sys_trans`.`id` DESC", |
| 175 | - $translang |
|
| 176 | - ); |
|
| 177 | - $tpl->assign_rs('trans', $trans); |
|
| 178 | - sql_free_result($trans); |
|
| 179 | - break; |
|
| 175 | + $translang |
|
| 176 | + ); |
|
| 177 | + $tpl->assign_rs('trans', $trans); |
|
| 178 | + sql_free_result($trans); |
|
| 179 | + break; |
|
| 180 | 180 | |
| 181 | - case 'remove': |
|
| 182 | - if (!$access->mayTranslate($translang)) { |
|
| 183 | - $tpl->error(ERROR_NO_ACCESS); |
|
| 184 | - } |
|
| 185 | - remove(); |
|
| 186 | - break; |
|
| 187 | - |
|
| 188 | - case 'scan': |
|
| 189 | - scan(); |
|
| 190 | - break; |
|
| 191 | - |
|
| 192 | - case 'scanstart': |
|
| 193 | - scanStart(); |
|
| 194 | - break; |
|
| 195 | - |
|
| 196 | - case 'scanfile': |
|
| 197 | - $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : ''; |
|
| 198 | - scanFile($filename); |
|
| 199 | - exit; |
|
| 200 | - |
|
| 201 | - case 'quicknone': |
|
| 202 | - $cookie->un_set('translate_mode'); |
|
| 203 | - break; |
|
| 204 | - |
|
| 205 | - case 'quicknew': |
|
| 206 | - $cookie->set('translate_mode', 'new'); |
|
| 207 | - break; |
|
| 208 | - |
|
| 209 | - case 'quickall': |
|
| 210 | - $cookie->set('translate_mode', 'all'); |
|
| 211 | - break; |
|
| 212 | - |
|
| 213 | - default: |
|
| 214 | - $action = 'listnew'; |
|
| 215 | - $trans = sql( |
|
| 216 | - "SELECT DISTINCT |
|
| 181 | + case 'remove': |
|
| 182 | + if (!$access->mayTranslate($translang)) { |
|
| 183 | + $tpl->error(ERROR_NO_ACCESS); |
|
| 184 | + } |
|
| 185 | + remove(); |
|
| 186 | + break; |
|
| 187 | + |
|
| 188 | + case 'scan': |
|
| 189 | + scan(); |
|
| 190 | + break; |
|
| 191 | + |
|
| 192 | + case 'scanstart': |
|
| 193 | + scanStart(); |
|
| 194 | + break; |
|
| 195 | + |
|
| 196 | + case 'scanfile': |
|
| 197 | + $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : ''; |
|
| 198 | + scanFile($filename); |
|
| 199 | + exit; |
|
| 200 | + |
|
| 201 | + case 'quicknone': |
|
| 202 | + $cookie->un_set('translate_mode'); |
|
| 203 | + break; |
|
| 204 | + |
|
| 205 | + case 'quicknew': |
|
| 206 | + $cookie->set('translate_mode', 'new'); |
|
| 207 | + break; |
|
| 208 | + |
|
| 209 | + case 'quickall': |
|
| 210 | + $cookie->set('translate_mode', 'all'); |
|
| 211 | + break; |
|
| 212 | + |
|
| 213 | + default: |
|
| 214 | + $action = 'listnew'; |
|
| 215 | + $trans = sql( |
|
| 216 | + "SELECT DISTINCT |
|
| 217 | 217 | `sys_trans`.`id`, |
| 218 | 218 | `sys_trans`.`text` |
| 219 | 219 | FROM `sys_trans` |
@@ -224,10 +224,10 @@ discard block |
||
| 224 | 224 | ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id` |
| 225 | 225 | WHERE ISNULL(`sys_trans_text`.`trans_id`) OR `sys_trans_text`.`text`='' |
| 226 | 226 | ORDER BY `sys_trans`.`id` DESC", |
| 227 | - $translang |
|
| 228 | - ); |
|
| 229 | - $tpl->assign_rs('trans', $trans); |
|
| 230 | - sql_free_result($trans); |
|
| 227 | + $translang |
|
| 228 | + ); |
|
| 229 | + $tpl->assign_rs('trans', $trans); |
|
| 230 | + sql_free_result($trans); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | $languages = []; |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | global $login; |
| 31 | 31 | |
| 32 | 32 | $fields = |
| 33 | - "`pics`.`uuid` AS `pic_uuid`, |
|
| 33 | + "`pics`.`uuid` AS `pic_uuid`, |
|
| 34 | 34 | `pics`.`url` AS `pic_url`, |
| 35 | 35 | `pics`.`title`, |
| 36 | 36 | `pics`.`date_created`, |
@@ -2273,38 +2273,38 @@ discard block |
||
| 2273 | 2273 | |
| 2274 | 2274 | foreach ($option as $k => $v) { |
| 2275 | 2275 | switch ($k) { |
| 2276 | - case 'encoding': |
|
| 2277 | - switch ($v) { |
|
| 2278 | - case 'utf8': |
|
| 2279 | - case 'ucs4_string': |
|
| 2280 | - case 'ucs4_array': |
|
| 2281 | - $this->_api_encoding = $v; |
|
| 2282 | - break; |
|
| 2276 | + case 'encoding': |
|
| 2277 | + switch ($v) { |
|
| 2278 | + case 'utf8': |
|
| 2279 | + case 'ucs4_string': |
|
| 2280 | + case 'ucs4_array': |
|
| 2281 | + $this->_api_encoding = $v; |
|
| 2282 | + break; |
|
| 2283 | 2283 | |
| 2284 | - default: |
|
| 2285 | - throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k); |
|
| 2286 | - } |
|
| 2284 | + default: |
|
| 2285 | + throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k); |
|
| 2286 | + } |
|
| 2287 | 2287 | |
| 2288 | 2288 | break; |
| 2289 | 2289 | |
| 2290 | - case 'overlong': |
|
| 2291 | - $this->_allow_overlong = ($v) ? true : false; |
|
| 2292 | - break; |
|
| 2290 | + case 'overlong': |
|
| 2291 | + $this->_allow_overlong = ($v) ? true : false; |
|
| 2292 | + break; |
|
| 2293 | 2293 | |
| 2294 | - case 'strict': |
|
| 2295 | - $this->_strict_mode = ($v) ? true : false; |
|
| 2296 | - break; |
|
| 2294 | + case 'strict': |
|
| 2295 | + $this->_strict_mode = ($v) ? true : false; |
|
| 2296 | + break; |
|
| 2297 | 2297 | |
| 2298 | - case 'version': |
|
| 2299 | - if (in_array($v, array('2003', '2008'))) { |
|
| 2300 | - $this->_version = $v; |
|
| 2301 | - } else { |
|
| 2302 | - throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k); |
|
| 2303 | - } |
|
| 2304 | - break; |
|
| 2298 | + case 'version': |
|
| 2299 | + if (in_array($v, array('2003', '2008'))) { |
|
| 2300 | + $this->_version = $v; |
|
| 2301 | + } else { |
|
| 2302 | + throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k); |
|
| 2303 | + } |
|
| 2304 | + break; |
|
| 2305 | 2305 | |
| 2306 | - default: |
|
| 2307 | - return false; |
|
| 2306 | + default: |
|
| 2307 | + return false; |
|
| 2308 | 2308 | } |
| 2309 | 2309 | } |
| 2310 | 2310 | |
@@ -2328,15 +2328,15 @@ discard block |
||
| 2328 | 2328 | // Forcing conversion of input to UCS4 array |
| 2329 | 2329 | // If one time encoding is given, use this, else the objects property |
| 2330 | 2330 | switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) { |
| 2331 | - case 'utf8': |
|
| 2332 | - $decoded = $this->_utf8_to_ucs4($decoded); |
|
| 2333 | - break; |
|
| 2334 | - case 'ucs4_string': |
|
| 2335 | - $decoded = $this->_ucs4_string_to_ucs4($decoded); |
|
| 2336 | - case 'ucs4_array': // No break; before this line. Catch case, but do nothing |
|
| 2337 | - break; |
|
| 2338 | - default: |
|
| 2339 | - throw new InvalidArgumentException('Unsupported input format'); |
|
| 2331 | + case 'utf8': |
|
| 2332 | + $decoded = $this->_utf8_to_ucs4($decoded); |
|
| 2333 | + break; |
|
| 2334 | + case 'ucs4_string': |
|
| 2335 | + $decoded = $this->_ucs4_string_to_ucs4($decoded); |
|
| 2336 | + case 'ucs4_array': // No break; before this line. Catch case, but do nothing |
|
| 2337 | + break; |
|
| 2338 | + default: |
|
| 2339 | + throw new InvalidArgumentException('Unsupported input format'); |
|
| 2340 | 2340 | } |
| 2341 | 2341 | |
| 2342 | 2342 | // No input, no output, what else did you expect? |
@@ -2350,35 +2350,35 @@ discard block |
||
| 2350 | 2350 | foreach ($decoded as $k => $v) { |
| 2351 | 2351 | // Make sure to use just the plain dot |
| 2352 | 2352 | switch($v) { |
| 2353 | - case 0x3002: |
|
| 2354 | - case 0xFF0E: |
|
| 2355 | - case 0xFF61: |
|
| 2356 | - $decoded[$k] = 0x2E; |
|
| 2357 | - // It's right, no break here |
|
| 2358 | - // The codepoints above have to be converted to dots anyway |
|
| 2359 | - |
|
| 2360 | - // Stumbling across an anchoring character |
|
| 2361 | - case 0x2E: |
|
| 2362 | - case 0x2F: |
|
| 2363 | - case 0x3A: |
|
| 2364 | - case 0x3F: |
|
| 2365 | - case 0x40: |
|
| 2366 | - // Neither email addresses nor URLs allowed in strict mode |
|
| 2367 | - if ($this->_strict_mode) { |
|
| 2368 | - throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.'); |
|
| 2369 | - } |
|
| 2370 | - // Skip first char |
|
| 2371 | - if ($k) { |
|
| 2372 | - $encoded = ''; |
|
| 2373 | - $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin))); |
|
| 2374 | - if ($encoded) { |
|
| 2375 | - $output .= $encoded; |
|
| 2376 | - } else { |
|
| 2377 | - $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin))); |
|
| 2353 | + case 0x3002: |
|
| 2354 | + case 0xFF0E: |
|
| 2355 | + case 0xFF61: |
|
| 2356 | + $decoded[$k] = 0x2E; |
|
| 2357 | + // It's right, no break here |
|
| 2358 | + // The codepoints above have to be converted to dots anyway |
|
| 2359 | + |
|
| 2360 | + // Stumbling across an anchoring character |
|
| 2361 | + case 0x2E: |
|
| 2362 | + case 0x2F: |
|
| 2363 | + case 0x3A: |
|
| 2364 | + case 0x3F: |
|
| 2365 | + case 0x40: |
|
| 2366 | + // Neither email addresses nor URLs allowed in strict mode |
|
| 2367 | + if ($this->_strict_mode) { |
|
| 2368 | + throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.'); |
|
| 2378 | 2369 | } |
| 2379 | - $output .= chr($decoded[$k]); |
|
| 2380 | - } |
|
| 2381 | - $last_begin = $k + 1; |
|
| 2370 | + // Skip first char |
|
| 2371 | + if ($k) { |
|
| 2372 | + $encoded = ''; |
|
| 2373 | + $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin))); |
|
| 2374 | + if ($encoded) { |
|
| 2375 | + $output .= $encoded; |
|
| 2376 | + } else { |
|
| 2377 | + $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin))); |
|
| 2378 | + } |
|
| 2379 | + $output .= chr($decoded[$k]); |
|
| 2380 | + } |
|
| 2381 | + $last_begin = $k + 1; |
|
| 2382 | 2382 | } |
| 2383 | 2383 | } |
| 2384 | 2384 | // Catch the rest of the string |
@@ -2416,12 +2416,12 @@ discard block |
||
| 2416 | 2416 | // Optionally set |
| 2417 | 2417 | if ($one_time_encoding) { |
| 2418 | 2418 | switch ($one_time_encoding) { |
| 2419 | - case 'utf8': |
|
| 2420 | - case 'ucs4_string': |
|
| 2421 | - case 'ucs4_array': |
|
| 2422 | - break; |
|
| 2423 | - default: |
|
| 2424 | - throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding); |
|
| 2419 | + case 'utf8': |
|
| 2420 | + case 'ucs4_string': |
|
| 2421 | + case 'ucs4_array': |
|
| 2422 | + break; |
|
| 2423 | + default: |
|
| 2424 | + throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding); |
|
| 2425 | 2425 | } |
| 2426 | 2426 | } |
| 2427 | 2427 | // Make sure to drop any newline characters around |
@@ -2473,17 +2473,17 @@ discard block |
||
| 2473 | 2473 | // The output is UTF-8 by default, other output formats need conversion here |
| 2474 | 2474 | // If one time encoding is given, use this, else the objects property |
| 2475 | 2475 | switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) { |
| 2476 | - case 'utf8': |
|
| 2477 | - return $return; |
|
| 2478 | - break; |
|
| 2479 | - case 'ucs4_string': |
|
| 2480 | - return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return)); |
|
| 2481 | - break; |
|
| 2482 | - case 'ucs4_array': |
|
| 2483 | - return $this->_utf8_to_ucs4($return); |
|
| 2484 | - break; |
|
| 2485 | - default: |
|
| 2486 | - throw new InvalidArgumentException('Unsupported output format'); |
|
| 2476 | + case 'utf8': |
|
| 2477 | + return $return; |
|
| 2478 | + break; |
|
| 2479 | + case 'ucs4_string': |
|
| 2480 | + return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return)); |
|
| 2481 | + break; |
|
| 2482 | + case 'ucs4_array': |
|
| 2483 | + return $this->_utf8_to_ucs4($return); |
|
| 2484 | + break; |
|
| 2485 | + default: |
|
| 2486 | + throw new InvalidArgumentException('Unsupported output format'); |
|
| 2487 | 2487 | } |
| 2488 | 2488 | } |
| 2489 | 2489 | |
@@ -78,83 +78,83 @@ discard block |
||
| 78 | 78 | $sl1=strlen($ret); |
| 79 | 79 | if($CC==0) $CC=256; |
| 80 | 80 | if($BitCount<24) |
| 81 | - { |
|
| 81 | + { |
|
| 82 | 82 | $ColorTotal=imagecolorstotal($img); |
| 83 | - if($IsTransparent) $ColorTotal--; |
|
| 83 | + if($IsTransparent) $ColorTotal--; |
|
| 84 | 84 | |
| 85 | - for($p=0;$p<$ColorTotal;$p++) |
|
| 86 | - { |
|
| 87 | - $color=imagecolorsforindex($img,$p); |
|
| 88 | - $ret.=inttobyte($color["blue"]); |
|
| 89 | - $ret.=inttobyte($color["green"]); |
|
| 90 | - $ret.=inttobyte($color["red"]); |
|
| 91 | - $ret.=inttobyte(0); //RESERVED |
|
| 92 | - }; |
|
| 85 | + for($p=0;$p<$ColorTotal;$p++) |
|
| 86 | + { |
|
| 87 | + $color=imagecolorsforindex($img,$p); |
|
| 88 | + $ret.=inttobyte($color["blue"]); |
|
| 89 | + $ret.=inttobyte($color["green"]); |
|
| 90 | + $ret.=inttobyte($color["red"]); |
|
| 91 | + $ret.=inttobyte(0); //RESERVED |
|
| 92 | + }; |
|
| 93 | 93 | |
| 94 | 94 | $CT=$ColorTotal; |
| 95 | - for($p=$ColorTotal;$p<$CC;$p++) |
|
| 96 | - { |
|
| 97 | - $ret.=inttobyte(0); |
|
| 98 | - $ret.=inttobyte(0); |
|
| 99 | - $ret.=inttobyte(0); |
|
| 100 | - $ret.=inttobyte(0); //RESERVED |
|
| 101 | - }; |
|
| 102 | - }; |
|
| 95 | + for($p=$ColorTotal;$p<$CC;$p++) |
|
| 96 | + { |
|
| 97 | + $ret.=inttobyte(0); |
|
| 98 | + $ret.=inttobyte(0); |
|
| 99 | + $ret.=inttobyte(0); |
|
| 100 | + $ret.=inttobyte(0); //RESERVED |
|
| 101 | + }; |
|
| 102 | + }; |
|
| 103 | 103 | |
| 104 | 104 | |
| 105 | 105 | if($BitCount<=8) |
| 106 | 106 | { |
| 107 | 107 | |
| 108 | - for($y=$Height-1;$y>=0;$y--) |
|
| 109 | - { |
|
| 110 | - $bWrite=""; |
|
| 111 | - for($x=0;$x<$Width;$x++) |
|
| 112 | - { |
|
| 113 | - $color=imagecolorat($img,$x,$y); |
|
| 114 | - $bWrite.=decbinx($color,$BitCount); |
|
| 115 | - if(strlen($bWrite)==8) |
|
| 108 | + for($y=$Height-1;$y>=0;$y--) |
|
| 109 | + { |
|
| 110 | + $bWrite=""; |
|
| 111 | + for($x=0;$x<$Width;$x++) |
|
| 116 | 112 | { |
| 117 | - $retd.=inttobyte(bindec($bWrite)); |
|
| 118 | - $bWrite=""; |
|
| 113 | + $color=imagecolorat($img,$x,$y); |
|
| 114 | + $bWrite.=decbinx($color,$BitCount); |
|
| 115 | + if(strlen($bWrite)==8) |
|
| 116 | + { |
|
| 117 | + $retd.=inttobyte(bindec($bWrite)); |
|
| 118 | + $bWrite=""; |
|
| 119 | + }; |
|
| 119 | 120 | }; |
| 120 | - }; |
|
| 121 | 121 | |
| 122 | - if((strlen($bWrite)<8)and(strlen($bWrite)!=0)) |
|
| 122 | + if((strlen($bWrite)<8)and(strlen($bWrite)!=0)) |
|
| 123 | 123 | { |
| 124 | - $sl=strlen($bWrite); |
|
| 125 | - for($t=0;$t<8-$sl;$t++) |
|
| 126 | - $sl.="0"; |
|
| 127 | - $retd.=inttobyte(bindec($bWrite)); |
|
| 124 | + $sl=strlen($bWrite); |
|
| 125 | + for($t=0;$t<8-$sl;$t++) |
|
| 126 | + $sl.="0"; |
|
| 127 | + $retd.=inttobyte(bindec($bWrite)); |
|
| 128 | + }; |
|
| 129 | + for($z=0;$z<$Zbytek;$z++) |
|
| 130 | + $retd.=inttobyte(0); |
|
| 128 | 131 | }; |
| 129 | - for($z=0;$z<$Zbytek;$z++) |
|
| 130 | - $retd.=inttobyte(0); |
|
| 131 | - }; |
|
| 132 | 132 | }; |
| 133 | 133 | |
| 134 | 134 | if(($RLE==1)and($BitCount==8)) |
| 135 | 135 | { |
| 136 | - for($t=0;$t<strlen($retd);$t+=4) |
|
| 137 | - { |
|
| 138 | - if($t!=0) |
|
| 139 | - if(($t)%$Width==0) |
|
| 136 | + for($t=0;$t<strlen($retd);$t+=4) |
|
| 137 | + { |
|
| 138 | + if($t!=0) |
|
| 139 | + if(($t)%$Width==0) |
|
| 140 | 140 | $ret.=chr(0).chr(0); |
| 141 | 141 | |
| 142 | - if(($t+5)%$Width==0) |
|
| 143 | - { |
|
| 144 | - $ret.=chr(0).chr(5).substr($retd,$t,5).chr(0); |
|
| 145 | - $t+=1; |
|
| 146 | - } |
|
| 147 | - if(($t+6)%$Width==0) |
|
| 142 | + if(($t+5)%$Width==0) |
|
| 143 | + { |
|
| 144 | + $ret.=chr(0).chr(5).substr($retd,$t,5).chr(0); |
|
| 145 | + $t+=1; |
|
| 146 | + } |
|
| 147 | + if(($t+6)%$Width==0) |
|
| 148 | 148 | { |
| 149 | - $ret.=chr(0).chr(6).substr($retd,$t,6); |
|
| 150 | - $t+=2; |
|
| 149 | + $ret.=chr(0).chr(6).substr($retd,$t,6); |
|
| 150 | + $t+=2; |
|
| 151 | 151 | } |
| 152 | 152 | else |
| 153 | 153 | { |
| 154 | - $ret.=chr(0).chr(4).substr($retd,$t,4); |
|
| 154 | + $ret.=chr(0).chr(4).substr($retd,$t,4); |
|
| 155 | + }; |
|
| 155 | 156 | }; |
| 156 | - }; |
|
| 157 | - $ret.=chr(0).chr(1); |
|
| 157 | + $ret.=chr(0).chr(1); |
|
| 158 | 158 | } |
| 159 | 159 | else |
| 160 | 160 | { |
@@ -165,31 +165,31 @@ discard block |
||
| 165 | 165 | if($BitCount==24) |
| 166 | 166 | { |
| 167 | 167 | for($z=0;$z<$Zbytek;$z++) |
| 168 | - $Dopl.=chr(0); |
|
| 168 | + $Dopl.=chr(0); |
|
| 169 | 169 | |
| 170 | 170 | for($y=$Height-1;$y>=0;$y--) |
| 171 | - { |
|
| 172 | - for($x=0;$x<$Width;$x++) |
|
| 171 | + { |
|
| 172 | + for($x=0;$x<$Width;$x++) |
|
| 173 | 173 | { |
| 174 | - $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y)); |
|
| 175 | - $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]); |
|
| 174 | + $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y)); |
|
| 175 | + $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]); |
|
| 176 | 176 | } |
| 177 | - $ret.=$Dopl; |
|
| 178 | - }; |
|
| 177 | + $ret.=$Dopl; |
|
| 178 | + }; |
|
| 179 | 179 | |
| 180 | - }; |
|
| 180 | + }; |
|
| 181 | 181 | |
| 182 | - if($file!="") |
|
| 183 | - { |
|
| 182 | + if($file!="") |
|
| 183 | + { |
|
| 184 | 184 | $r=($f=fopen($file,"w")); |
| 185 | 185 | $r=$r and fwrite($f,$ret); |
| 186 | 186 | $r=$r and fclose($f); |
| 187 | 187 | return $r; |
| 188 | - } |
|
| 189 | - else |
|
| 190 | - { |
|
| 191 | - echo $ret; |
|
| 192 | - }; |
|
| 188 | + } |
|
| 189 | + else |
|
| 190 | + { |
|
| 191 | + echo $ret; |
|
| 192 | + }; |
|
| 193 | 193 | }; |
| 194 | 194 | |
| 195 | 195 | |
@@ -213,57 +213,57 @@ discard block |
||
| 213 | 213 | |
| 214 | 214 | if($Header=="BM") |
| 215 | 215 | { |
| 216 | - $Size=freaddword($f); |
|
| 217 | - $Reserved1=freadword($f); |
|
| 218 | - $Reserved2=freadword($f); |
|
| 219 | - $FirstByteOfImage=freaddword($f); |
|
| 220 | - |
|
| 221 | - $SizeBITMAPINFOHEADER=freaddword($f); |
|
| 222 | - $Width=freaddword($f); |
|
| 223 | - $Height=freaddword($f); |
|
| 224 | - $biPlanes=freadword($f); |
|
| 225 | - $biBitCount=freadword($f); |
|
| 226 | - $RLECompression=freaddword($f); |
|
| 227 | - $WidthxHeight=freaddword($f); |
|
| 228 | - $biXPelsPerMeter=freaddword($f); |
|
| 229 | - $biYPelsPerMeter=freaddword($f); |
|
| 230 | - $NumberOfPalettesUsed=freaddword($f); |
|
| 231 | - $NumberOfImportantColors=freaddword($f); |
|
| 216 | + $Size=freaddword($f); |
|
| 217 | + $Reserved1=freadword($f); |
|
| 218 | + $Reserved2=freadword($f); |
|
| 219 | + $FirstByteOfImage=freaddword($f); |
|
| 220 | + |
|
| 221 | + $SizeBITMAPINFOHEADER=freaddword($f); |
|
| 222 | + $Width=freaddword($f); |
|
| 223 | + $Height=freaddword($f); |
|
| 224 | + $biPlanes=freadword($f); |
|
| 225 | + $biBitCount=freadword($f); |
|
| 226 | + $RLECompression=freaddword($f); |
|
| 227 | + $WidthxHeight=freaddword($f); |
|
| 228 | + $biXPelsPerMeter=freaddword($f); |
|
| 229 | + $biYPelsPerMeter=freaddword($f); |
|
| 230 | + $NumberOfPalettesUsed=freaddword($f); |
|
| 231 | + $NumberOfImportantColors=freaddword($f); |
|
| 232 | 232 | |
| 233 | 233 | if($biBitCount<24) |
| 234 | - { |
|
| 235 | - $img=imagecreate($Width,$Height); |
|
| 236 | - $Colors=pow(2,$biBitCount); |
|
| 237 | - for($p=0;$p<$Colors;$p++) |
|
| 238 | - { |
|
| 234 | + { |
|
| 235 | + $img=imagecreate($Width,$Height); |
|
| 236 | + $Colors=pow(2,$biBitCount); |
|
| 237 | + for($p=0;$p<$Colors;$p++) |
|
| 238 | + { |
|
| 239 | 239 | $B=freadbyte($f); |
| 240 | 240 | $G=freadbyte($f); |
| 241 | 241 | $R=freadbyte($f); |
| 242 | 242 | $Reserved=freadbyte($f); |
| 243 | 243 | $Palette[]=imagecolorallocate($img,$R,$G,$B); |
| 244 | - }; |
|
| 244 | + }; |
|
| 245 | 245 | |
| 246 | 246 | |
| 247 | 247 | |
| 248 | 248 | |
| 249 | 249 | if($RLECompression==0) |
| 250 | 250 | { |
| 251 | - $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4; |
|
| 251 | + $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4; |
|
| 252 | 252 | |
| 253 | 253 | for($y=$Height-1;$y>=0;$y--) |
| 254 | 254 | { |
| 255 | - $CurrentBit=0; |
|
| 256 | - for($x=0;$x<$Width;$x++) |
|
| 257 | - { |
|
| 258 | - $C=freadbits($f,$biBitCount); |
|
| 259 | - imagesetpixel($img,$x,$y,$Palette[$C]); |
|
| 260 | - }; |
|
| 255 | + $CurrentBit=0; |
|
| 256 | + for($x=0;$x<$Width;$x++) |
|
| 257 | + { |
|
| 258 | + $C=freadbits($f,$biBitCount); |
|
| 259 | + imagesetpixel($img,$x,$y,$Palette[$C]); |
|
| 260 | + }; |
|
| 261 | 261 | if($CurrentBit!=0) {freadbyte($f);}; |
| 262 | 262 | for($g=0;$g<$Zbytek;$g++) |
| 263 | - freadbyte($f); |
|
| 264 | - }; |
|
| 263 | + freadbyte($f); |
|
| 264 | + }; |
|
| 265 | 265 | |
| 266 | - }; |
|
| 266 | + }; |
|
| 267 | 267 | }; |
| 268 | 268 | |
| 269 | 269 | |
@@ -288,29 +288,29 @@ discard block |
||
| 288 | 288 | |
| 289 | 289 | while(!(($prefix==0)and($suffix==0))) |
| 290 | 290 | { |
| 291 | - if($prefix==0) |
|
| 292 | - { |
|
| 293 | - $pocet=$suffix; |
|
| 294 | - $Data.=fread($f,$pocet); |
|
| 295 | - $pocetb+=$pocet; |
|
| 296 | - if($pocetb%2==1) {freadbyte($f); $pocetb++;}; |
|
| 297 | - }; |
|
| 298 | - if($prefix>0) |
|
| 299 | - { |
|
| 300 | - $pocet=$prefix; |
|
| 301 | - for($r=0;$r<$pocet;$r++) |
|
| 291 | + if($prefix==0) |
|
| 292 | + { |
|
| 293 | + $pocet=$suffix; |
|
| 294 | + $Data.=fread($f,$pocet); |
|
| 295 | + $pocetb+=$pocet; |
|
| 296 | + if($pocetb%2==1) {freadbyte($f); $pocetb++;}; |
|
| 297 | + }; |
|
| 298 | + if($prefix>0) |
|
| 299 | + { |
|
| 300 | + $pocet=$prefix; |
|
| 301 | + for($r=0;$r<$pocet;$r++) |
|
| 302 | 302 | $Data.=chr($suffix); |
| 303 | - }; |
|
| 304 | - $prefix=freadbyte($f); |
|
| 305 | - $suffix=freadbyte($f); |
|
| 306 | - $pocetb+=2; |
|
| 307 | - if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>"; |
|
| 303 | + }; |
|
| 304 | + $prefix=freadbyte($f); |
|
| 305 | + $suffix=freadbyte($f); |
|
| 306 | + $pocetb+=2; |
|
| 307 | + if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>"; |
|
| 308 | 308 | }; |
| 309 | 309 | |
| 310 | 310 | for($x=0;$x<strlen($Data);$x++) |
| 311 | - { |
|
| 312 | - imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]); |
|
| 313 | - }; |
|
| 311 | + { |
|
| 312 | + imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]); |
|
| 313 | + }; |
|
| 314 | 314 | $Data=""; |
| 315 | 315 | |
| 316 | 316 | }; |
@@ -341,44 +341,44 @@ discard block |
||
| 341 | 341 | |
| 342 | 342 | while(!(($prefix==0)and($suffix==0))) |
| 343 | 343 | { |
| 344 | - if($prefix==0) |
|
| 345 | - { |
|
| 346 | - $pocet=$suffix; |
|
| 344 | + if($prefix==0) |
|
| 345 | + { |
|
| 346 | + $pocet=$suffix; |
|
| 347 | 347 | |
| 348 | - $CurrentBit=0; |
|
| 349 | - for($h=0;$h<$pocet;$h++) |
|
| 348 | + $CurrentBit=0; |
|
| 349 | + for($h=0;$h<$pocet;$h++) |
|
| 350 | 350 | $Data.=chr(freadbits($f,4)); |
| 351 | - if($CurrentBit!=0) freadbits($f,4); |
|
| 352 | - $pocetb+=ceil(($pocet/2)); |
|
| 353 | - if($pocetb%2==1) {freadbyte($f); $pocetb++;}; |
|
| 354 | - }; |
|
| 355 | - if($prefix>0) |
|
| 356 | - { |
|
| 357 | - $pocet=$prefix; |
|
| 358 | - $i=0; |
|
| 359 | - for($r=0;$r<$pocet;$r++) |
|
| 351 | + if($CurrentBit!=0) freadbits($f,4); |
|
| 352 | + $pocetb+=ceil(($pocet/2)); |
|
| 353 | + if($pocetb%2==1) {freadbyte($f); $pocetb++;}; |
|
| 354 | + }; |
|
| 355 | + if($prefix>0) |
|
| 356 | + { |
|
| 357 | + $pocet=$prefix; |
|
| 358 | + $i=0; |
|
| 359 | + for($r=0;$r<$pocet;$r++) |
|
| 360 | 360 | { |
| 361 | 361 | if($i%2==0) |
| 362 | - { |
|
| 363 | - $Data.=chr($suffix%16); |
|
| 364 | - } |
|
| 365 | - else |
|
| 366 | - { |
|
| 367 | - $Data.=chr(floor($suffix/16)); |
|
| 368 | - }; |
|
| 362 | + { |
|
| 363 | + $Data.=chr($suffix%16); |
|
| 364 | + } |
|
| 365 | + else |
|
| 366 | + { |
|
| 367 | + $Data.=chr(floor($suffix/16)); |
|
| 368 | + }; |
|
| 369 | 369 | $i++; |
| 370 | 370 | }; |
| 371 | - }; |
|
| 372 | - $prefix=freadbyte($f); |
|
| 373 | - $suffix=freadbyte($f); |
|
| 374 | - $pocetb+=2; |
|
| 375 | - if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>"; |
|
| 371 | + }; |
|
| 372 | + $prefix=freadbyte($f); |
|
| 373 | + $suffix=freadbyte($f); |
|
| 374 | + $pocetb+=2; |
|
| 375 | + if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>"; |
|
| 376 | 376 | }; |
| 377 | 377 | |
| 378 | 378 | for($x=0;$x<strlen($Data);$x++) |
| 379 | - { |
|
| 380 | - imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]); |
|
| 381 | - }; |
|
| 379 | + { |
|
| 380 | + imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]); |
|
| 381 | + }; |
|
| 382 | 382 | $Data=""; |
| 383 | 383 | |
| 384 | 384 | }; |
@@ -386,25 +386,25 @@ discard block |
||
| 386 | 386 | }; |
| 387 | 387 | |
| 388 | 388 | |
| 389 | - if($biBitCount==24) |
|
| 389 | + if($biBitCount==24) |
|
| 390 | 390 | { |
| 391 | - $img=imagecreatetruecolor($Width,$Height); |
|
| 392 | - $Zbytek=$Width%4; |
|
| 391 | + $img=imagecreatetruecolor($Width,$Height); |
|
| 392 | + $Zbytek=$Width%4; |
|
| 393 | 393 | |
| 394 | - for($y=$Height-1;$y>=0;$y--) |
|
| 394 | + for($y=$Height-1;$y>=0;$y--) |
|
| 395 | 395 | { |
| 396 | - for($x=0;$x<$Width;$x++) |
|
| 397 | - { |
|
| 398 | - $B=freadbyte($f); |
|
| 399 | - $G=freadbyte($f); |
|
| 400 | - $R=freadbyte($f); |
|
| 401 | - $color=imagecolorexact($img,$R,$G,$B); |
|
| 402 | - if($color==-1) $color=imagecolorallocate($img,$R,$G,$B); |
|
| 403 | - imagesetpixel($img,$x,$y,$color); |
|
| 404 | - } |
|
| 396 | + for($x=0;$x<$Width;$x++) |
|
| 397 | + { |
|
| 398 | + $B=freadbyte($f); |
|
| 399 | + $G=freadbyte($f); |
|
| 400 | + $R=freadbyte($f); |
|
| 401 | + $color=imagecolorexact($img,$R,$G,$B); |
|
| 402 | + if($color==-1) $color=imagecolorallocate($img,$R,$G,$B); |
|
| 403 | + imagesetpixel($img,$x,$y,$color); |
|
| 404 | + } |
|
| 405 | 405 | for($z=0;$z<$Zbytek;$z++) |
| 406 | - freadbyte($f); |
|
| 407 | - }; |
|
| 406 | + freadbyte($f); |
|
| 407 | + }; |
|
| 408 | 408 | }; |
| 409 | 409 | return $img; |
| 410 | 410 | |
@@ -438,14 +438,14 @@ discard block |
||
| 438 | 438 | |
| 439 | 439 | function freadbyte($f) |
| 440 | 440 | { |
| 441 | - return ord(fread($f,1)); |
|
| 441 | + return ord(fread($f,1)); |
|
| 442 | 442 | }; |
| 443 | 443 | |
| 444 | 444 | function freadword($f) |
| 445 | 445 | { |
| 446 | - $b1=freadbyte($f); |
|
| 447 | - $b2=freadbyte($f); |
|
| 448 | - return $b2*256+$b1; |
|
| 446 | + $b1=freadbyte($f); |
|
| 447 | + $b2=freadbyte($f); |
|
| 448 | + return $b2*256+$b1; |
|
| 449 | 449 | }; |
| 450 | 450 | |
| 451 | 451 | |
@@ -456,9 +456,9 @@ discard block |
||
| 456 | 456 | |
| 457 | 457 | function freaddword($f) |
| 458 | 458 | { |
| 459 | - $b1=freadword($f); |
|
| 460 | - $b2=freadword($f); |
|
| 461 | - return $b2*65536+$b1; |
|
| 459 | + $b1=freadword($f); |
|
| 460 | + $b2=freadword($f); |
|
| 461 | + return $b2*65536+$b1; |
|
| 462 | 462 | }; |
| 463 | 463 | |
| 464 | 464 | |
@@ -476,30 +476,30 @@ discard block |
||
| 476 | 476 | $CurrentBit=0; |
| 477 | 477 | function freadbits($f,$count) |
| 478 | 478 | { |
| 479 | - global $CurrentBit,$SMode; |
|
| 480 | - $Byte=freadbyte($f); |
|
| 481 | - $LastCBit=$CurrentBit; |
|
| 482 | - $CurrentBit+=$count; |
|
| 483 | - if($CurrentBit==8) |
|
| 484 | - { |
|
| 485 | - $CurrentBit=0; |
|
| 486 | - } |
|
| 487 | - else |
|
| 488 | - { |
|
| 489 | - fseek($f,ftell($f)-1); |
|
| 490 | - }; |
|
| 491 | - return RetBits($Byte,$LastCBit,$count); |
|
| 479 | + global $CurrentBit,$SMode; |
|
| 480 | + $Byte=freadbyte($f); |
|
| 481 | + $LastCBit=$CurrentBit; |
|
| 482 | + $CurrentBit+=$count; |
|
| 483 | + if($CurrentBit==8) |
|
| 484 | + { |
|
| 485 | + $CurrentBit=0; |
|
| 486 | + } |
|
| 487 | + else |
|
| 488 | + { |
|
| 489 | + fseek($f,ftell($f)-1); |
|
| 490 | + }; |
|
| 491 | + return RetBits($Byte,$LastCBit,$count); |
|
| 492 | 492 | }; |
| 493 | 493 | |
| 494 | 494 | |
| 495 | 495 | |
| 496 | 496 | function RGBToHex($Red,$Green,$Blue) |
| 497 | - { |
|
| 498 | - $hRed=dechex($Red);if(strlen($hRed)==1) $hRed="0$hRed"; |
|
| 499 | - $hGreen=dechex($Green);if(strlen($hGreen)==1) $hGreen="0$hGreen"; |
|
| 500 | - $hBlue=dechex($Blue);if(strlen($hBlue)==1) $hBlue="0$hBlue"; |
|
| 501 | - return($hRed.$hGreen.$hBlue); |
|
| 502 | - }; |
|
| 497 | + { |
|
| 498 | + $hRed=dechex($Red);if(strlen($hRed)==1) $hRed="0$hRed"; |
|
| 499 | + $hGreen=dechex($Green);if(strlen($hGreen)==1) $hGreen="0$hGreen"; |
|
| 500 | + $hBlue=dechex($Blue);if(strlen($hBlue)==1) $hBlue="0$hBlue"; |
|
| 501 | + return($hRed.$hGreen.$hBlue); |
|
| 502 | + }; |
|
| 503 | 503 | |
| 504 | 504 | function int_to_dword($n) |
| 505 | 505 | { |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | $bin=decbin($d); |
| 522 | 522 | $sbin=strlen($bin); |
| 523 | 523 | for($j=0;$j<$n-$sbin;$j++) |
| 524 | - $bin="0$bin"; |
|
| 524 | + $bin="0$bin"; |
|
| 525 | 525 | return $bin; |
| 526 | 526 | }; |
| 527 | 527 | |