From 7002dc5576f107a93a47233e1ad173ea897ac797 Mon Sep 17 00:00:00 2001 From: joyqi Date: Thu, 12 Dec 2013 11:14:21 +0800 Subject: [PATCH 01/35] =?UTF-8?q?=E4=BF=AE=E6=AD=A3install=E7=9A=84markdow?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.php b/install.php index 712027d2..f3e09362 100644 --- a/install.php +++ b/install.php @@ -333,11 +333,11 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion); /** 初始内容 */ $installDb->query($installDb->insert('table.contents')->rows(array('title' => _t('欢迎使用 Typecho'), 'slug' => 'start', 'created' => Typecho_Date::gmtTime(), 'modified' => Typecho_Date::gmtTime(), - 'text' => _t('如果您看到这篇文章,表示您的 blog 已经安装成功.'), 'authorId' => 1, 'type' => 'post', 'status' => 'publish', 'commentsNum' => 1, 'allowComment' => 1, + 'text' => _t('如果您看到这篇文章,表示您的 blog 已经安装成功.'), 'authorId' => 1, 'type' => 'post', 'status' => 'publish', 'commentsNum' => 1, 'allowComment' => 1, 'allowPing' => 1, 'allowFeed' => 1, 'parent' => 0))); $installDb->query($installDb->insert('table.contents')->rows(array('title' => _t('关于'), 'slug' => 'start-page', 'created' => Typecho_Date::gmtTime(), 'modified' => Typecho_Date::gmtTime(), - 'text' => _t('本页面由 Typecho 创建, 这只是个测试页面.'), 'authorId' => 1, 'order' => 0, 'type' => 'page', 'status' => 'publish', 'commentsNum' => 0, 'allowComment' => 1, + 'text' => _t('本页面由 Typecho 创建, 这只是个测试页面.'), 'authorId' => 1, 'order' => 0, 'type' => 'page', 'status' => 'publish', 'commentsNum' => 0, 'allowComment' => 1, 'allowPing' => 1, 'allowFeed' => 1, 'parent' => 0))); /** 初始评论 */ From c773d9e6cc1923de38d1b2038f86df4618351e72 Mon Sep 17 00:00:00 2001 From: joyqi Date: Thu, 12 Dec 2013 11:18:39 +0800 Subject: [PATCH 02/35] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E5=87=86=E5=A4=87=E5=8F=91=E5=B8=83=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- var/Typecho/Common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php index 2cacd2eb..4b6f63a9 100644 --- a/var/Typecho/Common.php +++ b/var/Typecho/Common.php @@ -20,7 +20,7 @@ class Typecho_Common { /** 程序版本 */ - const VERSION = '0.9/13.12.10'; + const VERSION = '0.9.1/13.12.12'; /** * 缓存的包含路径 From 59e01860d1b674f284199bd954cfba05b529846d Mon Sep 17 00:00:00 2001 From: joyqi Date: Thu, 12 Dec 2013 11:20:25 +0800 Subject: [PATCH 03/35] =?UTF-8?q?0.9=E7=89=88=E6=9C=AC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- var/Typecho/Common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php index 4b6f63a9..4e00fea3 100644 --- a/var/Typecho/Common.php +++ b/var/Typecho/Common.php @@ -20,7 +20,7 @@ class Typecho_Common { /** 程序版本 */ - const VERSION = '0.9.1/13.12.12'; + const VERSION = '0.9/13.12.12'; /** * 缓存的包含路径 From b2b55e6412797eb672ee1c42caf2e6ee2aae3dcd Mon Sep 17 00:00:00 2001 From: joyqi Date: Thu, 12 Dec 2013 21:02:00 +0800 Subject: [PATCH 04/35] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B3=BB=E7=BB=9F=E5=90=8E=E8=BF=98=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=96=B0=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/upgrade.php | 9 ++++++++- var/Widget/Upgrade.php | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/admin/upgrade.php b/admin/upgrade.php index a05c2bde..ad0834ca 100644 --- a/admin/upgrade.php +++ b/admin/upgrade.php @@ -29,5 +29,12 @@ include 'menu.php'; + + diff --git a/var/Widget/Upgrade.php b/var/Widget/Upgrade.php index 5feae4a0..bb19d44b 100644 --- a/var/Widget/Upgrade.php +++ b/var/Widget/Upgrade.php @@ -104,9 +104,6 @@ class Widget_Upgrade extends Widget_Abstract_Options implements Widget_Interface $this->update(array('value' => 'Typecho ' . Typecho_Common::VERSION), $this->db->sql()->where('name = ?', 'generator')); - /** 删除更新cookie */ - Typecho_Cookie::delete('__typecho_check_version'); - $this->widget('Widget_Notice')->set(empty($message) ? _t("升级已经完成") : $message, empty($message) ? 'success' : 'notice'); } From 87a2191dbad4f784dd27c3401ca9ef8cbba38b09 Mon Sep 17 00:00:00 2001 From: fen Date: Thu, 12 Dec 2013 21:44:27 +0800 Subject: [PATCH 05/35] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E7=AF=87=E3=80=81=E4=B8=8B=E4=B8=80=E7=AF=87=E6=BC=94=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- usr/themes/default/post.php | 5 +++++ usr/themes/default/style.css | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/usr/themes/default/post.php b/usr/themes/default/post.php index e9dd3ab4..9d8ca23b 100644 --- a/usr/themes/default/post.php +++ b/usr/themes/default/post.php @@ -15,6 +15,11 @@ need('comments.php'); ?> + +
    +
  • 上一篇：thePrev('%s','没有了'); ?>
    • +
  • 下一篇：theNext('%s','没有了'); ?>
    • +
