From bfd5f175d24ac123d32793ea6208f849857823a2 Mon Sep 17 00:00:00 2001 From: Gigik Date: Fri, 27 Feb 2015 19:57:34 +0100 Subject: [PATCH] =?UTF-8?q?Aktualizacja=20plik=C3=B3w=20MyBB=20i=20t=C5=82?= =?UTF-8?q?umaczenia=20dla=20PPM=201.8.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Upload/admin/inc/class_form.php | 9 +- Upload/admin/inc/class_page.php | 76 +- Upload/admin/inc/class_table.php | 34 +- Upload/admin/inc/functions.php | 8 +- Upload/admin/inc/functions_themes.php | 44 +- Upload/admin/inc/functions_view_manager.php | 38 +- Upload/admin/index.php | 130 +- .../codemirror/addon/dialog/dialog.js | 50 +- .../codemirror/addon/fold/foldcode.js | 4 + .../codemirror/addon/fold/foldgutter.js | 6 +- .../jscripts/codemirror/addon/fold/index.html | 8 + .../codemirror/addon/fold/xml-fold.js | 3 +- .../addon/search/match-highlighter.js | 32 +- .../addon/search/matchesonscrollbar.css | 8 + .../addon/search/matchesonscrollbar.js | 90 + .../codemirror/addon/search/search.js | 20 +- .../codemirror/addon/search/searchcursor.js | 2 +- .../jscripts/codemirror/lib/codemirror.css | 36 +- .../jscripts/codemirror/lib/codemirror.js | 1499 ++-- .../admin/jscripts/codemirror/mode/css/css.js | 12 +- .../jscripts/codemirror/mode/css/index.html | 78 +- .../jscripts/codemirror/mode/css/less.html | 4 +- .../jscripts/codemirror/mode/css/scss.html | 4 +- .../codemirror/mode/htmlmixed/htmlmixed.js | 5 +- .../codemirror/mode/htmlmixed/index.html | 93 +- .../codemirror/mode/javascript/index.html | 117 +- .../codemirror/mode/javascript/javascript.js | 33 +- .../codemirror/mode/javascript/json-ld.html | 4 +- .../codemirror/mode/javascript/test.js | 19 + .../mode/javascript/typescript.html | 4 +- .../jscripts/codemirror/mode/xml/index.html | 65 +- .../admin/jscripts/codemirror/mode/xml/xml.js | 2 +- .../jscripts/codemirror/theme/index.html | 118 +- .../admin/jscripts/codemirror/theme/mybb.css | 4 +- .../jqueryui/css/redmond/jquery-ui.min.css | 4 +- .../css/redmond/jquery-ui.structure.min.css | 4 +- .../css/redmond/jquery-ui.theme.min.css | 4 +- .../jscripts/jqueryui/js/jquery-ui.min.js | 8 +- Upload/admin/jscripts/peeker.js | 26 +- Upload/admin/jscripts/tabs.js | 7 + Upload/admin/jscripts/themes.js | 250 +- .../admin/modules/config/attachment_types.php | 34 +- Upload/admin/modules/config/badwords.php | 4 +- Upload/admin/modules/config/banning.php | 10 +- Upload/admin/modules/config/calendars.php | 38 +- .../admin/modules/config/help_documents.php | 60 +- Upload/admin/modules/config/languages.php | 4 +- Upload/admin/modules/config/mod_tools.php | 92 +- Upload/admin/modules/config/mycode.php | 28 +- Upload/admin/modules/config/plugins.php | 2 +- Upload/admin/modules/config/post_icons.php | 16 +- .../admin/modules/config/profile_fields.php | 88 +- Upload/admin/modules/config/questions.php | 12 +- Upload/admin/modules/config/settings.php | 156 +- Upload/admin/modules/config/smilies.php | 35 +- Upload/admin/modules/config/spiders.php | 12 +- .../admin/modules/config/thread_prefixes.php | 6 +- Upload/admin/modules/config/warning.php | 48 +- Upload/admin/modules/forum/announcements.php | 48 +- Upload/admin/modules/forum/attachments.php | 41 +- Upload/admin/modules/forum/management.php | 204 +- .../admin/modules/forum/moderation_queue.php | 6 +- Upload/admin/modules/home/credits.php | 16 +- Upload/admin/modules/home/index.php | 7 +- Upload/admin/modules/home/preferences.php | 87 +- Upload/admin/modules/style/templates.php | 134 +- Upload/admin/modules/style/themes.php | 100 +- Upload/admin/modules/tools/adminlog.php | 17 +- Upload/admin/modules/tools/cache.php | 6 +- Upload/admin/modules/tools/mailerrors.php | 24 +- Upload/admin/modules/tools/maillogs.php | 17 +- Upload/admin/modules/tools/modlog.php | 16 +- Upload/admin/modules/tools/optimizedb.php | 2 +- .../admin/modules/tools/recount_rebuild.php | 90 +- Upload/admin/modules/tools/spamlog.php | 70 +- Upload/admin/modules/tools/statistics.php | 14 +- Upload/admin/modules/tools/tasks.php | 32 +- Upload/admin/modules/tools/warninglog.php | 10 +- .../admin/modules/user/admin_permissions.php | 10 +- Upload/admin/modules/user/banning.php | 24 +- .../admin/modules/user/group_promotions.php | 78 +- Upload/admin/modules/user/groups.php | 255 +- Upload/admin/modules/user/mass_mail.php | 50 +- Upload/admin/modules/user/titles.php | 32 +- Upload/admin/modules/user/users.php | 173 +- Upload/admin/styles/default/main.css | 6 + Upload/announcements.php | 4 +- Upload/archive/global.php | 7 + Upload/attachment.php | 16 +- Upload/calendar.php | 236 +- Upload/captcha.php | 6 +- Upload/contact.php | 19 +- Upload/css.php | 2 +- Upload/editpost.php | 72 +- Upload/forumdisplay.php | 18 +- Upload/global.php | 38 +- .../inc/3rdparty/2fa/GoogleAuthenticator.php | 201 + Upload/inc/3rdparty/json/json.php | 6 + Upload/inc/cachehandlers/apc.php | 2 +- Upload/inc/cachehandlers/disk.php | 2 +- Upload/inc/cachehandlers/eaccelerator.php | 2 +- Upload/inc/class_captcha.php | 86 +- Upload/inc/class_core.php | 7 +- Upload/inc/class_datacache.php | 39 +- Upload/inc/class_error.php | 4 + Upload/inc/class_parser.php | 38 +- Upload/inc/class_session.php | 42 +- Upload/inc/class_stopforumspamchecker.php | 39 + Upload/inc/datahandlers/event.php | 4 +- Upload/inc/datahandlers/login.php | 16 +- Upload/inc/datahandlers/pm.php | 2 +- Upload/inc/datahandlers/post.php | 19 +- Upload/inc/datahandlers/user.php | 88 +- Upload/inc/datahandlers/warnings.php | 28 +- Upload/inc/db_base.php | 450 ++ Upload/inc/db_mysql.php | 4 +- Upload/inc/db_mysqli.php | 4 +- Upload/inc/db_pdo.php | 2 +- Upload/inc/db_pgsql.php | 4 +- Upload/inc/db_sqlite.php | 2920 ++++---- Upload/inc/functions.php | 611 +- Upload/inc/functions_archive.php | 3 +- Upload/inc/functions_modcp.php | 24 +- Upload/inc/functions_online.php | 10 +- Upload/inc/functions_post.php | 63 +- Upload/inc/functions_search.php | 139 +- Upload/inc/functions_serverstats.php | 2 +- Upload/inc/functions_upload.php | 56 +- Upload/inc/functions_user.php | 10 +- Upload/inc/init.php | 3 + .../polish/admin/config_settings.lang.php | 7 +- Upload/inc/plugins/hello.php | 604 +- Upload/inc/tasks/versioncheck.php | 4 +- Upload/install/index.php | 68 +- Upload/install/resources/mybb_theme.xml | 370 +- Upload/install/resources/mysql_db_tables.php | 6 +- Upload/install/resources/pgsql_db_tables.php | 6 +- Upload/install/resources/settings.xml | 263 +- Upload/install/resources/sqlite_db_tables.php | 6 +- Upload/install/resources/upgrade12.php | 12 +- Upload/install/resources/upgrade26.php | 2 +- Upload/install/resources/upgrade30.php | 12 +- Upload/install/resources/upgrade31.php | 2 +- Upload/install/resources/usergroups.xml | 9 +- Upload/install/upgrade.php | 52 +- Upload/jscripts/bbcodes_sceditor.js | 76 +- Upload/jscripts/captcha.js | 19 +- Upload/jscripts/general.js | 36 +- Upload/jscripts/inline_edit.js | 16 +- Upload/jscripts/inline_moderation.js | 70 +- Upload/jscripts/jquery.js | 8 +- Upload/jscripts/jquery.plugins.js | 1400 ++-- Upload/jscripts/jquery.plugins.min.js | 2 +- Upload/jscripts/question.js | 20 +- Upload/jscripts/rating.js | 5 +- Upload/jscripts/report.js | 95 +- .../jscripts/sceditor/editor_plugins/undo.js | 2 + .../sceditor/editor_themes/buttons.css | 25 +- .../sceditor/editor_themes/monocons.css | 19 +- Upload/jscripts/select2/select2.css | 4 +- Upload/jscripts/select2/select2.min.js | 8 +- Upload/jscripts/thread.js | 1133 ++-- Upload/jscripts/usercp.js | 12 +- .../validate/additional-methods.min.js | 4 +- .../jscripts/validate/jquery.validate.min.js | 4 +- Upload/managegroup.php | 22 +- Upload/member.php | 6009 +++++++++-------- Upload/memberlist.php | 6 +- Upload/misc.php | 107 +- Upload/modcp.php | 276 +- Upload/moderation.php | 143 +- Upload/newreply.php | 78 +- Upload/newthread.php | 68 +- Upload/online.php | 8 +- Upload/polls.php | 87 +- Upload/portal.php | 42 +- Upload/printthread.php | 6 +- Upload/private.php | 90 +- Upload/ratethread.php | 2 +- Upload/report.php | 6 +- Upload/reputation.php | 53 +- Upload/search.php | 40 +- Upload/sendthread.php | 4 +- Upload/showthread.php | 61 +- Upload/stats.php | 37 +- Upload/syndication.php | 2 +- Upload/usercp.php | 245 +- Upload/usercp2.php | 542 +- Upload/warnings.php | 44 +- Upload/xmlhttp.php | 51 +- 190 files changed, 12771 insertions(+), 10163 deletions(-) create mode 100644 Upload/admin/jscripts/codemirror/addon/fold/index.html create mode 100644 Upload/admin/jscripts/codemirror/addon/search/matchesonscrollbar.css create mode 100644 Upload/admin/jscripts/codemirror/addon/search/matchesonscrollbar.js create mode 100644 Upload/inc/3rdparty/2fa/GoogleAuthenticator.php create mode 100644 Upload/inc/db_base.php create mode 100644 Upload/jscripts/sceditor/editor_plugins/undo.js diff --git a/Upload/admin/inc/class_form.php b/Upload/admin/inc/class_form.php index c666a06..7bc7d35 100644 --- a/Upload/admin/inc/class_form.php +++ b/Upload/admin/inc/class_form.php @@ -596,7 +596,7 @@ function generate_group_select($name, $selected=array(), $options=array()) } } - $select .= ""; + $select .= ""; } $select .= ""; @@ -833,7 +833,7 @@ function generate_date_select($name, $day="",$month="",$year="") $built = $this->generate_select_box($name.'_day', $days, (int)$day, array('id' => $name.'_day'))."   "; $built .= $this->generate_select_box($name.'_month', $months, (int)$month, array('id' => $name.'_month'))."   "; - $built .= $this->generate_text_box($name.'_year', (int)$year, array('id' => $name.'_year', 'style' => 'width: 100px;')); + $built .= $this->generate_numeric_field($name.'_year', $year, array('id' => $name.'_year', 'style' => 'width: 100px;', 'min' => 0)); return $built; } @@ -894,7 +894,7 @@ class DefaultFormContainer /** * Initialise the new form container. * - * @param string The title of the forum container + * @param string The title of the form container * @param string An additional class to apply if we have one. */ function __construct($title='', $extra_class='') @@ -1050,5 +1050,4 @@ function end($return=false) echo $this->_container->output($this->_title, 1, "general form_container {$this->extra_class}", false); } } -} - +} \ No newline at end of file diff --git a/Upload/admin/inc/class_page.php b/Upload/admin/inc/class_page.php index 1b19fe7..0ab781c 100644 --- a/Upload/admin/inc/class_page.php +++ b/Upload/admin/inc/class_page.php @@ -97,7 +97,7 @@ function output_header($title="") echo " ".$title."\n"; echo " \n"; echo " \n"; - echo " style."/main.css\" type=\"text/css\" />\n"; + echo " style."/main.css?ver=1804\" type=\"text/css\" />\n"; echo " style."/modal.css\" type=\"text/css\" />\n"; // Load stylesheet for this module if it has one @@ -115,7 +115,7 @@ function output_header($title="") echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; // Stop JS elements showing while page is loading (JS supported browsers only) echo " \n"; @@ -505,6 +505,69 @@ function show_login($message="", $class="success") exit; } + function show_2fa() + { + global $lang, $cp_style, $mybb; + + $mybb2fa_page = << + + +{$lang->my2fa} + + + + + + + + + +
+ +
+

