From 4c51c079da7c0ecc731f0fae7e239d1d2336059e Mon Sep 17 00:00:00 2001 From: shizuki Date: Wed, 25 Feb 2009 05:18:48 +0000 Subject: [PATCH] =?utf8?q?=E3=83=96=E3=83=83=E3=82=AF=E3=83=9E=E3=83=BC?= =?utf8?q?=E3=82=AF=E3=83=AC=E3=83=83=E3=83=88=E3=81=AE=E4=B8=8D=E5=85=B7?= =?utf8?q?=E5=90=88=E4=BF=AE=E6=AD=A3=20IE6=E3=81=AE=E3=83=87=E3=82=B6?= =?utf8?q?=E3=82=A4=E3=83=B3=E3=81=8F=E3=81=9A=E3=82=8C=E4=BF=AE=E6=AD=A3?= =?utf8?q?=20=E7=B7=A8=E9=9B=86=E3=83=96=E3=83=83=E3=82=AF=E3=83=9E?= =?utf8?q?=E3=83=BC=E3=82=AF=E3=83=AC=E3=83=83=E3=83=88=E3=81=A7=EF=BD=A2?= =?utf8?q?=E3=83=98=E3=83=AB=E3=83=97=EF=BD=A3=E3=82=A2=E3=82=A4=E3=82=B3?= =?utf8?q?=E3=83=B3=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=A6?= =?utf8?q?=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92?= =?utf8?q?=E4=BF=AE=E6=AD=A3=20help.html=E3=81=B8=E3=81=AE=E3=83=AA?= =?utf8?q?=E3=83=B3=E3=82=AF=E3=82=92=E3=83=95=E3=83=ABURL=E3=81=AB?= =?utf8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk/utf8@955 1ca29b6e-896d-4ea0-84a5-967f57386b96 --- nucleus/libs/PAGEFACTORY.php | 10 ++++++- nucleus/libs/globalfunctions.php | 6 ++-- nucleus/libs/include/bookmarklet-add.template | 39 ++++++++++++++------------ nucleus/libs/include/bookmarklet-edit.template | 28 ++++++++---------- 4 files changed, 46 insertions(+), 37 deletions(-) diff --git a/nucleus/libs/PAGEFACTORY.php b/nucleus/libs/PAGEFACTORY.php index 41235b4..4d8c98c 100755 --- a/nucleus/libs/PAGEFACTORY.php +++ b/nucleus/libs/PAGEFACTORY.php @@ -80,7 +80,8 @@ class PAGEFACTORY extends BaseActions { 'ticket', 'autosave', 'autosaveinfo', - 'ifautosave' + 'ifautosave', + 'xmldeclaration' ); // TODO: maybe add 'skin' later on? @@ -173,6 +174,13 @@ class PAGEFACTORY extends BaseActions { ADMIN::selectBlogCategory('catid',$catid,$startidx,1,$this->blog->getID()); } + function parse_xmldeclaration() { + $ua = serverVar('HTTP_USER_AGENT'); + if (!(ereg("Windows", $ua) && ereg("MSIE", $ua)) || ereg("MSIE 7", $ua)) { + echo '<' . '?xml version="1.0" encoding="' . _CHARSET .'"?' . '>' . "\n"; + } + } + function parse_blogid() { echo $this->blog->getID(); } diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php index 93deb47..37f2114 100755 --- a/nucleus/libs/globalfunctions.php +++ b/nucleus/libs/globalfunctions.php @@ -1203,11 +1203,13 @@ function help($id) { } function helpHtml($id) { - return helplink($id) . '' . _HELP_TT . ''; + global $CONF; + return helplink($id) . '' . _HELP_TT . ''; } function helplink($id) { - return ''; + global $CONF; + return ''; } function getMailFooter() { diff --git a/nucleus/libs/include/bookmarklet-add.template b/nucleus/libs/include/bookmarklet-add.template index b6a513f..0a02a89 100755 --- a/nucleus/libs/include/bookmarklet-add.template +++ b/nucleus/libs/include/bookmarklet-add.template @@ -1,5 +1,4 @@ -"?> - +<%xmldeclaration%> > @@ -112,22 +111,26 @@ <%text(_ADD_DRAFTNFUTURE)%> - -
- <%helplink(future)%> -
- <%text(_ADD_PLACE_ON)%> - <%text(_ITEM_ADDEDITTEMPLATE_YEAR)%> - <%text(_ITEM_ADDEDITTEMPLATE_MONTH)%> - <%text(_ITEM_ADDEDITTEMPLATE_DAY)%> - <%text(_ITEM_ADDEDITTEMPLATE_HOUR)%> - <%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%> -
- <%text(_ITEM_ADDEDITTEMPLATE_FORMAT)%>(yyyy)<%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>(dd)<%text(_ITEM_ADDEDITTEMPLATE_DAY)%> (hh)<%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%> - <%ifblogsetting(ballowpast,0)%>
<%text(_ADD_NOPASTDATES)%><%endif%> -
- <%helplink(draft)%>
- + diff --git a/nucleus/libs/include/bookmarklet-edit.template b/nucleus/libs/include/bookmarklet-edit.template index b87e6d9..fb33659 100755 --- a/nucleus/libs/include/bookmarklet-edit.template +++ b/nucleus/libs/include/bookmarklet-edit.template @@ -1,5 +1,4 @@ -"?> - +<%xmldeclaration%> > @@ -71,7 +70,7 @@ <%ticket%>
- +
@@ -90,7 +89,7 @@
<%text(_ADD_TITLE)%> type="text" size="60" maxlength="160" value="<%contents(title)%>" />
- +
<%text(_ADD_MORE)%> <%helplink(extended)%> @@ -101,7 +100,7 @@
- +
<%ifblogsetting(bcomments)%> - @@ -144,21 +142,20 @@

<%text(_ADD_PREVIEW)%>

-   +  
 
 
-
- - <%ifautosave()%><%endif%> - - <%ifautosave()%>(<%text(_AUTOSAVEDRAFT)%> : <%text(_AUTOSAVEDRAFT_NOTYETSAVED)%>)<%endif%> -
+ +
+ + <%ifautosave()%><%endif%> + + <%ifautosave()%>(<%text(_AUTOSAVEDRAFT)%> : <%text(_AUTOSAVEDRAFT_NOTYETSAVED)%>)<%endif%>
- <%ifautosave()%><%endif%> - -- 2.11.0
<%text(_ADD_DISABLE_COMMENTS)%> @@ -130,11 +129,10 @@
  • <%helplink(draft)%>
    • <%endif%> +
    • -
    <%text(_ADD_PLUGIN_EXTRAS)%> <%pluginextras%>