diff --git a/admin/common.php b/admin/common.php
index 597209c4..b18173bb 100644
--- a/admin/common.php
+++ b/admin/common.php
@@ -34,7 +34,6 @@ if (!empty($currentMenu)) {
$adminFile = basename($params['path']);
if (!$user->logged && !\Typecho\Cookie::get('__typecho_first_run')) {
-
if ('welcome.php' != $adminFile) {
$response->redirect(\Typecho\Common::url('welcome.php', $options->adminUrl));
} else {
diff --git a/admin/manage-comments.php b/admin/manage-comments.php
index 65015084..a8c70250 100644
--- a/admin/manage-comments.php
+++ b/admin/manage-comments.php
@@ -112,7 +112,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == \Ty
'text' => $comments->text
);
- echo htmlspecialchars(Json::encode($comment));
+ echo htmlspecialchars(json_encode($comment));
?>">
diff --git a/admin/write-js.php b/admin/write-js.php
index adee5dc8..e072e3bb 100644
--- a/admin/write-js.php
+++ b/admin/write-js.php
@@ -67,7 +67,7 @@ $(document).ready(function() {
'tags' => $tags->name
);
}
- echo Json::encode($data);
+ echo json_encode($data);
?>, {
propertyToSearch: 'tags',
tokenValue : 'tags',
diff --git a/install.php b/install.php
index 6a50bfd4..c46bcd73 100644
--- a/install.php
+++ b/install.php
@@ -74,7 +74,7 @@ function install_get_site_url(): string
*/
function install_is_cli(): bool
{
- return php_sapi_name() == 'cli';
+ return \Typecho\Request::getInstance()->isCli();
}
/**
@@ -92,7 +92,7 @@ function install_get_default_options(): array
'theme:default' => 'a:2:{s:7:"logoUrl";N;s:12:"sidebarBlock";a:5:{i:0;s:15:"ShowRecentPosts";i:1;s:18:"ShowRecentComments";i:2;s:12:"ShowCategory";i:3;s:11:"ShowArchive";i:4;s:9:"ShowOther";}}',
'timezone' => '28800',
'lang' => install_get_lang(),
- 'charset' => _t('UTF-8'),
+ 'charset' => 'UTF-8',
'contentType' => 'text/html',
'gzip' => 0,
'generator' => 'Typecho ' . \Typecho\Common::VERSION,
@@ -341,7 +341,7 @@ function install_raise_error($error, $config = null)
exit(1);
} else {
- \Typecho\Response::getInstance()->throwJson([
+ install_throw_json([
'success' => 0,
'message' => is_string($error) ? nl2br($error) : $error,
'config' => $config
@@ -370,7 +370,7 @@ function install_success($step, ?array $config = null)
exit(0);
} else {
- \Typecho\Response::getInstance()->throwJson([
+ install_throw_json([
'success' => 1,
'message' => $step,
'config' => $config
@@ -378,6 +378,28 @@ function install_success($step, ?array $config = null)
}
}
+/**
+ * @param $data
+ */
+function install_throw_json($data)
+{
+ \Typecho\Response::getInstance()->setContentType('application/json')
+ ->addResponder(function () use ($data) {
+ echo json_encode($data);
+ })
+ ->respond();
+}
+
+/**
+ * @param string $url
+ */
+function install_redirect(string $url)
+{
+ \Typecho\Response::getInstance()->setStatus(302)
+ ->setHeader('Location', $url)
+ ->respond();
+}
+
/**
* add common js support
*
@@ -493,6 +515,22 @@ function install_js_support()
);
+ fillInput();
redirect($options->siteUrl);
+ install_redirect($options->siteUrl);
}
exit(1);
@@ -1146,7 +1232,6 @@ function install_dispatch()
install_step_2_perform();
} else {
$request = \Typecho\Request::getInstance();
- $response = \Typecho\Response::getInstance();
$step = $request->get('step');
$action = 1;
@@ -1156,14 +1241,14 @@ function install_dispatch()
if (!install_check('db_structure')) {
$action = 2;
} else {
- $response->redirect('install.php?step=3');
+ install_redirect('install.php?step=3');
}
break;
case $step == 3:
if (install_check('db_structure')) {
$action = 3;
} else {
- $response->redirect('install.php?step=2');
+ install_redirect('install.php?step=2');
}
break;
default:
@@ -1172,7 +1257,7 @@ function install_dispatch()
$method = 'install_step_' . $action;
- if ($request->isPost() && $action > 1) {
+ if ($request->isPost()) {
$method .= '_perform';
$method();
exit;
diff --git a/var/Json.php b/var/Json.php
deleted file mode 100644
index f9859fb2..00000000
--- a/var/Json.php
+++ /dev/null
@@ -1,576 +0,0 @@
-= 0x20) && ($ord_var_c <= 0x7F)):
- $ascii .= $var[$c];
- break;
-
- case (($ord_var_c & 0xE0) == 0xC0):
- $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
- $c += 1;
- $utf16 = self::utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xF0) == 0xE0):
- $char = pack(
- 'C*',
- $ord_var_c,
- ord($var[$c + 1]),
- ord($var[$c + 2])
- );
- $c += 2;
- $utf16 = self::utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xF8) == 0xF0):
- $char = pack(
- 'C*',
- $ord_var_c,
- ord($var[$c + 1]),
- ord($var[$c + 2]),
- ord($var[$c + 3])
- );
- $c += 3;
- $utf16 = self::utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xFC) == 0xF8):
- $char = pack(
- 'C*',
- $ord_var_c,
- ord($var[$c + 1]),
- ord($var[$c + 2]),
- ord($var[$c + 3]),
- ord($var[$c + 4])
- );
- $c += 4;
- $utf16 = self::utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xFE) == 0xFC):
- $char = pack(
- 'C*',
- $ord_var_c,
- ord($var[$c + 1]),
- ord($var[$c + 2]),
- ord($var[$c + 3]),
- ord($var[$c + 4]),
- ord($var[$c + 5])
- );
- $c += 5;
- $utf16 = self::utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
- }
- }
-
- return '"' . $ascii . '"';
-
- case 'array':
- if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
- $properties = array_map(
- [self::class, 'nameValue'],
- array_keys($var),
- array_values($var)
- );
-
- foreach ($properties as $property) {
- if (self::isError($property)) {
- return $property;
- }
- }
-
- return '{' . join(',', $properties) . '}';
- }
-
- // treat it like a regular array
- $elements = array_map([self::class, 'encodeStr'], $var);
-
- foreach ($elements as $element) {
- if (self::isError($element)) {
- return $element;
- }
- }
-
- return '[' . join(',', $elements) . ']';
-
- case 'object':
- $vars = get_object_vars($var);
-
- $properties = array_map(
- [self::class, 'nameValue'],
- array_keys($vars),
- array_values($vars)
- );
-
- foreach ($properties as $property) {
- if (self::isError($property)) {
- return $property;
- }
- }
-
- return '{' . join(',', $properties) . '}';
-
- default:
- return false;
- }
- }
-
- /**
- * 将utf8转换为utf16
- *
- * @access private
- * @param string|null $utf8 utf8字符串
- * @return string|null
- */
- private static function utf82utf16(?string $utf8): ?string
- {
- if (function_exists('mb_convert_encoding')) {
- return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
- }
-
- switch (strlen($utf8)) {
- case 1:
- return $utf8;
-
- case 2:
- return chr(0x07 & (ord($utf8[0]) >> 2))
- . chr((0xC0 & (ord($utf8[0]) << 6))
- | (0x3F & ord($utf8[1])));
- case 3:
- return chr((0xF0 & (ord($utf8[0]) << 4))
- | (0x0F & (ord($utf8[1]) >> 2)))
- . chr((0xC0 & (ord($utf8[1]) << 6))
- | (0x7F & ord($utf8[2])));
- }
- return '';
- }
-
- /**
- * 判断错误
- *
- * @access private
- * @param mixed $data 错误对象
- * @param string|null $code 错误代码
- * @return boolean
- */
- private static function isError($data, ?string $code = null): bool
- {
- if (
- is_object($data) && (get_class($data) == 'services_json_error' ||
- is_subclass_of($data, 'services_json_error'))
- ) {
- return true;
- }
-
- return false;
- }
-
- /**
- * 解码json字符串
- *
- * @param string|null $str 解码字符串
- * @return array|bool|float|int|stdClass|string|void|null
- */
- private static function decodeStr(?string $str)
- {
- $str = self::reduceString($str);
-
- switch (strtolower($str)) {
- case 'true':
- return true;
-
- case 'false':
- return false;
-
- case 'null':
- return null;
-
- default:
- $m = [];
-
- if (is_numeric($str)) {
- return ((float)$str == (int)$str)
- ? (int)$str
- : (float)$str;
- } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
- $delim = substr($str, 0, 1);
- $chrs = substr($str, 1, -1);
- $utf8 = '';
- $strlen_chrs = strlen($chrs);
-
- for ($c = 0; $c < $strlen_chrs; ++$c) {
- $substr_chrs_c_2 = substr($chrs, $c, 2);
- $ord_chrs_c = ord($chrs[$c]);
-
- switch (true) {
- case $substr_chrs_c_2 == '\b':
- $utf8 .= chr(0x08);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\t':
- $utf8 .= chr(0x09);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\n':
- $utf8 .= chr(0x0A);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\f':
- $utf8 .= chr(0x0C);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\r':
- $utf8 .= chr(0x0D);
- ++$c;
- break;
-
- case $substr_chrs_c_2 == '\\"':
- case $substr_chrs_c_2 == '\\\'':
- case $substr_chrs_c_2 == '\\\\':
- case $substr_chrs_c_2 == '\\/':
- if (
- ($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
- ($delim == "'" && $substr_chrs_c_2 != '\\"')
- ) {
- $utf8 .= $chrs[++$c];
- }
- break;
-
- case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
- $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
- . chr(hexdec(substr($chrs, ($c + 4), 2)));
- $utf8 .= self::utf162utf8($utf16);
- $c += 5;
- break;
-
- case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
- $utf8 .= $chrs[$c];
- break;
-
- case ($ord_chrs_c & 0xE0) == 0xC0:
- $utf8 .= substr($chrs, $c, 2);
- ++$c;
- break;
-
- case ($ord_chrs_c & 0xF0) == 0xE0:
- $utf8 .= substr($chrs, $c, 3);
- $c += 2;
- break;
-
- case ($ord_chrs_c & 0xF8) == 0xF0:
- $utf8 .= substr($chrs, $c, 4);
- $c += 3;
- break;
-
- case ($ord_chrs_c & 0xFC) == 0xF8:
- $utf8 .= substr($chrs, $c, 5);
- $c += 4;
- break;
-
- case ($ord_chrs_c & 0xFE) == 0xFC:
- $utf8 .= substr($chrs, $c, 6);
- $c += 5;
- break;
- }
- }
-
- return $utf8;
- } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
- if ($str [0] == '[') {
- $stk = [self::SERVICES_JSON_IN_ARR];
- $arr = [];
- } else {
- $stk = [self::SERVICES_JSON_IN_OBJ];
- $obj = new stdClass();
- }
-
- array_push($stk, [
- 'what' => self::SERVICES_JSON_SLICE,
- 'where' => 0,
- 'delim' => false
- ]);
-
- $chrs = substr($str, 1, -1);
- $chrs = self::reduceString($chrs);
-
- if ($chrs == '') {
- if (reset($stk) == self::SERVICES_JSON_IN_ARR) {
- return $arr;
- } else {
- return $obj;
- }
- }
-
- $strlen_chrs = strlen($chrs);
- for ($c = 0; $c <= $strlen_chrs; ++$c) {
- $top = end($stk);
- $substr_chrs_c_2 = substr($chrs, $c, 2);
-
- if (
- ($c == $strlen_chrs) || (($chrs [$c] == ',')
- && ($top['what'] == self::SERVICES_JSON_SLICE))
- ) {
- $slice = substr($chrs, $top['where'], ($c - $top['where']));
- array_push(
- $stk,
- [
- 'what' => self::SERVICES_JSON_SLICE, 'where' => ($c + 1),
- 'delim' => false
- ]
- );
-
- if (reset($stk) == self::SERVICES_JSON_IN_ARR) {
- array_push($arr, self::decodeStr($slice));
- } elseif (reset($stk) == self::SERVICES_JSON_IN_OBJ) {
- $parts = [];
-
- if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
- $key = self::decodeStr($parts[1]);
- $val = self::decodeStr($parts[2]);
- $obj->$key = $val;
- } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
- $key = $parts[1];
- $val = self::decodeStr($parts[2]);
- $obj->$key = $val;
- }
- }
- } elseif (
- (($chrs [$c] == '"') || ($chrs[$c] == "'"))
- && ($top['what'] != self::SERVICES_JSON_IN_STR)
- ) {
- array_push(
- $stk,
- ['what' => self::SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]
- );
- } elseif (
- ($chrs [$c] == $top['delim']) &&
- ($top['what'] == self::SERVICES_JSON_IN_STR) &&
- ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)
- ) {
- array_pop($stk);
- } elseif (
- ($chrs [$c] == '[') &&
- in_array(
- $top['what'],
- [self::SERVICES_JSON_SLICE, self::SERVICES_JSON_IN_ARR, self::SERVICES_JSON_IN_OBJ]
- )
- ) {
- array_push($stk, ['what' => self::SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
- } elseif (($chrs [$c] == ']') && ($top['what'] == self::SERVICES_JSON_IN_ARR)) {
- array_pop($stk);
- } elseif (
- ($chrs [$c] == '{') &&
- in_array(
- $top['what'],
- [self::SERVICES_JSON_SLICE, self::SERVICES_JSON_IN_ARR, self::SERVICES_JSON_IN_OBJ]
- )
- ) {
- array_push($stk, ['what' => self::SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
- } elseif (($chrs [$c] == '}') && ($top['what'] == self::SERVICES_JSON_IN_OBJ)) {
- array_pop($stk);
- } elseif (
- ($substr_chrs_c_2 == '/*') &&
- in_array(
- $top['what'],
- [self::SERVICES_JSON_SLICE, self::SERVICES_JSON_IN_ARR, self::SERVICES_JSON_IN_OBJ]
- )
- ) {
- array_push($stk, ['what' => self::SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
- $c++;
- } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == self::SERVICES_JSON_IN_CMT)) {
- array_pop($stk);
- $c++;
- for ($i = $top['where']; $i <= $c; ++$i) {
- $chrs = substr_replace($chrs, ' ', $i, 1);
- }
- }
- }
-
- if (reset($stk) == self::SERVICES_JSON_IN_ARR) {
- return $arr;
- } elseif (reset($stk) == self::SERVICES_JSON_IN_OBJ) {
- return $obj;
- }
- }
- }
- }
-
- /**
- * 清除特殊格式
- *
- * @param string|null $str 待处理字符串
- * @return string|null
- */
- private static function reduceString(?string $str): ?string
- {
- $str = preg_replace([
- '#^\s*//(.+)$#m',
- '#^\s*/\*(.+)\*/#Us',
- '#/\*(.+)\*/\s*$#Us'
- ], '', $str);
- return trim($str);
- }
-
- /**
- * 将utf16转换为utf8
- *
- * @param string|null $utf16 utf16字符串
- * @return string|null
- */
- private static function utf162utf8(?string $utf16): ?string
- {
- if (function_exists('mb_convert_encoding')) {
- return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
- }
- $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
-
- switch (true) {
- case ((0x7F & $bytes) == $bytes):
- return chr(0x7F & $bytes);
-
- case (0x07FF & $bytes) == $bytes:
- return chr(0xC0 | (($bytes >> 6) & 0x1F))
- . chr(0x80 | ($bytes & 0x3F));
-
- case (0xFFFF & $bytes) == $bytes:
- return chr(0xE0 | (($bytes >> 12) & 0x0F))
- . chr(0x80 | (($bytes >> 6) & 0x3F))
- . chr(0x80 | ($bytes & 0x3F));
- }
- return '';
- }
-}
diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php
index a7522469..fe3fb508 100644
--- a/var/Typecho/Common.php
+++ b/var/Typecho/Common.php
@@ -11,7 +11,33 @@
namespace
{
- define('__TYPECHO_MB_SUPPORTED__', function_exists('mb_get_info') && function_exists('mb_regex_encoding'));
+
+ use Typecho\I18n;
+
+ /**
+ * @deprecated use json_encode and json_decode directly
+ */
+ class Json
+ {
+ /**
+ * @param $value
+ * @return string
+ */
+ public static function encode($value): string
+ {
+ return json_encode($value);
+ }
+
+ /**
+ * @param string $string
+ * @param bool $assoc
+ * @return mixed
+ */
+ public static function decode(string $string, bool $assoc = false)
+ {
+ return json_decode($string, $assoc);
+ }
+ }
/**
* I18n function
@@ -24,9 +50,9 @@ namespace
function _t(string $string, ...$args): string
{
if (empty($args)) {
- return Typecho_I18n::translate($string);
+ return I18n::translate($string);
} else {
- return vsprintf(Typecho_I18n::translate($string), $args);
+ return vsprintf(I18n::translate($string), $args);
}
}
@@ -53,7 +79,7 @@ namespace
*/
function _n(string $single, string $plural, int $number): string
{
- return str_replace('%d', $number, Typecho_I18n::ngettext($single, $plural, $number));
+ return str_replace('%d', $number, I18n::ngettext($single, $plural, $number));
}
}
@@ -254,6 +280,14 @@ namespace Typecho
*/
public static function init()
{
+ // init response
+ Response::getInstance()->enableAutoSendHeaders(false);
+
+ ob_start(function ($content) {
+ Response::getInstance()->sendHeaders();
+ return $content;
+ });
+
/** 设置异常截获函数 */
set_exception_handler(function (\Throwable $exception) {
if (defined('__TYPECHO_DEBUG__') && __TYPECHO_DEBUG__) {
@@ -262,7 +296,14 @@ namespace Typecho
echo htmlspecialchars($exception->__toString());
echo '';
} else {
- @ob_end_clean();
+ Response::getInstance()->clean();
+ ob_end_clean();
+
+ ob_start(function ($content) {
+ Response::getInstance()->sendHeaders();
+ return $content;
+ });
+
if (404 == $exception->getCode() && !empty(self::$exceptionHandle)) {
$handleClass = self::$exceptionHandle;
new $handleClass($exception);
@@ -284,25 +325,24 @@ namespace Typecho
{
$code = $exception->getCode() ?: 500;
$message = $exception->getMessage();
- $charset = self::$charset;
- if ($exception instanceof \Typecho_Db_Exception) {
+ if ($exception instanceof \Typecho\Db\Exception) {
$code = 500;
//覆盖原始错误信息
$message = 'Database Server Error';
- if ($exception instanceof \Typecho_Db_Adapter_Exception) {
+ if ($exception instanceof \Typecho\Db\Adapter\Exception) {
$code = 503;
$message = 'Error establishing a database connection';
- } elseif ($exception instanceof \Typecho_Db_Query_Exception) {
+ } elseif ($exception instanceof \Typecho\Db\Query\Exception) {
$message = 'Database Query Error';
}
}
/** 设置http code */
if (is_numeric($code) && $code > 200) {
- Response::setStatus($code);
+ Response::getInstance()->setStatus($code);
}
$message = nl2br($message);
@@ -315,7 +355,7 @@ namespace Typecho
-
+
{$code}
|