@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | return false; |
| 91 | 91 | }, |
| 92 | 92 | 'utf8_version' => '8.0', |
| 93 | - 'utf8_version_check' => function (){ |
|
| 93 | + 'utf8_version_check' => function() { |
|
| 94 | 94 | $request = pg_query('SELECT version()'); |
| 95 | 95 | list ($version) = pg_fetch_row($request); |
| 96 | 96 | list($pgl, $version) = explode(' ', $version); |
@@ -981,7 +981,7 @@ discard block |
||
| 981 | 981 | $incontext['continue'] = 1; |
| 982 | 982 | |
| 983 | 983 | // Check Postgres setting |
| 984 | - if ( $db_type === 'postgresql') |
|
| 984 | + if ($db_type === 'postgresql') |
|
| 985 | 985 | { |
| 986 | 986 | load_database(); |
| 987 | 987 | $result = $smcFunc['db_query']('', ' |
@@ -40,7 +40,8 @@ discard block |
||
| 40 | 40 | 'mysql' => array( |
| 41 | 41 | 'name' => 'MySQL', |
| 42 | 42 | 'version' => '5.6.0', |
| 43 | - 'version_check' => function() { |
|
| 43 | + 'version_check' => function() |
|
| 44 | + { |
|
| 44 | 45 | global $db_connection; |
| 45 | 46 | if (!function_exists('mysqli_fetch_row')) |
| 46 | 47 | return false; |
@@ -56,7 +57,8 @@ discard block |
||
| 56 | 57 | return true; |
| 57 | 58 | }, |
| 58 | 59 | 'utf8_version' => '5.0.22', |
| 59 | - 'utf8_version_check' => function() { |
|
| 60 | + 'utf8_version_check' => function() |
|
| 61 | + { |
|
| 60 | 62 | global $db_connection; |
| 61 | 63 | return mysqli_get_server_info($db_connection); |
| 62 | 64 | }, |
@@ -70,7 +72,8 @@ discard block |
||
| 70 | 72 | 'postgresql' => array( |
| 71 | 73 | 'name' => 'PostgreSQL', |
| 72 | 74 | 'version' => '9.6', |
| 73 | - 'version_check' => function() { |
|
| 75 | + 'version_check' => function() |
|
| 76 | + { |
|
| 74 | 77 | $request = pg_query('SELECT version()'); |
| 75 | 78 | list ($version) = pg_fetch_row($request); |
| 76 | 79 | list($pgl, $version) = explode(' ', $version); |
@@ -90,7 +93,8 @@ discard block |
||
| 90 | 93 | return false; |
| 91 | 94 | }, |
| 92 | 95 | 'utf8_version' => '8.0', |
| 93 | - 'utf8_version_check' => function (){ |
|
| 96 | + 'utf8_version_check' => function () |
|
| 97 | + { |
|
| 94 | 98 | $request = pg_query('SELECT version()'); |
| 95 | 99 | list ($version) = pg_fetch_row($request); |
| 96 | 100 | list($pgl, $version) = explode(' ', $version); |
@@ -995,7 +999,7 @@ discard block |
||
| 995 | 999 | { |
| 996 | 1000 | $row = $smcFunc['db_fetch_assoc']($result); |
| 997 | 1001 | if ($row['standard_conforming_strings'] !== 'on') |
| 998 | - { |
|
| 1002 | + { |
|
| 999 | 1003 | $incontext['continue'] = 0; |
| 1000 | 1004 | $incontext['error'] = $txt['error_pg_scs']; |
| 1001 | 1005 | } |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | $to = explode('/', $lang_dir); |
| 547 | 547 | $relPath = $to; |
| 548 | 548 | |
| 549 | - foreach($from as $depth => $dir) |
|
| 549 | + foreach ($from as $depth => $dir) |
|
| 550 | 550 | { |
| 551 | 551 | if ($dir === $to[$depth]) |
| 552 | 552 | array_shift($relPath); |
@@ -3067,94 +3067,94 @@ discard block |
||
| 3067 | 3067 | // Translation table for the character sets not native for MySQL. |
| 3068 | 3068 | $translation_tables = array( |
| 3069 | 3069 | 'windows-1255' => array( |
| 3070 | - '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
| 3071 | - '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
| 3072 | - '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
| 3073 | - '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
| 3074 | - '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
| 3075 | - '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
| 3076 | - '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792', |
|
| 3077 | - '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF', |
|
| 3078 | - '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
| 3079 | - '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
| 3080 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 3081 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 3082 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 3083 | - '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
| 3084 | - '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
| 3085 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 3086 | - '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
| 3087 | - '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
| 3088 | - '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
| 3089 | - '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
| 3090 | - '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
| 3091 | - '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
| 3092 | - '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
| 3093 | - '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
| 3094 | - '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
| 3095 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 3096 | - '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
| 3097 | - '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 3098 | - '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
| 3099 | - '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
| 3100 | - '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
| 3101 | - '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
| 3102 | - '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
| 3103 | - '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
| 3104 | - '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
| 3105 | - '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
| 3106 | - '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
| 3107 | - '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
| 3108 | - '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
| 3109 | - '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
| 3110 | - '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
| 3111 | - '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
| 3070 | + '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
| 3071 | + '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
| 3072 | + '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
| 3073 | + '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
| 3074 | + '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
| 3075 | + '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
| 3076 | + '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792', |
|
| 3077 | + '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF', |
|
| 3078 | + '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
| 3079 | + '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
| 3080 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 3081 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 3082 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 3083 | + '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
| 3084 | + '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
| 3085 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 3086 | + '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
| 3087 | + '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
| 3088 | + '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
| 3089 | + '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
| 3090 | + '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
| 3091 | + '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
| 3092 | + '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
| 3093 | + '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
| 3094 | + '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
| 3095 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 3096 | + '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
| 3097 | + '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 3098 | + '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
| 3099 | + '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
| 3100 | + '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
| 3101 | + '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
| 3102 | + '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
| 3103 | + '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
| 3104 | + '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
| 3105 | + '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
| 3106 | + '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
| 3107 | + '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
| 3108 | + '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
| 3109 | + '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
| 3110 | + '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
| 3111 | + '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
| 3112 | 3112 | '0xFA' => '0xD7AA', |
| 3113 | 3113 | ), |
| 3114 | 3114 | 'windows-1253' => array( |
| 3115 | - '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
| 3116 | - '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
| 3117 | - '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
| 3118 | - '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
| 3119 | - '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
| 3120 | - '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E', |
|
| 3121 | - '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
| 3122 | - '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
| 3123 | - '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
| 3124 | - '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
| 3125 | - '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
| 3126 | - '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
| 3127 | - '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
| 3128 | - '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
| 3129 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 3130 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 3131 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 3132 | - '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
| 3133 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 3134 | - '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
| 3135 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 3136 | - '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
| 3137 | - '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
| 3138 | - '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
| 3139 | - '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 3140 | - '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
| 3141 | - '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
| 3142 | - '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
| 3143 | - '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
| 3144 | - '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
| 3145 | - '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
| 3146 | - '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
| 3147 | - '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
| 3148 | - '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
| 3149 | - '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
| 3150 | - '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
| 3151 | - '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
| 3152 | - '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
| 3153 | - '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
| 3154 | - '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
| 3155 | - '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
| 3156 | - '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
| 3157 | - '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', |
|
| 3115 | + '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
| 3116 | + '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
| 3117 | + '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
| 3118 | + '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
| 3119 | + '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
| 3120 | + '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E', |
|
| 3121 | + '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
| 3122 | + '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
| 3123 | + '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
| 3124 | + '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
| 3125 | + '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
| 3126 | + '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
| 3127 | + '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
| 3128 | + '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
| 3129 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 3130 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 3131 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 3132 | + '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
| 3133 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 3134 | + '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
| 3135 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 3136 | + '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
| 3137 | + '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
| 3138 | + '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
| 3139 | + '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 3140 | + '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
| 3141 | + '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
| 3142 | + '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
| 3143 | + '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
| 3144 | + '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
| 3145 | + '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
| 3146 | + '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
| 3147 | + '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
| 3148 | + '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
| 3149 | + '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
| 3150 | + '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
| 3151 | + '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
| 3152 | + '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
| 3153 | + '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
| 3154 | + '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
| 3155 | + '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
| 3156 | + '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
| 3157 | + '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', |
|
| 3158 | 3158 | ), |
| 3159 | 3159 | ); |
| 3160 | 3160 | |
@@ -3414,7 +3414,7 @@ discard block |
||
| 3414 | 3414 | // This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8) |
| 3415 | 3415 | $new_string = preg_replace_callback( |
| 3416 | 3416 | '~\bs:(\d+):"(.*?)";(?=$|[bidsaO]:|[{}}]|N;)~s', |
| 3417 | - function ($matches) |
|
| 3417 | + function($matches) |
|
| 3418 | 3418 | { |
| 3419 | 3419 | return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";'; |
| 3420 | 3420 | }, |
@@ -41,7 +41,8 @@ discard block |
||
| 41 | 41 | 'mysql' => array( |
| 42 | 42 | 'name' => 'MySQL', |
| 43 | 43 | 'version' => '5.6.0', |
| 44 | - 'version_check' => function() { |
|
| 44 | + 'version_check' => function() |
|
| 45 | + { |
|
| 45 | 46 | global $db_connection; |
| 46 | 47 | if (!function_exists('mysqli_fetch_row')) |
| 47 | 48 | return false; |
@@ -52,7 +53,8 @@ discard block |
||
| 52 | 53 | 'postgresql' => array( |
| 53 | 54 | 'name' => 'PostgreSQL', |
| 54 | 55 | 'version' => '9.6', |
| 55 | - 'version_check' => function() { |
|
| 56 | + 'version_check' => function() |
|
| 57 | + { |
|
| 56 | 58 | if (!function_exists('pg_version')) |
| 57 | 59 | return false; |
| 58 | 60 | $version = pg_version(); |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | 'filename' => empty($user_settings['filename']) ? '' : $user_settings['filename'], |
| 835 | 835 | 'custom_dir' => !empty($user_settings['attachment_type']) && $user_settings['attachment_type'] == 1, |
| 836 | 836 | 'id_attach' => isset($user_settings['id_attach']) ? $user_settings['id_attach'] : 0, |
| 837 | - 'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width']: 0, |
|
| 837 | + 'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width'] : 0, |
|
| 838 | 838 | 'height' => isset($user_settings['attachment_height']) > 0 ? $user_settings['attachment_height'] : 0, |
| 839 | 839 | ), |
| 840 | 840 | 'smiley_set' => isset($user_settings['smiley_set']) ? $user_settings['smiley_set'] : '', |
@@ -2492,7 +2492,7 @@ discard block |
||
| 2492 | 2492 | ); |
| 2493 | 2493 | |
| 2494 | 2494 | // Add the JQuery library to the list of files to load. |
| 2495 | - $jQueryUrls = array ('cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/'. JQUERY_VERSION . '/jquery.min.js', 'jquery_cdn' => 'https://code.jquery.com/jquery-'. JQUERY_VERSION . '.min.js', 'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-'. JQUERY_VERSION . '.min.js'); |
|
| 2495 | + $jQueryUrls = array('cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js', 'jquery_cdn' => 'https://code.jquery.com/jquery-' . JQUERY_VERSION . '.min.js', 'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-' . JQUERY_VERSION . '.min.js'); |
|
| 2496 | 2496 | |
| 2497 | 2497 | if (isset($modSettings['jquery_source']) && array_key_exists($modSettings['jquery_source'], $jQueryUrls)) |
| 2498 | 2498 | loadJavaScriptFile($jQueryUrls[$modSettings['jquery_source']], array('external' => true, 'seed' => false), 'smf_jquery'); |
@@ -2733,8 +2733,7 @@ discard block |
||
| 2733 | 2733 | $context['css_files_order'] = array(); |
| 2734 | 2734 | |
| 2735 | 2735 | $params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
| 2736 | - (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
| 2737 | - (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
| 2736 | + (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
| 2738 | 2737 | $params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
| 2739 | 2738 | $themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
| 2740 | 2739 | $params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true; |
@@ -2849,8 +2848,7 @@ discard block |
||
| 2849 | 2848 | global $settings, $context, $modSettings; |
| 2850 | 2849 | |
| 2851 | 2850 | $params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? |
| 2852 | - (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : |
|
| 2853 | - (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
| 2851 | + (array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : ''); |
|
| 2854 | 2852 | $params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false; |
| 2855 | 2853 | $themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme'; |
| 2856 | 2854 | $params['async'] = isset($params['async']) ? $params['async'] : false; |
@@ -2955,7 +2953,7 @@ discard block |
||
| 2955 | 2953 | $elements[] = JavaScriptEscape($element); |
| 2956 | 2954 | } |
| 2957 | 2955 | |
| 2958 | - $value = '[' . implode(', ',$elements) . ']'; |
|
| 2956 | + $value = '[' . implode(', ', $elements) . ']'; |
|
| 2959 | 2957 | } |
| 2960 | 2958 | } |
| 2961 | 2959 | |
@@ -3636,8 +3634,7 @@ discard block |
||
| 3636 | 3634 | |
| 3637 | 3635 | // What accelerator we are going to try. |
| 3638 | 3636 | $cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT; |
| 3639 | - $fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : |
|
| 3640 | - CacheApi::APIS_NAMESPACE . $cache_class_name; |
|
| 3637 | + $fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name; |
|
| 3641 | 3638 | |
| 3642 | 3639 | // Do some basic tests. |
| 3643 | 3640 | if (class_exists($fully_qualified_class_name)) |
@@ -3941,7 +3938,7 @@ discard block |
||
| 3941 | 3938 | $auth_secret = hash_file('sha256', $boarddir . '/Settings.php'); |
| 3942 | 3939 | |
| 3943 | 3940 | // Set the last error to now, but only every 15 minutes. Don't need to flood the logs. |
| 3944 | - if (empty($db_last_error) || ($db_last_error + 60*15) <= time()) |
|
| 3941 | + if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time()) |
|
| 3945 | 3942 | { |
| 3946 | 3943 | updateDbLastError(time()); |
| 3947 | 3944 | loadLanguage('Errors'); |
@@ -1289,7 +1289,6 @@ |
||
| 1289 | 1289 | if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']) |
| 1290 | 1290 | $pages .= sprintf(strtr($settings['page_index']['page'], array('{URL}' => $scripturl . '?topic=' . $row['id_topic'] . '.0;all')), '', $txt['all']); |
| 1291 | 1291 | } |
| 1292 | - |
|
| 1293 | 1292 | else |
| 1294 | 1293 | $pages = ''; |
| 1295 | 1294 | |
@@ -222,7 +222,7 @@ |
||
| 222 | 222 | if (!function_exists('mb_encode_numericentity')) |
| 223 | 223 | return false; |
| 224 | 224 | |
| 225 | - $entity = mb_encode_numericentity($string, array(0x0,0x10FFFF,0x0,0xFFFFFF), $encoding); |
|
| 225 | + $entity = mb_encode_numericentity($string, array(0x0, 0x10FFFF, 0x0, 0xFFFFFF), $encoding); |
|
| 226 | 226 | |
| 227 | 227 | if (strpos($entity, '&#') !== 0) |
| 228 | 228 | return false; |
@@ -315,7 +315,7 @@ |
||
| 315 | 315 | |
| 316 | 316 | array_walk_recursive( |
| 317 | 317 | $_POST, |
| 318 | - function (&$value, $key) use ($context, $smcFunc) |
|
| 318 | + function(&$value, $key) use ($context, $smcFunc) |
|
| 319 | 319 | { |
| 320 | 320 | // Normalize Unicode characters. (Does nothing if not in UTF-8 mode.) |
| 321 | 321 | $value = $smcFunc['normalize']($value); |
@@ -2060,7 +2060,7 @@ |
||
| 2060 | 2060 | new RecursiveIteratorIterator( |
| 2061 | 2061 | new RecursiveCallbackFilterIterator( |
| 2062 | 2062 | new RecursiveDirectoryIterator($dirname, FilesystemIterator::UNIX_PATHS), |
| 2063 | - function ($fileInfo, $currentFile, $iterator) |
|
| 2063 | + function($fileInfo, $currentFile, $iterator) |
|
| 2064 | 2064 | { |
| 2065 | 2065 | // Allow recursion |
| 2066 | 2066 | if ($iterator->hasChildren()) |
@@ -2214,7 +2214,6 @@ |
||
| 2214 | 2214 | $hookData['pureFunc'] = $hookData['method']; |
| 2215 | 2215 | $hookData['call'] = $modFunc; |
| 2216 | 2216 | } |
| 2217 | - |
|
| 2218 | 2217 | else |
| 2219 | 2218 | $hookData['call'] = $hookData['pureFunc'] = $modFunc; |
| 2220 | 2219 | |
@@ -256,7 +256,7 @@ |
||
| 256 | 256 | return array(); |
| 257 | 257 | |
| 258 | 258 | // preparse code does a few things which might mess with our parsing |
| 259 | - $body = htmlspecialchars_decode(preg_replace('~<br\s*/?'.'>~', "\n", str_replace(' ', ' ', $body)), ENT_QUOTES); |
|
| 259 | + $body = htmlspecialchars_decode(preg_replace('~<br\s*/?' . '>~', "\n", str_replace(' ', ' ', $body)), ENT_QUOTES); |
|
| 260 | 260 | |
| 261 | 261 | if (empty(self::$excluded_bbc_regex)) |
| 262 | 262 | self::setExcludedBbcRegex(); |
@@ -2917,7 +2917,7 @@ discard block |
||
| 2917 | 2917 | $string = preg_split('/(.)/su', $string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); |
| 2918 | 2918 | |
| 2919 | 2919 | // Replace characters with decomposed forms. |
| 2920 | - for ($i=0; $i < count($string); $i++) |
|
| 2920 | + for ($i = 0; $i < count($string); $i++) |
|
| 2921 | 2921 | { |
| 2922 | 2922 | // Hangul characters. |
| 2923 | 2923 | if ($string[$i] >= "\xEA\xB0\x80" && $string[$i] <= "\xED\x9E\xA3") |
@@ -2951,7 +2951,7 @@ discard block |
||
| 2951 | 2951 | { |
| 2952 | 2952 | $temp = $string[$i]; |
| 2953 | 2953 | $string[$i] = $string[$i - 1]; |
| 2954 | - $string[$i -1] = $temp; |
|
| 2954 | + $string[$i - 1] = $temp; |
|
| 2955 | 2955 | |
| 2956 | 2956 | // Backtrack and check again. |
| 2957 | 2957 | if ($i > 1) |
@@ -3262,7 +3262,7 @@ discard block |
||
| 3262 | 3262 | |
| 3263 | 3263 | Regex source is https://unicode.org/reports/tr51/#EBNF_and_Regex |
| 3264 | 3264 | */ |
| 3265 | - $string = mb_ereg_replace_callback( |
|
| 3265 | + $string = mb_ereg_replace_callback( |
|
| 3266 | 3266 | '\p{Regional_Indicator}\p{Regional_Indicator}' . |
| 3267 | 3267 | '|' . |
| 3268 | 3268 | '\p{Emoji}' . |
@@ -3283,7 +3283,7 @@ discard block |
||
| 3283 | 3283 | '[\x{E0020}-\x{E007E}]+\x{E007F}' . |
| 3284 | 3284 | ')?' . |
| 3285 | 3285 | ')*', |
| 3286 | - function ($matches) use (&$placeholders) |
|
| 3286 | + function($matches) use (&$placeholders) |
|
| 3287 | 3287 | { |
| 3288 | 3288 | // Skip lone ASCII characters that are not actully part of an emoji sequence. |
| 3289 | 3289 | // This can happen because the digits 0-9 and the '*' and '#' characters are |
@@ -3658,7 +3658,7 @@ discard block |
||
| 3658 | 3658 | // Do the thing. |
| 3659 | 3659 | $temp = @mb_ereg_replace_callback( |
| 3660 | 3660 | $pattern, |
| 3661 | - function ($matches) use ($placeholders) |
|
| 3661 | + function($matches) use ($placeholders) |
|
| 3662 | 3662 | { |
| 3663 | 3663 | return strtr($matches[0], $placeholders); |
| 3664 | 3664 | }, |