@@ -539,7 +539,7 @@ discard block |
||
| 539 | 539 | $to = explode('/', $lang_dir); |
| 540 | 540 | $relPath = $to; |
| 541 | 541 | |
| 542 | - foreach($from as $depth => $dir) |
|
| 542 | + foreach ($from as $depth => $dir) |
|
| 543 | 543 | { |
| 544 | 544 | if ($dir === $to[$depth]) |
| 545 | 545 | array_shift($relPath); |
@@ -3043,94 +3043,94 @@ discard block |
||
| 3043 | 3043 | // Translation table for the character sets not native for MySQL. |
| 3044 | 3044 | $translation_tables = array( |
| 3045 | 3045 | 'windows-1255' => array( |
| 3046 | - '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
| 3047 | - '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
| 3048 | - '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
| 3049 | - '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
| 3050 | - '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
| 3051 | - '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
| 3052 | - '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792', |
|
| 3053 | - '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF', |
|
| 3054 | - '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
| 3055 | - '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
| 3056 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 3057 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 3058 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 3059 | - '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
| 3060 | - '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
| 3061 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 3062 | - '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
| 3063 | - '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
| 3064 | - '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
| 3065 | - '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
| 3066 | - '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
| 3067 | - '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
| 3068 | - '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
| 3069 | - '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
| 3070 | - '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
| 3071 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 3072 | - '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
| 3073 | - '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 3074 | - '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
| 3075 | - '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
| 3076 | - '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
| 3077 | - '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
| 3078 | - '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
| 3079 | - '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
| 3080 | - '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
| 3081 | - '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
| 3082 | - '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
| 3083 | - '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
| 3084 | - '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
| 3085 | - '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
| 3086 | - '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
| 3087 | - '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
| 3046 | + '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
| 3047 | + '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
| 3048 | + '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
| 3049 | + '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
| 3050 | + '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
| 3051 | + '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
| 3052 | + '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792', |
|
| 3053 | + '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF', |
|
| 3054 | + '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
| 3055 | + '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
| 3056 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 3057 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 3058 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 3059 | + '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
| 3060 | + '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
| 3061 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 3062 | + '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
| 3063 | + '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
| 3064 | + '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
| 3065 | + '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
| 3066 | + '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
| 3067 | + '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
| 3068 | + '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
| 3069 | + '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
| 3070 | + '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
| 3071 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 3072 | + '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
| 3073 | + '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 3074 | + '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
| 3075 | + '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
| 3076 | + '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
| 3077 | + '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
| 3078 | + '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
| 3079 | + '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
| 3080 | + '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
| 3081 | + '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
| 3082 | + '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
| 3083 | + '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
| 3084 | + '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
| 3085 | + '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
| 3086 | + '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
| 3087 | + '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
| 3088 | 3088 | '0xFA' => '0xD7AA', |
| 3089 | 3089 | ), |
| 3090 | 3090 | 'windows-1253' => array( |
| 3091 | - '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
| 3092 | - '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
| 3093 | - '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
| 3094 | - '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
| 3095 | - '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
| 3096 | - '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E', |
|
| 3097 | - '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
| 3098 | - '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
| 3099 | - '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
| 3100 | - '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
| 3101 | - '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
| 3102 | - '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
| 3103 | - '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
| 3104 | - '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
| 3105 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 3106 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 3107 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 3108 | - '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
| 3109 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 3110 | - '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
| 3111 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 3112 | - '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
| 3113 | - '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
| 3114 | - '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
| 3115 | - '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 3116 | - '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
| 3117 | - '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
| 3118 | - '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
| 3119 | - '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
| 3120 | - '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
| 3121 | - '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
| 3122 | - '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
| 3123 | - '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
| 3124 | - '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
| 3125 | - '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
| 3126 | - '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
| 3127 | - '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
| 3128 | - '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
| 3129 | - '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
| 3130 | - '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
| 3131 | - '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
| 3132 | - '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
| 3133 | - '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', |
|
| 3091 | + '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
| 3092 | + '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
| 3093 | + '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
| 3094 | + '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
| 3095 | + '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
| 3096 | + '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E', |
|
| 3097 | + '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
| 3098 | + '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
| 3099 | + '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
| 3100 | + '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
| 3101 | + '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
| 3102 | + '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
| 3103 | + '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
| 3104 | + '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
| 3105 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
| 3106 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
| 3107 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
| 3108 | + '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
| 3109 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
| 3110 | + '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
| 3111 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
| 3112 | + '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
| 3113 | + '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
| 3114 | + '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
| 3115 | + '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
| 3116 | + '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
| 3117 | + '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
| 3118 | + '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
| 3119 | + '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
| 3120 | + '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
| 3121 | + '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
| 3122 | + '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
| 3123 | + '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
| 3124 | + '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
| 3125 | + '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
| 3126 | + '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
| 3127 | + '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
| 3128 | + '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
| 3129 | + '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
| 3130 | + '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
| 3131 | + '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
| 3132 | + '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
| 3133 | + '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', |
|
| 3134 | 3134 | ), |
| 3135 | 3135 | ); |
| 3136 | 3136 | |
@@ -3390,7 +3390,7 @@ discard block |
||
| 3390 | 3390 | // This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8) |
| 3391 | 3391 | $new_string = preg_replace_callback( |
| 3392 | 3392 | '~\bs:(\d+):"(.*?)";(?=$|[bidsaO]:|[{}}]|N;)~s', |
| 3393 | - function ($matches) |
|
| 3393 | + function($matches) |
|
| 3394 | 3394 | { |
| 3395 | 3395 | return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";'; |
| 3396 | 3396 | }, |
@@ -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(); |
@@ -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; |
@@ -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 | |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | $combining_classes = utf8_combining_classes(); |
| 250 | 250 | |
| 251 | 251 | // Replace characters with decomposed forms. |
| 252 | - for ($i=0; $i < count($chars); $i++) |
|
| 252 | + for ($i = 0; $i < count($chars); $i++) |
|
| 253 | 253 | { |
| 254 | 254 | // Hangul characters. |
| 255 | 255 | if ($chars[$i] >= "\xEA\xB0\x80" && $chars[$i] <= "\xED\x9E\xA3") |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | { |
| 284 | 284 | $temp = $chars[$i]; |
| 285 | 285 | $chars[$i] = $chars[$i - 1]; |
| 286 | - $chars[$i -1] = $temp; |
|
| 286 | + $chars[$i - 1] = $temp; |
|
| 287 | 287 | |
| 288 | 288 | // Backtrack and check again. |
| 289 | 289 | if ($i > 1) |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | |
| 528 | 528 | // Use placeholders to preserve known emoji from further processing. |
| 529 | 529 | // Regex source is https://unicode.org/reports/tr51/#EBNF_and_Regex |
| 530 | - $string = preg_replace_callback( |
|
| 530 | + $string = preg_replace_callback( |
|
| 531 | 531 | '/' . |
| 532 | 532 | // Flag emojis |
| 533 | 533 | '[' . $prop_classes['Regional_Indicator'] . ']{2}' . |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | ')?' . |
| 557 | 557 | ')*' . |
| 558 | 558 | '/u', |
| 559 | - function ($matches) use (&$placeholders) |
|
| 559 | + function($matches) use (&$placeholders) |
|
| 560 | 560 | { |
| 561 | 561 | // Skip lone ASCII characters that are not actully part of an emoji sequence. |
| 562 | 562 | // This can happen because the digits 0-9 and the '*' and '#' characters are |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | // Use placeholders for sanctioned variation selectors. |
| 588 | 588 | $string = preg_replace_callback( |
| 589 | 589 | $patterns, |
| 590 | - function ($matches) use (&$placeholders) |
|
| 590 | + function($matches) use (&$placeholders) |
|
| 591 | 591 | { |
| 592 | 592 | $placeholders[$matches[0]] = "\xEE\xB3\x9B" . md5($matches[0]) . "\xEE\xB3\x9C"; |
| 593 | 593 | return $placeholders[$matches[0]]; |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | // Do the thing. |
| 668 | 668 | $string = preg_replace_callback( |
| 669 | 669 | '/' . $pattern . '/u', |
| 670 | - function ($matches) use ($placeholders) |
|
| 670 | + function($matches) use ($placeholders) |
|
| 671 | 671 | { |
| 672 | 672 | return strtr($matches[0], $placeholders); |
| 673 | 673 | }, |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | } |
| 753 | 753 | } |
| 754 | 754 | // This sort works decently well to ensure widely used scripts are ranked before rare scripts. |
| 755 | -uasort($funcs['utf8_regex_joining_type']['data'], function ($a, $b) |
|
| 755 | +uasort($funcs['utf8_regex_joining_type']['data'], function($a, $b) |
|
| 756 | 756 | { |
| 757 | 757 | if ($a['stats']['age'] == $b['stats']['age']) |
| 758 | 758 | { |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | } |
| 829 | 829 | } |
| 830 | 830 | // Again, sort commonly used scripts before rare scripts. |
| 831 | -uasort($funcs['utf8_regex_indic']['data'], function ($a, $b) |
|
| 831 | +uasort($funcs['utf8_regex_indic']['data'], function($a, $b) |
|
| 832 | 832 | { |
| 833 | 833 | if ($a['stats']['age'] == $b['stats']['age']) |
| 834 | 834 | { |
@@ -156,7 +156,6 @@ discard block |
||
| 156 | 156 | $diff = $cur_profile['date_registered'] - strtotime(smf_strftime('%Y-%m-%d', $cur_profile['date_registered'])); |
| 157 | 157 | $value = $value + $diff; |
| 158 | 158 | } |
| 159 | - |
|
| 160 | 159 | else |
| 161 | 160 | $value = $cur_profile['date_registered']; |
| 162 | 161 | |
@@ -507,7 +506,7 @@ discard block |
||
| 507 | 506 | log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])])); |
| 508 | 507 | |
| 509 | 508 | $context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set) |
| 510 | - { |
|
| 509 | + { |
|
| 511 | 510 | return $v != $set; |
| 512 | 511 | }); |
| 513 | 512 | } |
@@ -3518,7 +3517,6 @@ discard block |
||
| 3518 | 3517 | } |
| 3519 | 3518 | } |
| 3520 | 3519 | } |
| 3521 | - |
|
| 3522 | 3520 | elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar) |
| 3523 | 3521 | { |
| 3524 | 3522 | if ((isset($_FILES['attachment']['name']) && $_FILES['attachment']['name'] != '') || $downloadedExternalAvatar) |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | return false; |
| 93 | 93 | }, |
| 94 | 94 | 'utf8_version' => '8.0', |
| 95 | - 'utf8_version_check' => function (){ |
|
| 95 | + 'utf8_version_check' => function() { |
|
| 96 | 96 | global $db_connection; |
| 97 | 97 | $request = pg_query($db_connection, 'SELECT version()'); |
| 98 | 98 | list ($version) = pg_fetch_row($request); |
@@ -987,7 +987,7 @@ discard block |
||
| 987 | 987 | $incontext['continue'] = 1; |
| 988 | 988 | |
| 989 | 989 | // Check Postgres setting |
| 990 | - if ( $db_type === 'postgresql') |
|
| 990 | + if ($db_type === 'postgresql') |
|
| 991 | 991 | { |
| 992 | 992 | load_database(); |
| 993 | 993 | $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 | global $db_connection; |
| 75 | 78 | $request = pg_query($db_connection, 'SELECT version()'); |
| 76 | 79 | list ($version) = pg_fetch_row($request); |
@@ -92,7 +95,8 @@ discard block |
||
| 92 | 95 | return false; |
| 93 | 96 | }, |
| 94 | 97 | 'utf8_version' => '8.0', |
| 95 | - 'utf8_version_check' => function (){ |
|
| 98 | + 'utf8_version_check' => function () |
|
| 99 | + { |
|
| 96 | 100 | global $db_connection; |
| 97 | 101 | $request = pg_query($db_connection, 'SELECT version()'); |
| 98 | 102 | list ($version) = pg_fetch_row($request); |
@@ -1001,7 +1005,7 @@ discard block |
||
| 1001 | 1005 | { |
| 1002 | 1006 | $row = $smcFunc['db_fetch_assoc']($result); |
| 1003 | 1007 | if ($row['standard_conforming_strings'] !== 'on') |
| 1004 | - { |
|
| 1008 | + { |
|
| 1005 | 1009 | $incontext['continue'] = 0; |
| 1006 | 1010 | $incontext['error'] = $txt['error_pg_scs']; |
| 1007 | 1011 | } |
@@ -93,14 +93,14 @@ discard block |
||
| 93 | 93 | ), |
| 94 | 94 | 'ignore' => array( |
| 95 | 95 | 'label' => $report['ignore'] ? $txt['mc_reportedp_unignore'] : $txt['mc_reportedp_ignore'], |
| 96 | - 'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;ignore='.(int)!$report['ignore'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-ignore_token_var'].'='.$context['mod-report-ignore_token'], |
|
| 96 | + 'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;ignore=' . (int) !$report['ignore'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-ignore_token_var'] . '=' . $context['mod-report-ignore_token'], |
|
| 97 | 97 | 'javascript' => !$report['ignore'] ? ' data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '', |
| 98 | 98 | 'class' => 'you_sure', |
| 99 | 99 | 'icon' => 'ignore' |
| 100 | 100 | ), |
| 101 | 101 | 'close' => array( |
| 102 | 102 | 'label' => $context['view_closed'] ? $txt['mc_reportedp_open'] : $txt['mc_reportedp_close'], |
| 103 | - 'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;closed='.(int)!$report['closed'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-closed_token_var'].'='.$context['mod-report-closed_token'], |
|
| 103 | + 'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;closed=' . (int) !$report['closed'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-closed_token_var'] . '=' . $context['mod-report-closed_token'], |
|
| 104 | 104 | 'icon' => $context['view_closed'] ? 'folder' : 'close', |
| 105 | 105 | ), |
| 106 | 106 | ); |
@@ -109,8 +109,8 @@ discard block |
||
| 109 | 109 | if ($context['report_type'] == 'posts') |
| 110 | 110 | $context['reports'][$key]['quickbuttons']['delete'] = array( |
| 111 | 111 | 'label' => $txt['mc_reportedp_delete'], |
| 112 | - 'href' => $scripturl.'?action=deletemsg;topic='.$report['topic']['id'].'.0;msg='.$report['topic']['id_msg'].';modcenter;'.$context['session_var'].'='.$context['session_id'], |
|
| 113 | - 'javascript' => 'data-confirm="'.$txt['mc_reportedp_delete_confirm'].'"', |
|
| 112 | + 'href' => $scripturl . '?action=deletemsg;topic=' . $report['topic']['id'] . '.0;msg=' . $report['topic']['id_msg'] . ';modcenter;' . $context['session_var'] . '=' . $context['session_id'], |
|
| 113 | + 'javascript' => 'data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '"', |
|
| 114 | 114 | 'class' => 'you_sure', |
| 115 | 115 | 'icon' => 'delete', |
| 116 | 116 | 'show' => !$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards'])) |
@@ -118,9 +118,9 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | // Ban reported member/post author link |
| 120 | 120 | if ($context['report_type'] == 'members') |
| 121 | - $ban_link = $scripturl.'?action=admin;area=ban;sa=add;u='.$report['user']['id'].';'.$context['session_var'].'='.$context['session_id']; |
|
| 121 | + $ban_link = $scripturl . '?action=admin;area=ban;sa=add;u=' . $report['user']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']; |
|
| 122 | 122 | else |
| 123 | - $ban_link = $scripturl.'?action=admin;area=ban;sa=add'.(!empty($report['author']['id']) ? ';u='.$report['author']['id'] : ';msg='.$report['topic']['id_msg']).';'.$context['session_var'].'='.$context['session_id']; |
|
| 123 | + $ban_link = $scripturl . '?action=admin;area=ban;sa=add' . (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']) . ';' . $context['session_var'] . '=' . $context['session_id']; |
|
| 124 | 124 | |
| 125 | 125 | $context['reports'][$key]['quickbuttons'] += array( |
| 126 | 126 | 'ban' => array( |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | ), |
| 132 | 132 | 'quickmod' => array( |
| 133 | 133 | 'class' => 'inline_mod_check', |
| 134 | - 'content' => '<input type="checkbox" name="close[]" value="'.$report['id'].'">', |
|
| 134 | + 'content' => '<input type="checkbox" name="close[]" value="' . $report['id'] . '">', |
|
| 135 | 135 | 'show' => !$context['view_closed'] && !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 |
| 136 | 136 | ) |
| 137 | 137 | ); |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | global $context, $scripturl, $txt, $settings, $options, $modSettings; |
| 278 | 278 | |
| 279 | 279 | echo ' |
| 280 | - <div class="windowbg" id="msg', $message['id'],'"> |
|
| 280 | + <div class="windowbg" id="msg', $message['id'], '"> |
|
| 281 | 281 | <div class="post_wrapper"> |
| 282 | 282 | <div class="poster">'; |
| 283 | 283 | |
@@ -1959,7 +1959,7 @@ discard block |
||
| 1959 | 1959 | <div class="smalltext"> |
| 1960 | 1960 | <div class="recipient_to"><strong>', $txt['to'], ':</strong> ', implode(', ', $draft['recipients']['to']), '</div>'; |
| 1961 | 1961 | |
| 1962 | - if(!empty($draft['recipients']['bcc'])) |
|
| 1962 | + if (!empty($draft['recipients']['bcc'])) |
|
| 1963 | 1963 | echo' |
| 1964 | 1964 | <div class="pm_bbc"><strong>', $txt['pm_bcc'], ':</strong> ', implode(', ', $draft['recipients']['bcc']), '</div>'; |
| 1965 | 1965 | |