@@ -13,8 +13,9 @@ discard block |
||
13 | 13 | * @version 2.1 Beta 3 |
14 | 14 | */ |
15 | 15 | |
16 | -if (!defined('SMF')) |
|
16 | +if (!defined('SMF')) { |
|
17 | 17 | die('No direct access...'); |
18 | +} |
|
18 | 19 | |
19 | 20 | /** |
20 | 21 | * Entry point for this section. |
@@ -38,8 +39,7 @@ discard block |
||
38 | 39 | 'stats' => 'SpiderStats', |
39 | 40 | ); |
40 | 41 | $default = 'stats'; |
41 | - } |
|
42 | - else |
|
42 | + } else |
|
43 | 43 | { |
44 | 44 | $subActions = array( |
45 | 45 | 'settings' => 'ManageSearchEngineSettings', |
@@ -90,11 +90,12 @@ discard block |
||
90 | 90 | { |
91 | 91 | disabledState = document.getElementById(\'spider_mode\').value == 0;'; |
92 | 92 | |
93 | - foreach ($config_vars as $variable) |
|
94 | - if ($variable[1] != 'spider_mode') |
|
93 | + foreach ($config_vars as $variable) { |
|
94 | + if ($variable[1] != 'spider_mode') |
|
95 | 95 | $javascript_function .= ' |
96 | 96 | if (document.getElementById(\'' . $variable[1] . '\')) |
97 | 97 | document.getElementById(\'' . $variable[1] . '\').disabled = disabledState;'; |
98 | + } |
|
98 | 99 | |
99 | 100 | $javascript_function .= ' |
100 | 101 | } |
@@ -102,8 +103,9 @@ discard block |
||
102 | 103 | |
103 | 104 | call_integration_hook('integrate_modify_search_engine_settings', array(&$config_vars)); |
104 | 105 | |
105 | - if ($return_config) |
|
106 | - return $config_vars; |
|
106 | + if ($return_config) { |
|
107 | + return $config_vars; |
|
108 | + } |
|
107 | 109 | |
108 | 110 | // We need to load the groups for the spider group thingy. |
109 | 111 | $request = $smcFunc['db_query']('', ' |
@@ -116,13 +118,15 @@ discard block |
||
116 | 118 | 'moderator_group' => 3, |
117 | 119 | ) |
118 | 120 | ); |
119 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
120 | - $config_vars['spider_group'][2][$row['id_group']] = $row['group_name']; |
|
121 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
122 | + $config_vars['spider_group'][2][$row['id_group']] = $row['group_name']; |
|
123 | + } |
|
121 | 124 | $smcFunc['db_free_result']($request); |
122 | 125 | |
123 | 126 | // Make sure it's valid - note that regular members are given id_group = 1 which is reversed in Load.php - no admins here! |
124 | - if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']])) |
|
125 | - $_POST['spider_group'] = 0; |
|
127 | + if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']])) { |
|
128 | + $_POST['spider_group'] = 0; |
|
129 | + } |
|
126 | 130 | |
127 | 131 | // We'll want this for our easy save. |
128 | 132 | require_once($sourcedir . '/ManageServer.php'); |
@@ -166,8 +170,9 @@ discard block |
||
166 | 170 | } |
167 | 171 | |
168 | 172 | // Are we adding a new one? |
169 | - if (!empty($_POST['addSpider'])) |
|
170 | - return EditSpider(); |
|
173 | + if (!empty($_POST['addSpider'])) { |
|
174 | + return EditSpider(); |
|
175 | + } |
|
171 | 176 | // User pressed the 'remove selection button'. |
172 | 177 | elseif (!empty($_POST['removeSpiders']) && !empty($_POST['remove']) && is_array($_POST['remove'])) |
173 | 178 | { |
@@ -175,8 +180,9 @@ discard block |
||
175 | 180 | validateToken('admin-ser'); |
176 | 181 | |
177 | 182 | // Make sure every entry is a proper integer. |
178 | - foreach ($_POST['remove'] as $index => $spider_id) |
|
179 | - $_POST['remove'][(int) $index] = (int) $spider_id; |
|
183 | + foreach ($_POST['remove'] as $index => $spider_id) { |
|
184 | + $_POST['remove'][(int) $index] = (int) $spider_id; |
|
185 | + } |
|
180 | 186 | |
181 | 187 | // Delete them all! |
182 | 188 | $smcFunc['db_query']('', ' |
@@ -215,8 +221,9 @@ discard block |
||
215 | 221 | ); |
216 | 222 | |
217 | 223 | $context['spider_last_seen'] = array(); |
218 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
219 | - $context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time']; |
|
224 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
225 | + $context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time']; |
|
226 | + } |
|
220 | 227 | $smcFunc['db_free_result']($request); |
221 | 228 | |
222 | 229 | createToken('admin-ser'); |
@@ -346,8 +353,9 @@ discard block |
||
346 | 353 | ) |
347 | 354 | ); |
348 | 355 | $spiders = array(); |
349 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
350 | - $spiders[$row['id_spider']] = $row; |
|
356 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
357 | + $spiders[$row['id_spider']] = $row; |
|
358 | + } |
|
351 | 359 | $smcFunc['db_free_result']($request); |
352 | 360 | |
353 | 361 | return $spiders; |
@@ -397,14 +405,15 @@ discard block |
||
397 | 405 | foreach ($ip_sets as $set) |
398 | 406 | { |
399 | 407 | $test = ip2range(trim($set)); |
400 | - if (!empty($test)) |
|
401 | - $ips[] = $set; |
|
408 | + if (!empty($test)) { |
|
409 | + $ips[] = $set; |
|
410 | + } |
|
402 | 411 | } |
403 | 412 | $ips = implode(',', $ips); |
404 | 413 | |
405 | 414 | // Goes in as it is... |
406 | - if ($context['id_spider']) |
|
407 | - $smcFunc['db_query']('', ' |
|
415 | + if ($context['id_spider']) { |
|
416 | + $smcFunc['db_query']('', ' |
|
408 | 417 | UPDATE {db_prefix}spiders |
409 | 418 | SET spider_name = {string:spider_name}, user_agent = {string:spider_agent}, |
410 | 419 | ip_info = {string:ip_info} |
@@ -416,8 +425,8 @@ discard block |
||
416 | 425 | 'ip_info' => $ips, |
417 | 426 | ) |
418 | 427 | ); |
419 | - else |
|
420 | - $smcFunc['db_insert']('insert', |
|
428 | + } else { |
|
429 | + $smcFunc['db_insert']('insert', |
|
421 | 430 | '{db_prefix}spiders', |
422 | 431 | array( |
423 | 432 | 'spider_name' => 'string', 'user_agent' => 'string', 'ip_info' => 'string', |
@@ -427,6 +436,7 @@ discard block |
||
427 | 436 | ), |
428 | 437 | array('id_spider') |
429 | 438 | ); |
439 | + } |
|
430 | 440 | |
431 | 441 | |
432 | 442 | cache_put_data('spider_search', null); |
@@ -454,13 +464,14 @@ discard block |
||
454 | 464 | 'current_spider' => $context['id_spider'], |
455 | 465 | ) |
456 | 466 | ); |
457 | - if ($row = $smcFunc['db_fetch_assoc']($request)) |
|
458 | - $context['spider'] = array( |
|
467 | + if ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
468 | + $context['spider'] = array( |
|
459 | 469 | 'id' => $row['id_spider'], |
460 | 470 | 'name' => $row['spider_name'], |
461 | 471 | 'agent' => $row['user_agent'], |
462 | 472 | 'ip_info' => $row['ip_info'], |
463 | 473 | ); |
474 | + } |
|
464 | 475 | $smcFunc['db_free_result']($request); |
465 | 476 | } |
466 | 477 | |
@@ -477,8 +488,9 @@ discard block |
||
477 | 488 | { |
478 | 489 | global $modSettings, $smcFunc; |
479 | 490 | |
480 | - if (isset($_SESSION['id_robot'])) |
|
481 | - unset($_SESSION['id_robot']); |
|
491 | + if (isset($_SESSION['id_robot'])) { |
|
492 | + unset($_SESSION['id_robot']); |
|
493 | + } |
|
482 | 494 | $_SESSION['robot_check'] = time(); |
483 | 495 | |
484 | 496 | // We cache the spider data for ten minutes if we can. |
@@ -492,15 +504,17 @@ discard block |
||
492 | 504 | ) |
493 | 505 | ); |
494 | 506 | $spider_data = array(); |
495 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
496 | - $spider_data[] = $row; |
|
507 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
508 | + $spider_data[] = $row; |
|
509 | + } |
|
497 | 510 | $smcFunc['db_free_result']($request); |
498 | 511 | |
499 | 512 | cache_put_data('spider_search', $spider_data, 600); |
500 | 513 | } |
501 | 514 | |
502 | - if (empty($spider_data)) |
|
503 | - return false; |
|
515 | + if (empty($spider_data)) { |
|
516 | + return false; |
|
517 | + } |
|
504 | 518 | |
505 | 519 | // Only do these bits once. |
506 | 520 | $ci_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']); |
@@ -508,33 +522,38 @@ discard block |
||
508 | 522 | foreach ($spider_data as $spider) |
509 | 523 | { |
510 | 524 | // User agent is easy. |
511 | - if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false) |
|
512 | - $_SESSION['id_robot'] = $spider['id_spider']; |
|
525 | + if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false) { |
|
526 | + $_SESSION['id_robot'] = $spider['id_spider']; |
|
527 | + } |
|
513 | 528 | // IP stuff is harder. |
514 | 529 | elseif ($_SERVER['REMOTE_ADDR']) |
515 | 530 | { |
516 | 531 | $ips = explode(',', $spider['ip_info']); |
517 | 532 | foreach ($ips as $ip) |
518 | 533 | { |
519 | - if ($ip === '') |
|
520 | - continue; |
|
534 | + if ($ip === '') { |
|
535 | + continue; |
|
536 | + } |
|
521 | 537 | |
522 | 538 | $ip = ip2range($ip); |
523 | 539 | if (!empty($ip)) |
524 | 540 | { |
525 | - if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR'])) |
|
526 | - $_SESSION['id_robot'] = $spider['id_spider']; |
|
541 | + if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR'])) { |
|
542 | + $_SESSION['id_robot'] = $spider['id_spider']; |
|
543 | + } |
|
527 | 544 | } |
528 | 545 | } |
529 | 546 | } |
530 | 547 | |
531 | - if (isset($_SESSION['id_robot'])) |
|
532 | - break; |
|
548 | + if (isset($_SESSION['id_robot'])) { |
|
549 | + break; |
|
550 | + } |
|
533 | 551 | } |
534 | 552 | |
535 | 553 | // If this is low server tracking then log the spider here as opposed to the main logging function. |
536 | - if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot'])) |
|
537 | - logSpider(); |
|
554 | + if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot'])) { |
|
555 | + logSpider(); |
|
556 | + } |
|
538 | 557 | |
539 | 558 | return !empty($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0; |
540 | 559 | } |
@@ -548,8 +567,9 @@ discard block |
||
548 | 567 | { |
549 | 568 | global $smcFunc, $modSettings, $context; |
550 | 569 | |
551 | - if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot'])) |
|
552 | - return; |
|
570 | + if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot'])) { |
|
571 | + return; |
|
572 | + } |
|
553 | 573 | |
554 | 574 | // Attempt to update today's entry. |
555 | 575 | if ($modSettings['spider_mode'] == 1) |
@@ -590,9 +610,9 @@ discard block |
||
590 | 610 | $url = $_GET + array('USER_AGENT' => $_SERVER['HTTP_USER_AGENT']); |
591 | 611 | unset($url['sesc'], $url[$context['session_var']]); |
592 | 612 | $url = json_encode($url); |
613 | + } else { |
|
614 | + $url = ''; |
|
593 | 615 | } |
594 | - else |
|
595 | - $url = ''; |
|
596 | 616 | |
597 | 617 | $smcFunc['db_insert']('insert', |
598 | 618 | '{db_prefix}log_spider_hits', |
@@ -620,12 +640,14 @@ discard block |
||
620 | 640 | ) |
621 | 641 | ); |
622 | 642 | $spider_hits = array(); |
623 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
624 | - $spider_hits[] = $row; |
|
643 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
644 | + $spider_hits[] = $row; |
|
645 | + } |
|
625 | 646 | $smcFunc['db_free_result']($request); |
626 | 647 | |
627 | - if (empty($spider_hits)) |
|
628 | - return; |
|
648 | + if (empty($spider_hits)) { |
|
649 | + return; |
|
650 | + } |
|
629 | 651 | |
630 | 652 | // Attempt to update the master data. |
631 | 653 | $stat_inserts = array(); |
@@ -646,18 +668,20 @@ discard block |
||
646 | 668 | 'hits' => $stat['num_hits'], |
647 | 669 | ) |
648 | 670 | ); |
649 | - if ($smcFunc['db_affected_rows']() == 0) |
|
650 | - $stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']); |
|
671 | + if ($smcFunc['db_affected_rows']() == 0) { |
|
672 | + $stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']); |
|
673 | + } |
|
651 | 674 | } |
652 | 675 | |
653 | 676 | // New stats? |
654 | - if (!empty($stat_inserts)) |
|
655 | - $smcFunc['db_insert']('ignore', |
|
677 | + if (!empty($stat_inserts)) { |
|
678 | + $smcFunc['db_insert']('ignore', |
|
656 | 679 | '{db_prefix}log_spider_stats', |
657 | 680 | array('stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'), |
658 | 681 | $stat_inserts, |
659 | 682 | array('stat_date', 'id_spider') |
660 | 683 | ); |
684 | + } |
|
661 | 685 | |
662 | 686 | // All processed. |
663 | 687 | $smcFunc['db_query']('', ' |
@@ -700,8 +724,7 @@ discard block |
||
700 | 724 | 'delete_period' => $deleteTime, |
701 | 725 | ) |
702 | 726 | ); |
703 | - } |
|
704 | - else |
|
727 | + } else |
|
705 | 728 | { |
706 | 729 | // Deleting all of them |
707 | 730 | $smcFunc['db_query']('', ' |
@@ -791,10 +814,11 @@ discard block |
||
791 | 814 | foreach ($context['spider_logs']['rows'] as $k => $row) |
792 | 815 | { |
793 | 816 | // Feature disabled? |
794 | - if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3) |
|
795 | - $context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>'; |
|
796 | - else |
|
797 | - $urls[$k] = array($row['data']['viewing']['value'], -1); |
|
817 | + if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3) { |
|
818 | + $context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>'; |
|
819 | + } else { |
|
820 | + $urls[$k] = array($row['data']['viewing']['value'], -1); |
|
821 | + } |
|
798 | 822 | } |
799 | 823 | |
800 | 824 | // Now stick in the new URLs. |
@@ -836,8 +860,9 @@ discard block |
||
836 | 860 | ) |
837 | 861 | ); |
838 | 862 | $spider_logs = array(); |
839 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
840 | - $spider_logs[] = $row; |
|
863 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
864 | + $spider_logs[] = $row; |
|
865 | + } |
|
841 | 866 | $smcFunc['db_free_result']($request); |
842 | 867 | |
843 | 868 | return $spider_logs; |
@@ -913,14 +938,18 @@ discard block |
||
913 | 938 | |
914 | 939 | // Prepare the dates for the drop down. |
915 | 940 | $date_choices = array(); |
916 | - for ($y = $min_year; $y <= $max_year; $y++) |
|
917 | - for ($m = 1; $m <= 12; $m++) |
|
941 | + for ($y = $min_year; $y <= $max_year; $y++) { |
|
942 | + for ($m = 1; |
|
943 | + } |
|
944 | + $m <= 12; $m++) |
|
918 | 945 | { |
919 | 946 | // This doesn't count? |
920 | - if ($y == $min_year && $m < $min_month) |
|
921 | - continue; |
|
922 | - if ($y == $max_year && $m > $max_month) |
|
923 | - break; |
|
947 | + if ($y == $min_year && $m < $min_month) { |
|
948 | + continue; |
|
949 | + } |
|
950 | + if ($y == $max_year && $m > $max_month) { |
|
951 | + break; |
|
952 | + } |
|
924 | 953 | |
925 | 954 | $date_choices[$y . $m] = $txt['months_short'][$m] . ' ' . $y; |
926 | 955 | } |
@@ -933,13 +962,14 @@ discard block |
||
933 | 962 | ' . $txt['spider_stats_select_month'] . ': |
934 | 963 | <select name="new_date" onchange="document.spider_stat_list.submit();">'; |
935 | 964 | |
936 | - if (empty($date_choices)) |
|
937 | - $date_select .= ' |
|
965 | + if (empty($date_choices)) { |
|
966 | + $date_select .= ' |
|
938 | 967 | <option></option>'; |
939 | - else |
|
940 | - foreach ($date_choices as $id => $text) |
|
968 | + } else { |
|
969 | + foreach ($date_choices as $id => $text) |
|
941 | 970 | $date_select .= ' |
942 | 971 | <option value="' . $id . '"' . ($current_date == $id ? ' selected' : '') . '>' . $text . '</option>'; |
972 | + } |
|
943 | 973 | |
944 | 974 | $date_select .= ' |
945 | 975 | </select> |
@@ -1063,8 +1093,9 @@ discard block |
||
1063 | 1093 | ) |
1064 | 1094 | ); |
1065 | 1095 | $spider_stats = array(); |
1066 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1067 | - $spider_stats[] = $row; |
|
1096 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1097 | + $spider_stats[] = $row; |
|
1098 | + } |
|
1068 | 1099 | $smcFunc['db_free_result']($request); |
1069 | 1100 | |
1070 | 1101 | return $spider_stats; |
@@ -1105,8 +1136,9 @@ discard block |
||
1105 | 1136 | array() |
1106 | 1137 | ); |
1107 | 1138 | $spiders = array(); |
1108 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1109 | - $spiders[$row['id_spider']] = $row['spider_name']; |
|
1139 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1140 | + $spiders[$row['id_spider']] = $row['spider_name']; |
|
1141 | + } |
|
1110 | 1142 | $smcFunc['db_free_result']($request); |
1111 | 1143 | |
1112 | 1144 | updateSettings(array('spider_name_cache' => json_encode($spiders))); |
@@ -14,8 +14,9 @@ discard block |
||
14 | 14 | * @version 2.1 Beta 3 |
15 | 15 | */ |
16 | 16 | |
17 | -if (!defined('SMF')) |
|
17 | +if (!defined('SMF')) { |
|
18 | 18 | die('No direct access...'); |
19 | +} |
|
19 | 20 | |
20 | 21 | /** |
21 | 22 | * Check if the user is who he/she says he is |
@@ -42,12 +43,14 @@ discard block |
||
42 | 43 | $refreshTime = isset($_GET['xml']) ? 4200 : 3600; |
43 | 44 | |
44 | 45 | // Is the security option off? |
45 | - if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) |
|
46 | - return; |
|
46 | + if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) { |
|
47 | + return; |
|
48 | + } |
|
47 | 49 | |
48 | 50 | // Or are they already logged in?, Moderator or admin session is need for this area |
49 | - if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time())) |
|
50 | - return; |
|
51 | + if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time())) { |
|
52 | + return; |
|
53 | + } |
|
51 | 54 | |
52 | 55 | require_once($sourcedir . '/Subs-Auth.php'); |
53 | 56 | |
@@ -55,8 +58,9 @@ discard block |
||
55 | 58 | if (isset($_POST[$type. '_pass'])) |
56 | 59 | { |
57 | 60 | // Check to ensure we're forcing SSL for authentication |
58 | - if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) |
|
59 | - fatal_lang_error('login_ssl_required'); |
|
61 | + if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) { |
|
62 | + fatal_lang_error('login_ssl_required'); |
|
63 | + } |
|
60 | 64 | |
61 | 65 | checkSession(); |
62 | 66 | |
@@ -72,17 +76,19 @@ discard block |
||
72 | 76 | } |
73 | 77 | |
74 | 78 | // Better be sure to remember the real referer |
75 | - if (empty($_SESSION['request_referer'])) |
|
76 | - $_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
77 | - elseif (empty($_POST)) |
|
78 | - unset($_SESSION['request_referer']); |
|
79 | + if (empty($_SESSION['request_referer'])) { |
|
80 | + $_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
81 | + } elseif (empty($_POST)) { |
|
82 | + unset($_SESSION['request_referer']); |
|
83 | + } |
|
79 | 84 | |
80 | 85 | // Need to type in a password for that, man. |
81 | - if (!isset($_GET['xml'])) |
|
82 | - adminLogin($type); |
|
83 | - else |
|
84 | - return 'session_verify_fail'; |
|
85 | -} |
|
86 | + if (!isset($_GET['xml'])) { |
|
87 | + adminLogin($type); |
|
88 | + } else { |
|
89 | + return 'session_verify_fail'; |
|
90 | + } |
|
91 | + } |
|
86 | 92 | |
87 | 93 | /** |
88 | 94 | * Require a user who is logged in. (not a guest.) |
@@ -96,25 +102,30 @@ discard block |
||
96 | 102 | global $user_info, $txt, $context, $scripturl, $modSettings; |
97 | 103 | |
98 | 104 | // Luckily, this person isn't a guest. |
99 | - if (!$user_info['is_guest']) |
|
100 | - return; |
|
105 | + if (!$user_info['is_guest']) { |
|
106 | + return; |
|
107 | + } |
|
101 | 108 | |
102 | 109 | // Log what they were trying to do didn't work) |
103 | - if (!empty($modSettings['who_enabled'])) |
|
104 | - $_GET['error'] = 'guest_login'; |
|
110 | + if (!empty($modSettings['who_enabled'])) { |
|
111 | + $_GET['error'] = 'guest_login'; |
|
112 | + } |
|
105 | 113 | writeLog(true); |
106 | 114 | |
107 | 115 | // Just die. |
108 | - if (isset($_REQUEST['xml'])) |
|
109 | - obExit(false); |
|
116 | + if (isset($_REQUEST['xml'])) { |
|
117 | + obExit(false); |
|
118 | + } |
|
110 | 119 | |
111 | 120 | // Attempt to detect if they came from dlattach. |
112 | - if (SMF != 'SSI' && empty($context['theme_loaded'])) |
|
113 | - loadTheme(); |
|
121 | + if (SMF != 'SSI' && empty($context['theme_loaded'])) { |
|
122 | + loadTheme(); |
|
123 | + } |
|
114 | 124 | |
115 | 125 | // Never redirect to an attachment |
116 | - if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) |
|
117 | - $_SESSION['login_url'] = $_SERVER['REQUEST_URL']; |
|
126 | + if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) { |
|
127 | + $_SESSION['login_url'] = $_SERVER['REQUEST_URL']; |
|
128 | + } |
|
118 | 129 | |
119 | 130 | // Load the Login template and language file. |
120 | 131 | loadLanguage('Login'); |
@@ -124,8 +135,7 @@ discard block |
||
124 | 135 | { |
125 | 136 | $_SESSION['login_url'] = $scripturl . '?' . $_SERVER['QUERY_STRING']; |
126 | 137 | redirectexit('action=login'); |
127 | - } |
|
128 | - else |
|
138 | + } else |
|
129 | 139 | { |
130 | 140 | loadTemplate('Login'); |
131 | 141 | $context['sub_template'] = 'kick_guest'; |
@@ -155,8 +165,9 @@ discard block |
||
155 | 165 | global $sourcedir, $cookiename, $user_settings, $smcFunc; |
156 | 166 | |
157 | 167 | // You cannot be banned if you are an admin - doesn't help if you log out. |
158 | - if ($user_info['is_admin']) |
|
159 | - return; |
|
168 | + if ($user_info['is_admin']) { |
|
169 | + return; |
|
170 | + } |
|
160 | 171 | |
161 | 172 | // Only check the ban every so often. (to reduce load.) |
162 | 173 | if ($forceCheck || !isset($_SESSION['ban']) || empty($modSettings['banLastUpdated']) || ($_SESSION['ban']['last_checked'] < $modSettings['banLastUpdated']) || $_SESSION['ban']['id_member'] != $user_info['id'] || $_SESSION['ban']['ip'] != $user_info['ip'] || $_SESSION['ban']['ip2'] != $user_info['ip2'] || (isset($user_info['email'], $_SESSION['ban']['email']) && $_SESSION['ban']['email'] != $user_info['email'])) |
@@ -177,8 +188,9 @@ discard block |
||
177 | 188 | // Check both IP addresses. |
178 | 189 | foreach (array('ip', 'ip2') as $ip_number) |
179 | 190 | { |
180 | - if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) |
|
181 | - continue; |
|
191 | + if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) { |
|
192 | + continue; |
|
193 | + } |
|
182 | 194 | $ban_query[] = ' {inet:'.$ip_number.'} BETWEEN bi.ip_low and bi.ip_high'; |
183 | 195 | $ban_query_vars[$ip_number] = $user_info[$ip_number]; |
184 | 196 | // IP was valid, maybe there's also a hostname... |
@@ -228,24 +240,28 @@ discard block |
||
228 | 240 | // Store every type of ban that applies to you in your session. |
229 | 241 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
230 | 242 | { |
231 | - foreach ($restrictions as $restriction) |
|
232 | - if (!empty($row[$restriction])) |
|
243 | + foreach ($restrictions as $restriction) { |
|
244 | + if (!empty($row[$restriction])) |
|
233 | 245 | { |
234 | 246 | $_SESSION['ban'][$restriction]['reason'] = $row['reason']; |
247 | + } |
|
235 | 248 | $_SESSION['ban'][$restriction]['ids'][] = $row['id_ban']; |
236 | - if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time']))) |
|
237 | - $_SESSION['ban']['expire_time'] = $row['expire_time']; |
|
249 | + if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time']))) { |
|
250 | + $_SESSION['ban']['expire_time'] = $row['expire_time']; |
|
251 | + } |
|
238 | 252 | |
239 | - if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email'])) |
|
240 | - $flag_is_activated = true; |
|
253 | + if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email'])) { |
|
254 | + $flag_is_activated = true; |
|
255 | + } |
|
241 | 256 | } |
242 | 257 | } |
243 | 258 | $smcFunc['db_free_result']($request); |
244 | 259 | } |
245 | 260 | |
246 | 261 | // Mark the cannot_access and cannot_post bans as being 'hit'. |
247 | - if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login'])) |
|
248 | - log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array())); |
|
262 | + if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login'])) { |
|
263 | + log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array())); |
|
264 | + } |
|
249 | 265 | |
250 | 266 | // If for whatever reason the is_activated flag seems wrong, do a little work to clear it up. |
251 | 267 | if ($user_info['id'] && (($user_settings['is_activated'] >= 10 && !$flag_is_activated) |
@@ -260,8 +276,9 @@ discard block |
||
260 | 276 | if (!isset($_SESSION['ban']['cannot_access']) && !empty($_COOKIE[$cookiename . '_'])) |
261 | 277 | { |
262 | 278 | $bans = explode(',', $_COOKIE[$cookiename . '_']); |
263 | - foreach ($bans as $key => $value) |
|
264 | - $bans[$key] = (int) $value; |
|
279 | + foreach ($bans as $key => $value) { |
|
280 | + $bans[$key] = (int) $value; |
|
281 | + } |
|
265 | 282 | $request = $smcFunc['db_query']('', ' |
266 | 283 | SELECT bi.id_ban, bg.reason |
267 | 284 | FROM {db_prefix}ban_items AS bi |
@@ -297,14 +314,15 @@ discard block |
||
297 | 314 | if (isset($_SESSION['ban']['cannot_access'])) |
298 | 315 | { |
299 | 316 | // We don't wanna see you! |
300 | - if (!$user_info['is_guest']) |
|
301 | - $smcFunc['db_query']('', ' |
|
317 | + if (!$user_info['is_guest']) { |
|
318 | + $smcFunc['db_query']('', ' |
|
302 | 319 | DELETE FROM {db_prefix}log_online |
303 | 320 | WHERE id_member = {int:current_member}', |
304 | 321 | array( |
305 | 322 | 'current_member' => $user_info['id'], |
306 | 323 | ) |
307 | 324 | ); |
325 | + } |
|
308 | 326 | |
309 | 327 | // 'Log' the user out. Can't have any funny business... (save the name!) |
310 | 328 | $old_name = isset($user_info['name']) && $user_info['name'] != '' ? $user_info['name'] : $txt['guest_title']; |
@@ -390,9 +408,10 @@ discard block |
||
390 | 408 | } |
391 | 409 | |
392 | 410 | // Fix up the banning permissions. |
393 | - if (isset($user_info['permissions'])) |
|
394 | - banPermissions(); |
|
395 | -} |
|
411 | + if (isset($user_info['permissions'])) { |
|
412 | + banPermissions(); |
|
413 | + } |
|
414 | + } |
|
396 | 415 | |
397 | 416 | /** |
398 | 417 | * Fix permissions according to ban status. |
@@ -403,8 +422,9 @@ discard block |
||
403 | 422 | global $user_info, $sourcedir, $modSettings, $context; |
404 | 423 | |
405 | 424 | // Somehow they got here, at least take away all permissions... |
406 | - if (isset($_SESSION['ban']['cannot_access'])) |
|
407 | - $user_info['permissions'] = array(); |
|
425 | + if (isset($_SESSION['ban']['cannot_access'])) { |
|
426 | + $user_info['permissions'] = array(); |
|
427 | + } |
|
408 | 428 | // Okay, well, you can watch, but don't touch a thing. |
409 | 429 | elseif (isset($_SESSION['ban']['cannot_post']) || (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $user_info['warning'])) |
410 | 430 | { |
@@ -446,44 +466,45 @@ discard block |
||
446 | 466 | call_integration_hook('integrate_warn_permissions', array(&$permission_change)); |
447 | 467 | foreach ($permission_change as $old => $new) |
448 | 468 | { |
449 | - if (!in_array($old, $user_info['permissions'])) |
|
450 | - unset($permission_change[$old]); |
|
451 | - else |
|
452 | - $user_info['permissions'][] = $new; |
|
469 | + if (!in_array($old, $user_info['permissions'])) { |
|
470 | + unset($permission_change[$old]); |
|
471 | + } else { |
|
472 | + $user_info['permissions'][] = $new; |
|
473 | + } |
|
453 | 474 | } |
454 | 475 | $user_info['permissions'] = array_diff($user_info['permissions'], array_keys($permission_change)); |
455 | 476 | } |
456 | 477 | |
457 | 478 | // @todo Find a better place to call this? Needs to be after permissions loaded! |
458 | 479 | // Finally, some bits we cache in the session because it saves queries. |
459 | - if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id']) |
|
460 | - $user_info['mod_cache'] = $_SESSION['mc']; |
|
461 | - else |
|
480 | + if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id']) { |
|
481 | + $user_info['mod_cache'] = $_SESSION['mc']; |
|
482 | + } else |
|
462 | 483 | { |
463 | 484 | require_once($sourcedir . '/Subs-Auth.php'); |
464 | 485 | rebuildModCache(); |
465 | 486 | } |
466 | 487 | |
467 | 488 | // Now that we have the mod cache taken care of lets setup a cache for the number of mod reports still open |
468 | - if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) |
|
469 | - $context['open_mod_reports'] = $_SESSION['rc']['reports']; |
|
470 | - elseif ($_SESSION['mc']['bq'] != '0=1') |
|
489 | + if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) { |
|
490 | + $context['open_mod_reports'] = $_SESSION['rc']['reports']; |
|
491 | + } elseif ($_SESSION['mc']['bq'] != '0=1') |
|
471 | 492 | { |
472 | 493 | require_once($sourcedir . '/Subs-ReportedContent.php'); |
473 | 494 | recountOpenReports('posts'); |
495 | + } else { |
|
496 | + $context['open_mod_reports'] = 0; |
|
474 | 497 | } |
475 | - else |
|
476 | - $context['open_mod_reports'] = 0; |
|
477 | 498 | |
478 | - if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) |
|
479 | - $context['open_member_reports'] = !empty($_SESSION['rc']['member_reports']) ? $_SESSION['rc']['member_reports'] : 0; |
|
480 | - elseif (allowedTo('moderate_forum')) |
|
499 | + if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) { |
|
500 | + $context['open_member_reports'] = !empty($_SESSION['rc']['member_reports']) ? $_SESSION['rc']['member_reports'] : 0; |
|
501 | + } elseif (allowedTo('moderate_forum')) |
|
481 | 502 | { |
482 | 503 | require_once($sourcedir . '/Subs-ReportedContent.php'); |
483 | 504 | recountOpenReports('members'); |
505 | + } else { |
|
506 | + $context['open_member_reports'] = 0; |
|
484 | 507 | } |
485 | - else |
|
486 | - $context['open_member_reports'] = 0; |
|
487 | 508 | |
488 | 509 | } |
489 | 510 | |
@@ -500,8 +521,9 @@ discard block |
||
500 | 521 | global $user_info, $smcFunc; |
501 | 522 | |
502 | 523 | // Don't log web accelerators, it's very confusing... |
503 | - if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') |
|
504 | - return; |
|
524 | + if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') { |
|
525 | + return; |
|
526 | + } |
|
505 | 527 | |
506 | 528 | $smcFunc['db_insert']('', |
507 | 529 | '{db_prefix}log_banned', |
@@ -511,8 +533,8 @@ discard block |
||
511 | 533 | ); |
512 | 534 | |
513 | 535 | // One extra point for these bans. |
514 | - if (!empty($ban_ids)) |
|
515 | - $smcFunc['db_query']('', ' |
|
536 | + if (!empty($ban_ids)) { |
|
537 | + $smcFunc['db_query']('', ' |
|
516 | 538 | UPDATE {db_prefix}ban_items |
517 | 539 | SET hits = hits + 1 |
518 | 540 | WHERE id_ban IN ({array_int:ban_ids})', |
@@ -520,7 +542,8 @@ discard block |
||
520 | 542 | 'ban_ids' => $ban_ids, |
521 | 543 | ) |
522 | 544 | ); |
523 | -} |
|
545 | + } |
|
546 | + } |
|
524 | 547 | |
525 | 548 | /** |
526 | 549 | * Checks if a given email address might be banned. |
@@ -536,8 +559,9 @@ discard block |
||
536 | 559 | global $txt, $smcFunc; |
537 | 560 | |
538 | 561 | // Can't ban an empty email |
539 | - if (empty($email) || trim($email) == '') |
|
540 | - return; |
|
562 | + if (empty($email) || trim($email) == '') { |
|
563 | + return; |
|
564 | + } |
|
541 | 565 | |
542 | 566 | // Let's start with the bans based on your IP/hostname/memberID... |
543 | 567 | $ban_ids = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['ids'] : array(); |
@@ -610,16 +634,18 @@ discard block |
||
610 | 634 | if ($type == 'post') |
611 | 635 | { |
612 | 636 | $check = isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null); |
613 | - if ($check !== $sc) |
|
614 | - $error = 'session_timeout'; |
|
637 | + if ($check !== $sc) { |
|
638 | + $error = 'session_timeout'; |
|
639 | + } |
|
615 | 640 | } |
616 | 641 | |
617 | 642 | // How about $_GET['sesc']? |
618 | 643 | elseif ($type == 'get') |
619 | 644 | { |
620 | 645 | $check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : null); |
621 | - if ($check !== $sc) |
|
622 | - $error = 'session_verify_fail'; |
|
646 | + if ($check !== $sc) { |
|
647 | + $error = 'session_verify_fail'; |
|
648 | + } |
|
623 | 649 | } |
624 | 650 | |
625 | 651 | // Or can it be in either? |
@@ -627,13 +653,15 @@ discard block |
||
627 | 653 | { |
628 | 654 | $check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : (isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null))); |
629 | 655 | |
630 | - if ($check !== $sc) |
|
631 | - $error = 'session_verify_fail'; |
|
656 | + if ($check !== $sc) { |
|
657 | + $error = 'session_verify_fail'; |
|
658 | + } |
|
632 | 659 | } |
633 | 660 | |
634 | 661 | // Verify that they aren't changing user agents on us - that could be bad. |
635 | - if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA'])) |
|
636 | - $error = 'session_verify_fail'; |
|
662 | + if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA'])) { |
|
663 | + $error = 'session_verify_fail'; |
|
664 | + } |
|
637 | 665 | |
638 | 666 | // Make sure a page with session check requirement is not being prefetched. |
639 | 667 | if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') |
@@ -644,30 +672,35 @@ discard block |
||
644 | 672 | } |
645 | 673 | |
646 | 674 | // Check the referring site - it should be the same server at least! |
647 | - if (isset($_SESSION['request_referer'])) |
|
648 | - $referrer = $_SESSION['request_referer']; |
|
649 | - else |
|
650 | - $referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
675 | + if (isset($_SESSION['request_referer'])) { |
|
676 | + $referrer = $_SESSION['request_referer']; |
|
677 | + } else { |
|
678 | + $referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
679 | + } |
|
651 | 680 | if (!empty($referrer['host'])) |
652 | 681 | { |
653 | - if (strpos($_SERVER['HTTP_HOST'], ':') !== false) |
|
654 | - $real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':')); |
|
655 | - else |
|
656 | - $real_host = $_SERVER['HTTP_HOST']; |
|
682 | + if (strpos($_SERVER['HTTP_HOST'], ':') !== false) { |
|
683 | + $real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':')); |
|
684 | + } else { |
|
685 | + $real_host = $_SERVER['HTTP_HOST']; |
|
686 | + } |
|
657 | 687 | |
658 | 688 | $parsed_url = parse_url($boardurl); |
659 | 689 | |
660 | 690 | // Are global cookies on? If so, let's check them ;). |
661 | 691 | if (!empty($modSettings['globalCookies'])) |
662 | 692 | { |
663 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1) |
|
664 | - $parsed_url['host'] = $parts[1]; |
|
693 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1) { |
|
694 | + $parsed_url['host'] = $parts[1]; |
|
695 | + } |
|
665 | 696 | |
666 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1) |
|
667 | - $referrer['host'] = $parts[1]; |
|
697 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1) { |
|
698 | + $referrer['host'] = $parts[1]; |
|
699 | + } |
|
668 | 700 | |
669 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1) |
|
670 | - $real_host = $parts[1]; |
|
701 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1) { |
|
702 | + $real_host = $parts[1]; |
|
703 | + } |
|
671 | 704 | } |
672 | 705 | |
673 | 706 | // Okay: referrer must either match parsed_url or real_host. |
@@ -685,12 +718,14 @@ discard block |
||
685 | 718 | $log_error = true; |
686 | 719 | } |
687 | 720 | |
688 | - if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') |
|
689 | - fatal_error('Sound the alarm! It\'s a hacker! Close the castle gates!!', false); |
|
721 | + if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') { |
|
722 | + fatal_error('Sound the alarm! It\'s a hacker! Close the castle gates!!', false); |
|
723 | + } |
|
690 | 724 | |
691 | 725 | // Everything is ok, return an empty string. |
692 | - if (!isset($error)) |
|
693 | - return ''; |
|
726 | + if (!isset($error)) { |
|
727 | + return ''; |
|
728 | + } |
|
694 | 729 | // A session error occurred, show the error. |
695 | 730 | elseif ($is_fatal) |
696 | 731 | { |
@@ -699,13 +734,14 @@ discard block |
||
699 | 734 | ob_end_clean(); |
700 | 735 | header('HTTP/1.1 403 Forbidden - Session timeout'); |
701 | 736 | die; |
737 | + } else { |
|
738 | + fatal_lang_error($error, isset($log_error) ? 'user' : false); |
|
702 | 739 | } |
703 | - else |
|
704 | - fatal_lang_error($error, isset($log_error) ? 'user' : false); |
|
705 | 740 | } |
706 | 741 | // A session error occurred, return the error to the calling function. |
707 | - else |
|
708 | - return $error; |
|
742 | + else { |
|
743 | + return $error; |
|
744 | + } |
|
709 | 745 | |
710 | 746 | // We really should never fall through here, for very important reasons. Let's make sure. |
711 | 747 | trigger_error('Hacking attempt...', E_USER_ERROR); |
@@ -721,10 +757,9 @@ discard block |
||
721 | 757 | { |
722 | 758 | global $modSettings; |
723 | 759 | |
724 | - if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action]) |
|
725 | - return true; |
|
726 | - |
|
727 | - else |
|
760 | + if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action]) { |
|
761 | + return true; |
|
762 | + } else |
|
728 | 763 | { |
729 | 764 | $token = md5(mt_rand() . session_id() . (string) microtime() . $modSettings['rand_seed']); |
730 | 765 | $_SESSION['confirm_' . $action] = md5($token . $_SERVER['HTTP_USER_AGENT']); |
@@ -775,9 +810,9 @@ discard block |
||
775 | 810 | $return = $_SESSION['token'][$type . '-' . $action][3]; |
776 | 811 | unset($_SESSION['token'][$type . '-' . $action]); |
777 | 812 | return $return; |
813 | + } else { |
|
814 | + return ''; |
|
778 | 815 | } |
779 | - else |
|
780 | - return ''; |
|
781 | 816 | } |
782 | 817 | |
783 | 818 | // This nasty piece of code validates a token. |
@@ -808,12 +843,14 @@ discard block |
||
808 | 843 | fatal_lang_error('token_verify_fail', false); |
809 | 844 | } |
810 | 845 | // Remove this token as its useless |
811 | - else |
|
812 | - unset($_SESSION['token'][$type . '-' . $action]); |
|
846 | + else { |
|
847 | + unset($_SESSION['token'][$type . '-' . $action]); |
|
848 | + } |
|
813 | 849 | |
814 | 850 | // Randomly check if we should remove some older tokens. |
815 | - if (mt_rand(0, 138) == 23) |
|
816 | - cleanTokens(); |
|
851 | + if (mt_rand(0, 138) == 23) { |
|
852 | + cleanTokens(); |
|
853 | + } |
|
817 | 854 | |
818 | 855 | return false; |
819 | 856 | } |
@@ -828,14 +865,16 @@ discard block |
||
828 | 865 | function cleanTokens($complete = false) |
829 | 866 | { |
830 | 867 | // We appreciate cleaning up after yourselves. |
831 | - if (!isset($_SESSION['token'])) |
|
832 | - return; |
|
868 | + if (!isset($_SESSION['token'])) { |
|
869 | + return; |
|
870 | + } |
|
833 | 871 | |
834 | 872 | // Clean up tokens, trying to give enough time still. |
835 | - foreach ($_SESSION['token'] as $key => $data) |
|
836 | - if ($data[2] + 10800 < time() || $complete) |
|
873 | + foreach ($_SESSION['token'] as $key => $data) { |
|
874 | + if ($data[2] + 10800 < time() || $complete) |
|
837 | 875 | unset($_SESSION['token'][$key]); |
838 | -} |
|
876 | + } |
|
877 | + } |
|
839 | 878 | |
840 | 879 | /** |
841 | 880 | * Check whether a form has been submitted twice. |
@@ -853,37 +892,40 @@ discard block |
||
853 | 892 | { |
854 | 893 | global $context; |
855 | 894 | |
856 | - if (!isset($_SESSION['forms'])) |
|
857 | - $_SESSION['forms'] = array(); |
|
895 | + if (!isset($_SESSION['forms'])) { |
|
896 | + $_SESSION['forms'] = array(); |
|
897 | + } |
|
858 | 898 | |
859 | 899 | // Register a form number and store it in the session stack. (use this on the page that has the form.) |
860 | 900 | if ($action == 'register') |
861 | 901 | { |
862 | 902 | $context['form_sequence_number'] = 0; |
863 | - while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms'])) |
|
864 | - $context['form_sequence_number'] = mt_rand(1, 16000000); |
|
903 | + while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms'])) { |
|
904 | + $context['form_sequence_number'] = mt_rand(1, 16000000); |
|
905 | + } |
|
865 | 906 | } |
866 | 907 | // Check whether the submitted number can be found in the session. |
867 | 908 | elseif ($action == 'check') |
868 | 909 | { |
869 | - if (!isset($_REQUEST['seqnum'])) |
|
870 | - return true; |
|
871 | - elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
910 | + if (!isset($_REQUEST['seqnum'])) { |
|
911 | + return true; |
|
912 | + } elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
872 | 913 | { |
873 | 914 | $_SESSION['forms'][] = (int) $_REQUEST['seqnum']; |
874 | 915 | return true; |
916 | + } elseif ($is_fatal) { |
|
917 | + fatal_lang_error('error_form_already_submitted', false); |
|
918 | + } else { |
|
919 | + return false; |
|
875 | 920 | } |
876 | - elseif ($is_fatal) |
|
877 | - fatal_lang_error('error_form_already_submitted', false); |
|
878 | - else |
|
879 | - return false; |
|
880 | 921 | } |
881 | 922 | // Don't check, just free the stack number. |
882 | - elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
883 | - $_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum'])); |
|
884 | - elseif ($action != 'free') |
|
885 | - trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING); |
|
886 | -} |
|
923 | + elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) { |
|
924 | + $_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum'])); |
|
925 | + } elseif ($action != 'free') { |
|
926 | + trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING); |
|
927 | + } |
|
928 | + } |
|
887 | 929 | |
888 | 930 | /** |
889 | 931 | * Check the user's permissions. |
@@ -900,16 +942,19 @@ discard block |
||
900 | 942 | global $user_info, $smcFunc; |
901 | 943 | |
902 | 944 | // You're always allowed to do nothing. (unless you're a working man, MR. LAZY :P!) |
903 | - if (empty($permission)) |
|
904 | - return true; |
|
945 | + if (empty($permission)) { |
|
946 | + return true; |
|
947 | + } |
|
905 | 948 | |
906 | 949 | // You're never allowed to do something if your data hasn't been loaded yet! |
907 | - if (empty($user_info)) |
|
908 | - return false; |
|
950 | + if (empty($user_info)) { |
|
951 | + return false; |
|
952 | + } |
|
909 | 953 | |
910 | 954 | // Administrators are supermen :P. |
911 | - if ($user_info['is_admin']) |
|
912 | - return true; |
|
955 | + if ($user_info['is_admin']) { |
|
956 | + return true; |
|
957 | + } |
|
913 | 958 | |
914 | 959 | // Let's ensure this is an array. |
915 | 960 | $permission = (array)$permission; |
@@ -917,14 +962,16 @@ discard block |
||
917 | 962 | // Are we checking the _current_ board, or some other boards? |
918 | 963 | if ($boards === null) |
919 | 964 | { |
920 | - if (count(array_intersect($permission, $user_info['permissions'])) != 0) |
|
921 | - return true; |
|
965 | + if (count(array_intersect($permission, $user_info['permissions'])) != 0) { |
|
966 | + return true; |
|
967 | + } |
|
922 | 968 | // You aren't allowed, by default. |
923 | - else |
|
924 | - return false; |
|
969 | + else { |
|
970 | + return false; |
|
971 | + } |
|
972 | + } elseif (!is_array($boards)) { |
|
973 | + $boards = array($boards); |
|
925 | 974 | } |
926 | - elseif (!is_array($boards)) |
|
927 | - $boards = array($boards); |
|
928 | 975 | |
929 | 976 | $request = $smcFunc['db_query']('', ' |
930 | 977 | SELECT MIN(bp.add_deny) AS add_deny |
@@ -947,12 +994,14 @@ discard block |
||
947 | 994 | ); |
948 | 995 | |
949 | 996 | // Make sure they can do it on all of the boards. |
950 | - if ($smcFunc['db_num_rows']($request) != count($boards)) |
|
951 | - return false; |
|
997 | + if ($smcFunc['db_num_rows']($request) != count($boards)) { |
|
998 | + return false; |
|
999 | + } |
|
952 | 1000 | |
953 | 1001 | $result = true; |
954 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
955 | - $result &= !empty($row['add_deny']); |
|
1002 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1003 | + $result &= !empty($row['add_deny']); |
|
1004 | + } |
|
956 | 1005 | $smcFunc['db_free_result']($request); |
957 | 1006 | |
958 | 1007 | // If the query returned 1, they can do it... otherwise, they can't. |
@@ -1017,9 +1066,10 @@ discard block |
||
1017 | 1066 | |
1018 | 1067 | // If you're doing something on behalf of some "heavy" permissions, validate your session. |
1019 | 1068 | // (take out the heavy permissions, and if you can't do anything but those, you need a validated session.) |
1020 | - if (!allowedTo(array_diff($permission, $heavy_permissions), $boards)) |
|
1021 | - validateSession(); |
|
1022 | -} |
|
1069 | + if (!allowedTo(array_diff($permission, $heavy_permissions), $boards)) { |
|
1070 | + validateSession(); |
|
1071 | + } |
|
1072 | + } |
|
1023 | 1073 | |
1024 | 1074 | /** |
1025 | 1075 | * Return the boards a user has a certain (board) permission on. (array(0) if all.) |
@@ -1038,8 +1088,9 @@ discard block |
||
1038 | 1088 | global $user_info, $smcFunc; |
1039 | 1089 | |
1040 | 1090 | // Arrays are nice, most of the time. |
1041 | - if (!is_array($permissions)) |
|
1042 | - $permissions = array($permissions); |
|
1091 | + if (!is_array($permissions)) { |
|
1092 | + $permissions = array($permissions); |
|
1093 | + } |
|
1043 | 1094 | |
1044 | 1095 | /* |
1045 | 1096 | * Set $simple to true to use this function as it were in SMF 2.0.x. |
@@ -1051,13 +1102,14 @@ discard block |
||
1051 | 1102 | // Administrators are all powerful, sorry. |
1052 | 1103 | if ($user_info['is_admin']) |
1053 | 1104 | { |
1054 | - if ($simple) |
|
1055 | - return array(0); |
|
1056 | - else |
|
1105 | + if ($simple) { |
|
1106 | + return array(0); |
|
1107 | + } else |
|
1057 | 1108 | { |
1058 | 1109 | $boards = array(); |
1059 | - foreach ($permissions as $permission) |
|
1060 | - $boards[$permission] = array(0); |
|
1110 | + foreach ($permissions as $permission) { |
|
1111 | + $boards[$permission] = array(0); |
|
1112 | + } |
|
1061 | 1113 | |
1062 | 1114 | return $boards; |
1063 | 1115 | } |
@@ -1089,31 +1141,32 @@ discard block |
||
1089 | 1141 | { |
1090 | 1142 | if ($simple) |
1091 | 1143 | { |
1092 | - if (empty($row['add_deny'])) |
|
1093 | - $deny_boards[] = $row['id_board']; |
|
1094 | - else |
|
1095 | - $boards[] = $row['id_board']; |
|
1096 | - } |
|
1097 | - else |
|
1144 | + if (empty($row['add_deny'])) { |
|
1145 | + $deny_boards[] = $row['id_board']; |
|
1146 | + } else { |
|
1147 | + $boards[] = $row['id_board']; |
|
1148 | + } |
|
1149 | + } else |
|
1098 | 1150 | { |
1099 | - if (empty($row['add_deny'])) |
|
1100 | - $deny_boards[$row['permission']][] = $row['id_board']; |
|
1101 | - else |
|
1102 | - $boards[$row['permission']][] = $row['id_board']; |
|
1151 | + if (empty($row['add_deny'])) { |
|
1152 | + $deny_boards[$row['permission']][] = $row['id_board']; |
|
1153 | + } else { |
|
1154 | + $boards[$row['permission']][] = $row['id_board']; |
|
1155 | + } |
|
1103 | 1156 | } |
1104 | 1157 | } |
1105 | 1158 | $smcFunc['db_free_result']($request); |
1106 | 1159 | |
1107 | - if ($simple) |
|
1108 | - $boards = array_unique(array_values(array_diff($boards, $deny_boards))); |
|
1109 | - else |
|
1160 | + if ($simple) { |
|
1161 | + $boards = array_unique(array_values(array_diff($boards, $deny_boards))); |
|
1162 | + } else |
|
1110 | 1163 | { |
1111 | 1164 | foreach ($permissions as $permission) |
1112 | 1165 | { |
1113 | 1166 | // never had it to start with |
1114 | - if (empty($boards[$permission])) |
|
1115 | - $boards[$permission] = array(); |
|
1116 | - else |
|
1167 | + if (empty($boards[$permission])) { |
|
1168 | + $boards[$permission] = array(); |
|
1169 | + } else |
|
1117 | 1170 | { |
1118 | 1171 | // Or it may have been removed |
1119 | 1172 | $deny_boards[$permission] = isset($deny_boards[$permission]) ? $deny_boards[$permission] : array(); |
@@ -1149,10 +1202,11 @@ discard block |
||
1149 | 1202 | |
1150 | 1203 | |
1151 | 1204 | // Moderators are free... |
1152 | - if (!allowedTo('moderate_board')) |
|
1153 | - $timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime']; |
|
1154 | - else |
|
1155 | - $timeLimit = 2; |
|
1205 | + if (!allowedTo('moderate_board')) { |
|
1206 | + $timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime']; |
|
1207 | + } else { |
|
1208 | + $timeLimit = 2; |
|
1209 | + } |
|
1156 | 1210 | |
1157 | 1211 | call_integration_hook('integrate_spam_protection', array(&$timeOverrides, &$timeLimit)); |
1158 | 1212 | |
@@ -1179,8 +1233,9 @@ discard block |
||
1179 | 1233 | if ($smcFunc['db_affected_rows']() != 1) |
1180 | 1234 | { |
1181 | 1235 | // Spammer! You only have to wait a *few* seconds! |
1182 | - if (!$only_return_result) |
|
1183 | - fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit)); |
|
1236 | + if (!$only_return_result) { |
|
1237 | + fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit)); |
|
1238 | + } |
|
1184 | 1239 | |
1185 | 1240 | return true; |
1186 | 1241 | } |
@@ -1198,11 +1253,13 @@ discard block |
||
1198 | 1253 | */ |
1199 | 1254 | function secureDirectory($path, $attachments = false) |
1200 | 1255 | { |
1201 | - if (empty($path)) |
|
1202 | - return 'empty_path'; |
|
1256 | + if (empty($path)) { |
|
1257 | + return 'empty_path'; |
|
1258 | + } |
|
1203 | 1259 | |
1204 | - if (!is_writable($path)) |
|
1205 | - return 'path_not_writable'; |
|
1260 | + if (!is_writable($path)) { |
|
1261 | + return 'path_not_writable'; |
|
1262 | + } |
|
1206 | 1263 | |
1207 | 1264 | $directoryname = basename($path); |
1208 | 1265 | |
@@ -1214,9 +1271,9 @@ discard block |
||
1214 | 1271 | |
1215 | 1272 | RemoveHandler .php .php3 .phtml .cgi .fcgi .pl .fpl .shtml'; |
1216 | 1273 | |
1217 | - if (file_exists($path . '/.htaccess')) |
|
1218 | - $errors[] = 'htaccess_exists'; |
|
1219 | - else |
|
1274 | + if (file_exists($path . '/.htaccess')) { |
|
1275 | + $errors[] = 'htaccess_exists'; |
|
1276 | + } else |
|
1220 | 1277 | { |
1221 | 1278 | $fh = @fopen($path . '/.htaccess', 'w'); |
1222 | 1279 | if ($fh) { |
@@ -1228,9 +1285,9 @@ discard block |
||
1228 | 1285 | $errors[] = 'htaccess_cannot_create_file'; |
1229 | 1286 | } |
1230 | 1287 | |
1231 | - if (file_exists($path . '/index.php')) |
|
1232 | - $errors[] = 'index-php_exists'; |
|
1233 | - else |
|
1288 | + if (file_exists($path . '/index.php')) { |
|
1289 | + $errors[] = 'index-php_exists'; |
|
1290 | + } else |
|
1234 | 1291 | { |
1235 | 1292 | $fh = @fopen($path . '/index.php', 'w'); |
1236 | 1293 | if ($fh) { |
@@ -1257,11 +1314,12 @@ discard block |
||
1257 | 1314 | $errors[] = 'index-php_cannot_create_file'; |
1258 | 1315 | } |
1259 | 1316 | |
1260 | - if (!empty($errors)) |
|
1261 | - return $errors; |
|
1262 | - else |
|
1263 | - return true; |
|
1264 | -} |
|
1317 | + if (!empty($errors)) { |
|
1318 | + return $errors; |
|
1319 | + } else { |
|
1320 | + return true; |
|
1321 | + } |
|
1322 | + } |
|
1265 | 1323 | |
1266 | 1324 | /** |
1267 | 1325 | * This sets the X-Frame-Options header. |
@@ -1274,14 +1332,16 @@ discard block |
||
1274 | 1332 | global $modSettings; |
1275 | 1333 | |
1276 | 1334 | $option = 'SAMEORIGIN'; |
1277 | - if (is_null($override) && !empty($modSettings['frame_security'])) |
|
1278 | - $option = $modSettings['frame_security']; |
|
1279 | - elseif (in_array($override, array('SAMEORIGIN', 'DENY'))) |
|
1280 | - $option = $override; |
|
1335 | + if (is_null($override) && !empty($modSettings['frame_security'])) { |
|
1336 | + $option = $modSettings['frame_security']; |
|
1337 | + } elseif (in_array($override, array('SAMEORIGIN', 'DENY'))) { |
|
1338 | + $option = $override; |
|
1339 | + } |
|
1281 | 1340 | |
1282 | 1341 | // Don't bother setting the header if we have disabled it. |
1283 | - if ($option == 'DISABLE') |
|
1284 | - return; |
|
1342 | + if ($option == 'DISABLE') { |
|
1343 | + return; |
|
1344 | + } |
|
1285 | 1345 | |
1286 | 1346 | // Finally set it. |
1287 | 1347 | header('X-Frame-Options: ' . $option); |
@@ -13,8 +13,9 @@ discard block |
||
13 | 13 | * @version 2.1 Beta 3 |
14 | 14 | */ |
15 | 15 | |
16 | -if (!defined('SMF')) |
|
16 | +if (!defined('SMF')) { |
|
17 | 17 | die('No direct access...'); |
18 | +} |
|
18 | 19 | |
19 | 20 | /** |
20 | 21 | * This is a handling function for all things post moderation. |
@@ -39,8 +40,9 @@ discard block |
||
39 | 40 | ); |
40 | 41 | |
41 | 42 | // Pick something valid... |
42 | - if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) |
|
43 | - $_REQUEST['sa'] = 'replies'; |
|
43 | + if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) { |
|
44 | + $_REQUEST['sa'] = 'replies'; |
|
45 | + } |
|
44 | 46 | |
45 | 47 | call_integration_hook('integrate_post_moderation', array(&$subActions)); |
46 | 48 | |
@@ -68,13 +70,15 @@ discard block |
||
68 | 70 | $approve_boards = $approve_boards == array(0) ? $filter_board : array_intersect($approve_boards, $filter_board); |
69 | 71 | } |
70 | 72 | |
71 | - if ($approve_boards == array(0)) |
|
72 | - $approve_query = ''; |
|
73 | - elseif (!empty($approve_boards)) |
|
74 | - $approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')'; |
|
73 | + if ($approve_boards == array(0)) { |
|
74 | + $approve_query = ''; |
|
75 | + } elseif (!empty($approve_boards)) { |
|
76 | + $approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')'; |
|
77 | + } |
|
75 | 78 | // Nada, zip, etc... |
76 | - else |
|
77 | - $approve_query = ' AND 1=0'; |
|
79 | + else { |
|
80 | + $approve_query = ' AND 1=0'; |
|
81 | + } |
|
78 | 82 | |
79 | 83 | // We also need to know where we can delete topics and/or replies to. |
80 | 84 | if ($context['current_view'] == 'topics') |
@@ -82,8 +86,7 @@ discard block |
||
82 | 86 | $delete_own_boards = boardsAllowedTo('remove_own'); |
83 | 87 | $delete_any_boards = boardsAllowedTo('remove_any'); |
84 | 88 | $delete_own_replies = array(); |
85 | - } |
|
86 | - else |
|
89 | + } else |
|
87 | 90 | { |
88 | 91 | $delete_own_boards = boardsAllowedTo('delete_own'); |
89 | 92 | $delete_any_boards = boardsAllowedTo('delete_any'); |
@@ -92,21 +95,25 @@ discard block |
||
92 | 95 | |
93 | 96 | $toAction = array(); |
94 | 97 | // Check if we have something to do? |
95 | - if (isset($_GET['approve'])) |
|
96 | - $toAction[] = (int) $_GET['approve']; |
|
98 | + if (isset($_GET['approve'])) { |
|
99 | + $toAction[] = (int) $_GET['approve']; |
|
100 | + } |
|
97 | 101 | // Just a deletion? |
98 | - elseif (isset($_GET['delete'])) |
|
99 | - $toAction[] = (int) $_GET['delete']; |
|
102 | + elseif (isset($_GET['delete'])) { |
|
103 | + $toAction[] = (int) $_GET['delete']; |
|
104 | + } |
|
100 | 105 | // Lots of approvals? |
101 | - elseif (isset($_POST['item'])) |
|
102 | - foreach ($_POST['item'] as $item) |
|
106 | + elseif (isset($_POST['item'])) { |
|
107 | + foreach ($_POST['item'] as $item) |
|
103 | 108 | $toAction[] = (int) $item; |
109 | + } |
|
104 | 110 | |
105 | 111 | // What are we actually doing. |
106 | - if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) |
|
107 | - $curAction = 'approve'; |
|
108 | - elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) |
|
109 | - $curAction = 'delete'; |
|
112 | + if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) { |
|
113 | + $curAction = 'approve'; |
|
114 | + } elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) { |
|
115 | + $curAction = 'delete'; |
|
116 | + } |
|
110 | 117 | |
111 | 118 | // Right, so we have something to do? |
112 | 119 | if (!empty($toAction) && isset($curAction)) |
@@ -135,8 +142,9 @@ discard block |
||
135 | 142 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
136 | 143 | { |
137 | 144 | // If it's not within what our view is ignore it... |
138 | - if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies')) |
|
139 | - continue; |
|
145 | + if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies')) { |
|
146 | + continue; |
|
147 | + } |
|
140 | 148 | |
141 | 149 | $can_add = false; |
142 | 150 | // If we're approving this is simple. |
@@ -148,18 +156,22 @@ discard block |
||
148 | 156 | elseif ($curAction == 'delete') |
149 | 157 | { |
150 | 158 | // Own post is easy! |
151 | - if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) |
|
152 | - $can_add = true; |
|
159 | + if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) { |
|
160 | + $can_add = true; |
|
161 | + } |
|
153 | 162 | // Is it a reply to their own topic? |
154 | - elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) |
|
155 | - $can_add = true; |
|
163 | + elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) { |
|
164 | + $can_add = true; |
|
165 | + } |
|
156 | 166 | // Someone elses? |
157 | - elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) |
|
158 | - $can_add = true; |
|
167 | + elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) { |
|
168 | + $can_add = true; |
|
169 | + } |
|
159 | 170 | } |
160 | 171 | |
161 | - if ($can_add) |
|
162 | - $anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg']; |
|
172 | + if ($can_add) { |
|
173 | + $anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg']; |
|
174 | + } |
|
163 | 175 | $toAction[] = $anItem; |
164 | 176 | |
165 | 177 | // All clear. What have we got now, what, what? |
@@ -177,8 +189,7 @@ discard block |
||
177 | 189 | if ($curAction == 'approve') |
178 | 190 | { |
179 | 191 | approveMessages ($toAction, $details, $context['current_view']); |
180 | - } |
|
181 | - else |
|
192 | + } else |
|
182 | 193 | { |
183 | 194 | removeMessages ($toAction, $details, $context['current_view']); |
184 | 195 | } |
@@ -265,16 +276,19 @@ discard block |
||
265 | 276 | for ($i = 1; $row = $smcFunc['db_fetch_assoc']($request); $i++) |
266 | 277 | { |
267 | 278 | // Can delete is complicated, let's solve it first... is it their own post? |
268 | - if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) |
|
269 | - $can_delete = true; |
|
279 | + if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) { |
|
280 | + $can_delete = true; |
|
281 | + } |
|
270 | 282 | // Is it a reply to their own topic? |
271 | - elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) |
|
272 | - $can_delete = true; |
|
283 | + elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) { |
|
284 | + $can_delete = true; |
|
285 | + } |
|
273 | 286 | // Someone elses? |
274 | - elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) |
|
275 | - $can_delete = true; |
|
276 | - else |
|
277 | - $can_delete = false; |
|
287 | + elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) { |
|
288 | + $can_delete = true; |
|
289 | + } else { |
|
290 | + $can_delete = false; |
|
291 | + } |
|
278 | 292 | |
279 | 293 | $context['unapproved_items'][] = array( |
280 | 294 | 'id' => $row['id_msg'], |
@@ -323,28 +337,31 @@ discard block |
||
323 | 337 | // Once again, permissions are king! |
324 | 338 | $approve_boards = boardsAllowedTo('approve_posts'); |
325 | 339 | |
326 | - if ($approve_boards == array(0)) |
|
327 | - $approve_query = ''; |
|
328 | - elseif (!empty($approve_boards)) |
|
329 | - $approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')'; |
|
330 | - else |
|
331 | - $approve_query = ' AND 1=0'; |
|
340 | + if ($approve_boards == array(0)) { |
|
341 | + $approve_query = ''; |
|
342 | + } elseif (!empty($approve_boards)) { |
|
343 | + $approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')'; |
|
344 | + } else { |
|
345 | + $approve_query = ' AND 1=0'; |
|
346 | + } |
|
332 | 347 | |
333 | 348 | // Get together the array of things to act on, if any. |
334 | 349 | $attachments = array(); |
335 | - if (isset($_GET['approve'])) |
|
336 | - $attachments[] = (int) $_GET['approve']; |
|
337 | - elseif (isset($_GET['delete'])) |
|
338 | - $attachments[] = (int) $_GET['delete']; |
|
339 | - elseif (isset($_POST['item'])) |
|
340 | - foreach ($_POST['item'] as $item) |
|
350 | + if (isset($_GET['approve'])) { |
|
351 | + $attachments[] = (int) $_GET['approve']; |
|
352 | + } elseif (isset($_GET['delete'])) { |
|
353 | + $attachments[] = (int) $_GET['delete']; |
|
354 | + } elseif (isset($_POST['item'])) { |
|
355 | + foreach ($_POST['item'] as $item) |
|
341 | 356 | $attachments[] = (int) $item; |
357 | + } |
|
342 | 358 | |
343 | 359 | // Are we approving or deleting? |
344 | - if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) |
|
345 | - $curAction = 'approve'; |
|
346 | - elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) |
|
347 | - $curAction = 'delete'; |
|
360 | + if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) { |
|
361 | + $curAction = 'approve'; |
|
362 | + } elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) { |
|
363 | + $curAction = 'delete'; |
|
364 | + } |
|
348 | 365 | |
349 | 366 | // Something to do, let's do it! |
350 | 367 | if (!empty($attachments) && isset($curAction)) |
@@ -372,17 +389,19 @@ discard block |
||
372 | 389 | ) |
373 | 390 | ); |
374 | 391 | $attachments = array(); |
375 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
376 | - $attachments[] = $row['id_attach']; |
|
392 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
393 | + $attachments[] = $row['id_attach']; |
|
394 | + } |
|
377 | 395 | $smcFunc['db_free_result']($request); |
378 | 396 | |
379 | 397 | // Assuming it wasn't all like, proper illegal, we can do the approving. |
380 | 398 | if (!empty($attachments)) |
381 | 399 | { |
382 | - if ($curAction == 'approve') |
|
383 | - ApproveAttachments($attachments); |
|
384 | - else |
|
385 | - removeAttachments(array('id_attach' => $attachments, 'do_logging' => true)); |
|
400 | + if ($curAction == 'approve') { |
|
401 | + ApproveAttachments($attachments); |
|
402 | + } else { |
|
403 | + removeAttachments(array('id_attach' => $attachments, 'do_logging' => true)); |
|
404 | + } |
|
386 | 405 | } |
387 | 406 | } |
388 | 407 | |
@@ -682,15 +701,16 @@ discard block |
||
682 | 701 | { |
683 | 702 | approveTopics($topic, !$approved); |
684 | 703 | |
685 | - if ($starter != $user_info['id']) |
|
686 | - logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board)); |
|
687 | - } |
|
688 | - else |
|
704 | + if ($starter != $user_info['id']) { |
|
705 | + logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board)); |
|
706 | + } |
|
707 | + } else |
|
689 | 708 | { |
690 | 709 | approvePosts($_REQUEST['msg'], !$approved); |
691 | 710 | |
692 | - if ($poster != $user_info['id']) |
|
693 | - logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board)); |
|
711 | + if ($poster != $user_info['id']) { |
|
712 | + logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board)); |
|
713 | + } |
|
694 | 714 | } |
695 | 715 | |
696 | 716 | redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg']. '#msg' . $_REQUEST['msg']); |
@@ -716,8 +736,7 @@ discard block |
||
716 | 736 | { |
717 | 737 | logAction('approve_topic', array('topic' => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board'])); |
718 | 738 | } |
719 | - } |
|
720 | - else |
|
739 | + } else |
|
721 | 740 | { |
722 | 741 | approvePosts($messages); |
723 | 742 | // and tell the world about it again |
@@ -745,8 +764,9 @@ discard block |
||
745 | 764 | ) |
746 | 765 | ); |
747 | 766 | $msgs = array(); |
748 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
749 | - $msgs[] = $row[0]; |
|
767 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
768 | + $msgs[] = $row[0]; |
|
769 | + } |
|
750 | 770 | $smcFunc['db_free_result']($request); |
751 | 771 | |
752 | 772 | if (!empty($msgs)) |
@@ -765,8 +785,9 @@ discard block |
||
765 | 785 | ) |
766 | 786 | ); |
767 | 787 | $attaches = array(); |
768 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
769 | - $attaches[] = $row[0]; |
|
788 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
789 | + $attaches[] = $row[0]; |
|
790 | + } |
|
770 | 791 | $smcFunc['db_free_result']($request); |
771 | 792 | |
772 | 793 | if (!empty($attaches)) |
@@ -794,12 +815,12 @@ discard block |
||
794 | 815 | { |
795 | 816 | removeTopics($messages); |
796 | 817 | // and tell the world about it |
797 | - foreach ($messages as $topic) |
|
798 | - // Note, only log topic ID in native form if it's not gone forever. |
|
818 | + foreach ($messages as $topic) { |
|
819 | + // Note, only log topic ID in native form if it's not gone forever. |
|
799 | 820 | logAction('remove', array( |
800 | 821 | (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $messageDetails[$topic]['board'] ? 'topic' : 'old_topic_id') => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board'])); |
801 | - } |
|
802 | - else |
|
822 | + } |
|
823 | + } else |
|
803 | 824 | { |
804 | 825 | foreach ($messages as $post) |
805 | 826 | { |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | { |
317 | 317 | // PHP only supports $this inside anonymous functions since 5.4 |
318 | 318 | $minifier = $this; |
319 | - $callback = function ($match) use ($minifier) { |
|
319 | + $callback = function($match) use ($minifier) { |
|
320 | 320 | // check the second index here, because the first always contains a quote |
321 | 321 | if (!$match[2]) { |
322 | 322 | /* |
@@ -329,8 +329,8 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | $count = count($minifier->extracted); |
332 | - $placeholder = $match[1].$count.$match[1]; |
|
333 | - $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1]; |
|
332 | + $placeholder = $match[1] . $count . $match[1]; |
|
333 | + $minifier->extracted[$placeholder] = $match[1] . $match[2] . $match[1]; |
|
334 | 334 | |
335 | 335 | return $placeholder; |
336 | 336 | }; |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | * considered as escape-char (times 2) and to get it in the regex, |
348 | 348 | * escaped (times 2) |
349 | 349 | */ |
350 | - $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback); |
|
350 | + $this->registerPattern('/([' . $chars . '])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback); |
|
351 | 351 | } |
352 | 352 | |
353 | 353 | /** |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | protected function openFileForWriting($path) |
398 | 398 | { |
399 | 399 | if (($handler = @fopen($path, 'w')) === false) { |
400 | - throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.'); |
|
400 | + throw new IOException('The file "' . $path . '" could not be opened for writing. Check if PHP has enough permissions.'); |
|
401 | 401 | } |
402 | 402 | |
403 | 403 | return $handler; |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | protected function writeToFile($handler, $content, $path = '') |
416 | 416 | { |
417 | 417 | if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) { |
418 | - throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.'); |
|
418 | + throw new IOException('The file "' . $path . '" could not be written to. Check your disk space and file permissions.'); |
|
419 | 419 | } |
420 | 420 | } |
421 | 421 | } |
@@ -16,335 +16,335 @@ discard block |
||
16 | 16 | */ |
17 | 17 | abstract class Minify |
18 | 18 | { |
19 | - /** |
|
20 | - * The data to be minified. |
|
21 | - * |
|
22 | - * @var string[] |
|
23 | - */ |
|
24 | - protected $data = array(); |
|
25 | - |
|
26 | - /** |
|
27 | - * Array of patterns to match. |
|
28 | - * |
|
29 | - * @var string[] |
|
30 | - */ |
|
31 | - protected $patterns = array(); |
|
32 | - |
|
33 | - /** |
|
34 | - * This array will hold content of strings and regular expressions that have |
|
35 | - * been extracted from the JS source code, so we can reliably match "code", |
|
36 | - * without having to worry about potential "code-like" characters inside. |
|
37 | - * |
|
38 | - * @var string[] |
|
39 | - */ |
|
40 | - public $extracted = array(); |
|
41 | - |
|
42 | - /** |
|
43 | - * Init the minify class - optionally, code may be passed along already. |
|
44 | - */ |
|
45 | - public function __construct(/* $data = null, ... */) |
|
46 | - { |
|
47 | - // it's possible to add the source through the constructor as well ;) |
|
48 | - if (func_num_args()) { |
|
49 | - call_user_func_array(array($this, 'add'), func_get_args()); |
|
50 | - } |
|
51 | - } |
|
52 | - |
|
53 | - /** |
|
54 | - * Add a file or straight-up code to be minified. |
|
55 | - * |
|
56 | - * @param string|string[] $data |
|
57 | - */ |
|
58 | - public function add($data /* $data = null, ... */) |
|
59 | - { |
|
60 | - // bogus "usage" of parameter $data: scrutinizer warns this variable is |
|
61 | - // not used (we're using func_get_args instead to support overloading), |
|
62 | - // but it still needs to be defined because it makes no sense to have |
|
63 | - // this function without argument :) |
|
64 | - $args = array($data) + func_get_args(); |
|
65 | - |
|
66 | - // this method can be overloaded |
|
67 | - foreach ($args as $data) { |
|
68 | - if (is_array($data)) { |
|
69 | - call_user_func_array(array($this, 'add'), $data); |
|
70 | - continue; |
|
71 | - } |
|
72 | - |
|
73 | - // redefine var |
|
74 | - $data = (string) $data; |
|
75 | - |
|
76 | - // load data |
|
77 | - $value = $this->load($data); |
|
78 | - $key = ($data != $value) ? $data : count($this->data); |
|
79 | - |
|
80 | - // replace CR linefeeds etc. |
|
81 | - // @see https://github.com/matthiasmullie/minify/pull/139 |
|
82 | - $value = str_replace(array("\r\n", "\r"), "\n", $value); |
|
83 | - |
|
84 | - // store data |
|
85 | - $this->data[$key] = $value; |
|
86 | - } |
|
87 | - } |
|
88 | - |
|
89 | - /** |
|
90 | - * Minify the data & (optionally) saves it to a file. |
|
91 | - * |
|
92 | - * @param string[optional] $path Path to write the data to |
|
93 | - * |
|
94 | - * @return string The minified data |
|
95 | - */ |
|
96 | - public function minify($path = null) |
|
97 | - { |
|
98 | - $content = $this->execute($path); |
|
99 | - |
|
100 | - // save to path |
|
101 | - if ($path !== null) { |
|
102 | - $this->save($content, $path); |
|
103 | - } |
|
104 | - |
|
105 | - return $content; |
|
106 | - } |
|
107 | - |
|
108 | - /** |
|
109 | - * Minify & gzip the data & (optionally) saves it to a file. |
|
110 | - * |
|
111 | - * @param string[optional] $path Path to write the data to |
|
112 | - * @param int[optional] $level Compression level, from 0 to 9 |
|
113 | - * |
|
114 | - * @return string The minified & gzipped data |
|
115 | - */ |
|
116 | - public function gzip($path = null, $level = 9) |
|
117 | - { |
|
118 | - $content = $this->execute($path); |
|
119 | - $content = gzencode($content, $level, FORCE_GZIP); |
|
120 | - |
|
121 | - // save to path |
|
122 | - if ($path !== null) { |
|
123 | - $this->save($content, $path); |
|
124 | - } |
|
125 | - |
|
126 | - return $content; |
|
127 | - } |
|
128 | - |
|
129 | - /** |
|
130 | - * Minify the data & write it to a CacheItemInterface object. |
|
131 | - * |
|
132 | - * @param CacheItemInterface $item Cache item to write the data to |
|
133 | - * |
|
134 | - * @return CacheItemInterface Cache item with the minifier data |
|
135 | - */ |
|
136 | - public function cache(CacheItemInterface $item) |
|
137 | - { |
|
138 | - $content = $this->execute(); |
|
139 | - $item->set($content); |
|
140 | - |
|
141 | - return $item; |
|
142 | - } |
|
143 | - |
|
144 | - /** |
|
145 | - * Minify the data. |
|
146 | - * |
|
147 | - * @param string[optional] $path Path to write the data to |
|
148 | - * |
|
149 | - * @return string The minified data |
|
150 | - */ |
|
151 | - abstract public function execute($path = null); |
|
152 | - |
|
153 | - /** |
|
154 | - * Load data. |
|
155 | - * |
|
156 | - * @param string $data Either a path to a file or the content itself |
|
157 | - * |
|
158 | - * @return string |
|
159 | - */ |
|
160 | - protected function load($data) |
|
161 | - { |
|
162 | - // check if the data is a file |
|
163 | - if ($this->canImportFile($data)) { |
|
164 | - $data = file_get_contents($data); |
|
165 | - |
|
166 | - // strip BOM, if any |
|
167 | - if (substr($data, 0, 3) == "\xef\xbb\xbf") { |
|
168 | - $data = substr($data, 3); |
|
169 | - } |
|
170 | - } |
|
171 | - |
|
172 | - return $data; |
|
173 | - } |
|
174 | - |
|
175 | - /** |
|
176 | - * Save to file. |
|
177 | - * |
|
178 | - * @param string $content The minified data |
|
179 | - * @param string $path The path to save the minified data to |
|
180 | - * |
|
181 | - * @throws IOException |
|
182 | - */ |
|
183 | - protected function save($content, $path) |
|
184 | - { |
|
185 | - $handler = $this->openFileForWriting($path); |
|
186 | - |
|
187 | - $this->writeToFile($handler, $content); |
|
188 | - |
|
189 | - @fclose($handler); |
|
190 | - } |
|
191 | - |
|
192 | - /** |
|
193 | - * Register a pattern to execute against the source content. |
|
194 | - * |
|
195 | - * @param string $pattern PCRE pattern |
|
196 | - * @param string|callable $replacement Replacement value for matched pattern |
|
197 | - */ |
|
198 | - protected function registerPattern($pattern, $replacement = '') |
|
199 | - { |
|
200 | - // study the pattern, we'll execute it more than once |
|
201 | - $pattern .= 'S'; |
|
202 | - |
|
203 | - $this->patterns[] = array($pattern, $replacement); |
|
204 | - } |
|
205 | - |
|
206 | - /** |
|
207 | - * We can't "just" run some regular expressions against JavaScript: it's a |
|
208 | - * complex language. E.g. having an occurrence of // xyz would be a comment, |
|
209 | - * unless it's used within a string. Of you could have something that looks |
|
210 | - * like a 'string', but inside a comment. |
|
211 | - * The only way to accurately replace these pieces is to traverse the JS one |
|
212 | - * character at a time and try to find whatever starts first. |
|
213 | - * |
|
214 | - * @param string $content The content to replace patterns in |
|
215 | - * |
|
216 | - * @return string The (manipulated) content |
|
217 | - */ |
|
218 | - protected function replace($content) |
|
219 | - { |
|
220 | - $processed = ''; |
|
221 | - $positions = array_fill(0, count($this->patterns), -1); |
|
222 | - $matches = array(); |
|
223 | - |
|
224 | - while ($content) { |
|
225 | - // find first match for all patterns |
|
226 | - foreach ($this->patterns as $i => $pattern) { |
|
227 | - list($pattern, $replacement) = $pattern; |
|
228 | - |
|
229 | - // no need to re-run matches that are still in the part of the |
|
230 | - // content that hasn't been processed |
|
231 | - if ($positions[$i] >= 0) { |
|
232 | - continue; |
|
233 | - } |
|
234 | - |
|
235 | - $match = null; |
|
236 | - if (preg_match($pattern, $content, $match)) { |
|
237 | - $matches[$i] = $match; |
|
238 | - |
|
239 | - // we'll store the match position as well; that way, we |
|
240 | - // don't have to redo all preg_matches after changing only |
|
241 | - // the first (we'll still know where those others are) |
|
242 | - $positions[$i] = strpos($content, $match[0]); |
|
243 | - } else { |
|
244 | - // if the pattern couldn't be matched, there's no point in |
|
245 | - // executing it again in later runs on this same content; |
|
246 | - // ignore this one until we reach end of content |
|
247 | - unset($matches[$i]); |
|
248 | - $positions[$i] = strlen($content); |
|
249 | - } |
|
250 | - } |
|
251 | - |
|
252 | - // no more matches to find: everything's been processed, break out |
|
253 | - if (!$matches) { |
|
254 | - $processed .= $content; |
|
255 | - break; |
|
256 | - } |
|
257 | - |
|
258 | - // see which of the patterns actually found the first thing (we'll |
|
259 | - // only want to execute that one, since we're unsure if what the |
|
260 | - // other found was not inside what the first found) |
|
261 | - $discardLength = min($positions); |
|
262 | - $firstPattern = array_search($discardLength, $positions); |
|
263 | - $match = $matches[$firstPattern][0]; |
|
264 | - |
|
265 | - // execute the pattern that matches earliest in the content string |
|
266 | - list($pattern, $replacement) = $this->patterns[$firstPattern]; |
|
267 | - $replacement = $this->replacePattern($pattern, $replacement, $content); |
|
268 | - |
|
269 | - // figure out which part of the string was unmatched; that's the |
|
270 | - // part we'll execute the patterns on again next |
|
271 | - $content = substr($content, $discardLength); |
|
272 | - $unmatched = (string) substr($content, strpos($content, $match) + strlen($match)); |
|
273 | - |
|
274 | - // move the replaced part to $processed and prepare $content to |
|
275 | - // again match batch of patterns against |
|
276 | - $processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched)); |
|
277 | - $content = $unmatched; |
|
278 | - |
|
279 | - // first match has been replaced & that content is to be left alone, |
|
280 | - // the next matches will start after this replacement, so we should |
|
281 | - // fix their offsets |
|
282 | - foreach ($positions as $i => $position) { |
|
283 | - $positions[$i] -= $discardLength + strlen($match); |
|
284 | - } |
|
285 | - } |
|
286 | - |
|
287 | - return $processed; |
|
288 | - } |
|
289 | - |
|
290 | - /** |
|
291 | - * This is where a pattern is matched against $content and the matches |
|
292 | - * are replaced by their respective value. |
|
293 | - * This function will be called plenty of times, where $content will always |
|
294 | - * move up 1 character. |
|
295 | - * |
|
296 | - * @param string $pattern Pattern to match |
|
297 | - * @param string|callable $replacement Replacement value |
|
298 | - * @param string $content Content to match pattern against |
|
299 | - * |
|
300 | - * @return string |
|
301 | - */ |
|
302 | - protected function replacePattern($pattern, $replacement, $content) |
|
303 | - { |
|
304 | - if (is_callable($replacement)) { |
|
305 | - return preg_replace_callback($pattern, $replacement, $content, 1, $count); |
|
306 | - } else { |
|
307 | - return preg_replace($pattern, $replacement, $content, 1, $count); |
|
308 | - } |
|
309 | - } |
|
310 | - |
|
311 | - /** |
|
312 | - * Strings are a pattern we need to match, in order to ignore potential |
|
313 | - * code-like content inside them, but we just want all of the string |
|
314 | - * content to remain untouched. |
|
315 | - * |
|
316 | - * This method will replace all string content with simple STRING# |
|
317 | - * placeholder text, so we've rid all strings from characters that may be |
|
318 | - * misinterpreted. Original string content will be saved in $this->extracted |
|
319 | - * and after doing all other minifying, we can restore the original content |
|
320 | - * via restoreStrings(). |
|
321 | - * |
|
322 | - * @param string[optional] $chars |
|
323 | - */ |
|
324 | - protected function extractStrings($chars = '\'"') |
|
325 | - { |
|
326 | - // PHP only supports $this inside anonymous functions since 5.4 |
|
327 | - $minifier = $this; |
|
328 | - $callback = function ($match) use ($minifier) { |
|
329 | - // check the second index here, because the first always contains a quote |
|
330 | - if ($match[2] === '') { |
|
331 | - /* |
|
19 | + /** |
|
20 | + * The data to be minified. |
|
21 | + * |
|
22 | + * @var string[] |
|
23 | + */ |
|
24 | + protected $data = array(); |
|
25 | + |
|
26 | + /** |
|
27 | + * Array of patterns to match. |
|
28 | + * |
|
29 | + * @var string[] |
|
30 | + */ |
|
31 | + protected $patterns = array(); |
|
32 | + |
|
33 | + /** |
|
34 | + * This array will hold content of strings and regular expressions that have |
|
35 | + * been extracted from the JS source code, so we can reliably match "code", |
|
36 | + * without having to worry about potential "code-like" characters inside. |
|
37 | + * |
|
38 | + * @var string[] |
|
39 | + */ |
|
40 | + public $extracted = array(); |
|
41 | + |
|
42 | + /** |
|
43 | + * Init the minify class - optionally, code may be passed along already. |
|
44 | + */ |
|
45 | + public function __construct(/* $data = null, ... */) |
|
46 | + { |
|
47 | + // it's possible to add the source through the constructor as well ;) |
|
48 | + if (func_num_args()) { |
|
49 | + call_user_func_array(array($this, 'add'), func_get_args()); |
|
50 | + } |
|
51 | + } |
|
52 | + |
|
53 | + /** |
|
54 | + * Add a file or straight-up code to be minified. |
|
55 | + * |
|
56 | + * @param string|string[] $data |
|
57 | + */ |
|
58 | + public function add($data /* $data = null, ... */) |
|
59 | + { |
|
60 | + // bogus "usage" of parameter $data: scrutinizer warns this variable is |
|
61 | + // not used (we're using func_get_args instead to support overloading), |
|
62 | + // but it still needs to be defined because it makes no sense to have |
|
63 | + // this function without argument :) |
|
64 | + $args = array($data) + func_get_args(); |
|
65 | + |
|
66 | + // this method can be overloaded |
|
67 | + foreach ($args as $data) { |
|
68 | + if (is_array($data)) { |
|
69 | + call_user_func_array(array($this, 'add'), $data); |
|
70 | + continue; |
|
71 | + } |
|
72 | + |
|
73 | + // redefine var |
|
74 | + $data = (string) $data; |
|
75 | + |
|
76 | + // load data |
|
77 | + $value = $this->load($data); |
|
78 | + $key = ($data != $value) ? $data : count($this->data); |
|
79 | + |
|
80 | + // replace CR linefeeds etc. |
|
81 | + // @see https://github.com/matthiasmullie/minify/pull/139 |
|
82 | + $value = str_replace(array("\r\n", "\r"), "\n", $value); |
|
83 | + |
|
84 | + // store data |
|
85 | + $this->data[$key] = $value; |
|
86 | + } |
|
87 | + } |
|
88 | + |
|
89 | + /** |
|
90 | + * Minify the data & (optionally) saves it to a file. |
|
91 | + * |
|
92 | + * @param string[optional] $path Path to write the data to |
|
93 | + * |
|
94 | + * @return string The minified data |
|
95 | + */ |
|
96 | + public function minify($path = null) |
|
97 | + { |
|
98 | + $content = $this->execute($path); |
|
99 | + |
|
100 | + // save to path |
|
101 | + if ($path !== null) { |
|
102 | + $this->save($content, $path); |
|
103 | + } |
|
104 | + |
|
105 | + return $content; |
|
106 | + } |
|
107 | + |
|
108 | + /** |
|
109 | + * Minify & gzip the data & (optionally) saves it to a file. |
|
110 | + * |
|
111 | + * @param string[optional] $path Path to write the data to |
|
112 | + * @param int[optional] $level Compression level, from 0 to 9 |
|
113 | + * |
|
114 | + * @return string The minified & gzipped data |
|
115 | + */ |
|
116 | + public function gzip($path = null, $level = 9) |
|
117 | + { |
|
118 | + $content = $this->execute($path); |
|
119 | + $content = gzencode($content, $level, FORCE_GZIP); |
|
120 | + |
|
121 | + // save to path |
|
122 | + if ($path !== null) { |
|
123 | + $this->save($content, $path); |
|
124 | + } |
|
125 | + |
|
126 | + return $content; |
|
127 | + } |
|
128 | + |
|
129 | + /** |
|
130 | + * Minify the data & write it to a CacheItemInterface object. |
|
131 | + * |
|
132 | + * @param CacheItemInterface $item Cache item to write the data to |
|
133 | + * |
|
134 | + * @return CacheItemInterface Cache item with the minifier data |
|
135 | + */ |
|
136 | + public function cache(CacheItemInterface $item) |
|
137 | + { |
|
138 | + $content = $this->execute(); |
|
139 | + $item->set($content); |
|
140 | + |
|
141 | + return $item; |
|
142 | + } |
|
143 | + |
|
144 | + /** |
|
145 | + * Minify the data. |
|
146 | + * |
|
147 | + * @param string[optional] $path Path to write the data to |
|
148 | + * |
|
149 | + * @return string The minified data |
|
150 | + */ |
|
151 | + abstract public function execute($path = null); |
|
152 | + |
|
153 | + /** |
|
154 | + * Load data. |
|
155 | + * |
|
156 | + * @param string $data Either a path to a file or the content itself |
|
157 | + * |
|
158 | + * @return string |
|
159 | + */ |
|
160 | + protected function load($data) |
|
161 | + { |
|
162 | + // check if the data is a file |
|
163 | + if ($this->canImportFile($data)) { |
|
164 | + $data = file_get_contents($data); |
|
165 | + |
|
166 | + // strip BOM, if any |
|
167 | + if (substr($data, 0, 3) == "\xef\xbb\xbf") { |
|
168 | + $data = substr($data, 3); |
|
169 | + } |
|
170 | + } |
|
171 | + |
|
172 | + return $data; |
|
173 | + } |
|
174 | + |
|
175 | + /** |
|
176 | + * Save to file. |
|
177 | + * |
|
178 | + * @param string $content The minified data |
|
179 | + * @param string $path The path to save the minified data to |
|
180 | + * |
|
181 | + * @throws IOException |
|
182 | + */ |
|
183 | + protected function save($content, $path) |
|
184 | + { |
|
185 | + $handler = $this->openFileForWriting($path); |
|
186 | + |
|
187 | + $this->writeToFile($handler, $content); |
|
188 | + |
|
189 | + @fclose($handler); |
|
190 | + } |
|
191 | + |
|
192 | + /** |
|
193 | + * Register a pattern to execute against the source content. |
|
194 | + * |
|
195 | + * @param string $pattern PCRE pattern |
|
196 | + * @param string|callable $replacement Replacement value for matched pattern |
|
197 | + */ |
|
198 | + protected function registerPattern($pattern, $replacement = '') |
|
199 | + { |
|
200 | + // study the pattern, we'll execute it more than once |
|
201 | + $pattern .= 'S'; |
|
202 | + |
|
203 | + $this->patterns[] = array($pattern, $replacement); |
|
204 | + } |
|
205 | + |
|
206 | + /** |
|
207 | + * We can't "just" run some regular expressions against JavaScript: it's a |
|
208 | + * complex language. E.g. having an occurrence of // xyz would be a comment, |
|
209 | + * unless it's used within a string. Of you could have something that looks |
|
210 | + * like a 'string', but inside a comment. |
|
211 | + * The only way to accurately replace these pieces is to traverse the JS one |
|
212 | + * character at a time and try to find whatever starts first. |
|
213 | + * |
|
214 | + * @param string $content The content to replace patterns in |
|
215 | + * |
|
216 | + * @return string The (manipulated) content |
|
217 | + */ |
|
218 | + protected function replace($content) |
|
219 | + { |
|
220 | + $processed = ''; |
|
221 | + $positions = array_fill(0, count($this->patterns), -1); |
|
222 | + $matches = array(); |
|
223 | + |
|
224 | + while ($content) { |
|
225 | + // find first match for all patterns |
|
226 | + foreach ($this->patterns as $i => $pattern) { |
|
227 | + list($pattern, $replacement) = $pattern; |
|
228 | + |
|
229 | + // no need to re-run matches that are still in the part of the |
|
230 | + // content that hasn't been processed |
|
231 | + if ($positions[$i] >= 0) { |
|
232 | + continue; |
|
233 | + } |
|
234 | + |
|
235 | + $match = null; |
|
236 | + if (preg_match($pattern, $content, $match)) { |
|
237 | + $matches[$i] = $match; |
|
238 | + |
|
239 | + // we'll store the match position as well; that way, we |
|
240 | + // don't have to redo all preg_matches after changing only |
|
241 | + // the first (we'll still know where those others are) |
|
242 | + $positions[$i] = strpos($content, $match[0]); |
|
243 | + } else { |
|
244 | + // if the pattern couldn't be matched, there's no point in |
|
245 | + // executing it again in later runs on this same content; |
|
246 | + // ignore this one until we reach end of content |
|
247 | + unset($matches[$i]); |
|
248 | + $positions[$i] = strlen($content); |
|
249 | + } |
|
250 | + } |
|
251 | + |
|
252 | + // no more matches to find: everything's been processed, break out |
|
253 | + if (!$matches) { |
|
254 | + $processed .= $content; |
|
255 | + break; |
|
256 | + } |
|
257 | + |
|
258 | + // see which of the patterns actually found the first thing (we'll |
|
259 | + // only want to execute that one, since we're unsure if what the |
|
260 | + // other found was not inside what the first found) |
|
261 | + $discardLength = min($positions); |
|
262 | + $firstPattern = array_search($discardLength, $positions); |
|
263 | + $match = $matches[$firstPattern][0]; |
|
264 | + |
|
265 | + // execute the pattern that matches earliest in the content string |
|
266 | + list($pattern, $replacement) = $this->patterns[$firstPattern]; |
|
267 | + $replacement = $this->replacePattern($pattern, $replacement, $content); |
|
268 | + |
|
269 | + // figure out which part of the string was unmatched; that's the |
|
270 | + // part we'll execute the patterns on again next |
|
271 | + $content = substr($content, $discardLength); |
|
272 | + $unmatched = (string) substr($content, strpos($content, $match) + strlen($match)); |
|
273 | + |
|
274 | + // move the replaced part to $processed and prepare $content to |
|
275 | + // again match batch of patterns against |
|
276 | + $processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched)); |
|
277 | + $content = $unmatched; |
|
278 | + |
|
279 | + // first match has been replaced & that content is to be left alone, |
|
280 | + // the next matches will start after this replacement, so we should |
|
281 | + // fix their offsets |
|
282 | + foreach ($positions as $i => $position) { |
|
283 | + $positions[$i] -= $discardLength + strlen($match); |
|
284 | + } |
|
285 | + } |
|
286 | + |
|
287 | + return $processed; |
|
288 | + } |
|
289 | + |
|
290 | + /** |
|
291 | + * This is where a pattern is matched against $content and the matches |
|
292 | + * are replaced by their respective value. |
|
293 | + * This function will be called plenty of times, where $content will always |
|
294 | + * move up 1 character. |
|
295 | + * |
|
296 | + * @param string $pattern Pattern to match |
|
297 | + * @param string|callable $replacement Replacement value |
|
298 | + * @param string $content Content to match pattern against |
|
299 | + * |
|
300 | + * @return string |
|
301 | + */ |
|
302 | + protected function replacePattern($pattern, $replacement, $content) |
|
303 | + { |
|
304 | + if (is_callable($replacement)) { |
|
305 | + return preg_replace_callback($pattern, $replacement, $content, 1, $count); |
|
306 | + } else { |
|
307 | + return preg_replace($pattern, $replacement, $content, 1, $count); |
|
308 | + } |
|
309 | + } |
|
310 | + |
|
311 | + /** |
|
312 | + * Strings are a pattern we need to match, in order to ignore potential |
|
313 | + * code-like content inside them, but we just want all of the string |
|
314 | + * content to remain untouched. |
|
315 | + * |
|
316 | + * This method will replace all string content with simple STRING# |
|
317 | + * placeholder text, so we've rid all strings from characters that may be |
|
318 | + * misinterpreted. Original string content will be saved in $this->extracted |
|
319 | + * and after doing all other minifying, we can restore the original content |
|
320 | + * via restoreStrings(). |
|
321 | + * |
|
322 | + * @param string[optional] $chars |
|
323 | + */ |
|
324 | + protected function extractStrings($chars = '\'"') |
|
325 | + { |
|
326 | + // PHP only supports $this inside anonymous functions since 5.4 |
|
327 | + $minifier = $this; |
|
328 | + $callback = function ($match) use ($minifier) { |
|
329 | + // check the second index here, because the first always contains a quote |
|
330 | + if ($match[2] === '') { |
|
331 | + /* |
|
332 | 332 | * Empty strings need no placeholder; they can't be confused for |
333 | 333 | * anything else anyway. |
334 | 334 | * But we still needed to match them, for the extraction routine |
335 | 335 | * to skip over this particular string. |
336 | 336 | */ |
337 | - return $match[0]; |
|
338 | - } |
|
337 | + return $match[0]; |
|
338 | + } |
|
339 | 339 | |
340 | - $count = count($minifier->extracted); |
|
341 | - $placeholder = $match[1].$count.$match[1]; |
|
342 | - $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1]; |
|
340 | + $count = count($minifier->extracted); |
|
341 | + $placeholder = $match[1].$count.$match[1]; |
|
342 | + $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1]; |
|
343 | 343 | |
344 | - return $placeholder; |
|
345 | - }; |
|
344 | + return $placeholder; |
|
345 | + }; |
|
346 | 346 | |
347 | - /* |
|
347 | + /* |
|
348 | 348 | * The \\ messiness explained: |
349 | 349 | * * Don't count ' or " as end-of-string if it's escaped (has backslash |
350 | 350 | * in front of it) |
@@ -356,75 +356,75 @@ discard block |
||
356 | 356 | * considered as escape-char (times 2) and to get it in the regex, |
357 | 357 | * escaped (times 2) |
358 | 358 | */ |
359 | - $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback); |
|
360 | - } |
|
361 | - |
|
362 | - /** |
|
363 | - * This method will restore all extracted data (strings, regexes) that were |
|
364 | - * replaced with placeholder text in extract*(). The original content was |
|
365 | - * saved in $this->extracted. |
|
366 | - * |
|
367 | - * @param string $content |
|
368 | - * |
|
369 | - * @return string |
|
370 | - */ |
|
371 | - protected function restoreExtractedData($content) |
|
372 | - { |
|
373 | - if (!$this->extracted) { |
|
374 | - // nothing was extracted, nothing to restore |
|
375 | - return $content; |
|
376 | - } |
|
377 | - |
|
378 | - $content = strtr($content, $this->extracted); |
|
379 | - |
|
380 | - $this->extracted = array(); |
|
381 | - |
|
382 | - return $content; |
|
383 | - } |
|
384 | - |
|
385 | - /** |
|
386 | - * Check if the path is a regular file and can be read. |
|
387 | - * |
|
388 | - * @param string $path |
|
389 | - * |
|
390 | - * @return bool |
|
391 | - */ |
|
392 | - protected function canImportFile($path) |
|
393 | - { |
|
394 | - return strlen($path) < PHP_MAXPATHLEN && @is_file($path) && is_readable($path); |
|
395 | - } |
|
396 | - |
|
397 | - /** |
|
398 | - * Attempts to open file specified by $path for writing. |
|
399 | - * |
|
400 | - * @param string $path The path to the file |
|
401 | - * |
|
402 | - * @return resource Specifier for the target file |
|
403 | - * |
|
404 | - * @throws IOException |
|
405 | - */ |
|
406 | - protected function openFileForWriting($path) |
|
407 | - { |
|
408 | - if (($handler = @fopen($path, 'w')) === false) { |
|
409 | - throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.'); |
|
410 | - } |
|
411 | - |
|
412 | - return $handler; |
|
413 | - } |
|
414 | - |
|
415 | - /** |
|
416 | - * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions. |
|
417 | - * |
|
418 | - * @param resource $handler The resource to write to |
|
419 | - * @param string $content The content to write |
|
420 | - * @param string $path The path to the file (for exception printing only) |
|
421 | - * |
|
422 | - * @throws IOException |
|
423 | - */ |
|
424 | - protected function writeToFile($handler, $content, $path = '') |
|
425 | - { |
|
426 | - if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) { |
|
427 | - throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.'); |
|
428 | - } |
|
429 | - } |
|
359 | + $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback); |
|
360 | + } |
|
361 | + |
|
362 | + /** |
|
363 | + * This method will restore all extracted data (strings, regexes) that were |
|
364 | + * replaced with placeholder text in extract*(). The original content was |
|
365 | + * saved in $this->extracted. |
|
366 | + * |
|
367 | + * @param string $content |
|
368 | + * |
|
369 | + * @return string |
|
370 | + */ |
|
371 | + protected function restoreExtractedData($content) |
|
372 | + { |
|
373 | + if (!$this->extracted) { |
|
374 | + // nothing was extracted, nothing to restore |
|
375 | + return $content; |
|
376 | + } |
|
377 | + |
|
378 | + $content = strtr($content, $this->extracted); |
|
379 | + |
|
380 | + $this->extracted = array(); |
|
381 | + |
|
382 | + return $content; |
|
383 | + } |
|
384 | + |
|
385 | + /** |
|
386 | + * Check if the path is a regular file and can be read. |
|
387 | + * |
|
388 | + * @param string $path |
|
389 | + * |
|
390 | + * @return bool |
|
391 | + */ |
|
392 | + protected function canImportFile($path) |
|
393 | + { |
|
394 | + return strlen($path) < PHP_MAXPATHLEN && @is_file($path) && is_readable($path); |
|
395 | + } |
|
396 | + |
|
397 | + /** |
|
398 | + * Attempts to open file specified by $path for writing. |
|
399 | + * |
|
400 | + * @param string $path The path to the file |
|
401 | + * |
|
402 | + * @return resource Specifier for the target file |
|
403 | + * |
|
404 | + * @throws IOException |
|
405 | + */ |
|
406 | + protected function openFileForWriting($path) |
|
407 | + { |
|
408 | + if (($handler = @fopen($path, 'w')) === false) { |
|
409 | + throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.'); |
|
410 | + } |
|
411 | + |
|
412 | + return $handler; |
|
413 | + } |
|
414 | + |
|
415 | + /** |
|
416 | + * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions. |
|
417 | + * |
|
418 | + * @param resource $handler The resource to write to |
|
419 | + * @param string $content The content to write |
|
420 | + * @param string $path The path to the file (for exception printing only) |
|
421 | + * |
|
422 | + * @throws IOException |
|
423 | + */ |
|
424 | + protected function writeToFile($handler, $content, $path = '') |
|
425 | + { |
|
426 | + if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) { |
|
427 | + throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.'); |
|
428 | + } |
|
429 | + } |
|
430 | 430 | } |
@@ -15,8 +15,9 @@ discard block |
||
15 | 15 | * Original module by Mach8 - We'll never forget you. |
16 | 16 | */ |
17 | 17 | |
18 | -if (!defined('SMF')) |
|
18 | +if (!defined('SMF')) { |
|
19 | 19 | die('No direct access...'); |
20 | +} |
|
20 | 21 | |
21 | 22 | /** |
22 | 23 | * splits a topic into two topics. |
@@ -30,15 +31,17 @@ discard block |
||
30 | 31 | global $topic, $sourcedir; |
31 | 32 | |
32 | 33 | // And... which topic were you splitting, again? |
33 | - if (empty($topic)) |
|
34 | - fatal_lang_error('numbers_one_to_nine', false); |
|
34 | + if (empty($topic)) { |
|
35 | + fatal_lang_error('numbers_one_to_nine', false); |
|
36 | + } |
|
35 | 37 | |
36 | 38 | // Are you allowed to split topics? |
37 | 39 | isAllowedTo('split_any'); |
38 | 40 | |
39 | 41 | // Load up the "dependencies" - the template, getMsgMemberID(), and sendNotifications(). |
40 | - if (!isset($_REQUEST['xml'])) |
|
41 | - loadTemplate('SplitTopics'); |
|
42 | + if (!isset($_REQUEST['xml'])) { |
|
43 | + loadTemplate('SplitTopics'); |
|
44 | + } |
|
42 | 45 | require_once($sourcedir . '/Subs-Boards.php'); |
43 | 46 | require_once($sourcedir . '/Subs-Post.php'); |
44 | 47 | |
@@ -50,12 +53,12 @@ discard block |
||
50 | 53 | ); |
51 | 54 | |
52 | 55 | // ?action=splittopics;sa=LETSBREAKIT won't work, sorry. |
53 | - if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) |
|
54 | - SplitIndex(); |
|
55 | - |
|
56 | - else |
|
57 | - call_helper($subActions[$_REQUEST['sa']]); |
|
58 | -} |
|
56 | + if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) { |
|
57 | + SplitIndex(); |
|
58 | + } else { |
|
59 | + call_helper($subActions[$_REQUEST['sa']]); |
|
60 | + } |
|
61 | + } |
|
59 | 62 | |
60 | 63 | /** |
61 | 64 | * screen shown before the actual split. |
@@ -71,8 +74,9 @@ discard block |
||
71 | 74 | global $txt, $topic, $context, $smcFunc, $modSettings; |
72 | 75 | |
73 | 76 | // Validate "at". |
74 | - if (empty($_GET['at'])) |
|
75 | - fatal_lang_error('numbers_one_to_nine', false); |
|
77 | + if (empty($_GET['at'])) { |
|
78 | + fatal_lang_error('numbers_one_to_nine', false); |
|
79 | + } |
|
76 | 80 | $_GET['at'] = (int) $_GET['at']; |
77 | 81 | |
78 | 82 | // Retrieve the subject and stuff of the specific topic/message. |
@@ -89,26 +93,31 @@ discard block |
||
89 | 93 | 'split_at' => $_GET['at'], |
90 | 94 | ) |
91 | 95 | ); |
92 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
93 | - fatal_lang_error('cant_find_messages'); |
|
96 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
97 | + fatal_lang_error('cant_find_messages'); |
|
98 | + } |
|
94 | 99 | list ($_REQUEST['subname'], $num_replies, $unapproved_posts, $id_first_msg, $approved) = $smcFunc['db_fetch_row']($request); |
95 | 100 | $smcFunc['db_free_result']($request); |
96 | 101 | |
97 | 102 | // If not approved validate they can see it. |
98 | - if ($modSettings['postmod_active'] && !$approved) |
|
99 | - isAllowedTo('approve_posts'); |
|
103 | + if ($modSettings['postmod_active'] && !$approved) { |
|
104 | + isAllowedTo('approve_posts'); |
|
105 | + } |
|
100 | 106 | |
101 | 107 | // If this topic has unapproved posts, we need to count them too... |
102 | - if ($modSettings['postmod_active'] && allowedTo('approve_posts')) |
|
103 | - $num_replies += $unapproved_posts - ($approved ? 0 : 1); |
|
108 | + if ($modSettings['postmod_active'] && allowedTo('approve_posts')) { |
|
109 | + $num_replies += $unapproved_posts - ($approved ? 0 : 1); |
|
110 | + } |
|
104 | 111 | |
105 | 112 | // Check if there is more than one message in the topic. (there should be.) |
106 | - if ($num_replies < 1) |
|
107 | - fatal_lang_error('topic_one_post', false); |
|
113 | + if ($num_replies < 1) { |
|
114 | + fatal_lang_error('topic_one_post', false); |
|
115 | + } |
|
108 | 116 | |
109 | 117 | // Check if this is the first message in the topic (if so, the first and second option won't be available) |
110 | - if ($id_first_msg == $_GET['at']) |
|
111 | - return SplitSelectTopics(); |
|
118 | + if ($id_first_msg == $_GET['at']) { |
|
119 | + return SplitSelectTopics(); |
|
120 | + } |
|
112 | 121 | |
113 | 122 | // Basic template information.... |
114 | 123 | $context['message'] = array( |
@@ -137,8 +146,9 @@ discard block |
||
137 | 146 | checkSession(); |
138 | 147 | |
139 | 148 | // Clean up the subject. |
140 | - if (!isset($_POST['subname']) || $_POST['subname'] == '') |
|
141 | - $_POST['subname'] = $txt['new_topic']; |
|
149 | + if (!isset($_POST['subname']) || $_POST['subname'] == '') { |
|
150 | + $_POST['subname'] = $txt['new_topic']; |
|
151 | + } |
|
142 | 152 | |
143 | 153 | // Redirect to the selector if they chose selective. |
144 | 154 | if ($_POST['step2'] == 'selective') |
@@ -163,16 +173,19 @@ discard block |
||
163 | 173 | 'split_at' => $_POST['at'], |
164 | 174 | ) |
165 | 175 | ); |
166 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
167 | - $messagesToBeSplit[] = $row['id_msg']; |
|
176 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
177 | + $messagesToBeSplit[] = $row['id_msg']; |
|
178 | + } |
|
168 | 179 | $smcFunc['db_free_result']($request); |
169 | 180 | } |
170 | 181 | // Only the selected message has to be split. That should be easy. |
171 | - elseif ($_POST['step2'] == 'onlythis') |
|
172 | - $messagesToBeSplit[] = $_POST['at']; |
|
182 | + elseif ($_POST['step2'] == 'onlythis') { |
|
183 | + $messagesToBeSplit[] = $_POST['at']; |
|
184 | + } |
|
173 | 185 | // There's another action?! |
174 | - else |
|
175 | - fatal_lang_error('no_access', false); |
|
186 | + else { |
|
187 | + fatal_lang_error('no_access', false); |
|
188 | + } |
|
176 | 189 | |
177 | 190 | $context['old_topic'] = $topic; |
178 | 191 | $context['new_topic'] = splitTopic($topic, $messagesToBeSplit, $_POST['subname']); |
@@ -199,8 +212,9 @@ discard block |
||
199 | 212 | $_SESSION['split_selection'][$topic] = empty($_SESSION['split_selection'][$topic]) ? array() : $_SESSION['split_selection'][$topic]; |
200 | 213 | |
201 | 214 | // This is a special case for split topics from quick-moderation checkboxes |
202 | - if (isset($_REQUEST['subname_enc'])) |
|
203 | - $_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']); |
|
215 | + if (isset($_REQUEST['subname_enc'])) { |
|
216 | + $_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']); |
|
217 | + } |
|
204 | 218 | |
205 | 219 | $context['not_selected'] = array( |
206 | 220 | 'num_messages' => 0, |
@@ -252,10 +266,12 @@ discard block |
||
252 | 266 | ) |
253 | 267 | ); |
254 | 268 | // You can't split the last message off. |
255 | - if (empty($context['not_selected']['start']) && $smcFunc['db_num_rows']($request) <= 1 && $_REQUEST['move'] == 'down') |
|
256 | - $_REQUEST['move'] = ''; |
|
257 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
258 | - $original_msgs['not_selected'][] = $row['id_msg']; |
|
269 | + if (empty($context['not_selected']['start']) && $smcFunc['db_num_rows']($request) <= 1 && $_REQUEST['move'] == 'down') { |
|
270 | + $_REQUEST['move'] = ''; |
|
271 | + } |
|
272 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
273 | + $original_msgs['not_selected'][] = $row['id_msg']; |
|
274 | + } |
|
259 | 275 | $smcFunc['db_free_result']($request); |
260 | 276 | if (!empty($_SESSION['split_selection'][$topic])) |
261 | 277 | { |
@@ -275,8 +291,9 @@ discard block |
||
275 | 291 | 'messages_per_page' => $context['messages_per_page'], |
276 | 292 | ) |
277 | 293 | ); |
278 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
279 | - $original_msgs['selected'][] = $row['id_msg']; |
|
294 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
295 | + $original_msgs['selected'][] = $row['id_msg']; |
|
296 | + } |
|
280 | 297 | $smcFunc['db_free_result']($request); |
281 | 298 | } |
282 | 299 | } |
@@ -286,12 +303,13 @@ discard block |
||
286 | 303 | { |
287 | 304 | $_REQUEST['msg'] = (int) $_REQUEST['msg']; |
288 | 305 | |
289 | - if ($_REQUEST['move'] == 'reset') |
|
290 | - $_SESSION['split_selection'][$topic] = array(); |
|
291 | - elseif ($_REQUEST['move'] == 'up') |
|
292 | - $_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_REQUEST['msg'])); |
|
293 | - else |
|
294 | - $_SESSION['split_selection'][$topic][] = $_REQUEST['msg']; |
|
306 | + if ($_REQUEST['move'] == 'reset') { |
|
307 | + $_SESSION['split_selection'][$topic] = array(); |
|
308 | + } elseif ($_REQUEST['move'] == 'up') { |
|
309 | + $_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_REQUEST['msg'])); |
|
310 | + } else { |
|
311 | + $_SESSION['split_selection'][$topic][] = $_REQUEST['msg']; |
|
312 | + } |
|
295 | 313 | } |
296 | 314 | |
297 | 315 | // Make sure the selection is still accurate. |
@@ -310,8 +328,9 @@ discard block |
||
310 | 328 | ) |
311 | 329 | ); |
312 | 330 | $_SESSION['split_selection'][$topic] = array(); |
313 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
314 | - $_SESSION['split_selection'][$topic][] = $row['id_msg']; |
|
331 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
332 | + $_SESSION['split_selection'][$topic][] = $row['id_msg']; |
|
333 | + } |
|
315 | 334 | $smcFunc['db_free_result']($request); |
316 | 335 | } |
317 | 336 | |
@@ -328,13 +347,15 @@ discard block |
||
328 | 347 | 'is_approved' => 1, |
329 | 348 | ) |
330 | 349 | ); |
331 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
332 | - $context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages']; |
|
350 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
351 | + $context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages']; |
|
352 | + } |
|
333 | 353 | $smcFunc['db_free_result']($request); |
334 | 354 | |
335 | 355 | // Fix an oversized starting page (to make sure both pageindexes are properly set). |
336 | - if ($context['selected']['start'] >= $context['selected']['num_messages']) |
|
337 | - $context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page']))); |
|
356 | + if ($context['selected']['start'] >= $context['selected']['num_messages']) { |
|
357 | + $context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page']))); |
|
358 | + } |
|
338 | 359 | |
339 | 360 | // Build a page list of the not-selected topics... |
340 | 361 | $context['not_selected']['page_index'] = constructPageIndex($scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_REQUEST['subname']), array('%' => '%%')) . ';topic=' . $topic . '.%1$d;start2=' . $context['selected']['start'], $context['not_selected']['start'], $context['not_selected']['num_messages'], $context['messages_per_page'], true); |
@@ -434,11 +455,12 @@ discard block |
||
434 | 455 | ); |
435 | 456 | |
436 | 457 | $context['changes'] = array(); |
437 | - foreach ($changes as $change_type => $change_array) |
|
438 | - foreach ($change_array as $section => $msg_array) |
|
458 | + foreach ($changes as $change_type => $change_array) { |
|
459 | + foreach ($change_array as $section => $msg_array) |
|
439 | 460 | { |
440 | 461 | if (empty($msg_array)) |
441 | 462 | continue; |
463 | + } |
|
442 | 464 | |
443 | 465 | foreach ($msg_array as $id_msg) |
444 | 466 | { |
@@ -447,8 +469,9 @@ discard block |
||
447 | 469 | 'type' => $change_type, |
448 | 470 | 'section' => $section, |
449 | 471 | ); |
450 | - if ($change_type == 'insert') |
|
451 | - $context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg]; |
|
472 | + if ($change_type == 'insert') { |
|
473 | + $context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg]; |
|
474 | + } |
|
452 | 475 | } |
453 | 476 | } |
454 | 477 | } |
@@ -468,12 +491,14 @@ discard block |
||
468 | 491 | checkSession(); |
469 | 492 | |
470 | 493 | // Default the subject in case it's blank. |
471 | - if (!isset($_POST['subname']) || $_POST['subname'] == '') |
|
472 | - $_POST['subname'] = $txt['new_topic']; |
|
494 | + if (!isset($_POST['subname']) || $_POST['subname'] == '') { |
|
495 | + $_POST['subname'] = $txt['new_topic']; |
|
496 | + } |
|
473 | 497 | |
474 | 498 | // You must've selected some messages! Can't split out none! |
475 | - if (empty($_SESSION['split_selection'][$topic])) |
|
476 | - fatal_lang_error('no_posts_selected', false); |
|
499 | + if (empty($_SESSION['split_selection'][$topic])) { |
|
500 | + fatal_lang_error('no_posts_selected', false); |
|
501 | + } |
|
477 | 502 | |
478 | 503 | $context['old_topic'] = $topic; |
479 | 504 | $context['new_topic'] = splitTopic($topic, $_SESSION['split_selection'][$topic], $_POST['subname']); |
@@ -499,8 +524,9 @@ discard block |
||
499 | 524 | global $smcFunc, $txt, $sourcedir; |
500 | 525 | |
501 | 526 | // Nothing to split? |
502 | - if (empty($splitMessages)) |
|
503 | - fatal_lang_error('no_posts_selected', false); |
|
527 | + if (empty($splitMessages)) { |
|
528 | + fatal_lang_error('no_posts_selected', false); |
|
529 | + } |
|
504 | 530 | |
505 | 531 | // Get some board info. |
506 | 532 | $request = $smcFunc['db_query']('', ' |
@@ -532,8 +558,9 @@ discard block |
||
532 | 558 | ) |
533 | 559 | ); |
534 | 560 | // You can't select ALL the messages! |
535 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
536 | - fatal_lang_error('selected_all_posts', false); |
|
561 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
562 | + fatal_lang_error('selected_all_posts', false); |
|
563 | + } |
|
537 | 564 | |
538 | 565 | $split1_first_msg = null; |
539 | 566 | $split1_last_msg = null; |
@@ -541,24 +568,27 @@ discard block |
||
541 | 568 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
542 | 569 | { |
543 | 570 | // Get the right first and last message dependant on approved state... |
544 | - if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg) |
|
545 | - $split1_first_msg = $row['myid_first_msg']; |
|
546 | - if (empty($split1_last_msg) || $row['approved']) |
|
547 | - $split1_last_msg = $row['myid_last_msg']; |
|
571 | + if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg) { |
|
572 | + $split1_first_msg = $row['myid_first_msg']; |
|
573 | + } |
|
574 | + if (empty($split1_last_msg) || $row['approved']) { |
|
575 | + $split1_last_msg = $row['myid_last_msg']; |
|
576 | + } |
|
548 | 577 | |
549 | 578 | // Get the counts correct... |
550 | 579 | if ($row['approved']) |
551 | 580 | { |
552 | 581 | $split1_replies = $row['message_count'] - 1; |
553 | 582 | $split1_unapprovedposts = 0; |
554 | - } |
|
555 | - else |
|
583 | + } else |
|
556 | 584 | { |
557 | - if (!isset($split1_replies)) |
|
558 | - $split1_replies = 0; |
|
585 | + if (!isset($split1_replies)) { |
|
586 | + $split1_replies = 0; |
|
587 | + } |
|
559 | 588 | // If the topic isn't approved then num replies must go up by one... as first post wouldn't be counted. |
560 | - elseif (!$split1_approved) |
|
561 | - $split1_replies++; |
|
589 | + elseif (!$split1_approved) { |
|
590 | + $split1_replies++; |
|
591 | + } |
|
562 | 592 | |
563 | 593 | $split1_unapprovedposts = $row['message_count']; |
564 | 594 | } |
@@ -584,10 +614,12 @@ discard block |
||
584 | 614 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
585 | 615 | { |
586 | 616 | // As before get the right first and last message dependant on approved state... |
587 | - if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg) |
|
588 | - $split2_first_msg = $row['myid_first_msg']; |
|
589 | - if (empty($split2_last_msg) || $row['approved']) |
|
590 | - $split2_last_msg = $row['myid_last_msg']; |
|
617 | + if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg) { |
|
618 | + $split2_first_msg = $row['myid_first_msg']; |
|
619 | + } |
|
620 | + if (empty($split2_last_msg) || $row['approved']) { |
|
621 | + $split2_last_msg = $row['myid_last_msg']; |
|
622 | + } |
|
591 | 623 | |
592 | 624 | // Then do the counts again... |
593 | 625 | if ($row['approved']) |
@@ -595,18 +627,20 @@ discard block |
||
595 | 627 | $split2_approved = true; |
596 | 628 | $split2_replies = $row['message_count'] - 1; |
597 | 629 | $split2_unapprovedposts = 0; |
598 | - } |
|
599 | - else |
|
630 | + } else |
|
600 | 631 | { |
601 | 632 | // Should this one be approved?? |
602 | - if ($split2_first_msg == $row['myid_first_msg']) |
|
603 | - $split2_approved = false; |
|
633 | + if ($split2_first_msg == $row['myid_first_msg']) { |
|
634 | + $split2_approved = false; |
|
635 | + } |
|
604 | 636 | |
605 | - if (!isset($split2_replies)) |
|
606 | - $split2_replies = 0; |
|
637 | + if (!isset($split2_replies)) { |
|
638 | + $split2_replies = 0; |
|
639 | + } |
|
607 | 640 | // As before, fix number of replies. |
608 | - elseif (!$split2_approved) |
|
609 | - $split2_replies++; |
|
641 | + elseif (!$split2_approved) { |
|
642 | + $split2_replies++; |
|
643 | + } |
|
610 | 644 | |
611 | 645 | $split2_unapprovedposts = $row['message_count']; |
612 | 646 | } |
@@ -616,12 +650,14 @@ discard block |
||
616 | 650 | $split2_lastMem = getMsgMemberID($split2_last_msg); |
617 | 651 | |
618 | 652 | // No database changes yet, so let's double check to see if everything makes at least a little sense. |
619 | - if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved)) |
|
620 | - fatal_lang_error('cant_find_messages'); |
|
653 | + if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved)) { |
|
654 | + fatal_lang_error('cant_find_messages'); |
|
655 | + } |
|
621 | 656 | |
622 | 657 | // You cannot split off the first message of a topic. |
623 | - if ($split1_first_msg > $split2_first_msg) |
|
624 | - fatal_lang_error('split_first_post', false); |
|
658 | + if ($split1_first_msg > $split2_first_msg) { |
|
659 | + fatal_lang_error('split_first_post', false); |
|
660 | + } |
|
625 | 661 | |
626 | 662 | // We're off to insert the new topic! Use 0 for now to avoid UNIQUE errors. |
627 | 663 | $smcFunc['db_insert']('', |
@@ -644,14 +680,16 @@ discard block |
||
644 | 680 | array('id_topic') |
645 | 681 | ); |
646 | 682 | $split2_ID_TOPIC = $smcFunc['db_insert_id']('{db_prefix}topics', 'id_topic'); |
647 | - if ($split2_ID_TOPIC <= 0) |
|
648 | - fatal_lang_error('cant_insert_topic'); |
|
683 | + if ($split2_ID_TOPIC <= 0) { |
|
684 | + fatal_lang_error('cant_insert_topic'); |
|
685 | + } |
|
649 | 686 | |
650 | 687 | // Move the messages over to the other topic. |
651 | 688 | $new_subject = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($new_subject)), array("\r" => '', "\n" => '', "\t" => '')); |
652 | 689 | // Check the subject length. |
653 | - if ($smcFunc['strlen']($new_subject) > 100) |
|
654 | - $new_subject = $smcFunc['substr']($new_subject, 0, 100); |
|
690 | + if ($smcFunc['strlen']($new_subject) > 100) { |
|
691 | + $new_subject = $smcFunc['substr']($new_subject, 0, 100); |
|
692 | + } |
|
655 | 693 | // Valid subject? |
656 | 694 | if ($new_subject != '') |
657 | 695 | { |
@@ -722,8 +760,8 @@ discard block |
||
722 | 760 | ); |
723 | 761 | |
724 | 762 | // If the new topic isn't approved ensure the first message flags this just in case. |
725 | - if (!$split2_approved) |
|
726 | - $smcFunc['db_query']('', ' |
|
763 | + if (!$split2_approved) { |
|
764 | + $smcFunc['db_query']('', ' |
|
727 | 765 | UPDATE {db_prefix}messages |
728 | 766 | SET approved = {int:approved} |
729 | 767 | WHERE id_msg = {int:id_msg} |
@@ -734,6 +772,7 @@ discard block |
||
734 | 772 | 'id_topic' => $split2_ID_TOPIC, |
735 | 773 | ) |
736 | 774 | ); |
775 | + } |
|
737 | 776 | |
738 | 777 | // The board has more topics now (Or more unapproved ones!). |
739 | 778 | $smcFunc['db_query']('', ' |
@@ -760,8 +799,9 @@ discard block |
||
760 | 799 | if ($smcFunc['db_num_rows']($request) > 0) |
761 | 800 | { |
762 | 801 | $replaceEntries = array(); |
763 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
764 | - $replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']); |
|
802 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
803 | + $replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']); |
|
804 | + } |
|
765 | 805 | |
766 | 806 | $smcFunc['db_insert']('ignore', |
767 | 807 | '{db_prefix}log_topics', |
@@ -785,8 +825,9 @@ discard block |
||
785 | 825 | // If there's a search index that needs updating, update it... |
786 | 826 | require_once($sourcedir . '/Search.php'); |
787 | 827 | $searchAPI = findSearchAPI(); |
788 | - if (is_callable(array($searchAPI, 'topicSplit'))) |
|
789 | - $searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages); |
|
828 | + if (is_callable(array($searchAPI, 'topicSplit'))) { |
|
829 | + $searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages); |
|
830 | + } |
|
790 | 831 | |
791 | 832 | // Return the ID of the newly created topic. |
792 | 833 | return $split2_ID_TOPIC; |
@@ -812,12 +853,12 @@ discard block |
||
812 | 853 | ); |
813 | 854 | |
814 | 855 | // ?action=mergetopics;sa=LETSBREAKIT won't work, sorry. |
815 | - if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) |
|
816 | - MergeIndex(); |
|
817 | - |
|
818 | - else |
|
819 | - call_helper($subActions[$_REQUEST['sa']]); |
|
820 | -} |
|
856 | + if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) { |
|
857 | + MergeIndex(); |
|
858 | + } else { |
|
859 | + call_helper($subActions[$_REQUEST['sa']]); |
|
860 | + } |
|
861 | + } |
|
821 | 862 | |
822 | 863 | /** |
823 | 864 | * allows to pick a topic to merge the current topic with. |
@@ -831,8 +872,9 @@ discard block |
||
831 | 872 | global $txt, $board, $context, $smcFunc, $sourcedir; |
832 | 873 | global $scripturl, $modSettings; |
833 | 874 | |
834 | - if (!isset($_GET['from'])) |
|
835 | - fatal_lang_error('no_access', false); |
|
875 | + if (!isset($_GET['from'])) { |
|
876 | + fatal_lang_error('no_access', false); |
|
877 | + } |
|
836 | 878 | $_GET['from'] = (int) $_GET['from']; |
837 | 879 | |
838 | 880 | $_REQUEST['targetboard'] = isset($_REQUEST['targetboard']) ? (int) $_REQUEST['targetboard'] : $board; |
@@ -843,9 +885,9 @@ discard block |
||
843 | 885 | { |
844 | 886 | $can_approve_boards = boardsAllowedTo('approve_posts'); |
845 | 887 | $onlyApproved = $can_approve_boards !== array(0) && !in_array($_REQUEST['targetboard'], $can_approve_boards); |
888 | + } else { |
|
889 | + $onlyApproved = false; |
|
846 | 890 | } |
847 | - else |
|
848 | - $onlyApproved = false; |
|
849 | 891 | |
850 | 892 | // How many topics are on this board? (used for paging.) |
851 | 893 | $request = $smcFunc['db_query']('', ' |
@@ -879,8 +921,9 @@ discard block |
||
879 | 921 | 'is_approved' => 1, |
880 | 922 | ) |
881 | 923 | ); |
882 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
883 | - fatal_lang_error('no_board'); |
|
924 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
925 | + fatal_lang_error('no_board'); |
|
926 | + } |
|
884 | 927 | list ($subject) = $smcFunc['db_fetch_row']($request); |
885 | 928 | $smcFunc['db_free_result']($request); |
886 | 929 | |
@@ -893,8 +936,9 @@ discard block |
||
893 | 936 | // Check which boards you have merge permissions on. |
894 | 937 | $merge_boards = boardsAllowedTo('merge_any'); |
895 | 938 | |
896 | - if (empty($merge_boards)) |
|
897 | - fatal_lang_error('cannot_merge_any', 'user'); |
|
939 | + if (empty($merge_boards)) { |
|
940 | + fatal_lang_error('cannot_merge_any', 'user'); |
|
941 | + } |
|
898 | 942 | |
899 | 943 | // No sense in loading this if you can only merge on this board |
900 | 944 | if (count($merge_boards) > 1 || in_array(0, $merge_boards)) |
@@ -908,8 +952,9 @@ discard block |
||
908 | 952 | ); |
909 | 953 | |
910 | 954 | // Only include these boards in the list (0 means you're an admin') |
911 | - if (!in_array(0, $merge_boards)) |
|
912 | - $options['included_boards'] = $merge_boards; |
|
955 | + if (!in_array(0, $merge_boards)) { |
|
956 | + $options['included_boards'] = $merge_boards; |
|
957 | + } |
|
913 | 958 | |
914 | 959 | $context['merge_categories'] = getBoardList($options); |
915 | 960 | } |
@@ -955,8 +1000,9 @@ discard block |
||
955 | 1000 | } |
956 | 1001 | $smcFunc['db_free_result']($request); |
957 | 1002 | |
958 | - if (empty($context['topics']) && count($merge_boards) <= 1 && !in_array(0, $merge_boards)) |
|
959 | - fatal_lang_error('merge_need_more_topics'); |
|
1003 | + if (empty($context['topics']) && count($merge_boards) <= 1 && !in_array(0, $merge_boards)) { |
|
1004 | + fatal_lang_error('merge_need_more_topics'); |
|
1005 | + } |
|
960 | 1006 | |
961 | 1007 | $context['sub_template'] = 'merge'; |
962 | 1008 | } |
@@ -986,24 +1032,29 @@ discard block |
||
986 | 1032 | checkSession('request'); |
987 | 1033 | |
988 | 1034 | // Handle URLs from MergeIndex. |
989 | - if (!empty($_GET['from']) && !empty($_GET['to'])) |
|
990 | - $topics = array((int) $_GET['from'], (int) $_GET['to']); |
|
1035 | + if (!empty($_GET['from']) && !empty($_GET['to'])) { |
|
1036 | + $topics = array((int) $_GET['from'], (int) $_GET['to']); |
|
1037 | + } |
|
991 | 1038 | |
992 | 1039 | // If we came from a form, the topic IDs came by post. |
993 | - if (!empty($_POST['topics']) && is_array($_POST['topics'])) |
|
994 | - $topics = $_POST['topics']; |
|
1040 | + if (!empty($_POST['topics']) && is_array($_POST['topics'])) { |
|
1041 | + $topics = $_POST['topics']; |
|
1042 | + } |
|
995 | 1043 | |
996 | 1044 | // There's nothing to merge with just one topic... |
997 | - if (empty($topics) || !is_array($topics) || count($topics) == 1) |
|
998 | - fatal_lang_error('merge_need_more_topics'); |
|
1045 | + if (empty($topics) || !is_array($topics) || count($topics) == 1) { |
|
1046 | + fatal_lang_error('merge_need_more_topics'); |
|
1047 | + } |
|
999 | 1048 | |
1000 | 1049 | // Make sure every topic is numeric, or some nasty things could be done with the DB. |
1001 | - foreach ($topics as $id => $topic) |
|
1002 | - $topics[$id] = (int) $topic; |
|
1050 | + foreach ($topics as $id => $topic) { |
|
1051 | + $topics[$id] = (int) $topic; |
|
1052 | + } |
|
1003 | 1053 | |
1004 | 1054 | // Joy of all joys, make sure they're not messing about with unapproved topics they can't see :P |
1005 | - if ($modSettings['postmod_active']) |
|
1006 | - $can_approve_boards = boardsAllowedTo('approve_posts'); |
|
1055 | + if ($modSettings['postmod_active']) { |
|
1056 | + $can_approve_boards = boardsAllowedTo('approve_posts'); |
|
1057 | + } |
|
1007 | 1058 | |
1008 | 1059 | // Get info about the topics and polls that will be merged. |
1009 | 1060 | $request = $smcFunc['db_query']('', ' |
@@ -1024,8 +1075,9 @@ discard block |
||
1024 | 1075 | 'limit' => count($topics), |
1025 | 1076 | ) |
1026 | 1077 | ); |
1027 | - if ($smcFunc['db_num_rows']($request) < 2) |
|
1028 | - fatal_lang_error('no_topic_id'); |
|
1078 | + if ($smcFunc['db_num_rows']($request) < 2) { |
|
1079 | + fatal_lang_error('no_topic_id'); |
|
1080 | + } |
|
1029 | 1081 | $num_views = 0; |
1030 | 1082 | $is_sticky = 0; |
1031 | 1083 | $boardTotals = array(); |
@@ -1038,34 +1090,38 @@ discard block |
||
1038 | 1090 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
1039 | 1091 | { |
1040 | 1092 | // Sorry, redirection topics can't be merged |
1041 | - if (!empty($row['id_redirect_topic'])) |
|
1042 | - fatal_lang_error('cannot_merge_redirect', false); |
|
1093 | + if (!empty($row['id_redirect_topic'])) { |
|
1094 | + fatal_lang_error('cannot_merge_redirect', false); |
|
1095 | + } |
|
1043 | 1096 | |
1044 | 1097 | // Make a note for the board counts... |
1045 | - if (!isset($boardTotals[$row['id_board']])) |
|
1046 | - $boardTotals[$row['id_board']] = array( |
|
1098 | + if (!isset($boardTotals[$row['id_board']])) { |
|
1099 | + $boardTotals[$row['id_board']] = array( |
|
1047 | 1100 | 'posts' => 0, |
1048 | 1101 | 'topics' => 0, |
1049 | 1102 | 'unapproved_posts' => 0, |
1050 | 1103 | 'unapproved_topics' => 0 |
1051 | 1104 | ); |
1105 | + } |
|
1052 | 1106 | |
1053 | 1107 | // We can't see unapproved topics here? |
1054 | 1108 | if ($modSettings['postmod_active'] && !$row['approved'] && $can_approve_boards != array(0) && in_array($row['id_board'], $can_approve_boards)) |
1055 | 1109 | { |
1056 | 1110 | unset($topics[$row['id_topic']]); // If we can't see it, we should not merge it and not adjust counts! Instead skip it. |
1057 | 1111 | continue; |
1058 | - }elseif (!$row['approved']) |
|
1059 | - $boardTotals[$row['id_board']]['unapproved_topics']++; |
|
1060 | - else |
|
1061 | - $boardTotals[$row['id_board']]['topics']++; |
|
1112 | + } elseif (!$row['approved']) { |
|
1113 | + $boardTotals[$row['id_board']]['unapproved_topics']++; |
|
1114 | + } else { |
|
1115 | + $boardTotals[$row['id_board']]['topics']++; |
|
1116 | + } |
|
1062 | 1117 | |
1063 | 1118 | $boardTotals[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts']; |
1064 | 1119 | $boardTotals[$row['id_board']]['posts'] += $row['num_replies'] + ($row['approved'] ? 1 : 0); |
1065 | 1120 | |
1066 | 1121 | // In the case of making a redirect, the topic count goes up by one due to the redirect topic. |
1067 | - if (isset($_POST['postRedirect'])) |
|
1068 | - $boardTotals[$row['id_board']]['topics']--; |
|
1122 | + if (isset($_POST['postRedirect'])) { |
|
1123 | + $boardTotals[$row['id_board']]['topics']--; |
|
1124 | + } |
|
1069 | 1125 | |
1070 | 1126 | $topic_data[$row['id_topic']] = array( |
1071 | 1127 | 'id' => $row['id_topic'], |
@@ -1091,11 +1147,13 @@ discard block |
||
1091 | 1147 | $boards[] = $row['id_board']; |
1092 | 1148 | |
1093 | 1149 | // If there's no poll, id_poll == 0... |
1094 | - if ($row['id_poll'] > 0) |
|
1095 | - $polls[] = $row['id_poll']; |
|
1150 | + if ($row['id_poll'] > 0) { |
|
1151 | + $polls[] = $row['id_poll']; |
|
1152 | + } |
|
1096 | 1153 | // Store the id_topic with the lowest id_first_msg. |
1097 | - if (empty($firstTopic)) |
|
1098 | - $firstTopic = $row['id_topic']; |
|
1154 | + if (empty($firstTopic)) { |
|
1155 | + $firstTopic = $row['id_topic']; |
|
1156 | + } |
|
1099 | 1157 | |
1100 | 1158 | // Lowest topic id gets selected as surviving topic id. We need to store this board so we can adjust the topic count (This one will not have a redirect topic) |
1101 | 1159 | if($row['id_topic'] < $lowestTopicId || empty($lowestTopicId) ) |
@@ -1109,11 +1167,13 @@ discard block |
||
1109 | 1167 | $smcFunc['db_free_result']($request); |
1110 | 1168 | |
1111 | 1169 | // If we didn't get any topics then they've been messing with unapproved stuff. |
1112 | - if (empty($topic_data)) |
|
1113 | - fatal_lang_error('no_topic_id'); |
|
1170 | + if (empty($topic_data)) { |
|
1171 | + fatal_lang_error('no_topic_id'); |
|
1172 | + } |
|
1114 | 1173 | |
1115 | - if (isset($_POST['postRedirect']) && !empty($lowestTopicBoard)) |
|
1116 | - $boardTotals[$lowestTopicBoard]['topics']++; |
|
1174 | + if (isset($_POST['postRedirect']) && !empty($lowestTopicBoard)) { |
|
1175 | + $boardTotals[$lowestTopicBoard]['topics']++; |
|
1176 | + } |
|
1117 | 1177 | |
1118 | 1178 | // Will this be approved? |
1119 | 1179 | $context['is_approved'] = $topic_data[$firstTopic]['approved']; |
@@ -1129,8 +1189,9 @@ discard block |
||
1129 | 1189 | |
1130 | 1190 | // Get the boards a user is allowed to merge in. |
1131 | 1191 | $merge_boards = boardsAllowedTo('merge_any'); |
1132 | - if (empty($merge_boards)) |
|
1133 | - fatal_lang_error('cannot_merge_any', 'user'); |
|
1192 | + if (empty($merge_boards)) { |
|
1193 | + fatal_lang_error('cannot_merge_any', 'user'); |
|
1194 | + } |
|
1134 | 1195 | |
1135 | 1196 | // Make sure they can see all boards.... |
1136 | 1197 | $request = $smcFunc['db_query']('', ' |
@@ -1147,8 +1208,9 @@ discard block |
||
1147 | 1208 | ) |
1148 | 1209 | ); |
1149 | 1210 | // If the number of boards that's in the output isn't exactly the same as we've put in there, you're in trouble. |
1150 | - if ($smcFunc['db_num_rows']($request) != count($boards)) |
|
1151 | - fatal_lang_error('no_board'); |
|
1211 | + if ($smcFunc['db_num_rows']($request) != count($boards)) { |
|
1212 | + fatal_lang_error('no_board'); |
|
1213 | + } |
|
1152 | 1214 | $smcFunc['db_free_result']($request); |
1153 | 1215 | |
1154 | 1216 | if (empty($_REQUEST['sa']) || $_REQUEST['sa'] == 'options') |
@@ -1167,8 +1229,8 @@ discard block |
||
1167 | 1229 | 'limit' => count($polls), |
1168 | 1230 | ) |
1169 | 1231 | ); |
1170 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1171 | - $context['polls'][] = array( |
|
1232 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1233 | + $context['polls'][] = array( |
|
1172 | 1234 | 'id' => $row['id_poll'], |
1173 | 1235 | 'topic' => array( |
1174 | 1236 | 'id' => $row['id_topic'], |
@@ -1177,6 +1239,7 @@ discard block |
||
1177 | 1239 | 'question' => $row['question'], |
1178 | 1240 | 'selected' => $row['id_topic'] == $firstTopic |
1179 | 1241 | ); |
1242 | + } |
|
1180 | 1243 | $smcFunc['db_free_result']($request); |
1181 | 1244 | } |
1182 | 1245 | if (count($boards) > 1) |
@@ -1192,18 +1255,20 @@ discard block |
||
1192 | 1255 | 'limit' => count($boards), |
1193 | 1256 | ) |
1194 | 1257 | ); |
1195 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1196 | - $context['boards'][] = array( |
|
1258 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1259 | + $context['boards'][] = array( |
|
1197 | 1260 | 'id' => $row['id_board'], |
1198 | 1261 | 'name' => $row['name'], |
1199 | 1262 | 'selected' => $row['id_board'] == $topic_data[$firstTopic]['board'] |
1200 | 1263 | ); |
1264 | + } |
|
1201 | 1265 | $smcFunc['db_free_result']($request); |
1202 | 1266 | } |
1203 | 1267 | |
1204 | 1268 | $context['topics'] = $topic_data; |
1205 | - foreach ($topic_data as $id => $topic) |
|
1206 | - $context['topics'][$id]['selected'] = $topic['id'] == $firstTopic; |
|
1269 | + foreach ($topic_data as $id => $topic) { |
|
1270 | + $context['topics'][$id]['selected'] = $topic['id'] == $firstTopic; |
|
1271 | + } |
|
1207 | 1272 | |
1208 | 1273 | $context['page_title'] = $txt['merge']; |
1209 | 1274 | $context['sub_template'] = 'merge_extra_options'; |
@@ -1212,13 +1277,15 @@ discard block |
||
1212 | 1277 | |
1213 | 1278 | // Determine target board. |
1214 | 1279 | $target_board = count($boards) > 1 ? (int) $_REQUEST['board'] : $boards[0]; |
1215 | - if (!in_array($target_board, $boards)) |
|
1216 | - fatal_lang_error('no_board'); |
|
1280 | + if (!in_array($target_board, $boards)) { |
|
1281 | + fatal_lang_error('no_board'); |
|
1282 | + } |
|
1217 | 1283 | |
1218 | 1284 | // Determine which poll will survive and which polls won't. |
1219 | 1285 | $target_poll = count($polls) > 1 ? (int) $_POST['poll'] : (count($polls) == 1 ? $polls[0] : 0); |
1220 | - if ($target_poll > 0 && !in_array($target_poll, $polls)) |
|
1221 | - fatal_lang_error('no_access', false); |
|
1286 | + if ($target_poll > 0 && !in_array($target_poll, $polls)) { |
|
1287 | + fatal_lang_error('no_access', false); |
|
1288 | + } |
|
1222 | 1289 | $deleted_polls = empty($target_poll) ? $polls : array_diff($polls, array($target_poll)); |
1223 | 1290 | |
1224 | 1291 | // Determine the subject of the newly merged topic - was a custom subject specified? |
@@ -1226,19 +1293,23 @@ discard block |
||
1226 | 1293 | { |
1227 | 1294 | $target_subject = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => '')); |
1228 | 1295 | // Keep checking the length. |
1229 | - if ($smcFunc['strlen']($target_subject) > 100) |
|
1230 | - $target_subject = $smcFunc['substr']($target_subject, 0, 100); |
|
1296 | + if ($smcFunc['strlen']($target_subject) > 100) { |
|
1297 | + $target_subject = $smcFunc['substr']($target_subject, 0, 100); |
|
1298 | + } |
|
1231 | 1299 | |
1232 | 1300 | // Nothing left - odd but pick the first topics subject. |
1233 | - if ($target_subject == '') |
|
1234 | - $target_subject = $topic_data[$firstTopic]['subject']; |
|
1301 | + if ($target_subject == '') { |
|
1302 | + $target_subject = $topic_data[$firstTopic]['subject']; |
|
1303 | + } |
|
1235 | 1304 | } |
1236 | 1305 | // A subject was selected from the list. |
1237 | - elseif (!empty($topic_data[(int) $_POST['subject']]['subject'])) |
|
1238 | - $target_subject = $topic_data[(int) $_POST['subject']]['subject']; |
|
1306 | + elseif (!empty($topic_data[(int) $_POST['subject']]['subject'])) { |
|
1307 | + $target_subject = $topic_data[(int) $_POST['subject']]['subject']; |
|
1308 | + } |
|
1239 | 1309 | // Nothing worked? Just take the subject of the first message. |
1240 | - else |
|
1241 | - $target_subject = $topic_data[$firstTopic]['subject']; |
|
1310 | + else { |
|
1311 | + $target_subject = $topic_data[$firstTopic]['subject']; |
|
1312 | + } |
|
1242 | 1313 | |
1243 | 1314 | // Get the first and last message and the number of messages.... |
1244 | 1315 | $request = $smcFunc['db_query']('', ' |
@@ -1264,15 +1335,13 @@ discard block |
||
1264 | 1335 | { |
1265 | 1336 | $num_replies = $row['message_count'] - 1; |
1266 | 1337 | $num_unapproved = 0; |
1267 | - } |
|
1268 | - else |
|
1338 | + } else |
|
1269 | 1339 | { |
1270 | 1340 | $topic_approved = 0; |
1271 | 1341 | $num_replies = 0; |
1272 | 1342 | $num_unapproved = $row['message_count']; |
1273 | 1343 | } |
1274 | - } |
|
1275 | - else |
|
1344 | + } else |
|
1276 | 1345 | { |
1277 | 1346 | // If this has a lower first_msg then the first post is not approved and hence the number of replies was wrong! |
1278 | 1347 | if ($first_msg > $row['first_msg']) |
@@ -1318,8 +1387,9 @@ discard block |
||
1318 | 1387 | list ($member_started) = $smcFunc['db_fetch_row']($request); |
1319 | 1388 | list ($member_updated) = $smcFunc['db_fetch_row']($request); |
1320 | 1389 | // First and last message are the same, so only row was returned. |
1321 | - if ($member_updated === NULL) |
|
1322 | - $member_updated = $member_started; |
|
1390 | + if ($member_updated === NULL) { |
|
1391 | + $member_updated = $member_started; |
|
1392 | + } |
|
1323 | 1393 | |
1324 | 1394 | $smcFunc['db_free_result']($request); |
1325 | 1395 | |
@@ -1332,8 +1402,9 @@ discard block |
||
1332 | 1402 | array( |
1333 | 1403 | 'topic_list' => $topics, |
1334 | 1404 | )); |
1335 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
1336 | - $affected_msgs[] = $row[0]; |
|
1405 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
1406 | + $affected_msgs[] = $row[0]; |
|
1407 | + } |
|
1337 | 1408 | $smcFunc['db_free_result']($request); |
1338 | 1409 | |
1339 | 1410 | // Assign the first topic ID to be the merged topic. |
@@ -1411,9 +1482,9 @@ discard block |
||
1411 | 1482 | // Grab the response prefix (like 'Re: ') in the default forum language. |
1412 | 1483 | if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix'))) |
1413 | 1484 | { |
1414 | - if ($language === $user_info['language']) |
|
1415 | - $context['response_prefix'] = $txt['response_prefix']; |
|
1416 | - else |
|
1485 | + if ($language === $user_info['language']) { |
|
1486 | + $context['response_prefix'] = $txt['response_prefix']; |
|
1487 | + } else |
|
1417 | 1488 | { |
1418 | 1489 | loadLanguage('index', $language, false); |
1419 | 1490 | $context['response_prefix'] = $txt['response_prefix']; |
@@ -1493,8 +1564,9 @@ discard block |
||
1493 | 1564 | if ($smcFunc['db_num_rows']($request) > 0) |
1494 | 1565 | { |
1495 | 1566 | $replaceEntries = array(); |
1496 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1497 | - $replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']); |
|
1567 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1568 | + $replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']); |
|
1569 | + } |
|
1498 | 1570 | |
1499 | 1571 | $smcFunc['db_insert']('replace', |
1500 | 1572 | '{db_prefix}log_topics', |
@@ -1531,8 +1603,9 @@ discard block |
||
1531 | 1603 | if ($smcFunc['db_num_rows']($request) > 0) |
1532 | 1604 | { |
1533 | 1605 | $replaceEntries = array(); |
1534 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1535 | - $replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']); |
|
1606 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1607 | + $replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']); |
|
1608 | + } |
|
1536 | 1609 | |
1537 | 1610 | $smcFunc['db_insert']('replace', |
1538 | 1611 | '{db_prefix}log_notify', |
@@ -1707,8 +1780,9 @@ discard block |
||
1707 | 1780 | // If there's a search index that needs updating, update it... |
1708 | 1781 | require_once($sourcedir . '/Search.php'); |
1709 | 1782 | $searchAPI = findSearchAPI(); |
1710 | - if (is_callable(array($searchAPI, 'topicMerge'))) |
|
1711 | - $searchAPI->topicMerge($id_topic, $topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array($context['response_prefix'], $target_subject)); |
|
1783 | + if (is_callable(array($searchAPI, 'topicMerge'))) { |
|
1784 | + $searchAPI->topicMerge($id_topic, $topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array($context['response_prefix'], $target_subject)); |
|
1785 | + } |
|
1712 | 1786 | |
1713 | 1787 | // Send them to the all done page. |
1714 | 1788 | redirectexit('action=mergetopics;sa=done;to=' . $id_topic . ';targetboard=' . $target_board); |
@@ -842,7 +842,7 @@ |
||
842 | 842 | require_once($sourcedir . '/Subs-Boards.php'); |
843 | 843 | sortBoards($recycle_boards); |
844 | 844 | |
845 | - $recycle_boards = array('') + $recycle_boards; |
|
845 | + $recycle_boards = array('') + $recycle_boards; |
|
846 | 846 | |
847 | 847 | // Here and the board settings... |
848 | 848 | $config_vars = array( |
@@ -13,8 +13,9 @@ discard block |
||
13 | 13 | * @version 2.1 Beta 3 |
14 | 14 | */ |
15 | 15 | |
16 | -if (!defined('SMF')) |
|
16 | +if (!defined('SMF')) { |
|
17 | 17 | die('No direct access...'); |
18 | +} |
|
18 | 19 | |
19 | 20 | /** |
20 | 21 | * The main dispatcher; doesn't do anything, just delegates. |
@@ -92,18 +93,19 @@ discard block |
||
92 | 93 | checkSession('get'); |
93 | 94 | validateToken('admin-bm-' . (int) $_REQUEST['src_board'], 'request'); |
94 | 95 | |
95 | - if ($_REQUEST['move_to'] === 'top') |
|
96 | - $boardOptions = array( |
|
96 | + if ($_REQUEST['move_to'] === 'top') { |
|
97 | + $boardOptions = array( |
|
97 | 98 | 'move_to' => $_REQUEST['move_to'], |
98 | 99 | 'target_category' => (int) $_REQUEST['target_cat'], |
99 | 100 | 'move_first_child' => true, |
100 | 101 | ); |
101 | - else |
|
102 | - $boardOptions = array( |
|
102 | + } else { |
|
103 | + $boardOptions = array( |
|
103 | 104 | 'move_to' => $_REQUEST['move_to'], |
104 | 105 | 'target_board' => (int) $_REQUEST['target_board'], |
105 | 106 | 'move_first_child' => true, |
106 | 107 | ); |
108 | + } |
|
107 | 109 | modifyBoard((int) $_REQUEST['src_board'], $boardOptions); |
108 | 110 | } |
109 | 111 | |
@@ -148,15 +150,16 @@ discard block |
||
148 | 150 | $security = $context['session_var'] . '=' . $context['session_id'] . ';' . $context['admin-bm-' . $context['move_board'] . '_token_var'] . '=' . $context['admin-bm-' . $context['move_board'] . '_token']; |
149 | 151 | foreach ($boardList[$catid] as $boardid) |
150 | 152 | { |
151 | - if (!isset($context['categories'][$catid]['move_link'])) |
|
152 | - $context['categories'][$catid]['move_link'] = array( |
|
153 | + if (!isset($context['categories'][$catid]['move_link'])) { |
|
154 | + $context['categories'][$catid]['move_link'] = array( |
|
153 | 155 | 'child_level' => 0, |
154 | 156 | 'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'', |
155 | 157 | 'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security, |
156 | 158 | ); |
159 | + } |
|
157 | 160 | |
158 | - if (!$context['categories'][$catid]['boards'][$boardid]['move']) |
|
159 | - $context['categories'][$catid]['boards'][$boardid]['move_links'] = array( |
|
161 | + if (!$context['categories'][$catid]['boards'][$boardid]['move']) { |
|
162 | + $context['categories'][$catid]['boards'][$boardid]['move_links'] = array( |
|
160 | 163 | array( |
161 | 164 | 'child_level' => $boards[$boardid]['level'], |
162 | 165 | 'label' => $txt['mboards_order_after'] . '\'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'', |
@@ -170,34 +173,39 @@ discard block |
||
170 | 173 | 'class' => 'here', |
171 | 174 | ), |
172 | 175 | ); |
176 | + } |
|
173 | 177 | |
174 | 178 | $difference = $boards[$boardid]['level'] - $prev_child_level; |
175 | - if ($difference == 1) |
|
176 | - array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null); |
|
177 | - elseif ($difference < 0) |
|
179 | + if ($difference == 1) { |
|
180 | + array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null); |
|
181 | + } elseif ($difference < 0) |
|
178 | 182 | { |
179 | - if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) |
|
180 | - $context['categories'][$catid]['boards'][$prev_board]['move_links'] = array(); |
|
181 | - for ($i = 0; $i < -$difference; $i++) |
|
182 | - if (($temp = array_pop($stack)) != null) |
|
183 | + if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) { |
|
184 | + $context['categories'][$catid]['boards'][$prev_board]['move_links'] = array(); |
|
185 | + } |
|
186 | + for ($i = 0; $i < -$difference; $i++) { |
|
187 | + if (($temp = array_pop($stack)) != null) |
|
183 | 188 | array_unshift($context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp); |
189 | + } |
|
184 | 190 | } |
185 | 191 | |
186 | 192 | $prev_board = $boardid; |
187 | 193 | $prev_child_level = $boards[$boardid]['level']; |
188 | 194 | |
189 | 195 | } |
190 | - if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) |
|
191 | - $context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']); |
|
192 | - elseif (!empty($stack)) |
|
193 | - $context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack; |
|
196 | + if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) { |
|
197 | + $context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']); |
|
198 | + } elseif (!empty($stack)) { |
|
199 | + $context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack; |
|
200 | + } |
|
194 | 201 | |
195 | - if (empty($boardList[$catid])) |
|
196 | - $context['categories'][$catid]['move_link'] = array( |
|
202 | + if (empty($boardList[$catid])) { |
|
203 | + $context['categories'][$catid]['move_link'] = array( |
|
197 | 204 | 'child_level' => 0, |
198 | 205 | 'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($tree['node']['name']) . '\'', |
199 | 206 | 'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security, |
200 | 207 | ); |
208 | + } |
|
201 | 209 | } |
202 | 210 | } |
203 | 211 | |
@@ -253,9 +261,9 @@ discard block |
||
253 | 261 | ); |
254 | 262 | } |
255 | 263 | // Category doesn't exist, man... sorry. |
256 | - elseif (!isset($cat_tree[$_REQUEST['cat']])) |
|
257 | - redirectexit('action=admin;area=manageboards'); |
|
258 | - else |
|
264 | + elseif (!isset($cat_tree[$_REQUEST['cat']])) { |
|
265 | + redirectexit('action=admin;area=manageboards'); |
|
266 | + } else |
|
259 | 267 | { |
260 | 268 | $context['category'] = array( |
261 | 269 | 'id' => $_REQUEST['cat'], |
@@ -267,30 +275,31 @@ discard block |
||
267 | 275 | 'is_empty' => empty($cat_tree[$_REQUEST['cat']]['children']) |
268 | 276 | ); |
269 | 277 | |
270 | - foreach ($boardList[$_REQUEST['cat']] as $child_board) |
|
271 | - $context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name']; |
|
278 | + foreach ($boardList[$_REQUEST['cat']] as $child_board) { |
|
279 | + $context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name']; |
|
280 | + } |
|
272 | 281 | } |
273 | 282 | |
274 | 283 | $prevCat = 0; |
275 | 284 | foreach ($cat_tree as $catid => $tree) |
276 | 285 | { |
277 | - if ($catid == $_REQUEST['cat'] && $prevCat > 0) |
|
278 | - $context['category_order'][$prevCat]['selected'] = true; |
|
279 | - elseif ($catid != $_REQUEST['cat']) |
|
280 | - $context['category_order'][$catid] = array( |
|
286 | + if ($catid == $_REQUEST['cat'] && $prevCat > 0) { |
|
287 | + $context['category_order'][$prevCat]['selected'] = true; |
|
288 | + } elseif ($catid != $_REQUEST['cat']) { |
|
289 | + $context['category_order'][$catid] = array( |
|
281 | 290 | 'id' => $catid, |
282 | 291 | 'name' => $txt['mboards_order_after'] . $tree['node']['name'], |
283 | 292 | 'selected' => false, |
284 | 293 | 'true_name' => $tree['node']['name'] |
285 | 294 | ); |
295 | + } |
|
286 | 296 | $prevCat = $catid; |
287 | 297 | } |
288 | 298 | if (!isset($_REQUEST['delete'])) |
289 | 299 | { |
290 | 300 | $context['sub_template'] = 'modify_category'; |
291 | 301 | $context['page_title'] = $_REQUEST['sa'] == 'newcat' ? $txt['mboards_new_cat_name'] : $txt['catEdit']; |
292 | - } |
|
293 | - else |
|
302 | + } else |
|
294 | 303 | { |
295 | 304 | $context['sub_template'] = 'confirm_category_delete'; |
296 | 305 | $context['page_title'] = $txt['mboards_delete_cat']; |
@@ -327,8 +336,9 @@ discard block |
||
327 | 336 | { |
328 | 337 | $catOptions = array(); |
329 | 338 | |
330 | - if (isset($_POST['cat_order'])) |
|
331 | - $catOptions['move_after'] = (int) $_POST['cat_order']; |
|
339 | + if (isset($_POST['cat_order'])) { |
|
340 | + $catOptions['move_after'] = (int) $_POST['cat_order']; |
|
341 | + } |
|
332 | 342 | |
333 | 343 | // Change "This & That" to "This & That" but don't change "¢" to "&cent;"... |
334 | 344 | $catOptions['cat_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['cat_name']), false, '', $context['description_allowed_tags']); |
@@ -336,10 +346,11 @@ discard block |
||
336 | 346 | |
337 | 347 | $catOptions['is_collapsible'] = isset($_POST['collapse']); |
338 | 348 | |
339 | - if (isset($_POST['add'])) |
|
340 | - createCategory($catOptions); |
|
341 | - else |
|
342 | - modifyCategory($_POST['cat'], $catOptions); |
|
349 | + if (isset($_POST['add'])) { |
|
350 | + createCategory($catOptions); |
|
351 | + } else { |
|
352 | + modifyCategory($_POST['cat'], $catOptions); |
|
353 | + } |
|
343 | 354 | } |
344 | 355 | // If they want to delete - first give them confirmation. |
345 | 356 | elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['empty'])) |
@@ -353,13 +364,14 @@ discard block |
||
353 | 364 | // First off - check if we are moving all the current boards first - before we start deleting! |
354 | 365 | if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1) |
355 | 366 | { |
356 | - if (empty($_POST['cat_to'])) |
|
357 | - fatal_lang_error('mboards_delete_error'); |
|
367 | + if (empty($_POST['cat_to'])) { |
|
368 | + fatal_lang_error('mboards_delete_error'); |
|
369 | + } |
|
358 | 370 | |
359 | 371 | deleteCategories(array($_POST['cat']), (int) $_POST['cat_to']); |
372 | + } else { |
|
373 | + deleteCategories(array($_POST['cat'])); |
|
360 | 374 | } |
361 | - else |
|
362 | - deleteCategories(array($_POST['cat'])); |
|
363 | 375 | } |
364 | 376 | |
365 | 377 | redirectexit('action=admin;area=manageboards'); |
@@ -404,8 +416,9 @@ discard block |
||
404 | 416 | if ($_REQUEST['sa'] == 'newboard') |
405 | 417 | { |
406 | 418 | // Category doesn't exist, man... sorry. |
407 | - if (empty($_REQUEST['cat'])) |
|
408 | - redirectexit('action=admin;area=manageboards'); |
|
419 | + if (empty($_REQUEST['cat'])) { |
|
420 | + redirectexit('action=admin;area=manageboards'); |
|
421 | + } |
|
409 | 422 | |
410 | 423 | // Some things that need to be setup for a new board. |
411 | 424 | $curBoard = array( |
@@ -429,8 +442,7 @@ discard block |
||
429 | 442 | 'category' => (int) $_REQUEST['cat'], |
430 | 443 | 'no_children' => true, |
431 | 444 | ); |
432 | - } |
|
433 | - else |
|
445 | + } else |
|
434 | 446 | { |
435 | 447 | // Just some easy shortcuts. |
436 | 448 | $curBoard = &$boards[$_REQUEST['boardid']]; |
@@ -478,8 +490,9 @@ discard block |
||
478 | 490 | ); |
479 | 491 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
480 | 492 | { |
481 | - if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1) |
|
482 | - $curBoard['member_groups'][] = $row['id_group']; |
|
493 | + if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1) { |
|
494 | + $curBoard['member_groups'][] = $row['id_group']; |
|
495 | + } |
|
483 | 496 | |
484 | 497 | $context['groups'][(int) $row['id_group']] = array( |
485 | 498 | 'id' => $row['id_group'], |
@@ -492,8 +505,9 @@ discard block |
||
492 | 505 | $smcFunc['db_free_result']($request); |
493 | 506 | |
494 | 507 | // Category doesn't exist, man... sorry. |
495 | - if (!isset($boardList[$curBoard['category']])) |
|
496 | - redirectexit('action=admin;area=manageboards'); |
|
508 | + if (!isset($boardList[$curBoard['category']])) { |
|
509 | + redirectexit('action=admin;area=manageboards'); |
|
510 | + } |
|
497 | 511 | |
498 | 512 | foreach ($boardList[$curBoard['category']] as $boardid) |
499 | 513 | { |
@@ -507,8 +521,7 @@ discard block |
||
507 | 521 | 'is_child' => false, |
508 | 522 | 'selected' => true |
509 | 523 | ); |
510 | - } |
|
511 | - else |
|
524 | + } else |
|
512 | 525 | { |
513 | 526 | $context['board_order'][] = array( |
514 | 527 | 'id' => $boardid, |
@@ -525,19 +538,21 @@ discard block |
||
525 | 538 | $context['can_move_children'] = false; |
526 | 539 | $context['children'] = $boards[$_REQUEST['boardid']]['tree']['children']; |
527 | 540 | |
528 | - foreach ($context['board_order'] as $lBoard) |
|
529 | - if ($lBoard['is_child'] == false && $lBoard['selected'] == false) |
|
541 | + foreach ($context['board_order'] as $lBoard) { |
|
542 | + if ($lBoard['is_child'] == false && $lBoard['selected'] == false) |
|
530 | 543 | $context['can_move_children'] = true; |
544 | + } |
|
531 | 545 | } |
532 | 546 | |
533 | 547 | // Get other available categories. |
534 | 548 | $context['categories'] = array(); |
535 | - foreach ($cat_tree as $catID => $tree) |
|
536 | - $context['categories'][] = array( |
|
549 | + foreach ($cat_tree as $catID => $tree) { |
|
550 | + $context['categories'][] = array( |
|
537 | 551 | 'id' => $catID == $curBoard['category'] ? 0 : $catID, |
538 | 552 | 'name' => $tree['node']['name'], |
539 | 553 | 'selected' => $catID == $curBoard['category'] |
540 | 554 | ); |
555 | + } |
|
541 | 556 | |
542 | 557 | $request = $smcFunc['db_query']('', ' |
543 | 558 | SELECT mem.id_member, mem.real_name |
@@ -549,14 +564,16 @@ discard block |
||
549 | 564 | ) |
550 | 565 | ); |
551 | 566 | $context['board']['moderators'] = array(); |
552 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
553 | - $context['board']['moderators'][$row['id_member']] = $row['real_name']; |
|
567 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
568 | + $context['board']['moderators'][$row['id_member']] = $row['real_name']; |
|
569 | + } |
|
554 | 570 | $smcFunc['db_free_result']($request); |
555 | 571 | |
556 | 572 | $context['board']['moderator_list'] = empty($context['board']['moderators']) ? '' : '"' . implode('", "', $context['board']['moderators']) . '"'; |
557 | 573 | |
558 | - if (!empty($context['board']['moderators'])) |
|
559 | - list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1); |
|
574 | + if (!empty($context['board']['moderators'])) { |
|
575 | + list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1); |
|
576 | + } |
|
560 | 577 | |
561 | 578 | // Get all the groups assigned as moderators |
562 | 579 | $request = $smcFunc['db_query']('', ' |
@@ -568,14 +585,16 @@ discard block |
||
568 | 585 | ) |
569 | 586 | ); |
570 | 587 | $context['board']['moderator_groups'] = array(); |
571 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
572 | - $context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name']; |
|
588 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
589 | + $context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name']; |
|
590 | + } |
|
573 | 591 | $smcFunc['db_free_result']($request); |
574 | 592 | |
575 | 593 | $context['board']['moderator_groups_list'] = empty($context['board']['moderator_groups']) ? '' : '"' . implode('", &qout;', $context['board']['moderator_groups']) . '"'; |
576 | 594 | |
577 | - if (!empty($context['board']['moderator_groups'])) |
|
578 | - list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1); |
|
595 | + if (!empty($context['board']['moderator_groups'])) { |
|
596 | + list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1); |
|
597 | + } |
|
579 | 598 | |
580 | 599 | // Get all the themes... |
581 | 600 | $request = $smcFunc['db_query']('', ' |
@@ -587,8 +606,9 @@ discard block |
||
587 | 606 | ) |
588 | 607 | ); |
589 | 608 | $context['themes'] = array(); |
590 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
591 | - $context['themes'][] = $row; |
|
609 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
610 | + $context['themes'][] = $row; |
|
611 | + } |
|
592 | 612 | $smcFunc['db_free_result']($request); |
593 | 613 | |
594 | 614 | if (!isset($_REQUEST['delete'])) |
@@ -596,8 +616,7 @@ discard block |
||
596 | 616 | $context['sub_template'] = 'modify_board'; |
597 | 617 | $context['page_title'] = $txt['boardsEdit']; |
598 | 618 | loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest'); |
599 | - } |
|
600 | - else |
|
619 | + } else |
|
601 | 620 | { |
602 | 621 | $context['sub_template'] = 'confirm_board_delete'; |
603 | 622 | $context['page_title'] = $txt['mboards_delete_board']; |
@@ -641,8 +660,9 @@ discard block |
||
641 | 660 | // Change the boardorder of this board? |
642 | 661 | elseif (!empty($_POST['placement']) && !empty($_POST['board_order'])) |
643 | 662 | { |
644 | - if (!in_array($_POST['placement'], array('before', 'after', 'child'))) |
|
645 | - fatal_lang_error('mangled_post', false); |
|
663 | + if (!in_array($_POST['placement'], array('before', 'after', 'child'))) { |
|
664 | + fatal_lang_error('mangled_post', false); |
|
665 | + } |
|
646 | 666 | |
647 | 667 | $boardOptions['move_to'] = $_POST['placement']; |
648 | 668 | $boardOptions['target_board'] = (int) $_POST['board_order']; |
@@ -655,13 +675,14 @@ discard block |
||
655 | 675 | $boardOptions['access_groups'] = array(); |
656 | 676 | $boardOptions['deny_groups'] = array(); |
657 | 677 | |
658 | - if (!empty($_POST['groups'])) |
|
659 | - foreach ($_POST['groups'] as $group => $action) |
|
678 | + if (!empty($_POST['groups'])) { |
|
679 | + foreach ($_POST['groups'] as $group => $action) |
|
660 | 680 | { |
661 | 681 | if ($action == 'allow') |
662 | 682 | $boardOptions['access_groups'][] = (int) $group; |
663 | - elseif ($action == 'deny') |
|
664 | - $boardOptions['deny_groups'][] = (int) $group; |
|
683 | + } elseif ($action == 'deny') { |
|
684 | + $boardOptions['deny_groups'][] = (int) $group; |
|
685 | + } |
|
665 | 686 | } |
666 | 687 | |
667 | 688 | // People with manage-boards are special. |
@@ -673,8 +694,9 @@ discard block |
||
673 | 694 | // Secondly, make sure those with super cow powers (like apt-get, or in this case manage boards) are upgraded. |
674 | 695 | $boardOptions['access_groups'] = array_unique(array_merge($boardOptions['access_groups'], $board_managers)); |
675 | 696 | |
676 | - if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) |
|
677 | - fatal_lang_error('too_many_groups', false); |
|
697 | + if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) { |
|
698 | + fatal_lang_error('too_many_groups', false); |
|
699 | + } |
|
678 | 700 | |
679 | 701 | // Do not allow HTML tags. Parse the string. |
680 | 702 | $boardOptions['board_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['board_name']), false, '', $context['description_allowed_tags']); |
@@ -685,8 +707,9 @@ discard block |
||
685 | 707 | if (isset($_POST['moderator_list']) && is_array($_POST['moderator_list'])) |
686 | 708 | { |
687 | 709 | $moderators = array(); |
688 | - foreach ($_POST['moderator_list'] as $moderator) |
|
689 | - $moderators[(int) $moderator] = (int) $moderator; |
|
710 | + foreach ($_POST['moderator_list'] as $moderator) { |
|
711 | + $moderators[(int) $moderator] = (int) $moderator; |
|
712 | + } |
|
690 | 713 | $boardOptions['moderators'] = $moderators; |
691 | 714 | } |
692 | 715 | |
@@ -695,8 +718,9 @@ discard block |
||
695 | 718 | if (isset($_POST['moderator_group_list']) && is_array($_POST['moderator_group_list'])) |
696 | 719 | { |
697 | 720 | $moderator_groups = array(); |
698 | - foreach ($_POST['moderator_group_list'] as $moderator_group) |
|
699 | - $moderator_groups[(int) $moderator_group] = (int) $moderator_group; |
|
721 | + foreach ($_POST['moderator_group_list'] as $moderator_group) { |
|
722 | + $moderator_groups[(int) $moderator_group] = (int) $moderator_group; |
|
723 | + } |
|
700 | 724 | $boardOptions['moderator_groups'] = $moderator_groups; |
701 | 725 | } |
702 | 726 | |
@@ -722,56 +746,62 @@ discard block |
||
722 | 746 | $smcFunc['db_free_result']($request); |
723 | 747 | |
724 | 748 | // If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board. |
725 | - if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) |
|
726 | - unset($boardOptions['redirect']); |
|
749 | + if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) { |
|
750 | + unset($boardOptions['redirect']); |
|
751 | + } |
|
727 | 752 | // Reset the redirection count when switching on/off. |
728 | - elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) |
|
729 | - $boardOptions['num_posts'] = 0; |
|
753 | + elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) { |
|
754 | + $boardOptions['num_posts'] = 0; |
|
755 | + } |
|
730 | 756 | // Resetting the count? |
731 | - elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) |
|
732 | - $boardOptions['num_posts'] = 0; |
|
757 | + elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) { |
|
758 | + $boardOptions['num_posts'] = 0; |
|
759 | + } |
|
733 | 760 | } |
734 | 761 | |
735 | 762 | // Create a new board... |
736 | 763 | if (isset($_POST['add'])) |
737 | 764 | { |
738 | 765 | // New boards by default go to the bottom of the category. |
739 | - if (empty($_POST['new_cat'])) |
|
740 | - $boardOptions['target_category'] = (int) $_POST['cur_cat']; |
|
741 | - if (!isset($boardOptions['move_to'])) |
|
742 | - $boardOptions['move_to'] = 'bottom'; |
|
766 | + if (empty($_POST['new_cat'])) { |
|
767 | + $boardOptions['target_category'] = (int) $_POST['cur_cat']; |
|
768 | + } |
|
769 | + if (!isset($boardOptions['move_to'])) { |
|
770 | + $boardOptions['move_to'] = 'bottom'; |
|
771 | + } |
|
743 | 772 | |
744 | 773 | createBoard($boardOptions); |
745 | 774 | } |
746 | 775 | |
747 | 776 | // ...or update an existing board. |
748 | - else |
|
749 | - modifyBoard($_POST['boardid'], $boardOptions); |
|
750 | - } |
|
751 | - elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children'])) |
|
777 | + else { |
|
778 | + modifyBoard($_POST['boardid'], $boardOptions); |
|
779 | + } |
|
780 | + } elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children'])) |
|
752 | 781 | { |
753 | 782 | EditBoard(); |
754 | 783 | return; |
755 | - } |
|
756 | - elseif (isset($_POST['delete'])) |
|
784 | + } elseif (isset($_POST['delete'])) |
|
757 | 785 | { |
758 | 786 | // First off - check if we are moving all the current child boards first - before we start deleting! |
759 | 787 | if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1) |
760 | 788 | { |
761 | - if (empty($_POST['board_to'])) |
|
762 | - fatal_lang_error('mboards_delete_board_error'); |
|
789 | + if (empty($_POST['board_to'])) { |
|
790 | + fatal_lang_error('mboards_delete_board_error'); |
|
791 | + } |
|
763 | 792 | |
764 | 793 | deleteBoards(array($_POST['boardid']), (int) $_POST['board_to']); |
794 | + } else { |
|
795 | + deleteBoards(array($_POST['boardid']), 0); |
|
765 | 796 | } |
766 | - else |
|
767 | - deleteBoards(array($_POST['boardid']), 0); |
|
768 | 797 | } |
769 | 798 | |
770 | - if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') |
|
771 | - redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']); |
|
772 | - else |
|
773 | - redirectexit('action=admin;area=manageboards'); |
|
774 | -} |
|
799 | + if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') { |
|
800 | + redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']); |
|
801 | + } else { |
|
802 | + redirectexit('action=admin;area=manageboards'); |
|
803 | + } |
|
804 | + } |
|
775 | 805 | |
776 | 806 | /** |
777 | 807 | * Used to retrieve data for modifying a board category |
@@ -808,8 +838,9 @@ discard block |
||
808 | 838 | $smcFunc['db_free_result']($request); |
809 | 839 | |
810 | 840 | // This would probably never happen, but just to be sure. |
811 | - if ($cat .= $allowed_sa[1]) |
|
812 | - die(str_replace(',', ' to', $cat)); |
|
841 | + if ($cat .= $allowed_sa[1]) { |
|
842 | + die(str_replace(',', ' to', $cat)); |
|
843 | + } |
|
813 | 844 | |
814 | 845 | redirectexit(); |
815 | 846 | } |
@@ -835,8 +866,9 @@ discard block |
||
835 | 866 | 'empty_string' => '', |
836 | 867 | ) |
837 | 868 | ); |
838 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
839 | - $recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name']; |
|
869 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
870 | + $recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name']; |
|
871 | + } |
|
840 | 872 | $smcFunc['db_free_result']($request); |
841 | 873 | |
842 | 874 | require_once($sourcedir . '/Subs-Boards.php'); |
@@ -860,8 +892,9 @@ discard block |
||
860 | 892 | |
861 | 893 | call_integration_hook('integrate_modify_board_settings', array(&$config_vars)); |
862 | 894 | |
863 | - if ($return_config) |
|
864 | - return $config_vars; |
|
895 | + if ($return_config) { |
|
896 | + return $config_vars; |
|
897 | + } |
|
865 | 898 | |
866 | 899 | // Needed for the settings template. |
867 | 900 | require_once($sourcedir . '/ManageServer.php'); |
@@ -14,8 +14,9 @@ discard block |
||
14 | 14 | * @version 2.1 Beta 3 |
15 | 15 | */ |
16 | 16 | |
17 | -if (!defined('SMF')) |
|
17 | +if (!defined('SMF')) { |
|
18 | 18 | die('No direct access...'); |
19 | +} |
|
19 | 20 | |
20 | 21 | /** |
21 | 22 | * Fetches a list of boards and (optional) categories including |
@@ -37,11 +38,12 @@ discard block |
||
37 | 38 | require_once($sourcedir . '/Subs-Boards.php'); |
38 | 39 | |
39 | 40 | // For performance, track the latest post while going through the boards. |
40 | - if (!empty($boardIndexOptions['set_latest_post'])) |
|
41 | - $latest_post = array( |
|
41 | + if (!empty($boardIndexOptions['set_latest_post'])) { |
|
42 | + $latest_post = array( |
|
42 | 43 | 'timestamp' => 0, |
43 | 44 | 'ref' => 0, |
44 | 45 | ); |
46 | + } |
|
45 | 47 | |
46 | 48 | // Find all boards and categories, as well as related information. This will be sorted by the natural order of boards and categories, which we control. |
47 | 49 | $result_boards = $smcFunc['db_query']('boardindex_fetch_boards', ' |
@@ -74,10 +76,11 @@ discard block |
||
74 | 76 | ); |
75 | 77 | |
76 | 78 | // Start with an empty array. |
77 | - if ($boardIndexOptions['include_categories']) |
|
78 | - $categories = array(); |
|
79 | - else |
|
80 | - $this_category = array(); |
|
79 | + if ($boardIndexOptions['include_categories']) { |
|
80 | + $categories = array(); |
|
81 | + } else { |
|
82 | + $this_category = array(); |
|
83 | + } |
|
81 | 84 | $boards = array(); |
82 | 85 | |
83 | 86 | // Run through the categories and boards (or only boards).... |
@@ -88,8 +91,9 @@ discard block |
||
88 | 91 | $row_board['is_read'] = !empty($row_board['is_read']) || $ignoreThisBoard ? '1' : '0'; |
89 | 92 | |
90 | 93 | // Add parent boards to the $boards list later used to fetch moderators |
91 | - if ($row_board['id_parent'] == $boardIndexOptions['parent_id']) |
|
92 | - $boards[] = $row_board['id_board']; |
|
94 | + if ($row_board['id_parent'] == $boardIndexOptions['parent_id']) { |
|
95 | + $boards[] = $row_board['id_board']; |
|
96 | + } |
|
93 | 97 | |
94 | 98 | if ($boardIndexOptions['include_categories']) |
95 | 99 | { |
@@ -111,8 +115,9 @@ discard block |
||
111 | 115 | } |
112 | 116 | |
113 | 117 | // If this board has new posts in it (and isn't the recycle bin!) then the category is new. |
114 | - if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board']) |
|
115 | - $categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != ''; |
|
118 | + if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board']) { |
|
119 | + $categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != ''; |
|
120 | + } |
|
116 | 121 | |
117 | 122 | // Avoid showing category unread link where it only has redirection boards. |
118 | 123 | $categories[$row_board['id_cat']]['show_unread'] = !empty($categories[$row_board['id_cat']]['show_unread']) ? 1 : !$row_board['is_redirect']; |
@@ -160,14 +165,12 @@ discard block |
||
160 | 165 | { |
161 | 166 | $this_category[$row_board['id_board']]['board_class'] = 'redirect'; |
162 | 167 | $this_category[$row_board['id_board']]['board_tooltip'] = $txt['redirect_board']; |
163 | - } |
|
164 | - elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest']) |
|
168 | + } elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest']) |
|
165 | 169 | { |
166 | 170 | // If we're showing to guests, we want to give them the idea that something interesting is going on! |
167 | 171 | $this_category[$row_board['id_board']]['board_class'] = 'on'; |
168 | 172 | $this_category[$row_board['id_board']]['board_tooltip'] = $txt['new_posts']; |
169 | - } |
|
170 | - else |
|
173 | + } else |
|
171 | 174 | { |
172 | 175 | $this_category[$row_board['id_board']]['board_tooltip'] = $txt['old_posts']; |
173 | 176 | } |
@@ -218,14 +221,16 @@ discard block |
||
218 | 221 | // Child of a child... just add it on... |
219 | 222 | elseif (!empty($boardIndexOptions['countChildPosts'])) |
220 | 223 | { |
221 | - if (!isset($parent_map)) |
|
222 | - $parent_map = array(); |
|
224 | + if (!isset($parent_map)) { |
|
225 | + $parent_map = array(); |
|
226 | + } |
|
223 | 227 | |
224 | - if (!isset($parent_map[$row_board['id_parent']])) |
|
225 | - foreach ($this_category as $id => $board) |
|
228 | + if (!isset($parent_map[$row_board['id_parent']])) { |
|
229 | + foreach ($this_category as $id => $board) |
|
226 | 230 | { |
227 | 231 | if (!isset($board['children'][$row_board['id_parent']])) |
228 | 232 | continue; |
233 | + } |
|
229 | 234 | |
230 | 235 | $parent_map[$row_board['id_parent']] = array(&$this_category[$id], &$this_category[$id]['children'][$row_board['id_parent']]); |
231 | 236 | $parent_map[$row_board['id_board']] = array(&$this_category[$id], &$this_category[$id]['children'][$row_board['id_parent']]); |
@@ -246,8 +251,9 @@ discard block |
||
246 | 251 | continue; |
247 | 252 | } |
248 | 253 | // Found a child of a child - skip. |
249 | - else |
|
250 | - continue; |
|
254 | + else { |
|
255 | + continue; |
|
256 | + } |
|
251 | 257 | |
252 | 258 | // Prepare the subject, and make sure it's not too long. |
253 | 259 | censorText($row_board['subject']); |
@@ -268,12 +274,13 @@ discard block |
||
268 | 274 | 'topic' => $row_board['id_topic'] |
269 | 275 | ); |
270 | 276 | |
271 | - if (!empty($settings['avatars_on_boardIndex'])) |
|
272 | - $this_last_post['member']['avatar'] = set_avatar_data(array( |
|
277 | + if (!empty($settings['avatars_on_boardIndex'])) { |
|
278 | + $this_last_post['member']['avatar'] = set_avatar_data(array( |
|
273 | 279 | 'avatar' => $row_board['avatar'], |
274 | 280 | 'email' => $row_board['email_address'], |
275 | 281 | 'filename' => !empty($row['member_filename']) ? $row_board['member_filename'] : '', |
276 | 282 | )); |
283 | + } |
|
277 | 284 | |
278 | 285 | // Provide the href and link. |
279 | 286 | if ($row_board['subject'] != '') |
@@ -285,8 +292,7 @@ discard block |
||
285 | 292 | link, href, subject, start (where they should go for the first unread post.), |
286 | 293 | and member. (which has id, name, link, href, username in it.) */ |
287 | 294 | $this_last_post['last_post_message'] = sprintf($txt['last_post_message'], $this_last_post['member']['link'], $this_last_post['link'], $this_last_post['time']); |
288 | - } |
|
289 | - else |
|
295 | + } else |
|
290 | 296 | { |
291 | 297 | $this_last_post['href'] = ''; |
292 | 298 | $this_last_post['link'] = $txt['not_applicable']; |
@@ -294,8 +300,9 @@ discard block |
||
294 | 300 | } |
295 | 301 | |
296 | 302 | // Set the last post in the parent board. |
297 | - if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this_category[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time']))) |
|
298 | - $this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post; |
|
303 | + if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this_category[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time']))) { |
|
304 | + $this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post; |
|
305 | + } |
|
299 | 306 | // Just in the child...? |
300 | 307 | if ($isChild) |
301 | 308 | { |
@@ -305,15 +312,17 @@ discard block |
||
305 | 312 | $this_category[$row_board['id_parent']]['children'][$row_board['id_board']]['new'] &= $row_board['poster_name'] != ''; |
306 | 313 | } |
307 | 314 | // No last post for this board? It's not new then, is it..? |
308 | - elseif ($row_board['poster_name'] == '') |
|
309 | - $this_category[$row_board['id_board']]['new'] = false; |
|
315 | + elseif ($row_board['poster_name'] == '') { |
|
316 | + $this_category[$row_board['id_board']]['new'] = false; |
|
317 | + } |
|
310 | 318 | |
311 | 319 | // Determine a global most recent topic. |
312 | - if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard) |
|
313 | - $latest_post = array( |
|
320 | + if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard) { |
|
321 | + $latest_post = array( |
|
314 | 322 | 'timestamp' => $row_board['poster_time'], |
315 | 323 | 'ref' => &$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'], |
316 | 324 | ); |
325 | + } |
|
317 | 326 | } |
318 | 327 | $smcFunc['db_free_result']($result_boards); |
319 | 328 | |
@@ -330,8 +339,9 @@ discard block |
||
330 | 339 | if (!empty($moderators[$board['id']])) |
331 | 340 | { |
332 | 341 | $categories[$k]['boards'][$j]['moderators'] = $moderators[$board['id']]; |
333 | - foreach ($moderators[$board['id']] as $moderator) |
|
334 | - $categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link']; |
|
342 | + foreach ($moderators[$board['id']] as $moderator) { |
|
343 | + $categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link']; |
|
344 | + } |
|
335 | 345 | } |
336 | 346 | if (!empty($groups[$board['id']])) |
337 | 347 | { |
@@ -344,16 +354,16 @@ discard block |
||
344 | 354 | } |
345 | 355 | } |
346 | 356 | } |
347 | - } |
|
348 | - else |
|
357 | + } else |
|
349 | 358 | { |
350 | 359 | foreach ($this_category as $k => $board) |
351 | 360 | { |
352 | 361 | if (!empty($moderators[$board['id']])) |
353 | 362 | { |
354 | 363 | $this_category[$k]['moderators'] = $moderators[$board['id']]; |
355 | - foreach ($moderators[$board['id']] as $moderator) |
|
356 | - $this_category[$k]['link_moderators'][] = $moderator['link']; |
|
364 | + foreach ($moderators[$board['id']] as $moderator) { |
|
365 | + $this_category[$k]['link_moderators'][] = $moderator['link']; |
|
366 | + } |
|
357 | 367 | } |
358 | 368 | if (!empty($groups[$board['id']])) |
359 | 369 | { |
@@ -367,20 +377,23 @@ discard block |
||
367 | 377 | } |
368 | 378 | } |
369 | 379 | |
370 | - if ($boardIndexOptions['include_categories']) |
|
371 | - sortCategories($categories); |
|
372 | - else |
|
373 | - sortBoards($this_category); |
|
380 | + if ($boardIndexOptions['include_categories']) { |
|
381 | + sortCategories($categories); |
|
382 | + } else { |
|
383 | + sortBoards($this_category); |
|
384 | + } |
|
374 | 385 | |
375 | 386 | // By now we should know the most recent post...if we wanna know it that is. |
376 | - if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref'])) |
|
377 | - $context['latest_post'] = $latest_post['ref']; |
|
387 | + if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref'])) { |
|
388 | + $context['latest_post'] = $latest_post['ref']; |
|
389 | + } |
|
378 | 390 | |
379 | 391 | // I can't remember why but trying to make a ternary to get this all in one line is actually a Very Bad Idea. |
380 | - if ($boardIndexOptions['include_categories']) |
|
381 | - call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories)); |
|
382 | - else |
|
383 | - call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category)); |
|
392 | + if ($boardIndexOptions['include_categories']) { |
|
393 | + call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories)); |
|
394 | + } else { |
|
395 | + call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category)); |
|
396 | + } |
|
384 | 397 | |
385 | 398 | return $boardIndexOptions['include_categories'] ? $categories : $this_category; |
386 | 399 | } |
@@ -13,8 +13,9 @@ discard block |
||
13 | 13 | * @version 2.1 Beta 3 |
14 | 14 | */ |
15 | 15 | |
16 | -if (!defined('SMF')) |
|
16 | +if (!defined('SMF')) { |
|
17 | 17 | die('No direct access...'); |
18 | +} |
|
18 | 19 | |
19 | 20 | /** |
20 | 21 | * The news dispatcher; doesn't do anything, just delegates. |
@@ -67,8 +68,9 @@ discard block |
||
67 | 68 | ); |
68 | 69 | |
69 | 70 | // Force the right area... |
70 | - if (substr($_REQUEST['sa'], 0, 7) == 'mailing') |
|
71 | - $context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers'; |
|
71 | + if (substr($_REQUEST['sa'], 0, 7) == 'mailing') { |
|
72 | + $context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers'; |
|
73 | + } |
|
72 | 74 | |
73 | 75 | call_helper($subActions[$_REQUEST['sa']][0]); |
74 | 76 | } |
@@ -99,9 +101,10 @@ discard block |
||
99 | 101 | $temp_news = explode("\n", $modSettings['news']); |
100 | 102 | |
101 | 103 | // Remove the items that were selected. |
102 | - foreach ($temp_news as $i => $news) |
|
103 | - if (in_array($i, $_POST['remove'])) |
|
104 | + foreach ($temp_news as $i => $news) { |
|
105 | + if (in_array($i, $_POST['remove'])) |
|
104 | 106 | unset($temp_news[$i]); |
107 | + } |
|
105 | 108 | |
106 | 109 | // Update the database. |
107 | 110 | updateSettings(array('news' => implode("\n", $temp_news))); |
@@ -117,9 +120,9 @@ discard block |
||
117 | 120 | |
118 | 121 | foreach ($_POST['news'] as $i => $news) |
119 | 122 | { |
120 | - if (trim($news) == '') |
|
121 | - unset($_POST['news'][$i]); |
|
122 | - else |
|
123 | + if (trim($news) == '') { |
|
124 | + unset($_POST['news'][$i]); |
|
125 | + } else |
|
123 | 126 | { |
124 | 127 | $_POST['news'][$i] = $smcFunc['htmlspecialchars']($_POST['news'][$i], ENT_QUOTES); |
125 | 128 | preparsecode($_POST['news'][$i]); |
@@ -154,11 +157,12 @@ discard block |
||
154 | 157 | 'data' => array( |
155 | 158 | 'function' => function ($news) |
156 | 159 | { |
157 | - if (is_numeric($news['id'])) |
|
158 | - return '<textarea id="data_' . $news['id'] . '" rows="3" cols="50" name="news[]" class="padding block">' . $news['unparsed'] . '</textarea> |
|
160 | + if (is_numeric($news['id'])) { |
|
161 | + return '<textarea id="data_' . $news['id'] . '" rows="3" cols="50" name="news[]" class="padding block">' . $news['unparsed'] . '</textarea> |
|
159 | 162 | <div class="floatleft" id="preview_' . $news['id'] . '"></div>'; |
160 | - else |
|
161 | - return $news['unparsed']; |
|
163 | + } else { |
|
164 | + return $news['unparsed']; |
|
165 | + } |
|
162 | 166 | }, |
163 | 167 | 'style' => 'width: 50%;', |
164 | 168 | ), |
@@ -183,10 +187,11 @@ discard block |
||
183 | 187 | 'data' => array( |
184 | 188 | 'function' => function ($news) |
185 | 189 | { |
186 | - if (is_numeric($news['id'])) |
|
187 | - return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check">'; |
|
188 | - else |
|
189 | - return ''; |
|
190 | + if (is_numeric($news['id'])) { |
|
191 | + return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check">'; |
|
192 | + } else { |
|
193 | + return ''; |
|
194 | + } |
|
190 | 195 | }, |
191 | 196 | 'class' => 'centercol', |
192 | 197 | ), |
@@ -280,12 +285,13 @@ discard block |
||
280 | 285 | |
281 | 286 | $admin_current_news = array(); |
282 | 287 | // Ready the current news. |
283 | - foreach (explode("\n", $modSettings['news']) as $id => $line) |
|
284 | - $admin_current_news[$id] = array( |
|
288 | + foreach (explode("\n", $modSettings['news']) as $id => $line) { |
|
289 | + $admin_current_news[$id] = array( |
|
285 | 290 | 'id' => $id, |
286 | 291 | 'unparsed' => un_preparsecode($line), |
287 | 292 | 'parsed' => preg_replace('~<([/]?)form[^>]*?[>]*>~i', '<em class="smalltext"><$1form></em>', parse_bbc($line)), |
288 | 293 | ); |
294 | + } |
|
289 | 295 | |
290 | 296 | $admin_current_news['last'] = array( |
291 | 297 | 'id' => 'last', |
@@ -352,10 +358,11 @@ discard block |
||
352 | 358 | 'member_count' => 0, |
353 | 359 | ); |
354 | 360 | |
355 | - if ($row['min_posts'] == -1) |
|
356 | - $normalGroups[$row['id_group']] = $row['id_group']; |
|
357 | - else |
|
358 | - $postGroups[$row['id_group']] = $row['id_group']; |
|
361 | + if ($row['min_posts'] == -1) { |
|
362 | + $normalGroups[$row['id_group']] = $row['id_group']; |
|
363 | + } else { |
|
364 | + $postGroups[$row['id_group']] = $row['id_group']; |
|
365 | + } |
|
359 | 366 | } |
360 | 367 | $smcFunc['db_free_result']($request); |
361 | 368 | |
@@ -371,8 +378,9 @@ discard block |
||
371 | 378 | 'post_group_list' => $postGroups, |
372 | 379 | ) |
373 | 380 | ); |
374 | - while ($row = $smcFunc['db_fetch_assoc']($query)) |
|
375 | - $context['groups'][$row['id_group']]['member_count'] += $row['member_count']; |
|
381 | + while ($row = $smcFunc['db_fetch_assoc']($query)) { |
|
382 | + $context['groups'][$row['id_group']]['member_count'] += $row['member_count']; |
|
383 | + } |
|
376 | 384 | $smcFunc['db_free_result']($query); |
377 | 385 | } |
378 | 386 | |
@@ -388,8 +396,9 @@ discard block |
||
388 | 396 | 'normal_group_list' => $normalGroups, |
389 | 397 | ) |
390 | 398 | ); |
391 | - while ($row = $smcFunc['db_fetch_assoc']($query)) |
|
392 | - $context['groups'][$row['id_group']]['member_count'] += $row['member_count']; |
|
399 | + while ($row = $smcFunc['db_fetch_assoc']($query)) { |
|
400 | + $context['groups'][$row['id_group']]['member_count'] += $row['member_count']; |
|
401 | + } |
|
393 | 402 | $smcFunc['db_free_result']($query); |
394 | 403 | |
395 | 404 | // Also do those who have it as an additional membergroup - this ones more yucky... |
@@ -406,8 +415,9 @@ discard block |
||
406 | 415 | 'blank_string' => '', |
407 | 416 | ) |
408 | 417 | ); |
409 | - while ($row = $smcFunc['db_fetch_assoc']($query)) |
|
410 | - $context['groups'][$row['id_group']]['member_count'] += $row['member_count']; |
|
418 | + while ($row = $smcFunc['db_fetch_assoc']($query)) { |
|
419 | + $context['groups'][$row['id_group']]['member_count'] += $row['member_count']; |
|
420 | + } |
|
411 | 421 | $smcFunc['db_free_result']($query); |
412 | 422 | } |
413 | 423 | |
@@ -458,10 +468,11 @@ discard block |
||
458 | 468 | { |
459 | 469 | $context[$key] = !empty($_REQUEST[$post]) ? $_REQUEST[$post] : ''; |
460 | 470 | |
461 | - if (empty($context[$key]) && empty($_REQUEST['xml'])) |
|
462 | - $context['post_error']['messages'][] = $txt['error_no_' . $post]; |
|
463 | - elseif (!empty($_REQUEST['xml'])) |
|
464 | - continue; |
|
471 | + if (empty($context[$key]) && empty($_REQUEST['xml'])) { |
|
472 | + $context['post_error']['messages'][] = $txt['error_no_' . $post]; |
|
473 | + } elseif (!empty($_REQUEST['xml'])) { |
|
474 | + continue; |
|
475 | + } |
|
465 | 476 | |
466 | 477 | preparsecode($context[$key]); |
467 | 478 | if ($html) |
@@ -540,10 +551,12 @@ discard block |
||
540 | 551 | |
541 | 552 | // Start by finding any members! |
542 | 553 | $toClean = array(); |
543 | - if (!empty($_POST['members'])) |
|
544 | - $toClean[] = 'members'; |
|
545 | - if (!empty($_POST['exclude_members'])) |
|
546 | - $toClean[] = 'exclude_members'; |
|
554 | + if (!empty($_POST['members'])) { |
|
555 | + $toClean[] = 'members'; |
|
556 | + } |
|
557 | + if (!empty($_POST['exclude_members'])) { |
|
558 | + $toClean[] = 'exclude_members'; |
|
559 | + } |
|
547 | 560 | if (!empty($toClean)) |
548 | 561 | { |
549 | 562 | require_once($sourcedir . '/Subs-Auth.php'); |
@@ -555,11 +568,13 @@ discard block |
||
555 | 568 | preg_match_all('~"([^"]+)"~', $_POST[$type], $matches); |
556 | 569 | $_POST[$type] = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $_POST[$type])))); |
557 | 570 | |
558 | - foreach ($_POST[$type] as $index => $member) |
|
559 | - if (strlen(trim($member)) > 0) |
|
571 | + foreach ($_POST[$type] as $index => $member) { |
|
572 | + if (strlen(trim($member)) > 0) |
|
560 | 573 | $_POST[$type][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($member))); |
561 | - else |
|
562 | - unset($_POST[$type][$index]); |
|
574 | + } |
|
575 | + else { |
|
576 | + unset($_POST[$type][$index]); |
|
577 | + } |
|
563 | 578 | |
564 | 579 | // Find the members |
565 | 580 | $_POST[$type] = implode(',', array_keys(findMembers($_POST[$type]))); |
@@ -569,16 +584,18 @@ discard block |
||
569 | 584 | if (isset($_POST['member_list']) && is_array($_POST['member_list'])) |
570 | 585 | { |
571 | 586 | $members = array(); |
572 | - foreach ($_POST['member_list'] as $member_id) |
|
573 | - $members[] = (int) $member_id; |
|
587 | + foreach ($_POST['member_list'] as $member_id) { |
|
588 | + $members[] = (int) $member_id; |
|
589 | + } |
|
574 | 590 | $_POST['members'] = implode(',', $members); |
575 | 591 | } |
576 | 592 | |
577 | 593 | if (isset($_POST['exclude_member_list']) && is_array($_POST['exclude_member_list'])) |
578 | 594 | { |
579 | 595 | $members = array(); |
580 | - foreach ($_POST['exclude_member_list'] as $member_id) |
|
581 | - $members[] = (int) $member_id; |
|
596 | + foreach ($_POST['exclude_member_list'] as $member_id) { |
|
597 | + $members[] = (int) $member_id; |
|
598 | + } |
|
582 | 599 | $_POST['exclude_members'] = implode(',', $members); |
583 | 600 | } |
584 | 601 | |
@@ -602,8 +619,9 @@ discard block |
||
602 | 619 | 'current_time' => time(), |
603 | 620 | ) |
604 | 621 | ); |
605 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
606 | - $context['recipients']['exclude_members'][] = $row['id_member']; |
|
622 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
623 | + $context['recipients']['exclude_members'][] = $row['id_member']; |
|
624 | + } |
|
607 | 625 | $smcFunc['db_free_result']($request); |
608 | 626 | |
609 | 627 | $request = $smcFunc['db_query']('', ' |
@@ -638,8 +656,9 @@ discard block |
||
638 | 656 | WHERE email_address IN(' . implode(', ', $condition_array) .')', |
639 | 657 | $condition_array_params |
640 | 658 | ); |
641 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
642 | - $context['recipients']['exclude_members'][] = $row['id_member']; |
|
659 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
660 | + $context['recipients']['exclude_members'][] = $row['id_member']; |
|
661 | + } |
|
643 | 662 | $smcFunc['db_free_result']($request); |
644 | 663 | } |
645 | 664 | |
@@ -657,10 +676,11 @@ discard block |
||
657 | 676 | ); |
658 | 677 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
659 | 678 | { |
660 | - if (in_array(3, $context['recipients'])) |
|
661 | - $context['recipients']['exclude_members'][] = $row['identifier']; |
|
662 | - else |
|
663 | - $context['recipients']['members'][] = $row['identifier']; |
|
679 | + if (in_array(3, $context['recipients'])) { |
|
680 | + $context['recipients']['exclude_members'][] = $row['identifier']; |
|
681 | + } else { |
|
682 | + $context['recipients']['members'][] = $row['identifier']; |
|
683 | + } |
|
664 | 684 | } |
665 | 685 | $smcFunc['db_free_result']($request); |
666 | 686 | } |
@@ -707,8 +727,9 @@ discard block |
||
707 | 727 | $num_at_once = 1000; |
708 | 728 | |
709 | 729 | // If by PM's I suggest we half the above number. |
710 | - if (!empty($_POST['send_pm'])) |
|
711 | - $num_at_once /= 2; |
|
730 | + if (!empty($_POST['send_pm'])) { |
|
731 | + $num_at_once /= 2; |
|
732 | + } |
|
712 | 733 | |
713 | 734 | checkSession(); |
714 | 735 | |
@@ -731,8 +752,7 @@ discard block |
||
731 | 752 | ); |
732 | 753 | list ($context['total_members']) = $smcFunc['db_fetch_row']($request); |
733 | 754 | $smcFunc['db_free_result']($request); |
734 | - } |
|
735 | - else |
|
755 | + } else |
|
736 | 756 | { |
737 | 757 | $context['total_members'] = (int) $_REQUEST['total_members']; |
738 | 758 | } |
@@ -750,32 +770,35 @@ discard block |
||
750 | 770 | if (!empty($_POST['exclude_members'])) |
751 | 771 | { |
752 | 772 | $members = explode(',', $_POST['exclude_members']); |
753 | - foreach ($members as $member) |
|
754 | - if ($member >= $context['start']) |
|
773 | + foreach ($members as $member) { |
|
774 | + if ($member >= $context['start']) |
|
755 | 775 | $context['recipients']['exclude_members'][] = (int) $member; |
776 | + } |
|
756 | 777 | } |
757 | 778 | |
758 | 779 | // What about members we *must* do? |
759 | 780 | if (!empty($_POST['members'])) |
760 | 781 | { |
761 | 782 | $members = explode(',', $_POST['members']); |
762 | - foreach ($members as $member) |
|
763 | - if ($member >= $context['start']) |
|
783 | + foreach ($members as $member) { |
|
784 | + if ($member >= $context['start']) |
|
764 | 785 | $context['recipients']['members'][] = (int) $member; |
786 | + } |
|
765 | 787 | } |
766 | 788 | // Cleaning groups is simple - although deal with both checkbox and commas. |
767 | 789 | if (isset($_POST['groups'])) |
768 | 790 | { |
769 | 791 | if (is_array($_POST['groups'])) |
770 | 792 | { |
771 | - foreach ($_POST['groups'] as $group => $dummy) |
|
772 | - $context['recipients']['groups'][] = (int) $group; |
|
773 | - } |
|
774 | - else |
|
793 | + foreach ($_POST['groups'] as $group => $dummy) { |
|
794 | + $context['recipients']['groups'][] = (int) $group; |
|
795 | + } |
|
796 | + } else |
|
775 | 797 | { |
776 | 798 | $groups = explode(',', $_POST['groups']); |
777 | - foreach ($groups as $group) |
|
778 | - $context['recipients']['groups'][] = (int) $group; |
|
799 | + foreach ($groups as $group) { |
|
800 | + $context['recipients']['groups'][] = (int) $group; |
|
801 | + } |
|
779 | 802 | } |
780 | 803 | } |
781 | 804 | // Same for excluded groups |
@@ -783,14 +806,15 @@ discard block |
||
783 | 806 | { |
784 | 807 | if (is_array($_POST['exclude_groups'])) |
785 | 808 | { |
786 | - foreach ($_POST['exclude_groups'] as $group => $dummy) |
|
787 | - $context['recipients']['exclude_groups'][] = (int) $group; |
|
788 | - } |
|
789 | - else |
|
809 | + foreach ($_POST['exclude_groups'] as $group => $dummy) { |
|
810 | + $context['recipients']['exclude_groups'][] = (int) $group; |
|
811 | + } |
|
812 | + } else |
|
790 | 813 | { |
791 | 814 | $groups = explode(',', $_POST['exclude_groups']); |
792 | - foreach ($groups as $group) |
|
793 | - $context['recipients']['exclude_groups'][] = (int) $group; |
|
815 | + foreach ($groups as $group) { |
|
816 | + $context['recipients']['exclude_groups'][] = (int) $group; |
|
817 | + } |
|
794 | 818 | } |
795 | 819 | } |
796 | 820 | // Finally - emails! |
@@ -800,14 +824,16 @@ discard block |
||
800 | 824 | foreach ($addressed as $curmem) |
801 | 825 | { |
802 | 826 | $curmem = trim($curmem); |
803 | - if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL)) |
|
804 | - $context['recipients']['emails'][$curmem] = $curmem; |
|
827 | + if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL)) { |
|
828 | + $context['recipients']['emails'][$curmem] = $curmem; |
|
829 | + } |
|
805 | 830 | } |
806 | 831 | } |
807 | 832 | |
808 | 833 | // If we're only cleaning drop out here. |
809 | - if ($clean_only) |
|
810 | - return; |
|
834 | + if ($clean_only) { |
|
835 | + return; |
|
836 | + } |
|
811 | 837 | |
812 | 838 | require_once($sourcedir . '/Subs-Post.php'); |
813 | 839 | |
@@ -823,16 +849,18 @@ discard block |
||
823 | 849 | if (!$context['send_pm'] && !empty($_POST['send_html'])) |
824 | 850 | { |
825 | 851 | // Prepare the message for HTML. |
826 | - if (!empty($_POST['parse_html'])) |
|
827 | - $_POST['message'] = str_replace(array("\n", ' '), array('<br>' . "\n", ' '), $_POST['message']); |
|
852 | + if (!empty($_POST['parse_html'])) { |
|
853 | + $_POST['message'] = str_replace(array("\n", ' '), array('<br>' . "\n", ' '), $_POST['message']); |
|
854 | + } |
|
828 | 855 | |
829 | 856 | // This is here to prevent spam filters from tagging this as spam. |
830 | 857 | if (preg_match('~\<html~i', $_POST['message']) == 0) |
831 | 858 | { |
832 | - if (preg_match('~\<body~i', $_POST['message']) == 0) |
|
833 | - $_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>'; |
|
834 | - else |
|
835 | - $_POST['message'] = '<html>' . $_POST['message'] . '</html>'; |
|
859 | + if (preg_match('~\<body~i', $_POST['message']) == 0) { |
|
860 | + $_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>'; |
|
861 | + } else { |
|
862 | + $_POST['message'] = '<html>' . $_POST['message'] . '</html>'; |
|
863 | + } |
|
836 | 864 | } |
837 | 865 | } |
838 | 866 | |
@@ -886,15 +914,17 @@ discard block |
||
886 | 914 | foreach ($context['recipients']['emails'] as $k => $email) |
887 | 915 | { |
888 | 916 | // Done as many as we can? |
889 | - if ($i >= $num_at_once) |
|
890 | - break; |
|
917 | + if ($i >= $num_at_once) { |
|
918 | + break; |
|
919 | + } |
|
891 | 920 | |
892 | 921 | // Don't sent it twice! |
893 | 922 | unset($context['recipients']['emails'][$k]); |
894 | 923 | |
895 | 924 | // Dammit - can't PM emails! |
896 | - if ($context['send_pm']) |
|
897 | - continue; |
|
925 | + if ($context['send_pm']) { |
|
926 | + continue; |
|
927 | + } |
|
898 | 928 | |
899 | 929 | $to_member = array( |
900 | 930 | $email, |
@@ -928,8 +958,9 @@ discard block |
||
928 | 958 | $queryBuild[] = 'mem.id_post_group = {int:group_' . $group . '}'; |
929 | 959 | } |
930 | 960 | } |
931 | - if (!empty($queryBuild)) |
|
932 | - $sendQuery .= implode(' OR ', $queryBuild); |
|
961 | + if (!empty($queryBuild)) { |
|
962 | + $sendQuery .= implode(' OR ', $queryBuild); |
|
963 | + } |
|
933 | 964 | } |
934 | 965 | if (!empty($context['recipients']['members'])) |
935 | 966 | { |
@@ -948,8 +979,9 @@ discard block |
||
948 | 979 | } |
949 | 980 | |
950 | 981 | // Anything to exclude? |
951 | - if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups'])) |
|
952 | - $sendQuery .= ' AND mem.id_group != {int:regular_group}'; |
|
982 | + if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups'])) { |
|
983 | + $sendQuery .= ' AND mem.id_group != {int:regular_group}'; |
|
984 | + } |
|
953 | 985 | if (!empty($context['recipients']['exclude_members'])) |
954 | 986 | { |
955 | 987 | $sendQuery .= ' AND mem.id_member NOT IN ({array_int:exclude_members})'; |
@@ -985,21 +1017,24 @@ discard block |
||
985 | 1017 | foreach ($rows as $row) |
986 | 1018 | { |
987 | 1019 | // Force them to have it? |
988 | - if (empty($context['email_force']) || empty($prefs[$row['id_member']]['announcements'])) |
|
989 | - continue; |
|
1020 | + if (empty($context['email_force']) || empty($prefs[$row['id_member']]['announcements'])) { |
|
1021 | + continue; |
|
1022 | + } |
|
990 | 1023 | |
991 | 1024 | // What groups are we looking at here? |
992 | - if (empty($row['additional_groups'])) |
|
993 | - $groups = array($row['id_group'], $row['id_post_group']); |
|
994 | - else |
|
995 | - $groups = array_merge( |
|
1025 | + if (empty($row['additional_groups'])) { |
|
1026 | + $groups = array($row['id_group'], $row['id_post_group']); |
|
1027 | + } else { |
|
1028 | + $groups = array_merge( |
|
996 | 1029 | array($row['id_group'], $row['id_post_group']), |
997 | 1030 | explode(',', $row['additional_groups']) |
998 | 1031 | ); |
1032 | + } |
|
999 | 1033 | |
1000 | 1034 | // Excluded groups? |
1001 | - if (array_intersect($groups, $context['recipients']['exclude_groups'])) |
|
1002 | - continue; |
|
1035 | + if (array_intersect($groups, $context['recipients']['exclude_groups'])) { |
|
1036 | + continue; |
|
1037 | + } |
|
1003 | 1038 | |
1004 | 1039 | // We might need this |
1005 | 1040 | $cleanMemberName = empty($_POST['send_html']) || $context['send_pm'] ? un_htmlspecialchars($row['real_name']) : $row['real_name']; |
@@ -1022,10 +1057,11 @@ discard block |
||
1022 | 1057 | ), $_POST['subject']); |
1023 | 1058 | |
1024 | 1059 | // Send the actual email - or a PM! |
1025 | - if (!$context['send_pm']) |
|
1026 | - sendmail($row['email_address'], $subject, $message, null, 'news', !empty($_POST['send_html']), 5); |
|
1027 | - else |
|
1028 | - sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message); |
|
1060 | + if (!$context['send_pm']) { |
|
1061 | + sendmail($row['email_address'], $subject, $message, null, 'news', !empty($_POST['send_html']), 5); |
|
1062 | + } else { |
|
1063 | + sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message); |
|
1064 | + } |
|
1029 | 1065 | } |
1030 | 1066 | } |
1031 | 1067 | |
@@ -1074,8 +1110,9 @@ discard block |
||
1074 | 1110 | |
1075 | 1111 | call_integration_hook('integrate_modify_news_settings', array(&$config_vars)); |
1076 | 1112 | |
1077 | - if ($return_config) |
|
1078 | - return $config_vars; |
|
1113 | + if ($return_config) { |
|
1114 | + return $config_vars; |
|
1115 | + } |
|
1079 | 1116 | |
1080 | 1117 | $context['page_title'] = $txt['admin_edit_news'] . ' - ' . $txt['settings']; |
1081 | 1118 | $context['sub_template'] = 'show_settings'; |
@@ -24,259 +24,259 @@ discard block |
||
24 | 24 | function utf8_strtolower($string) |
25 | 25 | { |
26 | 26 | static $case_folding = array( |
27 | - 'A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd', |
|
28 | - 'E' => 'e', 'F' => 'f', 'G' => 'g', 'H' => 'h', |
|
29 | - 'I' => 'i', 'J' => 'j', 'K' => 'k', 'L' => 'l', |
|
30 | - 'M' => 'm', 'N' => 'n', 'O' => 'o', 'P' => 'p', |
|
31 | - 'Q' => 'q', 'R' => 'r', 'S' => 's', 'T' => 't', |
|
32 | - 'U' => 'u', 'V' => 'v', 'W' => 'w', 'X' => 'x', |
|
33 | - 'Y' => 'y', 'Z' => 'z', "\xc2\xb5" => "\xce\xbc", "\xc3\x80" => "\xc3\xa0", |
|
34 | - "\xc3\x81" => "\xc3\xa1", "\xc3\x82" => "\xc3\xa2", "\xc3\x83" => "\xc3\xa3", "\xc3\x84" => "\xc3\xa4", |
|
35 | - "\xc3\x85" => "\xc3\xa5", "\xc3\x86" => "\xc3\xa6", "\xc3\x87" => "\xc3\xa7", "\xc3\x88" => "\xc3\xa8", |
|
36 | - "\xc3\x89" => "\xc3\xa9", "\xc3\x8a" => "\xc3\xaa", "\xc3\x8b" => "\xc3\xab", "\xc3\x8c" => "\xc3\xac", |
|
37 | - "\xc3\x8d" => "\xc3\xad", "\xc3\x8e" => "\xc3\xae", "\xc3\x8f" => "\xc3\xaf", "\xc3\x90" => "\xc3\xb0", |
|
38 | - "\xc3\x91" => "\xc3\xb1", "\xc3\x92" => "\xc3\xb2", "\xc3\x93" => "\xc3\xb3", "\xc3\x94" => "\xc3\xb4", |
|
39 | - "\xc3\x95" => "\xc3\xb5", "\xc3\x96" => "\xc3\xb6", "\xc3\x98" => "\xc3\xb8", "\xc3\x99" => "\xc3\xb9", |
|
40 | - "\xc3\x9a" => "\xc3\xba", "\xc3\x9b" => "\xc3\xbb", "\xc3\x9c" => "\xc3\xbc", "\xc3\x9d" => "\xc3\xbd", |
|
41 | - "\xc3\x9e" => "\xc3\xbe", "\xc3\x9f" => "ss", "\xc4\x80" => "\xc4\x81", "\xc4\x82" => "\xc4\x83", |
|
42 | - "\xc4\x84" => "\xc4\x85", "\xc4\x86" => "\xc4\x87", "\xc4\x88" => "\xc4\x89", "\xc4\x8a" => "\xc4\x8b", |
|
43 | - "\xc4\x8c" => "\xc4\x8d", "\xc4\x8e" => "\xc4\x8f", "\xc4\x90" => "\xc4\x91", "\xc4\x92" => "\xc4\x93", |
|
44 | - "\xc4\x94" => "\xc4\x95", "\xc4\x96" => "\xc4\x97", "\xc4\x98" => "\xc4\x99", "\xc4\x9a" => "\xc4\x9b", |
|
45 | - "\xc4\x9c" => "\xc4\x9d", "\xc4\x9e" => "\xc4\x9f", "\xc4\xa0" => "\xc4\xa1", "\xc4\xa2" => "\xc4\xa3", |
|
46 | - "\xc4\xa4" => "\xc4\xa5", "\xc4\xa6" => "\xc4\xa7", "\xc4\xa8" => "\xc4\xa9", "\xc4\xaa" => "\xc4\xab", |
|
47 | - "\xc4\xac" => "\xc4\xad", "\xc4\xae" => "\xc4\xaf", "\xc4\xb0" => "i\xcc\x87", "\xc4\xb2" => "\xc4\xb3", |
|
48 | - "\xc4\xb4" => "\xc4\xb5", "\xc4\xb6" => "\xc4\xb7", "\xc4\xb9" => "\xc4\xba", "\xc4\xbb" => "\xc4\xbc", |
|
49 | - "\xc4\xbd" => "\xc4\xbe", "\xc4\xbf" => "\xc5\x80", "\xc5\x81" => "\xc5\x82", "\xc5\x83" => "\xc5\x84", |
|
50 | - "\xc5\x85" => "\xc5\x86", "\xc5\x87" => "\xc5\x88", "\xc5\x89" => "\xca\xbcn", "\xc5\x8a" => "\xc5\x8b", |
|
51 | - "\xc5\x8c" => "\xc5\x8d", "\xc5\x8e" => "\xc5\x8f", "\xc5\x90" => "\xc5\x91", "\xc5\x92" => "\xc5\x93", |
|
52 | - "\xc5\x94" => "\xc5\x95", "\xc5\x96" => "\xc5\x97", "\xc5\x98" => "\xc5\x99", "\xc5\x9a" => "\xc5\x9b", |
|
53 | - "\xc5\x9c" => "\xc5\x9d", "\xc5\x9e" => "\xc5\x9f", "\xc5\xa0" => "\xc5\xa1", "\xc5\xa2" => "\xc5\xa3", |
|
54 | - "\xc5\xa4" => "\xc5\xa5", "\xc5\xa6" => "\xc5\xa7", "\xc5\xa8" => "\xc5\xa9", "\xc5\xaa" => "\xc5\xab", |
|
55 | - "\xc5\xac" => "\xc5\xad", "\xc5\xae" => "\xc5\xaf", "\xc5\xb0" => "\xc5\xb1", "\xc5\xb2" => "\xc5\xb3", |
|
56 | - "\xc5\xb4" => "\xc5\xb5", "\xc5\xb6" => "\xc5\xb7", "\xc5\xb8" => "\xc3\xbf", "\xc5\xb9" => "\xc5\xba", |
|
57 | - "\xc5\xbb" => "\xc5\xbc", "\xc5\xbd" => "\xc5\xbe", "\xc5\xbf" => "s", "\xc6\x81" => "\xc9\x93", |
|
58 | - "\xc6\x82" => "\xc6\x83", "\xc6\x84" => "\xc6\x85", "\xc6\x86" => "\xc9\x94", "\xc6\x87" => "\xc6\x88", |
|
59 | - "\xc6\x89" => "\xc9\x96", "\xc6\x8a" => "\xc9\x97", "\xc6\x8b" => "\xc6\x8c", "\xc6\x8e" => "\xc7\x9d", |
|
60 | - "\xc6\x8f" => "\xc9\x99", "\xc6\x90" => "\xc9\x9b", "\xc6\x91" => "\xc6\x92", "\xc6\x93" => "\xc9\xa0", |
|
61 | - "\xc6\x94" => "\xc9\xa3", "\xc6\x96" => "\xc9\xa9", "\xc6\x97" => "\xc9\xa8", "\xc6\x98" => "\xc6\x99", |
|
62 | - "\xc6\x9c" => "\xc9\xaf", "\xc6\x9d" => "\xc9\xb2", "\xc6\x9f" => "\xc9\xb5", "\xc6\xa0" => "\xc6\xa1", |
|
63 | - "\xc6\xa2" => "\xc6\xa3", "\xc6\xa4" => "\xc6\xa5", "\xc6\xa6" => "\xca\x80", "\xc6\xa7" => "\xc6\xa8", |
|
64 | - "\xc6\xa9" => "\xca\x83", "\xc6\xac" => "\xc6\xad", "\xc6\xae" => "\xca\x88", "\xc6\xaf" => "\xc6\xb0", |
|
65 | - "\xc6\xb1" => "\xca\x8a", "\xc6\xb2" => "\xca\x8b", "\xc6\xb3" => "\xc6\xb4", "\xc6\xb5" => "\xc6\xb6", |
|
66 | - "\xc6\xb7" => "\xca\x92", "\xc6\xb8" => "\xc6\xb9", "\xc6\xbc" => "\xc6\xbd", "\xc7\x84" => "\xc7\x86", |
|
67 | - "\xc7\x85" => "\xc7\x86", "\xc7\x87" => "\xc7\x89", "\xc7\x88" => "\xc7\x89", "\xc7\x8a" => "\xc7\x8c", |
|
68 | - "\xc7\x8b" => "\xc7\x8c", "\xc7\x8d" => "\xc7\x8e", "\xc7\x8f" => "\xc7\x90", "\xc7\x91" => "\xc7\x92", |
|
69 | - "\xc7\x93" => "\xc7\x94", "\xc7\x95" => "\xc7\x96", "\xc7\x97" => "\xc7\x98", "\xc7\x99" => "\xc7\x9a", |
|
70 | - "\xc7\x9b" => "\xc7\x9c", "\xc7\x9e" => "\xc7\x9f", "\xc7\xa0" => "\xc7\xa1", "\xc7\xa2" => "\xc7\xa3", |
|
71 | - "\xc7\xa4" => "\xc7\xa5", "\xc7\xa6" => "\xc7\xa7", "\xc7\xa8" => "\xc7\xa9", "\xc7\xaa" => "\xc7\xab", |
|
72 | - "\xc7\xac" => "\xc7\xad", "\xc7\xae" => "\xc7\xaf", "\xc7\xb0" => "j\xcc\x8c", "\xc7\xb1" => "\xc7\xb3", |
|
73 | - "\xc7\xb2" => "\xc7\xb3", "\xc7\xb4" => "\xc7\xb5", "\xc7\xb6" => "\xc6\x95", "\xc7\xb7" => "\xc6\xbf", |
|
74 | - "\xc7\xb8" => "\xc7\xb9", "\xc7\xba" => "\xc7\xbb", "\xc7\xbc" => "\xc7\xbd", "\xc7\xbe" => "\xc7\xbf", |
|
75 | - "\xc8\x80" => "\xc8\x81", "\xc8\x82" => "\xc8\x83", "\xc8\x84" => "\xc8\x85", "\xc8\x86" => "\xc8\x87", |
|
76 | - "\xc8\x88" => "\xc8\x89", "\xc8\x8a" => "\xc8\x8b", "\xc8\x8c" => "\xc8\x8d", "\xc8\x8e" => "\xc8\x8f", |
|
77 | - "\xc8\x90" => "\xc8\x91", "\xc8\x92" => "\xc8\x93", "\xc8\x94" => "\xc8\x95", "\xc8\x96" => "\xc8\x97", |
|
78 | - "\xc8\x98" => "\xc8\x99", "\xc8\x9a" => "\xc8\x9b", "\xc8\x9c" => "\xc8\x9d", "\xc8\x9e" => "\xc8\x9f", |
|
79 | - "\xc8\xa0" => "\xc6\x9e", "\xc8\xa2" => "\xc8\xa3", "\xc8\xa4" => "\xc8\xa5", "\xc8\xa6" => "\xc8\xa7", |
|
80 | - "\xc8\xa8" => "\xc8\xa9", "\xc8\xaa" => "\xc8\xab", "\xc8\xac" => "\xc8\xad", "\xc8\xae" => "\xc8\xaf", |
|
81 | - "\xc8\xb0" => "\xc8\xb1", "\xc8\xb2" => "\xc8\xb3", "\xc8\xba" => "\xe2\xb1\xa5", "\xc8\xbb" => "\xc8\xbc", |
|
82 | - "\xc8\xbd" => "\xc6\x9a", "\xc8\xbe" => "\xe2\xb1\xa6", "\xc9\x81" => "\xc9\x82", "\xc9\x83" => "\xc6\x80", |
|
83 | - "\xc9\x84" => "\xca\x89", "\xc9\x85" => "\xca\x8c", "\xc9\x86" => "\xc9\x87", "\xc9\x88" => "\xc9\x89", |
|
84 | - "\xc9\x8a" => "\xc9\x8b", "\xc9\x8c" => "\xc9\x8d", "\xc9\x8e" => "\xc9\x8f", "\xcd\x85" => "\xce\xb9", |
|
85 | - "\xce\x86" => "\xce\xac", "\xce\x88" => "\xce\xad", "\xce\x89" => "\xce\xae", "\xce\x8a" => "\xce\xaf", |
|
86 | - "\xce\x8c" => "\xcf\x8c", "\xce\x8e" => "\xcf\x8d", "\xce\x8f" => "\xcf\x8e", "\xce\x90" => "\xce\xb9\xcc\x88\xcc\x81", |
|
87 | - "\xce\x91" => "\xce\xb1", "\xce\x92" => "\xce\xb2", "\xce\x93" => "\xce\xb3", "\xce\x94" => "\xce\xb4", |
|
88 | - "\xce\x95" => "\xce\xb5", "\xce\x96" => "\xce\xb6", "\xce\x97" => "\xce\xb7", "\xce\x98" => "\xce\xb8", |
|
89 | - "\xce\x99" => "\xce\xb9", "\xce\x9a" => "\xce\xba", "\xce\x9b" => "\xce\xbb", "\xce\x9c" => "\xce\xbc", |
|
90 | - "\xce\x9d" => "\xce\xbd", "\xce\x9e" => "\xce\xbe", "\xce\x9f" => "\xce\xbf", "\xce\xa0" => "\xcf\x80", |
|
91 | - "\xce\xa1" => "\xcf\x81", "\xce\xa3" => "\xcf\x83", "\xce\xa4" => "\xcf\x84", "\xce\xa5" => "\xcf\x85", |
|
92 | - "\xce\xa6" => "\xcf\x86", "\xce\xa7" => "\xcf\x87", "\xce\xa8" => "\xcf\x88", "\xce\xa9" => "\xcf\x89", |
|
93 | - "\xce\xaa" => "\xcf\x8a", "\xce\xab" => "\xcf\x8b", "\xce\xb0" => "\xcf\x85\xcc\x88\xcc\x81", "\xcf\x82" => "\xcf\x83", |
|
94 | - "\xcf\x90" => "\xce\xb2", "\xcf\x91" => "\xce\xb8", "\xcf\x95" => "\xcf\x86", "\xcf\x96" => "\xcf\x80", |
|
95 | - "\xcf\x98" => "\xcf\x99", "\xcf\x9a" => "\xcf\x9b", "\xcf\x9c" => "\xcf\x9d", "\xcf\x9e" => "\xcf\x9f", |
|
96 | - "\xcf\xa0" => "\xcf\xa1", "\xcf\xa2" => "\xcf\xa3", "\xcf\xa4" => "\xcf\xa5", "\xcf\xa6" => "\xcf\xa7", |
|
97 | - "\xcf\xa8" => "\xcf\xa9", "\xcf\xaa" => "\xcf\xab", "\xcf\xac" => "\xcf\xad", "\xcf\xae" => "\xcf\xaf", |
|
98 | - "\xcf\xb0" => "\xce\xba", "\xcf\xb1" => "\xcf\x81", "\xcf\xb4" => "\xce\xb8", "\xcf\xb5" => "\xce\xb5", |
|
99 | - "\xcf\xb7" => "\xcf\xb8", "\xcf\xb9" => "\xcf\xb2", "\xcf\xba" => "\xcf\xbb", "\xcf\xbd" => "\xcd\xbb", |
|
100 | - "\xcf\xbe" => "\xcd\xbc", "\xcf\xbf" => "\xcd\xbd", "\xd0\x80" => "\xd1\x90", "\xd0\x81" => "\xd1\x91", |
|
101 | - "\xd0\x82" => "\xd1\x92", "\xd0\x83" => "\xd1\x93", "\xd0\x84" => "\xd1\x94", "\xd0\x85" => "\xd1\x95", |
|
102 | - "\xd0\x86" => "\xd1\x96", "\xd0\x87" => "\xd1\x97", "\xd0\x88" => "\xd1\x98", "\xd0\x89" => "\xd1\x99", |
|
103 | - "\xd0\x8a" => "\xd1\x9a", "\xd0\x8b" => "\xd1\x9b", "\xd0\x8c" => "\xd1\x9c", "\xd0\x8d" => "\xd1\x9d", |
|
104 | - "\xd0\x8e" => "\xd1\x9e", "\xd0\x8f" => "\xd1\x9f", "\xd0\x90" => "\xd0\xb0", "\xd0\x91" => "\xd0\xb1", |
|
105 | - "\xd0\x92" => "\xd0\xb2", "\xd0\x93" => "\xd0\xb3", "\xd0\x94" => "\xd0\xb4", "\xd0\x95" => "\xd0\xb5", |
|
106 | - "\xd0\x96" => "\xd0\xb6", "\xd0\x97" => "\xd0\xb7", "\xd0\x98" => "\xd0\xb8", "\xd0\x99" => "\xd0\xb9", |
|
107 | - "\xd0\x9a" => "\xd0\xba", "\xd0\x9b" => "\xd0\xbb", "\xd0\x9c" => "\xd0\xbc", "\xd0\x9d" => "\xd0\xbd", |
|
108 | - "\xd0\x9e" => "\xd0\xbe", "\xd0\x9f" => "\xd0\xbf", "\xd0\xa0" => "\xd1\x80", "\xd0\xa1" => "\xd1\x81", |
|
109 | - "\xd0\xa2" => "\xd1\x82", "\xd0\xa3" => "\xd1\x83", "\xd0\xa4" => "\xd1\x84", "\xd0\xa5" => "\xd1\x85", |
|
110 | - "\xd0\xa6" => "\xd1\x86", "\xd0\xa7" => "\xd1\x87", "\xd0\xa8" => "\xd1\x88", "\xd0\xa9" => "\xd1\x89", |
|
111 | - "\xd0\xaa" => "\xd1\x8a", "\xd0\xab" => "\xd1\x8b", "\xd0\xac" => "\xd1\x8c", "\xd0\xad" => "\xd1\x8d", |
|
112 | - "\xd0\xae" => "\xd1\x8e", "\xd0\xaf" => "\xd1\x8f", "\xd1\xa0" => "\xd1\xa1", "\xd1\xa2" => "\xd1\xa3", |
|
113 | - "\xd1\xa4" => "\xd1\xa5", "\xd1\xa6" => "\xd1\xa7", "\xd1\xa8" => "\xd1\xa9", "\xd1\xaa" => "\xd1\xab", |
|
114 | - "\xd1\xac" => "\xd1\xad", "\xd1\xae" => "\xd1\xaf", "\xd1\xb0" => "\xd1\xb1", "\xd1\xb2" => "\xd1\xb3", |
|
115 | - "\xd1\xb4" => "\xd1\xb5", "\xd1\xb6" => "\xd1\xb7", "\xd1\xb8" => "\xd1\xb9", "\xd1\xba" => "\xd1\xbb", |
|
116 | - "\xd1\xbc" => "\xd1\xbd", "\xd1\xbe" => "\xd1\xbf", "\xd2\x80" => "\xd2\x81", "\xd2\x8a" => "\xd2\x8b", |
|
117 | - "\xd2\x8c" => "\xd2\x8d", "\xd2\x8e" => "\xd2\x8f", "\xd2\x90" => "\xd2\x91", "\xd2\x92" => "\xd2\x93", |
|
118 | - "\xd2\x94" => "\xd2\x95", "\xd2\x96" => "\xd2\x97", "\xd2\x98" => "\xd2\x99", "\xd2\x9a" => "\xd2\x9b", |
|
119 | - "\xd2\x9c" => "\xd2\x9d", "\xd2\x9e" => "\xd2\x9f", "\xd2\xa0" => "\xd2\xa1", "\xd2\xa2" => "\xd2\xa3", |
|
120 | - "\xd2\xa4" => "\xd2\xa5", "\xd2\xa6" => "\xd2\xa7", "\xd2\xa8" => "\xd2\xa9", "\xd2\xaa" => "\xd2\xab", |
|
121 | - "\xd2\xac" => "\xd2\xad", "\xd2\xae" => "\xd2\xaf", "\xd2\xb0" => "\xd2\xb1", "\xd2\xb2" => "\xd2\xb3", |
|
122 | - "\xd2\xb4" => "\xd2\xb5", "\xd2\xb6" => "\xd2\xb7", "\xd2\xb8" => "\xd2\xb9", "\xd2\xba" => "\xd2\xbb", |
|
123 | - "\xd2\xbc" => "\xd2\xbd", "\xd2\xbe" => "\xd2\xbf", "\xd3\x80" => "\xd3\x8f", "\xd3\x81" => "\xd3\x82", |
|
124 | - "\xd3\x83" => "\xd3\x84", "\xd3\x85" => "\xd3\x86", "\xd3\x87" => "\xd3\x88", "\xd3\x89" => "\xd3\x8a", |
|
125 | - "\xd3\x8b" => "\xd3\x8c", "\xd3\x8d" => "\xd3\x8e", "\xd3\x90" => "\xd3\x91", "\xd3\x92" => "\xd3\x93", |
|
126 | - "\xd3\x94" => "\xd3\x95", "\xd3\x96" => "\xd3\x97", "\xd3\x98" => "\xd3\x99", "\xd3\x9a" => "\xd3\x9b", |
|
127 | - "\xd3\x9c" => "\xd3\x9d", "\xd3\x9e" => "\xd3\x9f", "\xd3\xa0" => "\xd3\xa1", "\xd3\xa2" => "\xd3\xa3", |
|
128 | - "\xd3\xa4" => "\xd3\xa5", "\xd3\xa6" => "\xd3\xa7", "\xd3\xa8" => "\xd3\xa9", "\xd3\xaa" => "\xd3\xab", |
|
129 | - "\xd3\xac" => "\xd3\xad", "\xd3\xae" => "\xd3\xaf", "\xd3\xb0" => "\xd3\xb1", "\xd3\xb2" => "\xd3\xb3", |
|
130 | - "\xd3\xb4" => "\xd3\xb5", "\xd3\xb6" => "\xd3\xb7", "\xd3\xb8" => "\xd3\xb9", "\xd3\xba" => "\xd3\xbb", |
|
131 | - "\xd3\xbc" => "\xd3\xbd", "\xd3\xbe" => "\xd3\xbf", "\xd4\x80" => "\xd4\x81", "\xd4\x82" => "\xd4\x83", |
|
132 | - "\xd4\x84" => "\xd4\x85", "\xd4\x86" => "\xd4\x87", "\xd4\x88" => "\xd4\x89", "\xd4\x8a" => "\xd4\x8b", |
|
133 | - "\xd4\x8c" => "\xd4\x8d", "\xd4\x8e" => "\xd4\x8f", "\xd4\x90" => "\xd4\x91", "\xd4\x92" => "\xd4\x93", |
|
134 | - "\xd4\xb1" => "\xd5\xa1", "\xd4\xb2" => "\xd5\xa2", "\xd4\xb3" => "\xd5\xa3", "\xd4\xb4" => "\xd5\xa4", |
|
135 | - "\xd4\xb5" => "\xd5\xa5", "\xd4\xb6" => "\xd5\xa6", "\xd4\xb7" => "\xd5\xa7", "\xd4\xb8" => "\xd5\xa8", |
|
136 | - "\xd4\xb9" => "\xd5\xa9", "\xd4\xba" => "\xd5\xaa", "\xd4\xbb" => "\xd5\xab", "\xd4\xbc" => "\xd5\xac", |
|
137 | - "\xd4\xbd" => "\xd5\xad", "\xd4\xbe" => "\xd5\xae", "\xd4\xbf" => "\xd5\xaf", "\xd5\x80" => "\xd5\xb0", |
|
138 | - "\xd5\x81" => "\xd5\xb1", "\xd5\x82" => "\xd5\xb2", "\xd5\x83" => "\xd5\xb3", "\xd5\x84" => "\xd5\xb4", |
|
139 | - "\xd5\x85" => "\xd5\xb5", "\xd5\x86" => "\xd5\xb6", "\xd5\x87" => "\xd5\xb7", "\xd5\x88" => "\xd5\xb8", |
|
140 | - "\xd5\x89" => "\xd5\xb9", "\xd5\x8a" => "\xd5\xba", "\xd5\x8b" => "\xd5\xbb", "\xd5\x8c" => "\xd5\xbc", |
|
141 | - "\xd5\x8d" => "\xd5\xbd", "\xd5\x8e" => "\xd5\xbe", "\xd5\x8f" => "\xd5\xbf", "\xd5\x90" => "\xd6\x80", |
|
142 | - "\xd5\x91" => "\xd6\x81", "\xd5\x92" => "\xd6\x82", "\xd5\x93" => "\xd6\x83", "\xd5\x94" => "\xd6\x84", |
|
143 | - "\xd5\x95" => "\xd6\x85", "\xd5\x96" => "\xd6\x86", "\xd6\x87" => "\xd5\xa5\xd6\x82", "\xe1\x82\xa0" => "\xe2\xb4\x80", |
|
144 | - "\xe1\x82\xa1" => "\xe2\xb4\x81", "\xe1\x82\xa2" => "\xe2\xb4\x82", "\xe1\x82\xa3" => "\xe2\xb4\x83", "\xe1\x82\xa4" => "\xe2\xb4\x84", |
|
145 | - "\xe1\x82\xa5" => "\xe2\xb4\x85", "\xe1\x82\xa6" => "\xe2\xb4\x86", "\xe1\x82\xa7" => "\xe2\xb4\x87", "\xe1\x82\xa8" => "\xe2\xb4\x88", |
|
146 | - "\xe1\x82\xa9" => "\xe2\xb4\x89", "\xe1\x82\xaa" => "\xe2\xb4\x8a", "\xe1\x82\xab" => "\xe2\xb4\x8b", "\xe1\x82\xac" => "\xe2\xb4\x8c", |
|
147 | - "\xe1\x82\xad" => "\xe2\xb4\x8d", "\xe1\x82\xae" => "\xe2\xb4\x8e", "\xe1\x82\xaf" => "\xe2\xb4\x8f", "\xe1\x82\xb0" => "\xe2\xb4\x90", |
|
148 | - "\xe1\x82\xb1" => "\xe2\xb4\x91", "\xe1\x82\xb2" => "\xe2\xb4\x92", "\xe1\x82\xb3" => "\xe2\xb4\x93", "\xe1\x82\xb4" => "\xe2\xb4\x94", |
|
149 | - "\xe1\x82\xb5" => "\xe2\xb4\x95", "\xe1\x82\xb6" => "\xe2\xb4\x96", "\xe1\x82\xb7" => "\xe2\xb4\x97", "\xe1\x82\xb8" => "\xe2\xb4\x98", |
|
150 | - "\xe1\x82\xb9" => "\xe2\xb4\x99", "\xe1\x82\xba" => "\xe2\xb4\x9a", "\xe1\x82\xbb" => "\xe2\xb4\x9b", "\xe1\x82\xbc" => "\xe2\xb4\x9c", |
|
151 | - "\xe1\x82\xbd" => "\xe2\xb4\x9d", "\xe1\x82\xbe" => "\xe2\xb4\x9e", "\xe1\x82\xbf" => "\xe2\xb4\x9f", "\xe1\x83\x80" => "\xe2\xb4\xa0", |
|
152 | - "\xe1\x83\x81" => "\xe2\xb4\xa1", "\xe1\x83\x82" => "\xe2\xb4\xa2", "\xe1\x83\x83" => "\xe2\xb4\xa3", "\xe1\x83\x84" => "\xe2\xb4\xa4", |
|
153 | - "\xe1\x83\x85" => "\xe2\xb4\xa5", "\xe1\xb8\x80" => "\xe1\xb8\x81", "\xe1\xb8\x82" => "\xe1\xb8\x83", "\xe1\xb8\x84" => "\xe1\xb8\x85", |
|
154 | - "\xe1\xb8\x86" => "\xe1\xb8\x87", "\xe1\xb8\x88" => "\xe1\xb8\x89", "\xe1\xb8\x8a" => "\xe1\xb8\x8b", "\xe1\xb8\x8c" => "\xe1\xb8\x8d", |
|
155 | - "\xe1\xb8\x8e" => "\xe1\xb8\x8f", "\xe1\xb8\x90" => "\xe1\xb8\x91", "\xe1\xb8\x92" => "\xe1\xb8\x93", "\xe1\xb8\x94" => "\xe1\xb8\x95", |
|
156 | - "\xe1\xb8\x96" => "\xe1\xb8\x97", "\xe1\xb8\x98" => "\xe1\xb8\x99", "\xe1\xb8\x9a" => "\xe1\xb8\x9b", "\xe1\xb8\x9c" => "\xe1\xb8\x9d", |
|
157 | - "\xe1\xb8\x9e" => "\xe1\xb8\x9f", "\xe1\xb8\xa0" => "\xe1\xb8\xa1", "\xe1\xb8\xa2" => "\xe1\xb8\xa3", "\xe1\xb8\xa4" => "\xe1\xb8\xa5", |
|
158 | - "\xe1\xb8\xa6" => "\xe1\xb8\xa7", "\xe1\xb8\xa8" => "\xe1\xb8\xa9", "\xe1\xb8\xaa" => "\xe1\xb8\xab", "\xe1\xb8\xac" => "\xe1\xb8\xad", |
|
159 | - "\xe1\xb8\xae" => "\xe1\xb8\xaf", "\xe1\xb8\xb0" => "\xe1\xb8\xb1", "\xe1\xb8\xb2" => "\xe1\xb8\xb3", "\xe1\xb8\xb4" => "\xe1\xb8\xb5", |
|
160 | - "\xe1\xb8\xb6" => "\xe1\xb8\xb7", "\xe1\xb8\xb8" => "\xe1\xb8\xb9", "\xe1\xb8\xba" => "\xe1\xb8\xbb", "\xe1\xb8\xbc" => "\xe1\xb8\xbd", |
|
161 | - "\xe1\xb8\xbe" => "\xe1\xb8\xbf", "\xe1\xb9\x80" => "\xe1\xb9\x81", "\xe1\xb9\x82" => "\xe1\xb9\x83", "\xe1\xb9\x84" => "\xe1\xb9\x85", |
|
162 | - "\xe1\xb9\x86" => "\xe1\xb9\x87", "\xe1\xb9\x88" => "\xe1\xb9\x89", "\xe1\xb9\x8a" => "\xe1\xb9\x8b", "\xe1\xb9\x8c" => "\xe1\xb9\x8d", |
|
163 | - "\xe1\xb9\x8e" => "\xe1\xb9\x8f", "\xe1\xb9\x90" => "\xe1\xb9\x91", "\xe1\xb9\x92" => "\xe1\xb9\x93", "\xe1\xb9\x94" => "\xe1\xb9\x95", |
|
164 | - "\xe1\xb9\x96" => "\xe1\xb9\x97", "\xe1\xb9\x98" => "\xe1\xb9\x99", "\xe1\xb9\x9a" => "\xe1\xb9\x9b", "\xe1\xb9\x9c" => "\xe1\xb9\x9d", |
|
165 | - "\xe1\xb9\x9e" => "\xe1\xb9\x9f", "\xe1\xb9\xa0" => "\xe1\xb9\xa1", "\xe1\xb9\xa2" => "\xe1\xb9\xa3", "\xe1\xb9\xa4" => "\xe1\xb9\xa5", |
|
166 | - "\xe1\xb9\xa6" => "\xe1\xb9\xa7", "\xe1\xb9\xa8" => "\xe1\xb9\xa9", "\xe1\xb9\xaa" => "\xe1\xb9\xab", "\xe1\xb9\xac" => "\xe1\xb9\xad", |
|
167 | - "\xe1\xb9\xae" => "\xe1\xb9\xaf", "\xe1\xb9\xb0" => "\xe1\xb9\xb1", "\xe1\xb9\xb2" => "\xe1\xb9\xb3", "\xe1\xb9\xb4" => "\xe1\xb9\xb5", |
|
168 | - "\xe1\xb9\xb6" => "\xe1\xb9\xb7", "\xe1\xb9\xb8" => "\xe1\xb9\xb9", "\xe1\xb9\xba" => "\xe1\xb9\xbb", "\xe1\xb9\xbc" => "\xe1\xb9\xbd", |
|
169 | - "\xe1\xb9\xbe" => "\xe1\xb9\xbf", "\xe1\xba\x80" => "\xe1\xba\x81", "\xe1\xba\x82" => "\xe1\xba\x83", "\xe1\xba\x84" => "\xe1\xba\x85", |
|
170 | - "\xe1\xba\x86" => "\xe1\xba\x87", "\xe1\xba\x88" => "\xe1\xba\x89", "\xe1\xba\x8a" => "\xe1\xba\x8b", "\xe1\xba\x8c" => "\xe1\xba\x8d", |
|
171 | - "\xe1\xba\x8e" => "\xe1\xba\x8f", "\xe1\xba\x90" => "\xe1\xba\x91", "\xe1\xba\x92" => "\xe1\xba\x93", "\xe1\xba\x94" => "\xe1\xba\x95", |
|
172 | - "\xe1\xba\x96" => "h\xcc\xb1", "\xe1\xba\x97" => "t\xcc\x88", "\xe1\xba\x98" => "w\xcc\x8a", "\xe1\xba\x99" => "y\xcc\x8a", |
|
173 | - "\xe1\xba\x9a" => "a\xca\xbe", "\xe1\xba\x9b" => "\xe1\xb9\xa1", "\xe1\xba\xa0" => "\xe1\xba\xa1", "\xe1\xba\xa2" => "\xe1\xba\xa3", |
|
174 | - "\xe1\xba\xa4" => "\xe1\xba\xa5", "\xe1\xba\xa6" => "\xe1\xba\xa7", "\xe1\xba\xa8" => "\xe1\xba\xa9", "\xe1\xba\xaa" => "\xe1\xba\xab", |
|
175 | - "\xe1\xba\xac" => "\xe1\xba\xad", "\xe1\xba\xae" => "\xe1\xba\xaf", "\xe1\xba\xb0" => "\xe1\xba\xb1", "\xe1\xba\xb2" => "\xe1\xba\xb3", |
|
176 | - "\xe1\xba\xb4" => "\xe1\xba\xb5", "\xe1\xba\xb6" => "\xe1\xba\xb7", "\xe1\xba\xb8" => "\xe1\xba\xb9", "\xe1\xba\xba" => "\xe1\xba\xbb", |
|
177 | - "\xe1\xba\xbc" => "\xe1\xba\xbd", "\xe1\xba\xbe" => "\xe1\xba\xbf", "\xe1\xbb\x80" => "\xe1\xbb\x81", "\xe1\xbb\x82" => "\xe1\xbb\x83", |
|
178 | - "\xe1\xbb\x84" => "\xe1\xbb\x85", "\xe1\xbb\x86" => "\xe1\xbb\x87", "\xe1\xbb\x88" => "\xe1\xbb\x89", "\xe1\xbb\x8a" => "\xe1\xbb\x8b", |
|
179 | - "\xe1\xbb\x8c" => "\xe1\xbb\x8d", "\xe1\xbb\x8e" => "\xe1\xbb\x8f", "\xe1\xbb\x90" => "\xe1\xbb\x91", "\xe1\xbb\x92" => "\xe1\xbb\x93", |
|
180 | - "\xe1\xbb\x94" => "\xe1\xbb\x95", "\xe1\xbb\x96" => "\xe1\xbb\x97", "\xe1\xbb\x98" => "\xe1\xbb\x99", "\xe1\xbb\x9a" => "\xe1\xbb\x9b", |
|
181 | - "\xe1\xbb\x9c" => "\xe1\xbb\x9d", "\xe1\xbb\x9e" => "\xe1\xbb\x9f", "\xe1\xbb\xa0" => "\xe1\xbb\xa1", "\xe1\xbb\xa2" => "\xe1\xbb\xa3", |
|
182 | - "\xe1\xbb\xa4" => "\xe1\xbb\xa5", "\xe1\xbb\xa6" => "\xe1\xbb\xa7", "\xe1\xbb\xa8" => "\xe1\xbb\xa9", "\xe1\xbb\xaa" => "\xe1\xbb\xab", |
|
183 | - "\xe1\xbb\xac" => "\xe1\xbb\xad", "\xe1\xbb\xae" => "\xe1\xbb\xaf", "\xe1\xbb\xb0" => "\xe1\xbb\xb1", "\xe1\xbb\xb2" => "\xe1\xbb\xb3", |
|
184 | - "\xe1\xbb\xb4" => "\xe1\xbb\xb5", "\xe1\xbb\xb6" => "\xe1\xbb\xb7", "\xe1\xbb\xb8" => "\xe1\xbb\xb9", "\xe1\xbc\x88" => "\xe1\xbc\x80", |
|
185 | - "\xe1\xbc\x89" => "\xe1\xbc\x81", "\xe1\xbc\x8a" => "\xe1\xbc\x82", "\xe1\xbc\x8b" => "\xe1\xbc\x83", "\xe1\xbc\x8c" => "\xe1\xbc\x84", |
|
186 | - "\xe1\xbc\x8d" => "\xe1\xbc\x85", "\xe1\xbc\x8e" => "\xe1\xbc\x86", "\xe1\xbc\x8f" => "\xe1\xbc\x87", "\xe1\xbc\x98" => "\xe1\xbc\x90", |
|
187 | - "\xe1\xbc\x99" => "\xe1\xbc\x91", "\xe1\xbc\x9a" => "\xe1\xbc\x92", "\xe1\xbc\x9b" => "\xe1\xbc\x93", "\xe1\xbc\x9c" => "\xe1\xbc\x94", |
|
188 | - "\xe1\xbc\x9d" => "\xe1\xbc\x95", "\xe1\xbc\xa8" => "\xe1\xbc\xa0", "\xe1\xbc\xa9" => "\xe1\xbc\xa1", "\xe1\xbc\xaa" => "\xe1\xbc\xa2", |
|
189 | - "\xe1\xbc\xab" => "\xe1\xbc\xa3", "\xe1\xbc\xac" => "\xe1\xbc\xa4", "\xe1\xbc\xad" => "\xe1\xbc\xa5", "\xe1\xbc\xae" => "\xe1\xbc\xa6", |
|
190 | - "\xe1\xbc\xaf" => "\xe1\xbc\xa7", "\xe1\xbc\xb8" => "\xe1\xbc\xb0", "\xe1\xbc\xb9" => "\xe1\xbc\xb1", "\xe1\xbc\xba" => "\xe1\xbc\xb2", |
|
191 | - "\xe1\xbc\xbb" => "\xe1\xbc\xb3", "\xe1\xbc\xbc" => "\xe1\xbc\xb4", "\xe1\xbc\xbd" => "\xe1\xbc\xb5", "\xe1\xbc\xbe" => "\xe1\xbc\xb6", |
|
192 | - "\xe1\xbc\xbf" => "\xe1\xbc\xb7", "\xe1\xbd\x88" => "\xe1\xbd\x80", "\xe1\xbd\x89" => "\xe1\xbd\x81", "\xe1\xbd\x8a" => "\xe1\xbd\x82", |
|
193 | - "\xe1\xbd\x8b" => "\xe1\xbd\x83", "\xe1\xbd\x8c" => "\xe1\xbd\x84", "\xe1\xbd\x8d" => "\xe1\xbd\x85", "\xe1\xbd\x90" => "\xcf\x85\xcc\x93", |
|
194 | - "\xe1\xbd\x92" => "\xcf\x85\xcc\x93\xcc\x80", "\xe1\xbd\x94" => "\xcf\x85\xcc\x93\xcc\x81", "\xe1\xbd\x96" => "\xcf\x85\xcc\x93\xcd\x82", "\xe1\xbd\x99" => "\xe1\xbd\x91", |
|
195 | - "\xe1\xbd\x9b" => "\xe1\xbd\x93", "\xe1\xbd\x9d" => "\xe1\xbd\x95", "\xe1\xbd\x9f" => "\xe1\xbd\x97", "\xe1\xbd\xa8" => "\xe1\xbd\xa0", |
|
196 | - "\xe1\xbd\xa9" => "\xe1\xbd\xa1", "\xe1\xbd\xaa" => "\xe1\xbd\xa2", "\xe1\xbd\xab" => "\xe1\xbd\xa3", "\xe1\xbd\xac" => "\xe1\xbd\xa4", |
|
197 | - "\xe1\xbd\xad" => "\xe1\xbd\xa5", "\xe1\xbd\xae" => "\xe1\xbd\xa6", "\xe1\xbd\xaf" => "\xe1\xbd\xa7", "\xe1\xbe\x80" => "\xe1\xbc\x80\xce\xb9", |
|
198 | - "\xe1\xbe\x81" => "\xe1\xbc\x81\xce\xb9", "\xe1\xbe\x82" => "\xe1\xbc\x82\xce\xb9", "\xe1\xbe\x83" => "\xe1\xbc\x83\xce\xb9", "\xe1\xbe\x84" => "\xe1\xbc\x84\xce\xb9", |
|
199 | - "\xe1\xbe\x85" => "\xe1\xbc\x85\xce\xb9", "\xe1\xbe\x86" => "\xe1\xbc\x86\xce\xb9", "\xe1\xbe\x87" => "\xe1\xbc\x87\xce\xb9", "\xe1\xbe\x88" => "\xe1\xbe\x80", |
|
200 | - "\xe1\xbe\x89" => "\xe1\xbe\x81", "\xe1\xbe\x8a" => "\xe1\xbe\x82", "\xe1\xbe\x8b" => "\xe1\xbe\x83", "\xe1\xbe\x8c" => "\xe1\xbe\x84", |
|
201 | - "\xe1\xbe\x8d" => "\xe1\xbe\x85", "\xe1\xbe\x8e" => "\xe1\xbe\x86", "\xe1\xbe\x8f" => "\xe1\xbe\x87", "\xe1\xbe\x90" => "\xe1\xbc\xa0\xce\xb9", |
|
202 | - "\xe1\xbe\x91" => "\xe1\xbc\xa1\xce\xb9", "\xe1\xbe\x92" => "\xe1\xbc\xa2\xce\xb9", "\xe1\xbe\x93" => "\xe1\xbc\xa3\xce\xb9", "\xe1\xbe\x94" => "\xe1\xbc\xa4\xce\xb9", |
|
203 | - "\xe1\xbe\x95" => "\xe1\xbc\xa5\xce\xb9", "\xe1\xbe\x96" => "\xe1\xbc\xa6\xce\xb9", "\xe1\xbe\x97" => "\xe1\xbc\xa7\xce\xb9", "\xe1\xbe\x98" => "\xe1\xbe\x90", |
|
204 | - "\xe1\xbe\x99" => "\xe1\xbe\x91", "\xe1\xbe\x9a" => "\xe1\xbe\x92", "\xe1\xbe\x9b" => "\xe1\xbe\x93", "\xe1\xbe\x9c" => "\xe1\xbe\x94", |
|
205 | - "\xe1\xbe\x9d" => "\xe1\xbe\x95", "\xe1\xbe\x9e" => "\xe1\xbe\x96", "\xe1\xbe\x9f" => "\xe1\xbe\x97", "\xe1\xbe\xa0" => "\xe1\xbd\xa0\xce\xb9", |
|
206 | - "\xe1\xbe\xa1" => "\xe1\xbd\xa1\xce\xb9", "\xe1\xbe\xa2" => "\xe1\xbd\xa2\xce\xb9", "\xe1\xbe\xa3" => "\xe1\xbd\xa3\xce\xb9", "\xe1\xbe\xa4" => "\xe1\xbd\xa4\xce\xb9", |
|
207 | - "\xe1\xbe\xa5" => "\xe1\xbd\xa5\xce\xb9", "\xe1\xbe\xa6" => "\xe1\xbd\xa6\xce\xb9", "\xe1\xbe\xa7" => "\xe1\xbd\xa7\xce\xb9", "\xe1\xbe\xa8" => "\xe1\xbe\xa0", |
|
208 | - "\xe1\xbe\xa9" => "\xe1\xbe\xa1", "\xe1\xbe\xaa" => "\xe1\xbe\xa2", "\xe1\xbe\xab" => "\xe1\xbe\xa3", "\xe1\xbe\xac" => "\xe1\xbe\xa4", |
|
209 | - "\xe1\xbe\xad" => "\xe1\xbe\xa5", "\xe1\xbe\xae" => "\xe1\xbe\xa6", "\xe1\xbe\xaf" => "\xe1\xbe\xa7", "\xe1\xbe\xb2" => "\xe1\xbd\xb0\xce\xb9", |
|
210 | - "\xe1\xbe\xb3" => "\xce\xb1\xce\xb9", "\xe1\xbe\xb4" => "\xce\xac\xce\xb9", "\xe1\xbe\xb6" => "\xce\xb1\xcd\x82", "\xe1\xbe\xb7" => "\xce\xb1\xcd\x82\xce\xb9", |
|
211 | - "\xe1\xbe\xb8" => "\xe1\xbe\xb0", "\xe1\xbe\xb9" => "\xe1\xbe\xb1", "\xe1\xbe\xba" => "\xe1\xbd\xb0", "\xe1\xbe\xbb" => "\xe1\xbd\xb1", |
|
212 | - "\xe1\xbe\xbc" => "\xe1\xbe\xb3", "\xe1\xbe\xbe" => "\xce\xb9", "\xe1\xbf\x82" => "\xe1\xbd\xb4\xce\xb9", "\xe1\xbf\x83" => "\xce\xb7\xce\xb9", |
|
213 | - "\xe1\xbf\x84" => "\xce\xae\xce\xb9", "\xe1\xbf\x86" => "\xce\xb7\xcd\x82", "\xe1\xbf\x87" => "\xce\xb7\xcd\x82\xce\xb9", "\xe1\xbf\x88" => "\xe1\xbd\xb2", |
|
214 | - "\xe1\xbf\x89" => "\xe1\xbd\xb3", "\xe1\xbf\x8a" => "\xe1\xbd\xb4", "\xe1\xbf\x8b" => "\xe1\xbd\xb5", "\xe1\xbf\x8c" => "\xe1\xbf\x83", |
|
215 | - "\xe1\xbf\x92" => "\xce\xb9\xcc\x88\xcc\x80", "\xe1\xbf\x93" => "\xce\xb9\xcc\x88\xcc\x81", "\xe1\xbf\x96" => "\xce\xb9\xcd\x82", "\xe1\xbf\x97" => "\xce\xb9\xcc\x88\xcd\x82", |
|
216 | - "\xe1\xbf\x98" => "\xe1\xbf\x90", "\xe1\xbf\x99" => "\xe1\xbf\x91", "\xe1\xbf\x9a" => "\xe1\xbd\xb6", "\xe1\xbf\x9b" => "\xe1\xbd\xb7", |
|
217 | - "\xe1\xbf\xa2" => "\xcf\x85\xcc\x88\xcc\x80", "\xe1\xbf\xa3" => "\xcf\x85\xcc\x88\xcc\x81", "\xe1\xbf\xa4" => "\xcf\x81\xcc\x93", "\xe1\xbf\xa6" => "\xcf\x85\xcd\x82", |
|
218 | - "\xe1\xbf\xa7" => "\xcf\x85\xcc\x88\xcd\x82", "\xe1\xbf\xa8" => "\xe1\xbf\xa0", "\xe1\xbf\xa9" => "\xe1\xbf\xa1", "\xe1\xbf\xaa" => "\xe1\xbd\xba", |
|
219 | - "\xe1\xbf\xab" => "\xe1\xbd\xbb", "\xe1\xbf\xac" => "\xe1\xbf\xa5", "\xe1\xbf\xb2" => "\xe1\xbd\xbc\xce\xb9", "\xe1\xbf\xb3" => "\xcf\x89\xce\xb9", |
|
220 | - "\xe1\xbf\xb4" => "\xcf\x8e\xce\xb9", "\xe1\xbf\xb6" => "\xcf\x89\xcd\x82", "\xe1\xbf\xb7" => "\xcf\x89\xcd\x82\xce\xb9", "\xe1\xbf\xb8" => "\xe1\xbd\xb8", |
|
221 | - "\xe1\xbf\xb9" => "\xe1\xbd\xb9", "\xe1\xbf\xba" => "\xe1\xbd\xbc", "\xe1\xbf\xbb" => "\xe1\xbd\xbd", "\xe1\xbf\xbc" => "\xe1\xbf\xb3", |
|
222 | - "\xe2\x84\xa6" => "\xcf\x89", "\xe2\x84\xaa" => "k", "\xe2\x84\xab" => "\xc3\xa5", "\xe2\x84\xb2" => "\xe2\x85\x8e", |
|
223 | - "\xe2\x85\xa0" => "\xe2\x85\xb0", "\xe2\x85\xa1" => "\xe2\x85\xb1", "\xe2\x85\xa2" => "\xe2\x85\xb2", "\xe2\x85\xa3" => "\xe2\x85\xb3", |
|
224 | - "\xe2\x85\xa4" => "\xe2\x85\xb4", "\xe2\x85\xa5" => "\xe2\x85\xb5", "\xe2\x85\xa6" => "\xe2\x85\xb6", "\xe2\x85\xa7" => "\xe2\x85\xb7", |
|
225 | - "\xe2\x85\xa8" => "\xe2\x85\xb8", "\xe2\x85\xa9" => "\xe2\x85\xb9", "\xe2\x85\xaa" => "\xe2\x85\xba", "\xe2\x85\xab" => "\xe2\x85\xbb", |
|
226 | - "\xe2\x85\xac" => "\xe2\x85\xbc", "\xe2\x85\xad" => "\xe2\x85\xbd", "\xe2\x85\xae" => "\xe2\x85\xbe", "\xe2\x85\xaf" => "\xe2\x85\xbf", |
|
227 | - "\xe2\x86\x83" => "\xe2\x86\x84", "\xe2\x92\xb6" => "\xe2\x93\x90", "\xe2\x92\xb7" => "\xe2\x93\x91", "\xe2\x92\xb8" => "\xe2\x93\x92", |
|
228 | - "\xe2\x92\xb9" => "\xe2\x93\x93", "\xe2\x92\xba" => "\xe2\x93\x94", "\xe2\x92\xbb" => "\xe2\x93\x95", "\xe2\x92\xbc" => "\xe2\x93\x96", |
|
229 | - "\xe2\x92\xbd" => "\xe2\x93\x97", "\xe2\x92\xbe" => "\xe2\x93\x98", "\xe2\x92\xbf" => "\xe2\x93\x99", "\xe2\x93\x80" => "\xe2\x93\x9a", |
|
230 | - "\xe2\x93\x81" => "\xe2\x93\x9b", "\xe2\x93\x82" => "\xe2\x93\x9c", "\xe2\x93\x83" => "\xe2\x93\x9d", "\xe2\x93\x84" => "\xe2\x93\x9e", |
|
231 | - "\xe2\x93\x85" => "\xe2\x93\x9f", "\xe2\x93\x86" => "\xe2\x93\xa0", "\xe2\x93\x87" => "\xe2\x93\xa1", "\xe2\x93\x88" => "\xe2\x93\xa2", |
|
232 | - "\xe2\x93\x89" => "\xe2\x93\xa3", "\xe2\x93\x8a" => "\xe2\x93\xa4", "\xe2\x93\x8b" => "\xe2\x93\xa5", "\xe2\x93\x8c" => "\xe2\x93\xa6", |
|
233 | - "\xe2\x93\x8d" => "\xe2\x93\xa7", "\xe2\x93\x8e" => "\xe2\x93\xa8", "\xe2\x93\x8f" => "\xe2\x93\xa9", "\xe2\xb0\x80" => "\xe2\xb0\xb0", |
|
234 | - "\xe2\xb0\x81" => "\xe2\xb0\xb1", "\xe2\xb0\x82" => "\xe2\xb0\xb2", "\xe2\xb0\x83" => "\xe2\xb0\xb3", "\xe2\xb0\x84" => "\xe2\xb0\xb4", |
|
235 | - "\xe2\xb0\x85" => "\xe2\xb0\xb5", "\xe2\xb0\x86" => "\xe2\xb0\xb6", "\xe2\xb0\x87" => "\xe2\xb0\xb7", "\xe2\xb0\x88" => "\xe2\xb0\xb8", |
|
236 | - "\xe2\xb0\x89" => "\xe2\xb0\xb9", "\xe2\xb0\x8a" => "\xe2\xb0\xba", "\xe2\xb0\x8b" => "\xe2\xb0\xbb", "\xe2\xb0\x8c" => "\xe2\xb0\xbc", |
|
237 | - "\xe2\xb0\x8d" => "\xe2\xb0\xbd", "\xe2\xb0\x8e" => "\xe2\xb0\xbe", "\xe2\xb0\x8f" => "\xe2\xb0\xbf", "\xe2\xb0\x90" => "\xe2\xb1\x80", |
|
238 | - "\xe2\xb0\x91" => "\xe2\xb1\x81", "\xe2\xb0\x92" => "\xe2\xb1\x82", "\xe2\xb0\x93" => "\xe2\xb1\x83", "\xe2\xb0\x94" => "\xe2\xb1\x84", |
|
239 | - "\xe2\xb0\x95" => "\xe2\xb1\x85", "\xe2\xb0\x96" => "\xe2\xb1\x86", "\xe2\xb0\x97" => "\xe2\xb1\x87", "\xe2\xb0\x98" => "\xe2\xb1\x88", |
|
240 | - "\xe2\xb0\x99" => "\xe2\xb1\x89", "\xe2\xb0\x9a" => "\xe2\xb1\x8a", "\xe2\xb0\x9b" => "\xe2\xb1\x8b", "\xe2\xb0\x9c" => "\xe2\xb1\x8c", |
|
241 | - "\xe2\xb0\x9d" => "\xe2\xb1\x8d", "\xe2\xb0\x9e" => "\xe2\xb1\x8e", "\xe2\xb0\x9f" => "\xe2\xb1\x8f", "\xe2\xb0\xa0" => "\xe2\xb1\x90", |
|
242 | - "\xe2\xb0\xa1" => "\xe2\xb1\x91", "\xe2\xb0\xa2" => "\xe2\xb1\x92", "\xe2\xb0\xa3" => "\xe2\xb1\x93", "\xe2\xb0\xa4" => "\xe2\xb1\x94", |
|
243 | - "\xe2\xb0\xa5" => "\xe2\xb1\x95", "\xe2\xb0\xa6" => "\xe2\xb1\x96", "\xe2\xb0\xa7" => "\xe2\xb1\x97", "\xe2\xb0\xa8" => "\xe2\xb1\x98", |
|
244 | - "\xe2\xb0\xa9" => "\xe2\xb1\x99", "\xe2\xb0\xaa" => "\xe2\xb1\x9a", "\xe2\xb0\xab" => "\xe2\xb1\x9b", "\xe2\xb0\xac" => "\xe2\xb1\x9c", |
|
245 | - "\xe2\xb0\xad" => "\xe2\xb1\x9d", "\xe2\xb0\xae" => "\xe2\xb1\x9e", "\xe2\xb1\xa0" => "\xe2\xb1\xa1", "\xe2\xb1\xa2" => "\xc9\xab", |
|
246 | - "\xe2\xb1\xa3" => "\xe1\xb5\xbd", "\xe2\xb1\xa4" => "\xc9\xbd", "\xe2\xb1\xa7" => "\xe2\xb1\xa8", "\xe2\xb1\xa9" => "\xe2\xb1\xaa", |
|
247 | - "\xe2\xb1\xab" => "\xe2\xb1\xac", "\xe2\xb1\xb5" => "\xe2\xb1\xb6", "\xe2\xb2\x80" => "\xe2\xb2\x81", "\xe2\xb2\x82" => "\xe2\xb2\x83", |
|
248 | - "\xe2\xb2\x84" => "\xe2\xb2\x85", "\xe2\xb2\x86" => "\xe2\xb2\x87", "\xe2\xb2\x88" => "\xe2\xb2\x89", "\xe2\xb2\x8a" => "\xe2\xb2\x8b", |
|
249 | - "\xe2\xb2\x8c" => "\xe2\xb2\x8d", "\xe2\xb2\x8e" => "\xe2\xb2\x8f", "\xe2\xb2\x90" => "\xe2\xb2\x91", "\xe2\xb2\x92" => "\xe2\xb2\x93", |
|
250 | - "\xe2\xb2\x94" => "\xe2\xb2\x95", "\xe2\xb2\x96" => "\xe2\xb2\x97", "\xe2\xb2\x98" => "\xe2\xb2\x99", "\xe2\xb2\x9a" => "\xe2\xb2\x9b", |
|
251 | - "\xe2\xb2\x9c" => "\xe2\xb2\x9d", "\xe2\xb2\x9e" => "\xe2\xb2\x9f", "\xe2\xb2\xa0" => "\xe2\xb2\xa1", "\xe2\xb2\xa2" => "\xe2\xb2\xa3", |
|
252 | - "\xe2\xb2\xa4" => "\xe2\xb2\xa5", "\xe2\xb2\xa6" => "\xe2\xb2\xa7", "\xe2\xb2\xa8" => "\xe2\xb2\xa9", "\xe2\xb2\xaa" => "\xe2\xb2\xab", |
|
253 | - "\xe2\xb2\xac" => "\xe2\xb2\xad", "\xe2\xb2\xae" => "\xe2\xb2\xaf", "\xe2\xb2\xb0" => "\xe2\xb2\xb1", "\xe2\xb2\xb2" => "\xe2\xb2\xb3", |
|
254 | - "\xe2\xb2\xb4" => "\xe2\xb2\xb5", "\xe2\xb2\xb6" => "\xe2\xb2\xb7", "\xe2\xb2\xb8" => "\xe2\xb2\xb9", "\xe2\xb2\xba" => "\xe2\xb2\xbb", |
|
255 | - "\xe2\xb2\xbc" => "\xe2\xb2\xbd", "\xe2\xb2\xbe" => "\xe2\xb2\xbf", "\xe2\xb3\x80" => "\xe2\xb3\x81", "\xe2\xb3\x82" => "\xe2\xb3\x83", |
|
256 | - "\xe2\xb3\x84" => "\xe2\xb3\x85", "\xe2\xb3\x86" => "\xe2\xb3\x87", "\xe2\xb3\x88" => "\xe2\xb3\x89", "\xe2\xb3\x8a" => "\xe2\xb3\x8b", |
|
257 | - "\xe2\xb3\x8c" => "\xe2\xb3\x8d", "\xe2\xb3\x8e" => "\xe2\xb3\x8f", "\xe2\xb3\x90" => "\xe2\xb3\x91", "\xe2\xb3\x92" => "\xe2\xb3\x93", |
|
258 | - "\xe2\xb3\x94" => "\xe2\xb3\x95", "\xe2\xb3\x96" => "\xe2\xb3\x97", "\xe2\xb3\x98" => "\xe2\xb3\x99", "\xe2\xb3\x9a" => "\xe2\xb3\x9b", |
|
259 | - "\xe2\xb3\x9c" => "\xe2\xb3\x9d", "\xe2\xb3\x9e" => "\xe2\xb3\x9f", "\xe2\xb3\xa0" => "\xe2\xb3\xa1", "\xe2\xb3\xa2" => "\xe2\xb3\xa3", |
|
260 | - "\xef\xac\x80" => "ff", "\xef\xac\x81" => "fi", "\xef\xac\x82" => "fl", "\xef\xac\x83" => "ffi", |
|
261 | - "\xef\xac\x84" => "ffl", "\xef\xac\x85" => "st", "\xef\xac\x86" => "st", "\xef\xac\x93" => "\xd5\xb4\xd5\xb6", |
|
262 | - "\xef\xac\x94" => "\xd5\xb4\xd5\xa5", "\xef\xac\x95" => "\xd5\xb4\xd5\xab", "\xef\xac\x96" => "\xd5\xbe\xd5\xb6", "\xef\xac\x97" => "\xd5\xb4\xd5\xad", |
|
263 | - "\xef\xbc\xa1" => "\xef\xbd\x81", "\xef\xbc\xa2" => "\xef\xbd\x82", "\xef\xbc\xa3" => "\xef\xbd\x83", "\xef\xbc\xa4" => "\xef\xbd\x84", |
|
264 | - "\xef\xbc\xa5" => "\xef\xbd\x85", "\xef\xbc\xa6" => "\xef\xbd\x86", "\xef\xbc\xa7" => "\xef\xbd\x87", "\xef\xbc\xa8" => "\xef\xbd\x88", |
|
265 | - "\xef\xbc\xa9" => "\xef\xbd\x89", "\xef\xbc\xaa" => "\xef\xbd\x8a", "\xef\xbc\xab" => "\xef\xbd\x8b", "\xef\xbc\xac" => "\xef\xbd\x8c", |
|
266 | - "\xef\xbc\xad" => "\xef\xbd\x8d", "\xef\xbc\xae" => "\xef\xbd\x8e", "\xef\xbc\xaf" => "\xef\xbd\x8f", "\xef\xbc\xb0" => "\xef\xbd\x90", |
|
267 | - "\xef\xbc\xb1" => "\xef\xbd\x91", "\xef\xbc\xb2" => "\xef\xbd\x92", "\xef\xbc\xb3" => "\xef\xbd\x93", "\xef\xbc\xb4" => "\xef\xbd\x94", |
|
268 | - "\xef\xbc\xb5" => "\xef\xbd\x95", "\xef\xbc\xb6" => "\xef\xbd\x96", "\xef\xbc\xb7" => "\xef\xbd\x97", "\xef\xbc\xb8" => "\xef\xbd\x98", |
|
269 | - "\xef\xbc\xb9" => "\xef\xbd\x99", "\xef\xbc\xba" => "\xef\xbd\x9a", "\xf0\x90\x90\x80" => "\xf0\x90\x90\xa8", "\xf0\x90\x90\x81" => "\xf0\x90\x90\xa9", |
|
270 | - "\xf0\x90\x90\x82" => "\xf0\x90\x90\xaa", "\xf0\x90\x90\x83" => "\xf0\x90\x90\xab", "\xf0\x90\x90\x84" => "\xf0\x90\x90\xac", "\xf0\x90\x90\x85" => "\xf0\x90\x90\xad", |
|
271 | - "\xf0\x90\x90\x86" => "\xf0\x90\x90\xae", "\xf0\x90\x90\x87" => "\xf0\x90\x90\xaf", "\xf0\x90\x90\x88" => "\xf0\x90\x90\xb0", "\xf0\x90\x90\x89" => "\xf0\x90\x90\xb1", |
|
272 | - "\xf0\x90\x90\x8a" => "\xf0\x90\x90\xb2", "\xf0\x90\x90\x8b" => "\xf0\x90\x90\xb3", "\xf0\x90\x90\x8c" => "\xf0\x90\x90\xb4", "\xf0\x90\x90\x8d" => "\xf0\x90\x90\xb5", |
|
273 | - "\xf0\x90\x90\x8e" => "\xf0\x90\x90\xb6", "\xf0\x90\x90\x8f" => "\xf0\x90\x90\xb7", "\xf0\x90\x90\x90" => "\xf0\x90\x90\xb8", "\xf0\x90\x90\x91" => "\xf0\x90\x90\xb9", |
|
274 | - "\xf0\x90\x90\x92" => "\xf0\x90\x90\xba", "\xf0\x90\x90\x93" => "\xf0\x90\x90\xbb", "\xf0\x90\x90\x94" => "\xf0\x90\x90\xbc", "\xf0\x90\x90\x95" => "\xf0\x90\x90\xbd", |
|
275 | - "\xf0\x90\x90\x96" => "\xf0\x90\x90\xbe", "\xf0\x90\x90\x97" => "\xf0\x90\x90\xbf", "\xf0\x90\x90\x98" => "\xf0\x90\x91\x80", "\xf0\x90\x90\x99" => "\xf0\x90\x91\x81", |
|
276 | - "\xf0\x90\x90\x9a" => "\xf0\x90\x91\x82", "\xf0\x90\x90\x9b" => "\xf0\x90\x91\x83", "\xf0\x90\x90\x9c" => "\xf0\x90\x91\x84", "\xf0\x90\x90\x9d" => "\xf0\x90\x91\x85", |
|
277 | - "\xf0\x90\x90\x9e" => "\xf0\x90\x91\x86", "\xf0\x90\x90\x9f" => "\xf0\x90\x91\x87", "\xf0\x90\x90\xa0" => "\xf0\x90\x91\x88", "\xf0\x90\x90\xa1" => "\xf0\x90\x91\x89", |
|
278 | - "\xf0\x90\x90\xa2" => "\xf0\x90\x91\x8a", "\xf0\x90\x90\xa3" => "\xf0\x90\x91\x8b", "\xf0\x90\x90\xa4" => "\xf0\x90\x91\x8c", "\xf0\x90\x90\xa5" => "\xf0\x90\x91\x8d", |
|
279 | - "\xf0\x90\x91\x8e" => "\xf0\x90\x90\xa6", "\xf0\x90\x91\x8f" => "\xf0\x90\x90\xa7", |
|
27 | + 'A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd', |
|
28 | + 'E' => 'e', 'F' => 'f', 'G' => 'g', 'H' => 'h', |
|
29 | + 'I' => 'i', 'J' => 'j', 'K' => 'k', 'L' => 'l', |
|
30 | + 'M' => 'm', 'N' => 'n', 'O' => 'o', 'P' => 'p', |
|
31 | + 'Q' => 'q', 'R' => 'r', 'S' => 's', 'T' => 't', |
|
32 | + 'U' => 'u', 'V' => 'v', 'W' => 'w', 'X' => 'x', |
|
33 | + 'Y' => 'y', 'Z' => 'z', "\xc2\xb5" => "\xce\xbc", "\xc3\x80" => "\xc3\xa0", |
|
34 | + "\xc3\x81" => "\xc3\xa1", "\xc3\x82" => "\xc3\xa2", "\xc3\x83" => "\xc3\xa3", "\xc3\x84" => "\xc3\xa4", |
|
35 | + "\xc3\x85" => "\xc3\xa5", "\xc3\x86" => "\xc3\xa6", "\xc3\x87" => "\xc3\xa7", "\xc3\x88" => "\xc3\xa8", |
|
36 | + "\xc3\x89" => "\xc3\xa9", "\xc3\x8a" => "\xc3\xaa", "\xc3\x8b" => "\xc3\xab", "\xc3\x8c" => "\xc3\xac", |
|
37 | + "\xc3\x8d" => "\xc3\xad", "\xc3\x8e" => "\xc3\xae", "\xc3\x8f" => "\xc3\xaf", "\xc3\x90" => "\xc3\xb0", |
|
38 | + "\xc3\x91" => "\xc3\xb1", "\xc3\x92" => "\xc3\xb2", "\xc3\x93" => "\xc3\xb3", "\xc3\x94" => "\xc3\xb4", |
|
39 | + "\xc3\x95" => "\xc3\xb5", "\xc3\x96" => "\xc3\xb6", "\xc3\x98" => "\xc3\xb8", "\xc3\x99" => "\xc3\xb9", |
|
40 | + "\xc3\x9a" => "\xc3\xba", "\xc3\x9b" => "\xc3\xbb", "\xc3\x9c" => "\xc3\xbc", "\xc3\x9d" => "\xc3\xbd", |
|
41 | + "\xc3\x9e" => "\xc3\xbe", "\xc3\x9f" => "ss", "\xc4\x80" => "\xc4\x81", "\xc4\x82" => "\xc4\x83", |
|
42 | + "\xc4\x84" => "\xc4\x85", "\xc4\x86" => "\xc4\x87", "\xc4\x88" => "\xc4\x89", "\xc4\x8a" => "\xc4\x8b", |
|
43 | + "\xc4\x8c" => "\xc4\x8d", "\xc4\x8e" => "\xc4\x8f", "\xc4\x90" => "\xc4\x91", "\xc4\x92" => "\xc4\x93", |
|
44 | + "\xc4\x94" => "\xc4\x95", "\xc4\x96" => "\xc4\x97", "\xc4\x98" => "\xc4\x99", "\xc4\x9a" => "\xc4\x9b", |
|
45 | + "\xc4\x9c" => "\xc4\x9d", "\xc4\x9e" => "\xc4\x9f", "\xc4\xa0" => "\xc4\xa1", "\xc4\xa2" => "\xc4\xa3", |
|
46 | + "\xc4\xa4" => "\xc4\xa5", "\xc4\xa6" => "\xc4\xa7", "\xc4\xa8" => "\xc4\xa9", "\xc4\xaa" => "\xc4\xab", |
|
47 | + "\xc4\xac" => "\xc4\xad", "\xc4\xae" => "\xc4\xaf", "\xc4\xb0" => "i\xcc\x87", "\xc4\xb2" => "\xc4\xb3", |
|
48 | + "\xc4\xb4" => "\xc4\xb5", "\xc4\xb6" => "\xc4\xb7", "\xc4\xb9" => "\xc4\xba", "\xc4\xbb" => "\xc4\xbc", |
|
49 | + "\xc4\xbd" => "\xc4\xbe", "\xc4\xbf" => "\xc5\x80", "\xc5\x81" => "\xc5\x82", "\xc5\x83" => "\xc5\x84", |
|
50 | + "\xc5\x85" => "\xc5\x86", "\xc5\x87" => "\xc5\x88", "\xc5\x89" => "\xca\xbcn", "\xc5\x8a" => "\xc5\x8b", |
|
51 | + "\xc5\x8c" => "\xc5\x8d", "\xc5\x8e" => "\xc5\x8f", "\xc5\x90" => "\xc5\x91", "\xc5\x92" => "\xc5\x93", |
|
52 | + "\xc5\x94" => "\xc5\x95", "\xc5\x96" => "\xc5\x97", "\xc5\x98" => "\xc5\x99", "\xc5\x9a" => "\xc5\x9b", |
|
53 | + "\xc5\x9c" => "\xc5\x9d", "\xc5\x9e" => "\xc5\x9f", "\xc5\xa0" => "\xc5\xa1", "\xc5\xa2" => "\xc5\xa3", |
|
54 | + "\xc5\xa4" => "\xc5\xa5", "\xc5\xa6" => "\xc5\xa7", "\xc5\xa8" => "\xc5\xa9", "\xc5\xaa" => "\xc5\xab", |
|
55 | + "\xc5\xac" => "\xc5\xad", "\xc5\xae" => "\xc5\xaf", "\xc5\xb0" => "\xc5\xb1", "\xc5\xb2" => "\xc5\xb3", |
|
56 | + "\xc5\xb4" => "\xc5\xb5", "\xc5\xb6" => "\xc5\xb7", "\xc5\xb8" => "\xc3\xbf", "\xc5\xb9" => "\xc5\xba", |
|
57 | + "\xc5\xbb" => "\xc5\xbc", "\xc5\xbd" => "\xc5\xbe", "\xc5\xbf" => "s", "\xc6\x81" => "\xc9\x93", |
|
58 | + "\xc6\x82" => "\xc6\x83", "\xc6\x84" => "\xc6\x85", "\xc6\x86" => "\xc9\x94", "\xc6\x87" => "\xc6\x88", |
|
59 | + "\xc6\x89" => "\xc9\x96", "\xc6\x8a" => "\xc9\x97", "\xc6\x8b" => "\xc6\x8c", "\xc6\x8e" => "\xc7\x9d", |
|
60 | + "\xc6\x8f" => "\xc9\x99", "\xc6\x90" => "\xc9\x9b", "\xc6\x91" => "\xc6\x92", "\xc6\x93" => "\xc9\xa0", |
|
61 | + "\xc6\x94" => "\xc9\xa3", "\xc6\x96" => "\xc9\xa9", "\xc6\x97" => "\xc9\xa8", "\xc6\x98" => "\xc6\x99", |
|
62 | + "\xc6\x9c" => "\xc9\xaf", "\xc6\x9d" => "\xc9\xb2", "\xc6\x9f" => "\xc9\xb5", "\xc6\xa0" => "\xc6\xa1", |
|
63 | + "\xc6\xa2" => "\xc6\xa3", "\xc6\xa4" => "\xc6\xa5", "\xc6\xa6" => "\xca\x80", "\xc6\xa7" => "\xc6\xa8", |
|
64 | + "\xc6\xa9" => "\xca\x83", "\xc6\xac" => "\xc6\xad", "\xc6\xae" => "\xca\x88", "\xc6\xaf" => "\xc6\xb0", |
|
65 | + "\xc6\xb1" => "\xca\x8a", "\xc6\xb2" => "\xca\x8b", "\xc6\xb3" => "\xc6\xb4", "\xc6\xb5" => "\xc6\xb6", |
|
66 | + "\xc6\xb7" => "\xca\x92", "\xc6\xb8" => "\xc6\xb9", "\xc6\xbc" => "\xc6\xbd", "\xc7\x84" => "\xc7\x86", |
|
67 | + "\xc7\x85" => "\xc7\x86", "\xc7\x87" => "\xc7\x89", "\xc7\x88" => "\xc7\x89", "\xc7\x8a" => "\xc7\x8c", |
|
68 | + "\xc7\x8b" => "\xc7\x8c", "\xc7\x8d" => "\xc7\x8e", "\xc7\x8f" => "\xc7\x90", "\xc7\x91" => "\xc7\x92", |
|
69 | + "\xc7\x93" => "\xc7\x94", "\xc7\x95" => "\xc7\x96", "\xc7\x97" => "\xc7\x98", "\xc7\x99" => "\xc7\x9a", |
|
70 | + "\xc7\x9b" => "\xc7\x9c", "\xc7\x9e" => "\xc7\x9f", "\xc7\xa0" => "\xc7\xa1", "\xc7\xa2" => "\xc7\xa3", |
|
71 | + "\xc7\xa4" => "\xc7\xa5", "\xc7\xa6" => "\xc7\xa7", "\xc7\xa8" => "\xc7\xa9", "\xc7\xaa" => "\xc7\xab", |
|
72 | + "\xc7\xac" => "\xc7\xad", "\xc7\xae" => "\xc7\xaf", "\xc7\xb0" => "j\xcc\x8c", "\xc7\xb1" => "\xc7\xb3", |
|
73 | + "\xc7\xb2" => "\xc7\xb3", "\xc7\xb4" => "\xc7\xb5", "\xc7\xb6" => "\xc6\x95", "\xc7\xb7" => "\xc6\xbf", |
|
74 | + "\xc7\xb8" => "\xc7\xb9", "\xc7\xba" => "\xc7\xbb", "\xc7\xbc" => "\xc7\xbd", "\xc7\xbe" => "\xc7\xbf", |
|
75 | + "\xc8\x80" => "\xc8\x81", "\xc8\x82" => "\xc8\x83", "\xc8\x84" => "\xc8\x85", "\xc8\x86" => "\xc8\x87", |
|
76 | + "\xc8\x88" => "\xc8\x89", "\xc8\x8a" => "\xc8\x8b", "\xc8\x8c" => "\xc8\x8d", "\xc8\x8e" => "\xc8\x8f", |
|
77 | + "\xc8\x90" => "\xc8\x91", "\xc8\x92" => "\xc8\x93", "\xc8\x94" => "\xc8\x95", "\xc8\x96" => "\xc8\x97", |
|
78 | + "\xc8\x98" => "\xc8\x99", "\xc8\x9a" => "\xc8\x9b", "\xc8\x9c" => "\xc8\x9d", "\xc8\x9e" => "\xc8\x9f", |
|
79 | + "\xc8\xa0" => "\xc6\x9e", "\xc8\xa2" => "\xc8\xa3", "\xc8\xa4" => "\xc8\xa5", "\xc8\xa6" => "\xc8\xa7", |
|
80 | + "\xc8\xa8" => "\xc8\xa9", "\xc8\xaa" => "\xc8\xab", "\xc8\xac" => "\xc8\xad", "\xc8\xae" => "\xc8\xaf", |
|
81 | + "\xc8\xb0" => "\xc8\xb1", "\xc8\xb2" => "\xc8\xb3", "\xc8\xba" => "\xe2\xb1\xa5", "\xc8\xbb" => "\xc8\xbc", |
|
82 | + "\xc8\xbd" => "\xc6\x9a", "\xc8\xbe" => "\xe2\xb1\xa6", "\xc9\x81" => "\xc9\x82", "\xc9\x83" => "\xc6\x80", |
|
83 | + "\xc9\x84" => "\xca\x89", "\xc9\x85" => "\xca\x8c", "\xc9\x86" => "\xc9\x87", "\xc9\x88" => "\xc9\x89", |
|
84 | + "\xc9\x8a" => "\xc9\x8b", "\xc9\x8c" => "\xc9\x8d", "\xc9\x8e" => "\xc9\x8f", "\xcd\x85" => "\xce\xb9", |
|
85 | + "\xce\x86" => "\xce\xac", "\xce\x88" => "\xce\xad", "\xce\x89" => "\xce\xae", "\xce\x8a" => "\xce\xaf", |
|
86 | + "\xce\x8c" => "\xcf\x8c", "\xce\x8e" => "\xcf\x8d", "\xce\x8f" => "\xcf\x8e", "\xce\x90" => "\xce\xb9\xcc\x88\xcc\x81", |
|
87 | + "\xce\x91" => "\xce\xb1", "\xce\x92" => "\xce\xb2", "\xce\x93" => "\xce\xb3", "\xce\x94" => "\xce\xb4", |
|
88 | + "\xce\x95" => "\xce\xb5", "\xce\x96" => "\xce\xb6", "\xce\x97" => "\xce\xb7", "\xce\x98" => "\xce\xb8", |
|
89 | + "\xce\x99" => "\xce\xb9", "\xce\x9a" => "\xce\xba", "\xce\x9b" => "\xce\xbb", "\xce\x9c" => "\xce\xbc", |
|
90 | + "\xce\x9d" => "\xce\xbd", "\xce\x9e" => "\xce\xbe", "\xce\x9f" => "\xce\xbf", "\xce\xa0" => "\xcf\x80", |
|
91 | + "\xce\xa1" => "\xcf\x81", "\xce\xa3" => "\xcf\x83", "\xce\xa4" => "\xcf\x84", "\xce\xa5" => "\xcf\x85", |
|
92 | + "\xce\xa6" => "\xcf\x86", "\xce\xa7" => "\xcf\x87", "\xce\xa8" => "\xcf\x88", "\xce\xa9" => "\xcf\x89", |
|
93 | + "\xce\xaa" => "\xcf\x8a", "\xce\xab" => "\xcf\x8b", "\xce\xb0" => "\xcf\x85\xcc\x88\xcc\x81", "\xcf\x82" => "\xcf\x83", |
|
94 | + "\xcf\x90" => "\xce\xb2", "\xcf\x91" => "\xce\xb8", "\xcf\x95" => "\xcf\x86", "\xcf\x96" => "\xcf\x80", |
|
95 | + "\xcf\x98" => "\xcf\x99", "\xcf\x9a" => "\xcf\x9b", "\xcf\x9c" => "\xcf\x9d", "\xcf\x9e" => "\xcf\x9f", |
|
96 | + "\xcf\xa0" => "\xcf\xa1", "\xcf\xa2" => "\xcf\xa3", "\xcf\xa4" => "\xcf\xa5", "\xcf\xa6" => "\xcf\xa7", |
|
97 | + "\xcf\xa8" => "\xcf\xa9", "\xcf\xaa" => "\xcf\xab", "\xcf\xac" => "\xcf\xad", "\xcf\xae" => "\xcf\xaf", |
|
98 | + "\xcf\xb0" => "\xce\xba", "\xcf\xb1" => "\xcf\x81", "\xcf\xb4" => "\xce\xb8", "\xcf\xb5" => "\xce\xb5", |
|
99 | + "\xcf\xb7" => "\xcf\xb8", "\xcf\xb9" => "\xcf\xb2", "\xcf\xba" => "\xcf\xbb", "\xcf\xbd" => "\xcd\xbb", |
|
100 | + "\xcf\xbe" => "\xcd\xbc", "\xcf\xbf" => "\xcd\xbd", "\xd0\x80" => "\xd1\x90", "\xd0\x81" => "\xd1\x91", |
|
101 | + "\xd0\x82" => "\xd1\x92", "\xd0\x83" => "\xd1\x93", "\xd0\x84" => "\xd1\x94", "\xd0\x85" => "\xd1\x95", |
|
102 | + "\xd0\x86" => "\xd1\x96", "\xd0\x87" => "\xd1\x97", "\xd0\x88" => "\xd1\x98", "\xd0\x89" => "\xd1\x99", |
|
103 | + "\xd0\x8a" => "\xd1\x9a", "\xd0\x8b" => "\xd1\x9b", "\xd0\x8c" => "\xd1\x9c", "\xd0\x8d" => "\xd1\x9d", |
|
104 | + "\xd0\x8e" => "\xd1\x9e", "\xd0\x8f" => "\xd1\x9f", "\xd0\x90" => "\xd0\xb0", "\xd0\x91" => "\xd0\xb1", |
|
105 | + "\xd0\x92" => "\xd0\xb2", "\xd0\x93" => "\xd0\xb3", "\xd0\x94" => "\xd0\xb4", "\xd0\x95" => "\xd0\xb5", |
|
106 | + "\xd0\x96" => "\xd0\xb6", "\xd0\x97" => "\xd0\xb7", "\xd0\x98" => "\xd0\xb8", "\xd0\x99" => "\xd0\xb9", |
|
107 | + "\xd0\x9a" => "\xd0\xba", "\xd0\x9b" => "\xd0\xbb", "\xd0\x9c" => "\xd0\xbc", "\xd0\x9d" => "\xd0\xbd", |
|
108 | + "\xd0\x9e" => "\xd0\xbe", "\xd0\x9f" => "\xd0\xbf", "\xd0\xa0" => "\xd1\x80", "\xd0\xa1" => "\xd1\x81", |
|
109 | + "\xd0\xa2" => "\xd1\x82", "\xd0\xa3" => "\xd1\x83", "\xd0\xa4" => "\xd1\x84", "\xd0\xa5" => "\xd1\x85", |
|
110 | + "\xd0\xa6" => "\xd1\x86", "\xd0\xa7" => "\xd1\x87", "\xd0\xa8" => "\xd1\x88", "\xd0\xa9" => "\xd1\x89", |
|
111 | + "\xd0\xaa" => "\xd1\x8a", "\xd0\xab" => "\xd1\x8b", "\xd0\xac" => "\xd1\x8c", "\xd0\xad" => "\xd1\x8d", |
|
112 | + "\xd0\xae" => "\xd1\x8e", "\xd0\xaf" => "\xd1\x8f", "\xd1\xa0" => "\xd1\xa1", "\xd1\xa2" => "\xd1\xa3", |
|
113 | + "\xd1\xa4" => "\xd1\xa5", "\xd1\xa6" => "\xd1\xa7", "\xd1\xa8" => "\xd1\xa9", "\xd1\xaa" => "\xd1\xab", |
|
114 | + "\xd1\xac" => "\xd1\xad", "\xd1\xae" => "\xd1\xaf", "\xd1\xb0" => "\xd1\xb1", "\xd1\xb2" => "\xd1\xb3", |
|
115 | + "\xd1\xb4" => "\xd1\xb5", "\xd1\xb6" => "\xd1\xb7", "\xd1\xb8" => "\xd1\xb9", "\xd1\xba" => "\xd1\xbb", |
|
116 | + "\xd1\xbc" => "\xd1\xbd", "\xd1\xbe" => "\xd1\xbf", "\xd2\x80" => "\xd2\x81", "\xd2\x8a" => "\xd2\x8b", |
|
117 | + "\xd2\x8c" => "\xd2\x8d", "\xd2\x8e" => "\xd2\x8f", "\xd2\x90" => "\xd2\x91", "\xd2\x92" => "\xd2\x93", |
|
118 | + "\xd2\x94" => "\xd2\x95", "\xd2\x96" => "\xd2\x97", "\xd2\x98" => "\xd2\x99", "\xd2\x9a" => "\xd2\x9b", |
|
119 | + "\xd2\x9c" => "\xd2\x9d", "\xd2\x9e" => "\xd2\x9f", "\xd2\xa0" => "\xd2\xa1", "\xd2\xa2" => "\xd2\xa3", |
|
120 | + "\xd2\xa4" => "\xd2\xa5", "\xd2\xa6" => "\xd2\xa7", "\xd2\xa8" => "\xd2\xa9", "\xd2\xaa" => "\xd2\xab", |
|
121 | + "\xd2\xac" => "\xd2\xad", "\xd2\xae" => "\xd2\xaf", "\xd2\xb0" => "\xd2\xb1", "\xd2\xb2" => "\xd2\xb3", |
|
122 | + "\xd2\xb4" => "\xd2\xb5", "\xd2\xb6" => "\xd2\xb7", "\xd2\xb8" => "\xd2\xb9", "\xd2\xba" => "\xd2\xbb", |
|
123 | + "\xd2\xbc" => "\xd2\xbd", "\xd2\xbe" => "\xd2\xbf", "\xd3\x80" => "\xd3\x8f", "\xd3\x81" => "\xd3\x82", |
|
124 | + "\xd3\x83" => "\xd3\x84", "\xd3\x85" => "\xd3\x86", "\xd3\x87" => "\xd3\x88", "\xd3\x89" => "\xd3\x8a", |
|
125 | + "\xd3\x8b" => "\xd3\x8c", "\xd3\x8d" => "\xd3\x8e", "\xd3\x90" => "\xd3\x91", "\xd3\x92" => "\xd3\x93", |
|
126 | + "\xd3\x94" => "\xd3\x95", "\xd3\x96" => "\xd3\x97", "\xd3\x98" => "\xd3\x99", "\xd3\x9a" => "\xd3\x9b", |
|
127 | + "\xd3\x9c" => "\xd3\x9d", "\xd3\x9e" => "\xd3\x9f", "\xd3\xa0" => "\xd3\xa1", "\xd3\xa2" => "\xd3\xa3", |
|
128 | + "\xd3\xa4" => "\xd3\xa5", "\xd3\xa6" => "\xd3\xa7", "\xd3\xa8" => "\xd3\xa9", "\xd3\xaa" => "\xd3\xab", |
|
129 | + "\xd3\xac" => "\xd3\xad", "\xd3\xae" => "\xd3\xaf", "\xd3\xb0" => "\xd3\xb1", "\xd3\xb2" => "\xd3\xb3", |
|
130 | + "\xd3\xb4" => "\xd3\xb5", "\xd3\xb6" => "\xd3\xb7", "\xd3\xb8" => "\xd3\xb9", "\xd3\xba" => "\xd3\xbb", |
|
131 | + "\xd3\xbc" => "\xd3\xbd", "\xd3\xbe" => "\xd3\xbf", "\xd4\x80" => "\xd4\x81", "\xd4\x82" => "\xd4\x83", |
|
132 | + "\xd4\x84" => "\xd4\x85", "\xd4\x86" => "\xd4\x87", "\xd4\x88" => "\xd4\x89", "\xd4\x8a" => "\xd4\x8b", |
|
133 | + "\xd4\x8c" => "\xd4\x8d", "\xd4\x8e" => "\xd4\x8f", "\xd4\x90" => "\xd4\x91", "\xd4\x92" => "\xd4\x93", |
|
134 | + "\xd4\xb1" => "\xd5\xa1", "\xd4\xb2" => "\xd5\xa2", "\xd4\xb3" => "\xd5\xa3", "\xd4\xb4" => "\xd5\xa4", |
|
135 | + "\xd4\xb5" => "\xd5\xa5", "\xd4\xb6" => "\xd5\xa6", "\xd4\xb7" => "\xd5\xa7", "\xd4\xb8" => "\xd5\xa8", |
|
136 | + "\xd4\xb9" => "\xd5\xa9", "\xd4\xba" => "\xd5\xaa", "\xd4\xbb" => "\xd5\xab", "\xd4\xbc" => "\xd5\xac", |
|
137 | + "\xd4\xbd" => "\xd5\xad", "\xd4\xbe" => "\xd5\xae", "\xd4\xbf" => "\xd5\xaf", "\xd5\x80" => "\xd5\xb0", |
|
138 | + "\xd5\x81" => "\xd5\xb1", "\xd5\x82" => "\xd5\xb2", "\xd5\x83" => "\xd5\xb3", "\xd5\x84" => "\xd5\xb4", |
|
139 | + "\xd5\x85" => "\xd5\xb5", "\xd5\x86" => "\xd5\xb6", "\xd5\x87" => "\xd5\xb7", "\xd5\x88" => "\xd5\xb8", |
|
140 | + "\xd5\x89" => "\xd5\xb9", "\xd5\x8a" => "\xd5\xba", "\xd5\x8b" => "\xd5\xbb", "\xd5\x8c" => "\xd5\xbc", |
|
141 | + "\xd5\x8d" => "\xd5\xbd", "\xd5\x8e" => "\xd5\xbe", "\xd5\x8f" => "\xd5\xbf", "\xd5\x90" => "\xd6\x80", |
|
142 | + "\xd5\x91" => "\xd6\x81", "\xd5\x92" => "\xd6\x82", "\xd5\x93" => "\xd6\x83", "\xd5\x94" => "\xd6\x84", |
|
143 | + "\xd5\x95" => "\xd6\x85", "\xd5\x96" => "\xd6\x86", "\xd6\x87" => "\xd5\xa5\xd6\x82", "\xe1\x82\xa0" => "\xe2\xb4\x80", |
|
144 | + "\xe1\x82\xa1" => "\xe2\xb4\x81", "\xe1\x82\xa2" => "\xe2\xb4\x82", "\xe1\x82\xa3" => "\xe2\xb4\x83", "\xe1\x82\xa4" => "\xe2\xb4\x84", |
|
145 | + "\xe1\x82\xa5" => "\xe2\xb4\x85", "\xe1\x82\xa6" => "\xe2\xb4\x86", "\xe1\x82\xa7" => "\xe2\xb4\x87", "\xe1\x82\xa8" => "\xe2\xb4\x88", |
|
146 | + "\xe1\x82\xa9" => "\xe2\xb4\x89", "\xe1\x82\xaa" => "\xe2\xb4\x8a", "\xe1\x82\xab" => "\xe2\xb4\x8b", "\xe1\x82\xac" => "\xe2\xb4\x8c", |
|
147 | + "\xe1\x82\xad" => "\xe2\xb4\x8d", "\xe1\x82\xae" => "\xe2\xb4\x8e", "\xe1\x82\xaf" => "\xe2\xb4\x8f", "\xe1\x82\xb0" => "\xe2\xb4\x90", |
|
148 | + "\xe1\x82\xb1" => "\xe2\xb4\x91", "\xe1\x82\xb2" => "\xe2\xb4\x92", "\xe1\x82\xb3" => "\xe2\xb4\x93", "\xe1\x82\xb4" => "\xe2\xb4\x94", |
|
149 | + "\xe1\x82\xb5" => "\xe2\xb4\x95", "\xe1\x82\xb6" => "\xe2\xb4\x96", "\xe1\x82\xb7" => "\xe2\xb4\x97", "\xe1\x82\xb8" => "\xe2\xb4\x98", |
|
150 | + "\xe1\x82\xb9" => "\xe2\xb4\x99", "\xe1\x82\xba" => "\xe2\xb4\x9a", "\xe1\x82\xbb" => "\xe2\xb4\x9b", "\xe1\x82\xbc" => "\xe2\xb4\x9c", |
|
151 | + "\xe1\x82\xbd" => "\xe2\xb4\x9d", "\xe1\x82\xbe" => "\xe2\xb4\x9e", "\xe1\x82\xbf" => "\xe2\xb4\x9f", "\xe1\x83\x80" => "\xe2\xb4\xa0", |
|
152 | + "\xe1\x83\x81" => "\xe2\xb4\xa1", "\xe1\x83\x82" => "\xe2\xb4\xa2", "\xe1\x83\x83" => "\xe2\xb4\xa3", "\xe1\x83\x84" => "\xe2\xb4\xa4", |
|
153 | + "\xe1\x83\x85" => "\xe2\xb4\xa5", "\xe1\xb8\x80" => "\xe1\xb8\x81", "\xe1\xb8\x82" => "\xe1\xb8\x83", "\xe1\xb8\x84" => "\xe1\xb8\x85", |
|
154 | + "\xe1\xb8\x86" => "\xe1\xb8\x87", "\xe1\xb8\x88" => "\xe1\xb8\x89", "\xe1\xb8\x8a" => "\xe1\xb8\x8b", "\xe1\xb8\x8c" => "\xe1\xb8\x8d", |
|
155 | + "\xe1\xb8\x8e" => "\xe1\xb8\x8f", "\xe1\xb8\x90" => "\xe1\xb8\x91", "\xe1\xb8\x92" => "\xe1\xb8\x93", "\xe1\xb8\x94" => "\xe1\xb8\x95", |
|
156 | + "\xe1\xb8\x96" => "\xe1\xb8\x97", "\xe1\xb8\x98" => "\xe1\xb8\x99", "\xe1\xb8\x9a" => "\xe1\xb8\x9b", "\xe1\xb8\x9c" => "\xe1\xb8\x9d", |
|
157 | + "\xe1\xb8\x9e" => "\xe1\xb8\x9f", "\xe1\xb8\xa0" => "\xe1\xb8\xa1", "\xe1\xb8\xa2" => "\xe1\xb8\xa3", "\xe1\xb8\xa4" => "\xe1\xb8\xa5", |
|
158 | + "\xe1\xb8\xa6" => "\xe1\xb8\xa7", "\xe1\xb8\xa8" => "\xe1\xb8\xa9", "\xe1\xb8\xaa" => "\xe1\xb8\xab", "\xe1\xb8\xac" => "\xe1\xb8\xad", |
|
159 | + "\xe1\xb8\xae" => "\xe1\xb8\xaf", "\xe1\xb8\xb0" => "\xe1\xb8\xb1", "\xe1\xb8\xb2" => "\xe1\xb8\xb3", "\xe1\xb8\xb4" => "\xe1\xb8\xb5", |
|
160 | + "\xe1\xb8\xb6" => "\xe1\xb8\xb7", "\xe1\xb8\xb8" => "\xe1\xb8\xb9", "\xe1\xb8\xba" => "\xe1\xb8\xbb", "\xe1\xb8\xbc" => "\xe1\xb8\xbd", |
|
161 | + "\xe1\xb8\xbe" => "\xe1\xb8\xbf", "\xe1\xb9\x80" => "\xe1\xb9\x81", "\xe1\xb9\x82" => "\xe1\xb9\x83", "\xe1\xb9\x84" => "\xe1\xb9\x85", |
|
162 | + "\xe1\xb9\x86" => "\xe1\xb9\x87", "\xe1\xb9\x88" => "\xe1\xb9\x89", "\xe1\xb9\x8a" => "\xe1\xb9\x8b", "\xe1\xb9\x8c" => "\xe1\xb9\x8d", |
|
163 | + "\xe1\xb9\x8e" => "\xe1\xb9\x8f", "\xe1\xb9\x90" => "\xe1\xb9\x91", "\xe1\xb9\x92" => "\xe1\xb9\x93", "\xe1\xb9\x94" => "\xe1\xb9\x95", |
|
164 | + "\xe1\xb9\x96" => "\xe1\xb9\x97", "\xe1\xb9\x98" => "\xe1\xb9\x99", "\xe1\xb9\x9a" => "\xe1\xb9\x9b", "\xe1\xb9\x9c" => "\xe1\xb9\x9d", |
|
165 | + "\xe1\xb9\x9e" => "\xe1\xb9\x9f", "\xe1\xb9\xa0" => "\xe1\xb9\xa1", "\xe1\xb9\xa2" => "\xe1\xb9\xa3", "\xe1\xb9\xa4" => "\xe1\xb9\xa5", |
|
166 | + "\xe1\xb9\xa6" => "\xe1\xb9\xa7", "\xe1\xb9\xa8" => "\xe1\xb9\xa9", "\xe1\xb9\xaa" => "\xe1\xb9\xab", "\xe1\xb9\xac" => "\xe1\xb9\xad", |
|
167 | + "\xe1\xb9\xae" => "\xe1\xb9\xaf", "\xe1\xb9\xb0" => "\xe1\xb9\xb1", "\xe1\xb9\xb2" => "\xe1\xb9\xb3", "\xe1\xb9\xb4" => "\xe1\xb9\xb5", |
|
168 | + "\xe1\xb9\xb6" => "\xe1\xb9\xb7", "\xe1\xb9\xb8" => "\xe1\xb9\xb9", "\xe1\xb9\xba" => "\xe1\xb9\xbb", "\xe1\xb9\xbc" => "\xe1\xb9\xbd", |
|
169 | + "\xe1\xb9\xbe" => "\xe1\xb9\xbf", "\xe1\xba\x80" => "\xe1\xba\x81", "\xe1\xba\x82" => "\xe1\xba\x83", "\xe1\xba\x84" => "\xe1\xba\x85", |
|
170 | + "\xe1\xba\x86" => "\xe1\xba\x87", "\xe1\xba\x88" => "\xe1\xba\x89", "\xe1\xba\x8a" => "\xe1\xba\x8b", "\xe1\xba\x8c" => "\xe1\xba\x8d", |
|
171 | + "\xe1\xba\x8e" => "\xe1\xba\x8f", "\xe1\xba\x90" => "\xe1\xba\x91", "\xe1\xba\x92" => "\xe1\xba\x93", "\xe1\xba\x94" => "\xe1\xba\x95", |
|
172 | + "\xe1\xba\x96" => "h\xcc\xb1", "\xe1\xba\x97" => "t\xcc\x88", "\xe1\xba\x98" => "w\xcc\x8a", "\xe1\xba\x99" => "y\xcc\x8a", |
|
173 | + "\xe1\xba\x9a" => "a\xca\xbe", "\xe1\xba\x9b" => "\xe1\xb9\xa1", "\xe1\xba\xa0" => "\xe1\xba\xa1", "\xe1\xba\xa2" => "\xe1\xba\xa3", |
|
174 | + "\xe1\xba\xa4" => "\xe1\xba\xa5", "\xe1\xba\xa6" => "\xe1\xba\xa7", "\xe1\xba\xa8" => "\xe1\xba\xa9", "\xe1\xba\xaa" => "\xe1\xba\xab", |
|
175 | + "\xe1\xba\xac" => "\xe1\xba\xad", "\xe1\xba\xae" => "\xe1\xba\xaf", "\xe1\xba\xb0" => "\xe1\xba\xb1", "\xe1\xba\xb2" => "\xe1\xba\xb3", |
|
176 | + "\xe1\xba\xb4" => "\xe1\xba\xb5", "\xe1\xba\xb6" => "\xe1\xba\xb7", "\xe1\xba\xb8" => "\xe1\xba\xb9", "\xe1\xba\xba" => "\xe1\xba\xbb", |
|
177 | + "\xe1\xba\xbc" => "\xe1\xba\xbd", "\xe1\xba\xbe" => "\xe1\xba\xbf", "\xe1\xbb\x80" => "\xe1\xbb\x81", "\xe1\xbb\x82" => "\xe1\xbb\x83", |
|
178 | + "\xe1\xbb\x84" => "\xe1\xbb\x85", "\xe1\xbb\x86" => "\xe1\xbb\x87", "\xe1\xbb\x88" => "\xe1\xbb\x89", "\xe1\xbb\x8a" => "\xe1\xbb\x8b", |
|
179 | + "\xe1\xbb\x8c" => "\xe1\xbb\x8d", "\xe1\xbb\x8e" => "\xe1\xbb\x8f", "\xe1\xbb\x90" => "\xe1\xbb\x91", "\xe1\xbb\x92" => "\xe1\xbb\x93", |
|
180 | + "\xe1\xbb\x94" => "\xe1\xbb\x95", "\xe1\xbb\x96" => "\xe1\xbb\x97", "\xe1\xbb\x98" => "\xe1\xbb\x99", "\xe1\xbb\x9a" => "\xe1\xbb\x9b", |
|
181 | + "\xe1\xbb\x9c" => "\xe1\xbb\x9d", "\xe1\xbb\x9e" => "\xe1\xbb\x9f", "\xe1\xbb\xa0" => "\xe1\xbb\xa1", "\xe1\xbb\xa2" => "\xe1\xbb\xa3", |
|
182 | + "\xe1\xbb\xa4" => "\xe1\xbb\xa5", "\xe1\xbb\xa6" => "\xe1\xbb\xa7", "\xe1\xbb\xa8" => "\xe1\xbb\xa9", "\xe1\xbb\xaa" => "\xe1\xbb\xab", |
|
183 | + "\xe1\xbb\xac" => "\xe1\xbb\xad", "\xe1\xbb\xae" => "\xe1\xbb\xaf", "\xe1\xbb\xb0" => "\xe1\xbb\xb1", "\xe1\xbb\xb2" => "\xe1\xbb\xb3", |
|
184 | + "\xe1\xbb\xb4" => "\xe1\xbb\xb5", "\xe1\xbb\xb6" => "\xe1\xbb\xb7", "\xe1\xbb\xb8" => "\xe1\xbb\xb9", "\xe1\xbc\x88" => "\xe1\xbc\x80", |
|
185 | + "\xe1\xbc\x89" => "\xe1\xbc\x81", "\xe1\xbc\x8a" => "\xe1\xbc\x82", "\xe1\xbc\x8b" => "\xe1\xbc\x83", "\xe1\xbc\x8c" => "\xe1\xbc\x84", |
|
186 | + "\xe1\xbc\x8d" => "\xe1\xbc\x85", "\xe1\xbc\x8e" => "\xe1\xbc\x86", "\xe1\xbc\x8f" => "\xe1\xbc\x87", "\xe1\xbc\x98" => "\xe1\xbc\x90", |
|
187 | + "\xe1\xbc\x99" => "\xe1\xbc\x91", "\xe1\xbc\x9a" => "\xe1\xbc\x92", "\xe1\xbc\x9b" => "\xe1\xbc\x93", "\xe1\xbc\x9c" => "\xe1\xbc\x94", |
|
188 | + "\xe1\xbc\x9d" => "\xe1\xbc\x95", "\xe1\xbc\xa8" => "\xe1\xbc\xa0", "\xe1\xbc\xa9" => "\xe1\xbc\xa1", "\xe1\xbc\xaa" => "\xe1\xbc\xa2", |
|
189 | + "\xe1\xbc\xab" => "\xe1\xbc\xa3", "\xe1\xbc\xac" => "\xe1\xbc\xa4", "\xe1\xbc\xad" => "\xe1\xbc\xa5", "\xe1\xbc\xae" => "\xe1\xbc\xa6", |
|
190 | + "\xe1\xbc\xaf" => "\xe1\xbc\xa7", "\xe1\xbc\xb8" => "\xe1\xbc\xb0", "\xe1\xbc\xb9" => "\xe1\xbc\xb1", "\xe1\xbc\xba" => "\xe1\xbc\xb2", |
|
191 | + "\xe1\xbc\xbb" => "\xe1\xbc\xb3", "\xe1\xbc\xbc" => "\xe1\xbc\xb4", "\xe1\xbc\xbd" => "\xe1\xbc\xb5", "\xe1\xbc\xbe" => "\xe1\xbc\xb6", |
|
192 | + "\xe1\xbc\xbf" => "\xe1\xbc\xb7", "\xe1\xbd\x88" => "\xe1\xbd\x80", "\xe1\xbd\x89" => "\xe1\xbd\x81", "\xe1\xbd\x8a" => "\xe1\xbd\x82", |
|
193 | + "\xe1\xbd\x8b" => "\xe1\xbd\x83", "\xe1\xbd\x8c" => "\xe1\xbd\x84", "\xe1\xbd\x8d" => "\xe1\xbd\x85", "\xe1\xbd\x90" => "\xcf\x85\xcc\x93", |
|
194 | + "\xe1\xbd\x92" => "\xcf\x85\xcc\x93\xcc\x80", "\xe1\xbd\x94" => "\xcf\x85\xcc\x93\xcc\x81", "\xe1\xbd\x96" => "\xcf\x85\xcc\x93\xcd\x82", "\xe1\xbd\x99" => "\xe1\xbd\x91", |
|
195 | + "\xe1\xbd\x9b" => "\xe1\xbd\x93", "\xe1\xbd\x9d" => "\xe1\xbd\x95", "\xe1\xbd\x9f" => "\xe1\xbd\x97", "\xe1\xbd\xa8" => "\xe1\xbd\xa0", |
|
196 | + "\xe1\xbd\xa9" => "\xe1\xbd\xa1", "\xe1\xbd\xaa" => "\xe1\xbd\xa2", "\xe1\xbd\xab" => "\xe1\xbd\xa3", "\xe1\xbd\xac" => "\xe1\xbd\xa4", |
|
197 | + "\xe1\xbd\xad" => "\xe1\xbd\xa5", "\xe1\xbd\xae" => "\xe1\xbd\xa6", "\xe1\xbd\xaf" => "\xe1\xbd\xa7", "\xe1\xbe\x80" => "\xe1\xbc\x80\xce\xb9", |
|
198 | + "\xe1\xbe\x81" => "\xe1\xbc\x81\xce\xb9", "\xe1\xbe\x82" => "\xe1\xbc\x82\xce\xb9", "\xe1\xbe\x83" => "\xe1\xbc\x83\xce\xb9", "\xe1\xbe\x84" => "\xe1\xbc\x84\xce\xb9", |
|
199 | + "\xe1\xbe\x85" => "\xe1\xbc\x85\xce\xb9", "\xe1\xbe\x86" => "\xe1\xbc\x86\xce\xb9", "\xe1\xbe\x87" => "\xe1\xbc\x87\xce\xb9", "\xe1\xbe\x88" => "\xe1\xbe\x80", |
|
200 | + "\xe1\xbe\x89" => "\xe1\xbe\x81", "\xe1\xbe\x8a" => "\xe1\xbe\x82", "\xe1\xbe\x8b" => "\xe1\xbe\x83", "\xe1\xbe\x8c" => "\xe1\xbe\x84", |
|
201 | + "\xe1\xbe\x8d" => "\xe1\xbe\x85", "\xe1\xbe\x8e" => "\xe1\xbe\x86", "\xe1\xbe\x8f" => "\xe1\xbe\x87", "\xe1\xbe\x90" => "\xe1\xbc\xa0\xce\xb9", |
|
202 | + "\xe1\xbe\x91" => "\xe1\xbc\xa1\xce\xb9", "\xe1\xbe\x92" => "\xe1\xbc\xa2\xce\xb9", "\xe1\xbe\x93" => "\xe1\xbc\xa3\xce\xb9", "\xe1\xbe\x94" => "\xe1\xbc\xa4\xce\xb9", |
|
203 | + "\xe1\xbe\x95" => "\xe1\xbc\xa5\xce\xb9", "\xe1\xbe\x96" => "\xe1\xbc\xa6\xce\xb9", "\xe1\xbe\x97" => "\xe1\xbc\xa7\xce\xb9", "\xe1\xbe\x98" => "\xe1\xbe\x90", |
|
204 | + "\xe1\xbe\x99" => "\xe1\xbe\x91", "\xe1\xbe\x9a" => "\xe1\xbe\x92", "\xe1\xbe\x9b" => "\xe1\xbe\x93", "\xe1\xbe\x9c" => "\xe1\xbe\x94", |
|
205 | + "\xe1\xbe\x9d" => "\xe1\xbe\x95", "\xe1\xbe\x9e" => "\xe1\xbe\x96", "\xe1\xbe\x9f" => "\xe1\xbe\x97", "\xe1\xbe\xa0" => "\xe1\xbd\xa0\xce\xb9", |
|
206 | + "\xe1\xbe\xa1" => "\xe1\xbd\xa1\xce\xb9", "\xe1\xbe\xa2" => "\xe1\xbd\xa2\xce\xb9", "\xe1\xbe\xa3" => "\xe1\xbd\xa3\xce\xb9", "\xe1\xbe\xa4" => "\xe1\xbd\xa4\xce\xb9", |
|
207 | + "\xe1\xbe\xa5" => "\xe1\xbd\xa5\xce\xb9", "\xe1\xbe\xa6" => "\xe1\xbd\xa6\xce\xb9", "\xe1\xbe\xa7" => "\xe1\xbd\xa7\xce\xb9", "\xe1\xbe\xa8" => "\xe1\xbe\xa0", |
|
208 | + "\xe1\xbe\xa9" => "\xe1\xbe\xa1", "\xe1\xbe\xaa" => "\xe1\xbe\xa2", "\xe1\xbe\xab" => "\xe1\xbe\xa3", "\xe1\xbe\xac" => "\xe1\xbe\xa4", |
|
209 | + "\xe1\xbe\xad" => "\xe1\xbe\xa5", "\xe1\xbe\xae" => "\xe1\xbe\xa6", "\xe1\xbe\xaf" => "\xe1\xbe\xa7", "\xe1\xbe\xb2" => "\xe1\xbd\xb0\xce\xb9", |
|
210 | + "\xe1\xbe\xb3" => "\xce\xb1\xce\xb9", "\xe1\xbe\xb4" => "\xce\xac\xce\xb9", "\xe1\xbe\xb6" => "\xce\xb1\xcd\x82", "\xe1\xbe\xb7" => "\xce\xb1\xcd\x82\xce\xb9", |
|
211 | + "\xe1\xbe\xb8" => "\xe1\xbe\xb0", "\xe1\xbe\xb9" => "\xe1\xbe\xb1", "\xe1\xbe\xba" => "\xe1\xbd\xb0", "\xe1\xbe\xbb" => "\xe1\xbd\xb1", |
|
212 | + "\xe1\xbe\xbc" => "\xe1\xbe\xb3", "\xe1\xbe\xbe" => "\xce\xb9", "\xe1\xbf\x82" => "\xe1\xbd\xb4\xce\xb9", "\xe1\xbf\x83" => "\xce\xb7\xce\xb9", |
|
213 | + "\xe1\xbf\x84" => "\xce\xae\xce\xb9", "\xe1\xbf\x86" => "\xce\xb7\xcd\x82", "\xe1\xbf\x87" => "\xce\xb7\xcd\x82\xce\xb9", "\xe1\xbf\x88" => "\xe1\xbd\xb2", |
|
214 | + "\xe1\xbf\x89" => "\xe1\xbd\xb3", "\xe1\xbf\x8a" => "\xe1\xbd\xb4", "\xe1\xbf\x8b" => "\xe1\xbd\xb5", "\xe1\xbf\x8c" => "\xe1\xbf\x83", |
|
215 | + "\xe1\xbf\x92" => "\xce\xb9\xcc\x88\xcc\x80", "\xe1\xbf\x93" => "\xce\xb9\xcc\x88\xcc\x81", "\xe1\xbf\x96" => "\xce\xb9\xcd\x82", "\xe1\xbf\x97" => "\xce\xb9\xcc\x88\xcd\x82", |
|
216 | + "\xe1\xbf\x98" => "\xe1\xbf\x90", "\xe1\xbf\x99" => "\xe1\xbf\x91", "\xe1\xbf\x9a" => "\xe1\xbd\xb6", "\xe1\xbf\x9b" => "\xe1\xbd\xb7", |
|
217 | + "\xe1\xbf\xa2" => "\xcf\x85\xcc\x88\xcc\x80", "\xe1\xbf\xa3" => "\xcf\x85\xcc\x88\xcc\x81", "\xe1\xbf\xa4" => "\xcf\x81\xcc\x93", "\xe1\xbf\xa6" => "\xcf\x85\xcd\x82", |
|
218 | + "\xe1\xbf\xa7" => "\xcf\x85\xcc\x88\xcd\x82", "\xe1\xbf\xa8" => "\xe1\xbf\xa0", "\xe1\xbf\xa9" => "\xe1\xbf\xa1", "\xe1\xbf\xaa" => "\xe1\xbd\xba", |
|
219 | + "\xe1\xbf\xab" => "\xe1\xbd\xbb", "\xe1\xbf\xac" => "\xe1\xbf\xa5", "\xe1\xbf\xb2" => "\xe1\xbd\xbc\xce\xb9", "\xe1\xbf\xb3" => "\xcf\x89\xce\xb9", |
|
220 | + "\xe1\xbf\xb4" => "\xcf\x8e\xce\xb9", "\xe1\xbf\xb6" => "\xcf\x89\xcd\x82", "\xe1\xbf\xb7" => "\xcf\x89\xcd\x82\xce\xb9", "\xe1\xbf\xb8" => "\xe1\xbd\xb8", |
|
221 | + "\xe1\xbf\xb9" => "\xe1\xbd\xb9", "\xe1\xbf\xba" => "\xe1\xbd\xbc", "\xe1\xbf\xbb" => "\xe1\xbd\xbd", "\xe1\xbf\xbc" => "\xe1\xbf\xb3", |
|
222 | + "\xe2\x84\xa6" => "\xcf\x89", "\xe2\x84\xaa" => "k", "\xe2\x84\xab" => "\xc3\xa5", "\xe2\x84\xb2" => "\xe2\x85\x8e", |
|
223 | + "\xe2\x85\xa0" => "\xe2\x85\xb0", "\xe2\x85\xa1" => "\xe2\x85\xb1", "\xe2\x85\xa2" => "\xe2\x85\xb2", "\xe2\x85\xa3" => "\xe2\x85\xb3", |
|
224 | + "\xe2\x85\xa4" => "\xe2\x85\xb4", "\xe2\x85\xa5" => "\xe2\x85\xb5", "\xe2\x85\xa6" => "\xe2\x85\xb6", "\xe2\x85\xa7" => "\xe2\x85\xb7", |
|
225 | + "\xe2\x85\xa8" => "\xe2\x85\xb8", "\xe2\x85\xa9" => "\xe2\x85\xb9", "\xe2\x85\xaa" => "\xe2\x85\xba", "\xe2\x85\xab" => "\xe2\x85\xbb", |
|
226 | + "\xe2\x85\xac" => "\xe2\x85\xbc", "\xe2\x85\xad" => "\xe2\x85\xbd", "\xe2\x85\xae" => "\xe2\x85\xbe", "\xe2\x85\xaf" => "\xe2\x85\xbf", |
|
227 | + "\xe2\x86\x83" => "\xe2\x86\x84", "\xe2\x92\xb6" => "\xe2\x93\x90", "\xe2\x92\xb7" => "\xe2\x93\x91", "\xe2\x92\xb8" => "\xe2\x93\x92", |
|
228 | + "\xe2\x92\xb9" => "\xe2\x93\x93", "\xe2\x92\xba" => "\xe2\x93\x94", "\xe2\x92\xbb" => "\xe2\x93\x95", "\xe2\x92\xbc" => "\xe2\x93\x96", |
|
229 | + "\xe2\x92\xbd" => "\xe2\x93\x97", "\xe2\x92\xbe" => "\xe2\x93\x98", "\xe2\x92\xbf" => "\xe2\x93\x99", "\xe2\x93\x80" => "\xe2\x93\x9a", |
|
230 | + "\xe2\x93\x81" => "\xe2\x93\x9b", "\xe2\x93\x82" => "\xe2\x93\x9c", "\xe2\x93\x83" => "\xe2\x93\x9d", "\xe2\x93\x84" => "\xe2\x93\x9e", |
|
231 | + "\xe2\x93\x85" => "\xe2\x93\x9f", "\xe2\x93\x86" => "\xe2\x93\xa0", "\xe2\x93\x87" => "\xe2\x93\xa1", "\xe2\x93\x88" => "\xe2\x93\xa2", |
|
232 | + "\xe2\x93\x89" => "\xe2\x93\xa3", "\xe2\x93\x8a" => "\xe2\x93\xa4", "\xe2\x93\x8b" => "\xe2\x93\xa5", "\xe2\x93\x8c" => "\xe2\x93\xa6", |
|
233 | + "\xe2\x93\x8d" => "\xe2\x93\xa7", "\xe2\x93\x8e" => "\xe2\x93\xa8", "\xe2\x93\x8f" => "\xe2\x93\xa9", "\xe2\xb0\x80" => "\xe2\xb0\xb0", |
|
234 | + "\xe2\xb0\x81" => "\xe2\xb0\xb1", "\xe2\xb0\x82" => "\xe2\xb0\xb2", "\xe2\xb0\x83" => "\xe2\xb0\xb3", "\xe2\xb0\x84" => "\xe2\xb0\xb4", |
|
235 | + "\xe2\xb0\x85" => "\xe2\xb0\xb5", "\xe2\xb0\x86" => "\xe2\xb0\xb6", "\xe2\xb0\x87" => "\xe2\xb0\xb7", "\xe2\xb0\x88" => "\xe2\xb0\xb8", |
|
236 | + "\xe2\xb0\x89" => "\xe2\xb0\xb9", "\xe2\xb0\x8a" => "\xe2\xb0\xba", "\xe2\xb0\x8b" => "\xe2\xb0\xbb", "\xe2\xb0\x8c" => "\xe2\xb0\xbc", |
|
237 | + "\xe2\xb0\x8d" => "\xe2\xb0\xbd", "\xe2\xb0\x8e" => "\xe2\xb0\xbe", "\xe2\xb0\x8f" => "\xe2\xb0\xbf", "\xe2\xb0\x90" => "\xe2\xb1\x80", |
|
238 | + "\xe2\xb0\x91" => "\xe2\xb1\x81", "\xe2\xb0\x92" => "\xe2\xb1\x82", "\xe2\xb0\x93" => "\xe2\xb1\x83", "\xe2\xb0\x94" => "\xe2\xb1\x84", |
|
239 | + "\xe2\xb0\x95" => "\xe2\xb1\x85", "\xe2\xb0\x96" => "\xe2\xb1\x86", "\xe2\xb0\x97" => "\xe2\xb1\x87", "\xe2\xb0\x98" => "\xe2\xb1\x88", |
|
240 | + "\xe2\xb0\x99" => "\xe2\xb1\x89", "\xe2\xb0\x9a" => "\xe2\xb1\x8a", "\xe2\xb0\x9b" => "\xe2\xb1\x8b", "\xe2\xb0\x9c" => "\xe2\xb1\x8c", |
|
241 | + "\xe2\xb0\x9d" => "\xe2\xb1\x8d", "\xe2\xb0\x9e" => "\xe2\xb1\x8e", "\xe2\xb0\x9f" => "\xe2\xb1\x8f", "\xe2\xb0\xa0" => "\xe2\xb1\x90", |
|
242 | + "\xe2\xb0\xa1" => "\xe2\xb1\x91", "\xe2\xb0\xa2" => "\xe2\xb1\x92", "\xe2\xb0\xa3" => "\xe2\xb1\x93", "\xe2\xb0\xa4" => "\xe2\xb1\x94", |
|
243 | + "\xe2\xb0\xa5" => "\xe2\xb1\x95", "\xe2\xb0\xa6" => "\xe2\xb1\x96", "\xe2\xb0\xa7" => "\xe2\xb1\x97", "\xe2\xb0\xa8" => "\xe2\xb1\x98", |
|
244 | + "\xe2\xb0\xa9" => "\xe2\xb1\x99", "\xe2\xb0\xaa" => "\xe2\xb1\x9a", "\xe2\xb0\xab" => "\xe2\xb1\x9b", "\xe2\xb0\xac" => "\xe2\xb1\x9c", |
|
245 | + "\xe2\xb0\xad" => "\xe2\xb1\x9d", "\xe2\xb0\xae" => "\xe2\xb1\x9e", "\xe2\xb1\xa0" => "\xe2\xb1\xa1", "\xe2\xb1\xa2" => "\xc9\xab", |
|
246 | + "\xe2\xb1\xa3" => "\xe1\xb5\xbd", "\xe2\xb1\xa4" => "\xc9\xbd", "\xe2\xb1\xa7" => "\xe2\xb1\xa8", "\xe2\xb1\xa9" => "\xe2\xb1\xaa", |
|
247 | + "\xe2\xb1\xab" => "\xe2\xb1\xac", "\xe2\xb1\xb5" => "\xe2\xb1\xb6", "\xe2\xb2\x80" => "\xe2\xb2\x81", "\xe2\xb2\x82" => "\xe2\xb2\x83", |
|
248 | + "\xe2\xb2\x84" => "\xe2\xb2\x85", "\xe2\xb2\x86" => "\xe2\xb2\x87", "\xe2\xb2\x88" => "\xe2\xb2\x89", "\xe2\xb2\x8a" => "\xe2\xb2\x8b", |
|
249 | + "\xe2\xb2\x8c" => "\xe2\xb2\x8d", "\xe2\xb2\x8e" => "\xe2\xb2\x8f", "\xe2\xb2\x90" => "\xe2\xb2\x91", "\xe2\xb2\x92" => "\xe2\xb2\x93", |
|
250 | + "\xe2\xb2\x94" => "\xe2\xb2\x95", "\xe2\xb2\x96" => "\xe2\xb2\x97", "\xe2\xb2\x98" => "\xe2\xb2\x99", "\xe2\xb2\x9a" => "\xe2\xb2\x9b", |
|
251 | + "\xe2\xb2\x9c" => "\xe2\xb2\x9d", "\xe2\xb2\x9e" => "\xe2\xb2\x9f", "\xe2\xb2\xa0" => "\xe2\xb2\xa1", "\xe2\xb2\xa2" => "\xe2\xb2\xa3", |
|
252 | + "\xe2\xb2\xa4" => "\xe2\xb2\xa5", "\xe2\xb2\xa6" => "\xe2\xb2\xa7", "\xe2\xb2\xa8" => "\xe2\xb2\xa9", "\xe2\xb2\xaa" => "\xe2\xb2\xab", |
|
253 | + "\xe2\xb2\xac" => "\xe2\xb2\xad", "\xe2\xb2\xae" => "\xe2\xb2\xaf", "\xe2\xb2\xb0" => "\xe2\xb2\xb1", "\xe2\xb2\xb2" => "\xe2\xb2\xb3", |
|
254 | + "\xe2\xb2\xb4" => "\xe2\xb2\xb5", "\xe2\xb2\xb6" => "\xe2\xb2\xb7", "\xe2\xb2\xb8" => "\xe2\xb2\xb9", "\xe2\xb2\xba" => "\xe2\xb2\xbb", |
|
255 | + "\xe2\xb2\xbc" => "\xe2\xb2\xbd", "\xe2\xb2\xbe" => "\xe2\xb2\xbf", "\xe2\xb3\x80" => "\xe2\xb3\x81", "\xe2\xb3\x82" => "\xe2\xb3\x83", |
|
256 | + "\xe2\xb3\x84" => "\xe2\xb3\x85", "\xe2\xb3\x86" => "\xe2\xb3\x87", "\xe2\xb3\x88" => "\xe2\xb3\x89", "\xe2\xb3\x8a" => "\xe2\xb3\x8b", |
|
257 | + "\xe2\xb3\x8c" => "\xe2\xb3\x8d", "\xe2\xb3\x8e" => "\xe2\xb3\x8f", "\xe2\xb3\x90" => "\xe2\xb3\x91", "\xe2\xb3\x92" => "\xe2\xb3\x93", |
|
258 | + "\xe2\xb3\x94" => "\xe2\xb3\x95", "\xe2\xb3\x96" => "\xe2\xb3\x97", "\xe2\xb3\x98" => "\xe2\xb3\x99", "\xe2\xb3\x9a" => "\xe2\xb3\x9b", |
|
259 | + "\xe2\xb3\x9c" => "\xe2\xb3\x9d", "\xe2\xb3\x9e" => "\xe2\xb3\x9f", "\xe2\xb3\xa0" => "\xe2\xb3\xa1", "\xe2\xb3\xa2" => "\xe2\xb3\xa3", |
|
260 | + "\xef\xac\x80" => "ff", "\xef\xac\x81" => "fi", "\xef\xac\x82" => "fl", "\xef\xac\x83" => "ffi", |
|
261 | + "\xef\xac\x84" => "ffl", "\xef\xac\x85" => "st", "\xef\xac\x86" => "st", "\xef\xac\x93" => "\xd5\xb4\xd5\xb6", |
|
262 | + "\xef\xac\x94" => "\xd5\xb4\xd5\xa5", "\xef\xac\x95" => "\xd5\xb4\xd5\xab", "\xef\xac\x96" => "\xd5\xbe\xd5\xb6", "\xef\xac\x97" => "\xd5\xb4\xd5\xad", |
|
263 | + "\xef\xbc\xa1" => "\xef\xbd\x81", "\xef\xbc\xa2" => "\xef\xbd\x82", "\xef\xbc\xa3" => "\xef\xbd\x83", "\xef\xbc\xa4" => "\xef\xbd\x84", |
|
264 | + "\xef\xbc\xa5" => "\xef\xbd\x85", "\xef\xbc\xa6" => "\xef\xbd\x86", "\xef\xbc\xa7" => "\xef\xbd\x87", "\xef\xbc\xa8" => "\xef\xbd\x88", |
|
265 | + "\xef\xbc\xa9" => "\xef\xbd\x89", "\xef\xbc\xaa" => "\xef\xbd\x8a", "\xef\xbc\xab" => "\xef\xbd\x8b", "\xef\xbc\xac" => "\xef\xbd\x8c", |
|
266 | + "\xef\xbc\xad" => "\xef\xbd\x8d", "\xef\xbc\xae" => "\xef\xbd\x8e", "\xef\xbc\xaf" => "\xef\xbd\x8f", "\xef\xbc\xb0" => "\xef\xbd\x90", |
|
267 | + "\xef\xbc\xb1" => "\xef\xbd\x91", "\xef\xbc\xb2" => "\xef\xbd\x92", "\xef\xbc\xb3" => "\xef\xbd\x93", "\xef\xbc\xb4" => "\xef\xbd\x94", |
|
268 | + "\xef\xbc\xb5" => "\xef\xbd\x95", "\xef\xbc\xb6" => "\xef\xbd\x96", "\xef\xbc\xb7" => "\xef\xbd\x97", "\xef\xbc\xb8" => "\xef\xbd\x98", |
|
269 | + "\xef\xbc\xb9" => "\xef\xbd\x99", "\xef\xbc\xba" => "\xef\xbd\x9a", "\xf0\x90\x90\x80" => "\xf0\x90\x90\xa8", "\xf0\x90\x90\x81" => "\xf0\x90\x90\xa9", |
|
270 | + "\xf0\x90\x90\x82" => "\xf0\x90\x90\xaa", "\xf0\x90\x90\x83" => "\xf0\x90\x90\xab", "\xf0\x90\x90\x84" => "\xf0\x90\x90\xac", "\xf0\x90\x90\x85" => "\xf0\x90\x90\xad", |
|
271 | + "\xf0\x90\x90\x86" => "\xf0\x90\x90\xae", "\xf0\x90\x90\x87" => "\xf0\x90\x90\xaf", "\xf0\x90\x90\x88" => "\xf0\x90\x90\xb0", "\xf0\x90\x90\x89" => "\xf0\x90\x90\xb1", |
|
272 | + "\xf0\x90\x90\x8a" => "\xf0\x90\x90\xb2", "\xf0\x90\x90\x8b" => "\xf0\x90\x90\xb3", "\xf0\x90\x90\x8c" => "\xf0\x90\x90\xb4", "\xf0\x90\x90\x8d" => "\xf0\x90\x90\xb5", |
|
273 | + "\xf0\x90\x90\x8e" => "\xf0\x90\x90\xb6", "\xf0\x90\x90\x8f" => "\xf0\x90\x90\xb7", "\xf0\x90\x90\x90" => "\xf0\x90\x90\xb8", "\xf0\x90\x90\x91" => "\xf0\x90\x90\xb9", |
|
274 | + "\xf0\x90\x90\x92" => "\xf0\x90\x90\xba", "\xf0\x90\x90\x93" => "\xf0\x90\x90\xbb", "\xf0\x90\x90\x94" => "\xf0\x90\x90\xbc", "\xf0\x90\x90\x95" => "\xf0\x90\x90\xbd", |
|
275 | + "\xf0\x90\x90\x96" => "\xf0\x90\x90\xbe", "\xf0\x90\x90\x97" => "\xf0\x90\x90\xbf", "\xf0\x90\x90\x98" => "\xf0\x90\x91\x80", "\xf0\x90\x90\x99" => "\xf0\x90\x91\x81", |
|
276 | + "\xf0\x90\x90\x9a" => "\xf0\x90\x91\x82", "\xf0\x90\x90\x9b" => "\xf0\x90\x91\x83", "\xf0\x90\x90\x9c" => "\xf0\x90\x91\x84", "\xf0\x90\x90\x9d" => "\xf0\x90\x91\x85", |
|
277 | + "\xf0\x90\x90\x9e" => "\xf0\x90\x91\x86", "\xf0\x90\x90\x9f" => "\xf0\x90\x91\x87", "\xf0\x90\x90\xa0" => "\xf0\x90\x91\x88", "\xf0\x90\x90\xa1" => "\xf0\x90\x91\x89", |
|
278 | + "\xf0\x90\x90\xa2" => "\xf0\x90\x91\x8a", "\xf0\x90\x90\xa3" => "\xf0\x90\x91\x8b", "\xf0\x90\x90\xa4" => "\xf0\x90\x91\x8c", "\xf0\x90\x90\xa5" => "\xf0\x90\x91\x8d", |
|
279 | + "\xf0\x90\x91\x8e" => "\xf0\x90\x90\xa6", "\xf0\x90\x91\x8f" => "\xf0\x90\x90\xa7", |
|
280 | 280 | ); |
281 | 281 | |
282 | 282 | return strtr($string, $case_folding); |
@@ -293,259 +293,259 @@ discard block |
||
293 | 293 | function utf8_strtoupper($string) |
294 | 294 | { |
295 | 295 | static $case_folding = array( |
296 | - 'a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D', |
|
297 | - 'e' => 'E', 'f' => 'F', 'g' => 'G', 'h' => 'H', |
|
298 | - 'i' => 'I', 'j' => 'J', 'k' => 'K', 'l' => 'L', |
|
299 | - 'm' => 'M', 'n' => 'N', 'o' => 'O', 'p' => 'P', |
|
300 | - 'q' => 'Q', 'r' => 'R', 's' => 'S', 't' => 'T', |
|
301 | - 'u' => 'U', 'v' => 'V', 'w' => 'W', 'x' => 'X', |
|
302 | - 'y' => 'Y', 'z' => 'Z', "\xce\xbc" => "\xc2\xb5", "\xc3\xa0" => "\xc3\x80", |
|
303 | - "\xc3\xa1" => "\xc3\x81", "\xc3\xa2" => "\xc3\x82", "\xc3\xa3" => "\xc3\x83", "\xc3\xa4" => "\xc3\x84", |
|
304 | - "\xc3\xa5" => "\xc3\x85", "\xc3\xa6" => "\xc3\x86", "\xc3\xa7" => "\xc3\x87", "\xc3\xa8" => "\xc3\x88", |
|
305 | - "\xc3\xa9" => "\xc3\x89", "\xc3\xaa" => "\xc3\x8a", "\xc3\xab" => "\xc3\x8b", "\xc3\xac" => "\xc3\x8c", |
|
306 | - "\xc3\xad" => "\xc3\x8d", "\xc3\xae" => "\xc3\x8e", "\xc3\xaf" => "\xc3\x8f", "\xc3\xb0" => "\xc3\x90", |
|
307 | - "\xc3\xb1" => "\xc3\x91", "\xc3\xb2" => "\xc3\x92", "\xc3\xb3" => "\xc3\x93", "\xc3\xb4" => "\xc3\x94", |
|
308 | - "\xc3\xb5" => "\xc3\x95", "\xc3\xb6" => "\xc3\x96", "\xc3\xb8" => "\xc3\x98", "\xc3\xb9" => "\xc3\x99", |
|
309 | - "\xc3\xba" => "\xc3\x9a", "\xc3\xbb" => "\xc3\x9b", "\xc3\xbc" => "\xc3\x9c", "\xc3\xbd" => "\xc3\x9d", |
|
310 | - "\xc3\xbe" => "\xc3\x9e", "ss" => "\xc3\x9f", "\xc4\x81" => "\xc4\x80", "\xc4\x83" => "\xc4\x82", |
|
311 | - "\xc4\x85" => "\xc4\x84", "\xc4\x87" => "\xc4\x86", "\xc4\x89" => "\xc4\x88", "\xc4\x8b" => "\xc4\x8a", |
|
312 | - "\xc4\x8d" => "\xc4\x8c", "\xc4\x8f" => "\xc4\x8e", "\xc4\x91" => "\xc4\x90", "\xc4\x93" => "\xc4\x92", |
|
313 | - "\xc4\x95" => "\xc4\x94", "\xc4\x97" => "\xc4\x96", "\xc4\x99" => "\xc4\x98", "\xc4\x9b" => "\xc4\x9a", |
|
314 | - "\xc4\x9d" => "\xc4\x9c", "\xc4\x9f" => "\xc4\x9e", "\xc4\xa1" => "\xc4\xa0", "\xc4\xa3" => "\xc4\xa2", |
|
315 | - "\xc4\xa5" => "\xc4\xa4", "\xc4\xa7" => "\xc4\xa6", "\xc4\xa9" => "\xc4\xa8", "\xc4\xab" => "\xc4\xaa", |
|
316 | - "\xc4\xad" => "\xc4\xac", "\xc4\xaf" => "\xc4\xae", "i\xcc\x87" => "\xc4\xb0", "\xc4\xb3" => "\xc4\xb2", |
|
317 | - "\xc4\xb5" => "\xc4\xb4", "\xc4\xb7" => "\xc4\xb6", "\xc4\xba" => "\xc4\xb9", "\xc4\xbc" => "\xc4\xbb", |
|
318 | - "\xc4\xbe" => "\xc4\xbd", "\xc5\x80" => "\xc4\xbf", "\xc5\x82" => "\xc5\x81", "\xc5\x84" => "\xc5\x83", |
|
319 | - "\xc5\x86" => "\xc5\x85", "\xc5\x88" => "\xc5\x87", "\xca\xbcn" => "\xc5\x89", "\xc5\x8b" => "\xc5\x8a", |
|
320 | - "\xc5\x8d" => "\xc5\x8c", "\xc5\x8f" => "\xc5\x8e", "\xc5\x91" => "\xc5\x90", "\xc5\x93" => "\xc5\x92", |
|
321 | - "\xc5\x95" => "\xc5\x94", "\xc5\x97" => "\xc5\x96", "\xc5\x99" => "\xc5\x98", "\xc5\x9b" => "\xc5\x9a", |
|
322 | - "\xc5\x9d" => "\xc5\x9c", "\xc5\x9f" => "\xc5\x9e", "\xc5\xa1" => "\xc5\xa0", "\xc5\xa3" => "\xc5\xa2", |
|
323 | - "\xc5\xa5" => "\xc5\xa4", "\xc5\xa7" => "\xc5\xa6", "\xc5\xa9" => "\xc5\xa8", "\xc5\xab" => "\xc5\xaa", |
|
324 | - "\xc5\xad" => "\xc5\xac", "\xc5\xaf" => "\xc5\xae", "\xc5\xb1" => "\xc5\xb0", "\xc5\xb3" => "\xc5\xb2", |
|
325 | - "\xc5\xb5" => "\xc5\xb4", "\xc5\xb7" => "\xc5\xb6", "\xc3\xbf" => "\xc5\xb8", "\xc5\xba" => "\xc5\xb9", |
|
326 | - "\xc5\xbc" => "\xc5\xbb", "\xc5\xbe" => "\xc5\xbd", "\xc9\x93" => "\xc6\x81", |
|
327 | - "\xc6\x83" => "\xc6\x82", "\xc6\x85" => "\xc6\x84", "\xc9\x94" => "\xc6\x86", "\xc6\x88" => "\xc6\x87", |
|
328 | - "\xc9\x96" => "\xc6\x89", "\xc9\x97" => "\xc6\x8a", "\xc6\x8c" => "\xc6\x8b", "\xc7\x9d" => "\xc6\x8e", |
|
329 | - "\xc9\x99" => "\xc6\x8f", "\xc9\x9b" => "\xc6\x90", "\xc6\x92" => "\xc6\x91", "\xc9\xa0" => "\xc6\x93", |
|
330 | - "\xc9\xa3" => "\xc6\x94", "\xc9\xa9" => "\xc6\x96", "\xc9\xa8" => "\xc6\x97", "\xc6\x99" => "\xc6\x98", |
|
331 | - "\xc9\xaf" => "\xc6\x9c", "\xc9\xb2" => "\xc6\x9d", "\xc9\xb5" => "\xc6\x9f", "\xc6\xa1" => "\xc6\xa0", |
|
332 | - "\xc6\xa3" => "\xc6\xa2", "\xc6\xa5" => "\xc6\xa4", "\xca\x80" => "\xc6\xa6", "\xc6\xa8" => "\xc6\xa7", |
|
333 | - "\xca\x83" => "\xc6\xa9", "\xc6\xad" => "\xc6\xac", "\xca\x88" => "\xc6\xae", "\xc6\xb0" => "\xc6\xaf", |
|
334 | - "\xca\x8a" => "\xc6\xb1", "\xca\x8b" => "\xc6\xb2", "\xc6\xb4" => "\xc6\xb3", "\xc6\xb6" => "\xc6\xb5", |
|
335 | - "\xca\x92" => "\xc6\xb7", "\xc6\xb9" => "\xc6\xb8", "\xc6\xbd" => "\xc6\xbc", "\xc7\x86" => "\xc7\x84", |
|
336 | - "\xc7\x86" => "\xc7\x85", "\xc7\x89" => "\xc7\x87", "\xc7\x89" => "\xc7\x88", "\xc7\x8c" => "\xc7\x8a", |
|
337 | - "\xc7\x8c" => "\xc7\x8b", "\xc7\x8e" => "\xc7\x8d", "\xc7\x90" => "\xc7\x8f", "\xc7\x92" => "\xc7\x91", |
|
338 | - "\xc7\x94" => "\xc7\x93", "\xc7\x96" => "\xc7\x95", "\xc7\x98" => "\xc7\x97", "\xc7\x9a" => "\xc7\x99", |
|
339 | - "\xc7\x9c" => "\xc7\x9b", "\xc7\x9f" => "\xc7\x9e", "\xc7\xa1" => "\xc7\xa0", "\xc7\xa3" => "\xc7\xa2", |
|
340 | - "\xc7\xa5" => "\xc7\xa4", "\xc7\xa7" => "\xc7\xa6", "\xc7\xa9" => "\xc7\xa8", "\xc7\xab" => "\xc7\xaa", |
|
341 | - "\xc7\xad" => "\xc7\xac", "\xc7\xaf" => "\xc7\xae", "j\xcc\x8c" => "\xc7\xb0", "\xc7\xb3" => "\xc7\xb1", |
|
342 | - "\xc7\xb3" => "\xc7\xb2", "\xc7\xb5" => "\xc7\xb4", "\xc6\x95" => "\xc7\xb6", "\xc6\xbf" => "\xc7\xb7", |
|
343 | - "\xc7\xb9" => "\xc7\xb8", "\xc7\xbb" => "\xc7\xba", "\xc7\xbd" => "\xc7\xbc", "\xc7\xbf" => "\xc7\xbe", |
|
344 | - "\xc8\x81" => "\xc8\x80", "\xc8\x83" => "\xc8\x82", "\xc8\x85" => "\xc8\x84", "\xc8\x87" => "\xc8\x86", |
|
345 | - "\xc8\x89" => "\xc8\x88", "\xc8\x8b" => "\xc8\x8a", "\xc8\x8d" => "\xc8\x8c", "\xc8\x8f" => "\xc8\x8e", |
|
346 | - "\xc8\x91" => "\xc8\x90", "\xc8\x93" => "\xc8\x92", "\xc8\x95" => "\xc8\x94", "\xc8\x97" => "\xc8\x96", |
|
347 | - "\xc8\x99" => "\xc8\x98", "\xc8\x9b" => "\xc8\x9a", "\xc8\x9d" => "\xc8\x9c", "\xc8\x9f" => "\xc8\x9e", |
|
348 | - "\xc6\x9e" => "\xc8\xa0", "\xc8\xa3" => "\xc8\xa2", "\xc8\xa5" => "\xc8\xa4", "\xc8\xa7" => "\xc8\xa6", |
|
349 | - "\xc8\xa9" => "\xc8\xa8", "\xc8\xab" => "\xc8\xaa", "\xc8\xad" => "\xc8\xac", "\xc8\xaf" => "\xc8\xae", |
|
350 | - "\xc8\xb1" => "\xc8\xb0", "\xc8\xb3" => "\xc8\xb2", "\xe2\xb1\xa5" => "\xc8\xba", "\xc8\xbc" => "\xc8\xbb", |
|
351 | - "\xc6\x9a" => "\xc8\xbd", "\xe2\xb1\xa6" => "\xc8\xbe", "\xc9\x82" => "\xc9\x81", "\xc6\x80" => "\xc9\x83", |
|
352 | - "\xca\x89" => "\xc9\x84", "\xca\x8c" => "\xc9\x85", "\xc9\x87" => "\xc9\x86", "\xc9\x89" => "\xc9\x88", |
|
353 | - "\xc9\x8b" => "\xc9\x8a", "\xc9\x8d" => "\xc9\x8c", "\xc9\x8f" => "\xc9\x8e", "\xce\xb9" => "\xcd\x85", |
|
354 | - "\xce\xac" => "\xce\x86", "\xce\xad" => "\xce\x88", "\xce\xae" => "\xce\x89", "\xce\xaf" => "\xce\x8a", |
|
355 | - "\xcf\x8c" => "\xce\x8c", "\xcf\x8d" => "\xce\x8e", "\xcf\x8e" => "\xce\x8f", "\xce\xb9\xcc\x88\xcc\x81" => "\xce\x90", |
|
356 | - "\xce\xb1" => "\xce\x91", "\xce\xb2" => "\xce\x92", "\xce\xb3" => "\xce\x93", "\xce\xb4" => "\xce\x94", |
|
357 | - "\xce\xb5" => "\xce\x95", "\xce\xb6" => "\xce\x96", "\xce\xb7" => "\xce\x97", "\xce\xb8" => "\xce\x98", |
|
358 | - "\xce\xb9" => "\xce\x99", "\xce\xba" => "\xce\x9a", "\xce\xbb" => "\xce\x9b", "\xce\xbc" => "\xce\x9c", |
|
359 | - "\xce\xbd" => "\xce\x9d", "\xce\xbe" => "\xce\x9e", "\xce\xbf" => "\xce\x9f", "\xcf\x80" => "\xce\xa0", |
|
360 | - "\xcf\x81" => "\xce\xa1", "\xcf\x83" => "\xce\xa3", "\xcf\x84" => "\xce\xa4", "\xcf\x85" => "\xce\xa5", |
|
361 | - "\xcf\x86" => "\xce\xa6", "\xcf\x87" => "\xce\xa7", "\xcf\x88" => "\xce\xa8", "\xcf\x89" => "\xce\xa9", |
|
362 | - "\xcf\x8a" => "\xce\xaa", "\xcf\x8b" => "\xce\xab", "\xcf\x85\xcc\x88\xcc\x81" => "\xce\xb0", "\xcf\x83" => "\xcf\x82", |
|
363 | - "\xce\xb2" => "\xcf\x90", "\xce\xb8" => "\xcf\x91", "\xcf\x86" => "\xcf\x95", "\xcf\x80" => "\xcf\x96", |
|
364 | - "\xcf\x99" => "\xcf\x98", "\xcf\x9b" => "\xcf\x9a", "\xcf\x9d" => "\xcf\x9c", "\xcf\x9f" => "\xcf\x9e", |
|
365 | - "\xcf\xa1" => "\xcf\xa0", "\xcf\xa3" => "\xcf\xa2", "\xcf\xa5" => "\xcf\xa4", "\xcf\xa7" => "\xcf\xa6", |
|
366 | - "\xcf\xa9" => "\xcf\xa8", "\xcf\xab" => "\xcf\xaa", "\xcf\xad" => "\xcf\xac", "\xcf\xaf" => "\xcf\xae", |
|
367 | - "\xce\xba" => "\xcf\xb0", "\xcf\x81" => "\xcf\xb1", "\xce\xb8" => "\xcf\xb4", "\xce\xb5" => "\xcf\xb5", |
|
368 | - "\xcf\xb8" => "\xcf\xb7", "\xcf\xb2" => "\xcf\xb9", "\xcf\xbb" => "\xcf\xba", "\xcd\xbb" => "\xcf\xbd", |
|
369 | - "\xcd\xbc" => "\xcf\xbe", "\xcd\xbd" => "\xcf\xbf", "\xd1\x90" => "\xd0\x80", "\xd1\x91" => "\xd0\x81", |
|
370 | - "\xd1\x92" => "\xd0\x82", "\xd1\x93" => "\xd0\x83", "\xd1\x94" => "\xd0\x84", "\xd1\x95" => "\xd0\x85", |
|
371 | - "\xd1\x96" => "\xd0\x86", "\xd1\x97" => "\xd0\x87", "\xd1\x98" => "\xd0\x88", "\xd1\x99" => "\xd0\x89", |
|
372 | - "\xd1\x9a" => "\xd0\x8a", "\xd1\x9b" => "\xd0\x8b", "\xd1\x9c" => "\xd0\x8c", "\xd1\x9d" => "\xd0\x8d", |
|
373 | - "\xd1\x9e" => "\xd0\x8e", "\xd1\x9f" => "\xd0\x8f", "\xd0\xb0" => "\xd0\x90", "\xd0\xb1" => "\xd0\x91", |
|
374 | - "\xd0\xb2" => "\xd0\x92", "\xd0\xb3" => "\xd0\x93", "\xd0\xb4" => "\xd0\x94", "\xd0\xb5" => "\xd0\x95", |
|
375 | - "\xd0\xb6" => "\xd0\x96", "\xd0\xb7" => "\xd0\x97", "\xd0\xb8" => "\xd0\x98", "\xd0\xb9" => "\xd0\x99", |
|
376 | - "\xd0\xba" => "\xd0\x9a", "\xd0\xbb" => "\xd0\x9b", "\xd0\xbc" => "\xd0\x9c", "\xd0\xbd" => "\xd0\x9d", |
|
377 | - "\xd0\xbe" => "\xd0\x9e", "\xd0\xbf" => "\xd0\x9f", "\xd1\x80" => "\xd0\xa0", "\xd1\x81" => "\xd0\xa1", |
|
378 | - "\xd1\x82" => "\xd0\xa2", "\xd1\x83" => "\xd0\xa3", "\xd1\x84" => "\xd0\xa4", "\xd1\x85" => "\xd0\xa5", |
|
379 | - "\xd1\x86" => "\xd0\xa6", "\xd1\x87" => "\xd0\xa7", "\xd1\x88" => "\xd0\xa8", "\xd1\x89" => "\xd0\xa9", |
|
380 | - "\xd1\x8a" => "\xd0\xaa", "\xd1\x8b" => "\xd0\xab", "\xd1\x8c" => "\xd0\xac", "\xd1\x8d" => "\xd0\xad", |
|
381 | - "\xd1\x8e" => "\xd0\xae", "\xd1\x8f" => "\xd0\xaf", "\xd1\xa1" => "\xd1\xa0", "\xd1\xa3" => "\xd1\xa2", |
|
382 | - "\xd1\xa5" => "\xd1\xa4", "\xd1\xa7" => "\xd1\xa6", "\xd1\xa9" => "\xd1\xa8", "\xd1\xab" => "\xd1\xaa", |
|
383 | - "\xd1\xad" => "\xd1\xac", "\xd1\xaf" => "\xd1\xae", "\xd1\xb1" => "\xd1\xb0", "\xd1\xb3" => "\xd1\xb2", |
|
384 | - "\xd1\xb5" => "\xd1\xb4", "\xd1\xb7" => "\xd1\xb6", "\xd1\xb9" => "\xd1\xb8", "\xd1\xbb" => "\xd1\xba", |
|
385 | - "\xd1\xbd" => "\xd1\xbc", "\xd1\xbf" => "\xd1\xbe", "\xd2\x81" => "\xd2\x80", "\xd2\x8b" => "\xd2\x8a", |
|
386 | - "\xd2\x8d" => "\xd2\x8c", "\xd2\x8f" => "\xd2\x8e", "\xd2\x91" => "\xd2\x90", "\xd2\x93" => "\xd2\x92", |
|
387 | - "\xd2\x95" => "\xd2\x94", "\xd2\x97" => "\xd2\x96", "\xd2\x99" => "\xd2\x98", "\xd2\x9b" => "\xd2\x9a", |
|
388 | - "\xd2\x9d" => "\xd2\x9c", "\xd2\x9f" => "\xd2\x9e", "\xd2\xa1" => "\xd2\xa0", "\xd2\xa3" => "\xd2\xa2", |
|
389 | - "\xd2\xa5" => "\xd2\xa4", "\xd2\xa7" => "\xd2\xa6", "\xd2\xa9" => "\xd2\xa8", "\xd2\xab" => "\xd2\xaa", |
|
390 | - "\xd2\xad" => "\xd2\xac", "\xd2\xaf" => "\xd2\xae", "\xd2\xb1" => "\xd2\xb0", "\xd2\xb3" => "\xd2\xb2", |
|
391 | - "\xd2\xb5" => "\xd2\xb4", "\xd2\xb7" => "\xd2\xb6", "\xd2\xb9" => "\xd2\xb8", "\xd2\xbb" => "\xd2\xba", |
|
392 | - "\xd2\xbd" => "\xd2\xbc", "\xd2\xbf" => "\xd2\xbe", "\xd3\x8f" => "\xd3\x80", "\xd3\x82" => "\xd3\x81", |
|
393 | - "\xd3\x84" => "\xd3\x83", "\xd3\x86" => "\xd3\x85", "\xd3\x88" => "\xd3\x87", "\xd3\x8a" => "\xd3\x89", |
|
394 | - "\xd3\x8c" => "\xd3\x8b", "\xd3\x8e" => "\xd3\x8d", "\xd3\x91" => "\xd3\x90", "\xd3\x93" => "\xd3\x92", |
|
395 | - "\xd3\x95" => "\xd3\x94", "\xd3\x97" => "\xd3\x96", "\xd3\x99" => "\xd3\x98", "\xd3\x9b" => "\xd3\x9a", |
|
396 | - "\xd3\x9d" => "\xd3\x9c", "\xd3\x9f" => "\xd3\x9e", "\xd3\xa1" => "\xd3\xa0", "\xd3\xa3" => "\xd3\xa2", |
|
397 | - "\xd3\xa5" => "\xd3\xa4", "\xd3\xa7" => "\xd3\xa6", "\xd3\xa9" => "\xd3\xa8", "\xd3\xab" => "\xd3\xaa", |
|
398 | - "\xd3\xad" => "\xd3\xac", "\xd3\xaf" => "\xd3\xae", "\xd3\xb1" => "\xd3\xb0", "\xd3\xb3" => "\xd3\xb2", |
|
399 | - "\xd3\xb5" => "\xd3\xb4", "\xd3\xb7" => "\xd3\xb6", "\xd3\xb9" => "\xd3\xb8", "\xd3\xbb" => "\xd3\xba", |
|
400 | - "\xd3\xbd" => "\xd3\xbc", "\xd3\xbf" => "\xd3\xbe", "\xd4\x81" => "\xd4\x80", "\xd4\x83" => "\xd4\x82", |
|
401 | - "\xd4\x85" => "\xd4\x84", "\xd4\x87" => "\xd4\x86", "\xd4\x89" => "\xd4\x88", "\xd4\x8b" => "\xd4\x8a", |
|
402 | - "\xd4\x8d" => "\xd4\x8c", "\xd4\x8f" => "\xd4\x8e", "\xd4\x91" => "\xd4\x90", "\xd4\x93" => "\xd4\x92", |
|
403 | - "\xd5\xa1" => "\xd4\xb1", "\xd5\xa2" => "\xd4\xb2", "\xd5\xa3" => "\xd4\xb3", "\xd5\xa4" => "\xd4\xb4", |
|
404 | - "\xd5\xa5" => "\xd4\xb5", "\xd5\xa6" => "\xd4\xb6", "\xd5\xa7" => "\xd4\xb7", "\xd5\xa8" => "\xd4\xb8", |
|
405 | - "\xd5\xa9" => "\xd4\xb9", "\xd5\xaa" => "\xd4\xba", "\xd5\xab" => "\xd4\xbb", "\xd5\xac" => "\xd4\xbc", |
|
406 | - "\xd5\xad" => "\xd4\xbd", "\xd5\xae" => "\xd4\xbe", "\xd5\xaf" => "\xd4\xbf", "\xd5\xb0" => "\xd5\x80", |
|
407 | - "\xd5\xb1" => "\xd5\x81", "\xd5\xb2" => "\xd5\x82", "\xd5\xb3" => "\xd5\x83", "\xd5\xb4" => "\xd5\x84", |
|
408 | - "\xd5\xb5" => "\xd5\x85", "\xd5\xb6" => "\xd5\x86", "\xd5\xb7" => "\xd5\x87", "\xd5\xb8" => "\xd5\x88", |
|
409 | - "\xd5\xb9" => "\xd5\x89", "\xd5\xba" => "\xd5\x8a", "\xd5\xbb" => "\xd5\x8b", "\xd5\xbc" => "\xd5\x8c", |
|
410 | - "\xd5\xbd" => "\xd5\x8d", "\xd5\xbe" => "\xd5\x8e", "\xd5\xbf" => "\xd5\x8f", "\xd6\x80" => "\xd5\x90", |
|
411 | - "\xd6\x81" => "\xd5\x91", "\xd6\x82" => "\xd5\x92", "\xd6\x83" => "\xd5\x93", "\xd6\x84" => "\xd5\x94", |
|
412 | - "\xd6\x85" => "\xd5\x95", "\xd6\x86" => "\xd5\x96", "\xd5\xa5\xd6\x82" => "\xd6\x87", "\xe2\xb4\x80" => "\xe1\x82\xa0", |
|
413 | - "\xe2\xb4\x81" => "\xe1\x82\xa1", "\xe2\xb4\x82" => "\xe1\x82\xa2", "\xe2\xb4\x83" => "\xe1\x82\xa3", "\xe2\xb4\x84" => "\xe1\x82\xa4", |
|
414 | - "\xe2\xb4\x85" => "\xe1\x82\xa5", "\xe2\xb4\x86" => "\xe1\x82\xa6", "\xe2\xb4\x87" => "\xe1\x82\xa7", "\xe2\xb4\x88" => "\xe1\x82\xa8", |
|
415 | - "\xe2\xb4\x89" => "\xe1\x82\xa9", "\xe2\xb4\x8a" => "\xe1\x82\xaa", "\xe2\xb4\x8b" => "\xe1\x82\xab", "\xe2\xb4\x8c" => "\xe1\x82\xac", |
|
416 | - "\xe2\xb4\x8d" => "\xe1\x82\xad", "\xe2\xb4\x8e" => "\xe1\x82\xae", "\xe2\xb4\x8f" => "\xe1\x82\xaf", "\xe2\xb4\x90" => "\xe1\x82\xb0", |
|
417 | - "\xe2\xb4\x91" => "\xe1\x82\xb1", "\xe2\xb4\x92" => "\xe1\x82\xb2", "\xe2\xb4\x93" => "\xe1\x82\xb3", "\xe2\xb4\x94" => "\xe1\x82\xb4", |
|
418 | - "\xe2\xb4\x95" => "\xe1\x82\xb5", "\xe2\xb4\x96" => "\xe1\x82\xb6", "\xe2\xb4\x97" => "\xe1\x82\xb7", "\xe2\xb4\x98" => "\xe1\x82\xb8", |
|
419 | - "\xe2\xb4\x99" => "\xe1\x82\xb9", "\xe2\xb4\x9a" => "\xe1\x82\xba", "\xe2\xb4\x9b" => "\xe1\x82\xbb", "\xe2\xb4\x9c" => "\xe1\x82\xbc", |
|
420 | - "\xe2\xb4\x9d" => "\xe1\x82\xbd", "\xe2\xb4\x9e" => "\xe1\x82\xbe", "\xe2\xb4\x9f" => "\xe1\x82\xbf", "\xe2\xb4\xa0" => "\xe1\x83\x80", |
|
421 | - "\xe2\xb4\xa1" => "\xe1\x83\x81", "\xe2\xb4\xa2" => "\xe1\x83\x82", "\xe2\xb4\xa3" => "\xe1\x83\x83", "\xe2\xb4\xa4" => "\xe1\x83\x84", |
|
422 | - "\xe2\xb4\xa5" => "\xe1\x83\x85", "\xe1\xb8\x81" => "\xe1\xb8\x80", "\xe1\xb8\x83" => "\xe1\xb8\x82", "\xe1\xb8\x85" => "\xe1\xb8\x84", |
|
423 | - "\xe1\xb8\x87" => "\xe1\xb8\x86", "\xe1\xb8\x89" => "\xe1\xb8\x88", "\xe1\xb8\x8b" => "\xe1\xb8\x8a", "\xe1\xb8\x8d" => "\xe1\xb8\x8c", |
|
424 | - "\xe1\xb8\x8f" => "\xe1\xb8\x8e", "\xe1\xb8\x91" => "\xe1\xb8\x90", "\xe1\xb8\x93" => "\xe1\xb8\x92", "\xe1\xb8\x95" => "\xe1\xb8\x94", |
|
425 | - "\xe1\xb8\x97" => "\xe1\xb8\x96", "\xe1\xb8\x99" => "\xe1\xb8\x98", "\xe1\xb8\x9b" => "\xe1\xb8\x9a", "\xe1\xb8\x9d" => "\xe1\xb8\x9c", |
|
426 | - "\xe1\xb8\x9f" => "\xe1\xb8\x9e", "\xe1\xb8\xa1" => "\xe1\xb8\xa0", "\xe1\xb8\xa3" => "\xe1\xb8\xa2", "\xe1\xb8\xa5" => "\xe1\xb8\xa4", |
|
427 | - "\xe1\xb8\xa7" => "\xe1\xb8\xa6", "\xe1\xb8\xa9" => "\xe1\xb8\xa8", "\xe1\xb8\xab" => "\xe1\xb8\xaa", "\xe1\xb8\xad" => "\xe1\xb8\xac", |
|
428 | - "\xe1\xb8\xaf" => "\xe1\xb8\xae", "\xe1\xb8\xb1" => "\xe1\xb8\xb0", "\xe1\xb8\xb3" => "\xe1\xb8\xb2", "\xe1\xb8\xb5" => "\xe1\xb8\xb4", |
|
429 | - "\xe1\xb8\xb7" => "\xe1\xb8\xb6", "\xe1\xb8\xb9" => "\xe1\xb8\xb8", "\xe1\xb8\xbb" => "\xe1\xb8\xba", "\xe1\xb8\xbd" => "\xe1\xb8\xbc", |
|
430 | - "\xe1\xb8\xbf" => "\xe1\xb8\xbe", "\xe1\xb9\x81" => "\xe1\xb9\x80", "\xe1\xb9\x83" => "\xe1\xb9\x82", "\xe1\xb9\x85" => "\xe1\xb9\x84", |
|
431 | - "\xe1\xb9\x87" => "\xe1\xb9\x86", "\xe1\xb9\x89" => "\xe1\xb9\x88", "\xe1\xb9\x8b" => "\xe1\xb9\x8a", "\xe1\xb9\x8d" => "\xe1\xb9\x8c", |
|
432 | - "\xe1\xb9\x8f" => "\xe1\xb9\x8e", "\xe1\xb9\x91" => "\xe1\xb9\x90", "\xe1\xb9\x93" => "\xe1\xb9\x92", "\xe1\xb9\x95" => "\xe1\xb9\x94", |
|
433 | - "\xe1\xb9\x97" => "\xe1\xb9\x96", "\xe1\xb9\x99" => "\xe1\xb9\x98", "\xe1\xb9\x9b" => "\xe1\xb9\x9a", "\xe1\xb9\x9d" => "\xe1\xb9\x9c", |
|
434 | - "\xe1\xb9\x9f" => "\xe1\xb9\x9e", "\xe1\xb9\xa1" => "\xe1\xb9\xa0", "\xe1\xb9\xa3" => "\xe1\xb9\xa2", "\xe1\xb9\xa5" => "\xe1\xb9\xa4", |
|
435 | - "\xe1\xb9\xa7" => "\xe1\xb9\xa6", "\xe1\xb9\xa9" => "\xe1\xb9\xa8", "\xe1\xb9\xab" => "\xe1\xb9\xaa", "\xe1\xb9\xad" => "\xe1\xb9\xac", |
|
436 | - "\xe1\xb9\xaf" => "\xe1\xb9\xae", "\xe1\xb9\xb1" => "\xe1\xb9\xb0", "\xe1\xb9\xb3" => "\xe1\xb9\xb2", "\xe1\xb9\xb5" => "\xe1\xb9\xb4", |
|
437 | - "\xe1\xb9\xb7" => "\xe1\xb9\xb6", "\xe1\xb9\xb9" => "\xe1\xb9\xb8", "\xe1\xb9\xbb" => "\xe1\xb9\xba", "\xe1\xb9\xbd" => "\xe1\xb9\xbc", |
|
438 | - "\xe1\xb9\xbf" => "\xe1\xb9\xbe", "\xe1\xba\x81" => "\xe1\xba\x80", "\xe1\xba\x83" => "\xe1\xba\x82", "\xe1\xba\x85" => "\xe1\xba\x84", |
|
439 | - "\xe1\xba\x87" => "\xe1\xba\x86", "\xe1\xba\x89" => "\xe1\xba\x88", "\xe1\xba\x8b" => "\xe1\xba\x8a", "\xe1\xba\x8d" => "\xe1\xba\x8c", |
|
440 | - "\xe1\xba\x8f" => "\xe1\xba\x8e", "\xe1\xba\x91" => "\xe1\xba\x90", "\xe1\xba\x93" => "\xe1\xba\x92", "\xe1\xba\x95" => "\xe1\xba\x94", |
|
441 | - "h\xcc\xb1" => "\xe1\xba\x96", "t\xcc\x88" => "\xe1\xba\x97", "w\xcc\x8a" => "\xe1\xba\x98", "y\xcc\x8a" => "\xe1\xba\x99", |
|
442 | - "a\xca\xbe" => "\xe1\xba\x9a", "\xe1\xb9\xa1" => "\xe1\xba\x9b", "\xe1\xba\xa1" => "\xe1\xba\xa0", "\xe1\xba\xa3" => "\xe1\xba\xa2", |
|
443 | - "\xe1\xba\xa5" => "\xe1\xba\xa4", "\xe1\xba\xa7" => "\xe1\xba\xa6", "\xe1\xba\xa9" => "\xe1\xba\xa8", "\xe1\xba\xab" => "\xe1\xba\xaa", |
|
444 | - "\xe1\xba\xad" => "\xe1\xba\xac", "\xe1\xba\xaf" => "\xe1\xba\xae", "\xe1\xba\xb1" => "\xe1\xba\xb0", "\xe1\xba\xb3" => "\xe1\xba\xb2", |
|
445 | - "\xe1\xba\xb5" => "\xe1\xba\xb4", "\xe1\xba\xb7" => "\xe1\xba\xb6", "\xe1\xba\xb9" => "\xe1\xba\xb8", "\xe1\xba\xbb" => "\xe1\xba\xba", |
|
446 | - "\xe1\xba\xbd" => "\xe1\xba\xbc", "\xe1\xba\xbf" => "\xe1\xba\xbe", "\xe1\xbb\x81" => "\xe1\xbb\x80", "\xe1\xbb\x83" => "\xe1\xbb\x82", |
|
447 | - "\xe1\xbb\x85" => "\xe1\xbb\x84", "\xe1\xbb\x87" => "\xe1\xbb\x86", "\xe1\xbb\x89" => "\xe1\xbb\x88", "\xe1\xbb\x8b" => "\xe1\xbb\x8a", |
|
448 | - "\xe1\xbb\x8d" => "\xe1\xbb\x8c", "\xe1\xbb\x8f" => "\xe1\xbb\x8e", "\xe1\xbb\x91" => "\xe1\xbb\x90", "\xe1\xbb\x93" => "\xe1\xbb\x92", |
|
449 | - "\xe1\xbb\x95" => "\xe1\xbb\x94", "\xe1\xbb\x97" => "\xe1\xbb\x96", "\xe1\xbb\x99" => "\xe1\xbb\x98", "\xe1\xbb\x9b" => "\xe1\xbb\x9a", |
|
450 | - "\xe1\xbb\x9d" => "\xe1\xbb\x9c", "\xe1\xbb\x9f" => "\xe1\xbb\x9e", "\xe1\xbb\xa1" => "\xe1\xbb\xa0", "\xe1\xbb\xa3" => "\xe1\xbb\xa2", |
|
451 | - "\xe1\xbb\xa5" => "\xe1\xbb\xa4", "\xe1\xbb\xa7" => "\xe1\xbb\xa6", "\xe1\xbb\xa9" => "\xe1\xbb\xa8", "\xe1\xbb\xab" => "\xe1\xbb\xaa", |
|
452 | - "\xe1\xbb\xad" => "\xe1\xbb\xac", "\xe1\xbb\xaf" => "\xe1\xbb\xae", "\xe1\xbb\xb1" => "\xe1\xbb\xb0", "\xe1\xbb\xb3" => "\xe1\xbb\xb2", |
|
453 | - "\xe1\xbb\xb5" => "\xe1\xbb\xb4", "\xe1\xbb\xb7" => "\xe1\xbb\xb6", "\xe1\xbb\xb9" => "\xe1\xbb\xb8", "\xe1\xbc\x80" => "\xe1\xbc\x88", |
|
454 | - "\xe1\xbc\x81" => "\xe1\xbc\x89", "\xe1\xbc\x82" => "\xe1\xbc\x8a", "\xe1\xbc\x83" => "\xe1\xbc\x8b", "\xe1\xbc\x84" => "\xe1\xbc\x8c", |
|
455 | - "\xe1\xbc\x85" => "\xe1\xbc\x8d", "\xe1\xbc\x86" => "\xe1\xbc\x8e", "\xe1\xbc\x87" => "\xe1\xbc\x8f", "\xe1\xbc\x90" => "\xe1\xbc\x98", |
|
456 | - "\xe1\xbc\x91" => "\xe1\xbc\x99", "\xe1\xbc\x92" => "\xe1\xbc\x9a", "\xe1\xbc\x93" => "\xe1\xbc\x9b", "\xe1\xbc\x94" => "\xe1\xbc\x9c", |
|
457 | - "\xe1\xbc\x95" => "\xe1\xbc\x9d", "\xe1\xbc\xa0" => "\xe1\xbc\xa8", "\xe1\xbc\xa1" => "\xe1\xbc\xa9", "\xe1\xbc\xa2" => "\xe1\xbc\xaa", |
|
458 | - "\xe1\xbc\xa3" => "\xe1\xbc\xab", "\xe1\xbc\xa4" => "\xe1\xbc\xac", "\xe1\xbc\xa5" => "\xe1\xbc\xad", "\xe1\xbc\xa6" => "\xe1\xbc\xae", |
|
459 | - "\xe1\xbc\xa7" => "\xe1\xbc\xaf", "\xe1\xbc\xb0" => "\xe1\xbc\xb8", "\xe1\xbc\xb1" => "\xe1\xbc\xb9", "\xe1\xbc\xb2" => "\xe1\xbc\xba", |
|
460 | - "\xe1\xbc\xb3" => "\xe1\xbc\xbb", "\xe1\xbc\xb4" => "\xe1\xbc\xbc", "\xe1\xbc\xb5" => "\xe1\xbc\xbd", "\xe1\xbc\xb6" => "\xe1\xbc\xbe", |
|
461 | - "\xe1\xbc\xb7" => "\xe1\xbc\xbf", "\xe1\xbd\x80" => "\xe1\xbd\x88", "\xe1\xbd\x81" => "\xe1\xbd\x89", "\xe1\xbd\x82" => "\xe1\xbd\x8a", |
|
462 | - "\xe1\xbd\x83" => "\xe1\xbd\x8b", "\xe1\xbd\x84" => "\xe1\xbd\x8c", "\xe1\xbd\x85" => "\xe1\xbd\x8d", "\xcf\x85\xcc\x93" => "\xe1\xbd\x90", |
|
463 | - "\xcf\x85\xcc\x93\xcc\x80" => "\xe1\xbd\x92", "\xcf\x85\xcc\x93\xcc\x81" => "\xe1\xbd\x94", "\xcf\x85\xcc\x93\xcd\x82" => "\xe1\xbd\x96", "\xe1\xbd\x91" => "\xe1\xbd\x99", |
|
464 | - "\xe1\xbd\x93" => "\xe1\xbd\x9b", "\xe1\xbd\x95" => "\xe1\xbd\x9d", "\xe1\xbd\x97" => "\xe1\xbd\x9f", "\xe1\xbd\xa0" => "\xe1\xbd\xa8", |
|
465 | - "\xe1\xbd\xa1" => "\xe1\xbd\xa9", "\xe1\xbd\xa2" => "\xe1\xbd\xaa", "\xe1\xbd\xa3" => "\xe1\xbd\xab", "\xe1\xbd\xa4" => "\xe1\xbd\xac", |
|
466 | - "\xe1\xbd\xa5" => "\xe1\xbd\xad", "\xe1\xbd\xa6" => "\xe1\xbd\xae", "\xe1\xbd\xa7" => "\xe1\xbd\xaf", "\xe1\xbc\x80\xce\xb9" => "\xe1\xbe\x80", |
|
467 | - "\xe1\xbc\x81\xce\xb9" => "\xe1\xbe\x81", "\xe1\xbc\x82\xce\xb9" => "\xe1\xbe\x82", "\xe1\xbc\x83\xce\xb9" => "\xe1\xbe\x83", "\xe1\xbc\x84\xce\xb9" => "\xe1\xbe\x84", |
|
468 | - "\xe1\xbc\x85\xce\xb9" => "\xe1\xbe\x85", "\xe1\xbc\x86\xce\xb9" => "\xe1\xbe\x86", "\xe1\xbc\x87\xce\xb9" => "\xe1\xbe\x87", "\xe1\xbe\x80" => "\xe1\xbe\x88", |
|
469 | - "\xe1\xbe\x81" => "\xe1\xbe\x89", "\xe1\xbe\x82" => "\xe1\xbe\x8a", "\xe1\xbe\x83" => "\xe1\xbe\x8b", "\xe1\xbe\x84" => "\xe1\xbe\x8c", |
|
470 | - "\xe1\xbe\x85" => "\xe1\xbe\x8d", "\xe1\xbe\x86" => "\xe1\xbe\x8e", "\xe1\xbe\x87" => "\xe1\xbe\x8f", "\xe1\xbc\xa0\xce\xb9" => "\xe1\xbe\x90", |
|
471 | - "\xe1\xbc\xa1\xce\xb9" => "\xe1\xbe\x91", "\xe1\xbc\xa2\xce\xb9" => "\xe1\xbe\x92", "\xe1\xbc\xa3\xce\xb9" => "\xe1\xbe\x93", "\xe1\xbc\xa4\xce\xb9" => "\xe1\xbe\x94", |
|
472 | - "\xe1\xbc\xa5\xce\xb9" => "\xe1\xbe\x95", "\xe1\xbc\xa6\xce\xb9" => "\xe1\xbe\x96", "\xe1\xbc\xa7\xce\xb9" => "\xe1\xbe\x97", "\xe1\xbe\x90" => "\xe1\xbe\x98", |
|
473 | - "\xe1\xbe\x91" => "\xe1\xbe\x99", "\xe1\xbe\x92" => "\xe1\xbe\x9a", "\xe1\xbe\x93" => "\xe1\xbe\x9b", "\xe1\xbe\x94" => "\xe1\xbe\x9c", |
|
474 | - "\xe1\xbe\x95" => "\xe1\xbe\x9d", "\xe1\xbe\x96" => "\xe1\xbe\x9e", "\xe1\xbe\x97" => "\xe1\xbe\x9f", "\xe1\xbd\xa0\xce\xb9" => "\xe1\xbe\xa0", |
|
475 | - "\xe1\xbd\xa1\xce\xb9" => "\xe1\xbe\xa1", "\xe1\xbd\xa2\xce\xb9" => "\xe1\xbe\xa2", "\xe1\xbd\xa3\xce\xb9" => "\xe1\xbe\xa3", "\xe1\xbd\xa4\xce\xb9" => "\xe1\xbe\xa4", |
|
476 | - "\xe1\xbd\xa5\xce\xb9" => "\xe1\xbe\xa5", "\xe1\xbd\xa6\xce\xb9" => "\xe1\xbe\xa6", "\xe1\xbd\xa7\xce\xb9" => "\xe1\xbe\xa7", "\xe1\xbe\xa0" => "\xe1\xbe\xa8", |
|
477 | - "\xe1\xbe\xa1" => "\xe1\xbe\xa9", "\xe1\xbe\xa2" => "\xe1\xbe\xaa", "\xe1\xbe\xa3" => "\xe1\xbe\xab", "\xe1\xbe\xa4" => "\xe1\xbe\xac", |
|
478 | - "\xe1\xbe\xa5" => "\xe1\xbe\xad", "\xe1\xbe\xa6" => "\xe1\xbe\xae", "\xe1\xbe\xa7" => "\xe1\xbe\xaf", "\xe1\xbd\xb0\xce\xb9" => "\xe1\xbe\xb2", |
|
479 | - "\xce\xb1\xce\xb9" => "\xe1\xbe\xb3", "\xce\xac\xce\xb9" => "\xe1\xbe\xb4", "\xce\xb1\xcd\x82" => "\xe1\xbe\xb6", "\xce\xb1\xcd\x82\xce\xb9" => "\xe1\xbe\xb7", |
|
480 | - "\xe1\xbe\xb0" => "\xe1\xbe\xb8", "\xe1\xbe\xb1" => "\xe1\xbe\xb9", "\xe1\xbd\xb0" => "\xe1\xbe\xba", "\xe1\xbd\xb1" => "\xe1\xbe\xbb", |
|
481 | - "\xe1\xbe\xb3" => "\xe1\xbe\xbc", "\xce\xb9" => "\xe1\xbe\xbe", "\xe1\xbd\xb4\xce\xb9" => "\xe1\xbf\x82", "\xce\xb7\xce\xb9" => "\xe1\xbf\x83", |
|
482 | - "\xce\xae\xce\xb9" => "\xe1\xbf\x84", "\xce\xb7\xcd\x82" => "\xe1\xbf\x86", "\xce\xb7\xcd\x82\xce\xb9" => "\xe1\xbf\x87", "\xe1\xbd\xb2" => "\xe1\xbf\x88", |
|
483 | - "\xe1\xbd\xb3" => "\xe1\xbf\x89", "\xe1\xbd\xb4" => "\xe1\xbf\x8a", "\xe1\xbd\xb5" => "\xe1\xbf\x8b", "\xe1\xbf\x83" => "\xe1\xbf\x8c", |
|
484 | - "\xce\xb9\xcc\x88\xcc\x80" => "\xe1\xbf\x92", "\xce\xb9\xcc\x88\xcc\x81" => "\xe1\xbf\x93", "\xce\xb9\xcd\x82" => "\xe1\xbf\x96", "\xce\xb9\xcc\x88\xcd\x82" => "\xe1\xbf\x97", |
|
485 | - "\xe1\xbf\x90" => "\xe1\xbf\x98", "\xe1\xbf\x91" => "\xe1\xbf\x99", "\xe1\xbd\xb6" => "\xe1\xbf\x9a", "\xe1\xbd\xb7" => "\xe1\xbf\x9b", |
|
486 | - "\xcf\x85\xcc\x88\xcc\x80" => "\xe1\xbf\xa2", "\xcf\x85\xcc\x88\xcc\x81" => "\xe1\xbf\xa3", "\xcf\x81\xcc\x93" => "\xe1\xbf\xa4", "\xcf\x85\xcd\x82" => "\xe1\xbf\xa6", |
|
487 | - "\xcf\x85\xcc\x88\xcd\x82" => "\xe1\xbf\xa7", "\xe1\xbf\xa0" => "\xe1\xbf\xa8", "\xe1\xbf\xa1" => "\xe1\xbf\xa9", "\xe1\xbd\xba" => "\xe1\xbf\xaa", |
|
488 | - "\xe1\xbd\xbb" => "\xe1\xbf\xab", "\xe1\xbf\xa5" => "\xe1\xbf\xac", "\xe1\xbd\xbc\xce\xb9" => "\xe1\xbf\xb2", "\xcf\x89\xce\xb9" => "\xe1\xbf\xb3", |
|
489 | - "\xcf\x8e\xce\xb9" => "\xe1\xbf\xb4", "\xcf\x89\xcd\x82" => "\xe1\xbf\xb6", "\xcf\x89\xcd\x82\xce\xb9" => "\xe1\xbf\xb7", "\xe1\xbd\xb8" => "\xe1\xbf\xb8", |
|
490 | - "\xe1\xbd\xb9" => "\xe1\xbf\xb9", "\xe1\xbd\xbc" => "\xe1\xbf\xba", "\xe1\xbd\xbd" => "\xe1\xbf\xbb", "\xe1\xbf\xb3" => "\xe1\xbf\xbc", |
|
491 | - "\xcf\x89" => "\xe2\x84\xa6", "k" => "\xe2\x84\xaa", "\xc3\xa5" => "\xe2\x84\xab", "\xe2\x85\x8e" => "\xe2\x84\xb2", |
|
492 | - "\xe2\x85\xb0" => "\xe2\x85\xa0", "\xe2\x85\xb1" => "\xe2\x85\xa1", "\xe2\x85\xb2" => "\xe2\x85\xa2", "\xe2\x85\xb3" => "\xe2\x85\xa3", |
|
493 | - "\xe2\x85\xb4" => "\xe2\x85\xa4", "\xe2\x85\xb5" => "\xe2\x85\xa5", "\xe2\x85\xb6" => "\xe2\x85\xa6", "\xe2\x85\xb7" => "\xe2\x85\xa7", |
|
494 | - "\xe2\x85\xb8" => "\xe2\x85\xa8", "\xe2\x85\xb9" => "\xe2\x85\xa9", "\xe2\x85\xba" => "\xe2\x85\xaa", "\xe2\x85\xbb" => "\xe2\x85\xab", |
|
495 | - "\xe2\x85\xbc" => "\xe2\x85\xac", "\xe2\x85\xbd" => "\xe2\x85\xad", "\xe2\x85\xbe" => "\xe2\x85\xae", "\xe2\x85\xbf" => "\xe2\x85\xaf", |
|
496 | - "\xe2\x86\x84" => "\xe2\x86\x83", "\xe2\x93\x90" => "\xe2\x92\xb6", "\xe2\x93\x91" => "\xe2\x92\xb7", "\xe2\x93\x92" => "\xe2\x92\xb8", |
|
497 | - "\xe2\x93\x93" => "\xe2\x92\xb9", "\xe2\x93\x94" => "\xe2\x92\xba", "\xe2\x93\x95" => "\xe2\x92\xbb", "\xe2\x93\x96" => "\xe2\x92\xbc", |
|
498 | - "\xe2\x93\x97" => "\xe2\x92\xbd", "\xe2\x93\x98" => "\xe2\x92\xbe", "\xe2\x93\x99" => "\xe2\x92\xbf", "\xe2\x93\x9a" => "\xe2\x93\x80", |
|
499 | - "\xe2\x93\x9b" => "\xe2\x93\x81", "\xe2\x93\x9c" => "\xe2\x93\x82", "\xe2\x93\x9d" => "\xe2\x93\x83", "\xe2\x93\x9e" => "\xe2\x93\x84", |
|
500 | - "\xe2\x93\x9f" => "\xe2\x93\x85", "\xe2\x93\xa0" => "\xe2\x93\x86", "\xe2\x93\xa1" => "\xe2\x93\x87", "\xe2\x93\xa2" => "\xe2\x93\x88", |
|
501 | - "\xe2\x93\xa3" => "\xe2\x93\x89", "\xe2\x93\xa4" => "\xe2\x93\x8a", "\xe2\x93\xa5" => "\xe2\x93\x8b", "\xe2\x93\xa6" => "\xe2\x93\x8c", |
|
502 | - "\xe2\x93\xa7" => "\xe2\x93\x8d", "\xe2\x93\xa8" => "\xe2\x93\x8e", "\xe2\x93\xa9" => "\xe2\x93\x8f", "\xe2\xb0\xb0" => "\xe2\xb0\x80", |
|
503 | - "\xe2\xb0\xb1" => "\xe2\xb0\x81", "\xe2\xb0\xb2" => "\xe2\xb0\x82", "\xe2\xb0\xb3" => "\xe2\xb0\x83", "\xe2\xb0\xb4" => "\xe2\xb0\x84", |
|
504 | - "\xe2\xb0\xb5" => "\xe2\xb0\x85", "\xe2\xb0\xb6" => "\xe2\xb0\x86", "\xe2\xb0\xb7" => "\xe2\xb0\x87", "\xe2\xb0\xb8" => "\xe2\xb0\x88", |
|
505 | - "\xe2\xb0\xb9" => "\xe2\xb0\x89", "\xe2\xb0\xba" => "\xe2\xb0\x8a", "\xe2\xb0\xbb" => "\xe2\xb0\x8b", "\xe2\xb0\xbc" => "\xe2\xb0\x8c", |
|
506 | - "\xe2\xb0\xbd" => "\xe2\xb0\x8d", "\xe2\xb0\xbe" => "\xe2\xb0\x8e", "\xe2\xb0\xbf" => "\xe2\xb0\x8f", "\xe2\xb1\x80" => "\xe2\xb0\x90", |
|
507 | - "\xe2\xb1\x81" => "\xe2\xb0\x91", "\xe2\xb1\x82" => "\xe2\xb0\x92", "\xe2\xb1\x83" => "\xe2\xb0\x93", "\xe2\xb1\x84" => "\xe2\xb0\x94", |
|
508 | - "\xe2\xb1\x85" => "\xe2\xb0\x95", "\xe2\xb1\x86" => "\xe2\xb0\x96", "\xe2\xb1\x87" => "\xe2\xb0\x97", "\xe2\xb1\x88" => "\xe2\xb0\x98", |
|
509 | - "\xe2\xb1\x89" => "\xe2\xb0\x99", "\xe2\xb1\x8a" => "\xe2\xb0\x9a", "\xe2\xb1\x8b" => "\xe2\xb0\x9b", "\xe2\xb1\x8c" => "\xe2\xb0\x9c", |
|
510 | - "\xe2\xb1\x8d" => "\xe2\xb0\x9d", "\xe2\xb1\x8e" => "\xe2\xb0\x9e", "\xe2\xb1\x8f" => "\xe2\xb0\x9f", "\xe2\xb1\x90" => "\xe2\xb0\xa0", |
|
511 | - "\xe2\xb1\x91" => "\xe2\xb0\xa1", "\xe2\xb1\x92" => "\xe2\xb0\xa2", "\xe2\xb1\x93" => "\xe2\xb0\xa3", "\xe2\xb1\x94" => "\xe2\xb0\xa4", |
|
512 | - "\xe2\xb1\x95" => "\xe2\xb0\xa5", "\xe2\xb1\x96" => "\xe2\xb0\xa6", "\xe2\xb1\x97" => "\xe2\xb0\xa7", "\xe2\xb1\x98" => "\xe2\xb0\xa8", |
|
513 | - "\xe2\xb1\x99" => "\xe2\xb0\xa9", "\xe2\xb1\x9a" => "\xe2\xb0\xaa", "\xe2\xb1\x9b" => "\xe2\xb0\xab", "\xe2\xb1\x9c" => "\xe2\xb0\xac", |
|
514 | - "\xe2\xb1\x9d" => "\xe2\xb0\xad", "\xe2\xb1\x9e" => "\xe2\xb0\xae", "\xe2\xb1\xa1" => "\xe2\xb1\xa0", "\xc9\xab" => "\xe2\xb1\xa2", |
|
515 | - "\xe1\xb5\xbd" => "\xe2\xb1\xa3", "\xc9\xbd" => "\xe2\xb1\xa4", "\xe2\xb1\xa8" => "\xe2\xb1\xa7", "\xe2\xb1\xaa" => "\xe2\xb1\xa9", |
|
516 | - "\xe2\xb1\xac" => "\xe2\xb1\xab", "\xe2\xb1\xb6" => "\xe2\xb1\xb5", "\xe2\xb2\x81" => "\xe2\xb2\x80", "\xe2\xb2\x83" => "\xe2\xb2\x82", |
|
517 | - "\xe2\xb2\x85" => "\xe2\xb2\x84", "\xe2\xb2\x87" => "\xe2\xb2\x86", "\xe2\xb2\x89" => "\xe2\xb2\x88", "\xe2\xb2\x8b" => "\xe2\xb2\x8a", |
|
518 | - "\xe2\xb2\x8d" => "\xe2\xb2\x8c", "\xe2\xb2\x8f" => "\xe2\xb2\x8e", "\xe2\xb2\x91" => "\xe2\xb2\x90", "\xe2\xb2\x93" => "\xe2\xb2\x92", |
|
519 | - "\xe2\xb2\x95" => "\xe2\xb2\x94", "\xe2\xb2\x97" => "\xe2\xb2\x96", "\xe2\xb2\x99" => "\xe2\xb2\x98", "\xe2\xb2\x9b" => "\xe2\xb2\x9a", |
|
520 | - "\xe2\xb2\x9d" => "\xe2\xb2\x9c", "\xe2\xb2\x9f" => "\xe2\xb2\x9e", "\xe2\xb2\xa1" => "\xe2\xb2\xa0", "\xe2\xb2\xa3" => "\xe2\xb2\xa2", |
|
521 | - "\xe2\xb2\xa5" => "\xe2\xb2\xa4", "\xe2\xb2\xa7" => "\xe2\xb2\xa6", "\xe2\xb2\xa9" => "\xe2\xb2\xa8", "\xe2\xb2\xab" => "\xe2\xb2\xaa", |
|
522 | - "\xe2\xb2\xad" => "\xe2\xb2\xac", "\xe2\xb2\xaf" => "\xe2\xb2\xae", "\xe2\xb2\xb1" => "\xe2\xb2\xb0", "\xe2\xb2\xb3" => "\xe2\xb2\xb2", |
|
523 | - "\xe2\xb2\xb5" => "\xe2\xb2\xb4", "\xe2\xb2\xb7" => "\xe2\xb2\xb6", "\xe2\xb2\xb9" => "\xe2\xb2\xb8", "\xe2\xb2\xbb" => "\xe2\xb2\xba", |
|
524 | - "\xe2\xb2\xbd" => "\xe2\xb2\xbc", "\xe2\xb2\xbf" => "\xe2\xb2\xbe", "\xe2\xb3\x81" => "\xe2\xb3\x80", "\xe2\xb3\x83" => "\xe2\xb3\x82", |
|
525 | - "\xe2\xb3\x85" => "\xe2\xb3\x84", "\xe2\xb3\x87" => "\xe2\xb3\x86", "\xe2\xb3\x89" => "\xe2\xb3\x88", "\xe2\xb3\x8b" => "\xe2\xb3\x8a", |
|
526 | - "\xe2\xb3\x8d" => "\xe2\xb3\x8c", "\xe2\xb3\x8f" => "\xe2\xb3\x8e", "\xe2\xb3\x91" => "\xe2\xb3\x90", "\xe2\xb3\x93" => "\xe2\xb3\x92", |
|
527 | - "\xe2\xb3\x95" => "\xe2\xb3\x94", "\xe2\xb3\x97" => "\xe2\xb3\x96", "\xe2\xb3\x99" => "\xe2\xb3\x98", "\xe2\xb3\x9b" => "\xe2\xb3\x9a", |
|
528 | - "\xe2\xb3\x9d" => "\xe2\xb3\x9c", "\xe2\xb3\x9f" => "\xe2\xb3\x9e", "\xe2\xb3\xa1" => "\xe2\xb3\xa0", "\xe2\xb3\xa3" => "\xe2\xb3\xa2", |
|
529 | - "ff" => "\xef\xac\x80", "fi" => "\xef\xac\x81", "fl" => "\xef\xac\x82", "ffi" => "\xef\xac\x83", |
|
530 | - "ffl" => "\xef\xac\x84", "st" => "\xef\xac\x85", "st" => "\xef\xac\x86", "\xd5\xb4\xd5\xb6" => "\xef\xac\x93", |
|
531 | - "\xd5\xb4\xd5\xa5" => "\xef\xac\x94", "\xd5\xb4\xd5\xab" => "\xef\xac\x95", "\xd5\xbe\xd5\xb6" => "\xef\xac\x96", "\xd5\xb4\xd5\xad" => "\xef\xac\x97", |
|
532 | - "\xef\xbd\x81" => "\xef\xbc\xa1", "\xef\xbd\x82" => "\xef\xbc\xa2", "\xef\xbd\x83" => "\xef\xbc\xa3", "\xef\xbd\x84" => "\xef\xbc\xa4", |
|
533 | - "\xef\xbd\x85" => "\xef\xbc\xa5", "\xef\xbd\x86" => "\xef\xbc\xa6", "\xef\xbd\x87" => "\xef\xbc\xa7", "\xef\xbd\x88" => "\xef\xbc\xa8", |
|
534 | - "\xef\xbd\x89" => "\xef\xbc\xa9", "\xef\xbd\x8a" => "\xef\xbc\xaa", "\xef\xbd\x8b" => "\xef\xbc\xab", "\xef\xbd\x8c" => "\xef\xbc\xac", |
|
535 | - "\xef\xbd\x8d" => "\xef\xbc\xad", "\xef\xbd\x8e" => "\xef\xbc\xae", "\xef\xbd\x8f" => "\xef\xbc\xaf", "\xef\xbd\x90" => "\xef\xbc\xb0", |
|
536 | - "\xef\xbd\x91" => "\xef\xbc\xb1", "\xef\xbd\x92" => "\xef\xbc\xb2", "\xef\xbd\x93" => "\xef\xbc\xb3", "\xef\xbd\x94" => "\xef\xbc\xb4", |
|
537 | - "\xef\xbd\x95" => "\xef\xbc\xb5", "\xef\xbd\x96" => "\xef\xbc\xb6", "\xef\xbd\x97" => "\xef\xbc\xb7", "\xef\xbd\x98" => "\xef\xbc\xb8", |
|
538 | - "\xef\xbd\x99" => "\xef\xbc\xb9", "\xef\xbd\x9a" => "\xef\xbc\xba", "\xf0\x90\x90\xa8" => "\xf0\x90\x90\x80", "\xf0\x90\x90\xa9" => "\xf0\x90\x90\x81", |
|
539 | - "\xf0\x90\x90\xaa" => "\xf0\x90\x90\x82", "\xf0\x90\x90\xab" => "\xf0\x90\x90\x83", "\xf0\x90\x90\xac" => "\xf0\x90\x90\x84", "\xf0\x90\x90\xad" => "\xf0\x90\x90\x85", |
|
540 | - "\xf0\x90\x90\xae" => "\xf0\x90\x90\x86", "\xf0\x90\x90\xaf" => "\xf0\x90\x90\x87", "\xf0\x90\x90\xb0" => "\xf0\x90\x90\x88", "\xf0\x90\x90\xb1" => "\xf0\x90\x90\x89", |
|
541 | - "\xf0\x90\x90\xb2" => "\xf0\x90\x90\x8a", "\xf0\x90\x90\xb3" => "\xf0\x90\x90\x8b", "\xf0\x90\x90\xb4" => "\xf0\x90\x90\x8c", "\xf0\x90\x90\xb5" => "\xf0\x90\x90\x8d", |
|
542 | - "\xf0\x90\x90\xb6" => "\xf0\x90\x90\x8e", "\xf0\x90\x90\xb7" => "\xf0\x90\x90\x8f", "\xf0\x90\x90\xb8" => "\xf0\x90\x90\x90", "\xf0\x90\x90\xb9" => "\xf0\x90\x90\x91", |
|
543 | - "\xf0\x90\x90\xba" => "\xf0\x90\x90\x92", "\xf0\x90\x90\xbb" => "\xf0\x90\x90\x93", "\xf0\x90\x90\xbc" => "\xf0\x90\x90\x94", "\xf0\x90\x90\xbd" => "\xf0\x90\x90\x95", |
|
544 | - "\xf0\x90\x90\xbe" => "\xf0\x90\x90\x96", "\xf0\x90\x90\xbf" => "\xf0\x90\x90\x97", "\xf0\x90\x91\x80" => "\xf0\x90\x90\x98", "\xf0\x90\x91\x81" => "\xf0\x90\x90\x99", |
|
545 | - "\xf0\x90\x91\x82" => "\xf0\x90\x90\x9a", "\xf0\x90\x91\x83" => "\xf0\x90\x90\x9b", "\xf0\x90\x91\x84" => "\xf0\x90\x90\x9c", "\xf0\x90\x91\x85" => "\xf0\x90\x90\x9d", |
|
546 | - "\xf0\x90\x91\x86" => "\xf0\x90\x90\x9e", "\xf0\x90\x91\x87" => "\xf0\x90\x90\x9f", "\xf0\x90\x91\x88" => "\xf0\x90\x90\xa0", "\xf0\x90\x91\x89" => "\xf0\x90\x90\xa1", |
|
547 | - "\xf0\x90\x91\x8a" => "\xf0\x90\x90\xa2", "\xf0\x90\x91\x8b" => "\xf0\x90\x90\xa3", "\xf0\x90\x91\x8c" => "\xf0\x90\x90\xa4", "\xf0\x90\x91\x8d" => "\xf0\x90\x90\xa5", |
|
548 | - "\xf0\x90\x90\xa6" => "\xf0\x90\x91\x8e", "\xf0\x90\x90\xa7" => "\xf0\x90\x91\x8f", |
|
296 | + 'a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D', |
|
297 | + 'e' => 'E', 'f' => 'F', 'g' => 'G', 'h' => 'H', |
|
298 | + 'i' => 'I', 'j' => 'J', 'k' => 'K', 'l' => 'L', |
|
299 | + 'm' => 'M', 'n' => 'N', 'o' => 'O', 'p' => 'P', |
|
300 | + 'q' => 'Q', 'r' => 'R', 's' => 'S', 't' => 'T', |
|
301 | + 'u' => 'U', 'v' => 'V', 'w' => 'W', 'x' => 'X', |
|
302 | + 'y' => 'Y', 'z' => 'Z', "\xce\xbc" => "\xc2\xb5", "\xc3\xa0" => "\xc3\x80", |
|
303 | + "\xc3\xa1" => "\xc3\x81", "\xc3\xa2" => "\xc3\x82", "\xc3\xa3" => "\xc3\x83", "\xc3\xa4" => "\xc3\x84", |
|
304 | + "\xc3\xa5" => "\xc3\x85", "\xc3\xa6" => "\xc3\x86", "\xc3\xa7" => "\xc3\x87", "\xc3\xa8" => "\xc3\x88", |
|
305 | + "\xc3\xa9" => "\xc3\x89", "\xc3\xaa" => "\xc3\x8a", "\xc3\xab" => "\xc3\x8b", "\xc3\xac" => "\xc3\x8c", |
|
306 | + "\xc3\xad" => "\xc3\x8d", "\xc3\xae" => "\xc3\x8e", "\xc3\xaf" => "\xc3\x8f", "\xc3\xb0" => "\xc3\x90", |
|
307 | + "\xc3\xb1" => "\xc3\x91", "\xc3\xb2" => "\xc3\x92", "\xc3\xb3" => "\xc3\x93", "\xc3\xb4" => "\xc3\x94", |
|
308 | + "\xc3\xb5" => "\xc3\x95", "\xc3\xb6" => "\xc3\x96", "\xc3\xb8" => "\xc3\x98", "\xc3\xb9" => "\xc3\x99", |
|
309 | + "\xc3\xba" => "\xc3\x9a", "\xc3\xbb" => "\xc3\x9b", "\xc3\xbc" => "\xc3\x9c", "\xc3\xbd" => "\xc3\x9d", |
|
310 | + "\xc3\xbe" => "\xc3\x9e", "ss" => "\xc3\x9f", "\xc4\x81" => "\xc4\x80", "\xc4\x83" => "\xc4\x82", |
|
311 | + "\xc4\x85" => "\xc4\x84", "\xc4\x87" => "\xc4\x86", "\xc4\x89" => "\xc4\x88", "\xc4\x8b" => "\xc4\x8a", |
|
312 | + "\xc4\x8d" => "\xc4\x8c", "\xc4\x8f" => "\xc4\x8e", "\xc4\x91" => "\xc4\x90", "\xc4\x93" => "\xc4\x92", |
|
313 | + "\xc4\x95" => "\xc4\x94", "\xc4\x97" => "\xc4\x96", "\xc4\x99" => "\xc4\x98", "\xc4\x9b" => "\xc4\x9a", |
|
314 | + "\xc4\x9d" => "\xc4\x9c", "\xc4\x9f" => "\xc4\x9e", "\xc4\xa1" => "\xc4\xa0", "\xc4\xa3" => "\xc4\xa2", |
|
315 | + "\xc4\xa5" => "\xc4\xa4", "\xc4\xa7" => "\xc4\xa6", "\xc4\xa9" => "\xc4\xa8", "\xc4\xab" => "\xc4\xaa", |
|
316 | + "\xc4\xad" => "\xc4\xac", "\xc4\xaf" => "\xc4\xae", "i\xcc\x87" => "\xc4\xb0", "\xc4\xb3" => "\xc4\xb2", |
|
317 | + "\xc4\xb5" => "\xc4\xb4", "\xc4\xb7" => "\xc4\xb6", "\xc4\xba" => "\xc4\xb9", "\xc4\xbc" => "\xc4\xbb", |
|
318 | + "\xc4\xbe" => "\xc4\xbd", "\xc5\x80" => "\xc4\xbf", "\xc5\x82" => "\xc5\x81", "\xc5\x84" => "\xc5\x83", |
|
319 | + "\xc5\x86" => "\xc5\x85", "\xc5\x88" => "\xc5\x87", "\xca\xbcn" => "\xc5\x89", "\xc5\x8b" => "\xc5\x8a", |
|
320 | + "\xc5\x8d" => "\xc5\x8c", "\xc5\x8f" => "\xc5\x8e", "\xc5\x91" => "\xc5\x90", "\xc5\x93" => "\xc5\x92", |
|
321 | + "\xc5\x95" => "\xc5\x94", "\xc5\x97" => "\xc5\x96", "\xc5\x99" => "\xc5\x98", "\xc5\x9b" => "\xc5\x9a", |
|
322 | + "\xc5\x9d" => "\xc5\x9c", "\xc5\x9f" => "\xc5\x9e", "\xc5\xa1" => "\xc5\xa0", "\xc5\xa3" => "\xc5\xa2", |
|
323 | + "\xc5\xa5" => "\xc5\xa4", "\xc5\xa7" => "\xc5\xa6", "\xc5\xa9" => "\xc5\xa8", "\xc5\xab" => "\xc5\xaa", |
|
324 | + "\xc5\xad" => "\xc5\xac", "\xc5\xaf" => "\xc5\xae", "\xc5\xb1" => "\xc5\xb0", "\xc5\xb3" => "\xc5\xb2", |
|
325 | + "\xc5\xb5" => "\xc5\xb4", "\xc5\xb7" => "\xc5\xb6", "\xc3\xbf" => "\xc5\xb8", "\xc5\xba" => "\xc5\xb9", |
|
326 | + "\xc5\xbc" => "\xc5\xbb", "\xc5\xbe" => "\xc5\xbd", "\xc9\x93" => "\xc6\x81", |
|
327 | + "\xc6\x83" => "\xc6\x82", "\xc6\x85" => "\xc6\x84", "\xc9\x94" => "\xc6\x86", "\xc6\x88" => "\xc6\x87", |
|
328 | + "\xc9\x96" => "\xc6\x89", "\xc9\x97" => "\xc6\x8a", "\xc6\x8c" => "\xc6\x8b", "\xc7\x9d" => "\xc6\x8e", |
|
329 | + "\xc9\x99" => "\xc6\x8f", "\xc9\x9b" => "\xc6\x90", "\xc6\x92" => "\xc6\x91", "\xc9\xa0" => "\xc6\x93", |
|
330 | + "\xc9\xa3" => "\xc6\x94", "\xc9\xa9" => "\xc6\x96", "\xc9\xa8" => "\xc6\x97", "\xc6\x99" => "\xc6\x98", |
|
331 | + "\xc9\xaf" => "\xc6\x9c", "\xc9\xb2" => "\xc6\x9d", "\xc9\xb5" => "\xc6\x9f", "\xc6\xa1" => "\xc6\xa0", |
|
332 | + "\xc6\xa3" => "\xc6\xa2", "\xc6\xa5" => "\xc6\xa4", "\xca\x80" => "\xc6\xa6", "\xc6\xa8" => "\xc6\xa7", |
|
333 | + "\xca\x83" => "\xc6\xa9", "\xc6\xad" => "\xc6\xac", "\xca\x88" => "\xc6\xae", "\xc6\xb0" => "\xc6\xaf", |
|
334 | + "\xca\x8a" => "\xc6\xb1", "\xca\x8b" => "\xc6\xb2", "\xc6\xb4" => "\xc6\xb3", "\xc6\xb6" => "\xc6\xb5", |
|
335 | + "\xca\x92" => "\xc6\xb7", "\xc6\xb9" => "\xc6\xb8", "\xc6\xbd" => "\xc6\xbc", "\xc7\x86" => "\xc7\x84", |
|
336 | + "\xc7\x86" => "\xc7\x85", "\xc7\x89" => "\xc7\x87", "\xc7\x89" => "\xc7\x88", "\xc7\x8c" => "\xc7\x8a", |
|
337 | + "\xc7\x8c" => "\xc7\x8b", "\xc7\x8e" => "\xc7\x8d", "\xc7\x90" => "\xc7\x8f", "\xc7\x92" => "\xc7\x91", |
|
338 | + "\xc7\x94" => "\xc7\x93", "\xc7\x96" => "\xc7\x95", "\xc7\x98" => "\xc7\x97", "\xc7\x9a" => "\xc7\x99", |
|
339 | + "\xc7\x9c" => "\xc7\x9b", "\xc7\x9f" => "\xc7\x9e", "\xc7\xa1" => "\xc7\xa0", "\xc7\xa3" => "\xc7\xa2", |
|
340 | + "\xc7\xa5" => "\xc7\xa4", "\xc7\xa7" => "\xc7\xa6", "\xc7\xa9" => "\xc7\xa8", "\xc7\xab" => "\xc7\xaa", |
|
341 | + "\xc7\xad" => "\xc7\xac", "\xc7\xaf" => "\xc7\xae", "j\xcc\x8c" => "\xc7\xb0", "\xc7\xb3" => "\xc7\xb1", |
|
342 | + "\xc7\xb3" => "\xc7\xb2", "\xc7\xb5" => "\xc7\xb4", "\xc6\x95" => "\xc7\xb6", "\xc6\xbf" => "\xc7\xb7", |
|
343 | + "\xc7\xb9" => "\xc7\xb8", "\xc7\xbb" => "\xc7\xba", "\xc7\xbd" => "\xc7\xbc", "\xc7\xbf" => "\xc7\xbe", |
|
344 | + "\xc8\x81" => "\xc8\x80", "\xc8\x83" => "\xc8\x82", "\xc8\x85" => "\xc8\x84", "\xc8\x87" => "\xc8\x86", |
|
345 | + "\xc8\x89" => "\xc8\x88", "\xc8\x8b" => "\xc8\x8a", "\xc8\x8d" => "\xc8\x8c", "\xc8\x8f" => "\xc8\x8e", |
|
346 | + "\xc8\x91" => "\xc8\x90", "\xc8\x93" => "\xc8\x92", "\xc8\x95" => "\xc8\x94", "\xc8\x97" => "\xc8\x96", |
|
347 | + "\xc8\x99" => "\xc8\x98", "\xc8\x9b" => "\xc8\x9a", "\xc8\x9d" => "\xc8\x9c", "\xc8\x9f" => "\xc8\x9e", |
|
348 | + "\xc6\x9e" => "\xc8\xa0", "\xc8\xa3" => "\xc8\xa2", "\xc8\xa5" => "\xc8\xa4", "\xc8\xa7" => "\xc8\xa6", |
|
349 | + "\xc8\xa9" => "\xc8\xa8", "\xc8\xab" => "\xc8\xaa", "\xc8\xad" => "\xc8\xac", "\xc8\xaf" => "\xc8\xae", |
|
350 | + "\xc8\xb1" => "\xc8\xb0", "\xc8\xb3" => "\xc8\xb2", "\xe2\xb1\xa5" => "\xc8\xba", "\xc8\xbc" => "\xc8\xbb", |
|
351 | + "\xc6\x9a" => "\xc8\xbd", "\xe2\xb1\xa6" => "\xc8\xbe", "\xc9\x82" => "\xc9\x81", "\xc6\x80" => "\xc9\x83", |
|
352 | + "\xca\x89" => "\xc9\x84", "\xca\x8c" => "\xc9\x85", "\xc9\x87" => "\xc9\x86", "\xc9\x89" => "\xc9\x88", |
|
353 | + "\xc9\x8b" => "\xc9\x8a", "\xc9\x8d" => "\xc9\x8c", "\xc9\x8f" => "\xc9\x8e", "\xce\xb9" => "\xcd\x85", |
|
354 | + "\xce\xac" => "\xce\x86", "\xce\xad" => "\xce\x88", "\xce\xae" => "\xce\x89", "\xce\xaf" => "\xce\x8a", |
|
355 | + "\xcf\x8c" => "\xce\x8c", "\xcf\x8d" => "\xce\x8e", "\xcf\x8e" => "\xce\x8f", "\xce\xb9\xcc\x88\xcc\x81" => "\xce\x90", |
|
356 | + "\xce\xb1" => "\xce\x91", "\xce\xb2" => "\xce\x92", "\xce\xb3" => "\xce\x93", "\xce\xb4" => "\xce\x94", |
|
357 | + "\xce\xb5" => "\xce\x95", "\xce\xb6" => "\xce\x96", "\xce\xb7" => "\xce\x97", "\xce\xb8" => "\xce\x98", |
|
358 | + "\xce\xb9" => "\xce\x99", "\xce\xba" => "\xce\x9a", "\xce\xbb" => "\xce\x9b", "\xce\xbc" => "\xce\x9c", |
|
359 | + "\xce\xbd" => "\xce\x9d", "\xce\xbe" => "\xce\x9e", "\xce\xbf" => "\xce\x9f", "\xcf\x80" => "\xce\xa0", |
|
360 | + "\xcf\x81" => "\xce\xa1", "\xcf\x83" => "\xce\xa3", "\xcf\x84" => "\xce\xa4", "\xcf\x85" => "\xce\xa5", |
|
361 | + "\xcf\x86" => "\xce\xa6", "\xcf\x87" => "\xce\xa7", "\xcf\x88" => "\xce\xa8", "\xcf\x89" => "\xce\xa9", |
|
362 | + "\xcf\x8a" => "\xce\xaa", "\xcf\x8b" => "\xce\xab", "\xcf\x85\xcc\x88\xcc\x81" => "\xce\xb0", "\xcf\x83" => "\xcf\x82", |
|
363 | + "\xce\xb2" => "\xcf\x90", "\xce\xb8" => "\xcf\x91", "\xcf\x86" => "\xcf\x95", "\xcf\x80" => "\xcf\x96", |
|
364 | + "\xcf\x99" => "\xcf\x98", "\xcf\x9b" => "\xcf\x9a", "\xcf\x9d" => "\xcf\x9c", "\xcf\x9f" => "\xcf\x9e", |
|
365 | + "\xcf\xa1" => "\xcf\xa0", "\xcf\xa3" => "\xcf\xa2", "\xcf\xa5" => "\xcf\xa4", "\xcf\xa7" => "\xcf\xa6", |
|
366 | + "\xcf\xa9" => "\xcf\xa8", "\xcf\xab" => "\xcf\xaa", "\xcf\xad" => "\xcf\xac", "\xcf\xaf" => "\xcf\xae", |
|
367 | + "\xce\xba" => "\xcf\xb0", "\xcf\x81" => "\xcf\xb1", "\xce\xb8" => "\xcf\xb4", "\xce\xb5" => "\xcf\xb5", |
|
368 | + "\xcf\xb8" => "\xcf\xb7", "\xcf\xb2" => "\xcf\xb9", "\xcf\xbb" => "\xcf\xba", "\xcd\xbb" => "\xcf\xbd", |
|
369 | + "\xcd\xbc" => "\xcf\xbe", "\xcd\xbd" => "\xcf\xbf", "\xd1\x90" => "\xd0\x80", "\xd1\x91" => "\xd0\x81", |
|
370 | + "\xd1\x92" => "\xd0\x82", "\xd1\x93" => "\xd0\x83", "\xd1\x94" => "\xd0\x84", "\xd1\x95" => "\xd0\x85", |
|
371 | + "\xd1\x96" => "\xd0\x86", "\xd1\x97" => "\xd0\x87", "\xd1\x98" => "\xd0\x88", "\xd1\x99" => "\xd0\x89", |
|
372 | + "\xd1\x9a" => "\xd0\x8a", "\xd1\x9b" => "\xd0\x8b", "\xd1\x9c" => "\xd0\x8c", "\xd1\x9d" => "\xd0\x8d", |
|
373 | + "\xd1\x9e" => "\xd0\x8e", "\xd1\x9f" => "\xd0\x8f", "\xd0\xb0" => "\xd0\x90", "\xd0\xb1" => "\xd0\x91", |
|
374 | + "\xd0\xb2" => "\xd0\x92", "\xd0\xb3" => "\xd0\x93", "\xd0\xb4" => "\xd0\x94", "\xd0\xb5" => "\xd0\x95", |
|
375 | + "\xd0\xb6" => "\xd0\x96", "\xd0\xb7" => "\xd0\x97", "\xd0\xb8" => "\xd0\x98", "\xd0\xb9" => "\xd0\x99", |
|
376 | + "\xd0\xba" => "\xd0\x9a", "\xd0\xbb" => "\xd0\x9b", "\xd0\xbc" => "\xd0\x9c", "\xd0\xbd" => "\xd0\x9d", |
|
377 | + "\xd0\xbe" => "\xd0\x9e", "\xd0\xbf" => "\xd0\x9f", "\xd1\x80" => "\xd0\xa0", "\xd1\x81" => "\xd0\xa1", |
|
378 | + "\xd1\x82" => "\xd0\xa2", "\xd1\x83" => "\xd0\xa3", "\xd1\x84" => "\xd0\xa4", "\xd1\x85" => "\xd0\xa5", |
|
379 | + "\xd1\x86" => "\xd0\xa6", "\xd1\x87" => "\xd0\xa7", "\xd1\x88" => "\xd0\xa8", "\xd1\x89" => "\xd0\xa9", |
|
380 | + "\xd1\x8a" => "\xd0\xaa", "\xd1\x8b" => "\xd0\xab", "\xd1\x8c" => "\xd0\xac", "\xd1\x8d" => "\xd0\xad", |
|
381 | + "\xd1\x8e" => "\xd0\xae", "\xd1\x8f" => "\xd0\xaf", "\xd1\xa1" => "\xd1\xa0", "\xd1\xa3" => "\xd1\xa2", |
|
382 | + "\xd1\xa5" => "\xd1\xa4", "\xd1\xa7" => "\xd1\xa6", "\xd1\xa9" => "\xd1\xa8", "\xd1\xab" => "\xd1\xaa", |
|
383 | + "\xd1\xad" => "\xd1\xac", "\xd1\xaf" => "\xd1\xae", "\xd1\xb1" => "\xd1\xb0", "\xd1\xb3" => "\xd1\xb2", |
|
384 | + "\xd1\xb5" => "\xd1\xb4", "\xd1\xb7" => "\xd1\xb6", "\xd1\xb9" => "\xd1\xb8", "\xd1\xbb" => "\xd1\xba", |
|
385 | + "\xd1\xbd" => "\xd1\xbc", "\xd1\xbf" => "\xd1\xbe", "\xd2\x81" => "\xd2\x80", "\xd2\x8b" => "\xd2\x8a", |
|
386 | + "\xd2\x8d" => "\xd2\x8c", "\xd2\x8f" => "\xd2\x8e", "\xd2\x91" => "\xd2\x90", "\xd2\x93" => "\xd2\x92", |
|
387 | + "\xd2\x95" => "\xd2\x94", "\xd2\x97" => "\xd2\x96", "\xd2\x99" => "\xd2\x98", "\xd2\x9b" => "\xd2\x9a", |
|
388 | + "\xd2\x9d" => "\xd2\x9c", "\xd2\x9f" => "\xd2\x9e", "\xd2\xa1" => "\xd2\xa0", "\xd2\xa3" => "\xd2\xa2", |
|
389 | + "\xd2\xa5" => "\xd2\xa4", "\xd2\xa7" => "\xd2\xa6", "\xd2\xa9" => "\xd2\xa8", "\xd2\xab" => "\xd2\xaa", |
|
390 | + "\xd2\xad" => "\xd2\xac", "\xd2\xaf" => "\xd2\xae", "\xd2\xb1" => "\xd2\xb0", "\xd2\xb3" => "\xd2\xb2", |
|
391 | + "\xd2\xb5" => "\xd2\xb4", "\xd2\xb7" => "\xd2\xb6", "\xd2\xb9" => "\xd2\xb8", "\xd2\xbb" => "\xd2\xba", |
|
392 | + "\xd2\xbd" => "\xd2\xbc", "\xd2\xbf" => "\xd2\xbe", "\xd3\x8f" => "\xd3\x80", "\xd3\x82" => "\xd3\x81", |
|
393 | + "\xd3\x84" => "\xd3\x83", "\xd3\x86" => "\xd3\x85", "\xd3\x88" => "\xd3\x87", "\xd3\x8a" => "\xd3\x89", |
|
394 | + "\xd3\x8c" => "\xd3\x8b", "\xd3\x8e" => "\xd3\x8d", "\xd3\x91" => "\xd3\x90", "\xd3\x93" => "\xd3\x92", |
|
395 | + "\xd3\x95" => "\xd3\x94", "\xd3\x97" => "\xd3\x96", "\xd3\x99" => "\xd3\x98", "\xd3\x9b" => "\xd3\x9a", |
|
396 | + "\xd3\x9d" => "\xd3\x9c", "\xd3\x9f" => "\xd3\x9e", "\xd3\xa1" => "\xd3\xa0", "\xd3\xa3" => "\xd3\xa2", |
|
397 | + "\xd3\xa5" => "\xd3\xa4", "\xd3\xa7" => "\xd3\xa6", "\xd3\xa9" => "\xd3\xa8", "\xd3\xab" => "\xd3\xaa", |
|
398 | + "\xd3\xad" => "\xd3\xac", "\xd3\xaf" => "\xd3\xae", "\xd3\xb1" => "\xd3\xb0", "\xd3\xb3" => "\xd3\xb2", |
|
399 | + "\xd3\xb5" => "\xd3\xb4", "\xd3\xb7" => "\xd3\xb6", "\xd3\xb9" => "\xd3\xb8", "\xd3\xbb" => "\xd3\xba", |
|
400 | + "\xd3\xbd" => "\xd3\xbc", "\xd3\xbf" => "\xd3\xbe", "\xd4\x81" => "\xd4\x80", "\xd4\x83" => "\xd4\x82", |
|
401 | + "\xd4\x85" => "\xd4\x84", "\xd4\x87" => "\xd4\x86", "\xd4\x89" => "\xd4\x88", "\xd4\x8b" => "\xd4\x8a", |
|
402 | + "\xd4\x8d" => "\xd4\x8c", "\xd4\x8f" => "\xd4\x8e", "\xd4\x91" => "\xd4\x90", "\xd4\x93" => "\xd4\x92", |
|
403 | + "\xd5\xa1" => "\xd4\xb1", "\xd5\xa2" => "\xd4\xb2", "\xd5\xa3" => "\xd4\xb3", "\xd5\xa4" => "\xd4\xb4", |
|
404 | + "\xd5\xa5" => "\xd4\xb5", "\xd5\xa6" => "\xd4\xb6", "\xd5\xa7" => "\xd4\xb7", "\xd5\xa8" => "\xd4\xb8", |
|
405 | + "\xd5\xa9" => "\xd4\xb9", "\xd5\xaa" => "\xd4\xba", "\xd5\xab" => "\xd4\xbb", "\xd5\xac" => "\xd4\xbc", |
|
406 | + "\xd5\xad" => "\xd4\xbd", "\xd5\xae" => "\xd4\xbe", "\xd5\xaf" => "\xd4\xbf", "\xd5\xb0" => "\xd5\x80", |
|
407 | + "\xd5\xb1" => "\xd5\x81", "\xd5\xb2" => "\xd5\x82", "\xd5\xb3" => "\xd5\x83", "\xd5\xb4" => "\xd5\x84", |
|
408 | + "\xd5\xb5" => "\xd5\x85", "\xd5\xb6" => "\xd5\x86", "\xd5\xb7" => "\xd5\x87", "\xd5\xb8" => "\xd5\x88", |
|
409 | + "\xd5\xb9" => "\xd5\x89", "\xd5\xba" => "\xd5\x8a", "\xd5\xbb" => "\xd5\x8b", "\xd5\xbc" => "\xd5\x8c", |
|
410 | + "\xd5\xbd" => "\xd5\x8d", "\xd5\xbe" => "\xd5\x8e", "\xd5\xbf" => "\xd5\x8f", "\xd6\x80" => "\xd5\x90", |
|
411 | + "\xd6\x81" => "\xd5\x91", "\xd6\x82" => "\xd5\x92", "\xd6\x83" => "\xd5\x93", "\xd6\x84" => "\xd5\x94", |
|
412 | + "\xd6\x85" => "\xd5\x95", "\xd6\x86" => "\xd5\x96", "\xd5\xa5\xd6\x82" => "\xd6\x87", "\xe2\xb4\x80" => "\xe1\x82\xa0", |
|
413 | + "\xe2\xb4\x81" => "\xe1\x82\xa1", "\xe2\xb4\x82" => "\xe1\x82\xa2", "\xe2\xb4\x83" => "\xe1\x82\xa3", "\xe2\xb4\x84" => "\xe1\x82\xa4", |
|
414 | + "\xe2\xb4\x85" => "\xe1\x82\xa5", "\xe2\xb4\x86" => "\xe1\x82\xa6", "\xe2\xb4\x87" => "\xe1\x82\xa7", "\xe2\xb4\x88" => "\xe1\x82\xa8", |
|
415 | + "\xe2\xb4\x89" => "\xe1\x82\xa9", "\xe2\xb4\x8a" => "\xe1\x82\xaa", "\xe2\xb4\x8b" => "\xe1\x82\xab", "\xe2\xb4\x8c" => "\xe1\x82\xac", |
|
416 | + "\xe2\xb4\x8d" => "\xe1\x82\xad", "\xe2\xb4\x8e" => "\xe1\x82\xae", "\xe2\xb4\x8f" => "\xe1\x82\xaf", "\xe2\xb4\x90" => "\xe1\x82\xb0", |
|
417 | + "\xe2\xb4\x91" => "\xe1\x82\xb1", "\xe2\xb4\x92" => "\xe1\x82\xb2", "\xe2\xb4\x93" => "\xe1\x82\xb3", "\xe2\xb4\x94" => "\xe1\x82\xb4", |
|
418 | + "\xe2\xb4\x95" => "\xe1\x82\xb5", "\xe2\xb4\x96" => "\xe1\x82\xb6", "\xe2\xb4\x97" => "\xe1\x82\xb7", "\xe2\xb4\x98" => "\xe1\x82\xb8", |
|
419 | + "\xe2\xb4\x99" => "\xe1\x82\xb9", "\xe2\xb4\x9a" => "\xe1\x82\xba", "\xe2\xb4\x9b" => "\xe1\x82\xbb", "\xe2\xb4\x9c" => "\xe1\x82\xbc", |
|
420 | + "\xe2\xb4\x9d" => "\xe1\x82\xbd", "\xe2\xb4\x9e" => "\xe1\x82\xbe", "\xe2\xb4\x9f" => "\xe1\x82\xbf", "\xe2\xb4\xa0" => "\xe1\x83\x80", |
|
421 | + "\xe2\xb4\xa1" => "\xe1\x83\x81", "\xe2\xb4\xa2" => "\xe1\x83\x82", "\xe2\xb4\xa3" => "\xe1\x83\x83", "\xe2\xb4\xa4" => "\xe1\x83\x84", |
|
422 | + "\xe2\xb4\xa5" => "\xe1\x83\x85", "\xe1\xb8\x81" => "\xe1\xb8\x80", "\xe1\xb8\x83" => "\xe1\xb8\x82", "\xe1\xb8\x85" => "\xe1\xb8\x84", |
|
423 | + "\xe1\xb8\x87" => "\xe1\xb8\x86", "\xe1\xb8\x89" => "\xe1\xb8\x88", "\xe1\xb8\x8b" => "\xe1\xb8\x8a", "\xe1\xb8\x8d" => "\xe1\xb8\x8c", |
|
424 | + "\xe1\xb8\x8f" => "\xe1\xb8\x8e", "\xe1\xb8\x91" => "\xe1\xb8\x90", "\xe1\xb8\x93" => "\xe1\xb8\x92", "\xe1\xb8\x95" => "\xe1\xb8\x94", |
|
425 | + "\xe1\xb8\x97" => "\xe1\xb8\x96", "\xe1\xb8\x99" => "\xe1\xb8\x98", "\xe1\xb8\x9b" => "\xe1\xb8\x9a", "\xe1\xb8\x9d" => "\xe1\xb8\x9c", |
|
426 | + "\xe1\xb8\x9f" => "\xe1\xb8\x9e", "\xe1\xb8\xa1" => "\xe1\xb8\xa0", "\xe1\xb8\xa3" => "\xe1\xb8\xa2", "\xe1\xb8\xa5" => "\xe1\xb8\xa4", |
|
427 | + "\xe1\xb8\xa7" => "\xe1\xb8\xa6", "\xe1\xb8\xa9" => "\xe1\xb8\xa8", "\xe1\xb8\xab" => "\xe1\xb8\xaa", "\xe1\xb8\xad" => "\xe1\xb8\xac", |
|
428 | + "\xe1\xb8\xaf" => "\xe1\xb8\xae", "\xe1\xb8\xb1" => "\xe1\xb8\xb0", "\xe1\xb8\xb3" => "\xe1\xb8\xb2", "\xe1\xb8\xb5" => "\xe1\xb8\xb4", |
|
429 | + "\xe1\xb8\xb7" => "\xe1\xb8\xb6", "\xe1\xb8\xb9" => "\xe1\xb8\xb8", "\xe1\xb8\xbb" => "\xe1\xb8\xba", "\xe1\xb8\xbd" => "\xe1\xb8\xbc", |
|
430 | + "\xe1\xb8\xbf" => "\xe1\xb8\xbe", "\xe1\xb9\x81" => "\xe1\xb9\x80", "\xe1\xb9\x83" => "\xe1\xb9\x82", "\xe1\xb9\x85" => "\xe1\xb9\x84", |
|
431 | + "\xe1\xb9\x87" => "\xe1\xb9\x86", "\xe1\xb9\x89" => "\xe1\xb9\x88", "\xe1\xb9\x8b" => "\xe1\xb9\x8a", "\xe1\xb9\x8d" => "\xe1\xb9\x8c", |
|
432 | + "\xe1\xb9\x8f" => "\xe1\xb9\x8e", "\xe1\xb9\x91" => "\xe1\xb9\x90", "\xe1\xb9\x93" => "\xe1\xb9\x92", "\xe1\xb9\x95" => "\xe1\xb9\x94", |
|
433 | + "\xe1\xb9\x97" => "\xe1\xb9\x96", "\xe1\xb9\x99" => "\xe1\xb9\x98", "\xe1\xb9\x9b" => "\xe1\xb9\x9a", "\xe1\xb9\x9d" => "\xe1\xb9\x9c", |
|
434 | + "\xe1\xb9\x9f" => "\xe1\xb9\x9e", "\xe1\xb9\xa1" => "\xe1\xb9\xa0", "\xe1\xb9\xa3" => "\xe1\xb9\xa2", "\xe1\xb9\xa5" => "\xe1\xb9\xa4", |
|
435 | + "\xe1\xb9\xa7" => "\xe1\xb9\xa6", "\xe1\xb9\xa9" => "\xe1\xb9\xa8", "\xe1\xb9\xab" => "\xe1\xb9\xaa", "\xe1\xb9\xad" => "\xe1\xb9\xac", |
|
436 | + "\xe1\xb9\xaf" => "\xe1\xb9\xae", "\xe1\xb9\xb1" => "\xe1\xb9\xb0", "\xe1\xb9\xb3" => "\xe1\xb9\xb2", "\xe1\xb9\xb5" => "\xe1\xb9\xb4", |
|
437 | + "\xe1\xb9\xb7" => "\xe1\xb9\xb6", "\xe1\xb9\xb9" => "\xe1\xb9\xb8", "\xe1\xb9\xbb" => "\xe1\xb9\xba", "\xe1\xb9\xbd" => "\xe1\xb9\xbc", |
|
438 | + "\xe1\xb9\xbf" => "\xe1\xb9\xbe", "\xe1\xba\x81" => "\xe1\xba\x80", "\xe1\xba\x83" => "\xe1\xba\x82", "\xe1\xba\x85" => "\xe1\xba\x84", |
|
439 | + "\xe1\xba\x87" => "\xe1\xba\x86", "\xe1\xba\x89" => "\xe1\xba\x88", "\xe1\xba\x8b" => "\xe1\xba\x8a", "\xe1\xba\x8d" => "\xe1\xba\x8c", |
|
440 | + "\xe1\xba\x8f" => "\xe1\xba\x8e", "\xe1\xba\x91" => "\xe1\xba\x90", "\xe1\xba\x93" => "\xe1\xba\x92", "\xe1\xba\x95" => "\xe1\xba\x94", |
|
441 | + "h\xcc\xb1" => "\xe1\xba\x96", "t\xcc\x88" => "\xe1\xba\x97", "w\xcc\x8a" => "\xe1\xba\x98", "y\xcc\x8a" => "\xe1\xba\x99", |
|
442 | + "a\xca\xbe" => "\xe1\xba\x9a", "\xe1\xb9\xa1" => "\xe1\xba\x9b", "\xe1\xba\xa1" => "\xe1\xba\xa0", "\xe1\xba\xa3" => "\xe1\xba\xa2", |
|
443 | + "\xe1\xba\xa5" => "\xe1\xba\xa4", "\xe1\xba\xa7" => "\xe1\xba\xa6", "\xe1\xba\xa9" => "\xe1\xba\xa8", "\xe1\xba\xab" => "\xe1\xba\xaa", |
|
444 | + "\xe1\xba\xad" => "\xe1\xba\xac", "\xe1\xba\xaf" => "\xe1\xba\xae", "\xe1\xba\xb1" => "\xe1\xba\xb0", "\xe1\xba\xb3" => "\xe1\xba\xb2", |
|
445 | + "\xe1\xba\xb5" => "\xe1\xba\xb4", "\xe1\xba\xb7" => "\xe1\xba\xb6", "\xe1\xba\xb9" => "\xe1\xba\xb8", "\xe1\xba\xbb" => "\xe1\xba\xba", |
|
446 | + "\xe1\xba\xbd" => "\xe1\xba\xbc", "\xe1\xba\xbf" => "\xe1\xba\xbe", "\xe1\xbb\x81" => "\xe1\xbb\x80", "\xe1\xbb\x83" => "\xe1\xbb\x82", |
|
447 | + "\xe1\xbb\x85" => "\xe1\xbb\x84", "\xe1\xbb\x87" => "\xe1\xbb\x86", "\xe1\xbb\x89" => "\xe1\xbb\x88", "\xe1\xbb\x8b" => "\xe1\xbb\x8a", |
|
448 | + "\xe1\xbb\x8d" => "\xe1\xbb\x8c", "\xe1\xbb\x8f" => "\xe1\xbb\x8e", "\xe1\xbb\x91" => "\xe1\xbb\x90", "\xe1\xbb\x93" => "\xe1\xbb\x92", |
|
449 | + "\xe1\xbb\x95" => "\xe1\xbb\x94", "\xe1\xbb\x97" => "\xe1\xbb\x96", "\xe1\xbb\x99" => "\xe1\xbb\x98", "\xe1\xbb\x9b" => "\xe1\xbb\x9a", |
|
450 | + "\xe1\xbb\x9d" => "\xe1\xbb\x9c", "\xe1\xbb\x9f" => "\xe1\xbb\x9e", "\xe1\xbb\xa1" => "\xe1\xbb\xa0", "\xe1\xbb\xa3" => "\xe1\xbb\xa2", |
|
451 | + "\xe1\xbb\xa5" => "\xe1\xbb\xa4", "\xe1\xbb\xa7" => "\xe1\xbb\xa6", "\xe1\xbb\xa9" => "\xe1\xbb\xa8", "\xe1\xbb\xab" => "\xe1\xbb\xaa", |
|
452 | + "\xe1\xbb\xad" => "\xe1\xbb\xac", "\xe1\xbb\xaf" => "\xe1\xbb\xae", "\xe1\xbb\xb1" => "\xe1\xbb\xb0", "\xe1\xbb\xb3" => "\xe1\xbb\xb2", |
|
453 | + "\xe1\xbb\xb5" => "\xe1\xbb\xb4", "\xe1\xbb\xb7" => "\xe1\xbb\xb6", "\xe1\xbb\xb9" => "\xe1\xbb\xb8", "\xe1\xbc\x80" => "\xe1\xbc\x88", |
|
454 | + "\xe1\xbc\x81" => "\xe1\xbc\x89", "\xe1\xbc\x82" => "\xe1\xbc\x8a", "\xe1\xbc\x83" => "\xe1\xbc\x8b", "\xe1\xbc\x84" => "\xe1\xbc\x8c", |
|
455 | + "\xe1\xbc\x85" => "\xe1\xbc\x8d", "\xe1\xbc\x86" => "\xe1\xbc\x8e", "\xe1\xbc\x87" => "\xe1\xbc\x8f", "\xe1\xbc\x90" => "\xe1\xbc\x98", |
|
456 | + "\xe1\xbc\x91" => "\xe1\xbc\x99", "\xe1\xbc\x92" => "\xe1\xbc\x9a", "\xe1\xbc\x93" => "\xe1\xbc\x9b", "\xe1\xbc\x94" => "\xe1\xbc\x9c", |
|
457 | + "\xe1\xbc\x95" => "\xe1\xbc\x9d", "\xe1\xbc\xa0" => "\xe1\xbc\xa8", "\xe1\xbc\xa1" => "\xe1\xbc\xa9", "\xe1\xbc\xa2" => "\xe1\xbc\xaa", |
|
458 | + "\xe1\xbc\xa3" => "\xe1\xbc\xab", "\xe1\xbc\xa4" => "\xe1\xbc\xac", "\xe1\xbc\xa5" => "\xe1\xbc\xad", "\xe1\xbc\xa6" => "\xe1\xbc\xae", |
|
459 | + "\xe1\xbc\xa7" => "\xe1\xbc\xaf", "\xe1\xbc\xb0" => "\xe1\xbc\xb8", "\xe1\xbc\xb1" => "\xe1\xbc\xb9", "\xe1\xbc\xb2" => "\xe1\xbc\xba", |
|
460 | + "\xe1\xbc\xb3" => "\xe1\xbc\xbb", "\xe1\xbc\xb4" => "\xe1\xbc\xbc", "\xe1\xbc\xb5" => "\xe1\xbc\xbd", "\xe1\xbc\xb6" => "\xe1\xbc\xbe", |
|
461 | + "\xe1\xbc\xb7" => "\xe1\xbc\xbf", "\xe1\xbd\x80" => "\xe1\xbd\x88", "\xe1\xbd\x81" => "\xe1\xbd\x89", "\xe1\xbd\x82" => "\xe1\xbd\x8a", |
|
462 | + "\xe1\xbd\x83" => "\xe1\xbd\x8b", "\xe1\xbd\x84" => "\xe1\xbd\x8c", "\xe1\xbd\x85" => "\xe1\xbd\x8d", "\xcf\x85\xcc\x93" => "\xe1\xbd\x90", |
|
463 | + "\xcf\x85\xcc\x93\xcc\x80" => "\xe1\xbd\x92", "\xcf\x85\xcc\x93\xcc\x81" => "\xe1\xbd\x94", "\xcf\x85\xcc\x93\xcd\x82" => "\xe1\xbd\x96", "\xe1\xbd\x91" => "\xe1\xbd\x99", |
|
464 | + "\xe1\xbd\x93" => "\xe1\xbd\x9b", "\xe1\xbd\x95" => "\xe1\xbd\x9d", "\xe1\xbd\x97" => "\xe1\xbd\x9f", "\xe1\xbd\xa0" => "\xe1\xbd\xa8", |
|
465 | + "\xe1\xbd\xa1" => "\xe1\xbd\xa9", "\xe1\xbd\xa2" => "\xe1\xbd\xaa", "\xe1\xbd\xa3" => "\xe1\xbd\xab", "\xe1\xbd\xa4" => "\xe1\xbd\xac", |
|
466 | + "\xe1\xbd\xa5" => "\xe1\xbd\xad", "\xe1\xbd\xa6" => "\xe1\xbd\xae", "\xe1\xbd\xa7" => "\xe1\xbd\xaf", "\xe1\xbc\x80\xce\xb9" => "\xe1\xbe\x80", |
|
467 | + "\xe1\xbc\x81\xce\xb9" => "\xe1\xbe\x81", "\xe1\xbc\x82\xce\xb9" => "\xe1\xbe\x82", "\xe1\xbc\x83\xce\xb9" => "\xe1\xbe\x83", "\xe1\xbc\x84\xce\xb9" => "\xe1\xbe\x84", |
|
468 | + "\xe1\xbc\x85\xce\xb9" => "\xe1\xbe\x85", "\xe1\xbc\x86\xce\xb9" => "\xe1\xbe\x86", "\xe1\xbc\x87\xce\xb9" => "\xe1\xbe\x87", "\xe1\xbe\x80" => "\xe1\xbe\x88", |
|
469 | + "\xe1\xbe\x81" => "\xe1\xbe\x89", "\xe1\xbe\x82" => "\xe1\xbe\x8a", "\xe1\xbe\x83" => "\xe1\xbe\x8b", "\xe1\xbe\x84" => "\xe1\xbe\x8c", |
|
470 | + "\xe1\xbe\x85" => "\xe1\xbe\x8d", "\xe1\xbe\x86" => "\xe1\xbe\x8e", "\xe1\xbe\x87" => "\xe1\xbe\x8f", "\xe1\xbc\xa0\xce\xb9" => "\xe1\xbe\x90", |
|
471 | + "\xe1\xbc\xa1\xce\xb9" => "\xe1\xbe\x91", "\xe1\xbc\xa2\xce\xb9" => "\xe1\xbe\x92", "\xe1\xbc\xa3\xce\xb9" => "\xe1\xbe\x93", "\xe1\xbc\xa4\xce\xb9" => "\xe1\xbe\x94", |
|
472 | + "\xe1\xbc\xa5\xce\xb9" => "\xe1\xbe\x95", "\xe1\xbc\xa6\xce\xb9" => "\xe1\xbe\x96", "\xe1\xbc\xa7\xce\xb9" => "\xe1\xbe\x97", "\xe1\xbe\x90" => "\xe1\xbe\x98", |
|
473 | + "\xe1\xbe\x91" => "\xe1\xbe\x99", "\xe1\xbe\x92" => "\xe1\xbe\x9a", "\xe1\xbe\x93" => "\xe1\xbe\x9b", "\xe1\xbe\x94" => "\xe1\xbe\x9c", |
|
474 | + "\xe1\xbe\x95" => "\xe1\xbe\x9d", "\xe1\xbe\x96" => "\xe1\xbe\x9e", "\xe1\xbe\x97" => "\xe1\xbe\x9f", "\xe1\xbd\xa0\xce\xb9" => "\xe1\xbe\xa0", |
|
475 | + "\xe1\xbd\xa1\xce\xb9" => "\xe1\xbe\xa1", "\xe1\xbd\xa2\xce\xb9" => "\xe1\xbe\xa2", "\xe1\xbd\xa3\xce\xb9" => "\xe1\xbe\xa3", "\xe1\xbd\xa4\xce\xb9" => "\xe1\xbe\xa4", |
|
476 | + "\xe1\xbd\xa5\xce\xb9" => "\xe1\xbe\xa5", "\xe1\xbd\xa6\xce\xb9" => "\xe1\xbe\xa6", "\xe1\xbd\xa7\xce\xb9" => "\xe1\xbe\xa7", "\xe1\xbe\xa0" => "\xe1\xbe\xa8", |
|
477 | + "\xe1\xbe\xa1" => "\xe1\xbe\xa9", "\xe1\xbe\xa2" => "\xe1\xbe\xaa", "\xe1\xbe\xa3" => "\xe1\xbe\xab", "\xe1\xbe\xa4" => "\xe1\xbe\xac", |
|
478 | + "\xe1\xbe\xa5" => "\xe1\xbe\xad", "\xe1\xbe\xa6" => "\xe1\xbe\xae", "\xe1\xbe\xa7" => "\xe1\xbe\xaf", "\xe1\xbd\xb0\xce\xb9" => "\xe1\xbe\xb2", |
|
479 | + "\xce\xb1\xce\xb9" => "\xe1\xbe\xb3", "\xce\xac\xce\xb9" => "\xe1\xbe\xb4", "\xce\xb1\xcd\x82" => "\xe1\xbe\xb6", "\xce\xb1\xcd\x82\xce\xb9" => "\xe1\xbe\xb7", |
|
480 | + "\xe1\xbe\xb0" => "\xe1\xbe\xb8", "\xe1\xbe\xb1" => "\xe1\xbe\xb9", "\xe1\xbd\xb0" => "\xe1\xbe\xba", "\xe1\xbd\xb1" => "\xe1\xbe\xbb", |
|
481 | + "\xe1\xbe\xb3" => "\xe1\xbe\xbc", "\xce\xb9" => "\xe1\xbe\xbe", "\xe1\xbd\xb4\xce\xb9" => "\xe1\xbf\x82", "\xce\xb7\xce\xb9" => "\xe1\xbf\x83", |
|
482 | + "\xce\xae\xce\xb9" => "\xe1\xbf\x84", "\xce\xb7\xcd\x82" => "\xe1\xbf\x86", "\xce\xb7\xcd\x82\xce\xb9" => "\xe1\xbf\x87", "\xe1\xbd\xb2" => "\xe1\xbf\x88", |
|
483 | + "\xe1\xbd\xb3" => "\xe1\xbf\x89", "\xe1\xbd\xb4" => "\xe1\xbf\x8a", "\xe1\xbd\xb5" => "\xe1\xbf\x8b", "\xe1\xbf\x83" => "\xe1\xbf\x8c", |
|
484 | + "\xce\xb9\xcc\x88\xcc\x80" => "\xe1\xbf\x92", "\xce\xb9\xcc\x88\xcc\x81" => "\xe1\xbf\x93", "\xce\xb9\xcd\x82" => "\xe1\xbf\x96", "\xce\xb9\xcc\x88\xcd\x82" => "\xe1\xbf\x97", |
|
485 | + "\xe1\xbf\x90" => "\xe1\xbf\x98", "\xe1\xbf\x91" => "\xe1\xbf\x99", "\xe1\xbd\xb6" => "\xe1\xbf\x9a", "\xe1\xbd\xb7" => "\xe1\xbf\x9b", |
|
486 | + "\xcf\x85\xcc\x88\xcc\x80" => "\xe1\xbf\xa2", "\xcf\x85\xcc\x88\xcc\x81" => "\xe1\xbf\xa3", "\xcf\x81\xcc\x93" => "\xe1\xbf\xa4", "\xcf\x85\xcd\x82" => "\xe1\xbf\xa6", |
|
487 | + "\xcf\x85\xcc\x88\xcd\x82" => "\xe1\xbf\xa7", "\xe1\xbf\xa0" => "\xe1\xbf\xa8", "\xe1\xbf\xa1" => "\xe1\xbf\xa9", "\xe1\xbd\xba" => "\xe1\xbf\xaa", |
|
488 | + "\xe1\xbd\xbb" => "\xe1\xbf\xab", "\xe1\xbf\xa5" => "\xe1\xbf\xac", "\xe1\xbd\xbc\xce\xb9" => "\xe1\xbf\xb2", "\xcf\x89\xce\xb9" => "\xe1\xbf\xb3", |
|
489 | + "\xcf\x8e\xce\xb9" => "\xe1\xbf\xb4", "\xcf\x89\xcd\x82" => "\xe1\xbf\xb6", "\xcf\x89\xcd\x82\xce\xb9" => "\xe1\xbf\xb7", "\xe1\xbd\xb8" => "\xe1\xbf\xb8", |
|
490 | + "\xe1\xbd\xb9" => "\xe1\xbf\xb9", "\xe1\xbd\xbc" => "\xe1\xbf\xba", "\xe1\xbd\xbd" => "\xe1\xbf\xbb", "\xe1\xbf\xb3" => "\xe1\xbf\xbc", |
|
491 | + "\xcf\x89" => "\xe2\x84\xa6", "k" => "\xe2\x84\xaa", "\xc3\xa5" => "\xe2\x84\xab", "\xe2\x85\x8e" => "\xe2\x84\xb2", |
|
492 | + "\xe2\x85\xb0" => "\xe2\x85\xa0", "\xe2\x85\xb1" => "\xe2\x85\xa1", "\xe2\x85\xb2" => "\xe2\x85\xa2", "\xe2\x85\xb3" => "\xe2\x85\xa3", |
|
493 | + "\xe2\x85\xb4" => "\xe2\x85\xa4", "\xe2\x85\xb5" => "\xe2\x85\xa5", "\xe2\x85\xb6" => "\xe2\x85\xa6", "\xe2\x85\xb7" => "\xe2\x85\xa7", |
|
494 | + "\xe2\x85\xb8" => "\xe2\x85\xa8", "\xe2\x85\xb9" => "\xe2\x85\xa9", "\xe2\x85\xba" => "\xe2\x85\xaa", "\xe2\x85\xbb" => "\xe2\x85\xab", |
|
495 | + "\xe2\x85\xbc" => "\xe2\x85\xac", "\xe2\x85\xbd" => "\xe2\x85\xad", "\xe2\x85\xbe" => "\xe2\x85\xae", "\xe2\x85\xbf" => "\xe2\x85\xaf", |
|
496 | + "\xe2\x86\x84" => "\xe2\x86\x83", "\xe2\x93\x90" => "\xe2\x92\xb6", "\xe2\x93\x91" => "\xe2\x92\xb7", "\xe2\x93\x92" => "\xe2\x92\xb8", |
|
497 | + "\xe2\x93\x93" => "\xe2\x92\xb9", "\xe2\x93\x94" => "\xe2\x92\xba", "\xe2\x93\x95" => "\xe2\x92\xbb", "\xe2\x93\x96" => "\xe2\x92\xbc", |
|
498 | + "\xe2\x93\x97" => "\xe2\x92\xbd", "\xe2\x93\x98" => "\xe2\x92\xbe", "\xe2\x93\x99" => "\xe2\x92\xbf", "\xe2\x93\x9a" => "\xe2\x93\x80", |
|
499 | + "\xe2\x93\x9b" => "\xe2\x93\x81", "\xe2\x93\x9c" => "\xe2\x93\x82", "\xe2\x93\x9d" => "\xe2\x93\x83", "\xe2\x93\x9e" => "\xe2\x93\x84", |
|
500 | + "\xe2\x93\x9f" => "\xe2\x93\x85", "\xe2\x93\xa0" => "\xe2\x93\x86", "\xe2\x93\xa1" => "\xe2\x93\x87", "\xe2\x93\xa2" => "\xe2\x93\x88", |
|
501 | + "\xe2\x93\xa3" => "\xe2\x93\x89", "\xe2\x93\xa4" => "\xe2\x93\x8a", "\xe2\x93\xa5" => "\xe2\x93\x8b", "\xe2\x93\xa6" => "\xe2\x93\x8c", |
|
502 | + "\xe2\x93\xa7" => "\xe2\x93\x8d", "\xe2\x93\xa8" => "\xe2\x93\x8e", "\xe2\x93\xa9" => "\xe2\x93\x8f", "\xe2\xb0\xb0" => "\xe2\xb0\x80", |
|
503 | + "\xe2\xb0\xb1" => "\xe2\xb0\x81", "\xe2\xb0\xb2" => "\xe2\xb0\x82", "\xe2\xb0\xb3" => "\xe2\xb0\x83", "\xe2\xb0\xb4" => "\xe2\xb0\x84", |
|
504 | + "\xe2\xb0\xb5" => "\xe2\xb0\x85", "\xe2\xb0\xb6" => "\xe2\xb0\x86", "\xe2\xb0\xb7" => "\xe2\xb0\x87", "\xe2\xb0\xb8" => "\xe2\xb0\x88", |
|
505 | + "\xe2\xb0\xb9" => "\xe2\xb0\x89", "\xe2\xb0\xba" => "\xe2\xb0\x8a", "\xe2\xb0\xbb" => "\xe2\xb0\x8b", "\xe2\xb0\xbc" => "\xe2\xb0\x8c", |
|
506 | + "\xe2\xb0\xbd" => "\xe2\xb0\x8d", "\xe2\xb0\xbe" => "\xe2\xb0\x8e", "\xe2\xb0\xbf" => "\xe2\xb0\x8f", "\xe2\xb1\x80" => "\xe2\xb0\x90", |
|
507 | + "\xe2\xb1\x81" => "\xe2\xb0\x91", "\xe2\xb1\x82" => "\xe2\xb0\x92", "\xe2\xb1\x83" => "\xe2\xb0\x93", "\xe2\xb1\x84" => "\xe2\xb0\x94", |
|
508 | + "\xe2\xb1\x85" => "\xe2\xb0\x95", "\xe2\xb1\x86" => "\xe2\xb0\x96", "\xe2\xb1\x87" => "\xe2\xb0\x97", "\xe2\xb1\x88" => "\xe2\xb0\x98", |
|
509 | + "\xe2\xb1\x89" => "\xe2\xb0\x99", "\xe2\xb1\x8a" => "\xe2\xb0\x9a", "\xe2\xb1\x8b" => "\xe2\xb0\x9b", "\xe2\xb1\x8c" => "\xe2\xb0\x9c", |
|
510 | + "\xe2\xb1\x8d" => "\xe2\xb0\x9d", "\xe2\xb1\x8e" => "\xe2\xb0\x9e", "\xe2\xb1\x8f" => "\xe2\xb0\x9f", "\xe2\xb1\x90" => "\xe2\xb0\xa0", |
|
511 | + "\xe2\xb1\x91" => "\xe2\xb0\xa1", "\xe2\xb1\x92" => "\xe2\xb0\xa2", "\xe2\xb1\x93" => "\xe2\xb0\xa3", "\xe2\xb1\x94" => "\xe2\xb0\xa4", |
|
512 | + "\xe2\xb1\x95" => "\xe2\xb0\xa5", "\xe2\xb1\x96" => "\xe2\xb0\xa6", "\xe2\xb1\x97" => "\xe2\xb0\xa7", "\xe2\xb1\x98" => "\xe2\xb0\xa8", |
|
513 | + "\xe2\xb1\x99" => "\xe2\xb0\xa9", "\xe2\xb1\x9a" => "\xe2\xb0\xaa", "\xe2\xb1\x9b" => "\xe2\xb0\xab", "\xe2\xb1\x9c" => "\xe2\xb0\xac", |
|
514 | + "\xe2\xb1\x9d" => "\xe2\xb0\xad", "\xe2\xb1\x9e" => "\xe2\xb0\xae", "\xe2\xb1\xa1" => "\xe2\xb1\xa0", "\xc9\xab" => "\xe2\xb1\xa2", |
|
515 | + "\xe1\xb5\xbd" => "\xe2\xb1\xa3", "\xc9\xbd" => "\xe2\xb1\xa4", "\xe2\xb1\xa8" => "\xe2\xb1\xa7", "\xe2\xb1\xaa" => "\xe2\xb1\xa9", |
|
516 | + "\xe2\xb1\xac" => "\xe2\xb1\xab", "\xe2\xb1\xb6" => "\xe2\xb1\xb5", "\xe2\xb2\x81" => "\xe2\xb2\x80", "\xe2\xb2\x83" => "\xe2\xb2\x82", |
|
517 | + "\xe2\xb2\x85" => "\xe2\xb2\x84", "\xe2\xb2\x87" => "\xe2\xb2\x86", "\xe2\xb2\x89" => "\xe2\xb2\x88", "\xe2\xb2\x8b" => "\xe2\xb2\x8a", |
|
518 | + "\xe2\xb2\x8d" => "\xe2\xb2\x8c", "\xe2\xb2\x8f" => "\xe2\xb2\x8e", "\xe2\xb2\x91" => "\xe2\xb2\x90", "\xe2\xb2\x93" => "\xe2\xb2\x92", |
|
519 | + "\xe2\xb2\x95" => "\xe2\xb2\x94", "\xe2\xb2\x97" => "\xe2\xb2\x96", "\xe2\xb2\x99" => "\xe2\xb2\x98", "\xe2\xb2\x9b" => "\xe2\xb2\x9a", |
|
520 | + "\xe2\xb2\x9d" => "\xe2\xb2\x9c", "\xe2\xb2\x9f" => "\xe2\xb2\x9e", "\xe2\xb2\xa1" => "\xe2\xb2\xa0", "\xe2\xb2\xa3" => "\xe2\xb2\xa2", |
|
521 | + "\xe2\xb2\xa5" => "\xe2\xb2\xa4", "\xe2\xb2\xa7" => "\xe2\xb2\xa6", "\xe2\xb2\xa9" => "\xe2\xb2\xa8", "\xe2\xb2\xab" => "\xe2\xb2\xaa", |
|
522 | + "\xe2\xb2\xad" => "\xe2\xb2\xac", "\xe2\xb2\xaf" => "\xe2\xb2\xae", "\xe2\xb2\xb1" => "\xe2\xb2\xb0", "\xe2\xb2\xb3" => "\xe2\xb2\xb2", |
|
523 | + "\xe2\xb2\xb5" => "\xe2\xb2\xb4", "\xe2\xb2\xb7" => "\xe2\xb2\xb6", "\xe2\xb2\xb9" => "\xe2\xb2\xb8", "\xe2\xb2\xbb" => "\xe2\xb2\xba", |
|
524 | + "\xe2\xb2\xbd" => "\xe2\xb2\xbc", "\xe2\xb2\xbf" => "\xe2\xb2\xbe", "\xe2\xb3\x81" => "\xe2\xb3\x80", "\xe2\xb3\x83" => "\xe2\xb3\x82", |
|
525 | + "\xe2\xb3\x85" => "\xe2\xb3\x84", "\xe2\xb3\x87" => "\xe2\xb3\x86", "\xe2\xb3\x89" => "\xe2\xb3\x88", "\xe2\xb3\x8b" => "\xe2\xb3\x8a", |
|
526 | + "\xe2\xb3\x8d" => "\xe2\xb3\x8c", "\xe2\xb3\x8f" => "\xe2\xb3\x8e", "\xe2\xb3\x91" => "\xe2\xb3\x90", "\xe2\xb3\x93" => "\xe2\xb3\x92", |
|
527 | + "\xe2\xb3\x95" => "\xe2\xb3\x94", "\xe2\xb3\x97" => "\xe2\xb3\x96", "\xe2\xb3\x99" => "\xe2\xb3\x98", "\xe2\xb3\x9b" => "\xe2\xb3\x9a", |
|
528 | + "\xe2\xb3\x9d" => "\xe2\xb3\x9c", "\xe2\xb3\x9f" => "\xe2\xb3\x9e", "\xe2\xb3\xa1" => "\xe2\xb3\xa0", "\xe2\xb3\xa3" => "\xe2\xb3\xa2", |
|
529 | + "ff" => "\xef\xac\x80", "fi" => "\xef\xac\x81", "fl" => "\xef\xac\x82", "ffi" => "\xef\xac\x83", |
|
530 | + "ffl" => "\xef\xac\x84", "st" => "\xef\xac\x85", "st" => "\xef\xac\x86", "\xd5\xb4\xd5\xb6" => "\xef\xac\x93", |
|
531 | + "\xd5\xb4\xd5\xa5" => "\xef\xac\x94", "\xd5\xb4\xd5\xab" => "\xef\xac\x95", "\xd5\xbe\xd5\xb6" => "\xef\xac\x96", "\xd5\xb4\xd5\xad" => "\xef\xac\x97", |
|
532 | + "\xef\xbd\x81" => "\xef\xbc\xa1", "\xef\xbd\x82" => "\xef\xbc\xa2", "\xef\xbd\x83" => "\xef\xbc\xa3", "\xef\xbd\x84" => "\xef\xbc\xa4", |
|
533 | + "\xef\xbd\x85" => "\xef\xbc\xa5", "\xef\xbd\x86" => "\xef\xbc\xa6", "\xef\xbd\x87" => "\xef\xbc\xa7", "\xef\xbd\x88" => "\xef\xbc\xa8", |
|
534 | + "\xef\xbd\x89" => "\xef\xbc\xa9", "\xef\xbd\x8a" => "\xef\xbc\xaa", "\xef\xbd\x8b" => "\xef\xbc\xab", "\xef\xbd\x8c" => "\xef\xbc\xac", |
|
535 | + "\xef\xbd\x8d" => "\xef\xbc\xad", "\xef\xbd\x8e" => "\xef\xbc\xae", "\xef\xbd\x8f" => "\xef\xbc\xaf", "\xef\xbd\x90" => "\xef\xbc\xb0", |
|
536 | + "\xef\xbd\x91" => "\xef\xbc\xb1", "\xef\xbd\x92" => "\xef\xbc\xb2", "\xef\xbd\x93" => "\xef\xbc\xb3", "\xef\xbd\x94" => "\xef\xbc\xb4", |
|
537 | + "\xef\xbd\x95" => "\xef\xbc\xb5", "\xef\xbd\x96" => "\xef\xbc\xb6", "\xef\xbd\x97" => "\xef\xbc\xb7", "\xef\xbd\x98" => "\xef\xbc\xb8", |
|
538 | + "\xef\xbd\x99" => "\xef\xbc\xb9", "\xef\xbd\x9a" => "\xef\xbc\xba", "\xf0\x90\x90\xa8" => "\xf0\x90\x90\x80", "\xf0\x90\x90\xa9" => "\xf0\x90\x90\x81", |
|
539 | + "\xf0\x90\x90\xaa" => "\xf0\x90\x90\x82", "\xf0\x90\x90\xab" => "\xf0\x90\x90\x83", "\xf0\x90\x90\xac" => "\xf0\x90\x90\x84", "\xf0\x90\x90\xad" => "\xf0\x90\x90\x85", |
|
540 | + "\xf0\x90\x90\xae" => "\xf0\x90\x90\x86", "\xf0\x90\x90\xaf" => "\xf0\x90\x90\x87", "\xf0\x90\x90\xb0" => "\xf0\x90\x90\x88", "\xf0\x90\x90\xb1" => "\xf0\x90\x90\x89", |
|
541 | + "\xf0\x90\x90\xb2" => "\xf0\x90\x90\x8a", "\xf0\x90\x90\xb3" => "\xf0\x90\x90\x8b", "\xf0\x90\x90\xb4" => "\xf0\x90\x90\x8c", "\xf0\x90\x90\xb5" => "\xf0\x90\x90\x8d", |
|
542 | + "\xf0\x90\x90\xb6" => "\xf0\x90\x90\x8e", "\xf0\x90\x90\xb7" => "\xf0\x90\x90\x8f", "\xf0\x90\x90\xb8" => "\xf0\x90\x90\x90", "\xf0\x90\x90\xb9" => "\xf0\x90\x90\x91", |
|
543 | + "\xf0\x90\x90\xba" => "\xf0\x90\x90\x92", "\xf0\x90\x90\xbb" => "\xf0\x90\x90\x93", "\xf0\x90\x90\xbc" => "\xf0\x90\x90\x94", "\xf0\x90\x90\xbd" => "\xf0\x90\x90\x95", |
|
544 | + "\xf0\x90\x90\xbe" => "\xf0\x90\x90\x96", "\xf0\x90\x90\xbf" => "\xf0\x90\x90\x97", "\xf0\x90\x91\x80" => "\xf0\x90\x90\x98", "\xf0\x90\x91\x81" => "\xf0\x90\x90\x99", |
|
545 | + "\xf0\x90\x91\x82" => "\xf0\x90\x90\x9a", "\xf0\x90\x91\x83" => "\xf0\x90\x90\x9b", "\xf0\x90\x91\x84" => "\xf0\x90\x90\x9c", "\xf0\x90\x91\x85" => "\xf0\x90\x90\x9d", |
|
546 | + "\xf0\x90\x91\x86" => "\xf0\x90\x90\x9e", "\xf0\x90\x91\x87" => "\xf0\x90\x90\x9f", "\xf0\x90\x91\x88" => "\xf0\x90\x90\xa0", "\xf0\x90\x91\x89" => "\xf0\x90\x90\xa1", |
|
547 | + "\xf0\x90\x91\x8a" => "\xf0\x90\x90\xa2", "\xf0\x90\x91\x8b" => "\xf0\x90\x90\xa3", "\xf0\x90\x91\x8c" => "\xf0\x90\x90\xa4", "\xf0\x90\x91\x8d" => "\xf0\x90\x90\xa5", |
|
548 | + "\xf0\x90\x90\xa6" => "\xf0\x90\x91\x8e", "\xf0\x90\x90\xa7" => "\xf0\x90\x91\x8f", |
|
549 | 549 | ); |
550 | 550 | |
551 | 551 | return strtr($string, $case_folding); |
@@ -11,8 +11,9 @@ discard block |
||
11 | 11 | * @version 2.1 Beta 3 |
12 | 12 | */ |
13 | 13 | |
14 | -if (!defined('SMF')) |
|
14 | +if (!defined('SMF')) { |
|
15 | 15 | die('No direct access...'); |
16 | +} |
|
16 | 17 | |
17 | 18 | /** |
18 | 19 | * Converts the given UTF-8 string into lowercase. |
@@ -569,8 +570,8 @@ discard block |
||
569 | 570 | ); |
570 | 571 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
571 | 572 | { |
572 | - if (safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1) |
|
573 | - $smcFunc['db_query']('', ' |
|
573 | + if (safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1) { |
|
574 | + $smcFunc['db_query']('', ' |
|
574 | 575 | UPDATE {db_prefix}log_actions |
575 | 576 | SET extra = {string:extra} |
576 | 577 | WHERE id_action = {int:current_action}', |
@@ -579,6 +580,7 @@ discard block |
||
579 | 580 | 'extra' => $matches[1] . strlen($matches[3]) . ':"' . $matches[3] . '"' . $matches[4], |
580 | 581 | ) |
581 | 582 | ); |
583 | + } |
|
582 | 584 | } |
583 | 585 | $smcFunc['db_free_result']($request); |
584 | 586 |