From a90ca22e5fcb077e4a1bbaed879a41cafa208c31 Mon Sep 17 00:00:00 2001 From: jaideejung007 Date: Thu, 3 Jun 2021 12:08:45 +0700 Subject: [PATCH] Discuz! X3.4 Thai UTF-8 R20210320, Rev.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - เพิ่ม !837 Add a new configuration for GD image max pixel upper limit - เพิ่ม !835 Add a new low-level security modules to minimize the security risks of short file names and empty Host access - เพิ่ม !788 Add description for multiple selection: "Hold down the CTRL key to select multiple options" - เพิ่ม !404 Add a new setting "Whether to disclose the management reason" under the topic post - ปรับปรุง ข้อความภาษาไทยใน AdminCP ส่วนของ "สกิน" เป็น "รูปแบบสไตล์" เพื่อป้องกันความสับสนกับเมนู เทมเพลต (ที่เพิ่มขึ้นมาใหม่) - ปรับปรุง ข้อมูลลิขสิทธิ์เป็นปี 2021 - ปรับปรุง !844 Update task status in real time instead of cron - ปรับปรุง !843 Fix: Security question position can reveal the password field - ปรับปรุง !838 Fix the calendar css - ปรับปรุง !834 Fix admincp language related to the safety - ปรับปรุง !827 Remove duplicated language keys - ปรับปรุง !769 Fix: ambiguous password recovery email tips - ปรับปรุง !704 Fix the convertip function for illegal second parameter - ปรับปรุง !699 Update copyright info and some other minor issues - แก้ไขปัญหา พื้นหลังเมนูย่อยใน AdminCP ที่มีพื้นหลังสีขาว เมื่อชื่อเมนูนั้นมีชื่อยาว เช่น ชื่อเมนู "ตัวเลือกการนำเข้าไฟล์ของเทมเพลท" พื้นหลังเมนูจะมีสีดำไม่ทั้งหมด เป็นต้น - แก้ไขปัญหา การแคร็กระบบป้องกันการติดตั้งปลั๊กอิน/สกิน/สไตล์ที่ไม่ใช่ของแท้ใหม่ เนื่องจากไฟล์แพทช์ R20210320 มีการแก้ไขระบบตรวจสอบใหม่ (ขอขอบคุณ @zhogong) - แก้ไขปัญหา Delete the duplicate key value in the article call DIY module - แก้ไขปัญหา Database connection error returned. - แก้ไขปัญหา !858 Fix: the second breadcrumb navigation node is blank when the home is displayed in SNS style and is dynamically closed - แก้ไขปัญหา !857 Move forward the setting of the new mobile template - แก้ไขปัญหา !855 Fix the bug that the verified information and unmodifiable information can be resubmitted through the form for mandatory modification - แก้ไขปัญหา !853 Fix: Repeated reply numbers after deleting comments in Topic->Post moderation->Replies moderation - แก้ไขปัญหา !848 Fix: the page belongs to the unselected state in Portal->Module Management->Module List - แก้ไขปัญหา !841 Fix the problem that the admincp database verification tool does not support MySQL 8 - แก้ไขปัญหา !839 Prevent the invalid siteurl to be cached - แก้ไขปัญหา !833 Fix: missed language entry for background HTML module - แก้ไขปัญหา !831 Fix some bugs in forum-section editing - แก้ไขปัญหา !828 Fix: Topic generation Tips are not hidden (Portal->Html Management->Generate All) - แก้ไขปัญหา !821 The plug-in version number is displayed in the plug-in settings and "Not enabled" is displayed when the plug-in is not enabled - แก้ไขปัญหา !817 Fix some bugs related to the database backup and recovery - แก้ไขปัญหา !816 Fix: Custom image is not displayed at the site advertisement space - แก้ไขปัญหา !815 Fix: empty exported file content on the database shell backup - แก้ไขปัญหา !814 Fix problem that the detection of friend relationship is invalid in some cases - แก้ไขปัญหา !811 Fix: missing closing A tag. - แก้ไขปัญหา !809 Fix: Invalid label in the database backup selection: system MySQL Dump (Shell) - แก้ไขปัญหา !808 Fix the bug: White screen in "System MySQL Dump (Shell) backup database" - แก้ไขปัญหา !805 Small fix of PR393 to avoid the situation where the resource handle is equal 0 - แก้ไขปัญหา !804 Fix: missing highlight on the forum list page - แก้ไขปัญหา !803 Adjust the code to avoid false alarms by Tencent Computer Manager - แก้ไขปัญหา !802 Recommend common websites when installation is complete, such as tutorials - แก้ไขปัญหา !801 Adjust the version number and the QQ Connect plug-in to adapt to the update of the application center - แก้ไขปัญหา !800 Fixed an issue where a 404 error was reported when the "URL/undefined" page was redirected to the "URL/undefined" page when an error message was returned when the mobile form was submitted via Ajax - แก้ไขปัญหา !799 Fix: Cannot complete the account registration on a mobile phone using QQ - แก้ไขปัญหา !797 Remove duplicated keys in lang_admincp - แก้ไขปัญหา !795 Clean up some non-existent entries - แก้ไขปัญหา !789 Delete invalid variable $mobile1exists - แก้ไขปัญหา !784 Fix: New setting: Allow guests to view user profile - แก้ไขปัญหา !783 Support SSL encryption while sending email - แก้ไขปัญหา !779 Fix: Registration is not available at the touch mobile phone because of the form nesting error - แก้ไขปัญหา !776 Fix the BUG: invalid email sending task caused by WeChat login - แก้ไขปัญหา !773 New setting: Allow guests to view user profile - แก้ไขปัญหา !772 Fix: Repeated post operation info in portal page (from=portal) - แก้ไขปัญหา !770 Remove the nonexistent second parameter of convertip function - แก้ไขปัญหา !768 Fix PR 660 BUG - แก้ไขปัญหา !764 Fix several issues with the "atlist" (@username) when posting - แก้ไขปัญหา !762 Fix: Invalid mail sent in Back-end and Front-end user review - แก้ไขปัญหา !758 Fix: Invalid bottom links in mobile version - แก้ไขปัญหา !756 Fix the Search Tags for searchindex - แก้ไขปัญหา !754 Separate code and language in admincp_index.php - แก้ไขปัญหา !752 Fix: Error in the archiver pseudo-static rules, optimize the rewrite rules - แก้ไขปัญหา !750 Fix a BUG in remote login prompt code - แก้ไขปัญหา !748 Fix: conflict between jQuery and avatar upload tool - แก้ไขปัญหา !747 Fix: Wrong download file name in some cases - แก้ไขปัญหา !745 Separate code and language in misc_security.php - แก้ไขปัญหา !743 Fix: User batch verification is exported as empty files or wrong type data - แก้ไขปัญหา !740 Fix: Garbled attachments on IE 11 and old Edge - แก้ไขปัญหา !739 Fix: A link to the related section is not determoned as "section/group". - แก้ไขปัญหา !737 Fix: The optimized position is wrong when checking if the topic table needs to be optimized - แก้ไขปัญหา !736 Fix: AdminCP->Optimization, Check SEO optimization always prompting to improve SEO settings - แก้ไขปัญหา !735 Remove obsolete options in admincp optimizer - แก้ไขปัญหา !732 (AdminCP->Anti-Spam->Security master) Invalid optimized position for deleting the post when the user is allowed to edit the post - แก้ไขปัญหา !729 Fix some SQL queries problems caused by some table prefixes - แก้ไขปัญหา !718 Fix the installation bug: "Data table prefix is empty or format is wrong, please check" - แก้ไขปัญหา !717 Fix: IP library does not need to be deleted after the operation is not updated - แก้ไขปัญหา !716 Fix guide page, the post icon does not change with the template color switch and becomes the post icon of the corresponding color system. - แก้ไขปัญหา !715 Fix: parse tel/magnet links - แก้ไขปัญหา !713 Fix: restrict the last character to _ in the table prefix format, to avoid the table prefix like pre_1 from being generated and causing the program processing errors - แก้ไขปัญหา !706 Remove invalid link in AdmiCP->User->send notification->group message - แก้ไขปัญหา !701 Fix the problem that the custom advertising block function does not work properly in search and misc entries - แก้ไขปัญหา !700 Fix some group bugs - แก้ไขปัญหา !698 Groups->Search->Delete group: groupnum updated multiple times - แก้ไขปัญหา !696 Fix: Invalid label for input id=replylimit - แก้ไขปัญหา !695 Fix: Change the forum statistics chart from Flash to HTML5 - แก้ไขปัญหา !694 Only super administrators can do "Groups->Group Settings->Select user groups" - แก้ไขปัญหา !692 Fix the bug that abnormal posts are displayed in the label (such as regular posts, deleted posts, etc.) - แก้ไขปัญหา !691 Fix vulnerability: restore.php can execute remote SQL files - แก้ไขปัญหา !685 Fix: hide directory content in some locations - แก้ไขปัญหา !678 Parsing for new protocol tel/magnet link - แก้ไขปัญหา !677 Fix some small bugs and problems in the current system - แก้ไขปัญหา !675 Fix dfopen socket related issues (UCenter and installer) - แก้ไขปัญหา !674 Fix php5.3 compatibility issues - แก้ไขปัญหา !660 Fix several bugs in the admincp_db functions - แก้ไขปัญหา !659 Fix some bugs in data recovery tool - แก้ไขปัญหา !654 Fix: Site task execution problem - แก้ไขปัญหา !653 Style scheme setting does not take effect in "Forum Section Management"->"Batch Edit" - แก้ไขปัญหา !652 Fix: Wrong behavior caused by adminid = -1 - แก้ไขปัญหา !646 Fix: The user list is not displayed after a notification message - แก้ไขปัญหา !630 Fix a bug: User Tag-Send a notification report [Your request is not correct or the form verification string does not match] - แก้ไขปัญหา !622 Deleting user restrictions does not take effect in ACP->Users->Search->Manage users - แก้ไขปัญหา !612 Fix: showsetting shows unclosed tag - แก้ไขปัญหา !532 Fix: losing the line-wrapping of downloading pictures from the portal - แก้ไขปัญหา !521 Fix: search bots can not browse the tag page - แก้ไขปัญหา !507 Fix: no reminder for private messages and other messages - แก้ไขปัญหา !506 [Lightweight PR] Fixed the problem that the section rules become invalid after the section cache is turned on due to the same cache key value - แก้ไขปัญหา !495 Fix the bug that the converted HTML entity is lost after editing the article again - แก้ไขปัญหา !439 Fixed Scroll Link Menu Overflow in AdminCP - แก้ไขปัญหา !411 Fix: missing fields on user profile after moving a user to sub-table - แก้ไขปัญหา !393 Fix the error caused by continuing to execute the query when the query result is 0 --- upload/admin.php | 6 +- upload/archiver/index.php | 2 +- upload/connect.php | 2 +- upload/data/stat_setting.xml | 36 -- upload/install/data/index.htm | 0 upload/install/data/install_data.sql | 7 +- upload/install/images/index.htm | 0 upload/install/images/style.css | 4 +- upload/install/include/index.htm | 0 upload/install/include/install_function.php | 117 +++- upload/install/include/install_lang.php | 4 +- upload/install/index.php | 14 +- upload/m/index.php | 8 +- upload/misc.php | 9 +- upload/source/admincp/admincp_adv.php | 3 + upload/source/admincp/admincp_block.php | 2 +- upload/source/admincp/admincp_checktools.php | 17 +- upload/source/admincp/admincp_cloudaddons.php | 29 +- upload/source/admincp/admincp_collection.php | 6 +- upload/source/admincp/admincp_db.php | 152 +++-- upload/source/admincp/admincp_forums.php | 25 +- upload/source/admincp/admincp_group.php | 22 +- upload/source/admincp/admincp_index.php | 32 +- upload/source/admincp/admincp_login.php | 2 +- upload/source/admincp/admincp_main.php | 6 +- upload/source/admincp/admincp_makehtml.php | 10 +- upload/source/admincp/admincp_members.php | 45 +- upload/source/admincp/admincp_menu.php | 21 +- upload/source/admincp/admincp_optimizer.php | 25 +- upload/source/admincp/admincp_plugins.php | 100 ++- .../source/admincp/admincp_recyclebinpost.php | 10 +- upload/source/admincp/admincp_setting.php | 138 +++- upload/source/admincp/admincp_styles.php | 144 +++-- upload/source/admincp/admincp_tasks.php | 15 +- upload/source/admincp/admincp_templates.php | 124 +++- upload/source/admincp/admincp_verify.php | 2 +- upload/source/admincp/discuzfiles.md5 | 343 +++++----- .../admincp/moderate/moderate_member.php | 6 +- upload/source/archiver/common/footer.php | 2 +- upload/source/archiver/common/header.php | 2 +- upload/source/class/adv/adv_custom.php | 2 +- .../class/block/portal/block_article.php | 5 - upload/source/class/class_member.php | 14 +- upload/source/class/class_task.php | 61 +- .../source/class/discuz/discuz_database.php | 3 + upload/source/class/discuz/discuz_upload.php | 3 +- .../source/class/helper/helper_sysmessage.php | 2 +- .../class/optimizer/optimizer_dos8p3.php | 43 ++ .../class/optimizer/optimizer_editperdel.php | 2 +- .../class/optimizer/optimizer_httphost.php | 44 ++ .../source/class/optimizer/optimizer_seo.php | 2 +- .../class/optimizer/optimizer_thread.php | 2 +- .../source/class/table/table_common_task.php | 20 +- .../class/table/table_common_usergroup.php | 2 +- .../source/class/table/table_forum_forum.php | 6 +- .../source/class/table/table_forum_thread.php | 4 +- upload/source/discuz_version.php | 4 +- .../source/function/cache/cache_setting.php | 9 +- upload/source/function/function_admincp.php | 12 +- upload/source/function/function_core.php | 11 +- .../source/function/function_discuzcode.php | 9 +- upload/source/function/function_filesock.php | 12 +- upload/source/function/function_forumlist.php | 13 +- upload/source/function/function_mail.php | 4 +- upload/source/function/media/index.htm | 0 upload/source/function/media/media_ixigua.php | 15 + upload/source/function/media/media_tudou.php | 2 +- .../source/function/media/media_youtube.php | 10 +- .../include/cron/cron_cleanup_daily.php | 2 - upload/source/include/misc/misc_category.php | 1 - upload/source/include/misc/misc_counter.php | 68 -- upload/source/include/misc/misc_security.php | 14 +- upload/source/include/misc/misc_stat.php | 2 +- upload/source/include/modcp/modcp_member.php | 2 +- .../source/include/modcp/modcp_moderate.php | 1 + .../include/portalcp/portalcp_article.php | 2 + .../source/include/portalcp/portalcp_diy.php | 2 +- .../include/portalcp/portalcp_upload.php | 1 + upload/source/include/space/space_profile.php | 23 +- .../include/spacecp/spacecp_credit_base.php | 6 +- .../source/include/spacecp/spacecp_index.php | 10 +- upload/source/include/spacecp/spacecp_pm.php | 4 +- .../include/spacecp/spacecp_profile.php | 32 +- .../topicadmin/topicadmin_moderate.php | 13 +- upload/source/language/lang_admincp.php | 284 ++++---- upload/source/language/lang_admincp_menu.php | 11 +- upload/source/language/lang_admincp_msg.php | 40 +- .../language/lang_admincp_searchindex.php | 35 +- upload/source/language/lang_core.php | 9 +- upload/source/language/lang_message.php | 2 +- upload/source/language/lang_optimizer.php | 4 + upload/source/module/forum/forum_ajax.php | 4 +- .../source/module/forum/forum_attachment.php | 31 +- .../module/forum/forum_forumdisplay.php | 2 +- upload/source/module/forum/forum_index.php | 15 +- upload/source/module/forum/forum_misc.php | 12 +- upload/source/module/forum/forum_post.php | 2 +- .../source/module/forum/forum_viewthread.php | 31 +- upload/source/module/home/home_magic.php | 4 +- upload/source/module/home/home_space.php | 2 + upload/source/module/home/home_task.php | 1 + .../source/module/member/member_connect.php | 5 +- .../module/member/member_connect_register.php | 5 +- .../source/module/misc/misc_buyinvitecode.php | 6 +- upload/source/module/misc/misc_getatuser.php | 11 +- upload/source/module/misc/misc_patch.php | 2 +- upload/source/module/misc/misc_stat.php | 29 +- upload/source/module/misc/misc_tag.php | 12 +- .../module/portal/portal_attachment.php | 4 +- upload/source/module/search/search_forum.php | 2 +- .../source/plugin/mobile/api/1/forumnav.php | 2 +- .../source/plugin/mobile/api/3/forumnav.php | 2 +- upload/source/plugin/mobile/api/3/index.htm | 0 upload/source/plugin/mobile/api/4/index.htm | 0 upload/source/plugin/mobile/cache/index.htm | 0 .../plugin/mobile/template/image/index.htm | 0 .../plugin/mobile/template/mobile/index.htm | 0 .../source/plugin/qqconnect/connect.class.php | 27 +- .../qqconnect/connect/connect_check.php | 2 +- .../qqconnect/connect/connect_config.php | 2 +- .../qqconnect/discuz_plugin_qqconnect.xml | 2 +- upload/source/plugin/qqconnect/install.php | 22 +- upload/source/plugin/qqconnect/lib/index.htm | 0 .../plugin/qqconnect/template/module.htm | 4 +- upload/source/plugin/qqconnect/upgrade.php | 22 +- upload/source/plugin/wechat/image/index.htm | 0 upload/source/plugin/wechat/index.htm | 0 upload/source/plugin/wechat/install/index.htm | 0 upload/source/plugin/wechat/js/index.htm | 0 .../source/plugin/wechat/response.class.php | 4 +- upload/source/plugin/wechat/table/index.htm | 0 .../source/plugin/wechat/template/index.htm | 0 .../plugin/wechat/template/mobile/index.htm | 0 .../plugin/wechat/template/touch/index.htm | 0 upload/static/avatar/avatar.js | 9 +- upload/static/avatar/index.htm | 0 upload/static/image/admincp/admincp.css | 2 +- upload/static/image/admincp/btn_block_2.gif | Bin 440 -> 571 bytes upload/static/image/admincp/btn_block_3.gif | Bin 375 -> 501 bytes upload/static/image/common/stat.swf | Bin 33162 -> 0 bytes upload/static/image/mobile/images/index.htm | 0 upload/static/js/bbcode.js | 4 +- upload/static/js/calendar.js | 4 +- .../static/js/echarts/echarts.common.min.js | 45 ++ upload/static/js/echarts/index.htm | 0 upload/static/js/mobile/common.js | 3 +- upload/static/js/mobile/index.htm | 0 upload/static/js/player/index.htm | 0 upload/static/js/qshare.js | 2 +- upload/static/js/space_diy.js | 2 +- upload/static/js/stat.js | 52 ++ upload/static/js/webuploader/index.htm | 0 upload/template/default/common/footer.htm | 4 +- upload/template/default/common/header.htm | 2 +- .../template/default/common/header_common.htm | 2 +- upload/template/default/common/index.htm | 0 .../default/common/misc_imgcropper.htm | 2 +- .../template/default/discuz_style_default.xml | 6 +- .../default/forum/forumdisplay_list.htm | 2 +- upload/template/default/forum/guide.htm | 328 +++++----- .../default/forum/post_editor_attribute.htm | 2 +- upload/template/default/forum/stat_misc.htm | 11 +- .../template/default/forum/viewthread_mod.htm | 23 +- .../default/forum/viewthread_node_body.htm | 2 +- upload/template/default/home/index.htm | 0 upload/template/default/home/misc_stat.htm | 11 +- upload/template/default/home/space_card.htm | 1 - upload/template/default/home/space_header.htm | 2 +- .../template/default/home/space_privacy.htm | 2 +- .../default/home/space_profile_body.htm | 2 +- upload/template/default/home/space_thread.htm | 604 +++++++++--------- .../default/home/space_thread_nav.htm | 2 +- .../template/default/home/space_userabout.htm | 231 ++++--- .../template/default/home/spacecp_avatar.htm | 4 +- .../default/home/spacecp_avatar_body.htm | 7 +- .../default/home/spacecp_credit_header.htm | 2 +- .../template/default/home/spacecp_footer.htm | 2 +- .../template/default/home/spacecp_friend.htm | 4 +- .../template/default/home/spacecp_profile.htm | 2 +- .../default/home/spacecp_profile_nav.htm | 2 +- upload/template/default/m/css/index.htm | 0 upload/template/default/m/fonts/index.htm | 0 upload/template/default/m/images/index.htm | 0 upload/template/default/m/js/index.htm | 0 upload/template/default/m/tmpl/index.htm | 0 upload/template/default/member/index.htm | 0 upload/template/default/member/login.htm | 8 +- upload/template/default/mobile/home/index.htm | 0 .../default/mobile/home/space_profile.htm | 2 +- .../template/default/mobile/member/index.htm | 0 .../template/default/portal/diyxml/index.htm | 0 .../template/default/portal/portalcp_nav.htm | 2 +- upload/template/default/ranklist/index.htm | 0 upload/template/default/search/footer.htm | 2 +- upload/template/default/search/header.htm | 5 +- upload/template/default/search/index.htm | 0 upload/template/default/style/index.htm | 0 upload/template/default/style/t1/index.htm | 0 upload/template/default/style/t2/index.htm | 0 upload/template/default/style/t3/index.htm | 0 upload/template/default/style/t4/index.htm | 0 upload/template/default/style/t5/index.htm | 0 upload/template/default/tag/index.htm | 0 upload/template/default/touch/home/index.htm | 0 .../template/default/touch/member/index.htm | 0 .../default/touch/member/register.htm | 20 +- .../template/default/touch/search/index.htm | 0 .../default/wml/home/space_profile.htm | 2 +- upload/uc_client/client.php | 69 +- upload/uc_client/client/control/index.htm | 0 upload/uc_client/client/index.htm | 0 upload/uc_client/lib/dbi.class.php | 4 +- upload/uc_client/model/misc.php | 66 +- upload/uc_server/api/index.htm | 0 upload/uc_server/control/admin/index.htm | 0 upload/uc_server/images/gif/index.htm | 0 upload/uc_server/install/dbi.class.php | 2 +- upload/uc_server/install/func.inc.php | 111 +++- upload/uc_server/install/images/index.htm | 0 upload/uc_server/install/index.htm | 0 upload/uc_server/install/lang.inc.php | 2 +- upload/uc_server/lib/dbi.class.php | 4 +- upload/uc_server/model/misc.php | 66 +- upload/uc_server/model/note.php | 2 +- upload/uc_server/plugin/filecheck/index.htm | 0 upload/uc_server/plugin/index.htm | 0 .../release/20080429/control/index.htm | 0 .../uc_server/release/20080429/control/pm.php | 194 ++++++ upload/uc_server/release/20080429/index.htm | 0 .../uc_server/release/20080429/lib/index.htm | 0 .../release/20080429/lib/xml.class.php | 136 ++++ .../release/20080429/model/index.htm | 0 .../uc_server/release/20080429/model/pm.php | 352 ++++++++++ upload/uc_server/release/index.htm | 0 upload/uc_server/upgrade/index.htm | 0 upload/uc_server/upgrade/upgrade2.php | 599 +++++++++++++++++ .../view/default/admin_frame_menu.htm | 2 +- upload/uc_server/view/default/admin_login.htm | 2 +- utility/restore.php | 213 +++--- 239 files changed, 4141 insertions(+), 1754 deletions(-) delete mode 100644 upload/data/stat_setting.xml create mode 100644 upload/install/data/index.htm create mode 100644 upload/install/images/index.htm create mode 100644 upload/install/include/index.htm create mode 100644 upload/source/class/optimizer/optimizer_dos8p3.php create mode 100644 upload/source/class/optimizer/optimizer_httphost.php create mode 100644 upload/source/function/media/index.htm create mode 100644 upload/source/function/media/media_ixigua.php delete mode 100644 upload/source/include/misc/misc_counter.php create mode 100644 upload/source/plugin/mobile/api/3/index.htm create mode 100644 upload/source/plugin/mobile/api/4/index.htm create mode 100644 upload/source/plugin/mobile/cache/index.htm create mode 100644 upload/source/plugin/mobile/template/image/index.htm create mode 100644 upload/source/plugin/mobile/template/mobile/index.htm create mode 100644 upload/source/plugin/qqconnect/lib/index.htm create mode 100644 upload/source/plugin/wechat/image/index.htm create mode 100644 upload/source/plugin/wechat/index.htm create mode 100644 upload/source/plugin/wechat/install/index.htm create mode 100644 upload/source/plugin/wechat/js/index.htm create mode 100644 upload/source/plugin/wechat/table/index.htm create mode 100644 upload/source/plugin/wechat/template/index.htm create mode 100644 upload/source/plugin/wechat/template/mobile/index.htm create mode 100644 upload/source/plugin/wechat/template/touch/index.htm create mode 100644 upload/static/avatar/index.htm delete mode 100644 upload/static/image/common/stat.swf create mode 100644 upload/static/image/mobile/images/index.htm create mode 100644 upload/static/js/echarts/echarts.common.min.js create mode 100644 upload/static/js/echarts/index.htm create mode 100644 upload/static/js/mobile/index.htm create mode 100644 upload/static/js/player/index.htm create mode 100644 upload/static/js/stat.js create mode 100644 upload/static/js/webuploader/index.htm create mode 100644 upload/template/default/common/index.htm create mode 100644 upload/template/default/home/index.htm create mode 100644 upload/template/default/m/css/index.htm create mode 100644 upload/template/default/m/fonts/index.htm create mode 100644 upload/template/default/m/images/index.htm create mode 100644 upload/template/default/m/js/index.htm create mode 100644 upload/template/default/m/tmpl/index.htm create mode 100644 upload/template/default/member/index.htm create mode 100644 upload/template/default/mobile/home/index.htm create mode 100644 upload/template/default/mobile/member/index.htm create mode 100644 upload/template/default/portal/diyxml/index.htm create mode 100644 upload/template/default/ranklist/index.htm create mode 100644 upload/template/default/search/index.htm create mode 100644 upload/template/default/style/index.htm create mode 100644 upload/template/default/style/t1/index.htm create mode 100644 upload/template/default/style/t2/index.htm create mode 100644 upload/template/default/style/t3/index.htm create mode 100644 upload/template/default/style/t4/index.htm create mode 100644 upload/template/default/style/t5/index.htm create mode 100644 upload/template/default/tag/index.htm create mode 100644 upload/template/default/touch/home/index.htm create mode 100644 upload/template/default/touch/member/index.htm create mode 100644 upload/template/default/touch/search/index.htm create mode 100644 upload/uc_client/client/control/index.htm create mode 100644 upload/uc_client/client/index.htm create mode 100644 upload/uc_server/api/index.htm create mode 100644 upload/uc_server/control/admin/index.htm create mode 100644 upload/uc_server/images/gif/index.htm create mode 100644 upload/uc_server/install/images/index.htm create mode 100644 upload/uc_server/install/index.htm create mode 100644 upload/uc_server/plugin/filecheck/index.htm create mode 100644 upload/uc_server/plugin/index.htm create mode 100644 upload/uc_server/release/20080429/control/index.htm create mode 100644 upload/uc_server/release/20080429/control/pm.php create mode 100644 upload/uc_server/release/20080429/index.htm create mode 100644 upload/uc_server/release/20080429/lib/index.htm create mode 100644 upload/uc_server/release/20080429/lib/xml.class.php create mode 100644 upload/uc_server/release/20080429/model/index.htm create mode 100644 upload/uc_server/release/20080429/model/pm.php create mode 100644 upload/uc_server/release/index.htm create mode 100644 upload/uc_server/upgrade/index.htm create mode 100644 upload/uc_server/upgrade/upgrade2.php diff --git a/upload/admin.php b/upload/admin.php index 78fdd73a..b9f05099 100644 --- a/upload/admin.php +++ b/upload/admin.php @@ -62,6 +62,10 @@ } } else { cpheader(); - cpmsg('action_noaccess', '', 'error'); + if($action == 'cloudaddons') { + cpmsg('cloudaddons_noaccess', '', 'error'); + } else { + cpmsg('action_noaccess', '', 'error'); + } } ?> \ No newline at end of file diff --git a/upload/archiver/index.php b/upload/archiver/index.php index 7320c6c7..b048b662 100644 --- a/upload/archiver/index.php +++ b/upload/archiver/index.php @@ -13,7 +13,7 @@ $querystring = $_SERVER['QUERY_STRING']; -if(!empty($_GET['action'])) { +if(!empty($_GET['action']) && !empty($_GET['value'])) { $querystring = $_GET['action'].'-'.$_GET['value']; } diff --git a/upload/connect.php b/upload/connect.php index e37cc4f1..2bce30c2 100644 --- a/upload/connect.php +++ b/upload/connect.php @@ -1,6 +1,6 @@ - Tahoma - - 60102060 - - - - true - - - true0 - - - - #000000 - false - - 5 - 7 - - - 5 - - - - - true - 12 - - - true - true - - true - - \ No newline at end of file diff --git a/upload/install/data/index.htm b/upload/install/data/index.htm new file mode 100644 index 00000000..e69de29b diff --git a/upload/install/data/install_data.sql b/upload/install/data/install_data.sql index fd4fb4d1..4adf8995 100644 --- a/upload/install/data/install_data.sql +++ b/upload/install/data/install_data.sql @@ -158,7 +158,7 @@ INSERT INTO pre_common_nav VALUES ('','0','ทักทาย','Doing','home.php INSERT INTO pre_common_nav VALUES ('', '0', 'สถิติเว็บไซต์', '', 'misc.php?mod=stat', 'stat', 0, 0, 1, 1, 0, 0, 0, 0, '', '', '', 1, ''); INSERT INTO pre_common_nav VALUES ('', '0', 'รายงานหน้านี้', '', '#', 'report', 0, 0, 1, 2, 0, 0, 0, 0, '', '', '', 1, ''); INSERT INTO pre_common_nav VALUES ('', '0', 'ข้อความล้วน', '', 'archiver/', 'archiver', 0, 0, 1, 3, 0, 0, 0, 0, '', '', '', 1, ''); -INSERT INTO pre_common_nav VALUES ('', '0', 'อุปกรณ์พกพา', '', 'forum.php?mobile=yes', 'mobile', 0, 0, 1, 3, 0, 0, 0, 0, '', '', '', 1, ''); +INSERT INTO pre_common_nav VALUES ('', '0', 'อุปกรณ์พกพา', '', 'forum.php?mobile=yes', 'mobile', 0, 0, 0, 3, 0, 0, 0, 0, '', '', '', 1, ''); INSERT INTO pre_common_nav VALUES ('', '0', 'ประวัติการแบน', '', 'forum.php?mod=misc&action=showdarkroom', 'darkroom', 0, 0, 1, 3, 0, 0, 0, 0, '', '', '', 1, ''); INSERT INTO pre_common_nav VALUES ('', '0', 'บล็อก', '', 'home.php?mod=space&do=blog', 'blog', 0, 0, -1, 2, 0, 0, 0, 0, '{STATICURL}image/feed/blog.gif', 'เขียน', 'home.php?mod=spacecp&ac=blog', 2, ''); @@ -166,9 +166,7 @@ INSERT INTO pre_common_nav VALUES ('', '0', 'อัลบั้ม', '', 'home.p INSERT INTO pre_common_nav VALUES ('', '0', 'แบ่งปัน', '', 'home.php?mod=space&do=share', 'share', 0, 0, -1, 4, 0, 0, 0, 0, '{STATICURL}image/feed/share.gif', 'เพิ่ม', 'home.php?mod=spacecp&ac=share', 2, ''); INSERT INTO pre_common_nav VALUES ('', '0', 'ทักทาย', '', 'home.php?mod=space&do=doing', 'doing', 0, 0, -1, 5, 0, 0, 0, 0, '{STATICURL}image/feed/doing.gif', '', '', 2, ''); INSERT INTO pre_common_nav VALUES ('', '0', 'ติดตาม', '', 'home.php?mod=follow', 'follow', 0, 0, -1, 6, 0, 0, 0, 0, '{STATICURL}image/feed/follow.gif', '', '', 2, ''); -INSERT INTO pre_common_nav VALUES ('', '0', '{userpanelarea1}', '', '', '', 0, 0, 1, 7, 0, 0, 0, 0, '', '', '', 2, ''); INSERT INTO pre_common_nav VALUES ('', '0', '{hr}', '', '', '', 0, 1, 1, 8, 0, 0, 0, 0, '', '', '', 2, ''); -INSERT INTO pre_common_nav VALUES ('', '0', '{userpanelarea2}', '', '', '', 0, 0, 1, 9, 0, 0, 0, 0, '', '', '', 2, ''); INSERT INTO pre_common_nav VALUES ('', '0', 'เพื่อน', '', 'home.php?mod=space&do=friend', 'friend', 0, 0, 0, 1, 0, 0, 0, 0, '{STATICURL}image/feed/friend_b.png', '', '', 3, ''); INSERT INTO pre_common_nav VALUES ('', '0', 'กระทู้แนะนำของฉัน', '', 'forum.php?mod=guide&view=my', 'thread', 0, 0, 0, 2, 0, 0, 0, 0, '{STATICURL}image/feed/thread_b.png', '', '', 3, ''); @@ -306,7 +304,6 @@ INSERT INTO pre_common_setting VALUES ('friendgroupnum','8'); INSERT INTO pre_common_setting VALUES ('ftp','a:10:{s:2:\"on\";s:1:\"0\";s:3:\"ssl\";s:1:\"0\";s:4:\"host\";s:0:\"\";s:4:\"port\";s:2:\"21\";s:8:\"username\";s:0:\"\";s:8:\"password\";s:0:\"\";s:9:\"attachdir\";s:1:\".\";s:9:\"attachurl\";s:0:\"\";s:7:\"hideurl\";s:1:\"0\";s:7:\"timeout\";s:1:\"0\";}'); INSERT INTO pre_common_setting VALUES ('globalstick','1'); INSERT INTO pre_common_setting VALUES ('targetblank','0'); -INSERT INTO pre_common_setting VALUES ('google','1'); INSERT INTO pre_common_setting VALUES ('groupstatus','0'); INSERT INTO pre_common_setting VALUES ('portalstatus','0'); INSERT INTO pre_common_setting VALUES ('followstatus','0'); @@ -791,7 +788,7 @@ INSERT INTO pre_common_word_type SET `id`='1', `typename`='แบ่งปัน INSERT INTO pre_common_word_type SET `id`='2', `typename`='ค้าขาย'; INSERT INTO pre_forum_bbcode VALUES ('1','0','fly','bb_fly.gif','{1}','[fly]This is sample text[/fly]','แสดงเนื้หาเลื่อนตามแนวนอน การกระทำนี้จะคล้ายกับ HTML และ marquee คำค้น หมายเหตุ: การกระทำนี้มีผลกับเบราว์เซอร์ Internet Explorer เท่านั้น','1','กรุณาใส่ข้อความที่จะแสดง:','1','19','1 2 3 12 13 14 15 16 17 18 19'); -INSERT INTO pre_forum_bbcode VALUES ('2','0','qq','bb_qq.gif','','[qq]688888[/qq]','แสดงสถานะ QQ ออนไลน์，คลิกที่ไอคอนของเขา(เธอ)เพื่อสนทนา','1','กรุณาใส่หมายเลข QQ เพื่อแสดงสถานะออนไลน์:ตั้งค่า QQ สถานะออนไลน์  ','1','21','1 2 3 10 11 12 13 14 15 16 17 18 19'); +INSERT INTO pre_forum_bbcode VALUES ('2','0','qq','bb_qq.gif','','[qq]688888[/qq]','แสดงสถานะ QQ ออนไลน์，คลิกที่ไอคอนของเขา(เธอ)เพื่อสนทนา','1','กรุณาใส่หมายเลข QQ เพื่อแสดงสถานะออนไลน์:ตั้งค่า QQ สถานะออนไลน์  ','1','21','1 2 3 10 11 12 13 14 15 16 17 18 19'); INSERT INTO pre_forum_bbcode VALUES ('3','0','sup','bb_sup.gif','{1}','X[sup]2[/sup]','แสดงตัวอักษรลักษณะยกกำลัง','1','ใส่ข้อความที่นี่: ','1','22','1 2 3 12 13 14 15 16 17 18 19'); INSERT INTO pre_forum_bbcode VALUES ('4','0','sub','bb_sub.gif','{1}','X[sub]2[/sub]','แสดงตัวอักษรลักษณะตัวห้อย','1','ใส่ข้อความที่นี่: ','1','23','1 2 3 12 13 14 15 16 17 18 19'); INSERT INTO pre_forum_bbcode VALUES ('5', '2', 'spoil', 'bb_spoil.png', '
[Spoil] คลิกเพื่อดูข้อความที่ซ่อนไว้
{1}
', '', 'สปอยล์', '1', 'กรอกข้อความที่คุณต้องการสปอยล์', '1', '24', '10 11 12 13 14 15 20 16 17 18 19 1 2 3'); diff --git a/upload/install/images/index.htm b/upload/install/images/index.htm new file mode 100644 index 00000000..e69de29b diff --git a/upload/install/images/style.css b/upload/install/images/style.css index 78ffd9e2..4f2b189e 100644 --- a/upload/install/images/style.css +++ b/upload/install/images/style.css @@ -1,5 +1,5 @@ /* -(C) 2001-2009 Comsenz Inc. +(C) 2001-2099 Comsenz Inc. */ /* common */ @@ -39,7 +39,7 @@ table{ border-collapse:collapse; } .btnbox input{ margin:0 2px; } .btnbox textarea{ margin-bottom:10px; height:150px; } .btn{ margin-top:10px; } -.footer{ line-height:40px; text-align:center; background:url(bg_footer.gif) repeat-x; font-size:11px; } +.footer{ line-height:40px; text-align:center; background:#F7FBFE url(bg_footer.gif) repeat-x; font-size:11px; } /* form */ .txt{ width:200px; } diff --git a/upload/install/include/index.htm b/upload/install/include/index.htm new file mode 100644 index 00000000..e69de29b diff --git a/upload/install/include/install_function.php b/upload/install/include/install_function.php index 448eb7ed..424e1794 100644 --- a/upload/install/include/install_function.php +++ b/upload/install/include/install_function.php @@ -19,6 +19,7 @@ function show_msg($error_no, $error_msg = 'ok', $success = 1, $quit = TRUE) { $str = "\n"; $str .= "\t\n"; $str .= ""; + send_mime_type_header(); echo $str; exit; } else { @@ -63,9 +64,9 @@ function check_db($dbhost, $dbuser, $dbpw, $dbname, $tablepre) { } $mysqlmode = function_exists('mysql_connect') ? 'mysql' : 'mysqli'; $link = ($mysqlmode == 'mysql') ? @mysql_connect($dbhost, $dbuser, $dbpw) : new mysqli($dbhost, $dbuser, $dbpw); - if(!$link) { - $errno = ($mysqlmode == 'mysql') ? mysql_errno() : mysqli_errno(); - $error = ($mysqlmode == 'mysql') ? mysql_error() : mysqli_error(); + if(($mysqlmode == 'mysql' && !$link) || ($mysqlmode != 'mysql' && $link->connect_errno)) { + $errno = ($mysqlmode == 'mysql') ? mysql_errno($link) : $link->connect_errno; + $error = ($mysqlmode == 'mysql') ? mysql_error($link) : $link->connect_error; if($errno == 1045) { show_msg('database_errno_1045', $error, 0); } elseif($errno == 2003) { @@ -73,6 +74,7 @@ function check_db($dbhost, $dbuser, $dbpw, $dbname, $tablepre) { } else { show_msg('database_connect_error', $error, 0); } + return false; } else { if($query = (($mysqlmode == 'mysql') ? @mysql_query("SHOW TABLES FROM $dbname") : $link->query("SHOW TABLES FROM $dbname"))) { if(!$query) { @@ -170,12 +172,12 @@ function_exists($item) or show_msg('undefine_func', $item, 0); } } -function dintval($int, $allowarray = false) { +function dfloatval($int, $allowarray = false) { $ret = floatval($int); if($int == $ret || !$allowarray && is_array($int)) return $ret; if($allowarray && is_array($int)) { foreach($int as &$v) { - $v = dintval($v, true); + $v = dfloatval($v, true); } return $int; } elseif($int <= 0xffffffff) { @@ -198,8 +200,8 @@ function show_env_result(&$env_items, &$dirfile_items, &$func_items, &$filesock_ } $status = 1; if($item['r'] != 'notset') { - if(dintval($item['current']) && dintval($item['r'])) { - if(dintval($item['current']) < dintval($item['r'])) { + if(dfloatval($item['current']) && dfloatval($item['r'])) { + if(dfloatval($item['current']) < dfloatval($item['r'])) { $status = 0; $error_code = ENV_CHECK_ERROR; } @@ -267,6 +269,7 @@ function show_env_result(&$env_items, &$dirfile_items, &$func_items, &$filesock_ $str .= "\t\n"; $str .= "\t\n"; $str .= ""; + send_mime_type_header(); echo $str; exit; @@ -348,6 +351,16 @@ function show_env_result(&$env_items, &$dirfile_items, &$func_items, &$filesock_ function show_next_step($step, $error_code) { global $uchidden; + + if(!empty($uchidden)) { + $uc_info_transfer = unserialize(urldecode($uchidden)); + if(!isset($uc_info_transfer['ucapi']) && !isset($uc_info_transfer['ucfounderpw'])){ + $uchidden = ''; + } else { + $uchidden = dhtmlspecialchars($uchidden); + } + } + echo "
\n"; echo ""; if(isset($GLOBALS['hidden'])) { @@ -570,7 +583,7 @@ function showmessage(message) { function show_footer($quit = true) { echo <<Copyright ©2001-2020, Tencent Cloud. +
Copyright ©2001-2021, Tencent Cloud.
@@ -864,15 +877,24 @@ function fsocketopen($hostname, $port = 80, &$errno, &$errstr, $timeout = 15) { function dfopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE, $encodetype = 'URLENCODE', $allowcurl = TRUE) { $return = ''; $matches = parse_url($url); - $scheme = $matches['scheme']; + $scheme = strtolower($matches['scheme']); $host = $matches['host']; - $path = $matches['path'] ? $matches['path'].($matches['query'] ? '?'.$matches['query'] : '') : '/'; - $port = !empty($matches['port']) ? $matches['port'] : ($matches['scheme'] == 'https' ? 443 : 80); + $path = !empty($matches['path']) ? $matches['path'].(!empty($matches['query']) ? '?'.$matches['query'] : '') : '/'; + $port = !empty($matches['port']) ? $matches['port'] : ($scheme == 'https' ? 443 : 80); - if(function_exists('curl_init') && $allowcurl) { + if(function_exists('curl_init') && function_exists('curl_exec') && $allowcurl) { $ch = curl_init(); $ip && curl_setopt($ch, CURLOPT_HTTPHEADER, array("Host: ".$host)); - curl_setopt($ch, CURLOPT_URL, $scheme.'://'.($ip ? $ip : $host).':'.$port.$path); + curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); + // 在请求主机名并非一个合法 IP 地址, 且 PHP 版本 >= 5.5.0 时, 使用 CURLOPT_RESOLVE 设置固定的 IP 地址与域名关系 + // 在不支持的 PHP 版本下, 继续采用原有不支持 SNI 的流程 + if(!filter_var($host, FILTER_VALIDATE_IP) && version_compare(PHP_VERSION, '5.5.0', 'ge')) { + curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false); + curl_setopt($ch, CURLOPT_RESOLVE, array("$host:$port:$ip")); + curl_setopt($ch, CURLOPT_URL, $scheme.'://'.$host.':'.$port.$path); + } else { + curl_setopt($ch, CURLOPT_URL, $scheme.'://'.($ip ? $ip : $host).':'.$port.$path); + } curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); @@ -904,6 +926,9 @@ function dfopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ $out = "POST $path HTTP/1.0\r\n"; $header = "Accept: */*\r\n"; $header .= "Accept-Language: zh-cn\r\n"; + if($allowcurl) { + $encodetype = 'URLENCODE'; + } $boundary = $encodetype == 'URLENCODE' ? '' : '; boundary='.trim(substr(trim($post), 2, strpos(trim($post), "\n") - 2)); $header .= $encodetype == 'URLENCODE' ? "Content-Type: application/x-www-form-urlencoded\r\n" : "Content-Type: multipart/form-data$boundary\r\n"; $header .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n"; @@ -925,18 +950,35 @@ function dfopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ } $fpflag = 0; - if(!$fp = @fsocketopen(($scheme == 'https' ? 'ssl' : $scheme).'://'.($scheme == 'https' ? $host : ($ip ? $ip : $host)), $port, $errno, $errstr, $timeout)) { - $context = array( - 'http' => array( - 'method' => $post ? 'POST' : 'GET', - 'header' => $header, - 'content' => $post, - 'timeout' => $timeout, - ), + $context = array(); + if($scheme == 'https') { + $context['ssl'] = array( + 'verify_peer' => false, + 'verify_peer_name' => false, + 'peer_name' => $host ); + if(version_compare(PHP_VERSION, '5.6.0', '<')) { + $context['ssl']['SNI_enabled'] = true; + $context['ssl']['SNI_server_name'] = $host; + } + } + if(ini_get('allow_url_fopen')) { + $context['http'] = array( + 'method' => $post ? 'POST' : 'GET', + 'header' => $header, + 'timeout' => $timeout + ); + if($post) { + $context['http']['content'] = $post; + } $context = stream_context_create($context); - $fp = @fopen($scheme.'://'.($scheme == 'https' ? $host : ($ip ? $ip : $host)).':'.$port.$path, 'b', false, $context); + $fp = @fopen($scheme.'://'.($ip ? $ip : $host).':'.$port.$path, 'b', false, $context); $fpflag = 1; + } elseif(function_exists('stream_socket_client')) { + $context = stream_context_create($context); + $fp = @stream_socket_client(($scheme == 'https' ? 'ssl://' : '').($ip ? $ip : $host).':'.$port, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context); + } else { + $fp = @fsocketopen(($scheme == 'https' ? 'ssl://' : '').($scheme == 'https' ? $host : ($ip ? $ip : $host)), $port, $errno, $errstr, $timeout); } if(!$fp) { @@ -944,7 +986,9 @@ function dfopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ } else { stream_set_blocking($fp, $block); stream_set_timeout($fp, $timeout); - @fwrite($fp, $out); + if(!$fpflag) { + @fwrite($fp, $out); + } $status = stream_get_meta_data($fp); if(!$status['timed_out']) { while (!feof($fp) && !$fpflag) { @@ -1279,7 +1323,7 @@ function install_uc_server() { $pathinfo = pathinfo($_SERVER['PHP_SELF']); $pathinfo['dirname'] = substr($pathinfo['dirname'], 0, -8); - $isHTTPS = ($_SERVER['HTTPS'] && strtolower($_SERVER['HTTPS']) != 'off') ? true : false; + $isHTTPS = is_https(); $appurl = 'http'.($isHTTPS ? 's' : '').'://'.preg_replace("/\:\d+/", '', $_SERVER['HTTP_HOST']).($_SERVER['SERVER_PORT'] && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443 ? ':'.$_SERVER['SERVER_PORT'] : '').$pathinfo['dirname']; $ucapi = $appurl.'/uc_server'; $ucip = ''; @@ -1762,4 +1806,27 @@ function format_space($space) { } } return $space; -} \ No newline at end of file +} + +function send_mime_type_header($type = 'application/xml') { + header("Content-Type: ".$type); +} + +function is_https() { + if (isset($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) != "off") { + return true; + } + if (isset($_SERVER["HTTP_X_FORWARDED_PROTO"]) && strtolower($_SERVER["HTTP_X_FORWARDED_PROTO"]) == "https") { + return true; + } + if (isset($_SERVER["HTTP_SCHEME"]) && strtolower($_SERVER["HTTP_SCHEME"]) == "https") { + return true; + } + if (isset($_SERVER["HTTP_FROM_HTTPS"]) && strtolower($_SERVER["HTTP_FROM_HTTPS"]) != "off") { + return true; + } + if (isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] == 443) { + return true; + } + return false; +} diff --git a/upload/install/include/install_lang.php b/upload/install/include/install_lang.php index 3d609770..28a875a3 100644 --- a/upload/install/include/install_lang.php +++ b/upload/install/include/install_lang.php @@ -91,7 +91,7 @@ 'tips_ucenter' => 'กรุณากรอกข้อมูลของ UCenter ที่กำหนดไว้', 'tips_ucenter_comment' => 'UCenter เป็นผลิตภัณฑ์หลักของบริษัทฯ Comsenz ซึ่ง Discuz! Board ต้องติดตั้งและพึ่งพาการทำงานของโปรแกรมนี้. หากคุณติดตั้ง UCenter ไว้แล้ว กรุณากรอกข้อมูลด้านล่าง หากคุณยังไม่มีและยังไม่ได้ติดตั้ง UCenter กรุณาไปที่ DiscuzThai เพื่อดาวน์โหลด UCenter เวอร์ชันภาษาไทย แล้วทำการติดตั้งเพื่อดำเนินการต่อไป', - 'advice_mysql_connect' => 'กรุณาตรวจสอบว่า MySQL มีการเชื่อมต่ออย่างถูกต้อง', + 'advice_mysql_connect' => 'กรุณาตรวจสอบว่า mysql มีการเชื่อมต่ออย่างถูกต้อง', 'advice_gethostbyname' => 'ค่า gethostbyname.ใน PHP ถูกปิดใช้งาน โปรดติดต่อผู้ให้บริการโฮสเพื่อตรวจสอบการเปิดคุณลักษณะนี้', 'advice_file_get_contents' => 'ตรวจสอบ allow_url_fopen ใน php.ini ว่าเปิดใช้งานอยู่รึเปล่า. โปรดติดต่อผู้ให้บริการโฮสเพื่อตรวจสอบการเปิดคุณลักษณะนี้', 'advice_xml_parser_create' => 'ต้องตรวจสอบดูว่าสนับสนุน PHP สำหรับ XML หรือไม่. โปรดติดต่อผู้ให้บริการโฮสเพื่อตรวจสอบการเปิดคุณลักษณะนี้', @@ -252,7 +252,7 @@ 'license' => '

เวอร์ชันภาษาอังกฤษ (อย่างไม่เป็นทางการ) เป็นข้อตกลงใบอนุญาตสำหรับผู้ใช้ที่ไม่ใช้ภาษาจีน

-

Copyright (c) 2001-2020, Tencent Cloud Computing (Beijing) Co., Ltd. (formerly Beijing Kangsheng Xinchuang Technology Co., Ltd.) All rights reserved.

+

Copyright (c) 2001-2021, Tencent Cloud Computing (Beijing) Co., Ltd. (formerly Beijing Kangsheng Xinchuang Technology Co., Ltd.) All rights reserved.

Thank you for choosing Kangsheng products. We hope that our efforts can provide you with an efficient, fast, powerful site solution, and a powerful community forum solution. The website of Kangsheng Company is http://www.comsenz.com, and the official discussion website of the product is http://www.discuz.net.

diff --git a/upload/install/index.php b/upload/install/index.php index 63f711dd..873ca49e 100644 --- a/upload/install/index.php +++ b/upload/install/index.php @@ -58,9 +58,9 @@ $uchidden = getgpc('uchidden'); if(in_array($method, array('app_reg', 'ext_info'))) { - $isHTTPS = ($_SERVER['HTTPS'] && strtolower($_SERVER['HTTPS']) != 'off') ? true : false; + $isHTTPS = is_https(); $PHP_SELF = $_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME']; - # The port used by $bbserver cannot come from SERVER_PORT, because the server port of dz is not necessarily the port accessed by the user (for example, behind load balancing) + # $bbserver使用的端口，不能来自于SERVER_PORT，因为dz的服务器端口不一定是用户访问的端口(比如在负载均衡后面) $bbserver = 'http'.($isHTTPS ? 's' : '').'://'.$_SERVER['HTTP_HOST']; $default_ucapi = $bbserver.'/ucenter'; $default_appurl = $bbserver.substr($PHP_SELF, 0, strrpos($PHP_SELF, '/') - 8); @@ -285,9 +285,9 @@ } else { $mysqlmode = function_exists("mysql_connect") ? 'mysql' : 'mysqli'; $link = ($mysqlmode == 'mysql') ? @mysql_connect($dbhost, $dbuser, $dbpw) : new mysqli($dbhost, $dbuser, $dbpw); - if(!$link) { - $errno = ($mysqlmode == 'mysql') ? mysql_errno($link) : $link->errno; - $error = ($mysqlmode == 'mysql') ? mysql_error($link) : $link->error; + if(($mysqlmode == 'mysql' && !$link) || ($mysqlmode != 'mysql' && $link->connect_errno)) { + $errno = ($mysqlmode == 'mysql') ? mysql_errno($link) : $link->connect_errno; + $error = ($mysqlmode == 'mysql') ? mysql_error($link) : $link->connect_error; if($errno == 1045) { show_msg('database_errno_1045', $error, 0); } elseif($errno == 2003) { @@ -321,7 +321,7 @@ } } - if(strpos($tablepre, '.') !== false || intval($tablepre{0})) { + if(strpos($tablepre, '.') !== false || intval($tablepre[0])) { show_msg('tablepre_invalid', $tablepre, 0); } @@ -484,7 +484,7 @@ show_header(); echo '
'; /*jaideejung007*/ echo ''; - echo '

'.$lang['install_finish'].'


'; + echo '

'.$lang['install_finish'].'


'; echo '
'; show_footer(); } diff --git a/upload/m/index.php b/upload/m/index.php index 40d4e73d..be8507cb 100644 --- a/upload/m/index.php +++ b/upload/m/index.php @@ -18,6 +18,10 @@ $discuz->init(); +if (!$_G['setting']['mobile']['allowmnew']) { + dheader('location: ' . $_G['siteurl']); +} + if(!file_exists(DISCUZ_ROOT . $_G['style']['tpldir'] . '/m')) { $_G['style']['tpldir'] = './template/default'; } @@ -66,10 +70,6 @@ 'openApi' => array(), ); -if (!$_G['setting']['mobile']['allowmnew']) { - dheader('location: ' . $_G['siteurl']); -} - $a = $_GET['a'] && preg_match('/^\w+$/', $_GET['a']) ? $_GET['a'] : 'forumlist'; include template('m/' . $a); \ No newline at end of file diff --git a/upload/misc.php b/upload/misc.php index faa4c358..5ed08538 100644 --- a/upload/misc.php +++ b/upload/misc.php @@ -51,11 +51,13 @@ $discuz = C::app(); -$discuz->reject_robot(); +if($_GET['mod'] != 'tag'){ + $discuz->reject_robot(); +} $modarray = array('seccode', 'secqaa', 'initsys', 'invite', 'faq', 'report', 'swfupload', 'stat', 'ranklist', 'buyinvitecode', 'tag', 'diyhelp', 'mobile', 'patch', 'getatuser', 'imgcropper', - 'userstatus', 'signin'); + 'userstatus',); $modcachelist = array( 'ranklist' => array('forums', 'diytemplatename'), @@ -82,9 +84,6 @@ $discuz->init_cron = false; $discuz->init_session = false; break; - case 'updatecache': - $discuz->init_cron = false; - $discuz->init_session = false; default: break; } diff --git a/upload/source/admincp/admincp_adv.php b/upload/source/admincp/admincp_adv.php index b266f956..6857d3e3 100644 --- a/upload/source/admincp/admincp_adv.php +++ b/upload/source/admincp/admincp_adv.php @@ -530,7 +530,9 @@ function setpreview(o) { array('adv_admin_list', 'adv&operation=list', 1), array('adv_admin_listall', 'adv&operation=ad', 0), )); + /*search={"adv_admin":"action=adv","adv_admin_list":"action=adv&operation=list"}*/ showtips('adv_list_tip'); + /*search*/ $advs = getadvs(); showtableheader('', 'fixpadding'); @@ -561,6 +563,7 @@ function setpreview(o) { } if($adv['class'] == 'custom') { $customadv = $adv; + $img = file_exists(DISCUZ_ROOT.'./static/image/admincp/'.$customadv['class'].'.gif') ? '
' : ''; echo ''; echo $img.$lang['adv_custom_add']; showformheader("adv&operation=custom&do=add"); diff --git a/upload/source/admincp/admincp_block.php b/upload/source/admincp/admincp_block.php index 6f54fd25..ef99597e 100644 --- a/upload/source/admincp/admincp_block.php +++ b/upload/source/admincp/admincp_block.php @@ -217,7 +217,7 @@ $diytemplatename_sel = ''; diff --git a/upload/source/admincp/admincp_checktools.php b/upload/source/admincp/admincp_checktools.php index 740fc3e1..faac01f7 100644 --- a/upload/source/admincp/admincp_checktools.php +++ b/upload/source/admincp/admincp_checktools.php @@ -464,12 +464,13 @@ $rewritedata['rulereplace'][$k] = pvsort($vkeys, $v, $rewritedata['rulereplace'][$k]); $v = str_replace($vkeys, $rewritedata['rulevars'][$k], addcslashes($v, '?*+^$.[]()|')); $rulepath = $k != 'forum_archiver' ? '' : 'archiver/'; - $rule['{apache1}'] .= "\t".'RewriteCond %{QUERY_STRING} ^(.*)$'."\n\t".'RewriteRule ^(.*)/'.$v.'$ $1/'.$rulepath.pvadd($rewritedata['rulereplace'][$k])."&%1\n"; - $rule['{apache2}'] .= 'RewriteCond %{QUERY_STRING} ^(.*)$'."\n".'RewriteRule ^'.$v.'$ '.$rulepath.$rewritedata['rulereplace'][$k]."&%1\n"; - $rule['{iis}'] .= 'RewriteRule ^(.*)/'.$v.'(\?(.*))*$ $1/'.$rulepath.addcslashes(pvadd($rewritedata['rulereplace'][$k]).'&$'.($pvmaxv + 1), '.?')."\n"; - $rule['{iis7}'] .= "\t\t".'<rule name="'.$k.'">'."\n\t\t\t".'<match url="^(.*/)*'.str_replace('\.', '.', $v).'\?*(.*)$" />'."\n\t\t\t".'<action type="Rewrite" url="{R:1}/'.str_replace(array('&', 'page\%3D'), array('&amp;', 'page%3D'), $rulepath.addcslashes(pvadd($rewritedata['rulereplace'][$k], 1).'&{R:'.$pvmaxv.'}', '?')).'" />'."\n\t\t".'</rule>'."\n"; - $rule['{zeus}'] .= 'match URL into $ with ^(.*)/'.$v.'\?*(.*)$'."\n".'if matched then'."\n\t".'set URL = $1/'.$rulepath.pvadd($rewritedata['rulereplace'][$k]).'&$'.$pvmaxv."\nendif\n"; - $rule['{nginx}'] .= 'rewrite ^([^\.]*)/'.$v.'$ $1/'.$rulepath.stripslashes(pvadd($rewritedata['rulereplace'][$k]))." last;\n"; + $rule['{apache1}'] .= "\t".'RewriteCond %{QUERY_STRING} ^(.*)$'."\n\t".'RewriteRule ^(.*)/'.$rulepath.$v.'$ $1/'.$rulepath.pvadd($rewritedata['rulereplace'][$k])."&%1\n"; + $rule['{apache2}'] .= 'RewriteCond %{QUERY_STRING} ^(.*)$'."\n".'RewriteRule ^'.$rulepath.$v.'$ '.$rulepath.$rewritedata['rulereplace'][$k]."&%1\n"; + $rule['{iis}'] .= 'RewriteRule ^(.*)/'.$rulepath.$v.'(\?(.*))*$ $1/'.$rulepath.addcslashes(pvadd($rewritedata['rulereplace'][$k]).'&$'.($pvmaxv + 1), '.?')."\n"; + $rule['{iis7}'] .= "\t\t".'<rule name="'.$k.'">'."\n\t\t\t".'<match url="^(.*/)*'.$rulepath.str_replace('\.', '.', $v).'\?*(.*)$" />'."\n\t\t\t".'<action type="Rewrite" url="{R:1}/'.str_replace(array('&', 'page\%3D'), array('&amp;', 'page%3D'), $rulepath.addcslashes(pvadd($rewritedata['rulereplace'][$k], array('{R:', '}')).'&{R:'.$pvmaxv.'}', '?')).'" />'."\n\t\t".'</rule>'."\n"; + $rule['{nginx}'] .= 'rewrite ^([^\.]*)/'.$rulepath.$v.'$ $1/'.$rulepath.stripslashes(pvadd($rewritedata['rulereplace'][$k]))." last;\n"; + $rule['{lighttpd}'] .= '"(.*)/'.$rulepath.$v.'\?*(.*)$" => "$1/'.$rulepath.pvadd($rewritedata['rulereplace'][$k]).'&$'.$pvmaxv.'",'."\n"; + $rule['{caddy}'] .= '@'.$k.' path_regexp '.$k.' ^(.*)/'.$rulepath.$v."$\n".'rewrite @'.$k.' {re.'.$k.'.1}/'.$rulepath.pvadd($rewritedata['rulereplace'][$k], array('{re.'.$k.'.', '}')).'&{query}'."\n"; } $rule['{nginx}'] .= "if (!-e \$request_filename) {\n\treturn 404;\n}"; echo str_replace(array_keys($rule), $rule, cplang('rewrite_message')); @@ -514,12 +515,12 @@ function pvsort($key, $v, $s) { return $s; } -function pvadd($s, $t = 0) { +function pvadd($s, $t = array()) { $s = str_replace(array('$3', '$2', '$1'), array('~4', '~3', '~2'), $s); if(!$t) { return str_replace(array('~4', '~3', '~2'), array('$4', '$3', '$2'), $s); } else { - return str_replace(array('~4', '~3', '~2'), array('{R:4}', '{R:3}', '{R:2}'), $s); + return str_replace(array('~4', '~3', '~2'), array($t[0].'4'.$t[1], $t[0].'3'.$t[1], $t[0].'2'.$t[1]), $s); } } diff --git a/upload/source/admincp/admincp_cloudaddons.php b/upload/source/admincp/admincp_cloudaddons.php index c37d6cc3..e88380ec 100644 --- a/upload/source/admincp/admincp_cloudaddons.php +++ b/upload/source/admincp/admincp_cloudaddons.php @@ -18,19 +18,32 @@ cpmsg('noaccess_isfounder', '', 'error'); } -if(!$operation) { +if(!$operation || in_array($operation, array('plugins', 'templates'))) { cloudaddons_check(); shownav('cloudaddons'); $extra = ''; - if(!empty($_GET['id'])) { - $extra .= '&mod=app&ac=item&id='.rawurlencode($_GET['id']); - } - if(!empty($_GET['extra'])) { - $extra .= '&'.addslashes($_GET['extra']); + if(empty($_GET['frame'])) { + parse_str($_SERVER['QUERY_STRING'], $query); + $query['frame'] = 'no'; + $query_sting_tmp = http_build_query($query); + $url = ADMINSCRIPT.'?'.$query_sting_tmp; + echo ''; + } else { + if(!empty($operation)) { + $extra .= '&view='.rawurlencode($operation); + }elseif(!empty($_GET['id'])) { + $extra .= '&mod=app&ac=item&id='.rawurlencode($_GET['id']); + } + if(!empty($_GET['from'])) { + $extra .= '&from='.rawurlencode($_GET['from']); + } + if(!empty($_GET['extra'])) { + $extra .= '&'.addslashes($_GET['extra']); + } + $url = cloudaddons_url($extra); + echo ''; } - $url = cloudaddons_url($extra); - echo ''; } elseif($operation == 'download') { $step = intval($_GET['step']); diff --git a/upload/source/admincp/admincp_collection.php b/upload/source/admincp/admincp_collection.php index 33832f2c..f3683e3e 100644 --- a/upload/source/admincp/admincp_collection.php +++ b/upload/source/admincp/admincp_collection.php @@ -19,6 +19,7 @@ array('collection_comment', 'collection&operation=comment', $current['comment']), array('collection_recommend', 'collection&operation=recommend', $current['recommend']) )); +/*search={"collection":"action=collection"}*/ echo ''; if($operation == 'comment') { @@ -35,8 +36,8 @@ foreach($cidlist as $uniquecid) { $decreasnum[$uniquecid['ctid']]++; } - foreach($cidlist as $uniquecid) { - C::t('forum_collection')->update_by_ctid($uniquecid['ctid'], 0, 0, -$decreasnum[$uniquecid['ctid']]); + foreach($decreasnum as $ctid => $num) { + C::t('forum_collection')->update_by_ctid($ctid, 0, 0, -$num); } } cpmsg('collection_admin_updated', 'action=collection&operation=comment&searchsubmit=yes&perpage='.$_GET['perpage'].'&page='.$_GET['page'], 'succeed'); @@ -257,4 +258,5 @@ function removeNonExistsCollection($collectionrecommend) { } return $collectionrecommend; } +/*search*/ ?> \ No newline at end of file diff --git a/upload/source/admincp/admincp_db.php b/upload/source/admincp/admincp_db.php index 51bbcb01..148b4bab 100644 --- a/upload/source/admincp/admincp_db.php +++ b/upload/source/admincp/admincp_db.php @@ -81,6 +81,7 @@ array('nav_db_optimize', 'db&operation=optimize', 0), array('nav_db_dbcheck', 'db&operation=dbcheck', 0) )); + /*search={"nav_db":"action=db&operation=export","nav_db_export":"action=db&operation=export"}*/ showtips($db_export_tips); showformheader('db&operation=export&setup=1'); showtableheader(); @@ -95,26 +96,26 @@ showtagfooter('tbody'); showtagheader('tbody', 'advanceoption'); - showsetting('db_export_method', '', '', '
  • '.$lang['db_export_shell'].'
'); + showsetting('db_export_method', '', '', '
'); showtitle('db_export_options'); showsetting('db_export_options_extended_insert', 'extendins', 0, 'radio'); showsetting('db_export_options_sql_compatible', array('sqlcompat', array( - array('', $lang['default']), + array('0', $lang['default']), array('MYSQL40', 'MySQL 3.23/4.0.x'), array('MYSQL41', 'MySQL 4.1.x/5.x') - )), '', 'mradio'); + )), '0', 'mradio'); showsetting('db_export_options_charset', array('sqlcharset', array( - array('', cplang('default')), + array('0', cplang('default')), $dbcharset ? array($dbcharset, strtoupper($dbcharset)) : array(), $db->version() > '4.1' && $dbcharset != 'utf8' ? array('utf8', 'UTF-8') : array() - ), TRUE), 0, 'mradio'); + ), TRUE), '0', 'mradio'); showsetting('db_export_usehex', 'usehex', 1, 'radio'); if(function_exists('gzcompress')) { showsetting('db_export_usezip', array('usezip', array( array('1', $lang['db_export_zip_1']), array('2', $lang['db_export_zip_2']), array('0', $lang['db_export_zip_3']) - )), 0, 'mradio'); + )), '0', 'mradio'); } showsetting('db_export_filename', '', '', '.sql'); showtagfooter('tbody'); @@ -122,6 +123,7 @@ showsubmit('exportsubmit', 'submit', '', 'more_options'); showtablefooter(); showformfooter(); + /*search*/ } else { @@ -131,6 +133,18 @@ cpmsg('database_export_filename_invalid', '', 'error'); } + if(!in_array($_GET['type'], array('discuz', 'discuz_uc', 'custom'))) { + $_GET['type'] = 'discuz'; + } + + if(!in_array($_GET['method'], array('multivol', 'shell'))) { + $_GET['method'] = 'multivol'; + } + + if(!$_GET['sqlcharset'] || !preg_match('/^[\w\_\-]+$/', $_GET['sqlcharset'])) { + $_GET['sqlcharset'] = strtolower($dbcharset); + } + $time = dgmdate(TIMESTAMP); if($_GET['type'] == 'discuz' || $_GET['type'] == 'discuz_uc') { $tables = arraykeys2(fetchtablelist($tablepre), 'Name'); @@ -154,7 +168,7 @@ } $volume = intval($_GET['volume']) + 1; - $idstring = '# Identify: '.base64_encode("$_G[timestamp],".$_G['setting']['version'].",{$_GET['type']},{$_GET['method']},{$volume},{$tablepre},{$dbcharset}")."\n"; + $idstring = '# Identify: '.base64_encode("$_G[timestamp],".$_G['setting']['version'].",{$_GET['type']},{$_GET['method']},{$volume},{$tablepre},{$_GET['sqlcharset']}")."\n"; $dumpcharset = $_GET['sqlcharset'] ? $_GET['sqlcharset'] : str_replace('-', '', $_G['charset']); @@ -207,7 +221,7 @@ "# Type: {$_GET['type']}\n". "# Table Prefix: $tablepre\n". "#\n". - "# Discuz! Home: http://www.discuz.com\n". + "# Discuz! Home: http://www.discuz.net\n". "# Please visit our website for newest infomation about Discuz!\n". "# --------------------------------------------------------\n\n\n". "$setnames". @@ -295,21 +309,25 @@ $tablesstr = ''; foreach($tables as $table) { - $tablesstr .= '"'.$table.'" '; + $tablesstr .= ''.escapeshellarg($table).' '; } require DISCUZ_ROOT . './config/config_global.php'; + $dbhost = $_config['db'][1]['dbhost']; + $dbname = $_config['db'][1]['dbname']; + $dbpw = $_config['db'][1]['dbpw']; + $dbuser = $_config['db'][1]['dbuser']; list($dbhost, $dbport) = explode(':', $dbhost); + $db = DB::object(); $query = DB::query("SHOW VARIABLES LIKE 'basedir'"); - list(, $mysql_base) = DB::fetch($query, DB::$drivertype == 'mysqli' ? MYSQLI_NUM : MYSQL_NUM); + list(, $mysql_base) = DB::fetch($query, $db->drivertype == 'mysqli' ? MYSQLI_NUM : MYSQL_NUM); - $dumpfile = addslashes(dirname(dirname(__FILE__))).'/'.$backupfilename.'.sql'; + $dumpfile = addslashes(dirname(dirname(dirname(__FILE__)))).'/'.$backupfilename.'.sql'; @unlink($dumpfile); - $mysqlbin = $mysql_base == '/' ? '' : addslashes($mysql_base).'bin/'; - @shell_exec($mysqlbin.'mysqldump --force --quick '.($db->version() > '4.1' ? '--skip-opt --create-options' : '-all').' --add-drop-table'.($_GET['extendins'] == 1 ? ' --extended-insert' : '').''.($db->version() > '4.1' && $_GET['sqlcompat'] == 'MYSQL40' ? ' --compatible=mysql40' : '').' --host="'.$dbhost.($dbport ? (is_numeric($dbport) ? ' --port='.$dbport : ' --socket="'.$dbport.'"') : '').'" --user="'.$dbuser.'" --password="'.$dbpw.'" "'.$dbname.'" '.escapeshellarg($tablesstr).' > '.$dumpfile); - + $mysqlbin = $mysql_base == '/' ? '' : addslashes(rtrim($mysql_base, '/\\')).'/bin/'; + @shell_exec($mysqlbin.'mysqldump --force --quick '.($db->version() > '4.1' ? '--skip-opt --create-options' : '-all').' --add-drop-table'.($_GET['extendins'] == 1 ? ' --extended-insert' : '').''.($db->version() > '4.1' && $_GET['sqlcompat'] == 'MYSQL40' ? ' --compatible=mysql40' : '').' --host="'.$dbhost.'"'.($dbport ? (is_numeric($dbport) ? ' --port='.$dbport : ' --socket="'.$dbport.'"') : '').' --user="'.$dbuser.'" --password="'.$dbpw.'" "'.$dbname.'" '.$tablesstr.' > '.$dumpfile); if(@file_exists($dumpfile)) { if($_GET['usezip']) { @@ -364,7 +382,7 @@ if(!submitcheck('deletesubmit')) { - $exportlog = $exportsize = $exportziplog = array(); + $exportlog = $exportziplog = $exportsize = $exportzipsize = $exportfiletime = $exportzipfiletime = array(); if(is_dir(DISCUZ_ROOT.'./data/'.$backupdir)) { $dir = dir(DISCUZ_ROOT.'./data/'.$backupdir); while($entry = $dir->read()) { @@ -372,6 +390,7 @@ if(is_file($entry)) { if(preg_match("/\.sql$/i", $entry)) { $filesize = filesize($entry); + $filemtime = filemtime($entry); $fp = fopen($entry, 'rb'); $identify = explode(',', base64_decode(preg_replace("/^# Identify:\s*(\w+).*/s", "\\1", fgets($fp, 256)))); fclose($fp); @@ -382,22 +401,33 @@ 'method' => $identify[3], 'volume' => $identify[4], 'filename' => $entry, - 'dateline' => filemtime($entry), + 'dateline' => $filemtime, 'size' => $filesize ); $exportsize[$key] += $filesize; + $exportfiletime[$key] = $filemtime; } elseif(preg_match("/\.zip$/i", $entry)) { + $key = preg_replace('/^(.+?)(\-\d+)\.zip$/i', '\\1', basename($entry)); $filesize = filesize($entry); - $exportziplog[] = array( + $filemtime = filemtime($entry); + $exportziplog[$key][] = array( 'type' => 'zip', 'filename' => $entry, - 'size' => filesize($entry), - 'dateline' => filemtime($entry) + 'size' => $filesize, + 'dateline' => $filemtime ); + $exportzipsize[$key] += $filesize; + $exportzipfiletime[$key] = $filemtime; } } } $dir->close(); + if (!empty($exportlog)) { + array_multisort($exportfiletime, SORT_DESC, SORT_STRING, $exportlog); + } + if (!empty($exportziplog)) { + array_multisort($exportzipfiletime, SORT_DESC, SORT_STRING, $exportziplog); + } } else { cpmsg('database_export_dest_invalid', '', 'error'); } @@ -412,9 +442,11 @@ array('nav_db_optimize', 'db&operation=optimize', 0), array('nav_db_dbcheck', 'db&operation=dbcheck', 0) )); + /*search={"nav_db":"action=db&operation=export","nav_db_import":"action=db&operation=import"}*/ showtips('db_import_tips'); showtableheader('db_import'); showtablerow('', array('colspan="9" class="tipsblock"'), array(cplang('do_import_option', array('restore_url' => $restore_url)))); + /*search*/ showformheader('db&operation=import'); showtitle('db_export_file'); @@ -427,18 +459,18 @@ $info['dateline'] = is_int($info['dateline']) ? dgmdate($info['dateline']) : $lang['unknown']; $info['size'] = sizecount($exportsize[$key]); $info['volume'] = count($val); - $info['method'] = $info['type'] != 'zip' ? ($info['method'] == 'multivol' ? $lang['db_multivol'] : $lang['db_shell']) : ''; + $info['method'] = $info['method'] == 'multivol' ? $lang['db_multivol'] : $lang['db_shell']; $datafile_server = '.'.$info['filename']; showtablerow('', '', array( "", - "".$key."", + "".basename($info['filename'])."", $info['version'], $info['dateline'], $lang['db_export_'.$info['type']], $info['size'], $info['method'], - $info['volume'], - $info['type'] == 'zip' ? "$lang[db_import_unzip]" : "$lang[import]" + "".$info['volume']."", + "$lang[import]" )); echo ''; foreach($val as $info) { @@ -446,35 +478,55 @@ $info['size'] = sizecount($info['size']); showtablerow('', '', array( '', - "".substr(strrchr($info['filename'], "/"), 1)."", + "".substr(strrchr($info['filename'], "/"), 1)."", $info['version'], $info['dateline'], '', $info['size'], '', - $info['volume'], + '', '' )); } echo ''; } - foreach($exportziplog as $info) { + foreach($exportziplog as $key => $val) { + sort($val);//修改 确保-1.zip排前面,才会自动解压-2.zip + $info = $val[0]; + $info['volume'] = count($val); $info['dateline'] = is_int($info['dateline']) ? dgmdate($info['dateline']) : $lang['unknown']; - $info['size'] = sizecount($info['size']); + $info['size'] = sizecount($exportzipsize[$key]); $info['method'] = $info['method'] == 'multivol' ? $lang['db_multivol'] : $lang['db_zip']; $datafile_server = '.'.$info['filename']; showtablerow('', '', array( "", - "".substr(strrchr($info['filename'], "/"), 1)."", + "".basename($info['filename'])."", '', $info['dateline'], - $lang['db_export_'.$info['type']], + ($info['volume'] > 1 ? $lang['db_multivol'] : '').$lang['db_export_'.$info['type']], $info['size'], $info['method'], - '', + "".$info['volume']."", "$lang[db_import_unzip]" - )); + )); + echo ''; + foreach($val as $info) { + $info['dateline'] = is_int($info['dateline']) ? dgmdate($info['dateline']) : $lang['unknown']; + $info['size'] = sizecount($info['size']); + showtablerow('', '', array( + '', + "".substr(strrchr($info['filename'], "/"), 1)."", + $info['version'], + $info['dateline'], + '', + $info['size'], + '', + '', + '' + )); + } + echo ''; } showsubmit('deletesubmit', 'submit', 'del'); @@ -485,13 +537,18 @@ } else { if(is_array($_GET['delete'])) { foreach($_GET['delete'] as $filename) { + $type = ".sql"; + if(strpos($filename, '-1.zip') !== FALSE) { + $type = ".zip"; + $filename = str_replace('-1.zip', '', $filename); + } $file_path = './data/'.$backupdir.'/'.str_replace(array('/', '\\'), '', $filename); if(is_file($file_path)) { @unlink($file_path); } else { $i = 1; while(1) { - $file_path = './data/'.$backupdir.'/'.str_replace(array('/', '\\'), '', $filename.'-'.$i.'.sql'); + $file_path = './data/'.$backupdir.'/'.str_replace(array('/', '\\'), '', $filename.'-'.$i.$type); if(is_file($file_path)) { @unlink($file_path); $i++; @@ -501,7 +558,7 @@ } } } - cpmsg('database_file_delete_succeed', '', 'succeed'); + cpmsg('database_file_delete_succeed', 'action=db&operation=import', 'succeed'); } else { cpmsg('database_file_delete_invalid', '', 'error'); } @@ -541,6 +598,7 @@ array('nav_db_optimize', 'db&operation=optimize', 0), array('nav_db_dbcheck', 'db&operation=dbcheck', 0) )); + /*search={"nav_db":"action=db&operation=export","nav_db_runquery":"action=db&operation=runquery"}*/ showtips('db_runquery_tips'); showtableheader(); showformheader('db&operation=runquery&option=simple'); @@ -558,6 +616,7 @@ } showtablefooter(); + /*search*/ } else { $queries = $_GET['queries']; @@ -567,7 +626,8 @@ } elseif(!$checkperm) { cpmsg('database_run_query_denied', '', 'error'); } - $sqlquery = splitsql(str_replace(array(' {tablepre}', ' cdb_', ' `cdb_', ' pre_', ' `pre_'), array(' '.$tablepre, ' '.$tablepre, ' `'.$tablepre, ' '.$tablepre, ' `'.$tablepre), $queries)); + $sqlquery = str_replace(array(' cdb_', ' `cdb_', ' pre_', ' `pre_'), array(' {tablepre}', ' `{tablepre}', ' {tablepre}', ' `{tablepre}'), $queries); + $sqlquery = splitsql(str_replace(array(' {tablepre}', ' `{tablepre}'), array(' '.$tablepre, ' `'.$tablepre), $sqlquery)); $affected_rows = 0; foreach($sqlquery as $sql) { if(trim($sql) != '') { @@ -600,7 +660,9 @@ array('nav_db_optimize', 'db&operation=optimize', 1), array('nav_db_dbcheck', 'db&operation=dbcheck', 0) )); + /*search={"nav_db":"action=db&operation=export","nav_db_optimize":"action=db&operation=optimize"}*/ showtips('db_optimize_tips'); + /*search*/ showformheader('db&operation=optimize'); showtableheader('db_optimize_tables'); showsubtitle(array('', 'db_optimize_table_name', 'type', 'db_optimize_rows', 'db_optimize_data', 'db_optimize_index', 'db_optimize_frag')); @@ -669,7 +731,9 @@ if(!C::t('common_setting')->fetch_all_field()) { cpmsg('dbcheck_permissions_invalid', '', 'error'); } - + $installSqlPath = DISCUZ_ROOT.'./install/install.sql'; + if(!file_exists($installSqlPath)) + $installSqlPath = DISCUZ_ROOT.'./install/data/install.sql'; $step = max(1, intval($_GET['step'])); if($step == 3) { @@ -694,7 +758,7 @@ $except = array('threads' => array('sgid')); foreach(C::t('common_member_profile_setting')->range() as $profilefields) { - $except['memberfields'][] = 'field_'.$profilefields[$fieldid]; + $except['memberfields'][] = 'field_'.$profilefields['fieldid']; } if(submitcheck('repairsubmit') && (!empty($repair) || !empty($setting) || !empty($repairtable) || !empty($missingtable))) { @@ -704,8 +768,8 @@ foreach($missingtable as $value) { if(!isset($installdata)) { - $fp = fopen(DISCUZ_ROOT.'./install/install.sql', "rb"); - $installdata = fread($fp, filesize(DISCUZ_ROOT.'./install/install.sql')); + $fp = fopen($installSqlPath, "rb"); + $installdata = fread($fp, filesize($installSqlPath)); fclose($fp); } preg_match("/CREATE TABLE ".DB::table($value)."\s+\(.+?;/is", $installdata, $a); @@ -794,7 +858,7 @@ } } - $installexists = file_exists(DISCUZ_ROOT.'./install/install.sql'); + $installexists = file_exists($installSqlPath); $discuzdbnew = $deltables = $excepttables = $missingtables = $charseterror = array(); foreach($discuzdb as $dbtable => $fields) { if($fieldsquery = DB::query("SHOW FIELDS FROM ".DB::table($dbtable), 'SILENT')) { @@ -857,7 +921,15 @@ } elseif(!isset($discuzdbnew[$dbtable][$key])) { $dellist[] = $value; } elseif($tempvalue != $discuzdbnew[$dbtable][$key]) { - $modifylist[] = $value; + // MySQL 8.0.17 开始不再支持除tinyint(1)以外的任何int类数据类型的显示宽度，检测到此行为则移除数值。 + if((strpos($tempvalue['Type'], 'int(') !== false) && (strpos($discuzdbnew[$dbtable][$key]['Type'], '(') === false)) { + $tempvalue['Type'] = preg_replace('/\(\d+\)/', '', $tempvalue['Type']); + if($tempvalue != $discuzdbnew[$dbtable][$key]) { + $modifylist[] = $value; + } + } else { + $modifylist[] = $value; + } } } if(is_array($discuzdbnew[$dbtable])) { diff --git a/upload/source/admincp/admincp_forums.php b/upload/source/admincp/admincp_forums.php index 633eb2d9..27b9d07a 100644 --- a/upload/source/admincp/admincp_forums.php +++ b/upload/source/admincp/admincp_forums.php @@ -822,7 +822,11 @@ showtips('forums_edit_tips'); } showtableheader('forums_edit_extend', 'nobottom'); - showsetting('forums_edit_extend_style', '', '', $styleselect); + $multi_styleselect = $_GET['multi'] ? preg_replace('/\w+new/', 'multinew['.$_G['showsetting_multi'].'][\\0]', $styleselect) : $styleselect; + $styleid = $forum['styleid']; + $multi_styleselect = str_replace("selected=\"selected\"", "", $multi_styleselect); + $multi_styleselect = str_replace("value=\"$styleid\"", "value=\"$styleid\" selected=\"selected\"", $multi_styleselect); + showsetting('forums_edit_extend_style', '', '', $multi_styleselect); if($forum['type'] != 'sub') { showsetting('forums_edit_extend_sub_horizontal', 'forumcolumnsnew', $forum['forumcolumns'], 'text'); showsetting('forums_edit_extend_subforumsindex', array('subforumsindexnew', array( @@ -858,11 +862,14 @@ )), $forum['defaultorder'], 'mradio'); if($_G['setting']['allowreplybg']) { $replybghtml = ''; - if($forum['replybg']) { - $replybghtml = '
'; - } if($forum['replybg']) { $replybgurl = parse_url($forum['replybg']); + if(isset($replybgurl['host'])) { + $replybgicon = $forum['replybg']; + } else { + $replybgicon = $_G['setting']['attachurl'].'common/'.$forum['replybg'].'?'.random(6); + } + $replybghtml = '
'; } showsetting('forums_edit_extend_reply_background', 'replybgnew', (!$replybgurl['host'] ? str_replace($_G['setting']['attachurl'].'common/', '', $forum['replybg']) : $forum['replybg']), 'filetext', '', 0, $replybghtml); } @@ -1593,6 +1600,10 @@ function formulaexp() { $threadtypes_newdisplayorder = intval($_GET['newdisplayorder'][$key]); $threadtypes_newicon = trim($_GET['newicon'][$key]); $newtypeid = C::t('forum_threadclass')->insert(array('fid' => $fid, 'name' => $val, 'displayorder' => $threadtypes_newdisplayorder, 'icon' => $threadtypes_newicon, 'moderators' => intval($_GET['newmoderators'][$key])), true); + } else { + $threadtypes_newicon = $newtypearr['icon'];// 已存在的分类,使用原来属性 + $threadtypes_newdisplayorder = $newtypearr['displayorder']; + $_GET['newmoderators'][$key] = $newtypearr['moderators']; } $threadtypesnew['options']['name'][$newtypeid] = $val; $threadtypesnew['options']['icon'][$newtypeid] = $threadtypes_newicon; @@ -1791,9 +1802,9 @@ function formulaexp() { if(!$multiset) { if($_GET['delreplybg']) { - $valueparse = parse_url($_GET['replybgnew']); - if(!isset($valueparse['host']) && file_exists($_G['setting']['attachurl'].'common/'.$_GET['replybgnew'])) { - @unlink($_G['setting']['attachurl'].'common/'.$_GET['replybgnew']); + $valueparse = parse_url($forum['replybg']); + if(!isset($valueparse['host']) && file_exists($_G['setting']['attachurl'].'common/'.$forum['replybg'])) { + @unlink($_G['setting']['attachurl'].'common/'.$forum['replybg']); } $_GET['replybgnew'] = ''; } diff --git a/upload/source/admincp/admincp_group.php b/upload/source/admincp/admincp_group.php index 592d1440..366e6b3b 100644 --- a/upload/source/admincp/admincp_group.php +++ b/upload/source/admincp/admincp_group.php @@ -35,6 +35,7 @@ if(!submitcheck('updategroupsetting')) { shownav('group', 'nav_group_setting'); showsubmenu('nav_group_setting'); + /*search={"nav_group_setting":"action=group&operation=setting"}*/ showformheader('group&operation=setting'); showtableheader(); showtitle('groups_setting_basic'); @@ -54,6 +55,7 @@ showsubmit('updategroupsetting'); showtablefooter(); showformfooter(); + /*search*/ } else { require_once libfile('function/group'); @@ -112,7 +114,7 @@ foreach ($forums[$id] as $forum) { $showed[] = showgroup($forum); $lastfid = 0; - if(!empty($subs[$forum['fid']])) { + if(!empty($subs[$forum['fid']])) {//群组不展示了 废弃代码 foreach ($subs[$forum['fid']] as $sub) { $showed[] = showgroup($sub, 'sub'); $lastfid = $sub['fid']; @@ -290,7 +292,7 @@ $nums[$fup['fup']] ++; } foreach($nums as $fup => $num) { - C::t('forum_forumfield')->update_groupnum($fup, -$num); + empty($start) && C::t('forum_forumfield')->update_groupnum($fup, -$num); } foreach(C::t('forum_thread')->fetch_all_by_fid($fidarray, $start, $pp) as $thread) { $tids[] = $thread['tid']; @@ -398,7 +400,7 @@ $threads = $posts = 0; $archive = 0; foreach($threadtables as $tableid) { - C::t('forum_thread')->count_posts_by_fid($targetgroup, $tableid); + $data = C::t('forum_thread')->count_posts_by_fid($targetgroup, $tableid); $threads += $data['threads']; $posts += $data['posts']; if($data['threads'] > 0 && $tableid != 0) { @@ -504,7 +506,7 @@ } else { - $threads = C::t('forum_thread')->count_by_fid($fid); + $threads = C::t('forum_thread')->count_by_fid($fid);//群组不展示了 废弃代码 $formhash = formhash(); cpmsg('grouptype_delete_alarm', "action=group&operation=deletetype&fid=$fid&confirmed=1&formhash=$formhash", 'loadingform', array(), '
0%
', FALSE); echo " @@ -620,7 +622,7 @@ function forumsdelete(url, total, pp, currow) { if($_GET['namenew'] && $_GET['namenew'] != $group['name'] && C::t('forum_forum')->fetch_fid_by_name($_GET['namenew'])) { cpmsg('group_name_exist', 'action=group&operation=editgroup&fid='.$fid, 'error'); } - $setarr['name'] = $_GET['namenew']; + trim($_GET['namenew']) && $setarr['name'] = $_GET['namenew']; C::t('forum_forum')->update($fid, $setarr); if(!empty($_GET['fupnew']) && $_GET['fupnew'] != $group['fup']) { @@ -641,6 +643,7 @@ function forumsdelete(url, total, pp, currow) { shownav('group', 'nav_group_userperm'); $varname = array('newgroup_userperm', array(), 'isfloat'); showsubmenu(cplang('nav_group_userperm').' - '.cplang('group_userperm_moderator')); + /*search={"newgroup_userperm":"action=group&operation=userperm"}*/ showformheader("group&operation=userperm&id=$id"); showtableheader(); $varname[1] = array( @@ -694,6 +697,7 @@ function forumsdelete(url, total, pp, currow) { showsubmit('permsubmit', 'submit'); showtablefooter(); showformfooter(); + /*search*/ } else { $default_perm = array('allowstickthread' => 0, 'allowbumpthread' => 0, 'allowhighlightthread' => 0, 'allowlivethread' => 0, 'allowstampthread' => 0, 'allowclosethread' => 0, 'allowmergethread' => 0, 'allowsplitthread' => 0, 'allowrepairthread' => 0, 'allowrefund' => 0, 'alloweditpoll' => 0, 'allowremovereward' => 0, 'alloweditactivity' => 0, 'allowedittrade' => 0, 'allowdigestthread' => 0, 'alloweditpost' => 0, 'allowwarnpost' => 0, 'allowbanpost' => 0, 'allowdelpost' => 0, 'allowupbanner' => 0, 'disablepostctrl' => 0, 'allowviewip' => 0); $_GET['newgroup_userperm'] = array_merge($default_perm, $_GET['newgroup_userperm']); @@ -737,7 +741,9 @@ function forumsdelete(url, total, pp, currow) { EOT; shownav('group', 'nav_group_level'); showsubmenu('nav_group_level'); + /*search={"nav_group_level":"action=group&operation=level"}*/ showtips('group_level_tips'); + /*search*/ showformheader('group&operation=level'); showtableheader('group_level', 'fixpadding', 'id="grouplevel"'); @@ -914,7 +920,7 @@ function forumsdelete(url, total, pp, currow) { $levelnew['postpolicy']['allowpostspecial'] = bindec(intval($levelnew['postpolicy']['allowpostspecial'][6]).intval($levelnew['postpolicy']['allowpostspecial'][5]).intval($levelnew['postpolicy']['allowpostspecial'][4]).intval($levelnew['postpolicy']['allowpostspecial'][3]).intval($levelnew['postpolicy']['allowpostspecial'][2]).intval($levelnew['postpolicy']['allowpostspecial'][1])); $dataarr['postpolicy'] = serialize($levelnew['postpolicy']); - $dataarr['specialswitch']['membermaximum'] = intval($dataarr['specialswitch']['membermaximum']); + $_GET['specialswitchnew']['membermaximum'] = intval($_GET['specialswitchnew']['membermaximum']); $dataarr['specialswitch'] = serialize($_GET['specialswitchnew']); if($_GET['deleteicon']) { @unlink($_G['setting']['attachurl'].'common/'.$grouplevel['icon']); @@ -987,7 +993,7 @@ function forumsdelete(url, total, pp, currow) { $updateforum = '-'; } foreach($fups as $fid => $num) { - C::t('forum_forumfield')->update_groupnum($fid, $updateforum.$num); + $updateforum && C::t('forum_forumfield')->update_groupnum($fid, $updateforum.$num); } cpmsg('group_mod_succeed', 'action=group&operation=mod', 'succeed'); } @@ -1092,6 +1098,7 @@ function searchgroups($submit) { $dayselect .= "\n"; } + /*search={"nav_group_manage":"action=group&operation=manage"}*/ showtagheader('div', 'searchgroups', !$submit); echo ''; showformheader("group&operation=manage"); @@ -1112,6 +1119,7 @@ function searchgroups($submit) { showtablefooter(); showformfooter(); showtagfooter('div'); + /*search*/ } function countgroups() { diff --git a/upload/source/admincp/admincp_index.php b/upload/source/admincp/admincp_index.php index 04fa88bf..9ddefd15 100644 --- a/upload/source/admincp/admincp_index.php +++ b/upload/source/admincp/admincp_index.php @@ -230,7 +230,7 @@ } } -showtableheader('ตรวจสอบสภาพแวดล้อมการทำงาน', 'fixpadding'); +showtableheader('detect_environment', 'fixpadding'); $env_ok = true; $now_ver_gd = function_exists('gd_info')? gd_info() : false; $now_ver = array('PHP' => constant('PHP_VERSION'), 'MySQL' => helper_dbtool::dbversion(), 'gethostbyname' => function_exists('gethostbyname'), 'file_get_contents' => function_exists('file_get_contents'), 'xml_parser_create' => function_exists('xml_parser_create'), @@ -287,9 +287,9 @@ showtablefooter(); showformfooter(); -showtableheader('ผู้สนับสนุนโครงการ Discuz! โอเพนซอร์ส', 'fixpadding'); +showtableheader('contributors', 'fixpadding'); showtablerow('', array('', 'class="td21" style="text-align:right;"'), - 'Click Here To See Them' + '' . cplang('contributors_see') . '' ); showtablefooter(); @@ -320,9 +320,9 @@ showtablerow('', array('class="vtop td24 lineheight"', 'class="lineheight smallfont"'), array( cplang('home_check_newversion'), - ($newversion['newversion']['release'] ? ($newversion['newversion']['release'] != DISCUZ_RELEASE ? '' : '').'Discuz! '.$newversion['newversion']['version'].' R'.$newversion['newversion']['release'].' '.strtoupper(CHARSET).' '.($newversion['newversion']['release'] != DISCUZ_RELEASE ? '' : '') : 'เซิร์ฟเวอร์ของคุณตรวจไม่พบเวอร์ชันใหม่ กรุณาคลิกที่นี่เพื่อดูเวอร์ชันใหม่'). - ' [ 刷新 ]  

'. - (!empty($downlist) ? implode('、', $downlist).($newversion['newversion']['qqqun'] ? '  |  กลุ่ม QQ:'.$newversion['newversion']['qqqun'].'' : '') : 'ดาวน์โหลดไฟล์ล่าสุด (ภาษาจีน) | ดาวน์โหลดไฟล์ล่าสุด (ภาษาไทย) | กลุ่ม QQ:73'.'21'.'03'.'690') + ($newversion['newversion']['release'] ? ($newversion['newversion']['release'] != DISCUZ_RELEASE ? '' : '').'Discuz! '.$newversion['newversion']['version'].' R'.$newversion['newversion']['release'].' '.strtoupper(CHARSET).' '.($newversion['newversion']['release'] != DISCUZ_RELEASE ? '' : '') : ''.cplang('detect_environment_error').''). + ' [ '.cplang('refresh').' ]  

'. + (!empty($downlist) ? implode('、', $downlist).($newversion['newversion']['qqqun'] ? '  |  '.cplang('qq_group').$newversion['newversion']['qqqun'].'' : '') : ''.cplang('download_latest').' | '.cplang('qq_group').'73'.'21'.'03'.'690') )); showtablerow('', array('class="vtop td24 lineheight"', 'class="lineheight smallfont"'), array( @@ -355,7 +355,7 @@ )); showtablefooter(); -showtableheader('ข่าวสาร Discuz! ล่าสุด', 'fixpadding left" style="width : 48%; margin-left: 2%; clear: none;', '', '3'); +showtableheader('discuz_news', 'fixpadding left" style="width : 48%; margin-left: 2%; clear: none;', '', '3'); if(!empty($newversion['news'])){ $newversion['news'] = dhtmlspecialchars($newversion['news']); foreach ($newversion['news'] as $v){ @@ -366,11 +366,11 @@ } } else { showtablerow('', array('', 'class="td21" style="text-align:right;"'), array( - '暂未获取到动态，请登录 Discuz! 社区 查看。', + ''.cplang('log_in_to_update').'', '', )); showtablerow('', array('', 'class="td21" style="text-align:right;"'), array( - 'Discuz! X3.4 最新版本下载', + ''.cplang('download_latest').'', '', )); } @@ -381,11 +381,11 @@ showtableheader('home_dev', 'fixpadding'); showtablerow('', array('class="vtop td24 lineheight"'), array( cplang('home_dev_copyright'), - '腾讯云计算（北京）有限责任公司' + ''.cplang('org_name').'' )); showtablerow('', array('class="vtop td24 lineheight"', 'class="lineheight smallfont team"'), array( cplang('home_dev_manager'), - '戴志康 (Kevin \'Crossday\' Day)' + ''.cplang('dev_manager').'' )); showtablerow('', array('class="vtop td24 lineheight"', 'class="lineheight smallfont team"'), array( cplang('home_dev_team'), @@ -435,11 +435,11 @@ )); showtablerow('', array('class="vtop td24 lineheight"', 'class="lineheight"'), array( cplang('home_dev_links'), - 'เว็บบอร์ดแอปพลิเคชัน Discuz!, - 公司网站, - 购买授权, - 讨论区, - Discuz! App Store, + ''.cplang('app_discussion').', + '.cplang('org_site').', + '.cplang('purchase_service').', + '.cplang('discussion_area').', + '.cplang('app_center').', Discuz! X Git, Discuz! Thai Official Repositories ')); diff --git a/upload/source/admincp/admincp_login.php b/upload/source/admincp/admincp_login.php index f87543a1..f918d5cc 100644 --- a/upload/source/admincp/admincp_login.php +++ b/upload/source/admincp/admincp_login.php @@ -88,7 +88,7 @@ function html_login_footer($halt = true) {

Powered by Discuz! $version

-

Copyright © 2001-2020, Tencent Cloud.

+

Copyright © 2001-2021, Tencent Cloud.

diff --git a/upload/source/admincp/admincp_main.php b/upload/source/admincp/admincp_main.php index 4d800849..3d0d8d1f 100644 --- a/upload/source/admincp/admincp_main.php +++ b/upload/source/admincp/admincp_main.php @@ -108,8 +108,6 @@ } unset($menu); -$plugindefaultkey = $isfounder ? 1 : 0; - echo << @@ -124,7 +122,7 @@

Powered by Discuz! {$_G['setting']['version']}

-

Copyright © 2001-2020

+

Copyright © 2001-2021

Tencent Cloud.

@@ -176,7 +174,7 @@ function toggleMenu(key, url) { parent.main.location = admincpfilename + '?action=' + url; var hrefs = $('menu_' + key).getElementsByTagName('a'); for(var j = 0; j < hrefs.length; j++) { - hrefs[j].className = j == (key == 'plugin' ? $plugindefaultkey : 0) ? 'tabon' : ''; + hrefs[j].className = j == 0 ? 'tabon' : ''; } } if(key == 'uc') { diff --git a/upload/source/admincp/admincp_makehtml.php b/upload/source/admincp/admincp_makehtml.php index 4bb23095..6b876e8a 100644 --- a/upload/source/admincp/admincp_makehtml.php +++ b/upload/source/admincp/admincp_makehtml.php @@ -49,6 +49,7 @@ showsubmenu('html', $_nav, ''); } if($operation == 'all') { + /*search={"nav_makehtml":"action=makehtml&operation=all"}*/ showtips('makehtml_tips_all'); showformheader('makehtml&operation=all'); @@ -111,8 +112,8 @@ function make_html_topic(starttime){ if(s) { new make_html_batch('portal.php?mod=topic&topicid=', s.split(','), make_html_index, dom); } else { - dom.innerHTML = '$lang[makehtml_nofindtopic]
$lang[makehtml_startmakeindex]
$lang[makehtml_browser_error]'; - setTimeout(function(){\$('mk_category').style.display = 'none'; make_html_index();}, 1000); + dom.innerHTML = '$lang[makehtml_nofindtopic]
$lang[makehtml_startmakeindex]
$lang[makehtml_browser_error]'; + setTimeout(function(){\$('mk_topic').style.display = 'none'; make_html_index();}, 1000); } }); } @@ -136,6 +137,7 @@ function make_html_article(starttime) { EOT; showtablefooter(); showformfooter(); + /*search*/ } elseif($operation == 'index') { showtips('makehtml_tips_index'); @@ -414,6 +416,7 @@ function make_html_topic(starttime) { } elseif ($operation == 'makehtmlsetting') { if(!submitcheck('makehtmlsetting')) { + /*search={"nav_makehtml":"action=makehtml","setting_functions_makehtml":"action=makehtml&operation=makehtmlsetting"}*/ $setting = $_G['setting']; showformheader("makehtml&operation=makehtmlsetting"); showtableheader('', 'nobottom', 'id="makehtml"'.($_GET['operation'] != 'makehtmlsetting' ? ' style="display: none"' : '')); @@ -433,6 +436,7 @@ function make_html_topic(starttime) { showtablefooter(); showsubmit('makehtmlsetting', 'submit'); showformfooter(); + /*search*/ } else { $settingnew = $_GET['settingnew']; if(isset($settingnew['makehtml'])) { @@ -490,6 +494,7 @@ function make_html_topic(starttime) { cpmsg('admincp_makehtml_cleanhtml_error', 'action=makehtml&operation=makehtmlsetting', 'error'); } else { if(!submitcheck('cleanhtml')) { + /*search={"nav_makehtml":"action=makehtml","makehtml_clear":"action=makehtml&operation=cleanhtml"}*/ showformheader("makehtml&operation=cleanhtml"); showtableheader(); @@ -498,6 +503,7 @@ function make_html_topic(starttime) { showtablefooter(); showsubmit('cleanhtml', 'submit'); showformfooter(); + /*search*/ } else { if(isset($_GET['cleandata'])) { $cleandata = $_GET['cleandata']; diff --git a/upload/source/admincp/admincp_members.php b/upload/source/admincp/admincp_members.php index 66ee008b..6d6c2884 100644 --- a/upload/source/admincp/admincp_members.php +++ b/upload/source/admincp/admincp_members.php @@ -205,6 +205,7 @@ if(empty($_GET['uid']) && empty($_GET['username']) && empty($_GET['ip'])) { + /*search={"nav_repeat":"action=members&operation=repeat"}*/ shownav('user', 'nav_members'); showsubmenu('nav_members', array( array('search', 'members&operation=search', 0), @@ -220,6 +221,7 @@ showsubmit('submit', 'submit'); showtablefooter(); showformfooter(); + /*search*/ } else { @@ -343,11 +345,11 @@ if(!empty($_GET['uidarray'])) { $uids = array(); $allmember = C::t('common_member')->fetch_all($_GET['uidarray']); - $count = count($allmember); + $membernum = 0; foreach($allmember as $uid => $member) { if($member['adminid'] !== 1 && $member['groupid'] !== 1) { - if($count < 2000 || !empty($_GET['uidarray'])) { + if($membernum < 2000 ) { $extra .= ''; } $uids[] = $member['uid']; @@ -359,7 +361,7 @@ $uids = searchmembers($search_condition, $delmemberlimit, 0); } $allnum = intval($_GET['allnum']); - $conditions = $uids ? 'm.uid IN ('.dimplode($uids).')' : '0'; + if((empty($membernum) || empty($uids))) { if($deletestart) { @@ -395,10 +397,8 @@ } else { - if(empty($uids)) { - cpmsg('members_no_find_deluser', '', 'error'); - } - $numdeleted = $numdeleted ? $numdeleted : count($uids); + + $pertask = 1000; $current = $_GET['current'] ? intval($_GET['current']) : 0; $deleteitem = $_GET['deleteitem'] ? trim($_GET['deleteitem']) : 'post'; @@ -571,7 +571,7 @@ } showsearchform('newsletter'); - if(submitcheck('submit')) { + if(submitcheck('submit', 1)) { $dostr = ''; if($_GET['do'] == 'mobile') { $search_condition['token_noempty'] = 'token'; @@ -646,7 +646,6 @@ $grouppm['message'].'

'. (!$do ? ''.cplang('members_grouppmlist_view', array('number' => $grouppm['numbers'])).'' : - ''.cplang('members_grouppmlist_view_all').'('.$grouppm['numbers'].')   '. ''.cplang('members_grouppmlist_view_unread').'('.$unreads.')   '. ''.cplang('members_grouppmlist_view_read').'('.($grouppm['numbers'] - $unreads).')'), ''.cplang('delete').'' @@ -667,8 +666,8 @@ $count = $unreads; } $multipage = multi($count, $ppp, $page, ADMINSCRIPT."?action=members&operation=grouppmlist&do=$do".$filteradd); - $alldata = C::t('common_member_grouppm')->fetch_all_by_gpmid($gpmid, $_GET['filter'] == 'read' ? 1 : 0, $start_limit, $ppp); - $allmember = $gpmuser ? C::t('common_member')->fetch_all_username_by_uid(array_keys($gpmuser)) : array(); + $alldata = C::t('common_member_grouppm')->fetch_all_by_gpmid($do, $_GET['filter'] == 'read' ? 1 : 0, $start_limit, $ppp); + $allmember = $alldata ? C::t('common_member')->fetch_all_username_by_uid(array_keys($alldata)) : array(); foreach($alldata as $uid => $gpmuser) { echo '
'.$allmember[$uid].'
 '; if($gpmuser['status'] == 0) { @@ -916,6 +915,7 @@ ($groupselect['special'] ? ''.$groupselect['special'].'' : ''). ($groupselect['specialadmin'] ? ''.$groupselect['specialadmin'].'' : ''). ''.$groupselect['system'].''; + /*search={"nav_members_add":"action=members&operation=add"}*/ shownav('user', 'nav_members_add'); showsubmenu('members_add'); showformheader('members&operation=add'); @@ -928,6 +928,7 @@ showsubmit('addsubmit'); showtablefooter(); showformfooter(); + /*search*/ } else { @@ -1058,6 +1059,7 @@ $groups['member'] = ''; } + /*search={"members_group":"action=members&operation=group"}*/ shownav('user', 'members_group'); showsubmenu('members_group_member', array(), '', array('username' => $member['username'])); echo ''; @@ -1084,6 +1086,7 @@ showtablefooter(); showformfooter(); + /*search*/ } else { @@ -1174,7 +1177,7 @@ } if($_GET['groupidnew'] != $member['groupid'] && (in_array($_GET['groupidnew'], array(4, 5)) || in_array($member['groupid'], array(4, 5)))) { - $my_opt = in_array($_GET['groupidnew'], array(4, 5)) ? 'banuser' : 'unbanuser'; + $my_opt = in_array($_GET['groupidnew'], array(4, 5)) ? 'banuser' : 'unbanuser'; banlog($member['username'], $member['groupid'], $_GET['groupidnew'], $groupexpirynew, $_GET['reason']); } @@ -1226,6 +1229,7 @@ function membercredits() { EOT; shownav('user', 'members_credit'); showsubmenu('members_credit'); + /*search={"members_credit":"action=members&operation=credit"}*/ showtips('members_credit_tips'); showformheader("members&operation=credit&uid={$_GET['uid']}"); showtableheader(''.cplang('members_credit_logs').''.cplang('members_credit').' - '.$member['username'].'('.$member['grouptitle'].')', 'nobottom'); @@ -1238,6 +1242,7 @@ function membercredits() { showsubmit('creditsubmit'); showtablefooter(); showformfooter(); + /*search*/ } else { @@ -1522,7 +1527,7 @@ function getcrimerecord() { if($postcomment_cache_pid) { C::t('forum_postcache')->delete($postcomment_cache_pid); } - if(!$member['adminid']) { + if(in_array($member['adminid'], array(0, -1))) { $member_status = C::t('common_member_status')->fetch($member['uid']); } } elseif($member['groupid'] == 4 || $member['groupid'] == 5) { @@ -1731,7 +1736,7 @@ function getcrimerecord() { C::t('forum_postcache')->delete($postcomment_cache_pid); } } - + if(in_array('profile', $_GET['clear'])) { C::t('common_member_profile'.$tableext)->delete($member['uid']); C::t('common_member_profile'.$tableext)->insert(array('uid' => $member['uid'])); @@ -1765,6 +1770,7 @@ function getcrimerecord() { shownav('user', 'members_access_edit'); showsubmenu('members_access_edit'); + /*search={"members_access_edit":"action=members&operation=access"}*/ showtips('members_access_tips'); showtableheader(cplang('members_access_now').' - '.$member['username'], 'nobottom fixpadding'); showsubtitle(array('forum', 'members_access_view', 'members_access_post', 'members_access_reply', 'members_access_getattach', 'members_access_getimage', 'members_access_postattach', 'members_access_postimage', 'members_access_adminuser', 'members_access_dateline')); @@ -1818,6 +1824,7 @@ function getcrimerecord() { showsubmit('accesssubmit', 'submit'); showtablefooter(); showformfooter(); + /*search*/ } else { @@ -1937,6 +1944,7 @@ function getcrimerecord() { $member['signature'] = html2bbcode($member['sightml']); shownav('user', 'members_edit'); + /*search={"members_edit":"action=members&operation=edit"}*/ showsubmenu("$lang[members_edit] - $member[username]", array( array('connect_member_info', 'members&operation=edit&uid='.$uid, 1), !empty($_G['setting']['connect']['allow']) ? array('connect_member_bindlog', 'members&operation=edit&do=bindlog&uid='.$uid, 0) : array(), @@ -1999,6 +2007,7 @@ function getcrimerecord() { showsubmit('editsubmit'); showtablefooter(); showformfooter(); + /*search*/ } else { @@ -2139,7 +2148,7 @@ function getcrimerecord() { $ipbanned .= showtablerow('', array('class="td25"'), array( "", $theip, - convertip($theip, "./"), + convertip($theip), $banned[admin], $banned[dateline], "" @@ -2216,7 +2225,7 @@ function getcrimerecord() { 'dateline' => $_G['timestamp'], 'expiration' => $expiration, ); - C::t('common_banned')->insert($data); + C::t('common_banned')->insert($data); } if(is_array($_GET['expirationnew'])) { @@ -2773,6 +2782,7 @@ function showsearchform($operation = '') { $usertagselect .= "\n"; } + /*search={"nav_members":"action=members&operation=search"}*/ showtagheader('div', 'searchmembers', !$_GET['submit']); echo ''; echo ''; @@ -2927,6 +2937,7 @@ function showsearchform($operation = '') { showtablefooter(); showformfooter(); showtagfooter('div'); + /*search*/ } function searchcondition($condition) { @@ -3303,7 +3314,7 @@ function notifymembers($operation, $variable) { function banlog($username, $origgroupid, $newgroupid, $expiration, $reason, $status = 0) { global $_G, $_POST; - $cloud_apps = dunserialize($_G['setting']['cloud_apps']); + $cloud_apps = dunserialize($_G['setting']['cloud_apps']); writelog('banlog', dhtmlspecialchars("$_G[timestamp]\t{$_G[member][username]}\t$_G[groupid]\t$_G[clientip]\t$username\t$origgroupid\t$newgroupid\t$expiration\t$reason\t$status")); } diff --git a/upload/source/admincp/admincp_menu.php b/upload/source/admincp/admincp_menu.php index dc59e969..13970d38 100644 --- a/upload/source/admincp/admincp_menu.php +++ b/upload/source/admincp/admincp_menu.php @@ -28,6 +28,7 @@ 'safe' => '', 'extended' => '', 'plugin' => $isfounder ? 'plugins' : '', + 'template' => '', 'tools' => '', ); @@ -64,8 +65,6 @@ $menu['style'] = array( array('menu_setting_customnav', 'nav'), array('menu_setting_styles', 'setting_styles'), - array('menu_styles', 'styles'), - $isfounder ? array('menu_styles_templates', 'templates') : null, array('menu_posting_smilies', 'smilies'), array('menu_click', 'click'), array('menu_thread_stamp', 'misc_stamp'), @@ -169,6 +168,7 @@ array('menu_safe_setting', 'setting_sec'), array('menu_safe_seccheck', 'setting_seccheck'), array('menu_security', 'optimizer_security'), + array('menu_serversec', 'optimizer_serversec'), array('menu_safe_accountguard', 'setting_accountguard'), ); @@ -210,10 +210,17 @@ if($isfounder) { $menu['plugin'] = array( - array('menu_addons', 'cloudaddons'), array('menu_plugins', 'plugins'), ); } + +$menu['template'] = array( + array('menu_styles', 'styles'), +); +if($isfounder && isset($_G['config']['plugindeveloper']) && $_G['config']['plugindeveloper'] > 0) { + $menu['template'][] = array('menu_templates_add', 'templates_add'); +} + loadcache('adminmenu'); if(is_array($_G['cache']['adminmenu'])) { foreach($_G['cache']['adminmenu'] as $row) { @@ -236,6 +243,7 @@ $isfounder ? array('menu_tools_filecheck', 'checktools_filecheck') : null, $isfounder ? array('menu_tools_hookcheck', 'checktools_hookcheck') : null, ); + if($isfounder) { $topmenu['founder'] = ''; @@ -253,6 +261,13 @@ $menu['uc'] = array(); } +if($isfounder || $_G['adminid'] == 1) { + $topmenu['cloudaddons'] = ''; + $menu['cloudaddons'] = array( + array('menu_addons', 'cloudaddons&frame=no', '_blank'), + ); +} + if(!isfounder() && !isset($GLOBALS['admincp']->perms['all'])) { $menunew = $menu; foreach($menu as $topkey => $datas) { diff --git a/upload/source/admincp/admincp_optimizer.php b/upload/source/admincp/admincp_optimizer.php index 33113d24..b275323a 100644 --- a/upload/source/admincp/admincp_optimizer.php +++ b/upload/source/admincp/admincp_optimizer.php @@ -37,18 +37,17 @@ 'optimizer_usergroup4', 'optimizer_usergroup5', 'optimizer_usergroup6', - 'optimizer_cloudsecurity', 'optimizer_attachexpire', 'optimizer_attachrefcheck', 'optimizer_filecheck', 'optimizer_plugin', - 'optimizer_upgrade', - 'optimizer_patch', 'optimizer_loginpwcheck', 'optimizer_loginoutofdate', - 'optimizer_eviluser', - 'optimizer_white_list', - 'optimizer_security_daily', +); + +$serversec_option = array( + 'optimizer_dos8p3', + 'optimizer_httphost' ); if($_G['setting']['connect']['allow']) { @@ -57,7 +56,7 @@ } $check_record_time_key = 'check_record_time'; -if(in_array($operation, array('security', 'performance'))) { +if(in_array($operation, array('security', 'serversec', 'performance'))) { $_GET['anchor'] = $operation; $operation = ''; } @@ -66,6 +65,11 @@ $optimizer_option = $security_option; $check_record_time_key = 'security_check_record_time'; showsubmenu('menu_security'); +} elseif($_GET['anchor'] == 'serversec') { + shownav('safe', 'menu_serversec'); + $optimizer_option = $serversec_option; + $check_record_time_key = 'serversec_check_record_time'; + showsubmenu('menu_serversec'); } elseif($_GET['anchor'] == 'performance') { shownav('founder', 'menu_optimizer'); showsubmenu('menu_optimizer'); @@ -81,10 +85,11 @@ $optimizer = new optimizer($type); } -$_GET['anchor'] = in_array($_GET['anchor'], array('security', 'performance')) ? $_GET['anchor'] : 'security'; +$_GET['anchor'] = in_array($_GET['anchor'], array('security', 'serversec', 'performance')) ? $_GET['anchor'] : 'security'; $current = array($_GET['anchor'] => 1); showmenu('nav_founder_optimizer', array( array('founder_optimizer_security', 'optimizer&anchor=security', $current['security']), + array('founder_optimizer_serversec', 'optimizer&anchor=serversec', $current['serversec']), array('founder_optimizer_performance', 'optimizer&anchor=performance', $current['performance']), )); @@ -146,8 +151,8 @@ $checkrecordtime = C::t('common_optimizer')->fetch($check_record_time_key); - if(!$_GET['checking'] && $_GET['anchor'] == 'security') { - showtips('optimizer_security_tips'); + if(!$_GET['checking']) { + showtips('optimizer_'.$_GET['anchor'].'_tips'); } showtableheader(); diff --git a/upload/source/admincp/admincp_plugins.php b/upload/source/admincp/admincp_plugins.php index 3d80341b..0b677f07 100644 --- a/upload/source/admincp/admincp_plugins.php +++ b/upload/source/admincp/admincp_plugins.php @@ -35,14 +35,6 @@ if(!submitcheck('submit')) { loadcache('plugin'); - shownav('plugin'); - showsubmenu('nav_plugins', array( - array('plugins_list', 'plugins'), - $isplugindeveloper ? array('plugins_add', 'plugins&operation=add', 0) : array(), - array('cloudaddons_plugin_link', 'cloudaddons'), - ), ''.$lang['plugins_validator'].''); - showformheader('plugins'); - showtableheader('', 'psetting'); $outputsubmit = false; $plugins = $addonids = array(); $plugins = C::t('common_plugin')->fetch_all_data(); @@ -57,22 +49,37 @@ loadcache('addoncheck_plugin'); $checkresult = $_G['cache']['addoncheck_plugin']; } + $updatecount = 0; $splitavailable = array(); foreach($plugins as $plugin) { $addonid = $plugin['identifier'].'.plugin'; $updateinfo = ''; list(, $newver, $sysver) = explode(':', $checkresult[$addonid]); if($sysver && $sysver > $plugin['version']) { - $updateinfo = ''.$lang['plugins_find_newversion'].' '.$sysver.''; + $updateinfo = ''.$lang['plugins_find_newversion'].' '.$sysver.''; } elseif($newver) { - $updateinfo = ''.$lang['plugins_find_newversion'].' '.$newver.''; + $updateinfo = ''.$lang['plugins_find_newversion'].' '.$newver.''; } $plugins[] = $plugin['identifier']; $hookexists = FALSE; $plugin['modules'] = dunserialize($plugin['modules']); $submenuitem = array(); if(isset($_G['cache']['plugin'][$plugin['identifier']])) { - $submenuitem[] = ''.$lang['config'].''; + //为配合插件完全接管变量设置功能，当插件第一个后台设置模块为config时，插件列表不显示默认的设置 + $configexists = FALSE; + if(is_array($plugin['modules'])) { + foreach($plugin['modules'] as $k => $module) { + if ($module['type'] == 3) { + if ($module['name'] == 'config') { + $configexists = TRUE; + } + break; + } + } + } + if (!$configexists) { + $submenuitem[] = ''.$lang['config'].''; + } } if(is_array($plugin['modules'])) { foreach($plugin['modules'] as $k => $module) { @@ -92,10 +99,9 @@ $hl = !empty($_GET['hl']) && $_GET['hl'] == $plugin['pluginid']; $intro = $title = ''; if($updateinfo) { - $order = 'updatelist'; - } else { - $order = $plugin['available'] ? 'open' : 'close'; + $updatecount++; } + $order = $plugin['available'] ? 'open' : 'close'; if($plugin['pluginid'] == $_GET['hl']) { $order = 'hightlight'; } else { @@ -113,10 +119,10 @@ } $pluginlist[$order][$plugin['pluginid']] = $title.showtablerow('class="hover'.($hl ? ' hl' : '').'"', array('valign="top" style="width:45px"', 'valign="top"', 'align="right" valign="bottom" style="width:160px"'), array( '', - ''.dhtmlspecialchars($plugin['name']).' '.dhtmlspecialchars($plugin['version']).' ('.$plugin['identifier'].')'.($updateinfo ? ' '.$updateinfo.'' : ''). + ''.dhtmlspecialchars($plugin['name']).' '.dhtmlspecialchars($plugin['version']).' ('.$plugin['identifier'].')'.($updateinfo ? ' '.$updateinfo.'' : ''). ($plugin['description'] || $plugin['modules']['extra']['intro'] ? ''.cplang('plugins_home').'' : ''). '

'.($plugin['copyright'] ? cplang('author').': '.dhtmlspecialchars($plugin['copyright']).' | ' : ''). - ''.$lang['plugins_visit'].'

'. + ''.$lang['plugins_visit'].'

'. '

'.implode(' | ', $submenuitem).'

', ($hookexists !== FALSE && $plugin['available'] ? $lang['display_order'].":

" : ''). (!$plugin['available'] ? "$lang[enable]  " : "$lang[closed]  "). @@ -125,8 +131,19 @@ ($isplugindeveloper && !$plugin['modules']['system'] ? "$lang[plugins_editlink]  " : ''), ), true); } + + shownav('plugin', 'plugins_list'); + showsubmenu('nav_plugins', array( + array('plugins_list', 'plugins', 1), + $isplugindeveloper ? array('plugins_add', 'plugins&operation=add', 0) : array(), + array('plugins_validator'.($updatecount ? '_new' : ''), 'plugins&operation=upgradecheck', 0), + array('cloudaddons_plugin_link', 'cloudaddons&frame=no&operation=plugins&from=more', 0, 1), + ), ''.$lang['plugins_question'].'', array('updatecount' => $updatecount)); + showformheader('plugins'); + showtableheader('', 'psetting'); + ksort($pluginlist); - $pluginlist = (array)$pluginlist['hightlight'] + (array)$pluginlist['updatelist'] + (array)$pluginlist['open'] + (array)$pluginlist['close']; + $pluginlist = (array)$pluginlist['hightlight'] + (array)$pluginlist['open'] + (array)$pluginlist['close']; echo implode('', $pluginlist); if(empty($_GET['system'])) { @@ -159,9 +176,9 @@ $file = $entrydir.'/'.$f; $newlist .= showtablerow('class="hover"', array('style="width:45px"', 'valign="top"', 'align="right" valign="bottom" style="width:160px"'), array( '', - ''.$entrytitle.' '.$entryversion.($filemtime > TIMESTAMP - 86400 ? ' New!' : '').' ('.$entry.')'. - '

'.($entrycopyright ? cplang('author').': '.$entrycopyright.' | ' : ''). - ''.$lang['plugins_visit'].'

', + ''.$entrytitle.' '.$entryversion.($filemtime > TIMESTAMP - 86400 ? ' New!' : '').' ('.$entry.')'. + '

'.($entrycopyright ? cplang('author').': '.$entrycopyright.' | ' : ''). + ''.$lang['plugins_visit'].'

', ''.$lang['plugins_config_install'].'' ), true); } @@ -174,9 +191,9 @@ } if($outputsubmit) { - showsubmit('submit', 'submit', '', ''.cplang('cloudaddons_plugin_link').''); + showsubmit('submit', 'submit', '', ''.cplang('cloudaddons_plugin_link').''); } else { - showsubmit('', '', '', ''.cplang('cloudaddons_plugin_link').''); + showsubmit('', '', '', ''.cplang('cloudaddons_plugin_link').''); } showtablefooter(); showformfooter(); @@ -224,6 +241,7 @@ } } + $available = $operation == 'enable' ? 1 : 0; if($operation == 'enable') { require_once libfile('cache/setting', 'function'); @@ -247,6 +265,19 @@ } } } + $addonid = $dir.'.plugin'; + $array = cloudaddons_getmd5($addonid); + $array = array(); + if(preg_match('/^[a-z0-9_\.]+$/i', $addonid) && file_exists(DISCUZ_ROOT.'./data/addonmd5/'.$addonid.'.xml')) { + require_once libfile('class/xml'); + $xml = implode('', @file(DISCUZ_ROOT.'./data/addonmd5/'.$addonid.'.xml')); + $array = xml2array($xml); + } else { + $array = false; + } +/*jaideejung007*/ //if(dfsockopen(cloudaddons_url('&from=s').'&mod=app&ac=vali'.'dator&ver=2&addonid='.$addonid.($array !== false ? '&rid='.$array['RevisionID'].'&sn='.$array['SN'].'&rd='.$array['RevisionDateline'] : ''), 0, '', '', false, CLOUDADDONS_DOWNLOAD_IP, 15) === '0') { +/*jaideejung007*/ //$available = 0; +/*jaideejung007*/ //} if($exists) { $plugins = array(); foreach(C::t('common_plugin')->fetch_all_by_identifier(array_keys($exists)) as $plugin) { @@ -258,7 +289,6 @@ $conflictplugins = '
'.implode('
', $plugins).'
'; } } - $available = $operation == 'enable' ? 1 : 0; C::t('common_plugin')->update($_GET['pluginid'], array('available' => $available)); updatecache(array('plugin', 'setting', 'styles')); cleartemplatecache(); @@ -339,9 +369,8 @@ } elseif($operation == 'import') { if(submitcheck('importsubmit') || isset($_GET['dir'])) { - cloudaddons_validator($_GET['dir'].'.plugin'); - if(!isset($_GET['installtype'])) { + cloudaddons_validator($_GET['dir'].'.plugin'); $pdir = DISCUZ_ROOT.'./source/plugin/'.$_GET['dir']; $d = dir($pdir); $xmls = ''; @@ -385,6 +414,11 @@ '
'; exit; } + $addonid = $dir.'.plugin'; + $array = cloudaddons_getmd5($addonid); +/*jaideejung007*/ //if(cloudaddons_open('&mod=app&ac=validator&ver=2&addonid='.$addonid.($array !== false ? '&rid='.$array['RevisionID'].'&sn='.$array['SN'].'&rd='.$array['RevisionDateline'] : '')) === '0') { +/*jaideejung007*/ //cpmsg('c'.'lou'.'dad'.'dons'.'_genu'.'ine_m'.'essa'.'ge', '', 'error', array('addonid' => $addonid)); +/*jaideejung007*/ //} } if(!ispluginkey($pluginarray['plugin']['identifier'])) { @@ -676,7 +710,7 @@ if(!submitcheck('editsubmit')) { $operation = ''; shownav('plugin', $plugin['name']); - showsubmenuanchors($plugin['name'], $submenuitem); + showsubmenuanchors($plugin['name'].' '.$plugin['version'].(!$plugin['available'] ? ' ('.$lang['plugins_unavailable'].')' : ''), $submenuitem); if($pluginvars) { showformheader("plugins&operation=config&do=$pluginid"); @@ -820,7 +854,7 @@ if($modfile) { shownav('plugin', $plugin['name']); - showsubmenu($plugin['name'], $submenuitem); + showsubmenu($plugin['name'].' '.$plugin['version'].(!$plugin['available'] ? ' ('.$lang['plugins_unavailable'].')' : ''), $submenuitem); if(!@include(DISCUZ_ROOT.$modfile)) { cpmsg('plugins_setting_module_nonexistence', '', 'error', array('modfile' => $modfile)); } else { @@ -843,7 +877,7 @@ showsubmenu('nav_plugins', array( array('plugins_list', 'plugins', 0), array('plugins_add', 'plugins&operation=add', 1), - array('cloudaddons_plugin_link', 'cloudaddons'), + array('cloudaddons_plugin_link', 'cloudaddons&frame=no&operation=plugins&from=more', 0, 1), )); showtips('plugins_add_tips'); @@ -878,6 +912,7 @@ 'copyright' => $copyrightnew, ); $pluginid = C::t('common_plugin')->insert($data, true); + dmkdir(DISCUZ_ROOT.'./source/plugin/'.$identifiernew.'/'); updatecache(array('plugin', 'setting', 'styles')); cleartemplatecache(); cpmsg('plugins_add_succeed', "action=plugins&operation=edit&pluginid=$pluginid", 'succeed'); @@ -1526,9 +1561,9 @@ function shide(obj, id) { } foreach($result as $id => $row) { if($row['result'] == 0) { - $errarray[] = ''.$plugins[$id].''; + $errarray[] = ''.$plugins[$id].''; } elseif($row['result'] == 2) { - $newarray[] = ''.$plugins[$id].($row['newver'] ? ' -> '.$row['newver'] : '').''; + $newarray[] = ''.$plugins[$id].($row['newver'] ? ' -> '.$row['newver'] : '').''; } } if(!$nowarray && !$newarray && !$errarray) { @@ -1538,8 +1573,9 @@ function shide(obj, id) { showsubmenu('nav_plugins', array( array('plugins_list', 'plugins', 0), $isplugindeveloper ? array('plugins_add', 'plugins&operation=add', 0) : array(), - array('cloudaddons_plugin_link', 'cloudaddons'), - ), ''.$lang['plugins_validator'].''); + array('plugins_validator', 'plugins&operation=upgradecheck', 1), + array('cloudaddons_plugin_link', 'cloudaddons&frame=no&operation=plugins&from=more', 0, 1), + ), ''.$lang['plugins_question'].''); showtableheader(); if($nowarray) { showtitle('plugins_validator_nowupgrade'); diff --git a/upload/source/admincp/admincp_recyclebinpost.php b/upload/source/admincp/admincp_recyclebinpost.php index 442e7226..4b13ac14 100644 --- a/upload/source/admincp/admincp_recyclebinpost.php +++ b/upload/source/admincp/admincp_recyclebinpost.php @@ -1,7 +1,7 @@ "; + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_curscript":"action=setting&operation=functions&anchor=curscript"}*/ showtableheader('setting_functions_curscript_list', 'nobottom', 'id="curscript"'.($_GET['anchor'] != 'curscript' ? ' style="display: none"' : '')); $modulehtml = array(); $modulehtml[] = ''.$lang['setting_functions_curscript_portal'].''.$lang['setting_functions_curscript_portal_intro'].''.($setting['portalstatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; @@ -1156,7 +1199,9 @@ function getcodetext(obj, ctype) { $modulehtml[] = ''.$lang['setting_functions_curscript_ranklist'].''.$lang['setting_functions_curscript_ranklist_intro'].''.($setting['rankliststatus'] ? $lang['setting_functions_curscript_close']:$lang['setting_functions_curscript_open']).''; echo ''.implode('', $modulehtml).''; showtablefooter(); + /*search*/ + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_mod":"action=setting&operation=functions&anchor=mod"}*/ showtips('setting_tips', 'mod_tips', $_GET['anchor'] == 'mod'); showtableheader('', 'nobottom', 'id="mod"'.($_GET['anchor'] != 'mod' ? ' style="display: none"' : '')); showsetting('setting_functions_mod_updatestat', 'settingnew[updatestat]', $setting['updatestat'], 'radio'); @@ -1167,6 +1212,7 @@ function getcodetext(obj, ctype) { showsetting('setting_functions_mod_maxmodworksmonths', 'settingnew[maxmodworksmonths]', $setting['maxmodworksmonths'], 'text'); showsetting('setting_functions_mod_losslessdel', 'settingnew[losslessdel]', $setting['losslessdel'], 'text'); showsetting('setting_functions_mod_reasons', 'settingnew[modreasons]', $setting['modreasons'], 'textarea'); + showsetting('setting_functions_mod_reasons_public', 'settingnew[modreasons_public]', $setting['modreasons_public'], 'radio'); showsetting('setting_functions_user_reasons', 'settingnew[userreasons]', $setting['userreasons'], 'textarea'); showsetting('setting_functions_mod_bannedmessages', array('settingnew[bannedmessages]', array( $lang['setting_functions_mod_bannedmessages_thread'], @@ -1177,6 +1223,7 @@ function getcodetext(obj, ctype) { showsetting('setting_functions_mod_rewardexpiration', 'settingnew[rewardexpiration]', $setting['rewardexpiration'], 'text'); showsetting('setting_functions_mod_moddetail', 'settingnew[moddetail]', $setting['moddetail'], 'radio'); showtablefooter(); + /*search*/ $setting['heatthread'] = dunserialize($setting['heatthread']); $setting['recommendthread'] = dunserialize($setting['recommendthread']); @@ -1200,12 +1247,15 @@ function getcodetext(obj, ctype) { } } + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_heatthread":"action=setting&operation=functions&anchor=heatthread"}*/ showtips('setting_functions_heatthread_tips', 'heatthread_tips', $_GET['anchor'] == 'heatthread'); showtableheader('', 'nobottom', 'id="heatthread"'.($_GET['anchor'] != 'heatthread' ? ' style="display: none"' : '')); showsetting('setting_functions_heatthread_period', 'settingnew[heatthread][period]', $setting['heatthread']['period'], 'text'); showsetting('setting_functions_heatthread_iconlevels', '', '', '
'.$heatthreadicons); showtablefooter(); + /*search*/ + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_recommend":"action=setting&operation=functions&anchor=recommend"}*/ showtips('setting_functions_recommend_tips', 'recommend_tips', $_GET['anchor'] == 'recommend'); showtableheader('', 'nobottom', 'id="recommend"'.($_GET['anchor'] != 'recommend' ? ' style="display: none"' : '')); showsetting('setting_functions_recommend_status', 'settingnew[recommendthread][status]', $setting['recommendthread']['status'], 'radio', 0, 1); @@ -1215,7 +1265,9 @@ function getcodetext(obj, ctype) { showsetting('setting_functions_recommend_ownthread', 'settingnew[recommendthread][ownthread]', $setting['recommendthread']['ownthread'], 'radio'); showsetting('setting_functions_recommend_iconlevels', '', '', '
'.$recommendicons); showtablefooter(); + /*search*/ + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_comment":"action=setting&operation=functions&anchor=comment"}*/ showtableheader('', 'nobottom', 'id="comment"'.($_GET['anchor'] != 'comment' ? ' style="display: none"' : '')); showsetting('setting_functions_comment_allow', array('settingnew[allowpostcomment]', array( array(1, $lang['setting_functions_comment_allow_1'], 'commentextra'), @@ -1235,7 +1287,9 @@ function getcodetext(obj, ctype) { showsetting($data['name'].cplang('setting_functions_comment_commentitem_threadplugin'), 'settingnew[commentitem]['.$tpid.']', $setting['commentitem'][$tpid], 'textarea', '', 0, cplang('setting_functions_comment_commentitem_threadplugin_comment')); } showtablefooter(); + /*search*/ + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_threadexp":"action=setting&operation=functions&anchor=threadexp"}*/ showtableheader('', 'nobottom', 'id="threadexp"'.($_GET['anchor'] != 'threadexp' ? ' style="display: none"' : '')); showsetting('setting_functions_threadexp_repliesrank', 'settingnew[repliesrank]', $setting['repliesrank'], 'radio'); showsetting('setting_functions_threadexp_blacklist', 'settingnew[threadblacklist]', $setting['threadblacklist'], 'radio'); @@ -1245,7 +1299,9 @@ function getcodetext(obj, ctype) { showsetting('setting_functions_threadexp_hidefilteredpost', 'settingnew[hidefilteredpost]', $setting['hidefilteredpost'], 'radio'); showsetting('setting_functions_threadexp_filterednovote', 'settingnew[filterednovote]', $setting['filterednovote'], 'radio'); showtablefooter(); + /*search*/ + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_other":"action=setting&operation=functions&anchor=other"}*/ showtips('setting_tips', 'other_tips', $_GET['anchor'] == 'other'); showtableheader('', 'nobottom', 'id="other"'.($_GET['anchor'] != 'other' ? ' style="display: none"' : '')); showsetting('setting_functions_other_pwdsafety', 'settingnew[pwdsafety]', $setting['pwdsafety'], 'radio'); @@ -1267,7 +1323,9 @@ function getcodetext(obj, ctype) { showsetting('setting_functions_other_darkroom', 'settingnew[darkroom]', $setting['darkroom'], 'radio'); showsetting('setting_functions_other_global_sign', 'settingnew[globalsightml]', $setting['globalsightml'], 'textarea'); showtablefooter(); + /*search*/ + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_guide":"action=setting&operation=functions&anchor=guide"}*/ $setting['guide'] = unserialize($setting['guide']); showtableheader('', 'nobottom', 'id="guide"'.($_GET['anchor'] != 'guide' ? ' style="display: none"' : '')); showsetting('setting_functions_heatthread_guidelimit', 'settingnew[heatthread][guidelimit]', $setting['heatthread']['guidelimit'], 'text'); @@ -1280,7 +1338,9 @@ function getcodetext(obj, ctype) { showsetting('setting_functions_guide_hotdt', array('settingnew[guide][hotdt]', $dtarray), $setting['guide']['hotdt'], 'select'); showsetting('setting_functions_guide_digestdt', array('settingnew[guide][digestdt]', $dtarray), $setting['guide']['digestdt'], 'select'); showtablefooter(); + /*search*/ + /*search={"setting_functions":"action=setting&operation=functions","setting_functions_activity":"action=setting&operation=functions&anchor=activity"}*/ showtableheader('', 'nobottom', 'id="activity"'.($_GET['anchor'] != 'activity' ? ' style="display: none"' : '')); showsetting('setting_functions_activity_type', 'settingnew[activitytype]', $setting['activitytype'], 'textarea'); $varname = array('settingnew[activityfield]', array(), 'isfloat'); @@ -1300,6 +1360,7 @@ function getcodetext(obj, ctype) { showsetting('setting_functions_activity_credit', '', '' ,''); showsetting('setting_functions_activity_pp', 'settingnew[activitypp]', $setting['activitypp'], 'text'); showtablefooter(); + /*search*/ showtableheader('', 'notop'); if($_GET['anchor'] != 'curscript') { @@ -1321,6 +1382,7 @@ function getcodetext(obj, ctype) { } } + /*search={"setting_permissions":"action=setting&operation=permissions"}*/ showtableheader(); showsetting('setting_permissions_allowviewuserthread', 'settingnew[allowviewuserthread][allow]', $setting['allowviewuserthread']['allow'], 'radio', 0, 1); showsetting('setting_permissions_allowviewuserthread_fids', '', '', $forumselect); @@ -1348,6 +1410,7 @@ function getcodetext(obj, ctype) { showsetting('setting_permissions_dupkarmarate', 'settingnew[dupkarmarate]', $setting['dupkarmarate'], 'radio'); showsetting('setting_permissions_editperdel', 'settingnew[editperdel]', $setting['editperdel'], 'radio'); showsetting('setting_permissions_hideexpiration', 'settingnew[hideexpiration]', $setting['hideexpiration'], 'text'); + /*search*/ } elseif($operation == 'credits') { @@ -1358,6 +1421,7 @@ function getcodetext(obj, ctype) { echo ''; showtableheader(); + /*search*/ } elseif($operation == 'mail' && $isfounder) { $setting['mail'] = dunserialize($setting['mail']); $passwordmask = $setting['mail']['auth_password'] ? $setting['mail']['auth_password'][0].'********'.substr($setting['mail']['auth_password'], -2) : ''; + /*search={"setting_mail":"action=setting&operation=mail","setting_mail_setting":"action=setting&operation=mail&anchor=setting"}*/ showtableheader('', '', 'id="mailsetting"'.($_GET['anchor'] != 'setting' ? ' style="display: none"' : '')); showsetting('setting_mail_setting_send', array('settingnew[mail][mailsend]', array( @@ -1603,12 +1669,15 @@ function setrowtypedata(sendtype) { showsetting('setting_mail_setting_silent', 'settingnew[mail][sendmail_silent]', $setting['mail']['sendmail_silent'], 'radio'); showsubmit('settingsubmit'); showtablefooter(); + /*search*/ + /*search={"setting_mail":"action=setting&operation=mail","setting_mail_check":"action=setting&operation=mail&anchor=check"}*/ showtableheader('', '', 'id="mailcheck"'.($_GET['anchor'] != 'check' ? ' style="display: none"' : '')); showsetting('setting_mail_check_test_from', 'test_from', '', 'text'); showsetting('setting_mail_check_test_to', 'test_to', '', 'textarea'); showsubmit('', '', '', ''); showtablefooter(); + /*search*/ showformfooter(); exit; @@ -1618,6 +1687,7 @@ function setrowtypedata(sendtype) { loadcache('usergroups'); $setting['accountguard'] = dunserialize($setting['accountguard']); $usergroups = C::t('common_usergroup_field')->fetch_all(array_keys($_G['cache']['usergroups'])); + /*search={"setting_accountguard":"action=setting&operation=sec","setting_sec_reginput":"action=setting&operation=sec&anchor=accountguard"}*/ showtableheader('', 'nobottom'); $forcelogin = ''.cplang('usergroups_edit_basic_forcelogin_none').''.($_G['setting']['connect']['allow'] ? ''.cplang('usergroups_edit_basic_forcelogin_qq').'' : '').''.cplang('usergroups_edit_basic_forcelogin_mail').''; ksort($_G['cache']['usergroups']); @@ -1644,6 +1714,7 @@ function setrowtypedata(sendtype) { showtableheader('setting_sec_accountguard_forcelogin', 'nobottom'); echo $forcelogin; showtablefooter(); + /*search*/ } elseif($operation == 'seccheck') { @@ -1664,10 +1735,11 @@ function setrowtypedata(sendtype) { $seccodetypearray = array_merge($seccodetypearray, getseccodes($seccodesettings)); + /*search={"setting_seccheck":"action=setting&operation=sec","setting_sec_seccode":"action=setting&operation=sec&anchor=seccode"}*/ showtips('setting_sec_code_tips', 'seccode_tips', $_GET['anchor'] == 'seccode'); showtableheader('', '', 'id="seccode"'.($_GET['anchor'] != 'seccode' ? ' style="display: none"' : '')); - showtitle('setting_sec_seccode_rule_setting'); + showtitle('setting_sec_seccode_rule_setting'); showsetting('setting_sec_seccode_rule_register', array('settingnew[seccodedata][rule][register][allow]', array( array(2, cplang('setting_sec_seccode_rule_register_auto'), array('secrule_register' => '')), array(1, cplang('setting_sec_seccode_rule_register_on'), array('secrule_register' => 'none')), @@ -1751,6 +1823,7 @@ function setrowtypedata(sendtype) { showsubmit('settingsubmit'); showtablefooter(); + /*search*/ $setting['secqaa'] = dunserialize($setting['secqaa']); $start_limit = ($page - 1) * 10; @@ -1765,6 +1838,7 @@ function setrowtypedata(sendtype) { ]; EOT; + /*search={"setting_seccheck":"action=setting&operation=sec","setting_sec_secqaa":"action=setting&operation=sec&anchor=secqaa"}*/ showtips('setting_sec_qaa_tips', 'secqaa_tips', $_GET['anchor'] == 'secqaa'); showtagheader('div', 'secqaa', $_GET['anchor'] == 'secqaa'); showtableheader('setting_sec_secqaa', 'nobottom'); @@ -1798,19 +1872,23 @@ function setrowtypedata(sendtype) { showsubmit('settingsubmit', 'submit', 'del', '', $multipage); showtablefooter(); showtagfooter('div'); + /*search*/ exit; } elseif($operation == 'sec') { $setting['reginput'] = dunserialize($setting['reginput']); + /*search={"setting_sec":"action=setting&operation=sec","setting_sec_base":"action=setting&operation=sec&anchor=base"}*/ showtableheader('', '', 'id="base"'.($_GET['anchor'] != 'base' ? ' style="display: none"' : '')); showsetting('setting_sec_floodctrl', 'settingnew[floodctrl]', $setting['floodctrl'], 'text'); showsetting('setting_sec_base_need_email', 'settingnew[need_email]', $setting['need_email'], 'radio'); showsetting('setting_sec_base_need_avatar', 'settingnew[need_avatar]', $setting['need_avatar'], 'radio'); showsetting('setting_sec_base_need_friendnum', 'settingnew[need_friendnum]', $setting['need_friendnum'], 'text'); showtablefooter(); + /*search*/ + /*search={"setting_sec":"action=setting&operation=sec","setting_sec_reginput":"action=setting&operation=sec&anchor=reginput"}*/ showtagheader('div', 'reginput', $_GET['anchor'] == 'reginput'); showtableheader('setting_sec_reginput', 'nobottom'); showsetting('setting_sec_reginput_username', 'settingnew[reginput][username]', $setting['reginput']['username'], 'text'); @@ -1819,7 +1897,9 @@ function setrowtypedata(sendtype) { showsetting('setting_sec_reginput_email', 'settingnew[reginput][email]', $setting['reginput']['email'], 'text'); showtablefooter(); showtagfooter('div'); + /*search*/ + /*search={"setting_sec":"action=setting&operation=sec","setting_sec_reginput":"action=setting&operation=sec&anchor=postperiodtime"}*/ showtagheader('div', 'postperiodtime', $_GET['anchor'] == 'postperiodtime'); showtableheader('setting_sec_postperiodtime', 'nobottom'); showsetting('setting_datetime_postbanperiods', 'settingnew[postbanperiods]', $setting['postbanperiods'], 'textarea'); @@ -1828,6 +1908,7 @@ function setrowtypedata(sendtype) { showsetting('setting_datetime_postignoreip', 'settingnew[postignoreip]', $setting['postignoreip'], 'textarea'); showtablefooter(); showtagfooter('div'); + /*search*/ } elseif($operation == 'datetime') { @@ -1836,6 +1917,7 @@ function setrowtypedata(sendtype) { $setting['userdateformat'] = dateformat($setting['userdateformat']); $setting['dateformat'] = dateformat($setting['dateformat']); + /*search={"setting_datetime":"action=setting&operation=datetime"}*/ showtableheader(); showtitle('setting_datetime_format'); showsetting('setting_datetime_dateformat', 'settingnew[dateformat]', $setting['dateformat'], 'text'); @@ -1855,9 +1937,11 @@ function setrowtypedata(sendtype) { showsetting('setting_datetime_visitbanperiods', 'settingnew[visitbanperiods]', $setting['visitbanperiods'], 'textarea'); showsetting('setting_datetime_ban_downtime', 'settingnew[attachbanperiods]', $setting['attachbanperiods'], 'textarea'); showsetting('setting_datetime_searchbanperiods', 'settingnew[searchbanperiods]', $setting['searchbanperiods'], 'textarea'); + /*search*/ } elseif($operation == 'attach') { + /*search={"setting_attach":"action=setting&operation=attach","setting_attach_basic":"action=setting&operation=attach&anchor=basic"}*/ showtableheader('', '', 'id="basic"'.($_GET['anchor'] != 'basic' ? ' style="display: none"' : '')); showsetting('setting_attach_basic_dir', 'settingnew[attachdir]', $setting['attachdir'], 'text'); showsetting('setting_attach_basic_url', 'settingnew[attachurl]', $setting['attachurl'], 'text'); @@ -1865,13 +1949,16 @@ function setrowtypedata(sendtype) { array(0, $lang['setting_attach_image_watermarktype_GD'], array('imagelibext' => 'none')), array(1, $lang['setting_attach_image_watermarktype_IM'], array('imagelibext' => '')) )), $setting['imagelib'], 'mradio'); + showsetting('setting_attach_image_gdlimit', 'settingnew[gdlimit]', $setting['gdlimit'], 'text'); showsetting('setting_attach_image_thumbquality', 'settingnew[thumbquality]', $setting['thumbquality'], 'text'); showsetting('setting_attach_image_disabledmobile', 'settingnew[thumbdisabledmobile]', !$setting['thumbdisabledmobile'], 'radio'); showsetting('setting_attach_image_preview', '', '', cplang('setting_attach_image_thumb_preview_btn')); showtagfooter('tbody'); showsubmit('settingsubmit'); showtablefooter(); + /*search*/ + /*search={"setting_attach":"action=setting&operation=attach","setting_attach_forumattach":"action=setting&operation=attach&anchor=forumattach"}*/ showtableheader('', '', 'id="forumattach"'.($_GET['anchor'] != 'forumattach' ? ' style="display: none"' : '')); showsetting('setting_attach_basic_imgpost', 'settingnew[attachimgpost]', $setting['attachimgpost'], 'radio'); showsetting('setting_attach_basic_allowattachurl', 'settingnew[allowattachurl]', $setting['allowattachurl'], 'radio'); @@ -1889,6 +1976,7 @@ function setrowtypedata(sendtype) { showsetting('setting_attach_antileech_expire', 'settingnew[attachexpire]', $setting['attachexpire'], 'text'); showsetting('setting_attach_antileech_refcheck', 'settingnew[attachrefcheck]', $setting['attachrefcheck'], 'radio'); showtagfooter('tbody'); + /*search*/ showsubmit('settingsubmit'); showtablefooter(); @@ -1902,6 +1990,7 @@ function setrowtypedata(sendtype) { require_once libfile('function/cache'); + /*search={"setting_attach":"action=setting&operation=attach","setting_attach_remote":"action=setting&operation=attach&anchor=remote"}*/ showtableheader('', '', 'id="remote"'.($_GET['anchor'] != 'remote' ? ' style="display: none"' : '')); showsetting('setting_attach_remote_enabled', array('settingnew[ftp][on]', array( array(1, $lang['yes'], array('ftpext' => '', 'ftpcheckbutton' => '')), @@ -1926,18 +2015,23 @@ function setrowtypedata(sendtype) { showsubmit('settingsubmit'); showtablefooter(); + /*search*/ } + /*search={"setting_attach":"action=setting&operation=attach","setting_attach_album":"action=setting&operation=attach&anchor=albumattach"}*/ showtableheader('', '', 'id="albumattach"'.($_GET['anchor'] != 'albumattach' ? ' style="display: none"' : '')); showsetting('setting_attach_album_maxtimage', array('settingnew[maxthumbwidth]', 'settingnew[maxthumbheight]'), array(intval($setting['maxthumbwidth']), intval($setting['maxthumbheight'])), 'multiply'); showsubmit('settingsubmit'); showtablefooter(); + /*search*/ + /*search={"setting_attach":"action=setting&operation=attach","setting_attach_portal_article_attach":"action=setting&operation=attach&anchor=portalarticle"}*/ showtableheader('', '', 'id="portalarticle"'.($_GET['anchor'] != 'portalarticle' ? ' style="display: none"' : '')); showsetting('setting_attach_portal_article_img_thumb_closed', 'settingnew[portalarticleimgthumbclosed]', !$setting['portalarticleimgthumbclosed'], 'radio'); showsetting('setting_attach_portal_article_imgsize', array('settingnew[portalarticleimgthumbwidth]', 'settingnew[portalarticleimgthumbheight]'), array(intval($setting['portalarticleimgthumbwidth']), intval($setting['portalarticleimgthumbheight'])), 'multiply'); showsubmit('settingsubmit'); showtablefooter(); + /*search*/ showformfooter(); exit; @@ -1975,6 +2069,7 @@ function setrowtypedata(sendtype) { $checkwm['portal'] = array($setting['watermarkstatus']['portal'] => 'checked'); $checkwm['forum'] = array($setting['watermarkstatus']['forum'] => 'checked'); $checkwm['album'] = array($setting['watermarkstatus']['album'] => 'checked'); + /*search={"setting_imgwater":"action=setting&operation=imgwater","setting_imgwater_portal":"action=setting&operation=imgwater&anchor=portal"}*/ showtableheader('setting_imgwater_image_watermarks_portal', '', 'id="portal"'.($_GET['anchor'] != 'portal' ? ' style="display: none"' : '')); $fontlist['portal'] = '' . $fontlist['forum']; showsetting('setting_imgwater_image_watermarkstatus', '', '', '
'.$lang['setting_imgwater_image_watermarkstatus_none'].'
#1 #2 #3
#4 #5 #6
#7 #8 #9
'); @@ -2031,7 +2128,9 @@ function setrowtypedata(sendtype) { showtagfooter('tbody'); showsetting('setting_imgwater_preview', '', '', cplang('setting_imgwater_preview_forum')); showtablefooter(); + /*search*/ + /*search={"setting_imgwater":"action=setting&operation=imgwater","setting_imgwater_album":"action=setting&operation=imgwater&anchor=album"}*/ showtableheader('setting_imgwater_image_watermarks_album', '', 'id="album"'.($_GET['anchor'] != 'album' ? ' style="display: none"' : '')); $fontlist['album'] = ''.$lang['setting_imgwater_image_watermarkstatus_none'].' #1 #2 #3 #4 #5 #6 #7 #8 #9'); @@ -2059,10 +2158,12 @@ function setrowtypedata(sendtype) { showtagfooter('tbody'); showsetting('setting_imgwater_preview', '', '', cplang('setting_imgwater_preview_album')); showtablefooter(); + /*search*/ showtableheader(); } elseif($operation == 'search') { - $setting['search'] = dunserialize($setting['search']); + /*search={"setting_search":"action=setting&operation=search"}*/ + $setting['search'] = dunserialize($setting['search']); showtableheader('setting_search_status', 'fixpadding'); showsubtitle(array('setting_search_onoff', 'search_item_name', 'setting_serveropti_searchctrl', 'setting_serveropti_maxspm', 'setting_serveropti_maxsearchresults')); if(helper_access::check_module('portal')) { @@ -2073,7 +2174,7 @@ function setrowtypedata(sendtype) { '', '', ); - } + } $search_forum = array( $setting['search']['forum']['status'] ? '' : '', cplang('setting_search_status_forum'), @@ -2081,7 +2182,7 @@ function setrowtypedata(sendtype) { '', '', ); - + if(helper_access::check_module('blog')) { $search_blog = array( $setting['search']['blog']['status'] ? '' : '', @@ -2125,7 +2226,7 @@ function setrowtypedata(sendtype) { showtablerow('', '', $search_group); showtablerow('', '', $search_collection); showtablefooter(); - + showtableheader('setting_search_srchhotkeywords'); showsetting('setting_search_srchhotkeywords', 'settingnew[srchhotkeywords]', $setting['srchhotkeywords'], 'textarea'); @@ -2147,7 +2248,8 @@ function setrowtypedata(sendtype) { } $selectspxrank .=''; showsetting('settings_sphinx_sphinxrank', '', '', $selectspxrank); - showtablefooter(); + showtablefooter(); + /*search*/ showtableheader(); } elseif($operation == 'uc' && $isfounder) { @@ -2155,6 +2257,7 @@ function setrowtypedata(sendtype) { $disable = !is_writeable(DISCUZ_ROOT . './config/config_ucenter.php'); include DISCUZ_ROOT.'./config/config_ucenter.php'; + /*search={"setting_uc":"action=setting&operation=uc"}*/ showtips('setting_uc_tips'); showtableheader(); showsetting('setting_uc_appid', 'settingnew[uc][appid]', UC_APPID, 'text', $disable); @@ -2182,18 +2285,22 @@ function setrowtypedata(sendtype) { array(0, $lang['setting_uc_avatarmethod_0']), array(1, $lang['setting_uc_avatarmethod_1']), )), $setting['avatarmethod'], 'mradio'); + /*search*/ } elseif($operation == 'ec') { + /*search={"nav_ec":"action=setting&operation=ec","nav_ec_config":"action=setting&operation=ec"}*/ showtableheader(); showtitle('setting_ec_credittrade'); showsetting('setting_ec_ratio', 'settingnew[ec_ratio]', $setting['ec_ratio'], 'text'); showsetting('setting_ec_mincredits', 'settingnew[ec_mincredits]', $setting['ec_mincredits'], 'text'); showsetting('setting_ec_maxcredits', 'settingnew[ec_maxcredits]', $setting['ec_maxcredits'], 'text'); showsetting('setting_ec_maxcreditspermonth', 'settingnew[ec_maxcreditspermonth]', $setting['ec_maxcreditspermonth'], 'text'); + /*search*/ } elseif($operation == 'memory') { + /*search={"setting_optimize":"action=setting&operation=seo","setting_memory":"action=setting&operation=memory"}*/ showtips('setting_memory_tips'); showtableheader('setting_memory_status', 'fixpadding'); showsubtitle(array('setting_memory_state_interface', 'setting_memory_state_extension', 'setting_memory_state_config', 'setting_memory_clear', '')); @@ -2249,9 +2356,11 @@ function setrowtypedata(sendtype) { )); } + /*search*/ } elseif($operation == 'memorydata') { + /*search={"setting_optimize":"action=setting&operation=seo","setting_memorydata":"action=setting&operation=memorydata"}*/ $cache_keys = getmemorycachekeys(); if(submitcheck('memorydatasubmit')) { $flag = 0; @@ -2301,11 +2410,13 @@ function setrowtypedata(sendtype) { showsubmit('memorydatasubmit'); showtablefooter(); showtagfooter('div'); + /*search*/ showformfooter(); exit; } elseif($operation == 'ranklist') { + /*search={"setting_ranklist":"action=setting&operation=ranklist"}*/ $setting['ranklist'] = dunserialize($setting['ranklist']); showtableheader('', 'nobottom', 'id="all"'); showsetting('setting_ranklist_status', 'settingnew[ranklist][status]', $setting['ranklist']['status'], 'radio'); @@ -2350,11 +2461,13 @@ function setrowtypedata(sendtype) { showhiddenfields(array('updateranklistcache' => 0)); showsubmit('', '', ''); showtablefooter(); + /*search*/ showformfooter(); exit; } elseif ($operation == 'mobile'){ + /*search={"setting_mobile":"action=setting&operation=mobile"}*/ $setting['mobile'] = dunserialize($setting['mobile']); showtips('setting_mobile_status_tips'); showtableheader('setting_mobile_status', '', 'id="status"'.($_GET['anchor'] != 'status' ? ' style="display: none"' : '')); @@ -2363,7 +2476,6 @@ function setrowtypedata(sendtype) { array(0, $lang['no'], array('mobileext' => 'none')) ), TRUE), $setting['mobile']['allowmobile'] ? $setting['mobile']['allowmobile'] : 0, 'mradio'); showtagheader('tbody', 'mobileext', $setting['mobile']['allowmobile'], 'sub'); - showsetting('setting_mobile_allowmnew', 'settingnew[mobile][allowmnew]', $setting['mobile']['allowmnew'], 'radio'); showsetting('setting_mobile_mobileforward', 'settingnew[mobile][mobileforward]', $setting['mobile']['mobileforward'], 'radio'); showsetting('setting_mobile_otherindex', 'settingnew[mobile][otherindex]', $setting['mobile']['otherindex'], 'radio'); showsetting('setting_mobile_register', 'settingnew[mobile][mobileregister]', $setting['mobile']['mobileregister'], 'radio'); @@ -2379,13 +2491,16 @@ function setrowtypedata(sendtype) { )), $setting['mobile']['mobileforumview'] ? $setting['mobile']['mobileforumview'] : 0, 'mradio'); showsetting('setting_mobile_come_from', 'settingnew[mobile][mobilecomefrom]', $setting['mobile']['mobilecomefrom'], 'textarea'); showsetting('setting_mobile_wml', 'settingnew[mobile][wml]', $setting['mobile']['wml'], 'radio'); + showsetting('setting_mobile_allowmnew', 'settingnew[mobile][allowmnew]', $setting['mobile']['allowmnew'], 'radio'); showtagfooter('tbody'); showsubmit('settingsubmit'); showformfooter(); showtablefooter(); + /*search*/ exit; } elseif ($operation == 'antitheft'){ + /*search={"setting_antitheft":"action=setting&operation=antitheft"}*/ if($_GET['anchor'] == 'iplist') { if(submitcheck('antitheftsubmit', true)) { @@ -2472,6 +2587,7 @@ function setrowtypedata(sendtype) { showtablefooter(); showsubmit('settingsubmit'); } + /*search*/ exit; } else { @@ -3094,6 +3210,7 @@ function setrowtypedata(sendtype) { if($operation == 'attach') { if($settingnew['allowattachurl'] && !in_array($_G['config']['download']['readmod'], array(1, 4))) { + // 如需附件URL地址、媒体附件播放，需选择支持Range参数的读取模式1或4，其他模式会导致部分浏览器下视频播放异常 cpmsg('attach_readmod_error', '', 'error'); } $settingnew['thumbwidth'] = intval($settingnew['thumbwidth']) > 0 ? intval($settingnew['thumbwidth']) : 200; @@ -3215,7 +3332,7 @@ function setrowtypedata(sendtype) { unset($settingnew['allowfloatwin']); } - if($operation == 'search') { + if($operation == 'search') { foreach($settingnew['search'] as $key => $val) { foreach($val as $k => $v) { $settingnew['search'][$key][$k] = max(0, intval($v)); @@ -3236,6 +3353,11 @@ function setrowtypedata(sendtype) { if($operation == 'mobile') { $settingnew['mobile_arr']['allowmobile'] = intval($settingnew['mobile']['allowmobile']); + if(!$settingnew['mobile_arr']['allowmobile']) { + C::t('common_nav')->update_by_navtype_type_identifier(1, 0, 'mobile', array('available' => 0)); + } else { + C::t('common_nav')->update_by_navtype_type_identifier(1, 0, 'mobile', array('available' => 1)); + } $settingnew['mobile_arr']['allowmnew'] = intval($settingnew['mobile']['allowmnew']); $settingnew['mobile_arr']['mobileforward'] = intval($settingnew['mobile']['mobileforward']); $settingnew['mobile_arr']['otherindex'] = intval($settingnew['mobile']['otherindex']); diff --git a/upload/source/admincp/admincp_styles.php b/upload/source/admincp/admincp_styles.php index f73110ad..645e6709 100644 --- a/upload/source/admincp/admincp_styles.php +++ b/upload/source/admincp/admincp_styles.php @@ -37,17 +37,22 @@ cpmsg('styles_export_invalid', '', 'error'); } + $addonid = ''; if(preg_match('/^.?\/template\/([a-z]+[a-z0-9_]*)$/', $stylearray['directory'], $a) && $a[1] != 'default') { $addonid = $a[1].'.template'; } - if($isplugindeveloper || !$addonid || !cloudaddons_getmd5($addonid)) { + if(($isplugindeveloper && $isfounder) || !$addonid || !cloudaddons_getmd5($addonid)) { + if (ispluginkey(basename($stylearray['directory']))) { + cpheader(); + cloudaddons_validator(basename($stylearray['directory']).'.template'); + } foreach(C::t('common_stylevar')->fetch_all_by_styleid($id) as $style) { $stylearray['style'][$style['variable']] = $style['substitute']; } $stylearray['version'] = strip_tags($_G['setting']['version']); - exportdata('Discuz! Style', $stylearray['name'], $stylearray); + exportdata('Discuz! Style', basename($stylearray['directory']), $stylearray); } else { cpheader(); cpmsg('styles_export_invalid', '', 'error'); @@ -114,9 +119,7 @@ $sarray = $tpldirs = $addonids = array(); foreach(C::t('common_style')->fetch_all_data(true) as $row) { if(preg_match('/^.?\/template\/([a-z]+[a-z0-9_]*)$/', $row['directory'], $a) && $a[1] != 'default') { - if(!in_array($a[1].'.template', $addonids)) { - $addonids[$row['styleid']] = $a[1].'.template'; - } + $addonids[$row['styleid']] = $a[1].'.template'; } $sarray[$row['styleid']] = $row; $tpldirs[] = realpath($row['directory']); @@ -165,11 +168,10 @@ $updatestring = array(); foreach($sarray as $id => $style) { $style['name'] = dhtmlspecialchars($style['name']); - $isdefault = $id == $defaultid ? 'checked' : ''; + $isdefault = $id == $defaultid || $id == 1 ? 'checked' : ''; $isdefault1 = $id == $defaultid1 ? 'checked' : ''; $isdefault2 = $id == $defaultid2 ? 'checked' : ''; $isdefault3 = $id == $defaultid3 ? 'checked' : ''; - $mobile1exists = file_exists($style['directory'].'/mobile'); $d1exists = file_exists($style['directory'].'/mobile'); $d2exists = file_exists($style['directory'].'/touch') || file_exists($style['directory'].'/m'); $d3exists = file_exists($style['directory'].'/wml'); @@ -185,27 +187,26 @@ } } $stylelist .= - '' : ''); + "
'.$style['tplname'].'
'. + '
'.($addonids[$id] ? "$style[tplname]" : $style['tplname']).'
'. ($id > 0 ? "

\"$lang[preview]\"/

-

". - $updatestring[$addonids[$style['styleid']]]."		 +

$lang[styles_default]

".($d1exists ? "

" : "

")." ".($d2exists ? "

" : "

")." ".($d3exists ? "

" : "

")." -

+

$lang[edit]  ". - ($isplugindeveloper || !$addonids[$id] || !cloudaddons_getmd5($addonids[$id]) ? " $lang[export]
" : '
'). + (($isplugindeveloper && $isfounder) || !$addonids[$style['styleid']] || !cloudaddons_getmd5($addonids[$style['styleid']]) ? " $lang[export]
" : '
'). "$lang[copy]   $lang[restore] - ".($addonids[$id] ? "   $lang[plugins_visit]" : '')." + ".($isfounder && $addonids[$id] ? "   $lang[plugins_visit]" : '')."

" : "

$lang[styles_install]

$lang[styles_stylecount]: $style[stylecount]

". ($style['filemtime'] > $timestamp - 86400 ? '

New!

' : '')). - "
\n".($i == 3 ? '
".$updatestring[$addonids[$style['styleid']]]."
\n".($i == 3 ? '' : ''); $i++; if($i == 3) { $i = 0; @@ -215,25 +216,6 @@ $stylelist .= str_repeat('', 3 - $i); } - shownav('style', 'styles_admin'); - showsubmenu('styles_admin', array( - array('admin', 'styles', '1'), - array('import', 'styles&operation=import', '0'), - array('cloudaddons_style_link', 'cloudaddons') - ), ''.$lang['plugins_validator'].''); - showtips('styles_admin_tips'); - showformheader('styles'); - showhiddenfields(array('updatecsscache' => 0)); - showtableheader(); - echo $stylelist; - showtablefooter(); - showtableheader(); - echo ''.$lang['add_new'].' '.cplang('cloudaddons_style_link').''; - echo ' '; - showsubmit('stylesubmit', 'submit', 'del', ''); - showtablefooter(); - showformfooter(); - if(empty($_G['cookie']['addoncheck_template'])) { $checkresult = dunserialize(cloudaddons_upgradecheck($addonids)); savecache('addoncheck_template', $checkresult); @@ -242,13 +224,34 @@ loadcache('addoncheck_template'); $checkresult = $_G['cache']['addoncheck_template']; } + + $updatecount = 0; $newvers = ''; foreach($checkresult as $addonid => $value) { list($return, $newver) = explode(':', $value); if($newver) { - $newvers .= "if($('update_$addonid')) $('update_$addonid').innerHTML=' (".cplang('styles_find_newversion')." $newver)';"; + $updatecount++; + $newvers .= "if($('update_$addonid')) $('update_$addonid').innerHTML=' ".cplang('styles_find_newversion')." $newver';"; } } + + shownav('template', 'styles_list'); + showsubmenu('styles_admin', array( + array('styles_list', 'styles', 1), + array('styles_import', 'styles&operation=import', 0), + $isfounder ? array('plugins_validator'.($updatecount ? '_new' : ''), 'styles&operation=upgradecheck', 0) : array(), + $isfounder ? array('cloudaddons_style_link', 'cloudaddons&frame=no&operation=templates&from=more', 0, 1) : array(), + ), ''.$lang['templates_question'].'', array('updatecount' => $updatecount)); + showtips('styles_home_tips'); + showformheader('styles'); + showhiddenfields(array('updatecsscache' => 0)); + showtableheader(); + echo $stylelist; + showtablefooter(); + showtableheader(); + showsubmit('stylesubmit', 'submit', 'del', ''.($isfounder ? '  '.cplang('cloudaddons_style_link').'' : '')); + showtablefooter(); + showformfooter(); if($newvers) { echo ''; } @@ -268,19 +271,24 @@ $tpl->close(); cpmsg('csscache_update', 'action=styles', 'succeed'); } else { - - if(is_numeric($_GET['defaultnew']) && $defaultid != $_GET['defaultnew'] && isset($sarray[$_GET['defaultnew']])) { - $defaultid = $_GET['defaultnew']; - C::t('common_setting')->update('styleid', $defaultid); - } - if(is_numeric($_GET['defaultnew1']) && $defaultid1 != $_GET['defaultnew1'] && isset($sarray[$_GET['defaultnew1']])) { - C::t('common_setting')->update('styleid1', $_GET['defaultnew1']); - } - if(is_numeric($_GET['defaultnew2']) && $defaultid2 != $_GET['defaultnew2'] && isset($sarray[$_GET['defaultnew2']])) { - C::t('common_setting')->update('styleid2', $_GET['defaultnew2']); - } - if(is_numeric($_GET['defaultnew3']) && $defaultid3 != $_GET['defaultnew3'] && isset($sarray[$_GET['defaultnew3']])) { - C::t('common_setting')->update('styleid3', $_GET['defaultnew3']); + $defaultids = array(); + $dfids = array('', '1', '2', '3'); + foreach ($dfids as $dfid) { + $defaultnew = $_GET['defaultnew'.$dfid]; + if(is_numeric($defaultnew) && isset($sarray[$defaultnew])) { + if (!in_array($defaultnew, $defaultids)) { + if (basename($sarray[$defaultnew]['directory']) != 'default' && ispluginkey(basename($sarray[$defaultnew]['directory']))) { + cpheader(); + $addonid = basename($sarray[$defaultnew]['directory']).'.template'; + $array = cloudaddons_getmd5($addonid); +/*jaideejung007*/ //if(cloudaddons_open('&mod=app&ac=validator&ver=2&addonid='.$addonid.($array !== false ? '&rid='.$array['RevisionID'].'&sn='.$array['SN'].'&rd='.$array['RevisionDateline'] : '')) === '0') { +/*jaideejung007*/ //cpmsg('clo'.'uda'.'ddon'.'s_gen'.'uine_'.'mes'.'sage', '', 'error', array('addonid' => $addonid)); +/*jaideejung007*/ //} + } + $defaultids[] = $defaultnew; + } + C::t('common_setting')->update('styleid'.$dfid, $defaultnew); + } } if(isset($_GET['namenew'])) { @@ -297,7 +305,7 @@ $did = array(); foreach($delete as $id) { $id = intval($id); - if($id == $defaultid) { + if(in_array($id, $defaultids)) { cpmsg('styles_delete_invalid', '', 'error'); } elseif($id != 1){ $did[] = intval($id); @@ -343,12 +351,12 @@ if(!submitcheck('importsubmit') && !isset($_GET['dir'])) { - shownav('style', 'styles_admin'); + shownav('template', 'styles_import'); showsubmenu('styles_admin', array( - array('admin', 'styles', '0'), - array('import', 'styles&operation=import', '1'), - array('cloudaddons_style_link', 'cloudaddons') - ), ''.$lang['plugins_validator'].''); + array('styles_list', 'styles', 0), + array('styles_import', 'styles&operation=import', 1), + $isfounder ? array('cloudaddons_style_link', 'cloudaddons&frame=no&operation=templates&from=more', 0, 1) : array(), + ), ''.$lang['templates_question'].''); showformheader('styles&operation=import', 'enctype'); showtableheader('styles_import'); showimportdata(); @@ -377,7 +385,10 @@ } elseif($operation == 'copy') { - $style = C::t('common_style')->fetch($id); + $style = C::t('common_style')->fetch_by_styleid($id); + if (ispluginkey(basename($style['directory']))) { + cloudaddons_validator(basename($style['directory']).'.template'); + } $style['name'] .= '_'.random(4); $styleidnew = C::t('common_style')->insert(array('name' => $style['name'], 'available' => $style['available'], 'templateid' => $style['templateid']), true); @@ -463,8 +474,10 @@ showsubmenu(cplang('styles_admin').' - '.$style['name'], array( array('admin', 'styles', 0), - array('import', 'styles&operation=import', 0), - array('edit' , 'styles&operation=edit&id='.$id, 1) + array('edit' , 'styles&operation=edit&id='.$id, 1), + $isfounder ? array('export', 'styles&operation=export&id='.$id, 0) : array(), + $isfounder ? array('templates_add', 'templates&operation=add', 0) : array(), + array('cloudaddons_style_link', 'cloudaddons&frame=no&operation=templates&from=more', 0, 1), )); ?> @@ -616,6 +629,9 @@ function imgpre_switch(id) { } } elseif($operation == 'upgradecheck') { + if(!$admincp->isfounder) { + cpmsg('noaccess_isfounder', '', 'error'); + } $templatearray = C::t('common_template')->fetch_all_data(); if(!$templatearray) { cpmsg('plugin_not_found', '', 'error'); @@ -627,6 +643,7 @@ function imgpre_switch(id) { } } $checkresult = dunserialize(cloudaddons_upgradecheck($addonids)); + savecache('addoncheck_template', $checkresult); foreach($addonids as $k => $addonid) { if(isset($checkresult[$addonid])) { list($return, $newver) = explode(':', $checkresult[$addonid]); @@ -640,20 +657,21 @@ function imgpre_switch(id) { } foreach($result as $id => $row) { if($row['result'] == 0) { - $errarray[] = ''.$templatearray[$row['id']]['name'].''; + $errarray[] = ''.$templatearray[$row['id']]['name'].''; } elseif($row['result'] == 2) { - $newarray[] = ''.$templatearray[$row['id']]['name'].($row['newver'] ? ' -> '.$row['newver'] : '').''; + $newarray[] = ''.$templatearray[$row['id']]['name'].($row['newver'] ? ' -> '.$row['newver'] : '').''; } } if(!$newarray && !$errarray) { cpmsg('styles_validator_noupdate', '', 'error'); } else { - shownav('style', 'styles_admin'); + shownav('template', 'plugins_validator'); showsubmenu('styles_admin', array( - array('admin', 'styles', '0'), - array('import', 'styles&operation=import', '0'), - array('cloudaddons_style_link', 'cloudaddons') - ), ''.$lang['plugins_validator'].''); + array('styles_list', 'styles', 0), + array('styles_import', 'styles&operation=import', 0), + array('plugins_validator', 'styles&operation=upgradecheck', 1), + array('cloudaddons_style_link', 'cloudaddons&frame=no&operation=templates&from=more', 0, 1), + ), ''.$lang['templates_question'].''); showtableheader(); if($newarray) { showtitle('styles_validator_newversion'); diff --git a/upload/source/admincp/admincp_tasks.php b/upload/source/admincp/admincp_tasks.php index 4564efd6..3300d7bb 100644 --- a/upload/source/admincp/admincp_tasks.php +++ b/upload/source/admincp/admincp_tasks.php @@ -40,7 +40,7 @@ showsetting('tasks_on', 'taskonnew', $_G['setting']['taskon'], 'radio'); showtablefooter(); showtableheader('tasks_list', 'fixpadding'); - showsubtitle(array('display_order', 'available', 'name', 'tasks_reward', 'time', '')); + showsubtitle(array('display_order', 'available', 'name', 'tasks_reward', 'time', 'tasks_status', '')); $starttasks = array(); foreach(C::t('common_task')->fetch_all_data() as $task) { @@ -78,12 +78,22 @@ $task['time'] = cplang('nolimit'); } + if($task['available'] == 2 && ($task['starttime'] > TIMESTAMP || ($task['endtime'] && $task['endtime'] <= TIMESTAMP))) { + $task['available'] = 1; + C::t('common_task')->update($task['taskid'], array('available' => 1)); + } + if($task['available'] == 1 && (!$task['starttime'] || $task['starttime'] <= TIMESTAMP) && (!$task['endtime'] || $task['endtime'] > TIMESTAMP)) { + $task['available'] = 2; + C::t('common_task')->update($task['taskid'], array('available' => 2)); + } + showtablerow('', array('class="td25"', 'class="td25"'), array( '', "", "", $reward, $task['time'].'', + ($task['available'] == 1 ? ($task['endtime'] && $task['endtime'] <= TIMESTAMP ? cplang('tasks_status_3') : cplang('tasks_status_1')) : ($task['available'] == 2 ? cplang('tasks_status_2') : cplang('tasks_status_0'))), "$lang[edit]  $lang[delete]" )); @@ -538,6 +548,9 @@ C::t('common_taskvar')->update_by_taskid($id, $item, array('value' => is_array($value) ? serialize($value) : $value)); } } + require_once libfile('class/task'); + $tasklib = & task::instance(); + $tasklib->update_available(1); cpmsg('tasks_succeed', "action=tasks", 'succeed'); diff --git a/upload/source/admincp/admincp_templates.php b/upload/source/admincp/admincp_templates.php index 04ff7869..9dbd0bef 100644 --- a/upload/source/admincp/admincp_templates.php +++ b/upload/source/admincp/admincp_templates.php @@ -14,6 +14,11 @@ cpheader(); if(!isfounder()) cpmsg('noaccess_isfounder', '', 'error'); +$isplugindeveloper = isset($_G['config']['plugindeveloper']) && $_G['config']['plugindeveloper'] > 0; +if(!$isplugindeveloper) { + cpmsg('undefined_action', '', 'error'); +} + $operation = empty($operation) ? 'admin' : $operation; if($operation == 'admin') { @@ -26,7 +31,7 @@ $templates .= showtablerow('', array('class="td25"', '', 'class="td29"'), array( "", "". - ($basedir != 'default' ? ''.$lang['view'].'' : ''), + ($basedir != 'default' ? ''.$lang['view'].'' : ''), "", !empty($tpl['copyright']) ? $tpl['copyright'] : @@ -34,8 +39,12 @@ ), TRUE); } - shownav('style', 'templates_admin'); - showsubmenu('templates_admin'); + shownav('template', 'templates_admin'); + showsubmenu('styles_admin', array( + array('templates_add', 'templates&operation=add', 0), + array('nav_templates', 'templates&operation=admin', 1), + array('cloudaddons_style_link', 'cloudaddons&frame=no&operation=templates&from=more', 0, 1), + )); showformheader('templates'); showtableheader(); showsubtitle(array('', 'templates_admin_name', 'dir', 'copyright')); @@ -89,5 +98,114 @@ } +} elseif($operation == 'add') { + $predefinedvars = array('available' => array(), 'boardimg' => array(), 'imgdir' => array(), 'styleimgdir' => array(), 'stypeid' => array(), + 'headerbgcolor' => array(0, $lang['styles_edit_type_bg']), + 'bgcolor' => array(0), + 'sidebgcolor' => array(0, '', '#FFF sidebg.gif repeat-y 100% 0'), + 'titlebgcolor' => array(0), + + 'headerborder' => array(1, $lang['styles_edit_type_header'], '1px'), + 'headertext' => array(0), + 'footertext' => array(0), + + 'font' => array(1, $lang['styles_edit_type_font']), + 'fontsize' => array(1), + 'threadtitlefont' => array(1, $lang['styles_edit_type_thread_title']), + 'threadtitlefontsize' => array(1), + 'smfont' => array(1), + 'smfontsize' => array(1), + 'tabletext' => array(0), + 'midtext' => array(0), + 'lighttext' => array(0), + + 'link' => array(0, $lang['styles_edit_type_url']), + 'highlightlink' => array(0), + 'lightlink' => array(0), + + 'wrapbg' => array(0), + 'wrapbordercolor' => array(0), + + 'msgfontsize' => array(1, $lang['styles_edit_type_post'], '14px'), + 'contentwidth' => array(1), + 'contentseparate' => array(0), + + 'menubgcolor' => array(0, $lang['styles_edit_type_menu']), + 'menutext' => array(0), + 'menuhoverbgcolor' => array(0), + 'menuhovertext' => array(0), + + 'inputborder' => array(0, $lang['styles_edit_type_input']), + 'inputborderdarkcolor' => array(0), + 'inputbg' => array(0, '', '#FFF'), + + 'dropmenuborder' => array(0, $lang['styles_edit_type_dropmenu']), + 'dropmenubgcolor' => array(0), + + 'floatbgcolor' => array(0, $lang['styles_edit_type_float']), + 'floatmaskbgcolor' => array(0), + + 'commonborder' => array(0, $lang['styles_edit_type_other']), + 'commonbg' => array(0), + 'specialborder' => array(0), + 'specialbg' => array(0), + 'noticetext' => array(0), + ); + if(!submitcheck('addsubmit')) { + shownav('template', 'templates_add'); + showsubmenu('styles_admin', array( + array('templates_add', 'templates&operation=add', 1), + array('nav_templates', 'templates&operation=admin', 0), + array('cloudaddons_style_link', 'cloudaddons&frame=no&operation=templates&from=more', 0, 1), + )); + showtips('templates_add_tips'); + + showformheader("templates&operation=add", '', 'configform'); + showtableheader(); + showsetting('templates_edit_name', 'namenew', '', 'text'); + showsetting('templates_edit_copyright', 'copyrightnew', '', 'text'); + showsetting('templates_edit_identifier', 'identifiernew', '', 'text'); + + $styleselect = array(); + $styleselect[] = array(0, $lang['templates_empty']); + foreach(C::t('common_style')->fetch_all_data(true) as $value) { + $styleselect[] = array($value['styleid'], $value['name']); + } + showsetting('templates_edit_style', array('styleidnew', $styleselect), '', 'select'); + showsubmit('addsubmit'); + showtablefooter(); + showformfooter(); + } else { + $namenew = dhtmlspecialchars(trim($_GET['namenew'])); + $identifiernew = trim($_GET['identifiernew']); + $copyrightnew = dhtmlspecialchars($_GET['copyrightnew']); + $styleidnew = dintval($_GET['styleidnew']); + + if(!$namenew) { + cpmsg('templates_edit_name_invalid', '', 'error'); + } + + if(!ispluginkey($identifiernew)) { + cpmsg('templates_edit_identifier_invalid', '', 'error'); + } + + $templateid = C::t('common_template')->insert(array('name' => $namenew, 'directory' => './template/'.$identifiernew, 'copyright' => $copyrightnew), true); + $styleid = C::t('common_style')->insert(array('name' => $namenew, 'templateid' => $templateid), true); + if($styleidnew) { + foreach(C::t('common_stylevar')->fetch_all_by_styleid($styleidnew) as $stylevar) { + C::t('common_stylevar')->insert(array('styleid' => $styleid, 'variable' => $stylevar['variable'], 'substitute' => $stylevar['substitute'])); + } + }else{ + foreach(array_keys($predefinedvars) as $variable) { + $substitute = isset($predefinedvars[$variable][2]) ? $predefinedvars[$variable][2] : ''; + C::t('common_stylevar')->insert(array('styleid' => $styleid, 'variable' => $variable, 'substitute' => $substitute)); + } + } + updatecache(array('setting', 'styles')); + loadcache('style_default', true); + updatecache('updatediytemplate'); + cpmsg('templates_add_succeed', "action=styles", 'succeed'); + } + } ?> \ No newline at end of file diff --git a/upload/source/admincp/admincp_verify.php b/upload/source/admincp/admincp_verify.php index 8b50c888..d6d75b80 100644 --- a/upload/source/admincp/admincp_verify.php +++ b/upload/source/admincp/admincp_verify.php @@ -342,7 +342,7 @@ function singleverify(vid) { if($anchor != 'pass') { showsubmit('batchverifysubmit', 'submit', '', ''.cplang('moderate_all_validate').''. ($anchor == 'authstr' ? '  '.cplang('moderate_refusal_all').'' : '').'  '.cplang('moderate_cancel_all').'', $multipage, false); } else { - showsubmit('batchverifysubmit', 'submit', '', ''.cplang('moderate_export_all').'  '.cplang('moderate_refusal_all').'  '.cplang('moderate_cancel_all').'  | '.cplang('moderate_export_getall').'', $multipage, false); + showsubmit('batchverifysubmit', 'submit', '', ''.cplang('moderate_export_all').'  '.cplang('moderate_refusal_all').'  '.cplang('moderate_cancel_all').'  | '.cplang('moderate_export_getall').'', $multipage, false); } } else { showtablerow('', 'colspan="'.count($cssarr).'"', ''.cplang('moderate_nodata').''); diff --git a/upload/source/admincp/discuzfiles.md5 b/upload/source/admincp/discuzfiles.md5 index 33549029..0b251577 100644 --- a/upload/source/admincp/discuzfiles.md5 +++ b/upload/source/admincp/discuzfiles.md5 @@ -1,10 +1,10 @@ b75f03b55861f77b86d66ccf1b505aff *./.htaccess -c7f5336b050ca7235c6706ae341adc15 *./admin.php +265462076349abec5571edb1d6d614a1 *./admin.php ac32c9e1f5286d86a4fe2ec70d4c42bb *./api 96d59218db7d1aee6b6f07dff7251d87 *./api.php 925d38a86571e4736546218f0ed030d8 *./archiver c92a71303bcc841344e07d1bf49d1f9b *./config -a3364c196fc140a39bb84f4c12a381c9 *./connect.php +860a6b312f873d902d60727ff2404390 *./connect.php 6e4fbf3939402cf67a6c00367382988b *./crossdomain.xml cba7beb32835268b64190bc95a4ba48c *./data c028c4822428e83a358c60a93ef65381 *./favicon.ico @@ -15,7 +15,7 @@ c73a5c49d4653a58dfe8c3bfe4831fef *./index.php 0d673a9b9f136a7a6b6b25d4ff4bc1fd *./install 4180ee30974e69aa1fefe62dabe02884 *./m 91b4db47ebebe459c40ca11b2b9e68c7 *./member.php -a085055d730ae849070f1def97e32044 *./misc.php +72efa223372415e3e642c3f6732e64dc *./misc.php 0a207c219c883bb7d68115eda80aac8d *./plugin.php 1c4878830bc020d29ba117f4c7d7bdf8 *./portal.php e4c3bfe695710c5610cf51723b3bdae2 *./robots.txt @@ -29,7 +29,6 @@ b9b6db2a5893eb3f77d3243f7bbda747 *./template f5b7198f12766f6e6c047f01898a4bc5 *config/config_ucenter_default.php 7215ee9c7d9dc229d2921a40e899ec5f *config/index.htm d41d8cd98f00b204e9800998ecf8427e *data/index.htm -93d0ac4235e553d6cfe0ce65a55ef446 *data/stat_setting.xml d41d8cd98f00b204e9800998ecf8427e *data/avatar/index.htm d41d8cd98f00b204e9800998ecf8427e *data/log/index.htm d41d8cd98f00b204e9800998ecf8427e *data/cache/index.htm @@ -41,7 +40,7 @@ d41d8cd98f00b204e9800998ecf8427e *data/plugindata/index.htm d41d8cd98f00b204e9800998ecf8427e *data/threadcache/index.htm d41d8cd98f00b204e9800998ecf8427e *data/download/index.htm d41d8cd98f00b204e9800998ecf8427e *data/addonmd5/index.htm -f70832049116fe3d7b04488f8dfe721b *archiver/index.php +fee4806bed2bad3fad5fa78359ddb9e6 *archiver/index.php 0bd1b13bb5a23542ddf775d9f3ce8a3b *template/default/common/block_forumtree.htm d69fb996876db8c48a5d50344a2682b4 *template/default/common/block_thread.htm 34c242531f5d08d4c9421875b2635897 *template/default/common/block_userinfo.htm @@ -56,21 +55,22 @@ dafc02d0c915d06c992af4c491057a59 *template/default/common/editor.css d555a54a11245651d9deac88f8e6f96c *template/default/common/extcredits.htm 1bebd4db4212639085d44c3044bd63e7 *template/default/common/extgroups.htm 32eb29dd828ef514e8c3d31fc90aef14 *template/default/common/faq.htm -239f3642cff66728972be99c15400d63 *template/default/common/footer.htm +6a3aecf4567c62736711c68690c8c0e2 *template/default/common/footer.htm dcecf9502c1ceadebea0ae4c229d3364 *template/default/common/footer_ajax.htm 05d187559f460e57b220cb151705cd01 *template/default/common/forum_calendar.css e5ba4c53bab1bc12b6a316fae4c00ed9 *template/default/common/forum_moderator.css d1c62c93f25fe2f5cc98e6b6092cf7fa *template/default/common/getatuser.htm -69d62032b5004d8351fbd1e941d0523e *template/default/common/header.htm +e3465919d1d63640c60e8a010e46723a *template/default/common/header.htm 3f84349f5b5107b1ec966cd254be3a03 *template/default/common/header_ajax.htm -69853fed0456fe7a335d8c797163dc3c *template/default/common/header_common.htm +b4bc857369759e98d5a1243d4400f2c8 *template/default/common/header_common.htm 30e8ae1dc35bc51162e84b1f12b44e88 *template/default/common/header_diy.htm 1ae0483740c9e37416bd07c068bdda1e *template/default/common/header_diynav.htm 19c62212d41889dca71ee8239cdbb654 *template/default/common/header_qmenu.htm 62bcd878979921f622968c848597bc6a *template/default/common/header_userstatus.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/common/index.htm a3fa81ef3ad7b3aa6599a423d3f68c49 *template/default/common/invite.htm 8d18332c488ef29b14efb05a9565496d *template/default/common/ipnotice.htm -bddac7bf4b8fc9e9cf70ae30ed3294be *template/default/common/misc_imgcropper.htm +7a954c87c62c2fa38ec59b28555d6bb6 *template/default/common/misc_imgcropper.htm ff966ce7dd555cd1ae659bc2f2b6c178 *template/default/common/module.css f987de58cd8a82032394b239c16726f3 *template/default/common/preview.htm 61f248ee7134248ccc72146767b9f357 *template/default/common/pubsearchform.htm @@ -85,7 +85,7 @@ c956793b272feb6c0d7b2c71a43f02b7 *template/default/common/sendmail.htm fde427b09522cee417c37ddec65af441 *template/default/common/userabout.htm cea84eba65d990d7dce5ad76a9a0bf9e *template/default/common/widthauto.css 57697d555402cff54aa4c03315b6e85f *template/default/common/wysiwyg.css -a74d418ed29fbfe1483178b88a9616ff *template/default/discuz_style_default.xml +dd18c3531ed42b5800810ff2705a336c *template/default/discuz_style_default.xml 176f33f992cd1f1f2107aac16c1ec060 *template/default/forum/activity_applist_more.htm 7b0c83a6298c11a3dac98ae9273d8b81 *template/default/forum/activity_applylist.htm ba31d31a54eab7c21f693af4fb175981 *template/default/forum/activity_export.htm @@ -124,12 +124,12 @@ bbb9ef18c0f7c08588d157512af57601 *template/default/forum/discuzcode.htm aaf4e500dede81ea68286da2061b2c42 *template/default/forum/forumdisplay.htm da788356bc3bf1d33c263dcbb492b1ff *template/default/forum/forumdisplay_fastpost.htm db17c79b92c0ee7551bbaab7a2b894ee *template/default/forum/forumdisplay_leftside.htm -bc9e0f5e1d1567229e78aad505c1d46e *template/default/forum/forumdisplay_list.htm +10967da54ca4e8ef5a10cc7e51437a45 *template/default/forum/forumdisplay_list.htm 59ce0d2a156b316b4b05da263b161a70 *template/default/forum/forumdisplay_passwd.htm 8e3a24898257c4afac88594c8f411e1a *template/default/forum/forumdisplay_pay.htm bd55f788f5954a153a69497971d0e841 *template/default/forum/forumdisplay_sort.htm 6b226a0197b30d5ea628f7df57b2b182 *template/default/forum/forumdisplay_subforum.htm -cff08f1aefb77c73195ac96317eb65e4 *template/default/forum/guide.htm +a1197ed664e184a30a80c931580e55bb *template/default/forum/guide.htm 8f34f90145510799afa84a65df057ebc *template/default/forum/guide_list_row.htm 5fc89c347d01826e27850867948bf2c8 *template/default/forum/hiderecover.htm 7215ee9c7d9dc229d2921a40e899ec5f *template/default/forum/index.htm @@ -156,7 +156,7 @@ b2330bde173fc5469a976f824d64a485 *template/default/forum/postappend.htm 55f016c2685c1e9711ef9c750ede818f *template/default/forum/post_activity.htm 6570210b5bd53a37f5a0f800de6f68a5 *template/default/forum/post_attachlimit.htm 2a47aaff27a4658c8fa940db36716733 *template/default/forum/post_debate.htm -6060a46a8a92c9365ee2315abf087be9 *template/default/forum/post_editor_attribute.htm +abc172735278ea16833ba4a83a4440cc *template/default/forum/post_editor_attribute.htm 4bfed8ceb0f5c65438d5cb87dbee8dfe *template/default/forum/post_editor_body.htm 93dcdb958381eccb6553c1bb269ac78a *template/default/forum/post_editor_extra.htm 6fa6533634a774c091a70c58400721e1 *template/default/forum/post_forumselect.htm @@ -173,7 +173,7 @@ a7bb311ff41a6454269683330f215bbe *template/default/forum/relatekw.htm 3441971790ebe9cad4ff407f8c6dd4e5 *template/default/forum/seccheck_post.htm 555a09a7923ebf140db17e57d0314c8b *template/default/forum/stat_main.htm 385452e0e072db85f0a99b9a4884317d *template/default/forum/stat_memberlist.htm -af2411780c83b1659dbe7fb48f889192 *template/default/forum/stat_misc.htm +3a2a45d8a27d6b3f18c38036913988b3 *template/default/forum/stat_misc.htm 7575f7ca431d22cba5fd24f711c3abb5 *template/default/forum/stat_misc_export.htm 8214e0783aae5f888b0d42d69bed505d *template/default/forum/stat_team.htm 8ac873861425f862c5713b43a7a32e09 *template/default/forum/stat_trade.htm @@ -194,9 +194,9 @@ f72d39bd02596051cf2241e15566d748 *template/default/forum/viewthread_album.htm 29223d0eedde86aed53f43e573fd3c5f *template/default/forum/viewthread_debate.htm 6fecd3b135e9f8862fed96923d14cb83 *template/default/forum/viewthread_fastpost.htm bc0c6a59e995a81e693803bf4bc44f0f *template/default/forum/viewthread_from_node.htm -9bae9922836b11ed7d0c587c46df66de *template/default/forum/viewthread_mod.htm +a3e361a10cec8abbd6bc4ee407d170b7 *template/default/forum/viewthread_mod.htm ede94b1710bd3e1d626becfaf821381a *template/default/forum/viewthread_node.htm -f9d30cfec7a4098bb195bf06da3a28da *template/default/forum/viewthread_node_body.htm +65e5539560714ebd53f2b04713a6ecc0 *template/default/forum/viewthread_node_body.htm 80601015472e8fb330455ab09982c810 *template/default/forum/viewthread_pay.htm cb157ea840609cdfb21442902a2dae98 *template/default/forum/viewthread_poll.htm 531d1b15f0fc510bf592bfc6ceba8bd8 *template/default/forum/viewthread_poll_voter.htm @@ -225,6 +225,7 @@ cf208794326eec12073cd1d13feb115b *template/default/group/group_my.htm 530b51bd12b8ced7b4e6db5cd06a8a75 *template/default/home/follow_feed.htm 8ba4fc66ef512d1a2f6f4075fe38fc35 *template/default/home/follow_feed_li.htm 78fc9210dac8555057a28fae66c6ba82 *template/default/home/follow_user_header.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/home/index.htm a259738f3ff4b4caf68e09b6c752b590 *template/default/home/invite.htm ee50d4c5495554893227f5f1fe050275 *template/default/home/magic_call.htm e6d14c2b6f98f8eb5fbd251a3b8649f2 *template/default/home/magic_detector.htm @@ -234,12 +235,12 @@ e6d14c2b6f98f8eb5fbd251a3b8649f2 *template/default/home/magic_detector.htm 2c7b4c43f35782b6fd54b668a447e78f *template/default/home/magic_visit.htm a6cabe60b8b54aa777e79fb911a048f4 *template/default/home/misc_ajax.htm a2ef6c8789cd6ddf0e36e724861f67a0 *template/default/home/misc_inputpwd.htm -5570af46b872d8d5fc97ab6aa65cfc3a *template/default/home/misc_stat.htm +34f4180899aa7ea8bc01547916895a08 *template/default/home/misc_stat.htm 841af66cc4c7faffe3a0027398a8923f *template/default/home/misc_swfupload.htm 9fd97473360fe8cd42201fb632ba537d *template/default/home/sendmail.htm 5df4d255563a355f3cfe3f138f88607f *template/default/home/spacecp_album.htm -a718218be5290867108436b7a0d6302c *template/default/home/spacecp_avatar.htm -2d2be147049183439b4212e33549b689 *template/default/home/spacecp_avatar_body.htm +f540355e7d137879280722680bf6fe01 *template/default/home/spacecp_avatar.htm +a4d7ccdca03294f59acd8506ee7e816c *template/default/home/spacecp_avatar_body.htm f779540374fdebce5ac6d3d30000cebc *template/default/home/spacecp_blog.htm ba5dd21681d916d53a6e92db12275f3b *template/default/home/spacecp_class.htm 6c6f7c62e245db11742e4608b56577a7 *template/default/home/spacecp_click.htm @@ -247,7 +248,7 @@ ba5dd21681d916d53a6e92db12275f3b *template/default/home/spacecp_class.htm ad7117a238b7e94613649264c5e0342e *template/default/home/spacecp_common.htm e1528f71cbd64f31311aa24422099ec2 *template/default/home/spacecp_credit_action.htm 7f0312f909b40baaede89faa200f3e40 *template/default/home/spacecp_credit_base.htm -8cc29884eb14b69bfc273cadd0a89e66 *template/default/home/spacecp_credit_header.htm +9ff6d2baa907ef22e8615cb26bd31c77 *template/default/home/spacecp_credit_header.htm 3fa95267374eefd953cc58aa97696a53 *template/default/home/spacecp_credit_log.htm 181d889378f7ee651a2401fc34c8c6c6 *template/default/home/spacecp_doing.htm 95a353e3be6f38dfbe5ad85c9dc61ebd *template/default/home/spacecp_domain.htm @@ -257,8 +258,8 @@ de720f9649909092eb56db83e94ee0b0 *template/default/home/spacecp_ec_explain.htm f2fa729a8849559ee54c3f5c0b0bddda *template/default/home/spacecp_favorite.htm cb490cd229da8808a98136211b0d1182 *template/default/home/spacecp_feed.htm ddfc2ae18b1392cbb8ede04f3542c0f5 *template/default/home/spacecp_follow.htm -74fc3c89cbb6ac76d126eba2134fa946 *template/default/home/spacecp_footer.htm -9f7e2861cb2283cb52470353862c8b2f *template/default/home/spacecp_friend.htm +824b3c84b2f4f1be195fc45b4296a5ac *template/default/home/spacecp_footer.htm +23784db4cd1b650126f823ed66b540f6 *template/default/home/spacecp_friend.htm 3368d5fbfc40368c95e75c747b162f5f *template/default/home/spacecp_header.htm f45eaa003176a8b27deb98448512865d *template/default/home/spacecp_header_name.htm 4257aaa1e26fcb9a3b60fd99308376e5 *template/default/home/spacecp_index.htm @@ -270,8 +271,8 @@ e3c96eddf038222df84af8d74bfa3dd3 *template/default/home/spacecp_password.htm 36315ae8d3f9877635d58f1c4c4ffc72 *template/default/home/spacecp_poke.htm ab9b44b0beb713ba4515d2465524b417 *template/default/home/spacecp_poke_type.htm c651f615db6e29e794d03d8c327db4bc *template/default/home/spacecp_privacy.htm -50c596003986565bf2a400e02572c8db *template/default/home/spacecp_profile.htm -38f749cfe17f7ce274d2f0e084a4f8d8 *template/default/home/spacecp_profile_nav.htm +14cb653f4cd96a36e36056fd065dfcc6 *template/default/home/spacecp_profile.htm +727242a2cacff35b9c9d5d732c47e8da *template/default/home/spacecp_profile_nav.htm a05fc73feac3cd8d7876725430de72f2 *template/default/home/spacecp_promotion.htm c4568231fb65d6871df1e6920203a817 *template/default/home/spacecp_search.htm 12a9316004d196e00f926a9043b90d98 *template/default/home/spacecp_sendmail.htm @@ -286,7 +287,7 @@ d1a52d7bb45ce632f4b38e601ac06de9 *template/default/home/space_album_pic.htm 90401606603666f50c3cd38adfb31c7d *template/default/home/space_album_view.htm b17a0bc94675017bd4c54dd6a57a6af9 *template/default/home/space_blog_list.htm 0bf9fa2ae8f478ada0e9e12b4332823f *template/default/home/space_blog_view.htm -c1a51fd1dc88e29c387c67f7c9dfba3e *template/default/home/space_card.htm +c81cdadbdebc7f6c72e99001ff2c6cb2 *template/default/home/space_card.htm 194f16fa78af5426f5c96419b5375124 *template/default/home/space_click.htm 9e263e2f0714d86a63495c090882f733 *template/default/home/space_comment_li.htm 0ccb9321528f2adfcf7525253f1bcc40 *template/default/home/space_debate.htm @@ -299,7 +300,7 @@ d386f138e8134f8c445cd00eb4e704c1 *template/default/home/space_doing.htm 0ee5fb771c2f977cb5ce76d86c80c2d9 *template/default/home/space_feed_li.htm 872f7546989c1d0ccbc59d35cd241d83 *template/default/home/space_friend.htm 72f15f23e3cb5b17497b3b57951359d2 *template/default/home/space_friend_nav.htm -8169dba7f9012f47d0f1d6d24b74813e *template/default/home/space_header.htm +3953923addfcc319f77cccd1e827fc59 *template/default/home/space_header.htm 53b5d05669bd89b598530cebc4852e52 *template/default/home/space_header_personalnv.htm 1a2b4ee7e1a796961fdc1ead3a72b5c9 *template/default/home/space_home.htm 7514e5b3bc05708be084b853cbf7e5b1 *template/default/home/space_index.htm @@ -318,9 +319,9 @@ f29ffdea85f26b61e694574ed7f633e1 *template/default/home/space_plugin.htm 60d4e72964f3343c5ae2c7a7955c07e3 *template/default/home/space_pm.htm c1f3ed0d23e80ed3cfd33afda9433625 *template/default/home/space_pm_node.htm cbfb462a1269283ac208c9c8fcd83bdc *template/default/home/space_poll.htm -f6a093129e0566392a9d7f5919394aa6 *template/default/home/space_privacy.htm +9d05a9fbfc5dccf9615267a2a147b61c *template/default/home/space_privacy.htm 9730dd1eaaecbc38efc4c0d39456324b *template/default/home/space_profile.htm -7ecb4e7beac41d4122882405112a8172 *template/default/home/space_profile_body.htm +72de0807fe4d9b06fe12efdf98c80faf *template/default/home/space_profile_body.htm 97f9086571954ad05ae8e74cd944b46f *template/default/home/space_prompt_nav.htm 7586071a9bd5aecc85821db82d3c71f5 *template/default/home/space_reward.htm c2e6fbaf5ee15a8e88c487740734a245 *template/default/home/space_share_form.htm @@ -332,15 +333,16 @@ f11705f9f30d402dc14dca5d908a6198 *template/default/home/space_status.htm db9b21c491b406291b33f5ec399b5955 *template/default/home/space_task_detail.htm 78a25ca9f00dfce67c545e1c543d35bc *template/default/home/space_task_list.htm 9ce3c04869aca7db916acd472ddbe2af *template/default/home/space_task_parter.htm -89be867761edbe24e7083879780180f1 *template/default/home/space_thread.htm -a622cefee187dd86c7d80055be379c03 *template/default/home/space_thread_nav.htm +d0a1ebbfa0da0b74b357a241bb003e96 *template/default/home/space_thread.htm +cb32aff57eb5436ad080f2ded396a13d *template/default/home/space_thread_nav.htm 3574221056da3399dc7ff2774103e79d *template/default/home/space_trade.htm -007caa372103f49a6fef5a7198fa1e5c *template/default/home/space_userabout.htm +905c144944f6597d2558ca13e54be3d5 *template/default/home/space_userabout.htm 4d6e6f1ce253b7a51d9f827f5f4b9d8b *template/default/home/space_videophoto.htm ed337fd01fb8d1e75396547a17c62b77 *template/default/home/space_wall.htm 7215ee9c7d9dc229d2921a40e899ec5f *template/default/index.htm c8def757dc775d3fa95f5a7f788b31ac *template/default/m/css/activity.css 47286c1eda70027c05543fe2e63d823b *template/default/m/css/comm.css +d41d8cd98f00b204e9800998ecf8427e *template/default/m/css/index.htm 9c07c9429a5ad27482fbd8fc317d2fcd *template/default/m/css/login.css 89d825dac7e8a1d155b2e450c2e43536 *template/default/m/css/pm.css dc21c5b57798f7456a64f5ca60a4dde1 *template/default/m/css/vote.css @@ -348,6 +350,7 @@ dc21c5b57798f7456a64f5ca60a4dde1 *template/default/m/css/vote.css ed323af990ce539e60696c0a269033b3 *template/default/m/fonts/icomoon.svg eb67b9bfb98b3e7f046c9d03ff7fc858 *template/default/m/fonts/icomoon.ttf 6d4bf0e3a696c4b7cec2143e79d390ca *template/default/m/fonts/icomoon.woff +d41d8cd98f00b204e9800998ecf8427e *template/default/m/fonts/index.htm 1fff66eff9242eee8ec3324428e15032 *template/default/m/footer.htm 52aaf0f4353d74dfe68805b35e367a07 *template/default/m/forumlist.htm 0ca006b2f6a331ac69523914e4e45172 *template/default/m/header.htm @@ -367,6 +370,7 @@ abeb13e4a8261a52cacac0df96ff7e5a *template/default/m/images/expressImg3.png e633264cabd988ed9f2547fee07cbf1a *template/default/m/images/expressImg4.png 2869510f8267e49dfe59ea9639b2d95e *template/default/m/images/fullImg.jpg 7bf30f1802be392437411566e5307005 *template/default/m/images/inco_qq.png +d41d8cd98f00b204e9800998ecf8427e *template/default/m/images/index.htm 8f2d9491a0964ce8c4f116fbb14c02c4 *template/default/m/images/personImg.jpg bc64d1962d93c673a0deb362f26085c8 *template/default/m/images/personManyImg.jpg e6bd0e038440d2363fd9876106fc5a9c *template/default/m/images/photoSelect.png @@ -392,6 +396,7 @@ c70683923b05eeda4464b81f92e753c8 *template/default/m/js/forumdisplay.js a676531ea7c2194ffa014d082776cfee *template/default/m/js/forumlist.js 4f62f6bfbbcc46ba625a32f84b274f79 *template/default/m/js/imageview.js 7a94950cb5a50b21d5ca33d69d87db61 *template/default/m/js/image_compress.js +d41d8cd98f00b204e9800998ecf8427e *template/default/m/js/index.htm eabf9acafa76aeac3cd22bc32697bbb8 *template/default/m/js/index.js c8f3d04d406dd75013bca437712c11e2 *template/default/m/js/info_center.js 49b1460a983f0c8a14494f8dac3425c4 *template/default/m/js/jpeg.encoder.basic.js @@ -435,6 +440,7 @@ ffc5575036dca79c51bf4fbcef1cfc2a *template/default/m/tmpl/forumdisplay_picbox.ht 5a096ec739862a03c6f260f3dd2a7361 *template/default/m/tmpl/forumdisplay_showactivity.htm 2d49234c98d516b44f73813116b6736e *template/default/m/tmpl/forumdisplay_wsq.htm bff04db64f098e0dd329264d5c7f56ef *template/default/m/tmpl/forumlist.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/m/tmpl/index.htm 1092281426422f3af8aae1c31ec059fc *template/default/m/tmpl/infocenter.htm df92493e2c0b2148ac3f95b0cf8db836 *template/default/m/tmpl/login.htm f9b295f39780539110626507073adce3 *template/default/m/tmpl/menu_index.htm @@ -463,7 +469,8 @@ ed7e08c53eed492c1097958f10b680dd *template/default/m/tmpl/viewthread_reward.htm 534a0513be1bd381fa36fd2d470a4557 *template/default/m/viewcomment.htm 79cff0e230db64a3199a4e38f2658f6e *template/default/m/viewthread.htm f394c231919ab6411cc6a4dbb06ca91a *template/default/member/getpasswd.htm -089a38769e7bc8bc89e29be3900a1de4 *template/default/member/login.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/member/index.htm +a20d9f104f2f11a391a69eeea5ceb51a *template/default/member/login.htm 046c9c0eb183428fdcf48bfd7b08f7f1 *template/default/member/login_simple.htm 26cb5ca9b5c4a670b01a17a82897862e *template/default/member/register.htm 2a179b9334f8cb84cb4d0d6970ff57b6 *template/default/mobile/common/footer.htm @@ -495,14 +502,16 @@ c9982f8be9c5c745f3bc8292ee49635f *template/default/mobile/forum/viewthread.htm e145e079a13321495bc446104819f180 *template/default/mobile/forum/viewthread_poll.htm 2964cc0996115551fcd4701f41a88f54 *template/default/mobile/forum/viewthread_reward.htm a11a9819ad15fca292bf7c56f2751f3a *template/default/mobile/forum/viewthread_trade.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/mobile/home/index.htm 236e4e231fd4bed49d90434d7a729024 *template/default/mobile/home/spacecp_favorite.htm 5a07185a0180ad87777721e924662b07 *template/default/mobile/home/spacecp_pm.htm d92880580f26d3fe829f5f3dfa72607d *template/default/mobile/home/space_favorite.htm a609ec0afc84e921383d7363b19db461 *template/default/mobile/home/space_pm.htm 4d227c4be91df62f46f926b706c8ad9a *template/default/mobile/home/space_pm_node.htm -4ecdc979fe01c7d0f0650e72ac6778c8 *template/default/mobile/home/space_profile.htm +d9ae841a9e1cc1a764060967302dfc79 *template/default/mobile/home/space_profile.htm e5839c358b98a913fafb3c67855816ee *template/default/mobile/home/space_thread.htm d41d8cd98f00b204e9800998ecf8427e *template/default/mobile/index.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/mobile/member/index.htm 12191d8d90c061ce933f7e297904d7a5 *template/default/mobile/member/login.htm 6e67d20218ea93336e2b48ec0f05e4fd *template/default/mobile/member/register.htm fa842efbaf52eaef883266a334ee2979 *template/default/portal/block_more_forum_thread.htm @@ -510,6 +519,7 @@ fa842efbaf52eaef883266a334ee2979 *template/default/portal/block_more_forum_threa d6b0394fb64c23b19ce01fa51d0c795f *template/default/portal/block_more_portal_article.htm 5c1ee4d58f0dfbb26b2267c17b5378fe *template/default/portal/comment.htm 5f7366107faf7e271518679a0867c6fa *template/default/portal/comment_li.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/portal/diyxml/index.htm 263932da58a94732bae9f45ff7154716 *template/default/portal/diyxml/portal_index.xml 0f647d0781bc06c228d209b5a76f3ad6 *template/default/portal/diyxml/portal_topic_blue.xml 06c80b0f6c00677bd048a0b2189f7922 *template/default/portal/diyxml/portal_topic_green.xml @@ -530,7 +540,7 @@ db4eba4c0118adac0e06d706b09993bb *template/default/portal/portalcp_block_thumbse bcff2acc3c8ead556d0787dbe77cb62e *template/default/portal/portalcp_diy.htm 4b9001604dce22787d4c585f58e0d684 *template/default/portal/portalcp_index.htm d4e6d5a6f33ece3837ef6333f917a9af *template/default/portal/portalcp_login.htm -99a021eb50e121603d8b2659709f5e88 *template/default/portal/portalcp_nav.htm +1c01f3090b3570438580e6cb87fe9c73 *template/default/portal/portalcp_nav.htm dae89e242931e4133e62dbec20d5d2f2 *template/default/portal/portalcp_pageblock.htm ac33492b46ca20e26b22ebadab52fa10 *template/default/portal/portalcp_plugin.htm fdf1c58eff516c61136a0c3bf69103ca *template/default/portal/portalcp_portalblock.htm @@ -547,6 +557,7 @@ ae3838aadfe7752df96118cdfcbcced1 *template/default/portal/portal_comment.htm 5b66118d33e6028848efcf5fde238d92 *template/default/ranklist/blog.htm af97bbc9c29de276c0e8e15bf3b9ef0e *template/default/ranklist/forum.htm bf790734724fc95bf7ce81a7ea3148b1 *template/default/ranklist/group.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/ranklist/index.htm 1526983086c0c4b39eb18758ce4a305d *template/default/ranklist/member.htm bab5e632c8da4a714f4b019612074aba *template/default/ranklist/member_list.htm b78e1d22df3700541b4d6c7c113d7bd8 *template/default/ranklist/picture.htm @@ -560,22 +571,25 @@ a36d2d732c36245c790f7dc9bb15d80b *template/default/search/blog.htm bdc1f59506fecae78d67657440d8c584 *template/default/search/blog_list.htm 70e2d21da2808ca38f4da22eea7ae037 *template/default/search/collection.htm 7a3f2b9b081024dd91b057ae04d117f2 *template/default/search/collection_list.htm -de4d92aaa7861f594eee69015c066989 *template/default/search/footer.htm +7eeaee22204feb007672b441848806ae *template/default/search/footer.htm 42d00bb003a4fbd453310f211f3b24a8 *template/default/search/forum.htm 92c5126ad3bf3f47d1f9ba444d423183 *template/default/search/forum_adv.htm 8db5061665b5a887258dc9c42dd17afe *template/default/search/group.htm 38404dd2b5f39005af8a1066b48529c6 *template/default/search/group_list.htm -545b8e713cb4ff9a3c18bbe800b62b24 *template/default/search/header.htm +c1ce418721f70cbb1ba665a0db7187cd *template/default/search/header.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/search/index.htm fcef6aa02e8f0691b8f5da715e9c81c2 *template/default/search/portal.htm 8d68ce30fe23628b79d94f79a01f22a7 *template/default/search/portal_list.htm a6605cfe32ec5c463702378ad4e5d465 *template/default/search/pubsearch.htm 51e6de6f0783d769894c22b93f8a094f *template/default/search/sortoption.htm 75bd0c6a803128ea53b6b13bc05005ed *template/default/search/thread_list.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/style/index.htm e0b6d3936de0af62620be813c9c9f462 *template/default/style/t1/background.png c3d7951c6be4da58487a6da76b9b4b08 *template/default/style/t1/bgimg.jpg d3971cacd51984314ea2f262303b2105 *template/default/style/t1/create_group.png b252049735fef4fbcbc54a4f7bfa869f *template/default/style/t1/flw_post.png 83f1641928ce65e2a47408de42bfd72e *template/default/style/t1/hotspot.gif +d41d8cd98f00b204e9800998ecf8427e *template/default/style/t1/index.htm 5e77d0f03c5aa45de66e2437ee1bde26 *template/default/style/t1/mood_input.png 418a46d1c6259dcb5b1225c7cdfbf3d8 *template/default/style/t1/mood_input_btn.png 849a566877effa12b88eb2e132f2b3cb *template/default/style/t1/nv.png @@ -596,6 +610,7 @@ c02f200d65a611a9035865b1396286c9 *template/default/style/t2/background.png 97ca3f4dd0477b6fc82c6d47ec160084 *template/default/style/t2/create_group.png 7d3efbbbb5d4bce12e189d45e25e34e5 *template/default/style/t2/flw_post.png 71497f719186d96a36719a400064efa6 *template/default/style/t2/hotspot.gif +d41d8cd98f00b204e9800998ecf8427e *template/default/style/t2/index.htm b420030c3bc174d2bd84bb0d9595bb07 *template/default/style/t2/mood_input_btn.png db2cf2747a77fb319204efbe9ad8080a *template/default/style/t2/nv.png 97d30456ec0854c80830e7d684a7abf3 *template/default/style/t2/nv_a.png @@ -613,6 +628,7 @@ ec5eed6a0a372338bebedc85c60c9098 *template/default/style/t3/bgimg.jpg 83ea5a12d8719a4eca9af080a3702d28 *template/default/style/t3/create_group.png b0f66e4a9188169c8c1300e37ba2f89d *template/default/style/t3/flw_post.png 0b7ff850d3d15f9ce6a9014f52729efc *template/default/style/t3/hotspot.gif +d41d8cd98f00b204e9800998ecf8427e *template/default/style/t3/index.htm 5a148f4bd6abff0ae8b5dc801bf40f00 *template/default/style/t3/mood_input.png 05c054987a18f9756a2af125c7e92997 *template/default/style/t3/mood_input_btn.png f0191d42320bc4ca3b57177480c03647 *template/default/style/t3/nv.png @@ -632,6 +648,7 @@ e25fbe1ad935b3d3f23dc0d71107a27f *template/default/style/t3/style.css faacbcf26453432d3ea461342518bef7 *template/default/style/t4/create_group.png b32f16da3b9af96a1752d87186b74391 *template/default/style/t4/flw_post.png 65a14036f5e88bf7337b5ec4523ef970 *template/default/style/t4/hotspot.gif +d41d8cd98f00b204e9800998ecf8427e *template/default/style/t4/index.htm fddfe070122aba79f3204b967a6fed51 *template/default/style/t4/mood_input_btn.png 111df54b8a1977f800785e79882563be *template/default/style/t4/nv.png 5393e7fe28feac1164161e67f933b6ce *template/default/style/t4/nv_a.png @@ -645,9 +662,11 @@ cd0afe377d2a3925c6e36b8e9bc45242 *template/default/style/t4/style.css 4bd3123b02affb33cf73422d8b4cc56b *template/default/style/t4/titlebg_sd.png 41a47c326d7a88237beee5b871697409 *template/default/style/t4/vlineb.png a2fd1ff07a0b84526d53906a32e8a317 *template/default/style/t5/bgimg.jpg +d41d8cd98f00b204e9800998ecf8427e *template/default/style/t5/index.htm 68911d331fa8b19586df2d4f31303d16 *template/default/style/t5/nv.png 42da9a7ddb754e4461db2c45f063cc74 *template/default/style/t5/nv_a.png e861e5ec7ed902f8b8e7ad91de22be3d *template/default/style/t5/style.css +d41d8cd98f00b204e9800998ecf8427e *template/default/tag/index.htm 6e037fd66dc354cb095de43b250f632a *template/default/tag/tag.htm b4779822f2cfadae9183eefd24b834a9 *template/default/tag/tagitem.htm 6ba191e7cbbba04b627893cbc9732181 *template/default/touch/common/footer.htm @@ -680,6 +699,7 @@ d5ef711f88c9162871506da9012dc128 *template/default/touch/forum/viewthread_node.h e37253e4868498feb550658fae788dd4 *template/default/touch/forum/viewthread_poll.htm 2964cc0996115551fcd4701f41a88f54 *template/default/touch/forum/viewthread_reward.htm a11a9819ad15fca292bf7c56f2751f3a *template/default/touch/forum/viewthread_trade.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/touch/home/index.htm 01cdf1e488165f22f60a27f709c5e297 *template/default/touch/home/spacecp_favorite.htm ee2db39a898de172f7522b9ccc882342 *template/default/touch/home/spacecp_pm.htm 3a583acf4045d3b21b56ae910b7cc9cf *template/default/touch/home/space_favorite.htm @@ -688,9 +708,11 @@ ee2db39a898de172f7522b9ccc882342 *template/default/touch/home/spacecp_pm.htm a0723fe8d11b3d6b4963610b175d808d *template/default/touch/home/space_profile.htm 7bac8d58995eff9defefdec9ebf48b08 *template/default/touch/home/space_thread.htm d41d8cd98f00b204e9800998ecf8427e *template/default/touch/index.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/touch/member/index.htm 3db150e94816bca0c666867457737d37 *template/default/touch/member/login.htm -2eae920d16e2c1b663945d629bd88f50 *template/default/touch/member/register.htm +8809cd233b09d0e559610a5639aef2ac *template/default/touch/member/register.htm 624b509727c7d94335e7102aaab670ed *template/default/touch/search/forum.htm +d41d8cd98f00b204e9800998ecf8427e *template/default/touch/search/index.htm e2bfd963180479b2a2e8921466e6c207 *template/default/touch/search/pubsearch.htm 6115864494c807bf0b479fe80e185fbb *template/default/touch/search/thread_list.htm b8b4b06eaf5fbb31eeb40dc9cd038ddc *template/default/wml/common/footer.htm @@ -705,7 +727,7 @@ d41d8cd98f00b204e9800998ecf8427e *template/default/wml/forum/index.htm d3b33a262b99a32194565aea09d76f28 *template/default/wml/forum/post.htm f23d49ee5064d9c54b61f5e9cffa2e78 *template/default/wml/forum/viewthread.htm d41d8cd98f00b204e9800998ecf8427e *template/default/wml/home/index.htm -df404ef7d16b8f3856f51c3616112492 *template/default/wml/home/space_profile.htm +acdabd4bbbe809fbf3d50401d5557a23 *template/default/wml/home/space_profile.htm d41d8cd98f00b204e9800998ecf8427e *template/default/wml/index.htm d41d8cd98f00b204e9800998ecf8427e *template/default/wml/member/index.htm f29cfae1957895ec9bf2bb6f415142fe *template/default/wml/member/login.htm @@ -737,31 +759,31 @@ aab6115d6da094789d9fab9920c0848d *api/trade/notify_credit.php 9f8cdad894a67ca729e3f36a27121f3a *api/trade/notify_invite.php a014963f4ea09d3a9389b9100f9512e8 *api/trade/notify_trade.php d4eab86918808b578d08edaab073ac8e *api/uc.php -c95f2ed21859a62850f1bf8df6de049a *m/index.php -7fc12eebbcffa9d70b32a2df7fabb5a6 *source/discuz_version.php +586ed46d5def99dd346dce86077461af *m/index.php +de51b2959dcfeac15a5a61fe383dfe75 *source/discuz_version.php 7215ee9c7d9dc229d2921a40e899ec5f *source/index.htm 0a7896849dd83bbf64a31ccf11e58a17 *source/admincp/admincp_admingroup.php -110de6cfd7adf7e45d9233a36810abce *source/admincp/admincp_adv.php +d4644aa3ec2ad361b9cd1d2e1ca544e5 *source/admincp/admincp_adv.php b3d8f1df09c1490a9859d83c2d2385be *source/admincp/admincp_album.php ef610689497ab25a07c3d74737e8dccb *source/admincp/admincp_albumcategory.php b278f4425dc0d78eccf80cd8fcecd91c *source/admincp/admincp_announce.php e5ae9680988cedc8f4980de4b8440e0b *source/admincp/admincp_article.php fed901959ac26956ce99ffc2b581a826 *source/admincp/admincp_attach.php -e48263dce4356396f52bfbcfb5071c64 *source/admincp/admincp_block.php +16fc785dc929df5916a6079533cab1be *source/admincp/admincp_block.php 2b28d410347737cfd372c1ac0bf83bec *source/admincp/admincp_blockstyle.php 7dbd05b78e14c49e14d6b113393174a7 *source/admincp/admincp_blockxml.php 864b3ac50313b33ccc6727ac8c37f51e *source/admincp/admincp_blog.php dda34ea9edc3f37fb7f3c8bae9d587e0 *source/admincp/admincp_blogcategory.php 20479a5ebcc8c8de3dac7a61764af979 *source/admincp/admincp_blogrecyclebin.php ac14d324de325ee9485caca992f796c1 *source/admincp/admincp_card.php -57401d9c4c596c317d2f72b4380b785c *source/admincp/admincp_checktools.php +27d12462647e6977175505e2b3936927 *source/admincp/admincp_checktools.php b40bc52669c410d5fbedaaf37550fb01 *source/admincp/admincp_click.php -747b1a45cce05aaf847e741cf148b3cb *source/admincp/admincp_cloudaddons.php -a7564ff1d1d99de04603d6a6f588a6e5 *source/admincp/admincp_collection.php +67893871bf760e8a2d11f132a8f5c964 *source/admincp/admincp_cloudaddons.php +d18aad8908273cdaa7a76cc318aa74af *source/admincp/admincp_collection.php 93c0cd010c921640c9bc5c06aa6c9394 *source/admincp/admincp_comment.php 8d7cf94cf8ba4ac82818e26cecec2aac *source/admincp/admincp_counter.php 0665400d11cef649010505101cc39d00 *source/admincp/admincp_credits.php -bb2c967dd255331386d7477dda65ade4 *source/admincp/admincp_db.php +0690d25814bf20a9cad997b7fcf371b5 *source/admincp/admincp_db.php 4355eac678fb1b9e33938b608c67b712 *source/admincp/admincp_district.php b6285e1c1a5ca72e0d4b7fab4bb8111a *source/admincp/admincp_diytemplate.php 095970f483d45b56345d9b459d4380fb *source/admincp/admincp_doing.php @@ -769,27 +791,27 @@ e8348f309e68aac745875558e6f4d794 *source/admincp/admincp_domain.php c194ac61519defe9e2c93dd89f02c2fc *source/admincp/admincp_ec.php 47c380dc41cb0e22ea5081d667dd72bd *source/admincp/admincp_faq.php 3af3cc2f6d3a84b5e573aa0c72b72471 *source/admincp/admincp_feed.php -c9f2ef213aa3643c21d925dd103d5e76 *source/admincp/admincp_forums.php +4345e2660392eedca506ba7ff5de2e98 *source/admincp/admincp_forums.php e5ce8f7047641aee21bf81313dc74d5e *source/admincp/admincp_founder.php 9100bd5f83e6bffb1d80750b17a608da *source/admincp/admincp_grid.php -377b4f5663f9d281437cbb1292a54e40 *source/admincp/admincp_group.php -d2f30491529ba7b665ea29fb4ccb61fe *source/admincp/admincp_index.php -04f7903ba5816f0db57be7677f262dae *source/admincp/admincp_login.php +27bb63af7bfeba8cfd695c40c31b46f0 *source/admincp/admincp_group.php +c39244fceeaf2d38c138a98b84e87a9d *source/admincp/admincp_index.php +06252d6952f357372292be65a3ecd7a8 *source/admincp/admincp_login.php 066fcd25828eb07d0a5f2d22e3aa2d70 *source/admincp/admincp_logs.php 1bb4886383e494b58807893cdd465f70 *source/admincp/admincp_magics.php -4754adf6cb0ba7446f036554b04dbf2a *source/admincp/admincp_main.php -6b9e2213d4c9d5b6f3d9334bc1fc5a9b *source/admincp/admincp_makehtml.php +7e9dff600bab45e6be452441b223bd51 *source/admincp/admincp_main.php +12c4f9edb5c4f7cd77b024cff894d2b4 *source/admincp/admincp_makehtml.php 7fd31518567cb389fccdde7b382f7a08 *source/admincp/admincp_medals.php -3f73e0eb30d16bbd35754ad7dce6c404 *source/admincp/admincp_members.php +1ddcf90d278a73cb9297da40e8b8c48e *source/admincp/admincp_members.php d84ce153a40a5d5a23791a759f12369a *source/admincp/admincp_membersplit.php -6aaf5851329a75c5c45e84d640e5484c *source/admincp/admincp_menu.php +2a921564ae5f9ebca938cf7159b4118b *source/admincp/admincp_menu.php 434c58c867539395ce7e42245df4421c *source/admincp/admincp_misc.php 11232ab0bb6a9c90e69a218cf8496a58 *source/admincp/admincp_moderate.php d421a0c55a227f26d5488e1b1d77e787 *source/admincp/admincp_nav.php -23366d92de576cfff4a56565e09fe63c *source/admincp/admincp_optimizer.php +21606cee451f3b1fdd96c3216755418d *source/admincp/admincp_optimizer.php 1f3c59f706eb00a835546445e535836b *source/admincp/admincp_perm.php bd23c59350b74e3443721d34fd8d0b59 *source/admincp/admincp_pic.php -ea542b2c90c2747f15319b0d9a5307bf *source/admincp/admincp_plugins.php +a8de4c591dce9406bf4d2d24c677cd7e *source/admincp/admincp_plugins.php c86e3f25f9abb4293d0f6588b564691d *source/admincp/admincp_portalcategory.php 969afc1130dccb5d8ff826e4206b6d2a *source/admincp/admincp_portalpermission.php 917a2d1d146988b21834f13e8aaae898 *source/admincp/admincp_postcomment.php @@ -797,17 +819,17 @@ c86e3f25f9abb4293d0f6588b564691d *source/admincp/admincp_portalcategory.php 61535bec6fa0d6f62df48eabbaf0dbd5 *source/admincp/admincp_prune.php 05f8a7fdbc5d1ae3d6982d01fbbccc64 *source/admincp/admincp_quickquery.php be6ec846b09fe1bb329c0ed5d58fc606 *source/admincp/admincp_recyclebin.php -0e892bee0d6ef9ac154f567ddd37051f *source/admincp/admincp_recyclebinpost.php +d78b5fa0a0d8c1207ff7273bfee88029 *source/admincp/admincp_recyclebinpost.php 693cf16a043646e6a1c1d885c1ede9a0 *source/admincp/admincp_report.php 515969363b1f35bf2523b4db88447ab8 *source/admincp/admincp_search.php -1de31b6e7263ee535557858a2438ae5b *source/admincp/admincp_setting.php +598bb7f18c2af7b97ffa0e51fd1533cb *source/admincp/admincp_setting.php 99faaf0fbd0645ac3baf1889629787bd *source/admincp/admincp_share.php c5bcf7715bc4bc3a614574152e41120f *source/admincp/admincp_smilies.php 007a086e911f690b1ae821a31bf53eaf *source/admincp/admincp_specialuser.php -f25b6957089bb7092de045831446652f *source/admincp/admincp_styles.php +781d506775277aa763b9b186fc43d9d1 *source/admincp/admincp_styles.php 7d8bffef6b6b5e7530b0a5d8e82a74c3 *source/admincp/admincp_tag.php -7774e94c83fa87ede04f69b736fcf863 *source/admincp/admincp_tasks.php -3d707bac5069ce5b809a6ccccd69487d *source/admincp/admincp_templates.php +3ed5b843570848bfdb0a93329edc7cf4 *source/admincp/admincp_tasks.php +70b447bd12b533bff81cb3b10c3aa861 *source/admincp/admincp_templates.php 621446be00b3fbf50dffcb80c32d6d4d *source/admincp/admincp_threads.php 1bb43a8680ccfbb3d94b1453d2b18ef9 *source/admincp/admincp_threadsplit.php 7db879e1107ba0e814d18c6970708bb4 *source/admincp/admincp_threadtypes.php @@ -816,7 +838,7 @@ cb659766c1ca2ad229ed094a7b4a2187 *source/admincp/admincp_topic.php d44745dad9ecd4a464394605476ad4f2 *source/admincp/admincp_tradelog.php 9af8dd9ead43f4d9deda57729ffd2e02 *source/admincp/admincp_usergroups.php fbf03d461e9ba987c58da873bf8ba7ba *source/admincp/admincp_usertag.php -09093ca5fb7347045c1edd24f8024a5d *source/admincp/admincp_verify.php +3803e3f68cb5479362264c8bbe5ac561 *source/admincp/admincp_verify.php 6b669f9aae2c0f1b89812482fa36d645 *source/admincp/discuzdb.md5 de7c14ada87a2cd40f6c349a8ebfb69d *source/admincp/discuzhook.dat 7215ee9c7d9dc229d2921a40e899ec5f *source/admincp/index.htm @@ -825,15 +847,15 @@ d41d8cd98f00b204e9800998ecf8427e *source/admincp/moderate/index.htm 1163da172483fa357f7e32e594dbb6f1 *source/admincp/moderate/moderate_blog.php 0ddc624ef640faabad880993e1dd1cdc *source/admincp/moderate/moderate_comment.php 8d2aff0a87e04b2ac44ecda66fb4028a *source/admincp/moderate/moderate_doing.php -0f422c7a4d64fdfcd11838dc45aab25d *source/admincp/moderate/moderate_member.php +21cc7950aba9717d32d15f811509523b *source/admincp/moderate/moderate_member.php 6962b4e3aeea6be675e737ab48aff64a *source/admincp/moderate/moderate_picture.php b9a7cbe8c910ba822646fb1e04063538 *source/admincp/moderate/moderate_portalcomment.php 4107f44462f58b62fee4f33f946ca097 *source/admincp/moderate/moderate_reply.php 80a918eda876b0ac2b28f93d897d9e9d *source/admincp/moderate/moderate_share.php c07c4b20d08cbd15394e6c3936a88e38 *source/admincp/moderate/moderate_thread.php 96bbf89620d30c72c1dab0e8b8eca17d *source/admincp/robots.txt -95846d24d9bd44b4554855f63dc3f745 *source/archiver/common/footer.php -a661e663c7c126c05a1febfb9e933ea0 *source/archiver/common/header.php +f134cd176dc876fbc23a395f4772c115 *source/archiver/common/footer.php +9b17399dce8be4a59de9d1b68a06940c *source/archiver/common/header.php d41d8cd98f00b204e9800998ecf8427e *source/archiver/common/index.htm 6c78d7d7558299f534c3ad51fde36594 *source/archiver/forum/discuz.php e1661099fcf4579fb4ba139cf60a6098 *source/archiver/forum/forumdisplay.php @@ -845,7 +867,7 @@ c4f9685cf275e365e50c20921ac45325 *source/class/adv/adv_articlelist.php c70fa58f0cc624f14b97a8bc3078f8f2 *source/class/adv/adv_blog.php c38af429e8676cdc2ecfeaec51b9e142 *source/class/adv/adv_cornerbanner.php 25a144a831cbf062a4dc8ed6b898b15f *source/class/adv/adv_couplebanner.php -b78cf016712ecbe98b236fa986fedae6 *source/class/adv/adv_custom.php +bea545de6e0854304334da585ba49a31 *source/class/adv/adv_custom.php d3db607d65d207ee4d12ecbb5b9395ec *source/class/adv/adv_feed.php 48cf7229652039bc51998709cc281df1 *source/class/adv/adv_float.php 7acef8e9533f0a16df26f47c741f2f1a *source/class/adv/adv_footerbanner.php @@ -923,7 +945,7 @@ d41d8cd98f00b204e9800998ecf8427e *source/class/block/member/index.htm 11626498a6bdaeed12948830664ff54f *source/class/block/other/block_otherstat.php d41d8cd98f00b204e9800998ecf8427e *source/class/block/other/index.htm 1ff318229fa88d24aa2649a0a95c9609 *source/class/block/portal/blockclass.php -d9fb63614924bdb29de64a4b9dbf3c78 *source/class/block/portal/block_article.php +5576dfbd56a46503617723fd4fa7e32f *source/class/block/portal/block_article.php 28b92dd13223bab2870176d56c80f345 *source/class/block/portal/block_articlehot.php 7c6c430527508e78a0fdb3839ddb05bb *source/class/block/portal/block_articlenew.php b7508ac76e734ddeb338b45a529abb71 *source/class/block/portal/block_articlespecified.php @@ -965,14 +987,14 @@ d41d8cd98f00b204e9800998ecf8427e *source/class/cache/index.htm 097d57aed4c14135dddfa9e0654df28c *source/class/class_dbexception.php eb8fcd8cf858498235cb8f9fa5532642 *source/class/class_gifmerge.php 85280e530e1bdbc959ccdb820d448431 *source/class/class_image.php -7b4156fe4f4427a912f53e6227ae45fc *source/class/class_member.php +d8760004a5fb73a213202f39261437b2 *source/class/class_member.php 5cb482684c447569d9d8b8e7c36659bf *source/class/class_membersearch.php f586ad9557c88be3630b8263da72ec19 *source/class/class_optimizer.php 96b880167956e7190b9b033ee421c6a5 *source/class/class_portalcategory.php 6458a7fe20f3e3b9fd8212191b1e3d39 *source/class/class_seccode.php ba8f93e2baa105875cbca0152cdd8645 *source/class/class_sphinx.php ac4604d2b3f6feca6fd3d271457b3601 *source/class/class_tag.php -c687785e44c21bd79240c9e9d9352a5d *source/class/class_task.php +3917ab592a817b7d279ec7ebd8a2b490 *source/class/class_task.php f84a8ef882403ab585f1fcda9993ae8b *source/class/class_template.php a38d1ee63a97ac42ed1f42ffe61cbf0b *source/class/class_xml.php 0243c69f103b8167e4e75aae836b3886 *source/class/class_zip.php @@ -989,7 +1011,7 @@ b0b7df7926c2cdd89957cca31ba54c41 *source/class/discuz/discuz_block.php e4b42ae2732c2dba007cd29c0a139de4 *source/class/discuz/discuz_container.php 2afe7f21611c1ddb08750c68e29426ca *source/class/discuz/discuz_core.php 4beda424464c4de67cedaba60b306124 *source/class/discuz/discuz_cron.php -48e08406f0f187b5c2bfc7ddee35f3dc *source/class/discuz/discuz_database.php +286bb58841ea6dbdc8c1e155491ae53a *source/class/discuz/discuz_database.php 9ffcd8d0e4d8a9339786c4d8516a9347 *source/class/discuz/discuz_error.php 770b5620f235ec9e7bbd0950f524e3d9 *source/class/discuz/discuz_extend.php d2343fb3bea0e16b574a1ea601a9f871 *source/class/discuz/discuz_ftp.php @@ -1003,7 +1025,7 @@ cc904be3c5e32e6e4b55261a1eca6e3a *source/class/discuz/discuz_session_close.php 7f92dfc0de0cf70c65570d519fdb38c1 *source/class/discuz/discuz_table.php bc5940c2be4338f2288f0cb179ecb685 *source/class/discuz/discuz_table_archive.php 75165506ebe77239c8a624b4383a5a17 *source/class/discuz/discuz_upgrade.php -0fe4472987f5d5d2046e850ffbd068a8 *source/class/discuz/discuz_upload.php +438fc0d5ef8f04cdb24c96be52bac04a *source/class/discuz/discuz_upload.php d41d8cd98f00b204e9800998ecf8427e *source/class/discuz/index.htm bca8d6b270c0e9383383afe95dcfefe5 *source/class/extend/extend_thread_activity.php ca7a561187dc9f012ac92a40faa4fdc2 *source/class/extend/extend_thread_allowat.php @@ -1038,7 +1060,7 @@ a2f2d9d076697b1c25eea29e8a57f36e *source/class/helper/helper_page.php fabc124614f30c6dccbf7371ec2f3d60 *source/class/helper/helper_pm.php 2a7f2005c5991b12350bb768934814fd *source/class/helper/helper_seccheck.php b8eaa904d338d1c953032877d06748f4 *source/class/helper/helper_seo.php -fd8e25aa9fb996f120f2e271b3b8a290 *source/class/helper/helper_sysmessage.php +702716085abbe7156e78d080fec3bfa6 *source/class/helper/helper_sysmessage.php 971f0eae86647e401fd99aacfc643ee9 *source/class/helper/helper_util.php d41d8cd98f00b204e9800998ecf8427e *source/class/helper/index.htm 7215ee9c7d9dc229d2921a40e899ec5f *source/class/index.htm @@ -1089,10 +1111,12 @@ bbb7b9348becfc1bda0b510faf533948 *source/class/optimizer/optimizer_aggid.php 9fce3e9b01008cca2b841b6b439ba86f *source/class/optimizer/optimizer_attachrefcheck.php 5205232550520170c438d21461eff292 *source/class/optimizer/optimizer_dbbackup.php d89478f52c55b4bef37b4e7d4e74d3bf *source/class/optimizer/optimizer_dbbackup_clean.php -674072790ba3f0b872f56cc11cded16a *source/class/optimizer/optimizer_editperdel.php +26336cf1c4a314d0a2de74a0eeae2eff *source/class/optimizer/optimizer_dos8p3.php +21146601b3c3cdc9c96903535d13f249 *source/class/optimizer/optimizer_editperdel.php 8f8cd7d59ed7f118862ff67906effd4c *source/class/optimizer/optimizer_emailregister.php 2b7831dc19515b007fae5c6fa575ef02 *source/class/optimizer/optimizer_filecheck.php 7fe2cf8e749bf2fa4c18528167ef56f8 *source/class/optimizer/optimizer_forumstatus.php +5aca11f260167ecbb26922eb10743c70 *source/class/optimizer/optimizer_httphost.php d329a53c7a7b1971d8226ba9bc793014 *source/class/optimizer/optimizer_inviteregister.php 932bc655629e1eebf6ddc56ed076d69e *source/class/optimizer/optimizer_ipregctrl.php 7a7a64004bb7a42f3d4db87511d55c99 *source/class/optimizer/optimizer_log.php @@ -1107,9 +1131,9 @@ c8497456427c3fb365f6a61ab32cdb52 *source/class/optimizer/optimizer_pwlength.php 510ac61ffedd610afbb125044d57bc2d *source/class/optimizer/optimizer_recyclebin.php 3ba90ea8b884eca78df3cdf12f9777cf *source/class/optimizer/optimizer_regmaildomain.php 8ccc302b4da7ac3d40467e13f721246e *source/class/optimizer/optimizer_security_daily.php -f962a4e968aca5bd25f4ab2ee96809b9 *source/class/optimizer/optimizer_seo.php +6876f0067abae39e0991fbc91cfad098 *source/class/optimizer/optimizer_seo.php 05224f156023e0cefd1586c34055acfe *source/class/optimizer/optimizer_setting.php -956aa379ce6cc60881a62deb7770bdde *source/class/optimizer/optimizer_thread.php +dc72e1f36cb640fea13157f57f7a4e92 *source/class/optimizer/optimizer_thread.php 76ae09f75f2b9a3c7535ea4396ddaca1 *source/class/optimizer/optimizer_usergroup4.php 7b790e10507e6f9086cf3fa6883fc787 *source/class/optimizer/optimizer_usergroup5.php 4ddabd3aee8fcf87dd306b0c3d194b9f *source/class/optimizer/optimizer_usergroup6.php @@ -1213,13 +1237,13 @@ b24101ac31fb996e17f97aed925ce64d *source/class/table/table_common_statuser.php f3695d5c1d13eb6fee367a48ab582495 *source/class/table/table_common_syscache.php 208445d9a8b3458753cb5c7b434e6fb2 *source/class/table/table_common_tag.php bb0b673f9ba2f92aca30ff19baea66df *source/class/table/table_common_tagitem.php -d36fe91776e4a7b1f9c6302e49866fa0 *source/class/table/table_common_task.php +a02e005b81aa1d0c1524e037052446b9 *source/class/table/table_common_task.php b36f3aa41966c4681b523617512b0247 *source/class/table/table_common_taskvar.php e4fd5484f4ce0610e557c34ab96d00e4 *source/class/table/table_common_template.php 60fa85d70a34cfd2708f310c4647ab45 *source/class/table/table_common_template_block.php ba050bbefa6f34d367f41a8d27f7f265 *source/class/table/table_common_template_permission.php 37f4c233b56aeb64bdf68e345684f0b0 *source/class/table/table_common_uin_black.php -e8e06acc00391eb36a842547940cba53 *source/class/table/table_common_usergroup.php +301860157723cf7f1c7b39c2456855f4 *source/class/table/table_common_usergroup.php 25fd3fb794c41663969cf5769cb1997d *source/class/table/table_common_usergroup_field.php c13eb9d54e8ab2f1380816d6735b87c4 *source/class/table/table_common_visit.php b2f0ec7d45b8a99ffbe37d192c6da13e *source/class/table/table_common_word.php @@ -1246,7 +1270,7 @@ c4a88ceec8267c604a2c4de6ae8c0a3e *source/class/table/table_forum_debate.php a0a3be752723c0a7357aa6a9fd2d2685 *source/class/table/table_forum_debatepost.php 0d476674fd6adbe89b574d6c2e95d8c7 *source/class/table/table_forum_faq.php e36de6b00c52ee2c71c8857cca320acc *source/class/table/table_forum_filter_post.php -30f87794d52368580d92fb4a0983e999 *source/class/table/table_forum_forum.php +6557b7696c400499265233a4211299e1 *source/class/table/table_forum_forum.php debf82e9884b6182d354de7372776ce1 *source/class/table/table_forum_forumfield.php eae57e30a2afc4bbe90009a3c1e3b80f *source/class/table/table_forum_forumrecommend.php eda31421cd8638a6a759f03e4b963022 *source/class/table/table_forum_forum_threadtable.php @@ -1286,7 +1310,7 @@ ecbb04bb9a88340e7154d020a41fd8d7 *source/class/table/table_forum_replycredit.php cd142f7d9d56f6f5cdf20ba8bcb80841 *source/class/table/table_forum_sofa.php 292ba4a8221d934d4069e1e82d0bbb9c *source/class/table/table_forum_spacecache.php 40059149d0a0675213c0b0ac29b99fa4 *source/class/table/table_forum_statlog.php -368ec5a3d526adbc74c66eba78a5ae0a *source/class/table/table_forum_thread.php +b3d727b86d98913cbeb3e83da9e3c604 *source/class/table/table_forum_thread.php 162b9dc329cba0cc0e4a3c75525f3e1e *source/class/table/table_forum_threadaddviews.php 588140e7c65c8722818cb1150222c795 *source/class/table/table_forum_threadcalendar.php 2923528d736502648736bf1cad609fa7 *source/class/table/table_forum_threadclass.php @@ -1408,7 +1432,7 @@ b92c99aba4da35391bde84504d64ad93 *source/function/cache/cache_plugin.php baf85fb5431563387b59b0fb43cbb9e2 *source/function/cache/cache_profilesetting.php faf4bccddcf1bf0ea1fffad52bad7f68 *source/function/cache/cache_relatedlink.php 0d52202ae015fd4be95925b946dd7486 *source/function/cache/cache_secqaa.php -1011b998552f387d11848a5ae212ba44 *source/function/cache/cache_setting.php +f42cbb4cd26015cc01550e8ff2884084 *source/function/cache/cache_setting.php 472dafd096d39ad54c8b242a5220618e *source/function/cache/cache_smileycodes.php 0e488862847fc909ad920d4887d21814 *source/function/cache/cache_smileytypes.php f09feb7638b8b10f557cfc77efa8a528 *source/function/cache/cache_smilies.php @@ -1422,7 +1446,7 @@ fe617c17728d90c0b60d9a7346af4191 *source/function/cache/cache_threadsorts.php 1afccc6a7e13889e3e8ac245498304b5 *source/function/cache/cache_usergroups.php 8dffc3b7045a96be9bee7e6915769e59 *source/function/cache/cache_userstats.php d41d8cd98f00b204e9800998ecf8427e *source/function/cache/index.htm -d4599d86926509ecc6001a454a8080e9 *source/function/function_admincp.php +02922b50bd471a52b484f073bac52a99 *source/function/function_admincp.php 84da63dfc3f854f43b0a73dc51d0ea1a *source/function/function_attachment.php ba37235527c8a849e263af527a8c8301 *source/function/function_block.php 96a7de1f59331d44ae09942e31d16f7d *source/function/function_blog.php @@ -1430,26 +1454,26 @@ ba37235527c8a849e263af527a8c8301 *source/function/function_block.php 6713ffc5733c9a7f7d34ee2ff5ef590a *source/function/function_cloudaddons.php 77f06f33b827d1155c5c3c2f28bc7909 *source/function/function_collection.php 90ee4789682564336c6043e19dc2dcb8 *source/function/function_comment.php -eb4fad0a0bc1e7075724143021ff52c7 *source/function/function_core.php +62d7c18df4164ceb63c838b240f64482 *source/function/function_core.php 9bc78bc4596f7711cd5d338a791bc9be *source/function/function_credit.php 5ba2bef3a64ff75fc5adf2a4d2bae2a9 *source/function/function_delete.php -efb75e51255154017979b483c14b53e7 *source/function/function_discuzcode.php +f9f30d82fcbb24ab3f856699030f15d5 *source/function/function_discuzcode.php 9270deaa36c685a3f408bb9cee2db317 *source/function/function_domain.php 30b1bdd6288e8703448aebcefef24b3f *source/function/function_ec_credit.php 5dbc9a2336c42c0d6b4eed80aa6f100e *source/function/function_editor.php ed60f1ffa5730c849ff679cf8fd5efcb *source/function/function_exif.php 6a8be564dabbea97a4b97127eb3eaf9e *source/function/function_feed.php -759cdacc7ffba96f9da69493908bf0f8 *source/function/function_filesock.php +7829b6dc35e86acbe8fd6cb3d4ced140 *source/function/function_filesock.php 9823c87e973aedf53a1ac0495b805519 *source/function/function_followcode.php 3015ac02a76f45f63bdb4ddb42262ffa *source/function/function_forum.php -ad6ec12539ad4343bedbcaf69458b53b *source/function/function_forumlist.php +95cc4b28fdce7b3394b252a9d6d4dd9f *source/function/function_forumlist.php 10758d44f84170af87ed5d0a4f15d657 *source/function/function_friend.php 29f2fd5faa1137daf5cbee96a21bcde6 *source/function/function_group.php abe3f94e960d66f15bb08ec6195c029f *source/function/function_grouplog.php c7b201f1fbbee7b2d9f3e9c06277cc61 *source/function/function_home.php 55b57ec5873e397ffb7a7cc4f5fdf5ce *source/function/function_importdata.php 9f5d7bb25602f6dce197ade22f6614ee *source/function/function_magic.php -eb878fd7b572c27022979390a4c721ea *source/function/function_mail.php +ab0eb76dbff9097ab70c9460dc50ad25 *source/function/function_mail.php a0b1f0616ab4c4cd0ae4f4f38d4206cc *source/function/function_member.php 40ee75482ffa0542df601d1e6184e940 *source/function/function_message.php 7bec80063cf1cb941651ec05059d25f6 *source/function/function_misc.php @@ -1468,18 +1492,20 @@ a75377f288a9e757399525cd7a6f383a *source/function/function_space.php c270132d0780cb2682b431cd47897e9c *source/function/function_trade.php 405ba354a201677e9cd76cf0e2314a44 *source/function/function_upload.php d41d8cd98f00b204e9800998ecf8427e *source/function/index.htm +d41d8cd98f00b204e9800998ecf8427e *source/function/media/index.htm 2c2e756901195f6e9f1d6591ec6fcf3f *source/function/media/media_56.php 86352baae10e0ae033a15c32bad0b045 *source/function/media/media_acfun.php 8ee1482a98edb5fff23ae528644a74f2 *source/function/media/media_bilibili.php +4fd0727c1bcfecd671f531dddf01b3ec *source/function/media/media_ixigua.php fa6c365f3f764f271e0c63b142e4ccde *source/function/media/media_ku6.php 04bb0e6a2efb70f6a1444309c948a29d *source/function/media/media_mgtv.php 210dc5120a3d00888fdeb11c23027537 *source/function/media/media_qq.php 3852347aeff7aedd48666479cda193b1 *source/function/media/media_sina.php ad5a45fdf53841191e6fce4a9a9532c0 *source/function/media/media_sohu.php -dbc6c163d0edd70fd263d96ba79aed9a *source/function/media/media_tudou.php +f7719879f013401b3e59b4d44d9406ab *source/function/media/media_tudou.php 07782c6c51233ffaa4008447fa589ed4 *source/function/media/media_wasu.php cfa9a380c166cd6b6a87700f6dfc33ba *source/function/media/media_youku.php -2ce3f04d6df5579d55cc02caa950f431 *source/function/media/media_youtube.php +e8d228137cb50936a02f3ce386bca29f *source/function/media/media_youtube.php 8ed1be38bb3de1aa5a1fee832e2dae22 *source/include/collection/collection_comment.php 3708e215a1f193e93b0c0e94a9610ea4 *source/include/collection/collection_edit.php ce22900c4f828025ddec6f2e30351faf *source/include/collection/collection_follow.php @@ -1490,7 +1516,7 @@ d659e4063eaaf2346d348e53f4dc8531 *source/include/cron/cron_announcement_daily.ph 25c2dc1dbaf326fdf6b7e6430440e7b5 *source/include/cron/cron_cleanfeed.php 381f11f42e60b0776ca06a8ade8c75e3 *source/include/cron/cron_cleannotification.php e6246d40c1f5c5c0789d9832bb627428 *source/include/cron/cron_cleantrace.php -0ac5625d498a6fb75acfd7a009938ca9 *source/include/cron/cron_cleanup_daily.php +b240768e13e3b51856d63ae94c213e1a *source/include/cron/cron_cleanup_daily.php 1a25529eb4a879f09a883ab61bf80e01 *source/include/cron/cron_cleanup_monthly.php 4437326537a954ba0720e389b16121bb *source/include/cron/cron_follow_daily.php bf4e42f1826bb4c0d0ada68128f24d0e *source/include/cron/cron_magic_daily.php @@ -1510,8 +1536,7 @@ e5dc3d211acd2a3a0a1c033c9fc0244d *source/include/cron/cron_todayviews_daily.php 7215ee9c7d9dc229d2921a40e899ec5f *source/include/index.htm d41d8cd98f00b204e9800998ecf8427e *source/include/misc/index.htm ca8176d4de2937c07397936bfc2598b5 *source/include/misc/misc_ajax.php -5fec10ce7cb913536fde1253f536ce31 *source/include/misc/misc_category.php -3ddb68067f89c99602eca44afbd9a3e6 *source/include/misc/misc_counter.php +5cb97268c5a813871bad43794fa46dc7 *source/include/misc/misc_category.php a227cfdfc85fd2a54257cde6bfb51ff4 *source/include/misc/misc_emailcheck.php 7f06ba0572dc4769f9ee863cc5b21f7e *source/include/misc/misc_forumselect.php 5b37565a3e1ca80d1ad4f087a64280dc *source/include/misc/misc_inputpwd.php @@ -1525,9 +1550,9 @@ bbf3ba3644a7f9df6cac5069c07e706d *source/include/misc/misc_ranklist_member.php d09e1b7d03e908c9f0cd1b2f902b6336 *source/include/misc/misc_ranklist_picture.php 29a952d5e41b28255d01c8c1d53ffdca *source/include/misc/misc_ranklist_poll.php 6e1f87fd24fdcdf55b4fe90bee2f7afc *source/include/misc/misc_ranklist_thread.php -18ee58265c971b84156cc21cad77bac8 *source/include/misc/misc_security.php +60b4e5cb6aaebdb61e5eff74a1940de8 *source/include/misc/misc_security.php 3f2fb687c6fa491e17bafe6df652250d *source/include/misc/misc_sendmail.php -e9f9370a455b5d634e7b0f01426e98d7 *source/include/misc/misc_stat.php +6cb70bb1c3e5da260263288ca582fb40 *source/include/misc/misc_stat.php 01c5b8901bfaeb86ed42be16014d859c *source/include/misc/misc_swfupload.php d41d8cd98f00b204e9800998ecf8427e *source/include/modcp/index.htm f03bc0599f2a79111931b352f10b319b *source/include/modcp/modcp_announcement.php @@ -1536,8 +1561,8 @@ f56a1f879c2930be194bf6a9bea45386 *source/include/modcp/modcp_forum.php 4938f4a2850e1782a3637ad0f4d908c0 *source/include/modcp/modcp_home.php 6cc5d5f037c8da778f3db8fb3e88dd0a *source/include/modcp/modcp_log.php dde0eee700ab35dd90e4d34faf4be7d5 *source/include/modcp/modcp_login.php -bf0bdb530a4e28fcbbf31096492478a5 *source/include/modcp/modcp_member.php -c7ecbe882a713090109010c3c3b369aa *source/include/modcp/modcp_moderate.php +db62105c9d5979f0d2eb7a19f0a718cd *source/include/modcp/modcp_member.php +915d9979b32fc4b41c108e8f538eb18e *source/include/modcp/modcp_moderate.php 625cb9707b0dc2cce54196d4ecd5b0e0 *source/include/modcp/modcp_noperm.php a801e5b7a9e854353a693cc9929df969 *source/include/modcp/modcp_plugin.php 4188d4d380590165470b44ea5ab64255 *source/include/modcp/modcp_recyclebin.php @@ -1545,17 +1570,17 @@ fd19d49706140a127abc4862c9815263 *source/include/modcp/modcp_recyclebinpost.php 43ed72688e249662559ed03537060bf3 *source/include/modcp/modcp_report.php a05721b0fb4e06669214d586f7e63a83 *source/include/modcp/modcp_thread.php d41d8cd98f00b204e9800998ecf8427e *source/include/portalcp/index.htm -24141290867a83a6e0bea3e984417eb2 *source/include/portalcp/portalcp_article.php +f815caaa41ef9262896c3f15192b451d *source/include/portalcp/portalcp_article.php b2f6bdf956a2f9740847466d80611e8f *source/include/portalcp/portalcp_block.php c323043021274e388b00ad10178d2f94 *source/include/portalcp/portalcp_category.php 53d87d967308d166cd3d4bb934c73f28 *source/include/portalcp/portalcp_comment.php -d4b6ac94329fff13c0fae97c8901ee0f *source/include/portalcp/portalcp_diy.php +b088d9e85aae3ad74000f4903f8d5890 *source/include/portalcp/portalcp_diy.php 3856a6e3877d653e273d7aa3833238a1 *source/include/portalcp/portalcp_index.php c8b77635b59af981637218bc5880182d *source/include/portalcp/portalcp_plugin.php 40d03c02bc0c5d6480357ec61849c736 *source/include/portalcp/portalcp_portalblock.php bd16ae279c30f14453afaa125afebff1 *source/include/portalcp/portalcp_related.php 1491d7723dfdf23e3d6f34ded72bb718 *source/include/portalcp/portalcp_topic.php -dc27eee9dca302b4180722add31e1ada *source/include/portalcp/portalcp_upload.php +0db243c045d0f5ef59e9bc0b7f3a9ef5 *source/include/portalcp/portalcp_upload.php d41d8cd98f00b204e9800998ecf8427e *source/include/post/index.htm f629df076baef2c3bce97b9fbdcb0da6 *source/include/post/post_albumphoto.php d23410cf5da852f1087d746b82e62326 *source/include/post/post_editpost.php @@ -1576,7 +1601,7 @@ c87ebdb6d83cc3c5291cc63cc644efcb *source/include/space/space_home.php c4add6270e2d4882047efd415cc7fbee *source/include/space/space_plugin.php 051f2c887ed5989b15ddfaced7891feb *source/include/space/space_pm.php 2a8890e2002976f36b537419a3575b12 *source/include/space/space_poll.php -17216cf489fb8002fbc6397f185942f4 *source/include/space/space_profile.php +9f1335517df97d4353ee376653895c19 *source/include/space/space_profile.php 79444617a433bfe3f2378c5cb81f2e46 *source/include/space/space_reward.php f731c60a9d93ea8ad21468cafefb302c *source/include/space/space_share.php 30757760ad1b66e473c927f6c1905514 *source/include/space/space_thread.php @@ -1592,7 +1617,7 @@ b6708bb5967b1a2f54d4e100d20d5d77 *source/include/spacecp/spacecp_class.php 6c6f3ec8fbb5d99990df1a14044b5596 *source/include/spacecp/spacecp_comment.php c091bf51d19ee857ef61868303080fef *source/include/spacecp/spacecp_common.php 8c4f0628f538f3266305b3e5f1779e1c *source/include/spacecp/spacecp_credit.php -1bd26cee31db6dd6034a74754119a504 *source/include/spacecp/spacecp_credit_base.php +d19945359b41085f4857a967a38807f2 *source/include/spacecp/spacecp_credit_base.php 721c69630a50e9d5f25d710e45e5eb7b *source/include/spacecp/spacecp_credit_log.php 357ed67900619d9552dfff7bcd2e8ba7 *source/include/spacecp/spacecp_doing.php 5a1b70af27bbc8d7250380ead7fcbe5a *source/include/spacecp/spacecp_domain.php @@ -1601,14 +1626,14 @@ cf14259cc22736d0a5300fb1664378ee *source/include/spacecp/spacecp_favorite.php 905527895eee044b5c4cdbca75b6f1e3 *source/include/spacecp/spacecp_feed.php 198bd7bdfb786b5eb713382a319eb6a0 *source/include/spacecp/spacecp_follow.php 1dcfb62eb92e13e1ab18ce5381d56ce1 *source/include/spacecp/spacecp_friend.php -ad92c93d91c645e4f7651b70b3a7e7d0 *source/include/spacecp/spacecp_index.php +f207b5f0a8538140f4a8c39a68fcf532 *source/include/spacecp/spacecp_index.php c23ea89b754a09d5e9aba5d8eddfd520 *source/include/spacecp/spacecp_invite.php 55e9eb2515f9c2de66657f612a6ece79 *source/include/spacecp/spacecp_magic.php 3237cef7fb24b80104ed107e47a0aa2c *source/include/spacecp/spacecp_plugin.php -0145ad8801fde23d440876dc4462efbb *source/include/spacecp/spacecp_pm.php +e0f8fce2642a145e61b1a2eee5c99426 *source/include/spacecp/spacecp_pm.php 5f5e62ec69db8d5f072e5b5724eef3ab *source/include/spacecp/spacecp_poke.php d18f4bf4dd2bddccc1f15c04fb36d35b *source/include/spacecp/spacecp_privacy.php -fdb30bc1908e260aed23fc25bfae2d8f *source/include/spacecp/spacecp_profile.php +c8993c2784a570ce400378ca8a2a04fc *source/include/spacecp/spacecp_profile.php e862bf088d4aca1eb859422a43583e5b *source/include/spacecp/spacecp_profilevalidate.php 0602a64356411e7c965e115f05a76154 *source/include/spacecp/spacecp_promotion.php 1cad860731b369f18783233559a6c138 *source/include/spacecp/spacecp_search.php @@ -1639,7 +1664,7 @@ d30631e3aaebf711b44444ca5332077d *source/include/topicadmin/topicadmin_delpost.p 08f5ef647351ae049485cd5bd1ef8718 *source/include/topicadmin/topicadmin_getip.php 8789bdb4f6ca2e99bfd458f88de99858 *source/include/topicadmin/topicadmin_live.php 5e35a1340fe516d2de92331b98d5ffa0 *source/include/topicadmin/topicadmin_merge.php -e4a13f99ef817ceca3062d84fdcc3008 *source/include/topicadmin/topicadmin_moderate.php +ddfd53d51a153b1e6832edefe0b6f0e7 *source/include/topicadmin/topicadmin_moderate.php 58051bfa29151abcc386c8e48386b784 *source/include/topicadmin/topicadmin_refund.php 323a1c03557343ba8cb37c1b0ebda81a *source/include/topicadmin/topicadmin_removereward.php ac0288a9473346e1a6f279cf6b86b613 *source/include/topicadmin/topicadmin_repair.php @@ -1718,22 +1743,22 @@ d41d8cd98f00b204e9800998ecf8427e *source/language/group/index.htm 3cf14917141898d03708d3db4e17bdf6 *source/language/home/lang_template.php d41d8cd98f00b204e9800998ecf8427e *source/language/index.htm c912d218c2e9bb4c313190fc0f4a7339 *source/language/lang_action.php -d1209ab51e070d3e4b1c8b5da45d55c2 *source/language/lang_admincp.php +cc591e231f97968628731bc4d51492d9 *source/language/lang_admincp.php bb079def9d0446b4938108c706c529dd *source/language/lang_admincp_login.php -e42910d62e9e08101b1a04c562daf5f6 *source/language/lang_admincp_menu.php -9dbd567a54e26e50b73d252c0041e2a4 *source/language/lang_admincp_msg.php -dfbc65c621ac0770f589af8b9335433d *source/language/lang_admincp_searchindex.php +952dd72aef2f0ff5e479822bcf74d89c *source/language/lang_admincp_menu.php +bbec8295365ac2a19b6ac5798738463c *source/language/lang_admincp_msg.php +7f1c9c8219c1b8c19966f678e6443914 *source/language/lang_admincp_searchindex.php 85b48ebd58cbbca013cf830d7890506e *source/language/lang_blockclass.php 6bfd66db7ef1ddb8c49326f92f2ed710 *source/language/lang_cloud_register.php -ff9af2d622db0fbcc6dcc60298b698ce *source/language/lang_core.php +967ac73c8f30ee2aeda28c705ab37279 *source/language/lang_core.php fa70a2ac5cd412d46c80f68a3187f0e1 *source/language/lang_email.php ac434839cd9a6049134f647d2ea0d849 *source/language/lang_error.php 7eb8933eb7846b4c173df490c8a453d2 *source/language/lang_exif.php 9f9c4f8b58d1f7a1963794f2f74cc023 *source/language/lang_feed.php f1e320d5eceb22226759968178a75491 *source/language/lang_friend.php -db1452aa3fd8020bab7e4f81ff711936 *source/language/lang_message.php +149fe615077682119c458c28c65736d1 *source/language/lang_message.php 5c40419a2194878bd43014f1e8e2ae9e *source/language/lang_notification.php -191503dbdc2ea1813b071a4ad1446fc7 *source/language/lang_optimizer.php +ff93cf9cf22cad56c10073eb777511dc *source/language/lang_optimizer.php b22dda0c98c10eaec346b3c70b30059d *source/language/lang_portalcp.php 6aacd40bbd48bc31cdf081dd610f0c26 *source/language/lang_seccode.php 79ab02469b057aa44903b89a5471ea79 *source/language/lang_space.php @@ -1794,24 +1819,24 @@ a82e3b7397cbfef68ff51c7547bd6236 *source/language/task/lang_connect_bind.php 7555e944a64861c00955d1a9f7861227 *source/language/task/lang_promotion.php d41d8cd98f00b204e9800998ecf8427e *source/language/userapp/index.htm a7b46d58b381afc6de0f4d6856cd7c96 *source/language/userapp/lang_template.php -452c38f2c2a6b85bbec9a18ffe3a492e *source/module/forum/forum_ajax.php +98f2b1ff4694e0ed8eaac812c3887261 *source/module/forum/forum_ajax.php bdd5d6283fce2cb038b890f54ecc2a35 *source/module/forum/forum_announcement.php -dc644c4e095b7b053ee5daa2cfd080b9 *source/module/forum/forum_attachment.php +2b94517637e39842ccf37a50f4bfefc3 *source/module/forum/forum_attachment.php 28031a26398547ff20359989263cd3b6 *source/module/forum/forum_collection.php -52a3e6f358155315e06abe5674593b99 *source/module/forum/forum_forumdisplay.php +52df85a3fe13cea455f69302c765ca22 *source/module/forum/forum_forumdisplay.php 90d2edb38e859c8e96f40ed914969e05 *source/module/forum/forum_group.php 671496bee811316ce8f92bb9c10cb763 *source/module/forum/forum_guide.php 044aabe6823ceff3bd01b082776d5fe5 *source/module/forum/forum_image.php -b36ee858077628fb232246f66805bf46 *source/module/forum/forum_index.php -3f8fcb457636323dbf5e813886ef94a9 *source/module/forum/forum_misc.php +2565d3b4bc0f39f6308222d6629bd943 *source/module/forum/forum_index.php +8e1bfa88dd8cd12a218705aba2c66ee6 *source/module/forum/forum_misc.php eb619810a79382286ebea525af541369 *source/module/forum/forum_modcp.php -e674a6d44523796cee1ebb3b18c2e3ff *source/module/forum/forum_post.php +f577e6eb4951199e21281bfb93d78db0 *source/module/forum/forum_post.php 856837c63d08a8920978342ebae1a39b *source/module/forum/forum_redirect.php 1580ff8a89efe77b3e88c2e4a3258a05 *source/module/forum/forum_rss.php 9eacb72a42d21156d35b2a8956cc0fdc *source/module/forum/forum_tag.php 571fc4f66dc650cdf4548ff0d8d60e40 *source/module/forum/forum_topicadmin.php e7d4e8fed8d979a928cd8960eec25f2d *source/module/forum/forum_trade.php -d73ee20aaef631fa93e01c23bb14eb65 *source/module/forum/forum_viewthread.php +7e54d46d25a0af0554861517574ec9f6 *source/module/forum/forum_viewthread.php d41d8cd98f00b204e9800998ecf8427e *source/module/forum/index.htm 6ac2bc80c87d24ef37a87e02cf9f31cd *source/module/group/group_attentiongroup.php 8263a15c6d7dc0246cf7426d16cd9195 *source/module/group/group_index.php @@ -1820,20 +1845,20 @@ d41d8cd98f00b204e9800998ecf8427e *source/module/group/index.htm f2968429502566df71423fa8e651abcc *source/module/home/home_editor.php b15bac7c91424aacde4d5e0a6a574c0c *source/module/home/home_follow.php 1811ea7448bf729dfa139e217360aa8f *source/module/home/home_invite.php -c00706e9dd6e4b8531ca602d55a341e2 *source/module/home/home_magic.php +da87e5a59dc56331342232dfaa85d664 *source/module/home/home_magic.php 833b20dca51f50b527bd7094f38449df *source/module/home/home_medal.php 356360ddd68d3710e30d3a98dcd839eb *source/module/home/home_misc.php f1b870c5761d00a8631df0254912b510 *source/module/home/home_rss.php -e0b740aa833ab6e2b959d199c7163dd8 *source/module/home/home_space.php +d38279e933463817cdd76b0ca2dda388 *source/module/home/home_space.php 2be4e1f44aab62e977bc24429b056081 *source/module/home/home_spacecp.php -22c6f9270d736915123ada2a4306ae49 *source/module/home/home_task.php +1bdda7131765045c0ae7fe89e44c21a5 *source/module/home/home_task.php d41d8cd98f00b204e9800998ecf8427e *source/module/home/index.htm d41d8cd98f00b204e9800998ecf8427e *source/module/index.htm d41d8cd98f00b204e9800998ecf8427e *source/module/member/index.htm a053fa86402b06f0a404b3503642940a *source/module/member/member_activate.php -71dd95cd33f1ad4f152c7fee0612fb18 *source/module/member/member_connect.php +89c209c281e838821cc608ce8d5b3ae0 *source/module/member/member_connect.php 59e0ba82c6ad9650f61f39ade4455700 *source/module/member/member_connect_logging.php -895f8fafdc6b81e60283dbd95b024ebe *source/module/member/member_connect_register.php +637d3555272236936a737383402657bd *source/module/member/member_connect_register.php 27156c83fd2b23d44d0189c290936dbb *source/module/member/member_emailverify.php b50178653e1617f6eddeae13f0dac36c *source/module/member/member_getpasswd.php 4d0493b135a09ca80bef9e1bcff70175 *source/module/member/member_logging.php @@ -1842,26 +1867,26 @@ b50178653e1617f6eddeae13f0dac36c *source/module/member/member_getpasswd.php a299db7594f09569965dab9e6f942961 *source/module/member/member_regverify.php e581323b8312f1c41a4c8adfd00a1d4f *source/module/member/member_switchstatus.php d41d8cd98f00b204e9800998ecf8427e *source/module/misc/index.htm -f31a5e9ffd7d83abe684287058d89975 *source/module/misc/misc_buyinvitecode.php +236f38bb6d85458be3a1393121481a55 *source/module/misc/misc_buyinvitecode.php c4cc92f6de3bddcbe452039bba167d4f *source/module/misc/misc_diyhelp.php 44ee478ce8ef8877022f03a236e0b8aa *source/module/misc/misc_error.php aed09ee91f0152cf394e8fe7eb83d007 *source/module/misc/misc_faq.php -0c2a7a825561f1cbb9d74112086bc430 *source/module/misc/misc_getatuser.php +2e63894cef0b71fc56d228a9d5f0a4be *source/module/misc/misc_getatuser.php 670249a9c4264680aeaef53d39d9da8e *source/module/misc/misc_imgcropper.php 1ea0ed29cc359b6e6883dc37bb0dfd08 *source/module/misc/misc_initsys.php c41c71f883fd0e79e84bd620edc6e747 *source/module/misc/misc_invite.php 96f91bddc56c05c1b98e911965c33ffe *source/module/misc/misc_mobile.php -0c9c86676b498665572e81219536bbb0 *source/module/misc/misc_patch.php +d90360fdb040654b9b21573662c82701 *source/module/misc/misc_patch.php 24949cf4d7461cefb07622b712f1d123 *source/module/misc/misc_ranklist.php 70760d53b301c85f238d49ab4568fe83 *source/module/misc/misc_report.php ba69778df113e568f513c8136bd24e6a *source/module/misc/misc_seccode.php 5d7f3936ee1aafc1b0774ffa50782a4d *source/module/misc/misc_secqaa.php -8c5c539ef08c4ebad727020a04352103 *source/module/misc/misc_stat.php +3bc1eaeee38a3b0c994664b255f971f8 *source/module/misc/misc_stat.php f9894157f4f320c958bbb16a07101106 *source/module/misc/misc_swfupload.php -8cff67e3f9f57d6eec68f1fada15202f *source/module/misc/misc_tag.php +b84f8218004e16d528efd65294b8dda7 *source/module/misc/misc_tag.php 5662f1ef1ba82a32e2b5fd34fc03e8eb *source/module/misc/misc_userstatus.php d41d8cd98f00b204e9800998ecf8427e *source/module/portal/index.htm -a1ed2e82d8e6faa08c40864b1bbb6f58 *source/module/portal/portal_attachment.php +38d57d9f2fd3bea850613d01341cfa62 *source/module/portal/portal_attachment.php 2567bc717330093da0061be45ec9233a *source/module/portal/portal_block.php e4167bd24963a3a54196a9307ddca932 *source/module/portal/portal_comment.php b14cd41478740e497287a01b916a3e85 *source/module/portal/portal_index.php @@ -1874,13 +1899,13 @@ d41d8cd98f00b204e9800998ecf8427e *source/module/search/index.htm 83a0de5b8bbec75f07586f1ae29fc493 *source/module/search/search_album.php fdbc28de3ddfbdcbe973558d834d4526 *source/module/search/search_blog.php d1d027932f1ea96ff120548d71dcfa06 *source/module/search/search_collection.php -213a768c7e2ff9a528c4c4f635946544 *source/module/search/search_forum.php +f936bdbfbcd9f9e070d7469d652319cd *source/module/search/search_forum.php c4ad9c58ee1c98c90158a936139e70f3 *source/module/search/search_group.php fb7ea5226a204a93e5bcde2a892cac85 *source/module/search/search_portal.php 29aa3a7fc9ffac315adf350e760f1880 *source/module/search/search_user.php bc3876c0904d9f3f51136effb2fb4c3d *static/avatar/arrow_down_big.gif a221a06ac491aa71c92e759e6ac4963f *static/avatar/avatar.css -83c574a70ef3851e19e370d75658dd1f *static/avatar/avatar.js +faa16f5d2c0723f0bd073580f0f3c350 *static/avatar/avatar.js cd79a9260b562084bef086f68a202585 *static/avatar/avatar_back.gif 24e97b340ec9e9d72535db8e1f8087c5 *static/avatar/avatar_blank.gif ba59ae3abc3a75b97fb6186cfe9115ea *static/avatar/avatar_finishback.png @@ -1888,6 +1913,7 @@ ba59ae3abc3a75b97fb6186cfe9115ea *static/avatar/avatar_finishback.png 38c8a1e48fa4003201af428a3515866b *static/avatar/avatar_lattice.png a5e287491d3a1724b04d33b01dbbf70b *static/avatar/avatar_save.gif 42656cdf1b30696f3e6dd544a01ba0a3 *static/avatar/avatar_upload.gif +d41d8cd98f00b204e9800998ecf8427e *static/avatar/index.htm d935d506ae9c8dd9e0f96706fbb91f65 *static/avatar/jquery-ui.min.js 18e2222cdf584db09ad3d83a1c9cb686 *static/avatar/ui-bg_flat_0_aaaaaa_40x100.png 3c739f0850728b9d2b21fabce555c8bf *static/avatar/ui-bg_flat_75_ffffff_40x100.png @@ -1903,7 +1929,7 @@ e167cf8dd7c618441075253753d00fbd *static/avatar/ui-icons_454545_256x240.png 96cc018bb337ee2a8844b7b5f5fd02e7 *static/avatar/ui-icons_888888_256x240.png 59626b9493951a7c9e431e8ec5e4478f *static/avatar/ui-icons_cd0a0a_256x240.png b8d8387d7ae0bdd5569fef86c9c51ad1 *static/image/admincp/add.gif -babefef577a1bacafb60a7af314c9ea3 *static/image/admincp/admincp.css +7a17558f50fc57f2276022cd5d8b44a1 *static/image/admincp/admincp.css aadf13a830af9d293e350b6c5297fdce *static/image/admincp/ajax_loader.gif 91e1d435d5fe73636f0f5b5d1b4b37b2 *static/image/admincp/article.gif 1d01edbb7949c4ad7aa7793a4cd99e7f *static/image/admincp/articlelist.gif @@ -1927,8 +1953,8 @@ dfceed64760a1f13574ad0aae8716d7a *static/image/admincp/bg_repx_hd.gif 334a1bab50841c3cc63584f6af1b1c6e *static/image/admincp/btn_add2menu.gif 7a39882e8098d4104df384e575f8b397 *static/image/admincp/btn_big.png 2f2bec402935789ad70ac36db0275187 *static/image/admincp/btn_block.gif -bee9aa5bb999851cefca4f6f03ccb566 *static/image/admincp/btn_block_2.gif -5d50815bc8bc0b9271062054ec8e92c5 *static/image/admincp/btn_block_3.gif +011272221f07d67aa0ecd10c95810662 *static/image/admincp/btn_block_2.gif +007f7394322d67d48bc255903dc7fc6a *static/image/admincp/btn_block_3.gif 78bb09718a0bd8f14b2ad8ccdefab44e *static/image/admincp/btn_map.gif 7d30494900738f77cd8b96c98c000c57 *static/image/admincp/close.gif e98f502b701a48757eed60ad821b665d *static/image/admincp/cloud/btn.png @@ -2415,7 +2441,6 @@ a241d287a226e7e313b7fccf3d1144d5 *static/image/common/starlevel.gif 82a5f212caa58cee3dafae65d5f270ec *static/image/common/star_level1.gif c2b41b369342326bbf016c9a97515ecc *static/image/common/star_level2.gif a2075b49baacb4adffa6cebe931359ea *static/image/common/star_level3.gif -91164eb86a0eabd27a0f2cf0c67b2229 *static/image/common/stat.swf 9280b7fd7229bbe046ec4517aab365c4 *static/image/common/status_setting.xml 3d91814f0de228913f525e034453d778 *static/image/common/swfupload.swf 78cd307357ae22a376ccda899d2fd57c *static/image/common/switch_style.png @@ -2814,6 +2839,7 @@ fe041c8fde52f7429839c24f022609f7 *static/image/mobile/images/icon_load.gif ae49a05c0d765d7c212f7a37d9b9898a *static/image/mobile/images/icon_top.png 23266a21d274cabd223e592dbe2cecf7 *static/image/mobile/images/icon_tu.png aadf13a830af9d293e350b6c5297fdce *static/image/mobile/images/img_loader.gif +d41d8cd98f00b204e9800998ecf8427e *static/image/mobile/images/index.htm fddbe361c66d61ee2bc0b1f5a1728dc3 *static/image/mobile/images/login.png 7eb25924aee0213f70da9dbca87a9e51 *static/image/mobile/images/login_on.png 3a7d3aa44b14c2cc6862e94e52209f29 *static/image/mobile/images/logo.png @@ -3174,11 +3200,13 @@ b7d9174d54261a48fb7854d55fcb7852 *static/js/admincp.js 554019a035311ef2e0f2ea18d748c375 *static/js/ajax.js 9f6b49a6a36f26428f94687ccaaa4bd6 *static/js/at.js 822fde5d8f71ba4b92f154ff9629a9d4 *static/js/autoloadpage.js -1b9876416208d0b8ba403b4f9083f702 *static/js/bbcode.js -d5c044c25f81732cdaad64e217c25494 *static/js/calendar.js +d05396e14dc4f6262eb380da96ebf677 *static/js/bbcode.js +49aa22967f908e4aec72e87dbb661f48 *static/js/calendar.js af471c41ec36258c83faff696cb2bbf4 *static/js/common.js 200f809c73d9aedd1bb917a13e4d1ab4 *static/js/common_diy.js 524808861a77530e5c19756e86b7dafd *static/js/common_extra.js +08c70f0d2dd5500a6d6b4d073a213181 *static/js/echarts/echarts.common.min.js +d41d8cd98f00b204e9800998ecf8427e *static/js/echarts/index.htm 07db90c563300d70092466ad525cd5c0 *static/js/editor.js acb49f3a33a469c6b8bfaf3760d6c71b *static/js/fileprogress.js 8f607216c967ce46ab3f80951c6afb25 *static/js/forum.js @@ -3202,7 +3230,8 @@ d41d8cd98f00b204e9800998ecf8427e *static/js/index.htm ef058f07a773acf03f6d2f7f6ecb68fd *static/js/md5.js ed88708e2be8db3e81cedd63851109c1 *static/js/mobile/ajaxfileupload.js ff352f0645ea7e926caaa3ef2c48da02 *static/js/mobile/buildfileupload.js -71d2a6935c3bd5f3708e9ee2c9c43f27 *static/js/mobile/common.js +86894b6601102d2d2237e8bfb983a9b6 *static/js/mobile/common.js +d41d8cd98f00b204e9800998ecf8427e *static/js/mobile/index.htm e1288116312e4728f98923c79b034b67 *static/js/mobile/jquery.min.js c7a06100ded36c16acd06454e6932de0 *static/js/player/aplayer.min.css 45e6c849cb21cc7c5271e0e794bae1ca *static/js/player/aplayer.min.css.map @@ -3214,22 +3243,25 @@ e11f7de2d961c9966b6b6b010a1ac79b *static/js/player/dplayer.min.css 48c9558e19771531b7b375459818e0e4 *static/js/player/dplayer.min.js.map e7fbfbc5e77678a9b6196e101af0e631 *static/js/player/flv.min.js c13b478729fb303e032eb569fd09c550 *static/js/player/flv.min.js.map +d41d8cd98f00b204e9800998ecf8427e *static/js/player/index.htm 0a0674374ec370c74a3517e9d1417aca *static/js/portal.js b39f66a96b624ea5e6a80499f0118bcb *static/js/portal_diy.js c0bd9e7908e90daafab46fca8216f4d3 *static/js/portal_diy_data.js a199c05d7af8f06ed95151b9131edde2 *static/js/portal_upload.js -5c026660558d11bb0bf6079c90e1ec85 *static/js/qshare.js +85d2e0d31f59bb19009b50b1b9f6a4d7 *static/js/qshare.js 5c6d69df3fa5d32a42ad8a1f3433c190 *static/js/redef.js 1aa6346ec2c19dec83253a5c25b6ce25 *static/js/register.js c2816a3c0136b30f2672183ad6344287 *static/js/seditor.js 11a6b9be27da3f9a88286496982e146c *static/js/smilies.js -7cb03567f9b9eee10c7e11d59c07fcae *static/js/space_diy.js +c40d88f6b05b2bd229a85eadedc17e97 *static/js/space_diy.js +2b9a6a9fbc631092a45f496ecb28fcbc *static/js/stat.js 218d23eb1d5b41d04e654e912c846c03 *static/js/swfupload.js c6f707b6fa8f4a71e8c9ba65a33375e8 *static/js/swfupload.queue.js ab762cadf0e93c5432970c544b4431bf *static/js/threadsort.js 9ef45d85a06cde29e0a264893afd2337 *static/js/tree.js 0d24c0e248f66f83571dbb2531a50ece *static/js/upload.js 2a540d00a7be9c4f0072cdb560ccb739 *static/js/userapp_swfobject.js +d41d8cd98f00b204e9800998ecf8427e *static/js/webuploader/index.htm 10d57044c2894969e68235057ff812eb *static/js/webuploader/Uploader.swf 14d6f3cb791b4e67484f4bd0df109b95 *static/js/webuploader/webuploader.css d11856811f60dfbd01566a4e67d864b6 *static/js/webuploader/webuploader.min.js @@ -3368,7 +3400,7 @@ afdf7f2782616e4dc83ccbe3f5dedf7a *static/topic/t2/images/title.png d41d8cd98f00b204e9800998ecf8427e *static/topic/t2/index.htm a1b5c4f072b16161a9248da49618e1b7 *static/topic/t2/preview.jpg 98090794ee0f4a7f409dd3c629ccb5d4 *static/topic/t2/style.css -c77cf816dd3ac6684c4dc63395a4703b *uc_client/client.php +3521128d60bfc3374f0c531817e3eedc *uc_client/client.php 7215ee9c7d9dc229d2921a40e899ec5f *uc_client/index.htm d41d8cd98f00b204e9800998ecf8427e *uc_client/data/cache/index.htm d41d8cd98f00b204e9800998ecf8427e *uc_client/data/index.htm @@ -3389,13 +3421,13 @@ f75f60d1250abd0aec04d0e5f8bfed26 *uc_client/model/cache.php 87d25e6d940ccc1358c63e83e21474a3 *uc_client/model/friend.php 7215ee9c7d9dc229d2921a40e899ec5f *uc_client/model/index.htm d6436d71a2819b37a7260fa97b6f17c1 *uc_client/model/mail.php -fa62998c3aa569ca2682dc3ff1a7a64d *uc_client/model/misc.php +c37637833e663c2ff798258fc435935a *uc_client/model/misc.php a49b59974c5b9465a21c4f33ee1eca28 *uc_client/model/note.php 93c9a588d2e6e7c710bc67b8e8404459 *uc_client/model/pm.php d7b379d38fbc0e8a120454a334a54499 *uc_client/model/tag.php 29e549bcef6fdd6eaeb679c7a758ae51 *uc_client/model/user.php b4f18891acfa08c72be093196198adce *uc_client/lib/db.class.php -303c4c9243b313c4b2af0bf5fdc6aa02 *uc_client/lib/dbi.class.php +7efb90e1f9cff5722970f9bcf28ed6d8 *uc_client/lib/dbi.class.php 7215ee9c7d9dc229d2921a40e899ec5f *uc_client/lib/index.htm d4fbe5acd2ebfd7d4fd42ecaaccdcdf0 *uc_client/lib/sendmail.inc.php c0bca546a408c7db1fadd9abce4d8e9f *uc_client/lib/uccode.class.php @@ -3413,6 +3445,7 @@ d41d8cd98f00b204e9800998ecf8427e *uc_server/data/cache/index.htm d41d8cd98f00b204e9800998ecf8427e *uc_server/data/tmp/index.htm d41d8cd98f00b204e9800998ecf8427e *uc_server/data/view/index.htm 8ad350eb92f24263c20349a77d5c97e8 *uc_server/api/dbbak.php +d41d8cd98f00b204e9800998ecf8427e *uc_server/api/index.htm 90b101dd0e881816c7587f04df2c3db0 *uc_server/control/admin/admin.php 7aa86ce6075f58f5afdd5b119cd662c9 *uc_server/control/admin/app.php bb19aa03231cb8ffa29cbdb41449dfdf *uc_server/control/admin/badword.php @@ -3422,6 +3455,7 @@ c0c8cbc576cb72e129274c887a24676c *uc_server/control/admin/db.php f53e0119b7e5a24c2ac6dfa68913d631 *uc_server/control/admin/domain.php 9139008dd986bca1b8f9f203de4fde81 *uc_server/control/admin/feed.php f697e0fec08c84c27f84f22c019d2fae *uc_server/control/admin/frame.php +d41d8cd98f00b204e9800998ecf8427e *uc_server/control/admin/index.htm 6970e00023140a42a8101f88c9da08b3 *uc_server/control/admin/log.php 85b0228e317d1c458cace7a3478b6426 *uc_server/control/admin/mail.php 072767273359d2f7f2967be1a183b3b3 *uc_server/control/admin/note.php @@ -3454,8 +3488,8 @@ c0dec6b7bcbf660a3fe9d9de1d782629 *uc_server/model/feed.php 87d25e6d940ccc1358c63e83e21474a3 *uc_server/model/friend.php 7215ee9c7d9dc229d2921a40e899ec5f *uc_server/model/index.htm d6436d71a2819b37a7260fa97b6f17c1 *uc_server/model/mail.php -d0edc5e1d743700bd029632e2cf19913 *uc_server/model/misc.php -8a8f0a6badb63a5af7323af47218334a *uc_server/model/note.php +15e375f8fc7ee63086d412170c096276 *uc_server/model/misc.php +f03a2c4b668ed2f8d3576862c7595321 *uc_server/model/note.php bb9c95148eda27df11628934ac5e3963 *uc_server/model/plugin.php e07b645ad6318c754fe055d1abd38f66 *uc_server/model/pm.php ba787d675b6b8db7549ae1a1eb97dc20 *uc_server/model/setting.php @@ -3463,7 +3497,7 @@ d7b379d38fbc0e8a120454a334a54499 *uc_server/model/tag.php 62125eaa51a538a135a80ed7b954b020 *uc_server/model/user.php cdc453e23980b4f7f894a3b15042a76c *uc_server/model/version.php 5a6917878f5796f3b1aa2d187275ab01 *uc_server/lib/db.class.php -698bc9329b06c63e410fa25042d835e1 *uc_server/lib/dbi.class.php +3447cd9f54a06b5cbcd535e24667db3b *uc_server/lib/dbi.class.php 7215ee9c7d9dc229d2921a40e899ec5f *uc_server/lib/index.htm af8a06b22ccba3bf90c4cc3d68b08975 *uc_server/lib/seccode.class.php d4fbe5acd2ebfd7d4fd42ecaaccdcdf0 *uc_server/lib/sendmail.inc.php @@ -3471,9 +3505,13 @@ d4fbe5acd2ebfd7d4fd42ecaaccdcdf0 *uc_server/lib/sendmail.inc.php 76bf56969bc62728dfeb86295ac7dd0b *uc_server/lib/uccode.class.php 8da5f3c1c732b976acad7556f7e7e8c7 *uc_server/lib/upload.class.php dd8f21e6948c6c12ae073a59fcea5895 *uc_server/lib/xml.class.php +d41d8cd98f00b204e9800998ecf8427e *uc_server/plugin/filecheck/index.htm 72de92d385ed77b1f5574d593016af93 *uc_server/plugin/filecheck/plugin.php b8543be638099f125c7140179a6e4275 *uc_server/plugin/filecheck/plugin.xml 5d44be262da492a25c5e62f3387c8e6c *uc_server/plugin/filecheck/plugin_filecheck.htm +d41d8cd98f00b204e9800998ecf8427e *uc_server/plugin/index.htm +d41d8cd98f00b204e9800998ecf8427e *uc_server/upgrade/index.htm +fc55340a4e4c274a07710ce66670f616 *uc_server/upgrade/upgrade2.php 33b23d0c676f17d2b76a35ce0f0a2391 *uc_server/images/admincp.css d3af6beed6f4c5941d8474d8c30de6ab *uc_server/images/bg_login.gif 4fbf05bd615747043ff441b3be626935 *uc_server/images/bg_repno.gif @@ -3508,6 +3546,7 @@ b9aa4c8e088d9a3a5084aae5658800e3 *uc_server/images/default/selectpm.gif 4551e5ff11bce45780c17666d58d54bc *uc_server/images/fonts/en/FetteSteinschrift.ttf 7215ee9c7d9dc229d2921a40e899ec5f *uc_server/images/fonts/en/index.htm 7215ee9c7d9dc229d2921a40e899ec5f *uc_server/images/fonts/index.htm +d41d8cd98f00b204e9800998ecf8427e *uc_server/images/gif/index.htm 7f2c427e419dab7d1a393344d6f07e4e *uc_server/images/gif/OCR_A_Extended/2.gif 6abadede0f4e967b038ac69a16525ddc *uc_server/images/gif/OCR_A_Extended/3.gif 48cdd429871dc3d148b486ec52567338 *uc_server/images/gif/OCR_A_Extended/4.gif @@ -3568,6 +3607,14 @@ c8323955b8b6a4393372de9e122853a3 *uc_server/js/calendar.js 0e8249b8c83ab93350d6864e106da182 *uc_server/js/common.js 7215ee9c7d9dc229d2921a40e899ec5f *uc_server/js/index.htm 904fbd9ee2c415bbee0fa4f9ccce4f83 *uc_server/js/pm_editor.js +d41d8cd98f00b204e9800998ecf8427e *uc_server/release/20080429/control/index.htm +558a63b8f3215be4dd5f922d69c4e7b2 *uc_server/release/20080429/control/pm.php +d41d8cd98f00b204e9800998ecf8427e *uc_server/release/20080429/index.htm +d41d8cd98f00b204e9800998ecf8427e *uc_server/release/20080429/lib/index.htm +da658b223bf8d5f0d09129a29727671d *uc_server/release/20080429/lib/xml.class.php +d41d8cd98f00b204e9800998ecf8427e *uc_server/release/20080429/model/index.htm +8c0cc77da2f07314561f8270599d59b5 *uc_server/release/20080429/model/pm.php +d41d8cd98f00b204e9800998ecf8427e *uc_server/release/index.htm 0ab45bb9ded2cfd294563e3724b8f0be *uc_server/release/release.php 45ceb71c18375a9b987e05a02feae578 *uc_server/view/default/admin.lang.php f878f37931d5d3035d19a3b594cafac8 *uc_server/view/default/admin_admin.htm @@ -3581,9 +3628,9 @@ e7c9d9336c808d322ddd304d583d8523 *uc_server/view/default/admin_cache.htm 30dae5e21c3ac339675069db37efefc0 *uc_server/view/default/admin_frame_header.htm 56a95674b623b16fc5428927a1f866fe *uc_server/view/default/admin_frame_index.htm f0e91d97b3c12347a7679d7a997c7ce3 *uc_server/view/default/admin_frame_main.htm -fe7d8978015bc8f17725fb1d70637896 *uc_server/view/default/admin_frame_menu.htm +8711e2b66f38ed493deb340758589f59 *uc_server/view/default/admin_frame_menu.htm 9b748ad443e19d99e6f64de338e7abae *uc_server/view/default/admin_log.htm -ac3280cc97c26ea8bf69754edffec023 *uc_server/view/default/admin_login.htm +678bdc0185dfe47d414dc54190e2d2e4 *uc_server/view/default/admin_login.htm d85f6017aa35b5ef3d91cc28362dee17 *uc_server/view/default/admin_mail.htm f58c17f54b74ad9685edc0a672694c69 *uc_server/view/default/admin_note.htm d0f78db9349b7baef5483c12357896e1 *uc_server/view/default/admin_pm_clear.htm diff --git a/upload/source/admincp/moderate/moderate_member.php b/upload/source/admincp/moderate/moderate_member.php index d8148064..3dd2c62b 100644 --- a/upload/source/admincp/moderate/moderate_member.php +++ b/upload/source/admincp/moderate/moderate_member.php @@ -245,7 +245,7 @@ function cancelallcheck() { if(isset($members[$uid])) { $member = $members[$uid]; $member['regdate'] = dgmdate($member['regdate']); - $member['submitdate'] = dgmdate($member['submitdate']); + $member['submitdate'] = dgmdate($allmembervalidate[$uid]['submitdate']); $member['moddate'] = dgmdate(TIMESTAMP); $member['operation'] = $o; $member['remark'] = $_GET['remark'][$uid] ? dhtmlspecialchars($_GET['remark'][$uid]) : $lang['none']; @@ -254,8 +254,8 @@ function cancelallcheck() { 'bbname' => $_G['setting']['bbname'], 'regdate' => $member['regdate'], 'submitdate' => $member['submitdate'], - 'submittimes' => $member['submittimes'], - 'message' => $member['message'], + 'submittimes' => $allmembervalidate[$uid]['submittimes'], + 'message' => $allmembervalidate[$uid]['message'], 'modresult' => lang('email', 'moderate_member_'.$member['operation']), 'moddate' => $member['moddate'], 'adminusername' => $_G['member']['username'], diff --git a/upload/source/archiver/common/footer.php b/upload/source/archiver/common/footer.php index 226d8768..965f00f3 100644 --- a/upload/source/archiver/common/footer.php +++ b/upload/source/archiver/common/footer.php @@ -7,7 +7,7 @@
diff --git a/upload/source/archiver/common/header.php b/upload/source/archiver/common/header.php index 530b49fa..7688e73b 100644 --- a/upload/source/archiver/common/header.php +++ b/upload/source/archiver/common/header.php @@ -17,7 +17,7 @@ - + -
-
- $_G[setting][bbname]»{lang guide}$navigation -
-
-
-
-
-
-
- - - {lang rss_subscribe_this} - - -

- $lang['guide_'.$view] -

-
- -
-
-
$lang['guide_'.$view.'_description']
-
-
- -
- -
- $multipage - {lang send_posts} -
- - - - - -
-
- {lang more} » -

- {lang guide_hot}{lang guide_digest}{lang guide_newthread}{lang guide_new}{lang guide_my} -

-
-
-
- - - - - - - $thread['heats']{lang guide_attend} - $thread['lastpost'] - - - · $thread[subject] $list['forumnames'][$thread[fid]]['name'] - - - -

{lang guide_nothreads}

- -
-
-
- - - -
-
- - - - - - - - - - - - - - - -
- {lang title} - -     - {lang forum_threads}| - {lang reply}| - {lang comments}| - - {lang screening} - - - {lang forum_group}{lang author}{lang replies}{lang lastpost}
-
-
- - - -
-
-
- -
- $multipage - {lang guide_index} -
- - -
-
-
- - - + + +
+
+ $_G[setting][bbname]»{lang guide}$navigation +
+
+
+
+
+
+
+ + + {lang rss_subscribe_this} + + +

+ $lang['guide_'.$view] +

+
+ +
+
+
$lang['guide_'.$view.'_description']
+
+
+ +
+ +
+ $multipage + {lang send_posts} +
+ + + + + +
+
+ {lang more} » +

+ {lang guide_hot}{lang guide_digest}{lang guide_newthread}{lang guide_new}{lang guide_my} +

+
+
+
+ + + + + + + $thread['heats']{lang guide_attend} + $thread['lastpost'] + + + · $thread[subject] $list['forumnames'][$thread[fid]]['name'] + + + +

{lang guide_nothreads}

+ +
+
+
+ + + +
+
+ + + + + + + + + + + + + + + +
+ {lang title} + +     + {lang forum_threads}| + {lang reply}| + {lang comments}| + + {lang screening} + + + {lang forum_group}{lang author}{lang replies}{lang lastpost}
+
+
+ + + +
+
+
+ +
+ $multipage + {lang guide_index} +
+ + +
+
+
+ + + \ No newline at end of file diff --git a/upload/template/default/forum/post_editor_attribute.htm b/upload/template/default/forum/post_editor_attribute.htm index 4a5d3c74..9c6c3841 100644 --- a/upload/template/default/forum/post_editor_attribute.htm +++ b/upload/template/default/forum/post_editor_attribute.htm @@ -134,7 +134,7 @@
 
 
-
+
{lang replylimit}
diff --git a/upload/template/default/forum/stat_misc.htm b/upload/template/default/forum/stat_misc.htm index cdef5017..d107b40f 100644 --- a/upload/template/default/forum/stat_misc.htm +++ b/upload/template/default/forum/stat_misc.htm @@ -76,13 +76,10 @@

{lang stats_forums_stat}

{lang stats_forum_stat_log} - $foruminfo[name] - $month

- + + +
+ diff --git a/upload/template/default/forum/viewthread_mod.htm b/upload/template/default/forum/viewthread_mod.htm index 934289f2..2d452634 100644 --- a/upload/template/default/forum/viewthread_mod.htm +++ b/upload/template/default/forum/viewthread_mod.htm @@ -18,21 +18,36 @@

- + + + + + + + - + + - + + + + + + + - + +
{lang thread_moderations_username}{lang time} / {lang expire}{lang thread_moderations_action}{lang reason} {lang thread_moderations_username} {lang time} {lang thread_moderations_action}{lang expire}{lang expire}
$log[username]{lang thread_moderations_cron}$log[dateline]
$log[expiration]{lang expiration_unlimit}		{$modactioncode[$log['action']]}($log[magicname]) + {lang to} $log['reason'] $log[username]{lang thread_moderations_cron} $log[dateline] {$modactioncode[$log['action']]}($log[magicname]) {lang to} $log['reason'] $log[expiration]{lang expiration_unlimit}$log[expiration]{lang expiration_unlimit}
diff --git a/upload/template/default/forum/viewthread_node_body.htm b/upload/template/default/forum/viewthread_node_body.htm index 990e7ab2..5b031cdf 100644 --- a/upload/template/default/forum/viewthread_node_body.htm +++ b/upload/template/default/forum/viewthread_node_body.htm @@ -119,7 +119,7 @@

- +
{lang thread_mod_recommend_by}{lang thread_mod_by}
diff --git a/upload/template/default/home/index.htm b/upload/template/default/home/index.htm new file mode 100644 index 00000000..e69de29b diff --git a/upload/template/default/home/misc_stat.htm b/upload/template/default/home/misc_stat.htm index 33d7cc02..8129bddb 100644 --- a/upload/template/default/home/misc_stat.htm +++ b/upload/template/default/home/misc_stat.htm @@ -108,13 +108,10 @@

- + + +
+ diff --git a/upload/template/default/home/space_card.htm b/upload/template/default/home/space_card.htm index e375006a..ad267f16 100644 --- a/upload/template/default/home/space_card.htm +++ b/upload/template/default/home/space_card.htm @@ -71,7 +71,6 @@ {lang follow_del}{lang follow_add}TA - {lang add_friend} diff --git a/upload/template/default/home/space_header.htm b/upload/template/default/home/space_header.htm index 1ce1cc06..7b9e80c8 100644 --- a/upload/template/default/home/space_header.htm +++ b/upload/template/default/home/space_header.htm @@ -82,7 +82,7 @@