{$lang->my2fa}

+EOF; + // Make query string nice and pretty so that user can go to his/her preferred destination + $query_string = ''; + if($_SERVER['QUERY_STRING']) + { + $query_string = '?'.preg_replace('#adminsid=(.{32})#i', '', $_SERVER['QUERY_STRING']); + $query_string = preg_replace('#my_post_key=(.{32})#i', '', $query_string); + $query_string = str_replace('action=logout', '', $query_string); + $query_string = preg_replace('#&+#', '&', $query_string); + $query_string = str_replace('?&', '?', $query_string); + $query_string = htmlspecialchars_uni($query_string); + } + $mybb2fa_page .= <<{$lang->my2fa_code}

+
+
+
+
+
+

+ + +

+
+
+
+ + +EOF; + echo $mybb2fa_page; + exit; + } + /** * Generate the lockout page * @@ -867,6 +930,7 @@ function build_codebuttons_editor($bind, $editor_language, $smilies) { if($smilie['showclickable'] != 0) { + $smilie['image'] = str_replace("{theme}", "images", $smilie['image']); $smiliecache[$smilie['find']] = $smilie['image']; } } @@ -887,8 +951,8 @@ function build_codebuttons_editor($bind, $editor_language, $smilies) $finds_count = count($finds); // Only show the first text to replace in the box - $find = htmlspecialchars_uni($finds[0]); - $image = htmlspecialchars_uni($image); + $find = str_replace(array('\\', '"'), array('\\\\', '\"'), htmlspecialchars_uni($finds[0])); + $image = str_replace(array('\\', '"'), array('\\\\', '\"'), htmlspecialchars_uni($image)); if(substr($image, 0, 4) != "http") { $image = $mybb->settings['bburl']."/".$image; @@ -904,7 +968,7 @@ function build_codebuttons_editor($bind, $editor_language, $smilies) for($j = 1; $j < $finds_count; ++$j) { - $find = htmlspecialchars_uni($finds[$j]); + $find = str_replace(array('\\', '"'), array('\\\\', '\"'), htmlspecialchars_uni($finds[$j])); $hiddensmilies .= '"'.$find.'": "'.$image.'",'; } ++$i; @@ -975,7 +1039,7 @@ function build_codebuttons_editor($bind, $editor_language, $smilies) - - - - -
-

CSS mode

-
- - -

MIME types defined: text/css, text/x-scss (demo), text/x-less (demo).

- -

Parsing/Highlighting Tests: normal, verbose.

- -
+ + + + + +  + + \ No newline at end of file diff --git a/Upload/admin/jscripts/codemirror/mode/css/less.html b/Upload/admin/jscripts/codemirror/mode/css/less.html index 1030ca4..6ccb721 100644 --- a/Upload/admin/jscripts/codemirror/mode/css/less.html +++ b/Upload/admin/jscripts/codemirror/mode/css/less.html @@ -10,12 +10,12 @@