need('sidebar.php'); ?> diff --git a/usr/themes/default/style.css b/usr/themes/default/style.css index 96a382ab..06cf784b 100644 --- a/usr/themes/default/style.css +++ b/usr/themes/default/style.css @@ -195,6 +195,16 @@ textarea { clear: both; } +.post-near { + list-style: none; + margin: 30px 0; + padding: 0; + color: #999; +} +.post-near li { + margin: 10px 0; +} + .archive-title { margin: 1em 0 -1em; padding-top: 20px; @@ -364,7 +374,8 @@ textarea { .post-content video, .comment-content video { max-width: 100%; } -.post-content a img { +.post-content a img, +.comment-content a img { background: #FFF; position: relative; bottom: -4px; /* hidden img parent link border */ From e9798950063d9849083faedd402a0b1e6dcc92ca Mon Sep 17 00:00:00 2001 From: joyqi Date: Fri, 13 Dec 2013 10:43:12 +0800 Subject: [PATCH 06/35] fix build --- .travis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..9de9256d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +language: php + +php: + - 5.5 + - 5.4 + - 5.3 + - 5.2 + +jdk: + - openjdk7 + +install: make get-deps +script: cd ./tools/ && make all + From f6f35f221dccb567c37e8470b01bcacc0d60b26a Mon Sep 17 00:00:00 2001 From: joyqi Date: Fri, 13 Dec 2013 10:51:03 +0800 Subject: [PATCH 07/35] fix build env --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9de9256d..a7904937 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,6 @@ php: - 5.5 - 5.4 - 5.3 - - 5.2 -jdk: - - openjdk7 - -install: make get-deps script: cd ./tools/ && make all From 81a99eb92310f8dd9af3031571dfbb9e562d83b7 Mon Sep 17 00:00:00 2001 From: joyqi Date: Fri, 13 Dec 2013 11:59:17 +0800 Subject: [PATCH 08/35] =?UTF-8?q?=E6=9B=B4=E6=96=B0makefile=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=BB=98=E8=AE=A4=E7=9A=84readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ tools/Makefile | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..418a176c --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +Typecho Blogging Platform +========================= + +Please visit http://typecho.org for more information. diff --git a/tools/Makefile b/tools/Makefile index 548f7f29..61deef9b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -12,6 +12,7 @@ update: git clone https://github.com/typecho/typecho-replica.git build rm -Rf build/.git rm -Rf build/.gitignore + rm -Rf build/.gitattributes for i in `find build/ -name '*.css'`; do echo $$i && java -Xmx32m -jar yuicompressor-2.4.2.jar $$i --charset UTF-8 -o $$i; done; for i in `find build/admin/js/ -name '*.js'`; do echo $$i && java -Xmx32m -jar yuicompressor-2.4.2.jar $$i --charset UTF-8 -o $$i; done; for i in `find build/ -name '*.php'`; do php -l $$i; done; @@ -21,6 +22,9 @@ package: @echo 'package' rm -Rf build/tools/ rm -Rf build/todo.txt + rm -Rf build/changelog.txt + rm -Rf build/.travis.yml + rm -Rf build/README.md rm -Rf build/admin/scss rm -Rf build/admin/img/editor rm -Rf build/admin/img/icons @@ -61,6 +65,9 @@ install: make update rm -Rf build/tools/ rm -Rf build/todo.txt + rm -Rf build/changelog.txt + rm -Rf build/.travis.yml + rm -Rf build/README.md rm -Rf build/admin/scss rm -Rf build/admin/img/editor rm -Rf build/admin/img/icons From d2ed2217c78d886246112934e2d414227ac92e35 Mon Sep 17 00:00:00 2001 From: joyqi Date: Fri, 13 Dec 2013 12:29:26 +0800 Subject: [PATCH 09/35] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/Makefile | 15 --------------- tools/mcecp.php | 38 -------------------------------------- 2 files changed, 53 deletions(-) delete mode 100644 tools/mcecp.php diff --git a/tools/Makefile b/tools/Makefile index 61deef9b..05c42c50 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -56,11 +56,6 @@ theme: make clear -typecho: - for i in `php list.php "build/var/Typecho/"`; do php tc.php "in=$$i&out=build/var/Typecho.php"; done; - rm -Rf build/var/Typecho/ - - install: make update rm -Rf build/tools/ @@ -78,16 +73,6 @@ install: make clear -tinymce: - wget http://prdownloads.sourceforge.net/tinymce/tinymce_${TINYMCE}.zip?download - unzip tinymce_${TINYMCE}.zip - for i in `find tinymce/jscripts/ -name '*.js'`; do php mcecp.php "in=$$i&out=../usr/plugins/TinyMCE/tiny_mce/$$i"; done; - for i in `find tinymce/jscripts/ -name '*.htm'`; do php mcecp.php "in=$$i&out=../usr/plugins/TinyMCE/tiny_mce/$$i"; done; - rm -Rf tinymce/ - rm -Rf tinymce_${TINYMCE}.zip - svn ci ../usr/plugins/TinyMCE/tiny_mce/ -m "upgrade tiny_mce to ${TINYMCE}" - - all: make update make package diff --git a/tools/mcecp.php b/tools/mcecp.php deleted file mode 100644 index 7f5ea8df..00000000 --- a/tools/mcecp.php +++ /dev/null @@ -1,38 +0,0 @@ - Date: Fri, 13 Dec 2013 12:36:01 +0800 Subject: [PATCH 10/35] Update README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 418a176c..69fcb177 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,15 @@ Typecho Blogging Platform ========================= -Please visit http://typecho.org for more information. +####Homepage +http://typecho.org/ + +####Document +http://docs.typecho.org/ + +####Forum +http://forum.typecho.org/ + +####Download +http://typecho.org/download + From 718f36caa3f27d9fa43e44b04b1f00e155f421ed Mon Sep 17 00:00:00 2001 From: joyqi Date: Fri, 13 Dec 2013 15:32:49 +0800 Subject: [PATCH 11/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/manage-comments.php | 4 ++-- admin/manage-medias.php | 4 ++-- admin/manage-metas.php | 4 ++-- admin/manage-pages.php | 2 +- admin/manage-posts.php | 4 ++-- admin/manage-users.php | 4 ++-- install.php | 9 ++------- install/Mysql.php | 4 ++-- install/Pgsql.php | 4 ++-- usr/themes/default/comments.php | 2 +- var/Widget/Options/Discussion.php | 8 ++++---- var/Widget/Options/General.php | 2 +- var/Widget/Options/Permalink.php | 21 ++++++++++++--------- var/Widget/Options/Reading.php | 10 +++++----- var/Widget/Users/Edit.php | 20 ++++++++++---------- var/Widget/Users/Profile.php | 16 ++++++++-------- 16 files changed, 58 insertions(+), 60 deletions(-) diff --git a/admin/manage-comments.php b/admin/manage-comments.php index b80ca9e4..eb979418 100644 --- a/admin/manage-comments.php +++ b/admin/manage-comments.php @@ -50,7 +50,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
- +
    • @@ -192,7 +192,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
    - +
      • diff --git a/admin/manage-medias.php b/admin/manage-medias.php index 9b4dd351..9ceff582 100644 --- a/admin/manage-medias.php +++ b/admin/manage-medias.php @@ -18,7 +18,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
      - +
      @@ -93,7 +93,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
      - +
      diff --git a/admin/manage-metas.php b/admin/manage-metas.php index 6b5f18d1..4573f1fd 100644 --- a/admin/manage-metas.php +++ b/admin/manage-metas.php @@ -24,7 +24,7 @@ include 'menu.php';
      - +
        • @@ -92,7 +92,7 @@ include 'menu.php';
        - +
          • diff --git a/admin/manage-pages.php b/admin/manage-pages.php index 4617c448..5012a434 100644 --- a/admin/manage-pages.php +++ b/admin/manage-pages.php @@ -15,7 +15,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
          - +
          diff --git a/admin/manage-posts.php b/admin/manage-posts.php index 843327a8..d8a88859 100644 --- a/admin/manage-posts.php +++ b/admin/manage-posts.php @@ -15,7 +15,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
          - +
          @@ -125,7 +125,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
          - +
          diff --git a/admin/manage-users.php b/admin/manage-users.php index 36dd4cc0..ad484d4b 100644 --- a/admin/manage-users.php +++ b/admin/manage-users.php @@ -13,7 +13,7 @@ include 'menu.php';
          - +
          @@ -92,7 +92,7 @@ include 'menu.php';
          - +
          diff --git a/install.php b/install.php index f3e09362..128da8b2 100644 --- a/install.php +++ b/install.php @@ -333,11 +333,11 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion); /** 初始内容 */ $installDb->query($installDb->insert('table.contents')->rows(array('title' => _t('欢迎使用 Typecho'), 'slug' => 'start', 'created' => Typecho_Date::gmtTime(), 'modified' => Typecho_Date::gmtTime(), - 'text' => _t('如果您看到这篇文章,表示您的 blog 已经安装成功.'), 'authorId' => 1, 'type' => 'post', 'status' => 'publish', 'commentsNum' => 1, 'allowComment' => 1, + 'text' => '' . _t('如果您看到这篇文章,表示您的 blog 已经安装成功.'), 'authorId' => 1, 'type' => 'post', 'status' => 'publish', 'commentsNum' => 1, 'allowComment' => 1, 'allowPing' => 1, 'allowFeed' => 1, 'parent' => 0))); $installDb->query($installDb->insert('table.contents')->rows(array('title' => _t('关于'), 'slug' => 'start-page', 'created' => Typecho_Date::gmtTime(), 'modified' => Typecho_Date::gmtTime(), - 'text' => _t('本页面由 Typecho 创建, 这只是个测试页面.'), 'authorId' => 1, 'order' => 0, 'type' => 'page', 'status' => 'publish', 'commentsNum' => 0, 'allowComment' => 1, + 'text' => '' . _t('本页面由 Typecho 创建, 这只是个测试页面.'), 'authorId' => 1, 'order' => 0, 'type' => 'page', 'status' => 'publish', 'commentsNum' => 0, 'allowComment' => 1, 'allowPing' => 1, 'allowFeed' => 1, 'parent' => 0))); /** 初始评论 */ @@ -598,11 +598,6 @@ Typecho_Db::set(\$db); 您可以自由地将其用于商业以及非商业用途.'); ?>

          -

          -
            - -
          -

          diff --git a/install/Mysql.php b/install/Mysql.php index f662a460..61c496be 100644 --- a/install/Mysql.php +++ b/install/Mysql.php @@ -97,7 +97,7 @@ $baeDbPassword = "getenv('HTTP_BAE_ENV_SK')";
        • -

          +

        • @@ -107,7 +107,7 @@ $baeDbPassword = "getenv('HTTP_BAE_ENV_SK')";
        • -

          +

        • diff --git a/install/Pgsql.php b/install/Pgsql.php index d548fb71..b6fc2036 100644 --- a/install/Pgsql.php +++ b/install/Pgsql.php @@ -2,7 +2,7 @@
        • -

          +

        • @@ -12,7 +12,7 @@
        • -

          +

        • diff --git a/usr/themes/default/comments.php b/usr/themes/default/comments.php index fd6e66e6..864f4ab7 100644 --- a/usr/themes/default/comments.php +++ b/usr/themes/default/comments.php @@ -1,7 +1,7 @@
          comments()->to($comments); ?> have()): ?> -

          commentsNum(_t('暂无评论'), _t('仅有 1 条评论'), _t('已有 %d 条评论')); ?>

          +

          commentsNum(_t('暂无评论'), _t('仅有一条评论'), _t('已有 %d 条评论')); ?>

          listComments(); ?> diff --git a/var/Widget/Options/Discussion.php b/var/Widget/Options/Discussion.php index 25e48d9c..c41d2b5a 100644 --- a/var/Widget/Options/Discussion.php +++ b/var/Widget/Options/Discussion.php @@ -34,8 +34,8 @@ class Widget_Options_Discussion extends Widget_Abstract_Options implements Widge /** 评论日期格式 */ $commentDateFormat = new Typecho_Widget_Helper_Form_Element_Text('commentDateFormat', NULL, $this->options->commentDateFormat, - _t('评论日期格式'), _t('这是一个默认的格式,当你在模板中调用显示评论日期方法时, 如果没有指定日期格式, 将按照此格式输出.
          - 具体写法请参考 PHP 日期格式写法.')); + _t('评论日期格式'), _t('这是一个默认的格式,当你在模板中调用显示评论日期方法时, 如果没有指定日期格式, 将按照此格式输出.') . '
          ' + . _t('具体写法请参考 PHP 日期格式写法.')); $commentDateFormat->input->setAttribute('class', 'w-40 mono'); $form->addInput($commentDateFormat); @@ -156,8 +156,8 @@ class Widget_Options_Discussion extends Widget_Abstract_Options implements Widge /** 允许使用的HTML标签和属性 */ $commentsHTMLTagAllowed = new Typecho_Widget_Helper_Form_Element_Textarea('commentsHTMLTagAllowed', NULL, htmlspecialchars($this->options->commentsHTMLTagAllowed), - _t('允许使用的HTML标签和属性'), _t('默认的用户评论不允许填写任何的HTML标签, 你可以在这里填写允许使用的HTML标签.
          - 比如: <a href=""> <img src=""> <blockquote>')); + _t('允许使用的HTML标签和属性'), _t('默认的用户评论不允许填写任何的HTML标签, 你可以在这里填写允许使用的HTML标签.') . '
          ' + . _t('比如: %s', ': <a href=""> <img src=""> <blockquote>')); $commentsHTMLTagAllowed->input->setAttribute('class', 'mono'); $form->addInput($commentsHTMLTagAllowed); diff --git a/var/Widget/Options/General.php b/var/Widget/Options/General.php index 5a8f38a5..bf8f4689 100644 --- a/var/Widget/Options/General.php +++ b/var/Widget/Options/General.php @@ -113,7 +113,7 @@ class Widget_Options_General extends Widget_Abstract_Options implements Widget_I ); $attachmentTypes = new Typecho_Widget_Helper_Form_Element_Checkbox('attachmentTypes', $attachmentTypesOptions, - $attachmentTypesOptionsValue, _t('允许上传的文件类型'), _t('用逗号 "," 将后缀名隔开, 例如: cpp, h, mak')); + $attachmentTypesOptionsValue, _t('允许上传的文件类型'), _t('用逗号 "," 将后缀名隔开, 例如: %s', 'cpp, h, mak')); $form->addInput($attachmentTypes->multiMode()); /** 提交按钮 */ diff --git a/var/Widget/Options/Permalink.php b/var/Widget/Options/Permalink.php index 0b777c3e..ecaf0c2b 100644 --- a/var/Widget/Options/Permalink.php +++ b/var/Widget/Options/Permalink.php @@ -206,8 +206,8 @@ RewriteRule . {$basePath}index.php [L] /** 是否使用地址重写功能 */ $rewrite = new Typecho_Widget_Helper_Form_Element_Radio('rewrite', array('0' => _t('不启用'), '1' => _t('启用')), - $this->options->rewrite, _t('是否使用地址重写功能'), _t('地址重写即 rewrite 功能是某些服务器软件提供的优化内部连接的功能.
          - 打开此功能可以让你的链接看上去完全是静态地址.')); + $this->options->rewrite, _t('是否使用地址重写功能'), _t('地址重写即 rewrite 功能是某些服务器软件提供的优化内部连接的功能.') . '
          ' + . _t('打开此功能可以让你的链接看上去完全是静态地址.')); $errorStr = _t('重写功能检测失败, 请检查你的服务器设置'); @@ -215,11 +215,11 @@ RewriteRule . {$basePath}index.php [L] if (((isset($_SERVER['SERVER_SOFTWARE']) && false !== strpos(strtolower($_SERVER['SERVER_SOFTWARE']), 'apache')) || function_exists('apache_get_version')) && !file_exists(__TYPECHO_ROOT_DIR__ . '/.htaccess') && !is_writeable(__TYPECHO_ROOT_DIR__)) { - $errorStr .= '
          ' . _t('我们检测到你使用了apache服务器, 但是程序无法在根目录创建.htaccess文件, 这可能是产生这个错误的原因. - 请调整你的目录权限, 或者手动创建一个.htaccess文件.') . ''; + $errorStr .= '
          ' . _t('我们检测到你使用了apache服务器, 但是程序无法在根目录创建.htaccess文件, 这可能是产生这个错误的原因.') + . _t('请调整你的目录权限, 或者手动创建一个.htaccess文件.') . ''; } - $errorStr .= _t('
          如果你仍然想启用此功能, 请点击这里', Typecho_Common::url('index.php/action/options-permalink?do=enableRewriteAnyway', $this->options->siteUrl)); + $errorStr .= '
          ' . _t('如果你仍然想启用此功能, 请点击这里', Typecho_Common::url('index.php/action/options-permalink?do=enableRewriteAnyway', $this->options->siteUrl)); $form->addInput($rewrite->addRule(array($this, 'checkRewrite'), $errorStr)); $patterns = array('/archives/[cid:digital]/' => _t('默认风格') . ' /archives/{cid}/', @@ -241,20 +241,23 @@ RewriteRule . {$basePath}index.php [L] $patterns['custom'] = _t('个性化定义') . ' '; $postPattern = new Typecho_Widget_Helper_Form_Element_Radio('postPattern', $patterns, - $postPatternValue, _t('自定义文章路径'), _t('可用参数: {cid} 日志 ID, {slug} 日志缩略名, {category} 分类, {year} 年, {month} 月, {day} 日
          选择一种合适的文章静态路径风格, 使得你的网站链接更加友好.
          - 一旦你选择了某种链接风格请不要轻易修改它.')); + $postPatternValue, _t('自定义文章路径'), _t('可用参数: {cid} 日志 ID, {slug} 日志缩略名, {category} 分类, {year} 年, {month} 月, {day} 日') + . '
          ' . _t('选择一种合适的文章静态路径风格, 使得你的网站链接更加友好.') + . '
          ' . _t('一旦你选择了某种链接风格请不要轻易修改它.')); if ($customPatternValue) { $postPattern->value('custom'); } $form->addInput($postPattern->multiMode()); /** 独立页面后缀名 */ - $pagePattern = new Typecho_Widget_Helper_Form_Element_Text('pagePattern', NULL, $this->decodeRule($this->options->routingTable['page']['url']), _t('独立页面路径'), _t('可用参数: {cid} 页面 ID、{slug} 页面缩略名
          请在路径中至少包含上述的一项参数.')); + $pagePattern = new Typecho_Widget_Helper_Form_Element_Text('pagePattern', NULL, $this->decodeRule($this->options->routingTable['page']['url']), _t('独立页面路径'), _t('可用参数: {cid} 页面 ID、{slug} 页面缩略名') + . '
          ' . _t('请在路径中至少包含上述的一项参数.')); $pagePattern->input->setAttribute('class', 'mono w-60'); $form->addInput($pagePattern->addRule(array($this, 'checkPagePattern'), _t('独立页面路径中没有包含 {cid} 或者 {slug} '))); /** 分类页面 */ - $categoryPattern = new Typecho_Widget_Helper_Form_Element_Text('categoryPattern', NULL, $this->decodeRule($this->options->routingTable['category']['url']), _t('分类路径'), _t('可用参数: {mid} 分类 ID、{slug} 分类缩略名
          请在路径中至少包含上述的一项参数.')); + $categoryPattern = new Typecho_Widget_Helper_Form_Element_Text('categoryPattern', NULL, $this->decodeRule($this->options->routingTable['category']['url']), _t('分类路径'), _t('可用参数: {mid} 分类 ID、{slug} 分类缩略名') + . '
          ' . _t('请在路径中至少包含上述的一项参数.')); $categoryPattern->input->setAttribute('class', 'mono w-60'); $form->addInput($categoryPattern->addRule(array($this, 'checkCategoryPattern'), _t('分类路径中没有包含 {mid} 或者 {slug} '))); diff --git a/var/Widget/Options/Reading.php b/var/Widget/Options/Reading.php index 9c16a5f4..0472136f 100644 --- a/var/Widget/Options/Reading.php +++ b/var/Widget/Options/Reading.php @@ -34,9 +34,9 @@ class Widget_Options_Reading extends Widget_Options_Permalink /** 文章日期格式 */ $postDateFormat = new Typecho_Widget_Helper_Form_Element_Text('postDateFormat', NULL, $this->options->postDateFormat, - _t('文章日期格式'), _t('此格式用于指定显示在文章归档中的日期默认显示格式.
          - 在某些主题中这个格式可能不会生效, 因为主题作者可以自定义日期格式.
          - 请参考 PHP 日期格式写法.')); + _t('文章日期格式'), _t('此格式用于指定显示在文章归档中的日期默认显示格式.') . '
          ' + . _t('在某些主题中这个格式可能不会生效, 因为主题作者可以自定义日期格式.') . '
          ' + . _t('请参考 PHP 日期格式写法.')); $postDateFormat->input->setAttribute('class', 'w-40 mono'); $form->addInput($postDateFormat); @@ -132,8 +132,8 @@ class Widget_Options_Reading extends Widget_Options_Permalink /** FEED全文输出 */ $feedFullText = new Typecho_Widget_Helper_Form_Element_Radio('feedFullText', array('0' => _t('仅输出摘要'), '1' => _t('全文输出')), - $this->options->feedFullText, _t('聚合全文输出'), _t('如果你不希望在聚合中输出文章全文,请使用仅输出摘要选项.
          - 摘要的文字取决于你在文章中使用分隔符的位置.')); + $this->options->feedFullText, _t('聚合全文输出'), _t('如果你不希望在聚合中输出文章全文,请使用仅输出摘要选项.') . '
          ' + . _t('摘要的文字取决于你在文章中使用分隔符的位置.')); $form->addInput($feedFullText); /** 提交按钮 */ diff --git a/var/Widget/Users/Edit.php b/var/Widget/Users/Edit.php index dde92dd7..a40c81b0 100644 --- a/var/Widget/Users/Edit.php +++ b/var/Widget/Users/Edit.php @@ -94,23 +94,23 @@ class Widget_Users_Edit extends Widget_Abstract_Users implements Widget_Interfac Typecho_Widget_Helper_Form::POST_METHOD); /** 用户名称 */ - $name = new Typecho_Widget_Helper_Form_Element_Text('name', NULL, NULL, _t('用户名 *'), _t('此用户名将作为用户登录时所用的名称.
          - 请不要与系统中现有的用户名重复.')); + $name = new Typecho_Widget_Helper_Form_Element_Text('name', NULL, NULL, _t('用户名 *'), _t('此用户名将作为用户登录时所用的名称.') + . '
          ' . _t('请不要与系统中现有的用户名重复.')); $form->addInput($name); /** 电子邮箱地址 */ - $mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址 *'), _t('电子邮箱地址将作为此用户的主要联系方式.
          - 请不要与系统中现有的电子邮箱地址重复.')); + $mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址 *'), _t('电子邮箱地址将作为此用户的主要联系方式.') + . '
          ' . _t('请不要与系统中现有的电子邮箱地址重复.')); $form->addInput($mail); /** 用户昵称 */ - $screenName = new Typecho_Widget_Helper_Form_Element_Text('screenName', NULL, NULL, _t('用户昵称'), _t('用户昵称可以与用户名不同, 用于前台显示.
          - 如果你将此项留空, 将默认使用用户名.')); + $screenName = new Typecho_Widget_Helper_Form_Element_Text('screenName', NULL, NULL, _t('用户昵称'), _t('用户昵称可以与用户名不同, 用于前台显示.') + . '
          ' . _t('如果你将此项留空, 将默认使用用户名.')); $form->addInput($screenName); /** 用户密码 */ - $password = new Typecho_Widget_Helper_Form_Element_Password('password', NULL, NULL, _t('用户密码'), _t('为此用户分配一个密码.
          - 建议使用特殊字符与字母的混编样式,以增加系统安全性.')); + $password = new Typecho_Widget_Helper_Form_Element_Password('password', NULL, NULL, _t('用户密码'), _t('为此用户分配一个密码.') + . '
          ' . _t('建议使用特殊字符与字母的混编样式,以增加系统安全性.')); $password->input->setAttribute('class', 'w-60'); $form->addInput($password); @@ -126,8 +126,8 @@ class Widget_Users_Edit extends Widget_Abstract_Users implements Widget_Interfac /** 用户组 */ $group = new Typecho_Widget_Helper_Form_Element_Select('group', array('visitor' => _t('访问者'), 'subscriber' => _t('关注者'), 'contributor' => _t('贡献者'), 'editor' => _t('编辑'), 'administrator' => _t('管理员')), - NULL, _t('用户组'), _t('不同的用户组拥有不同的权限.
          - 具体的权限分配表请参考这里.')); + NULL, _t('用户组'), _t('不同的用户组拥有不同的权限.') + . '
          ' . _t('具体的权限分配表请参考这里.')); $form->addInput($group); /** 用户动作 */ diff --git a/var/Widget/Users/Profile.php b/var/Widget/Users/Profile.php index b94fd53d..06a57300 100644 --- a/var/Widget/Users/Profile.php +++ b/var/Widget/Users/Profile.php @@ -45,8 +45,8 @@ class Widget_Users_Profile extends Widget_Users_Edit implements Widget_Interface Typecho_Widget_Helper_Form::POST_METHOD); /** 用户昵称 */ - $screenName = new Typecho_Widget_Helper_Form_Element_Text('screenName', NULL, NULL, _t('昵称'), _t('用户昵称可以与用户名不同, 用于前台显示.
          - 如果你将此项留空, 将默认使用用户名.')); + $screenName = new Typecho_Widget_Helper_Form_Element_Text('screenName', NULL, NULL, _t('昵称'), _t('用户昵称可以与用户名不同, 用于前台显示.') + . '
          ' . _t('如果你将此项留空, 将默认使用用户名.')); $form->addInput($screenName); /** 个人主页地址 */ @@ -54,8 +54,8 @@ class Widget_Users_Profile extends Widget_Users_Edit implements Widget_Interface $form->addInput($url); /** 电子邮箱地址 */ - $mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址 *'), _t('电子邮箱地址将作为此用户的主要联系方式.
          - 请不要与系统中现有的电子邮箱地址重复.')); + $mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址 *'), _t('电子邮箱地址将作为此用户的主要联系方式.') + . '
          ' . _t('请不要与系统中现有的电子邮箱地址重复.')); $form->addInput($mail); /** 用户动作 */ @@ -97,8 +97,8 @@ class Widget_Users_Profile extends Widget_Users_Edit implements Widget_Interface $markdown = new Typecho_Widget_Helper_Form_Element_Radio('markdown', array('0' => _t('关闭'), '1' => _t('打开')), $this->options->markdown, _t('使用 Markdown 语法编辑和解析内容'), - _t('使用 Markdown 语法能够使您的撰写过程更加简便直观.
          -此功能开启不会影响以前没有使用 Markdown 语法编辑的内容.')); + _t('使用 Markdown 语法能够使您的撰写过程更加简便直观.') + . '
          ' . _t('此功能开启不会影响以前没有使用 Markdown 语法编辑的内容.')); $form->addInput($markdown); /** 自动保存 */ @@ -210,8 +210,8 @@ class Widget_Users_Profile extends Widget_Users_Edit implements Widget_Interface Typecho_Widget_Helper_Form::POST_METHOD); /** 用户密码 */ - $password = new Typecho_Widget_Helper_Form_Element_Password('password', NULL, NULL, _t('用户密码'), _t('为此用户分配一个密码.
          - 建议使用特殊字符与字母的混编样式,以增加系统安全性.')); + $password = new Typecho_Widget_Helper_Form_Element_Password('password', NULL, NULL, _t('用户密码'), _t('为此用户分配一个密码.') + . '
          ' . _t('建议使用特殊字符与字母的混编样式,以增加系统安全性.')); $password->input->setAttribute('class', 'w-60'); $form->addInput($password); From b15350075ce3fda48fafcdaff470d6f6e7c491df Mon Sep 17 00:00:00 2001 From: fen Date: Fri, 13 Dec 2013 17:09:44 +0800 Subject: [PATCH 12/35] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/css/style.css | 3 ++- admin/scss/components/_editor.scss | 3 ++- usr/themes/default/header.php | 5 +---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/admin/css/style.css b/admin/css/style.css index f49dd203..e56220a6 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -1263,6 +1263,7 @@ a.operate-reply { margin-right: 4px; padding: 3px; cursor: pointer; + vertical-align: middle; -webkit-border-radius: 2px; -moz-border-radius: 2px; -ms-border-radius: 2px; @@ -1273,7 +1274,7 @@ a.operate-reply { .wmd-button-row li.wmd-spacer { height: 20px; margin: 0 10px 0 6px; - padding: 3px 0; + padding: 0; width: 1px; background: #E9E9E6; cursor: default; } diff --git a/admin/scss/components/_editor.scss b/admin/scss/components/_editor.scss index 1dd5396f..d3947337 100644 --- a/admin/scss/components/_editor.scss +++ b/admin/scss/components/_editor.scss @@ -17,6 +17,7 @@ margin-right: 4px; padding: 3px; cursor: pointer; + vertical-align: middle; @include border-radius(2px); &:hover { background-color: #E9E9E6; @@ -24,7 +25,7 @@ &.wmd-spacer { height: 20px; margin: 0 10px 0 6px; - padding: 3px 0; + padding: 0; width: 1px; background: #E9E9E6; cursor: default; diff --git a/usr/themes/default/header.php b/usr/themes/default/header.php index f992795a..7043b0ba 100644 --- a/usr/themes/default/header.php +++ b/usr/themes/default/header.php @@ -1,8 +1,5 @@ - - - - + From 6997bb1b8e2c4a736b66cee126e58c047f94d459 Mon Sep 17 00:00:00 2001 From: joyqi Date: Mon, 16 Dec 2013 09:39:08 +0800 Subject: [PATCH 13/35] fixed issue #129 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根据实验，在某些web服务器上，对`urlencode`也就是RFC 3986的标准解释不同，它们将unicode字符转义为以百分号开头的小写字符，而php中则默认为大写字符。比如“你好”在php中被转义为`%E4%BD%A0%E5%A5%BD`而在某些服务器上被转义为`%e4%bd%a0%e5%a5%bd`。 这导致`Widget_Archive`中的`checkPermalink`函数将它们识别为不同的路径，从而循环重定向。 解决方法：在`checkPermalink`函数中直接比较`urldecode`以后的`path` --- var/Widget/Archive.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/Widget/Archive.php b/var/Widget/Archive.php index 508ecf89..9c98d100 100644 --- a/var/Widget/Archive.php +++ b/var/Widget/Archive.php @@ -621,7 +621,7 @@ class Widget_Archive extends Widget_Abstract_Contents $src = parse_url($permalink); $target = parse_url($requestUrl); - if ($src['host'] != $target['host'] || $src['path'] != $target['path']) { + if ($src['host'] != $target['host'] || urldecode($src['path']) != urldecode($target['path'])) { $this->response->redirect($permalink, true); } } From 5abd03638b742ef5872ddf9ebd2bc8e71493bc50 Mon Sep 17 00:00:00 2001 From: Jakukyo Friel Date: Mon, 16 Dec 2013 13:37:08 +0800 Subject: [PATCH 14/35] =?UTF-8?q?=E6=96=87=E5=AD=97=E7=9A=84=E5=B0=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 密码建议使用符号、字母混合改为使用符号、字母、数字混合 - 授权说明改得更明确些，强调是在GPL的范围之内自由商业性或非商业性使用。 --- install.php | 2 +- var/Widget/Users/Edit.php | 2 +- var/Widget/Users/Profile.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.php b/install.php index 128da8b2..4019dca5 100644 --- a/install.php +++ b/install.php @@ -595,7 +595,7 @@ Typecho_Db::set(\$db);

          GPL 协议发布,我们允许用户在 GPL 协议许可的范围内使用,拷贝,修改和分发此程序. -您可以自由地将其用于商业以及非商业用途.'); ?>

          +在GPL许可的范围内，您可以自由地将其用于商业以及非商业用途.'); ?>

          diff --git a/var/Widget/Users/Edit.php b/var/Widget/Users/Edit.php index a40c81b0..a406fce7 100644 --- a/var/Widget/Users/Edit.php +++ b/var/Widget/Users/Edit.php @@ -110,7 +110,7 @@ class Widget_Users_Edit extends Widget_Abstract_Users implements Widget_Interfac /** 用户密码 */ $password = new Typecho_Widget_Helper_Form_Element_Password('password', NULL, NULL, _t('用户密码'), _t('为此用户分配一个密码.') - . '
          ' . _t('建议使用特殊字符与字母的混编样式,以增加系统安全性.')); + . '
          ' . _t('建议使用特殊字符与字母、数字的混编样式,以增加系统安全性.')); $password->input->setAttribute('class', 'w-60'); $form->addInput($password); diff --git a/var/Widget/Users/Profile.php b/var/Widget/Users/Profile.php index 06a57300..cef6c36c 100644 --- a/var/Widget/Users/Profile.php +++ b/var/Widget/Users/Profile.php @@ -211,7 +211,7 @@ class Widget_Users_Profile extends Widget_Users_Edit implements Widget_Interface /** 用户密码 */ $password = new Typecho_Widget_Helper_Form_Element_Password('password', NULL, NULL, _t('用户密码'), _t('为此用户分配一个密码.') - . '
          ' . _t('建议使用特殊字符与字母的混编样式,以增加系统安全性.')); + . '
          ' . _t('建议使用特殊字符与字母、数字的混编样式,以增加系统安全性.')); $password->input->setAttribute('class', 'w-60'); $form->addInput($password); From 81b017a1185e2fef656a814cda81978ac7968bed Mon Sep 17 00:00:00 2001 From: joyqi Date: Mon, 16 Dec 2013 14:37:33 +0800 Subject: [PATCH 15/35] =?UTF-8?q?=E7=94=9F=E6=88=90pot=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/Makefile | 28 +++++++++-------- tools/list.php | 81 ++++++++++++++------------------------------------ 2 files changed, 38 insertions(+), 71 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 05c42c50..2dd80fbc 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -2,8 +2,6 @@ #define root directory DIR=../ -TINYMCE=3_2_2 - #update subversion update: @@ -11,8 +9,8 @@ update: rm -Rf build/ git clone https://github.com/typecho/typecho-replica.git build rm -Rf build/.git - rm -Rf build/.gitignore - rm -Rf build/.gitattributes + rm -f build/.gitignore + rm -f build/.gitattributes for i in `find build/ -name '*.css'`; do echo $$i && java -Xmx32m -jar yuicompressor-2.4.2.jar $$i --charset UTF-8 -o $$i; done; for i in `find build/admin/js/ -name '*.js'`; do echo $$i && java -Xmx32m -jar yuicompressor-2.4.2.jar $$i --charset UTF-8 -o $$i; done; for i in `find build/ -name '*.php'`; do php -l $$i; done; @@ -21,10 +19,10 @@ update: package: @echo 'package' rm -Rf build/tools/ - rm -Rf build/todo.txt - rm -Rf build/changelog.txt - rm -Rf build/.travis.yml - rm -Rf build/README.md + 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 @@ -59,10 +57,10 @@ theme: install: make update rm -Rf build/tools/ - rm -Rf build/todo.txt - rm -Rf build/changelog.txt - rm -Rf build/.travis.yml - rm -Rf build/README.md + 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 @@ -73,6 +71,12 @@ install: make clear +pot: + cd ../ && php tools/list.php ./ > tools/files.txt + cd ../ && xgettext --files-from=tools/files.txt -Lphp --from-code=UTF-8 --keyword=_t --keyword=_e --keyword=_n:1,2 --no-location --copyright-holder=Typecho --package-name=Typecho --package-version=`grep -E "VERSION = '(.*)'" ./var/Typecho/Common.php | cut -d "'" -f 2` --no-wrap --output=tools/messages.pot + rm -f files.txt + + all: make update make package diff --git a/tools/list.php b/tools/list.php index dd8fc251..35f7b71c 100644 --- a/tools/list.php +++ b/tools/list.php @@ -6,68 +6,31 @@ if (!isset($argv[1])) { exit(1); } -//获取一个目录下的文件 -function mgGetFile($inpath, $trim = false,$stamp = NULL) -{ - $file = array(); +/** + * 获取所有文件 + * + * @param string $dir + * @param string $pattern + * @return array + */ +function all_files($dir, $pattern = '*') { + $result = array(); - if(!is_dir($inpath)) - { - return $file; - } + $items = glob($dir . '/' . $pattern, GLOB_BRACE); + foreach ($items as $item) { + if (is_file($item)) { + $result[] = $item; + } + } - $handle=opendir($inpath); - if(NULL != $stamp) - { - $stamp = explode("|",$stamp); - } - - while ($tmp = readdir($handle)) - { - if(file_exists($inpath."/".$tmp) && eregi("^([_@0-9a-zA-Z\x80-\xff\^\.\%-]{0,})[\.]([0-9a-zA-Z]{1,})$",$tmp,$file_name)) - { - if($stamp != NULL && in_array($file_name[2],$stamp)) - { - $file[] = $trim ? $file_name[0] : $file_name[1]; - } - else if($stamp == NULL) - { - $file[] = $trim ? $file_name[0] : $file_name[1]; - } - } - } - closedir($handle); - return $file; -} - -//获取一个目录下的目录 -function mgGetDir($inpath) -{ - $handle=opendir($inpath); - $dir = array(); - while ($tmp = readdir($handle)) - { - if(is_dir($inpath."/".$tmp) && $tmp != ".." && $tmp != "." && 0 !== stripos($tmp,'.')) - { - $dir[] = $tmp; - } - } - closedir($handle); - return $dir; -} - -function listFile($inpath, $stamp) -{ - $files = mgGetFile($inpath, true, $stamp); - $dirs = mgGetDir($inpath); - - if ($dirs) { - foreach ($dirs as $dir) { - $files = array_merge($files, listFile($dir, $stamp)); + $items = glob($dir . '/*', GLOB_ONLYDIR); + foreach ($items as $item) { + if (is_dir($item)) { + $result = array_merge($result, all_files($item, $pattern)); } } - - return $files; + + return $result; } -echo implode("\n", listFile($argv[1], 'php')); +echo implode("\n", all_files($argv[1], '*.php')); From cfa0caeb481812b088ca4c98fb8542e45f9bb6f6 Mon Sep 17 00:00:00 2001 From: joyqi Date: Tue, 17 Dec 2013 10:13:00 +0800 Subject: [PATCH 16/35] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在安装程序中出现的语言翻译项不能使用换行符，那样不利于PO翻译软件识别。 --- install.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/install.php b/install.php index 4019dca5..7eec260e 100644 --- a/install.php +++ b/install.php @@ -594,10 +594,11 @@ Typecho_Db::set(\$db);

          -

          GPL 协议发布,我们允许用户在 GPL 协议许可的范围内使用,拷贝,修改和分发此程序. -在GPL许可的范围内，您可以自由地将其用于商业以及非商业用途.'); ?>

          -

          +

          GPL 协议发布, 我们允许用户在 GPL 协议许可的范围内使用, 拷贝, 修改和分发此程序.'); ?> +

          +

          + +

          • From b99e7c50d03264effd9dc60aeb19ceb29dfdbbc5 Mon Sep 17 00:00:00 2001 From: fen Date: Tue, 17 Dec 2013 11:19:34 +0800 Subject: [PATCH 17/35] =?UTF-8?q?=E5=85=81=E8=AE=B8=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/css/style.css | 2 +- admin/header.php | 2 +- admin/scss/style.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/css/style.css b/admin/css/style.css index e56220a6..7e84092d 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -622,7 +622,7 @@ button { .typecho-login { display: table-cell; - padding-bottom: 100px; + padding: 30px 0 100px; width: 280px; text-align: center; vertical-align: middle; } diff --git a/admin/header.php b/admin/header.php index 5945a535..6a3e9298 100644 --- a/admin/header.php +++ b/admin/header.php @@ -20,7 +20,7 @@ $header = Typecho_Plugin::factory('admin/header.php')->header($header); - + <?php _e('%s - %s - Powered by Typecho', $menu->title, $options->title); ?> diff --git a/admin/scss/style.scss b/admin/scss/style.scss index 38d087c1..a843cca2 100644 --- a/admin/scss/style.scss +++ b/admin/scss/style.scss @@ -302,7 +302,7 @@ a.button:hover, a.balloon-button:hover { } .typecho-login { display: table-cell; - padding-bottom: 100px; + padding: 30px 0 100px; width: 280px; text-align: center; vertical-align: middle; From 02b7eda2a708a5ce91f85f40b77261a8029f3363 Mon Sep 17 00:00:00 2001 From: joyqi Date: Tue, 17 Dec 2013 22:51:15 +0800 Subject: [PATCH 18/35] fixed #134 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正由于判断不准确导致某些情况下本地化时间函数输出异常。完善本地化时间函数的单，复数输出。 --- var/Typecho/I18n.php | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/var/Typecho/I18n.php b/var/Typecho/I18n.php index 99c90b19..eb5a7ba1 100644 --- a/var/Typecho/I18n.php +++ b/var/Typecho/I18n.php @@ -126,40 +126,41 @@ class Typecho_I18n $between = $now - $from; /** 如果是一天 */ - if ($between > 0 && $between < 86400 && idate('d', $from) == idate('d', $now)) { + if ($between >= 0 && $between < 86400 && date('d', $from) == date('d', $now)) { /** 如果是一小时 */ - if ($between < 3600 && idate('H', $from) == idate('H', $now)) { + if ($between < 3600) { /** 如果是一分钟 */ - if ($between < 60 && idate('i', $from) == idate('i', $now)) { - $second = idate('s', $now) - idate('s', $from); - if (0 == $second) { + if ($between < 60) { + if (0 == $between) { return _t('刚刚'); } else { - return sprintf(_n('%d秒前', '%d秒前', $second), $second); + return str_replace('%d', $between, _n('一秒前', '%d秒前', $between)); } } - $min = idate('i', $now) - idate('i', $from); - return sprintf(_n('%d分钟前', '%d分钟前', $min), $min); + $min = floor($between / 60); + return str_replace('%d', $min, _n('一分钟前', '%d分钟前', $min)); } - $hour = idate('H', $now) - idate('H', $from); - return sprintf(_n('%d小时前', '%d小时前', $hour), $hour); + $hour = floor($between / 3600); + return str_replace('%d', $hour, _n('一小时前', '%d小时前', $hour)); } /** 如果是昨天 */ - if ($between > 0 && $between < 172800 && (idate('z', $from) + 1 == idate('z', $now) || idate('z', $from) > 2 + idate('z', $now))) { + if ($between > 0 && $between < 172800 + && (date('z', $from) + 1 == date('z', $now) // 在同一年的情况 + || date('z', $from) + 1 == date('L') + 365 + date('z', $now))) { // 跨年的情况 return _t('昨天 %s', date('H:i', $from)); } /** 如果是一个星期 */ - if ($between > 0 && $between < 604800 && idate('W', $from) == idate('W', $now)) { - $day = intval($between / (3600 * 24)); - return sprintf(_n('%d天前', '%d天前', $day), $day); + if ($between > 0 && $between < 604800) { + $day = floor($between / 86400); + return str_replace('%d', $day, _n('一天前', '%天前', $day)); } /** 如果是 */ - if ($between > 0 && $between < 31622400 && idate('Y', $from) == idate('Y', $now)) { + if (date('Y', $from) == date('Y', $now)) { return date(_t('n月j日'), $from); } From 4bc3e9d97bbf52f4b94e63aaaad1d6a39eb6f505 Mon Sep 17 00:00:00 2001 From: joyqi Date: Wed, 18 Dec 2013 00:19:52 +0800 Subject: [PATCH 19/35] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=81=97=E6=BC=8F?= =?UTF-8?q?=E7=9A=84=E8=AF=AD=E8=A8=80=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正GetText库无法读取mo文件的bug --- admin/editor-js.php | 2 +- admin/media.php | 2 +- admin/menu.php | 2 +- var/Typecho/I18n/GetText.php | 37 +++++++++++++++++++++++++----------- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/admin/editor-js.php b/admin/editor-js.php index a41f29f8..b1aed329 100644 --- a/admin/editor-js.php +++ b/admin/editor-js.php @@ -214,7 +214,7 @@ $(document).ready(function () { // 编辑预览切换 - var edittab = $('.editor').prepend('
          撰写预览
          '), + var edittab = $('.editor').prepend('
          '), editarea = $(textarea.parent()).attr("id", "wmd-editarea"); $(".wmd-edittab a").click(function() { diff --git a/admin/media.php b/admin/media.php index 399127df..6ef70c5b 100644 --- a/admin/media.php +++ b/admin/media.php @@ -27,7 +27,7 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);

          -
          拖放替换文件到这里 或者 选择文件替换
          +
          或者 %s选择文件上传%s', '', ''); ?>
            diff --git a/admin/menu.php b/admin/menu.php index 92bba9e4..3f17e74d 100644 --- a/admin/menu.php +++ b/admin/menu.php @@ -9,7 +9,7 @@ if ($user->logged > 0) { _e('最后登录: %s', Typecho_I18n::dateWord($user->logged + $options->timezone, $options->gmtTime + $options->timezone)); } - ?>" href="adminUrl('profile.php'); ?>" class="author">screenName(); ?>网站 + ?>" href="adminUrl('profile.php'); ?>" class="author">screenName(); ?>
            diff --git a/var/Typecho/I18n/GetText.php b/var/Typecho/I18n/GetText.php index 81b858d2..36aa5498 100644 --- a/var/Typecho/I18n/GetText.php +++ b/var/Typecho/I18n/GetText.php @@ -78,17 +78,14 @@ class Typecho_I18n_GetText // Caching can be turned off $this->enable_cache = $enable_cache; - - // $MAGIC1 = (int)0x950412de; //bug in PHP 5 - $MAGIC1 = (int) - 1794895138; - // $MAGIC2 = (int)0xde120495; //bug - $MAGIC2 = (int) - 569244523; - $this->STREAM = @fopen($file, 'rb'); - $magic = $this->readint(); - if ($magic == $MAGIC1) { + + $unpacked = unpack('c', $this->read(4)); + $magic = array_shift($unpacked); + + if (-34 == $magic) { $this->BYTEORDER = 0; - } elseif ($magic == $MAGIC2) { + } elseif (-107 == $magic) { $this->BYTEORDER = 1; } else { $this->error = 1; // not MO file @@ -103,6 +100,24 @@ class Typecho_I18n_GetText $this->translations = $this->readint(); } + /** + * read + * + * @param mixed $count + * @access private + * @return void + */ + private function read($count) + { + $count = abs($count); + + if ($count > 0) { + return fread($this->STREAM, $count); + } + + return NULL; + } + /** * Reads a 32bit Integer from the Stream * @@ -111,7 +126,7 @@ class Typecho_I18n_GetText */ private function readint() { - $end = unpack($this->BYTEORDER == 0 ? 'V' : 'N', fread($this->STREAM, 4)); + $end = unpack($this->BYTEORDER == 0 ? 'V' : 'N', $this->read(4)); return array_shift($end); } @@ -123,7 +138,7 @@ class Typecho_I18n_GetText */ private function readintarray($count) { - return unpack(($this->BYTEORDER == 0 ? 'V' : 'N') . $count, fread($this->STREAM, 4 * $count)); + return unpack(($this->BYTEORDER == 0 ? 'V' : 'N') . $count, $this->read(4 * $count)); } /** From 0271fa729fc41a285573612927ec7ff0dcdd6141 Mon Sep 17 00:00:00 2001 From: joyqi Date: Wed, 18 Dec 2013 12:35:24 +0800 Subject: [PATCH 20/35] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- var/Typecho/I18n.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/var/Typecho/I18n.php b/var/Typecho/I18n.php index eb5a7ba1..dbbdd11a 100644 --- a/var/Typecho/I18n.php +++ b/var/Typecho/I18n.php @@ -13,8 +13,7 @@ * @param string $string 需要翻译的文字 * @return string */ -function _t($string) -{ +function _t($string) { if (func_num_args() <= 1) { return Typecho_I18n::translate($string); } else { @@ -30,8 +29,7 @@ function _t($string) * @param string $string 需要翻译并输出的文字 * @return void */ -function _e() -{ +function _e() { $args = func_get_args(); echo call_user_func_array('_t', $args); } @@ -44,8 +42,7 @@ function _e() * @param integer $number 数字 * @return string */ -function _n($single, $plural, $number) -{ +function _n($single, $plural, $number) { return Typecho_I18n::ngettext($single, $plural, $number); } From f4511ec67f4c4b4c9fc89208dccb4c767c881da5 Mon Sep 17 00:00:00 2001 From: fen Date: Wed, 18 Dec 2013 17:45:31 +0800 Subject: [PATCH 21/35] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20dialog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/header.php | 2 +- usr/themes/default/header.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/header.php b/admin/header.php index 6a3e9298..c7a8771d 100644 --- a/admin/header.php +++ b/admin/header.php @@ -27,5 +27,5 @@ $header = Typecho_Plugin::factory('admin/header.php')->header($header); > diff --git a/usr/themes/default/header.php b/usr/themes/default/header.php index 7043b0ba..eef16326 100644 --- a/usr/themes/default/header.php +++ b/usr/themes/default/header.php @@ -27,7 +27,7 @@
          + get('status')): ?> + +
        + get('status')): ?> + +
        have()): ?> diff --git a/admin/manage-medias.php b/admin/manage-medias.php index 9ceff582..f11af045 100644 --- a/admin/manage-medias.php +++ b/admin/manage-medias.php @@ -22,7 +22,8 @@ $stat = Typecho_Widget::widget('Widget_Stat');
        -
        + +
      +
      have()): ?>
        diff --git a/admin/table-js.php b/admin/table-js.php index b89cee26..4c1c849b 100644 --- a/admin/table-js.php +++ b/admin/table-js.php @@ -6,7 +6,7 @@ checkEl : 'input[type=checkbox]', rowEl : 'tr', selectAllEl : '.typecho-table-select-all', - actionEl : '.dropdown-menu a' + actionEl : '.dropdown-menu a,button.btn-operate' }); $('.btn-drop').dropdownMenu({ diff --git a/var/Widget/Abstract/Metas.php b/var/Widget/Abstract/Metas.php index 1d945b8d..8b169a44 100644 --- a/var/Widget/Abstract/Metas.php +++ b/var/Widget/Abstract/Metas.php @@ -235,6 +235,31 @@ class Widget_Abstract_Metas extends Widget_Abstract return is_array($inputTags) ? $result : current($result); } + /** + * 清理没有任何内容的标签 + * + * @access public + * @return void + */ + public function clearTags() + { + // 取出count为0的标签 + $tags = Typecho_Common::arrayFlatten($this->db->fetchAll($this->db->select('mid') + ->from('table.metas')->where('count = ?', 0)), 'mid'); + + foreach ($tags as $tag) { + // 确认是否已经没有关联了 + $content = $this->db->fetchRow($this->db->select('cid') + ->from('table.relationships')->where('mid = ?', $tag) + ->limit(1)); + + if (empty($content)) { + $this->db->query($this->db->delete('table.metas') + ->where('mid = ?', $tag)); + } + } + } + /** * 根据内容的指定类别和状态更新相关meta的计数信息 * diff --git a/var/Widget/Contents/Attachment/Edit.php b/var/Widget/Contents/Attachment/Edit.php index 1d502b43..e428aacd 100644 --- a/var/Widget/Contents/Attachment/Edit.php +++ b/var/Widget/Contents/Attachment/Edit.php @@ -221,6 +221,8 @@ class Widget_Contents_Attachment_Edit extends Widget_Contents_Post_Edit implemen /** 格式化文章主键 */ $posts = is_array($cid) ? $cid : array($cid); foreach ($posts as $post) { + // 删除插件接口 + $this->pluginHandle()->delete($post, $this); $condition = $this->db->sql()->where('cid = ?', $post); $row = $this->db->fetchRow($this->select() @@ -238,6 +240,9 @@ class Widget_Contents_Attachment_Edit extends Widget_Contents_Post_Edit implemen $status = $this->status; + // 完成删除插件接口 + $this->pluginHandle()->finishDelete($post, $this); + $deleteCount ++; } @@ -258,6 +263,61 @@ class Widget_Contents_Attachment_Edit extends Widget_Contents_Post_Edit implemen } } + /** + * clearAttachment + * + * @access public + * @return void + */ + public function clearAttachment() + { + $page = 1; + + do { + $posts = Typecho_Common::arrayFlatten($this->db->fetchAll($this->select('cid') + ->from('table.contents') + ->where('type = ? AND parent = ?', 'attachment', 0) + ->page($page, 100)), 'cid'); + $page ++; + + foreach ($posts as $post) { + // 删除插件接口 + $this->pluginHandle()->delete($post, $this); + + $condition = $this->db->sql()->where('cid = ?', $post); + $row = $this->db->fetchRow($this->select() + ->where('table.contents.type = ?', 'attachment') + ->where('table.contents.cid = ?', $post) + ->limit(1), array($this, 'push')); + + if ($this->isWriteable($condition) && $this->delete($condition)) { + /** 删除文件 */ + Widget_Upload::deleteHandle($row); + + /** 删除评论 */ + $this->db->query($this->db->delete('table.comments') + ->where('cid = ?', $post)); + + $status = $this->status; + + // 完成删除插件接口 + $this->pluginHandle()->finishDelete($post, $this); + + $deleteCount ++; + } + + unset($condition); + } + } while (count($posts) == 100); + + /** 设置提示信息 */ + $this->widget('Widget_Notice')->set($deleteCount > 0 ? _t('未归档文件已经被清理') : _t('没有未归档文件被清理'), + $deleteCount > 0 ? 'success' : 'notice'); + + /** 返回原网页 */ + $this->response->redirect(Typecho_Common::url('manage-medias.php', $this->options->adminUrl)); + } + /** * 绑定动作 * @@ -268,6 +328,7 @@ class Widget_Contents_Attachment_Edit extends Widget_Contents_Post_Edit implemen { $this->on($this->request->is('do=delete'))->deleteAttachment(); $this->on($this->request->is('do=update'))->updateAttachment(); + $this->on($this->request->is('do=clear'))->clearAttachment(); $this->response->redirect($this->options->adminUrl); } } diff --git a/var/Widget/Contents/Page/Edit.php b/var/Widget/Contents/Page/Edit.php index d3ce3c1d..ad7d4dbe 100644 --- a/var/Widget/Contents/Page/Edit.php +++ b/var/Widget/Contents/Page/Edit.php @@ -140,7 +140,7 @@ class Widget_Contents_Page_Edit extends Widget_Contents_Post_Edit implements Wid $pages = is_array($cid) ? $cid : array($cid); foreach ($pages as $page) { // 删除插件接口 - $this->pluginHandle->delete($page, $this); + $this->pluginHandle()->delete($page, $this); if ($this->delete($this->db->sql()->where('cid = ?', $page))) { /** 删除评论 */ diff --git a/var/Widget/Contents/Post/Edit.php b/var/Widget/Contents/Post/Edit.php index 0826915e..ee32a67a 100644 --- a/var/Widget/Contents/Post/Edit.php +++ b/var/Widget/Contents/Post/Edit.php @@ -777,7 +777,7 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg $posts = is_array($cid) ? $cid : array($cid); foreach ($posts as $post) { // 删除插件接口 - $this->pluginHandle->delete($post, $this); + $this->pluginHandle()->delete($post, $this); $condition = $this->db->sql()->where('cid = ?', $post); $postObject = $this->db->fetchObject($this->db->select('status', 'type') @@ -825,6 +825,11 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg unset($condition); } + + // 清理标签 + if ($deleteCount > 0) { + $this->widget('Widget_Abstract_Metas')->clearTags(); + } } /** 设置提示信息 */ diff --git a/var/Widget/Metas/Tag/Edit.php b/var/Widget/Metas/Tag/Edit.php index d3755822..23d932f5 100644 --- a/var/Widget/Metas/Tag/Edit.php +++ b/var/Widget/Metas/Tag/Edit.php @@ -330,7 +330,10 @@ class Widget_Metas_Tag_Edit extends Widget_Abstract_Metas implements Widget_Inte if ($tags && is_array($tags)) { foreach ($tags as $tag) { $this->refreshCountByTypeAndStatus($tag, 'post', 'publish'); - } + } + + // 自动清理标签 + $this->clearTags(); $this->widget('Widget_Notice')->set(_t('标签刷新已经完成'), 'success'); } else { From 2b9cf7755afdc1a1878db96cf5bf4171eba9f93a Mon Sep 17 00:00:00 2001 From: joyqi Date: Fri, 20 Dec 2013 00:11:34 +0800 Subject: [PATCH 29/35] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=99=E7=82=B9url?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E5=BD=93=E7=AB=99=E7=82=B9url=E5=9C=B0=E5=9D=80=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E5=8F=98=E5=8C=96=E6=97=B6=EF=BC=8C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=AE=A9=E7=94=A8=E6=88=B7=E4=BB=A5=E6=96=B0=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=99=BB=E5=BD=95=E5=90=8E=E5=8F=B0=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=99=E7=82=B9url=20=E4=BF=AE=E6=AD=A3htt?= =?UTF-8?q?p://forum.typecho.org/viewtopic.php=3Ff=3D4&t=3D4708=20?= =?UTF-8?q?=E6=8F=90=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/common-js.php | 2 +- admin/common.php | 2 + admin/copyright.php | 2 +- admin/custom-fields-js.php | 1 + admin/custom-fields.php | 2 +- admin/editor-js.php | 2 +- admin/file-upload-js.php | 2 +- admin/file-upload.php | 2 +- admin/footer.php | 2 +- admin/form-js.php | 4 +- admin/header.php | 2 +- admin/menu.php | 2 +- admin/page-title.php | 2 +- admin/table-js.php | 2 +- admin/upgrade.php | 2 +- admin/write-js.php | 2 +- var/Typecho/Common.php | 2 +- var/Typecho/Cookie.php | 46 +++++----- var/Typecho/Request.php | 153 +++++++++++++++++++++---------- var/Upgrade.php | 17 ++++ var/Widget/Init.php | 2 +- var/Widget/Notice.php | 9 +- var/Widget/Options.php | 16 +++- var/Widget/Options/General.php | 19 +++- var/Widget/Options/Permalink.php | 2 +- var/Widget/Service.php | 4 +- var/Widget/User.php | 11 +-- 27 files changed, 199 insertions(+), 115 deletions(-) diff --git a/admin/common-js.php b/admin/common-js.php index 7b5659d2..ab9590c0 100644 --- a/admin/common-js.php +++ b/admin/common-js.php @@ -1,4 +1,4 @@ - + diff --git a/admin/common.php b/admin/common.php index 5abc62a8..63d79088 100644 --- a/admin/common.php +++ b/admin/common.php @@ -3,6 +3,8 @@ if (!defined('__DIR__')) { define('__DIR__', dirname(__FILE__)); } +define('__TYPECHO_ADMIN__', true); + /** 载入配置文件 */ if (!@include_once __DIR__ . '/../config.inc.php') { file_exists(__DIR__ . '/../install.php') ? header('Location: ../install.php') : print('Missing Config File'); diff --git a/admin/copyright.php b/admin/copyright.php index 72249601..b17e928c 100644 --- a/admin/copyright.php +++ b/admin/copyright.php @@ -1,4 +1,4 @@ - +