diff --git a/admin/backup.php b/admin/backup.php index d1a0a862..1a4b43e8 100644 --- a/admin/backup.php +++ b/admin/backup.php @@ -4,10 +4,10 @@ include 'header.php'; include 'menu.php'; $actionUrl = $security->getTokenUrl( - Typecho_Router::url('do', array('action' => 'backup', 'widget' => 'Backup'), - Typecho_Common::url('index.php', $options->rootUrl))); + \Typecho\Router::url('do', array('action' => 'backup', 'widget' => 'Backup'), + \Typecho\Common::url('index.php', $options->rootUrl))); -$backupFiles = Typecho_Widget::widget('Widget_Backup')->listFiles(); +$backupFiles = \Typecho\Widget::widget('Widget_Backup')->listFiles(); ?>
diff --git a/admin/category.php b/admin/category.php index 97de61df..f73082ff 100644 --- a/admin/category.php +++ b/admin/category.php @@ -9,7 +9,7 @@ include 'menu.php';
- form()->render(); ?> + form()->render(); ?>
diff --git a/admin/common-js.php b/admin/common-js.php index 467ce54e..fad1cd04 100644 --- a/admin/common-js.php +++ b/admin/common-js.php @@ -7,13 +7,13 @@ $(document).ready(function() { // 处理消息机制 (function () { - var prefix = '', + var prefix = '', cookies = { notice : $.cookie(prefix + '__typecho_notice'), noticeType : $.cookie(prefix + '__typecho_notice_type'), highlight : $.cookie(prefix + '__typecho_notice_highlight') }, - path = ''; + path = ''; if (!!cookies.notice && 'success|notice|error'.indexOf(cookies.noticeType) >= 0) { var head = $('.typecho-head-nav'), @@ -110,7 +110,7 @@ if ((href && href[0] == '#') || /^adminUrl, '/'); ?>.*$/.exec(href) - || /^index), '/'), 0, -1); ?>action\/[_a-zA-Z0-9\/]+.*$/.exec(href)) { + || /^index), '/'), 0, -1); ?>action\/[_a-zA-Z0-9\/]+.*$/.exec(href)) { return; } diff --git a/admin/common.php b/admin/common.php index 28124ea6..597209c4 100644 --- a/admin/common.php +++ b/admin/common.php @@ -12,15 +12,15 @@ if (!defined('__TYPECHO_ROOT_DIR__') && !@include_once __DIR__ . '/../config.inc } /** 初始化组件 */ -Typecho_Widget::widget('Widget_Init'); +\Typecho\Widget::widget('Widget_Init'); /** 注册一个初始化插件 */ -Typecho_Plugin::factory('admin/common.php')->begin(); +\Typecho\Plugin::factory('admin/common.php')->begin(); -Typecho_Widget::widget('Widget_Options')->to($options); -Typecho_Widget::widget('Widget_User')->to($user); -Typecho_Widget::widget('Widget_Security')->to($security); -Typecho_Widget::widget('Widget_Menu')->to($menu); +\Typecho\Widget::widget('Widget_Options')->to($options); +\Typecho\Widget::widget('Widget_User')->to($user); +\Typecho\Widget::widget('Widget_Security')->to($security); +\Typecho\Widget::widget('Widget_Menu')->to($menu); /** 初始化上下文 */ $request = $options->request; @@ -33,22 +33,22 @@ if (!empty($currentMenu)) { $params = parse_url($currentMenu[2]); $adminFile = basename($params['path']); - if (!$user->logged && !Typecho_Cookie::get('__typecho_first_run')) { + if (!$user->logged && !\Typecho\Cookie::get('__typecho_first_run')) { if ('welcome.php' != $adminFile) { - $response->redirect(Typecho_Common::url('welcome.php', $options->adminUrl)); + $response->redirect(\Typecho\Common::url('welcome.php', $options->adminUrl)); } else { - Typecho_Cookie::set('__typecho_first_run', 1); + \Typecho\Cookie::set('__typecho_first_run', 1); } } elseif ($user->pass('administrator', true)) { /** 检测版本是否升级 */ - $mustUpgrade = version_compare(Typecho_Common::VERSION, $options->version, '>'); + $mustUpgrade = version_compare(\Typecho\Common::VERSION, $options->version, '>'); 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(\Typecho\Common::url('upgrade.php', $options->adminUrl)); + } elseif (!$mustUpgrade && 'upgrade.php' == $adminFile) { $response->redirect($options->adminUrl); - } else if (!$mustUpgrade && 'welcome.php' == $adminFile && $user->logged) { + } elseif (!$mustUpgrade && 'welcome.php' == $adminFile && $user->logged) { $response->redirect($options->adminUrl); } } diff --git a/admin/editor-js.php b/admin/editor-js.php index dfd51317..db2586ff 100644 --- a/admin/editor-js.php +++ b/admin/editor-js.php @@ -109,7 +109,7 @@ $(document).ready(function () { } }); - markdownEditor($content); ?> + markdownEditor($content); ?> var th = textarea.height(), ph = preview.height(), uploadBtn = $('

diff --git a/admin/user.php b/admin/user.php index f6cb957e..a8c33c06 100644 --- a/admin/user.php +++ b/admin/user.php @@ -9,7 +9,7 @@ include 'menu.php';
- form()->render(); ?> + form()->render(); ?>
diff --git a/admin/write-js.php b/admin/write-js.php index ac339ad0..adee5dc8 100644 --- a/admin/write-js.php +++ b/admin/write-js.php @@ -1,6 +1,6 @@ -write(); ?> -to($tags); ?> +write(); ?> +to($tags); ?> diff --git a/admin/write-page.php b/admin/write-page.php index 3c47b721..5a591284 100644 --- a/admin/write-page.php +++ b/admin/write-page.php @@ -2,7 +2,7 @@ include 'common.php'; include 'header.php'; include 'menu.php'; -Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page); +\Typecho\Widget::widget('Widget_Contents_Page_Edit')->to($page); ?>
@@ -12,7 +12,7 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
draft): ?> draft['cid'] != $page->cid): ?> - draft['modified']); ?> + draft['modified']); ?> 删除它', $pageModifyDate->word(), $security->getIndex('/action/contents-page-edit?do=deleteDraft&cid=' . $page->cid)); ?> @@ -25,7 +25,7 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);

