v1.3.0 (#1661)

* Add feed widget

* add feed render

* Add CommentPage widget

* New theme (#1390)

* 调整忽略目录

* add theme

* fix theme scss build

Co-authored-by: fen <f3nb0x@gmail.com>

* s/is_writeable/is_writable/g

* New upgrade method

* merge new fixes from master

* add pgsql ssl mode support (ref #1600) (#1623)

* Feat/code refactor (#1626)

* remove all magic methods, add type for class properties

* refactor codes

* fix all

* refactor code

* fix type

* fix all

* fix request is method

* fix all

* fix router

* fix get page

* fix 1.3.0 upgrade

* [feat] support high resolution avatar

* fix types in i18n component

* Implement Ctrl+S or Command+S for save draft (#1628)

* Implement Ctrl+S or Command+S for save draft

* rename

* add Typecho.savePost

* fix upload file size

* add new uploader

* replace new uploader

* fix textarea change

* fix preview

* refactor post edit

* fix issue

* fix page edit

---------

Co-authored-by: joyqi <joyqi@segmentfault.com>
Co-authored-by: joyqi <magike.net@gmail.com>

* fix #1632

* Add svg to image types

* Feat/tree pages (#1646)

* add tree trait

* finish category tree trait

* support select fields

* fix select fields

* refactor admin trait

* fix draft status

* Add new contents type "revision"

* minor refactor

* add more tree view abstracts

* add tree trait to pages

* get ready for tree view pages

* improve page edit

* fix revision

* fix slug

* add router params delegate

* fix params delegate

* fix

* fix

* fix all

* fix all

* fix tree

* fix page link

* fix feed

* fix page

* fix permalink

* fix permalink input

* fix offset query

* Support IDN (#1629)

* Support IDN

* use js

* Optimize code

* Optimize code

* fix URL script

* remove unnecessary use

---------

Co-authored-by: joyqi <joyqi@segmentfault.com>

* fix input element

* fix #1651, close #1653

* Use json instead of serialize (#1624)

* Use json instead of serialize

* Fix Upgrade code

* add tree trait

* finish category tree trait

* support select fields

* fix select fields

* refactor admin trait

* fix draft status

* Add new contents type "revision"

* minor refactor

* add more tree view abstracts

* add tree trait to pages

* get ready for tree view pages

* improve page edit

* fix revision

* fix slug

* add router params delegate

* fix params delegate

* fix

* fix

* fix all

* fix all

* fix tree

* fix page link

* fix feed

* fix page

* fix permalink

* fix permalink input

* fix offset query

* Fix typo

* remove proxy methods

* remove unnecessary useage

---------

Co-authored-by: joyqi <joyqi@segmentfault.com>
Co-authored-by: joyqi <magike.net@gmail.com>

* Fix Prevent XSS vulnerability in default theme (#1654)

* Fix Prevent XSS vulnerability in default theme

* Update var/Typecho/Db/Adapter/Pdo.php

* fix the getter

---------

Co-authored-by: joyqi <joyqi@segmentfault.com>

* add throwCallback to widget response

* fix: cut down fields when selecting recent posts

* fix typo errors

* fix typo errors

* fix http client cookie

* add throw finish

* fix theme lang

* fix default theme

* fix query

* add open graph and twitter card support
add canonical link

* fix canonical link meta

* fix theme classic-22

* remove unnecessary scss file when packaging

* init plugin signal

* improve: remove feather-icon js file

* fix: typo

* improve: post detail layout

* fix tags saving

* improve: nav search

* fix: theme screenshot

* fix: theme page layout

* remove php 7.2/7.3 env

---------

Co-authored-by: fen <f3nb0x@gmail.com>
Co-authored-by: Lu Fei <52o@qq52o.cn>

admin/write-page.php

@@ -2,7 +2,19 @@
 include 'common.php';
 include 'header.php';
 include 'menu.php';
-\Widget\Contents\Page\Edit::alloc()->to($page);
+
+$page = \Widget\Contents\Page\Edit::alloc()->prepare();
+
+$parentPageId = $page->getParent();
+$parentPages = [0 => _t('不选择')];
+$parents = \Widget\Contents\Page\Admin::allocWithAlias(
+    'options',
+    'ignoreRequest=1' . ($request->is('cid') ? '&ignore=' . $request->get('cid') : '')
+);
+
+while ($parents->next()) {
+    $parentPages[$parents->cid] = str_repeat('    ', $parents->levels) . $parents->title;
+}
 ?>
 <div class="main">
     <div class="body container">
@@ -14,7 +26,7 @@ include 'menu.php';
                         <?php if ($page->draft['cid'] != $page->cid): ?>
                             <?php $pageModifyDate = new \Typecho\Date($page->draft['modified']); ?>
                             <cite
-                                class="edit-draft-notice"><?php _e('当前正在编辑的是保存于%s的草稿, 你可以<a href="%s">删除它</a>', $pageModifyDate->word(),
+                                class="edit-draft-notice"><?php _e('你正在编辑的是保存于 %s 的修订版, 你也可以 <a href="%s">删除它</a>', $pageModifyDate->word(),
                                     $security->getIndex('/action/contents-page-edit?do=deleteDraft&cid=' . $page->cid)); ?></cite>
                         <?php else: ?>
                             <cite class="edit-draft-notice"><?php _e('当前正在编辑的是未发布的草稿'); ?></cite>
@@ -38,12 +50,18 @@ include 'menu.php';
                     ?>
                     <p class="mono url-slug">
                         <label for="slug" class="sr-only"><?php _e('网址缩略名'); ?></label>
-                        <?php echo preg_replace("/\{slug\}/i", $input, $permalink); ?>
+                        <?php echo preg_replace_callback("/\{(slug|directory)\}/i", function ($matches) use ($input) {
+                            if ($matches[1] == 'slug') {
+                                return $input;
+                            } else {
+                                return '{directory/' . $input . '}';
+                            }
+                        }, $permalink); ?>
                     </p>
                     <p>
                         <label for="text" class="sr-only"><?php _e('页面内容'); ?></label>
                         <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text"
-                                  name="text" class="w-100 mono"><?php echo htmlspecialchars($page->text ?? ''); ?></textarea>
+                                  name="text" class="w-100 mono"><?php echo htmlspecialchars($page->text); ?></textarea>
                     </p>
 
                     <?php include 'custom-fields.php'; ?>
@@ -53,6 +71,7 @@ include 'menu.php';
                                     class="i-caret-left"></i> <?php _e('取消预览'); ?></button>
                         </span>
                         <span class="right">
+                            <input type="hidden" name="do" value="publish" />
                             <input type="hidden" name="cid" value="<?php $page->cid(); ?>"/>
                             <button type="button" id="btn-preview" class="btn"><i
                                     class="i-exlink"></i> <?php _e('预览页面'); ?></button>
@@ -66,7 +85,7 @@ include 'menu.php';
                         </span>
                     </p>
 
-                    <?php \Typecho\Plugin::factory('admin/write-page.php')->content($page); ?>
+                    <?php \Typecho\Plugin::factory('admin/write-page.php')->call('content', $page); ?>
                 </div>
                 <div id="edit-secondary" class="col-mb-12 col-tb-3" role="complementary">
                     <ul class="typecho-option-tabs clearfix">
@@ -104,7 +123,20 @@ include 'menu.php';
                             <p class="description"><?php _e('如果你为此页面选择了一个自定义模板, 系统将按照你选择的模板文件展现它'); ?></p>
                         </section>
 
-                        <?php \Typecho\Plugin::factory('admin/write-page.php')->option($page); ?>
+                        <section class="typecho-post-option">
+                            <label for="parent" class="typecho-label"><?php _e('父级页面'); ?></label>
+                            <p>
+                                <select name="parent" id="parent">
+                                    <?php foreach ($parentPages as $pageId => $pageTitle): ?>
+                                        <option
+                                            value="<?php echo $pageId; ?>"<?php if ($pageId == ($page->parent ?? $parentPageId)): ?> selected="true"<?php endif; ?>><?php echo $pageTitle; ?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </p>
+                            <p class="description"><?php _e('如果你设定了父级页面, 此页面将作为子页面呈现'); ?></p>
+                        </section>
+
+                        <?php \Typecho\Plugin::factory('admin/write-page.php')->call('option', $page); ?>
 
                         <button type="button" id="advance-panel-btn" class="btn btn-xs"><?php _e('高级选项'); ?> <i
                                 class="i-caret-down"></i></button>
@@ -136,7 +168,7 @@ include 'menu.php';
                                 </ul>
                             </section>
 
-                            <?php \Typecho\Plugin::factory('admin/write-page.php')->advanceOption($page); ?>
+                            <?php \Typecho\Plugin::factory('admin/write-page.php')->call('advanceOption', $page); ?>
                         </div>
                         <?php if ($page->have()): ?>
                             <?php $modified = new \Typecho\Date($page->modified); ?>
@@ -167,7 +199,7 @@ 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)->call('richEditor', $page);
 if (!$plugged) {
     include 'editor-js.php';
 }