From 96d072bbdb2438b9c2232689333c5cee0a1e63e5 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Sun, 20 Oct 2013 14:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=92=B0=E5=86=99slug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/write-page.php |  9 +++++----
 admin/write-post.php | 13 +++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/admin/write-page.php b/admin/write-page.php
index 55dc435d..90dfd96b 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -20,12 +20,13 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                         <?php $permalink = Typecho_Common::url($options->routingTable['page']['url'], $options->index);
                         list ($scheme, $permalink) = explode(':', $permalink, 2);
                         $permalink = ltrim($permalink, '/');
-                        ?>
-                    <?php if (preg_match("/\[slug:?[_0-9a-z-:]*\]/i", $permalink)): 
+                        $permalink = preg_replace("/\[([_a-z0-9-]+)[^\]]*\]/i", "{\\1}", $permalink);
+                        if ($page->have()) {
+                            $permalink = str_replace('{cid}', $page->cid, $permalink);
+                        }
                         $input = '<input type="text" id="slug" name="slug" autocomplete="off" value="' . htmlspecialchars($page->slug) . '" class="mono" />';
                         ?>
-                        <p class="mono url-slug"><?php echo preg_replace("/\[slug:?[_0-9a-z-:]*\]/i", $input, $permalink); ?></p>
-                    <?php endif; ?>
+                        <p class="mono url-slug"><?php echo preg_replace("/\{slug\}/i", $input, $permalink); ?></p>
                     <p>
                         <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100 mono"><?php echo htmlspecialchars($page->text); ?></textarea>
                     </p>
diff --git a/admin/write-post.php b/admin/write-post.php
index 0d521eb1..f2bbdcb6 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -20,12 +20,17 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                     <?php $permalink = Typecho_Common::url($options->routingTable['post']['url'], $options->index);
                     list ($scheme, $permalink) = explode(':', $permalink, 2);
                     $permalink = ltrim($permalink, '/');
-                    ?>
-                    <?php if (preg_match("/\[slug:?[_0-9a-z-:]*\]/i", $permalink)): 
+                    $permalink = preg_replace("/\[([_a-z0-9-]+)[^\]]*\]/i", "{\\1}", $permalink);
+                    if ($post->have()) {
+                        $permalink = str_replace(array(
+                            '{cid}', '{category}', '{year}', '{month}', '{day}'
+                        ), array(
+                            $post->cid, $post->category, $post->year, $post->month, $post->day
+                        ), $permalink);
+                    }
                     $input = '<input type="text" id="slug" name="slug" autocomplete="off" value="' . htmlspecialchars($post->slug) . '" class="mono" />';
                     ?>
-                    <p class="mono url-slug"><?php echo preg_replace("/\[slug:?[_0-9a-z-:]*\]/i", $input, $permalink); ?></p>
-                    <?php endif; ?>
+                    <p class="mono url-slug"><?php echo preg_replace("/\{slug\}/i", $input, $permalink); ?></p>
 
                     <p>
                         <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100 mono"><?php echo htmlspecialchars($post->text); ?></textarea>