@@ -106,7 +106,7 @@ |
||
106 | 106 | if (!empty($context['custom_profile_fields']['columns'])) |
107 | 107 | foreach ($context['custom_profile_fields']['columns'] as $key => $column) |
108 | 108 | echo ' |
109 | - <td class="' , $key , ' centertext">', $member['options'][$key], '</td>'; |
|
109 | + <td class="' , $key, ' centertext">', $member['options'][$key], '</td>'; |
|
110 | 110 | |
111 | 111 | echo ' |
112 | 112 | </tr>'; |
@@ -328,7 +328,7 @@ |
||
328 | 328 | foreach ($context['error_info']['backtrace'] as $key => $value) |
329 | 329 | { |
330 | 330 | //Check for existing |
331 | - if (!property_exists($value,'file') || empty($value->file)) |
|
331 | + if (!property_exists($value, 'file') || empty($value->file)) |
|
332 | 332 | $value->file = $txt['unknown']; |
333 | 333 | if (!property_exists($value, 'line') || empty($value->line)) |
334 | 334 | $value->line = -1; |
@@ -841,13 +841,13 @@ discard block |
||
841 | 841 | // We're going to check that their board dir setting is right in case they've been moving stuff around. |
842 | 842 | if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => ''))) |
843 | 843 | $upcontext['warning'] = ' |
844 | - '. sprintf($txt['upgrade_boarddir_settings'], $boarddir, dirname(__FILE__)) .'<br> |
|
844 | + '. sprintf($txt['upgrade_boarddir_settings'], $boarddir, dirname(__FILE__)) . '<br> |
|
845 | 845 | <ul> |
846 | - <li>'. $txt['upgrade_boarddir'] .' ' . $boarddir . '</li> |
|
847 | - <li>'. $txt['upgrade_sourcedir'] .' ' . $boarddir . '</li> |
|
848 | - <li>'. $txt['upgrade_cachedir'] .' ' . $cachedir_temp . '</li> |
|
846 | + <li>'. $txt['upgrade_boarddir'] . ' ' . $boarddir . '</li> |
|
847 | + <li>'. $txt['upgrade_sourcedir'] . ' ' . $boarddir . '</li> |
|
848 | + <li>'. $txt['upgrade_cachedir'] . ' ' . $cachedir_temp . '</li> |
|
849 | 849 | </ul> |
850 | - '. $txt['upgrade_incorrect_settings'] .''; |
|
850 | + '. $txt['upgrade_incorrect_settings'] . ''; |
|
851 | 851 | |
852 | 852 | // Confirm mbstring is loaded... |
853 | 853 | if (!extension_loaded('mbstring')) |
@@ -1781,7 +1781,7 @@ discard block |
||
1781 | 1781 | |
1782 | 1782 | // Our custom error handler - does nothing but does stop public errors from XML! |
1783 | 1783 | set_error_handler( |
1784 | - function ($errno, $errstr, $errfile, $errline) use ($support_js) |
|
1784 | + function($errno, $errstr, $errfile, $errline) use ($support_js) |
|
1785 | 1785 | { |
1786 | 1786 | if ($support_js) |
1787 | 1787 | return true; |
@@ -2109,13 +2109,13 @@ discard block |
||
2109 | 2109 | |
2110 | 2110 | // Otherwise we have to display this somewhere appropriate if possible. |
2111 | 2111 | $upcontext['forced_error_message'] = ' |
2112 | - <strong>'. $txt['upgrade_unsuccessful'] .'</strong><br> |
|
2112 | + <strong>'. $txt['upgrade_unsuccessful'] . '</strong><br> |
|
2113 | 2113 | |
2114 | 2114 | <div style="margin: 2ex;"> |
2115 | - '. $txt['upgrade_thisquery'] .' |
|
2115 | + '. $txt['upgrade_thisquery'] . ' |
|
2116 | 2116 | <blockquote><pre>' . nl2br(htmlspecialchars(trim($string))) . ';</pre></blockquote> |
2117 | 2117 | |
2118 | - '. $txt['upgrade_causerror'] .' |
|
2118 | + '. $txt['upgrade_causerror'] . ' |
|
2119 | 2119 | <blockquote>' . nl2br(htmlspecialchars($db_error_message)) . '</blockquote> |
2120 | 2120 | </div> |
2121 | 2121 | |
@@ -2780,94 +2780,94 @@ discard block |
||
2780 | 2780 | // Translation table for the character sets not native for MySQL. |
2781 | 2781 | $translation_tables = array( |
2782 | 2782 | 'windows-1255' => array( |
2783 | - '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
2784 | - '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
2785 | - '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
2786 | - '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
2787 | - '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
2788 | - '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
2789 | - '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792', |
|
2790 | - '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF', |
|
2791 | - '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
2792 | - '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
2793 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
2794 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
2795 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
2796 | - '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
2797 | - '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
2798 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
2799 | - '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
2800 | - '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
2801 | - '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
2802 | - '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
2803 | - '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
2804 | - '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
2805 | - '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
2806 | - '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
2807 | - '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
2808 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
2809 | - '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
2810 | - '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
2811 | - '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
2812 | - '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
2813 | - '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
2814 | - '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
2815 | - '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
2816 | - '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
2817 | - '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
2818 | - '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
2819 | - '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
2820 | - '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
2821 | - '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
2822 | - '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
2823 | - '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
2824 | - '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
2783 | + '0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'', |
|
2784 | + '0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'', |
|
2785 | + '0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'', |
|
2786 | + '0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'', |
|
2787 | + '0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'', |
|
2788 | + '0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'', |
|
2789 | + '0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792', |
|
2790 | + '0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF', |
|
2791 | + '0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0', |
|
2792 | + '0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3', |
|
2793 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
2794 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
2795 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
2796 | + '0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', |
|
2797 | + '0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4', |
|
2798 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
2799 | + '0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB', |
|
2800 | + '0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE', |
|
2801 | + '0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781', |
|
2802 | + '0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2', |
|
2803 | + '0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C', |
|
2804 | + '0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F', |
|
2805 | + '0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2', |
|
2806 | + '0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6', |
|
2807 | + '0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9', |
|
2808 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
2809 | + '0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0', |
|
2810 | + '0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
2811 | + '0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2', |
|
2812 | + '0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3', |
|
2813 | + '0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6', |
|
2814 | + '0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9', |
|
2815 | + '0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD', |
|
2816 | + '0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780', |
|
2817 | + '0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794', |
|
2818 | + '0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799', |
|
2819 | + '0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099', |
|
2820 | + '0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86', |
|
2821 | + '0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093', |
|
2822 | + '0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397', |
|
2823 | + '0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796', |
|
2824 | + '0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4', |
|
2825 | 2825 | '0xFA' => '0xD7AA', |
2826 | 2826 | ), |
2827 | 2827 | 'windows-1253' => array( |
2828 | - '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
2829 | - '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
2830 | - '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
2831 | - '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
2832 | - '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
2833 | - '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E', |
|
2834 | - '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
2835 | - '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
2836 | - '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
2837 | - '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
2838 | - '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
2839 | - '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
2840 | - '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
2841 | - '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
2842 | - '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
2843 | - '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
2844 | - '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
2845 | - '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
2846 | - '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
2847 | - '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
2848 | - '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
2849 | - '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
2850 | - '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
2851 | - '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
2852 | - '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
2853 | - '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
2854 | - '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
2855 | - '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
2856 | - '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
2857 | - '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
2858 | - '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
2859 | - '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
2860 | - '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
2861 | - '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
2862 | - '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
2863 | - '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
2864 | - '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
2865 | - '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
2866 | - '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
2867 | - '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
2868 | - '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
2869 | - '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
2870 | - '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', |
|
2828 | + '0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'', |
|
2829 | + '0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'', |
|
2830 | + '0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'', |
|
2831 | + '0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'', |
|
2832 | + '0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'', |
|
2833 | + '0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E', |
|
2834 | + '0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C', |
|
2835 | + '0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90', |
|
2836 | + '0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C', |
|
2837 | + '0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA', |
|
2838 | + '0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC', |
|
2839 | + '0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF', |
|
2840 | + '0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2', |
|
2841 | + '0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4', |
|
2842 | + '0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7', |
|
2843 | + '0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB', |
|
2844 | + '0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE', |
|
2845 | + '0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3', |
|
2846 | + '0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7', |
|
2847 | + '0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2', |
|
2848 | + '0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6', |
|
2849 | + '0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86', |
|
2850 | + '0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89', |
|
2851 | + '0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2', |
|
2852 | + '0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D', |
|
2853 | + '0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094', |
|
2854 | + '0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84', |
|
2855 | + '0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94', |
|
2856 | + '0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692', |
|
2857 | + '0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B', |
|
2858 | + '0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3', |
|
2859 | + '0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6', |
|
2860 | + '0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9', |
|
2861 | + '0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD', |
|
2862 | + '0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0', |
|
2863 | + '0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4', |
|
2864 | + '0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7', |
|
2865 | + '0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80', |
|
2866 | + '0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83', |
|
2867 | + '0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86', |
|
2868 | + '0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89', |
|
2869 | + '0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C', |
|
2870 | + '0xFD' => '0xCF8D', '0xFE' => '0xCF8E', |
|
2871 | 2871 | ), |
2872 | 2872 | ); |
2873 | 2873 | |
@@ -3081,7 +3081,7 @@ discard block |
||
3081 | 3081 | |
3082 | 3082 | if ($upcontext['dropping_index'] && $command_line) |
3083 | 3083 | { |
3084 | - echo "\n" . '', $txt['upgrade_fulltext_error'] ,''; |
|
3084 | + echo "\n" . '', $txt['upgrade_fulltext_error'], ''; |
|
3085 | 3085 | flush(); |
3086 | 3086 | } |
3087 | 3087 | } |
@@ -3425,7 +3425,7 @@ discard block |
||
3425 | 3425 | { |
3426 | 3426 | echo ' |
3427 | 3427 | <div class="error"> |
3428 | - <p>', $txt['upgrade_writable_files'] ,'</p> |
|
3428 | + <p>', $txt['upgrade_writable_files'], '</p> |
|
3429 | 3429 | <ul class="error_content"> |
3430 | 3430 | <li>' . implode('</li> |
3431 | 3431 | <li>', $upcontext['chmod']['files']) . '</li> |
@@ -3791,12 +3791,12 @@ discard block |
||
3791 | 3791 | <div class="errorbox"> |
3792 | 3792 | <h3>', $txt['upgrade_warning'], '</h3> |
3793 | 3793 | <p>', sprintf($txt['upgrade_time_user'], $upcontext['user']['name']), '</p> |
3794 | - <p>', sprintf($txt[$agoTxt], $ago_seconds, $ago_minutes, $ago_hours), '</p> |
|
3794 | + <p>', sprintf($txt[$agoTxt], $ago_seconds, $ago_minutes, $ago_hours), '</p> |
|
3795 | 3795 | <p>', sprintf($txt[$updatedTxt], $updated_seconds, $updated_minutes, $updated_hours), '</p>'; |
3796 | 3796 | |
3797 | 3797 | if ($updated < 600) |
3798 | 3798 | echo ' |
3799 | - <p>', $txt['upgrade_run_script'], ' ', $upcontext['user']['name'],' ', $txt['upgrade_run_script2'], '</p>'; |
|
3799 | + <p>', $txt['upgrade_run_script'], ' ', $upcontext['user']['name'], ' ', $txt['upgrade_run_script2'], '</p>'; |
|
3800 | 3800 | |
3801 | 3801 | if ($updated > $upcontext['inactive_timeout']) |
3802 | 3802 | echo ' |
@@ -3905,7 +3905,7 @@ discard block |
||
3905 | 3905 | if (!empty($upcontext['upgrade_options_warning'])) |
3906 | 3906 | echo ' |
3907 | 3907 | <div class="errorbox"> |
3908 | - <h3>', $txt['upgrade_warning'] ,'</h3> |
|
3908 | + <h3>', $txt['upgrade_warning'], '</h3> |
|
3909 | 3909 | ', $upcontext['upgrade_options_warning'], ' |
3910 | 3910 | </div>'; |
3911 | 3911 | |
@@ -3969,7 +3969,7 @@ discard block |
||
3969 | 3969 | echo ' |
3970 | 3970 | <form action="', $upcontext['form_url'], '" name="upform" id="upform" method="post"> |
3971 | 3971 | <input type="hidden" name="backup_done" id="backup_done" value="0"> |
3972 | - <strong>', sprintf($txt['upgrade_completedtables_outof'], $upcontext['cur_table_num'], $upcontext['table_count']) ,'</strong> |
|
3972 | + <strong>', sprintf($txt['upgrade_completedtables_outof'], $upcontext['cur_table_num'], $upcontext['table_count']), '</strong> |
|
3973 | 3973 | <div id="debug_section"> |
3974 | 3974 | <span id="debuginfo"></span> |
3975 | 3975 | </div>'; |
@@ -295,7 +295,8 @@ discard block |
||
295 | 295 | // Call the step and if it returns false that means pause! |
296 | 296 | if (function_exists($step[2]) && $step[2]() === false) |
297 | 297 | break; |
298 | - elseif (function_exists($step[2])) { |
|
298 | + elseif (function_exists($step[2])) |
|
299 | + { |
|
299 | 300 | //Start each new step with this unset, so the 'normal' template is called first |
300 | 301 | unset($_GET['xml']); |
301 | 302 | //Clear out warnings at the start of each step |
@@ -2911,7 +2912,8 @@ discard block |
||
2911 | 2912 | $upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100); |
2912 | 2913 | |
2913 | 2914 | // Make sure we're ready & have painted the template before proceeding |
2914 | - if ($support_js && !isset($_GET['xml'])) { |
|
2915 | + if ($support_js && !isset($_GET['xml'])) |
|
2916 | + { |
|
2915 | 2917 | $_GET['substep'] = 0; |
2916 | 2918 | return false; |
2917 | 2919 | } |
@@ -2964,7 +2966,8 @@ discard block |
||
2964 | 2966 | list($charset) = explode('_', $collation); |
2965 | 2967 | |
2966 | 2968 | // Build structure of columns to operate on organized by charset; only operate on columns not yet utf8 |
2967 | - if ($charset != 'utf8') { |
|
2969 | + if ($charset != 'utf8') |
|
2970 | + { |
|
2968 | 2971 | if (!isset($table_charsets[$charset])) |
2969 | 2972 | $table_charsets[$charset] = array(); |
2970 | 2973 |
@@ -3388,7 +3388,7 @@ discard block |
||
3388 | 3388 | |
3389 | 3389 | $regex = <<<'EOT' |
3390 | 3390 | (\s*#\s*Make\s+sure\s+the\s+paths\s+are\s+correct\.\.\.\s+at\s+least\s+try\s+to\s+fix\s+them\.\s+)?if\s*\(\!file_exists\(\$boarddir\)\s+&&\s+file_exists\(dirname\(__FILE__\)\s+\.\s+'/agreement\.txt'\)\)\s+\$boarddir\s*\=\s*dirname\(__FILE__\);\s+if\s*\(\!file_exists\(\$sourcedir\)\s+&&\s+file_exists\(\$boarddir\s*\.\s*'/Sources'\)\)\s+\$sourcedir\s*\=\s*\$boarddir\s*\.\s*'/Sources';\s+if\s*\(\!file_exists\(\$cachedir\)\s+&&\s+file_exists\(\$boarddir\s*\.\s*'/cache'\)\)\s+\$cachedir\s*\=\s*\$boarddir\s*\.\s*'/cache'; |
3391 | -EOT; |
|
3391 | +eot; |
|
3392 | 3392 | |
3393 | 3393 | $replacement = <<<'EOT' |
3394 | 3394 | # Make sure the paths are correct... at least try to fix them. |
@@ -3400,7 +3400,7 @@ discard block |
||
3400 | 3400 | $cachedir = $boarddir . '/cache'; |
3401 | 3401 | |
3402 | 3402 | |
3403 | -EOT; |
|
3403 | +eot; |
|
3404 | 3404 | |
3405 | 3405 | if (preg_match('~' . $regex . '~', $settings) && preg_match('~(#+\s*Error-Catching\s*#+)~', $settings)) |
3406 | 3406 | { |
@@ -19,13 +19,13 @@ discard block |
||
19 | 19 | { |
20 | 20 | /** |
21 | 21 | * Constants for receiving email notfications. |
22 | - */ |
|
22 | + */ |
|
23 | 23 | const RECEIVE_NOTIFY_EMAIL = 0x02; |
24 | 24 | const RECEIVE_NOTIFY_ALERT = 0x01; |
25 | 25 | |
26 | 26 | /** |
27 | 27 | * Constants for reply types. |
28 | - */ |
|
28 | + */ |
|
29 | 29 | const NOTIFY_TYPE_REPLY_AND_MODIFY = 1; |
30 | 30 | const NOTIFY_TYPE_REPLY_AND_TOPIC_START_FOLLOWING = 2; |
31 | 31 | const NOTIFY_TYPE_ONLY_REPLIES = 3; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | /** |
35 | 35 | * Constants for frequencies. |
36 | - */ |
|
36 | + */ |
|
37 | 37 | const FREQUENCY_NOTHING = 0; |
38 | 38 | const FREQUENCY_EVERYTHING = 1; |
39 | 39 | const FREQUENCY_FIRST_UNREAD_MSG = 2; |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | const FREQUENCY_WEEKLY_DIGEST = 4; |
42 | 42 | |
43 | 43 | /** |
44 | - * This handles notifications when a new post is created - new topic, reply, quotes and mentions. |
|
44 | + * This handles notifications when a new post is created - new topic, reply, quotes and mentions. |
|
45 | 45 | * @return bool Always returns true |
46 | 46 | */ |
47 | 47 | public function execute() |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | <div id="recent" class="main_section"> |
22 | 22 | <div class="cat_bar"> |
23 | 23 | <h3 class="catbg"> |
24 | - <span class="xx"></span>',$txt['recent_posts'],' |
|
24 | + <span class="xx"></span>',$txt['recent_posts'], ' |
|
25 | 25 | </h3> |
26 | 26 | </div> |
27 | 27 | <div class="pagesection">', $context['page_index'], '</div>'; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | <p class="floatleft"> |
165 | 165 | ', $topic['first_post']['started_by'], ' |
166 | 166 | </p> |
167 | - ', !empty($topic['pages']) ? '<span id="pages'.$topic['first_post']['id'].'" class="topic_pages">'.$topic['pages'].'</span>' : '', ' |
|
167 | + ', !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">' . $topic['pages'] . '</span>' : '', ' |
|
168 | 168 | </div><!-- .info --> |
169 | 169 | <div class="board_stats centertext"> |
170 | 170 | <p> |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | <p class="floatleft"> |
316 | 316 | ', $topic['first_post']['started_by'], ' |
317 | 317 | </p> |
318 | - ', !empty($topic['pages']) ? '<span id="pages'.$topic['first_post']['id'].'" class="topic_pages">'.$topic['pages'].'</span>' : '', ' |
|
318 | + ', !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">' . $topic['pages'] . '</span>' : '', ' |
|
319 | 319 | </div><!-- .info --> |
320 | 320 | <div class="board_stats centertext"> |
321 | 321 | <p> |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic) |
247 | 247 | WHERE t.id_topic IS NULL |
248 | 248 | GROUP BY m.id_topic, m.id_board', |
249 | - 'fix_processing' => function ($row) use ($smcFunc) |
|
249 | + 'fix_processing' => function($row) use ($smcFunc) |
|
250 | 250 | { |
251 | 251 | global $salvageBoardID; |
252 | 252 | |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | // Remove all topics that have zero messages in the messages table. |
333 | 333 | 'fix_collect' => array( |
334 | 334 | 'index' => 'id_topic', |
335 | - 'process' => function ($topics) use ($smcFunc) |
|
335 | + 'process' => function($topics) use ($smcFunc) |
|
336 | 336 | { |
337 | 337 | $smcFunc['db_query']('', ' |
338 | 338 | DELETE FROM {db_prefix}topics |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | AND p.id_poll IS NULL |
370 | 370 | GROUP BY o.id_poll, t.id_topic, t.id_board, t.id_member_started, m.member_name |
371 | 371 | ', |
372 | - 'fix_processing' => function ($row) use ($smcFunc, $txt) |
|
372 | + 'fix_processing' => function($row) use ($smcFunc, $txt) |
|
373 | 373 | { |
374 | 374 | global $salvageBoardID; |
375 | 375 | |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll) |
507 | 507 | WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH} |
508 | 508 | AND t.id_poll IS NULL', |
509 | - 'fix_processing' => function ($row) use ($smcFunc, $txt) |
|
509 | + 'fix_processing' => function($row) use ($smcFunc, $txt) |
|
510 | 510 | { |
511 | 511 | global $salvageBoardID; |
512 | 512 | |
@@ -617,7 +617,7 @@ discard block |
||
617 | 617 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
618 | 618 | GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved |
619 | 619 | ORDER BY t.id_topic', |
620 | - 'fix_processing' => function ($row) use ($smcFunc) |
|
620 | + 'fix_processing' => function($row) use ($smcFunc) |
|
621 | 621 | { |
622 | 622 | $row['firstmsg_approved'] = (int) $row['firstmsg_approved']; |
623 | 623 | $row['myid_first_msg'] = (int) $row['myid_first_msg']; |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | ) |
647 | 647 | ); |
648 | 648 | }, |
649 | - 'message_function' => function ($row) use ($txt, &$context) |
|
649 | + 'message_function' => function($row) use ($txt, &$context) |
|
650 | 650 | { |
651 | 651 | // A pretend error? |
652 | 652 | if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) |
@@ -680,7 +680,7 @@ discard block |
||
680 | 680 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
681 | 681 | GROUP BY t.id_topic, t.num_replies, mf.approved |
682 | 682 | ORDER BY t.id_topic', |
683 | - 'fix_processing' => function ($row) |
|
683 | + 'fix_processing' => function($row) |
|
684 | 684 | { |
685 | 685 | global $smcFunc; |
686 | 686 | $row['my_num_replies'] = (int) $row['my_num_replies']; |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | ) |
700 | 700 | ); |
701 | 701 | }, |
702 | - 'message_function' => function ($row) |
|
702 | + 'message_function' => function($row) |
|
703 | 703 | { |
704 | 704 | global $txt, $context; |
705 | 705 | |
@@ -730,7 +730,7 @@ discard block |
||
730 | 730 | GROUP BY t.id_topic, t.unapproved_posts |
731 | 731 | HAVING unapproved_posts != COUNT(mu.id_msg) |
732 | 732 | ORDER BY t.id_topic', |
733 | - 'fix_processing' => function ($row) |
|
733 | + 'fix_processing' => function($row) |
|
734 | 734 | { |
735 | 735 | global $smcFunc; |
736 | 736 | $row['my_unapproved_posts'] = (int) $row['my_unapproved_posts']; |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | WHERE b.id_board IS NULL |
771 | 771 | AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
772 | 772 | GROUP BY t.id_board', |
773 | - 'fix_processing' => function ($row) |
|
773 | + 'fix_processing' => function($row) |
|
774 | 774 | { |
775 | 775 | global $smcFunc, $salvageCatID, $txt; |
776 | 776 | createSalvageArea(); |
@@ -817,7 +817,7 @@ discard block |
||
817 | 817 | ORDER BY b.id_cat, b.id_board', |
818 | 818 | 'fix_collect' => array( |
819 | 819 | 'index' => 'id_cat', |
820 | - 'process' => function ($cats) |
|
820 | + 'process' => function($cats) |
|
821 | 821 | { |
822 | 822 | global $smcFunc, $salvageCatID; |
823 | 823 | createSalvageArea(); |
@@ -853,7 +853,7 @@ discard block |
||
853 | 853 | // Last step-make sure all non-guest posters still exist. |
854 | 854 | 'fix_collect' => array( |
855 | 855 | 'index' => 'id_msg', |
856 | - 'process' => function ($msgs) |
|
856 | + 'process' => function($msgs) |
|
857 | 857 | { |
858 | 858 | global $smcFunc; |
859 | 859 | $smcFunc['db_query']('', ' |
@@ -880,7 +880,7 @@ discard block |
||
880 | 880 | ORDER BY b.id_parent, b.id_board', |
881 | 881 | 'fix_collect' => array( |
882 | 882 | 'index' => 'id_parent', |
883 | - 'process' => function ($parents) |
|
883 | + 'process' => function($parents) |
|
884 | 884 | { |
885 | 885 | global $smcFunc, $salvageBoardID, $salvageCatID; |
886 | 886 | |
@@ -917,7 +917,7 @@ discard block |
||
917 | 917 | AND p.id_poll IS NULL', |
918 | 918 | 'fix_collect' => array( |
919 | 919 | 'index' => 'id_poll', |
920 | - 'process' => function ($polls) |
|
920 | + 'process' => function($polls) |
|
921 | 921 | { |
922 | 922 | global $smcFunc; |
923 | 923 | $smcFunc['db_query']('', ' |
@@ -949,7 +949,7 @@ discard block |
||
949 | 949 | ORDER BY cal.id_topic', |
950 | 950 | 'fix_collect' => array( |
951 | 951 | 'index' => 'id_topic', |
952 | - 'process' => function ($events) |
|
952 | + 'process' => function($events) |
|
953 | 953 | { |
954 | 954 | global $smcFunc; |
955 | 955 | $smcFunc['db_query']('', ' |
@@ -979,7 +979,7 @@ discard block |
||
979 | 979 | AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}', |
980 | 980 | 'fix_collect' => array( |
981 | 981 | 'index' => 'id_topic', |
982 | - 'process' => function ($topics) |
|
982 | + 'process' => function($topics) |
|
983 | 983 | { |
984 | 984 | global $smcFunc; |
985 | 985 | $smcFunc['db_query']('', ' |
@@ -1009,7 +1009,7 @@ discard block |
||
1009 | 1009 | GROUP BY lt.id_member', |
1010 | 1010 | 'fix_collect' => array( |
1011 | 1011 | 'index' => 'id_member', |
1012 | - 'process' => function ($members) |
|
1012 | + 'process' => function($members) |
|
1013 | 1013 | { |
1014 | 1014 | global $smcFunc; |
1015 | 1015 | $smcFunc['db_query']('', ' |
@@ -1039,7 +1039,7 @@ discard block |
||
1039 | 1039 | GROUP BY lb.id_board', |
1040 | 1040 | 'fix_collect' => array( |
1041 | 1041 | 'index' => 'id_board', |
1042 | - 'process' => function ($boards) |
|
1042 | + 'process' => function($boards) |
|
1043 | 1043 | { |
1044 | 1044 | global $smcFunc; |
1045 | 1045 | $smcFunc['db_query']('', ' |
@@ -1069,7 +1069,7 @@ discard block |
||
1069 | 1069 | GROUP BY lb.id_member', |
1070 | 1070 | 'fix_collect' => array( |
1071 | 1071 | 'index' => 'id_member', |
1072 | - 'process' => function ($members) use ($smcFunc) |
|
1072 | + 'process' => function($members) use ($smcFunc) |
|
1073 | 1073 | { |
1074 | 1074 | $smcFunc['db_query']('', ' |
1075 | 1075 | DELETE FROM {db_prefix}log_boards |
@@ -1098,7 +1098,7 @@ discard block |
||
1098 | 1098 | GROUP BY lmr.id_board', |
1099 | 1099 | 'fix_collect' => array( |
1100 | 1100 | 'index' => 'id_board', |
1101 | - 'process' => function ($boards) use ($smcFunc) |
|
1101 | + 'process' => function($boards) use ($smcFunc) |
|
1102 | 1102 | { |
1103 | 1103 | $smcFunc['db_query']('', ' |
1104 | 1104 | DELETE FROM {db_prefix}log_mark_read |
@@ -1127,7 +1127,7 @@ discard block |
||
1127 | 1127 | GROUP BY lmr.id_member', |
1128 | 1128 | 'fix_collect' => array( |
1129 | 1129 | 'index' => 'id_member', |
1130 | - 'process' => function ($members) use ($smcFunc) |
|
1130 | + 'process' => function($members) use ($smcFunc) |
|
1131 | 1131 | { |
1132 | 1132 | $smcFunc['db_query']('', ' |
1133 | 1133 | DELETE FROM {db_prefix}log_mark_read |
@@ -1156,7 +1156,7 @@ discard block |
||
1156 | 1156 | GROUP BY pmr.id_pm', |
1157 | 1157 | 'fix_collect' => array( |
1158 | 1158 | 'index' => 'id_pm', |
1159 | - 'process' => function ($pms) use ($smcFunc) |
|
1159 | + 'process' => function($pms) use ($smcFunc) |
|
1160 | 1160 | { |
1161 | 1161 | $smcFunc['db_query']('', ' |
1162 | 1162 | DELETE FROM {db_prefix}pm_recipients |
@@ -1186,7 +1186,7 @@ discard block |
||
1186 | 1186 | GROUP BY pmr.id_member', |
1187 | 1187 | 'fix_collect' => array( |
1188 | 1188 | 'index' => 'id_member', |
1189 | - 'process' => function ($members) |
|
1189 | + 'process' => function($members) |
|
1190 | 1190 | { |
1191 | 1191 | global $smcFunc; |
1192 | 1192 | $smcFunc['db_query']('', ' |
@@ -1216,7 +1216,7 @@ discard block |
||
1216 | 1216 | AND mem.id_member IS NULL', |
1217 | 1217 | 'fix_collect' => array( |
1218 | 1218 | 'index' => 'id_pm', |
1219 | - 'process' => function ($guestMessages) |
|
1219 | + 'process' => function($guestMessages) |
|
1220 | 1220 | { |
1221 | 1221 | global $smcFunc; |
1222 | 1222 | $smcFunc['db_query']('', ' |
@@ -1246,7 +1246,7 @@ discard block |
||
1246 | 1246 | GROUP BY ln.id_member', |
1247 | 1247 | 'fix_collect' => array( |
1248 | 1248 | 'index' => 'id_member', |
1249 | - 'process' => function ($members) use ($smcFunc) |
|
1249 | + 'process' => function($members) use ($smcFunc) |
|
1250 | 1250 | { |
1251 | 1251 | $smcFunc['db_query']('', ' |
1252 | 1252 | DELETE FROM {db_prefix}log_notify |
@@ -1273,7 +1273,7 @@ discard block |
||
1273 | 1273 | LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic) |
1274 | 1274 | WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH} |
1275 | 1275 | AND lss.id_topic IS NULL', |
1276 | - 'fix_full_processing' => function ($result) |
|
1276 | + 'fix_full_processing' => function($result) |
|
1277 | 1277 | { |
1278 | 1278 | global $smcFunc; |
1279 | 1279 | |
@@ -1302,7 +1302,7 @@ discard block |
||
1302 | 1302 | array('word', 'id_topic') |
1303 | 1303 | ); |
1304 | 1304 | }, |
1305 | - 'message_function' => function ($row) |
|
1305 | + 'message_function' => function($row) |
|
1306 | 1306 | { |
1307 | 1307 | global $txt, $context; |
1308 | 1308 | |
@@ -1330,7 +1330,7 @@ discard block |
||
1330 | 1330 | AND t.id_topic IS NULL', |
1331 | 1331 | 'fix_collect' => array( |
1332 | 1332 | 'index' => 'id_topic', |
1333 | - 'process' => function ($deleteTopics) |
|
1333 | + 'process' => function($deleteTopics) |
|
1334 | 1334 | { |
1335 | 1335 | global $smcFunc; |
1336 | 1336 | $smcFunc['db_query']('', ' |
@@ -1360,7 +1360,7 @@ discard block |
||
1360 | 1360 | AND mem.id_member IS NULL', |
1361 | 1361 | 'fix_collect' => array( |
1362 | 1362 | 'index' => 'id_member', |
1363 | - 'process' => function ($members) |
|
1363 | + 'process' => function($members) |
|
1364 | 1364 | { |
1365 | 1365 | global $smcFunc; |
1366 | 1366 | $smcFunc['db_query']('', ' |
@@ -1389,7 +1389,7 @@ discard block |
||
1389 | 1389 | AND p.id_poll IS NULL', |
1390 | 1390 | 'fix_collect' => array( |
1391 | 1391 | 'index' => 'id_poll', |
1392 | - 'process' => function ($polls) |
|
1392 | + 'process' => function($polls) |
|
1393 | 1393 | { |
1394 | 1394 | global $smcFunc; |
1395 | 1395 | $smcFunc['db_query']('', ' |
@@ -1418,7 +1418,7 @@ discard block |
||
1418 | 1418 | AND lrc.id_report IS NULL', |
1419 | 1419 | 'fix_collect' => array( |
1420 | 1420 | 'index' => 'id_report', |
1421 | - 'process' => function ($reports) |
|
1421 | + 'process' => function($reports) |
|
1422 | 1422 | { |
1423 | 1423 | global $smcFunc; |
1424 | 1424 | $smcFunc['db_query']('', ' |
@@ -1447,7 +1447,7 @@ discard block |
||
1447 | 1447 | AND lr.id_report IS NULL', |
1448 | 1448 | 'fix_collect' => array( |
1449 | 1449 | 'index' => 'id_report', |
1450 | - 'process' => function ($reports) |
|
1450 | + 'process' => function($reports) |
|
1451 | 1451 | { |
1452 | 1452 | global $smcFunc; |
1453 | 1453 | $smcFunc['db_query']('', ' |
@@ -1477,7 +1477,7 @@ discard block |
||
1477 | 1477 | GROUP BY lgr.id_member', |
1478 | 1478 | 'fix_collect' => array( |
1479 | 1479 | 'index' => 'id_member', |
1480 | - 'process' => function ($members) |
|
1480 | + 'process' => function($members) |
|
1481 | 1481 | { |
1482 | 1482 | global $smcFunc; |
1483 | 1483 | $smcFunc['db_query']('', ' |
@@ -1507,7 +1507,7 @@ discard block |
||
1507 | 1507 | GROUP BY lgr.id_group', |
1508 | 1508 | 'fix_collect' => array( |
1509 | 1509 | 'index' => 'id_group', |
1510 | - 'process' => function ($groups) |
|
1510 | + 'process' => function($groups) |
|
1511 | 1511 | { |
1512 | 1512 | global $smcFunc; |
1513 | 1513 | $smcFunc['db_query']('', ' |
@@ -1129,7 +1129,7 @@ |
||
1129 | 1129 | '{db_prefix}log_subscribed', |
1130 | 1130 | array( |
1131 | 1131 | 'id_subscribe' => 'int', 'id_member' => 'int', 'old_id_group' => 'int', 'start_time' => 'int', |
1132 | - 'end_time' => 'int', 'status' => 'int','pending_details' => 'string-65534' |
|
1132 | + 'end_time' => 'int', 'status' => 'int', 'pending_details' => 'string-65534' |
|
1133 | 1133 | ), |
1134 | 1134 | array( |
1135 | 1135 | $context['sub_id'], $id_member, $id_group, $starttime, |
@@ -401,8 +401,8 @@ discard block |
||
401 | 401 | <div class="bar"></div> |
402 | 402 | </div> |
403 | 403 | <div class="attach-ui"> |
404 | - <a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a> |
|
405 | - <a class="button upload">', $txt['upload'] ,'</a> |
|
404 | + <a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a> |
|
405 | + <a class="button upload">', $txt['upload'], '</a> |
|
406 | 406 | </div> |
407 | 407 | </div><!-- .attach-info --> |
408 | 408 | </div><!-- #au-template --> |
@@ -419,10 +419,10 @@ discard block |
||
419 | 419 | </dt> |
420 | 420 | <dd class="smalltext fallback"> |
421 | 421 | <div id="attachUpload" class="descbox"> |
422 | - <h5>', $txt['attach_drop_zone'] ,'</h5> |
|
423 | - <a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a> |
|
424 | - <a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a> |
|
425 | - <a class="button fileinput-button">', $txt['attach_add'] ,'</a> |
|
422 | + <h5>', $txt['attach_drop_zone'], '</h5> |
|
423 | + <a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a> |
|
424 | + <a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a> |
|
425 | + <a class="button fileinput-button">', $txt['attach_add'], '</a> |
|
426 | 426 | <div id="total-progress" class="progress_bar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"> |
427 | 427 | <div class="bar"></div> |
428 | 428 | </div> |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | // Option to delete an event if user is editing one. |
533 | 533 | if ($context['make_event'] && !$context['event']['new']) |
534 | 534 | echo ' |
535 | - <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">'; |
|
535 | + <input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">'; |
|
536 | 536 | |
537 | 537 | echo ' |
538 | 538 | </span> |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | |
575 | 575 | $newPostsHTML .= ' |
576 | 576 | <br class="clear"> |
577 | - <div id="msg_%PostID%_ignored_prompt" class="smalltext" style="display: none;">' . $txt['ignoring_user'] . '<a href="#" id="msg_%PostID%_ignored_link" style="%IgnoredStyle%">' . $txt['show_ignore_user_post'] . '</a></div> |
|
577 | + <div id="msg_%PostID%_ignored_prompt" class="smalltext" style="display: none;">' . $txt['ignoring_user'] . '<a href="#" id="msg_%PostID%_ignored_link" style="%IgnoredStyle%">' . $txt['show_ignore_user_post'] . '</a></div> |
|
578 | 578 | <div class="list_posts smalltext" id="msg_%PostID%_body">%PostBody%</div> |
579 | 579 | </div>'; |
580 | 580 | |
@@ -660,7 +660,7 @@ discard block |
||
660 | 660 | });'; |
661 | 661 | |
662 | 662 | echo ' |
663 | - var oEditorID = "', $context['post_box_name'] ,'"; |
|
663 | + var oEditorID = "', $context['post_box_name'], '"; |
|
664 | 664 | var oEditorObject = oEditorHandle_', $context['post_box_name'], '; |
665 | 665 | </script>'; |
666 | 666 | |
@@ -692,7 +692,7 @@ discard block |
||
692 | 692 | if ($context['can_quote']) |
693 | 693 | echo ' |
694 | 694 | <ul class="quickbuttons" id="msg_', $post['id'], '_quote"> |
695 | - <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li> |
|
695 | + <li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li> |
|
696 | 696 | <li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li> |
697 | 697 | </ul>'; |
698 | 698 | |
@@ -777,7 +777,7 @@ discard block |
||
777 | 777 | <head> |
778 | 778 | <meta charset="', $context['character_set'], '"> |
779 | 779 | <title>', $txt['spell_check'], '</title> |
780 | - <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'"> |
|
780 | + <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '"> |
|
781 | 781 | <style> |
782 | 782 | body, td { |
783 | 783 | font-size: small; |
@@ -807,8 +807,8 @@ discard block |
||
807 | 807 | var spell_formname = window.opener.spell_formname; |
808 | 808 | var spell_fieldname = window.opener.spell_fieldname; |
809 | 809 | </script> |
810 | - <script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script> |
|
811 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> |
|
810 | + <script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script> |
|
811 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> |
|
812 | 812 | <script> |
813 | 813 | ', $context['spell_js'], ' |
814 | 814 | </script> |
@@ -852,7 +852,7 @@ discard block |
||
852 | 852 | <head> |
853 | 853 | <meta charset="', $context['character_set'], '"> |
854 | 854 | <title>', $txt['retrieving_quote'], '</title> |
855 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> |
|
855 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> |
|
856 | 856 | </head> |
857 | 857 | <body> |
858 | 858 | ', $txt['retrieving_quote'], ' |
@@ -1774,7 +1774,7 @@ discard block |
||
1774 | 1774 | call_integration_hook('integrate_pre_load_theme', array(&$id_theme)); |
1775 | 1775 | |
1776 | 1776 | // We already load the basic stuff? |
1777 | - if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme ) |
|
1777 | + if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme) |
|
1778 | 1778 | { |
1779 | 1779 | $member = empty($user_info['id']) ? -1 : $user_info['id']; |
1780 | 1780 | |
@@ -1799,7 +1799,7 @@ discard block |
||
1799 | 1799 | SELECT variable, value, id_member, id_theme |
1800 | 1800 | FROM {db_prefix}themes |
1801 | 1801 | WHERE id_member' . (empty($themeData[0]) ? ' IN (-1, 0, {int:id_member})' : ' = {int:id_member}') . ' |
1802 | - AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') .' |
|
1802 | + AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') . ' |
|
1803 | 1803 | ORDER BY id_theme asc', |
1804 | 1804 | array( |
1805 | 1805 | 'id_theme' => $id_theme, |
@@ -2029,7 +2029,7 @@ discard block |
||
2029 | 2029 | if (!isset($context['javascript_vars'])) |
2030 | 2030 | $context['javascript_vars'] = array(); |
2031 | 2031 | |
2032 | - $context['login_url'] = $scripturl . '?action=login2'; |
|
2032 | + $context['login_url'] = $scripturl . '?action=login2'; |
|
2033 | 2033 | $context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | '; |
2034 | 2034 | $context['session_var'] = $_SESSION['session_var']; |
2035 | 2035 | $context['session_id'] = $_SESSION['session_value']; |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | // Set a list of common functions. |
79 | 79 | $ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);'; |
80 | 80 | $ent_check = empty($modSettings['disableEntityCheck']) ? function($string) |
81 | - { |
|
81 | + { |
|
82 | 82 | $string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string); |
83 | 83 | return $string; |
84 | 84 | } : function($string) |
@@ -2131,7 +2131,6 @@ discard block |
||
2131 | 2131 | loadLanguage('index+Modifications'); |
2132 | 2132 | $context['template_layers'] = array(); |
2133 | 2133 | } |
2134 | - |
|
2135 | 2134 | else |
2136 | 2135 | { |
2137 | 2136 | // Custom templates to load, or just default? |
@@ -2510,14 +2509,12 @@ discard block |
||
2510 | 2509 | $fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']); |
2511 | 2510 | $filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']); |
2512 | 2511 | } |
2513 | - |
|
2514 | 2512 | else |
2515 | 2513 | { |
2516 | 2514 | $fileUrl = false; |
2517 | 2515 | $filePath = false; |
2518 | 2516 | } |
2519 | 2517 | } |
2520 | - |
|
2521 | 2518 | else |
2522 | 2519 | { |
2523 | 2520 | $fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']); |
@@ -2618,14 +2615,12 @@ discard block |
||
2618 | 2615 | $fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']); |
2619 | 2616 | $filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']); |
2620 | 2617 | } |
2621 | - |
|
2622 | 2618 | else |
2623 | 2619 | { |
2624 | 2620 | $fileUrl = false; |
2625 | 2621 | $filePath = false; |
2626 | 2622 | } |
2627 | 2623 | } |
2628 | - |
|
2629 | 2624 | else |
2630 | 2625 | { |
2631 | 2626 | $fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']); |