- routingTable['page']['url'], $options->index); + routingTable['page']['url'], $options->index); list ($scheme, $permalink) = explode(':', $permalink, 2); $permalink = ltrim($permalink, '/'); $permalink = preg_replace("/\[([_a-z0-9-]+)[^\]]*\]/i", "{\\1}", $permalink); @@ -59,7 +59,7 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);

- content($page); ?> + content($page); ?>
have()): ?> - modified); ?> + modified); ?>



%s 创建', - Typecho_Common::url('manage-pages.php?uid=' . $page->author->uid, $options->adminUrl), $page->author->screenName); ?>
+ \Typecho\Common::url('manage-pages.php?uid=' . $page->author->uid, $options->adminUrl), $page->author->screenName); ?>
word()); ?>

@@ -148,13 +148,13 @@ include 'common-js.php'; include 'form-js.php'; include 'write-js.php'; -Typecho_Plugin::factory('admin/write-page.php')->trigger($plugged)->richEditor($page); +\Typecho\Plugin::factory('admin/write-page.php')->trigger($plugged)->richEditor($page); if (!$plugged) { include 'editor-js.php'; } include 'file-upload-js.php'; include 'custom-fields-js.php'; -Typecho_Plugin::factory('admin/write-page.php')->bottom($page); +\Typecho\Plugin::factory('admin/write-page.php')->bottom($page); include 'footer.php'; ?> diff --git a/admin/write-post.php b/admin/write-post.php index 306ef1a7..ea9e57ef 100644 --- a/admin/write-post.php +++ b/admin/write-post.php @@ -2,7 +2,7 @@ include 'common.php'; include 'header.php'; include 'menu.php'; -Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post); +\Typecho\Widget::widget('Widget_Contents_Post_Edit')->to($post); ?>
@@ -12,7 +12,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
draft): ?> draft['cid'] != $post->cid): ?> - draft['modified']); ?> + draft['modified']); ?> 删除它', $postModifyDate->word(), $security->getIndex('/action/contents-post-edit?do=deleteDraft&cid=' . $post->cid)); ?> @@ -25,7 +25,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);

- routingTable['post']['url'], $options->index); + routingTable['post']['url'], $options->index); list ($scheme, $permalink) = explode(':', $permalink, 2); $permalink = ltrim($permalink, '/'); $permalink = preg_replace("/\[([_a-z0-9-]+)[^\]]*\]/i", "{\\1}", $permalink); @@ -64,7 +64,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);

- content($post); ?> + content($post); ?>