Modify the value for special skin parts. Revise 'Header Already Sent Message'. Confir...

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1099 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/nucleus/libs/globalfunctions.php b/utf8/nucleus/libs/globalfunctions.php
index 6f7ddbb..b56e67d 100755 (executable)
--- a/utf8/nucleus/libs/globalfunctions.php
+++ b/utf8/nucleus/libs/globalfunctions.php
@@ -2,7 +2,7 @@
 \r
 /*\r
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2010 The Nucleus Group\r
+ * Copyright (C) 2002-2011 The Nucleus Group\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -12,7 +12,7 @@
  */\r
 /**\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
- * @copyright Copyright (C) 2002-2010 The Nucleus Group\r
+ * @copyright Copyright (C) 2002-2011 The Nucleus Group\r
  * @version $Id$\r
  * $NucleusJP: globalfunctions.php,v 1.23.2.7 2008/02/05 08:30:08 kimitake Exp $\r
  */\r
@@ -20,7 +20,7 @@
 // needed if we include globalfunctions from install.php\r
 global $nucleus, $CONF, $DIR_LIBS, $DIR_LANG, $manager, $member;\r
 \r
-$nucleus['version'] = 'v3.62';\r
+$nucleus['version'] = 'v3.62_Beta-jp';\r
 $nucleus['codename'] = '';\r
 \r
 // check and die if someone is trying to override internal globals (when register_globals turn on)\r
@@ -502,7 +502,7 @@ if ($CONF['URLMode'] == 'pathinfo') {
                                        $i++;\r
 \r
                                        if ($i < sizeof($data) ) {\r
-                                               $_REQUEST['special'] = $data[$i];\r
+                                               $special = $data[$i];\r
                                        }\r
                                        break;\r
 \r
@@ -884,7 +884,7 @@ function selector() {
                // try to get line number/filename (extra headers_sent params only exists in PHP 4.3+)\r
                if (function_exists('version_compare') && version_compare('4.3.0', phpversion(), '<=') ) {\r
                        headers_sent($hsFile, $hsLine);\r
-                       $extraInfo = ' in <code>' . $hsFile . '</code> line <code>' . $hsLine . '</code>';\r
+                       $extraInfo = sprintf(_GFUNCTIONS_HEADERSALREADYSENT_FILE,$hsFile,$hsLine);\r
                } else {\r
                        $extraInfo = '';\r
                }\r
@@ -1294,7 +1294,9 @@ function mysqldate($timestamp) {
   */\r
 function selectBlog($shortname) {\r
        global $blogid, $archivelist;\r
-       $blogid = getBlogIDFromName($shortname);\r
+       if (!$blogid) {\r
+               $blogid = getBlogIDFromName($shortname);\r
+       }\r
 \r
        // also force archivelist variable, if it is set\r
        if ($archivelist) {\r
@@ -1304,7 +1306,9 @@ function selectBlog($shortname) {
 \r
 function selectSkin($skinname) {\r
        global $skinid;\r
-       $skinid = SKIN::getIdFromName($skinname);\r
+       if (!$skinid) {\r
+               $skinid = SKIN::getIdFromName($skinname);\r
+       }\r
 }\r
 \r
 /**\r
@@ -1313,16 +1317,20 @@ function selectSkin($skinname) {
  */\r
 function selectCategory($cat) {\r
        global $catid;\r
-       if (is_numeric($cat) ) {\r
-               $catid = intval($cat);\r
-       } else {\r
-               $catid = getCatIDFromName($cat);\r
+       if (!$catid) {\r
+               if (is_numeric($cat) ) {\r
+                       $catid = intval($cat);\r
+               } else {\r
+                       $catid = getCatIDFromName($cat);\r
+               }\r
        }\r
 }\r
 \r
 function selectItem($id) {\r
        global $itemid;\r
-       $itemid = intval($id);\r
+       if (!$itemid) {\r
+               $itemid = intval($id);\r
+       }\r
 }\r
 \r
 // force the use of a language file (warning: can cause warnings)\r
@@ -2312,7 +2320,7 @@ function getBookmarklet($blogid) {
        $document = 'document';\r
        $bookmarkletline = "javascript:Q='';x=".$document.";y=window;if(x.selection){Q=x.selection.createRange().text;}else if(y.getSelection){Q=y.getSelection();}else if(x.getSelection){Q=x.getSelection();}wingm=window.open('";\r
        $bookmarkletline .= $CONF['AdminURL'] . "bookmarklet.php?blogid=$blogid";\r
-       $bookmarkletline .="&logtext='+escape(Q)+'&loglink='+escape(x.location.href)+'&loglinktitle='+escape(x.title),'nucleusbm','toolbar=no,scrollbars=no,width=710,height=550,left=10,top=10,status=no,resizable=yes');wingm.focus();";\r
+       $bookmarkletline .="&logtext='+escape(Q)+'&loglink='+encodeURIComponent(x.location.href)+'&loglinktitle='+escape(x.title),'nucleusbm','toolbar=no,scrollbars=no,width=600,height=550,left=10,top=10,status=no,resizable=yes');wingm.focus();";\r
 \r
        return $bookmarkletline;\r
 }\r