From 242fc1a4cb3d6076505f851fdcd9c1bbf3e431a5 Mon Sep 17 00:00:00 2001 From: joyqi Date: Fri, 13 Oct 2017 11:03:38 +0800 Subject: [PATCH 1/6] fix some minor bugs --- admin/common.php | 2 +- admin/upgrade.php | 2 +- var/Typecho/Common.php | 2 +- var/Widget/Backup.php | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/admin/common.php b/admin/common.php index e3a67023..371ac64f 100644 --- a/admin/common.php +++ b/admin/common.php @@ -47,7 +47,7 @@ if (!$user->logged && !Typecho_Cookie::get('__typecho_first_run') && !empty($cur $mustUpgrade = (!defined('Typecho_Common::VERSION') || version_compare(str_replace('/', '.', Typecho_Common::VERSION), str_replace('/', '.', $options->version), '>')); - if ($mustUpgrade && 'upgrade.php' != $adminFile) { + if ($mustUpgrade && 'upgrade.php' != $adminFile && 'backup.php' != $adminFile) { $response->redirect(Typecho_Common::url('upgrade.php', $options->adminUrl)); } else if (!$mustUpgrade && 'upgrade.php' == $adminFile) { $response->redirect($options->adminUrl); diff --git a/admin/upgrade.php b/admin/upgrade.php index 718d47a0..a4565566 100644 --- a/admin/upgrade.php +++ b/admin/upgrade.php @@ -17,7 +17,7 @@ include 'menu.php';

diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php index 83d10c66..b1132619 100644 --- a/var/Typecho/Common.php +++ b/var/Typecho/Common.php @@ -1120,7 +1120,7 @@ EOF; $address = gethostbyname($host); $inet = inet_pton($address); - if ($inet === false) { + if (false === $inet) { // 有可能是ipv6的地址 $records = dns_get_record($host, DNS_AAAA); diff --git a/var/Widget/Backup.php b/var/Widget/Backup.php index 6eed4988..ece7be34 100644 --- a/var/Widget/Backup.php +++ b/var/Widget/Backup.php @@ -65,7 +65,6 @@ class Widget_Backup extends Widget_Abstract_Options implements Widget_Interface_ private function extractData($file) { $fp = @fopen($file, 'rb'); - $end = false; if (!$fp) { $this->widget('Widget_Notice')->set(_t('无法读取备份文件'), 'error'); From e277141c974cd740702c5ce73f7e9f382c18d84e Mon Sep 17 00:00:00 2001 From: joyqi Date: Tue, 24 Oct 2017 16:59:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=20#619=20=E4=BD=BF=E7=94=A8=E6=9B=B4?= =?UTF-8?q?=E5=A5=BD=E7=9A=84=E6=96=B9=E5=BC=8F=E4=BF=9D=E6=8A=A4=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E6=96=87=E4=BB=B6=EF=BC=8C=E4=B8=8D=E5=86=8D=E4=BE=9D?= =?UTF-8?q?=E8=B5=96session?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.php | 58 ++++++++++++++++++++++-------------------- var/Typecho/Common.php | 2 +- var/Typecho/I18n.php | 4 +-- var/Upgrade.php | 16 ++++++++++++ 4 files changed, 49 insertions(+), 31 deletions(-) diff --git a/install.php b/install.php index 8c414458..8260808e 100644 --- a/install.php +++ b/install.php @@ -1,3 +1,4 @@ + fetchRow($db->select()->from('table.options')->where('name = ?', 'installed')); + if (empty($installed) || $installed['value'] == 1) { + exit; + } + } catch (Exception $e) { + // do nothing + } + +endif; // 挡掉可能的跨站请求 if (!empty($_GET) || !empty($_POST)) { @@ -213,7 +222,7 @@ Typecho_Cookie::set('__typecho_lang', $lang);
- +

@@ -221,19 +230,15 @@ Typecho_Cookie::set('__typecho_lang', $lang);
-

-
-
-

-
-
+

+
+
+

+
+
addServer($config, Typecho_Db::READ | Typecho_Db::WRITE); - Typecho_Db::set($db); + $db->query($db->update('table.options')->rows(['value' => 1])->where('name = ?', 'installed')); ?>

@@ -273,7 +278,7 @@ Typecho_Cookie::set('__typecho_lang', $lang);
- +

@@ -285,11 +290,10 @@ Typecho_Cookie::set('__typecho_lang', $lang); $config = unserialize(base64_decode(Typecho_Cookie::get('__typecho_config'))); $type = explode('_', $config['adapter']); $type = array_pop($type); + $type = $type == 'Mysqli' ? 'Mysql' : $type; + $installDb = $db; try { - $installDb = new Typecho_Db($config['adapter'], $config['prefix']); - $installDb->addServer($config, Typecho_Db::READ | Typecho_Db::WRITE); - /** 初始化数据库结构 */ $scripts = file_get_contents ('./install/' . $type . '.sql'); $scripts = str_replace('typecho_', $config['prefix'], $scripts); @@ -366,6 +370,7 @@ Typecho_Cookie::set('__typecho_lang', $lang); $installDb->query($installDb->insert('table.options')->rows(array('name' => 'panelTable', 'user' => 0, 'value' => 'a:0:{}'))); $installDb->query($installDb->insert('table.options')->rows(array('name' => 'attachmentTypes', 'user' => 0, 'value' => '@image@'))); $installDb->query($installDb->insert('table.options')->rows(array('name' => 'secret', 'user' => 0, 'value' => Typecho_Common::randString(32, true)))); + $installDb->query($installDb->insert('table.options')->rows(array('name' => 'installed', 'user' => 0, 'value' => 0))); /** 初始分类 */ $installDb->query($installDb->insert('table.metas')->rows(array('name' => _t('默认分类'), 'slug' => 'default', 'type' => 'category', 'description' => _t('只是一个默认分类'), @@ -544,7 +549,7 @@ Typecho_Cookie::set('__typecho_lang', $lang); } /** 初始化配置文件 */ - $lines = array_slice(file(__FILE__), 0, 52); + $lines = array_slice(file(__FILE__), 1, 52); $lines[] = " /** 定义数据库参数 */ \$db = new Typecho_Db('{$adapter}', '" . _r('dbPrefix') . "'); @@ -556,9 +561,6 @@ Typecho_Db::set(\$db); @file_put_contents('./config.inc.php', $contents); } - // 创建一个用于标识的临时文件 - $_SESSION['typecho'] = 1; - if (!file_exists('./config.inc.php')) { ?>

config.inc.php 文件'); ?>
@@ -574,7 +576,7 @@ Typecho_Db::set(\$db); // 安装不成功删除配置文件 if($success != true && file_exists(__TYPECHO_ROOT_DIR__ . '/config.inc.php')) { - unlink(__TYPECHO_ROOT_DIR__ . '/config.inc.php'); + @unlink(__TYPECHO_ROOT_DIR__ . '/config.inc.php'); } } ?> @@ -652,7 +654,7 @@ Typecho_Db::set(\$db); 1): ?> diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php index b1132619..00925aaf 100644 --- a/var/Typecho/Common.php +++ b/var/Typecho/Common.php @@ -22,7 +22,7 @@ define('__TYPECHO_MB_SUPPORTED__', function_exists('mb_get_info') && function_ex class Typecho_Common { /** 程序版本 */ - const VERSION = '1.1/17.10.13'; + const VERSION = '1.1/17.10.24'; /** * 允许的属性 diff --git a/var/Typecho/I18n.php b/var/Typecho/I18n.php index 8be86323..d5b88a29 100644 --- a/var/Typecho/I18n.php +++ b/var/Typecho/I18n.php @@ -92,7 +92,7 @@ class Typecho_I18n public static function translate($string) { self::init(); - return self::$_lang ? self::$_loaded->translate($string) : $string; + return self::$_loaded ? self::$_loaded->translate($string) : $string; } /** @@ -106,7 +106,7 @@ class Typecho_I18n public static function ngettext($single, $plural, $number) { self::init(); - return self::$_lang ? self::$_loaded->ngettext($single, $plural, $number) : ($number > 1 ? $plural : $single); + return self::$_loaded ? self::$_loaded->ngettext($single, $plural, $number) : ($number > 1 ? $plural : $single); } /** diff --git a/var/Upgrade.php b/var/Upgrade.php index 2c7ce31c..9e78ac5d 100644 --- a/var/Upgrade.php +++ b/var/Upgrade.php @@ -1222,5 +1222,21 @@ Typecho_Date::setTimezoneOffset($options->timezone); $db->query($db->insert('table.options') ->rows(array('name' => 'xmlrpcMarkdown', 'user' => 0, 'value' => 0))); } + + /** + * 升级至17.10.24 + * + * @param mixed $db + * @param mixed $options + * @static + * @access public + * @return void + */ + public static function v1_1r17_10_24($db, $options) + { + // 增加installed + $db->query($db->insert('table.options') + ->rows(array('name' => 'installed', 'user' => 0, 'value' => 1))); + } } From 7d229b55eeb754b3f42408361ee1d10de188c012 Mon Sep 17 00:00:00 2001 From: joyqi Date: Tue, 24 Oct 2017 17:03:07 +0800 Subject: [PATCH 3/6] fix #616 --- var/Widget/Themes/List.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/var/Widget/Themes/List.php b/var/Widget/Themes/List.php index 2833b6bf..9cac7791 100644 --- a/var/Widget/Themes/List.php +++ b/var/Widget/Themes/List.php @@ -26,7 +26,7 @@ class Widget_Themes_List extends Typecho_Widget */ protected function getThemes() { - return glob(__TYPECHO_ROOT_DIR__ . __TYPECHO_THEME_DIR__ . '/*'); + return glob(__TYPECHO_ROOT_DIR__ . __TYPECHO_THEME_DIR__ . '/*', GLOB_ONLYDIR); } /** @@ -53,8 +53,6 @@ class Widget_Themes_List extends Typecho_Widget if ($themes) { $options = $this->widget('Widget_Options'); - $siteUrl = $options->siteUrl; - $adminUrl = $options->adminUrl; $activated = 0; $result = array(); From fefedb38667906fd433efc2fd69c2dd4d68336e1 Mon Sep 17 00:00:00 2001 From: joyqi Date: Thu, 26 Oct 2017 10:44:27 +0800 Subject: [PATCH 4/6] fix make tools --- tools/Makefile | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 4c07daaf..071d4f47 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -7,7 +7,7 @@ DIR=../ update: @echo 'git update' rm -Rf build/ - git clone https://github.com/typecho/typecho.git build + git clone --depth=1 https://github.com/typecho/typecho.git build rm -Rf build/.git rm -Rf build/.github rm -f build/.gitignore @@ -17,18 +17,23 @@ update: for i in `find build/ -name '*.php'`; do php -l $$i; done; -package: - @echo 'package' +rm: rm -Rf build/tools/ - rm -f build/todo.txt + rm -Rf build/.git* rm -f build/changelog.txt + rm -f build/.editorconfig rm -f build/.travis.yml rm -f build/README.md rm -Rf build/admin/scss rm -Rf build/admin/img/editor rm -Rf build/admin/img/icons rm -Rf build/admin/img/icons-2x - rm -Rf build/usr/langs/* + + + +package: + @echo 'package' + make rm mkdir build/usr/uploads/ chmod 777 build/usr/uploads/ tar -cvvzf build.tar.gz build/ @@ -68,15 +73,7 @@ theme: install: make update - rm -Rf build/tools/ - rm -f build/todo.txt - rm -f build/changelog.txt - rm -f build/.travis.yml - rm -f build/README.md - rm -Rf build/admin/scss - rm -Rf build/admin/img/editor - rm -Rf build/admin/img/icons - rm -Rf build/admin/img/icons-2x + make rm mkdir build/usr/uploads/ chmod 777 build/usr/uploads/ cp -Rf build/* ${DIR} From f955076905326764f8562b3ee6b5ce55b5051f0c Mon Sep 17 00:00:00 2001 From: joyqi Date: Thu, 26 Oct 2017 11:12:26 +0800 Subject: [PATCH 5/6] fix upgrade --- tools/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/Makefile b/tools/Makefile index 071d4f47..a8ba0631 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -51,6 +51,7 @@ upgrade: cp -Rf build/var/ ${DIR} rm -Rf ${DIR}/index.php cp build/index.php ${DIR} + cp build/install.php ${DIR} make clear From ef4ee2f9b071dfe48368edc1197d4a36208fab56 Mon Sep 17 00:00:00 2001 From: joyqi Date: Thu, 26 Oct 2017 12:24:39 +0800 Subject: [PATCH 6/6] fix unicode for hyperdown --- admin/js/hyperdown.js | 8 ++++++-- var/HyperDown.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/admin/js/hyperdown.js b/admin/js/hyperdown.js index 0eb394e6..356e0f95 100644 --- a/admin/js/hyperdown.js +++ b/admin/js/hyperdown.js @@ -4,7 +4,7 @@ slice = [].slice; Parser = (function() { - var array_keys, array_values, htmlspecialchars, preg_quote, str_replace, trim, ucfirst; + var array_keys, array_values, htmlspecialchars, pL, preg_quote, str_replace, trim, ucfirst; ucfirst = function(str) { return (str.charAt(0)).toUpperCase() + str.substring(1); @@ -14,6 +14,8 @@ return str.replace(/[-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); }; + pL = 'A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC'; + str_replace = function(search, replace, str) { var i, j, l, len, len1, val; if (search instanceof Array) { @@ -213,6 +215,7 @@ }; Parser.prototype.parseInline = function(text, whiteList, clearHolders, enableAutoLink) { + var regex; if (whiteList == null) { whiteList = ''; } @@ -320,7 +323,8 @@ text = this.parseInlineCallback(text); text = text.replace(/<([_a-z0-9-\.\+]+@[^@]+\.[a-z]{2,})>/ig, '$1'); if (enableAutoLink) { - text = text.replace(/(^|[^"])((https?):[x80-xff_a-z0-9-\.\/%#!@\?\+=~\|\,&\(\)]+)($|[^"])/ig, (function(_this) { + regex = new RegExp("(^|[^\"])((https?):[" + pL + "_0-9-\\./%#!@\\?\\+=~\\|\\,&\\(\\)]+)($|[^\"])", 'ig'); + text = text.replace(regex, (function(_this) { return function() { var link, matches; matches = 1 <= arguments.length ? slice.call(arguments, 0) : []; diff --git a/var/HyperDown.php b/var/HyperDown.php index 85ea2529..1a784bcd 100644 --- a/var/HyperDown.php +++ b/var/HyperDown.php @@ -414,7 +414,7 @@ class HyperDown // autolink url if ($enableAutoLink) { $text = preg_replace_callback( - "/(^|[^\"])((https?):[x80-xff_a-z0-9-\.\/%#!@\?\+=~\|\,&\(\)]+)($|[^\"])/i", + "/(^|[^\"])((https?):[\p{L}_0-9-\.\/%#!@\?\+=~\|\,&\(\)]+)($|[^\"])/iu", function ($matches) use ($self) { $link = $self->call('parseLink', $matches[2]); return "{$matches[1]}{$link}{$matches[4]}";