X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nucleus%2Flibs%2Fglobalfunctions.php;h=37f2114dba95147feba1523d65ed9d24537cb8b3;hb=4c51c079da7c0ecc731f0fae7e239d1d2336059e;hp=2b7aa026d8192de49832a8b0704b8984a5622802;hpb=70557a85a28605efbfe583e56a025877f3538bf0;p=nucleus-jp%2Fnucleus-jp-ancient.git

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 2b7aa02..37f2114 100755
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -350,27 +350,27 @@ if (!defined('_ARCHIVETYPE_MONTH') ) {
 // decode path_info
 if ($CONF['URLMode'] == 'pathinfo') {
 	// initialize keywords if this hasn't been done before
-	if ($CONF['ItemKey'] == '') {
+	if (!isset($CONF['ItemKey']) || $CONF['ItemKey'] == '') {
 		$CONF['ItemKey'] = 'item';
 	}
 
-	if ($CONF['ArchiveKey'] == '') {
+	if (!isset($CONF['ArchiveKey']) || $CONF['ArchiveKey'] == '') {
 		$CONF['ArchiveKey'] = 'archive';
 	}
 
-	if ($CONF['ArchivesKey'] == '') {
+	if (!isset($CONF['ArchivesKey']) || $CONF['ArchivesKey'] == '') {
 		$CONF['ArchivesKey'] = 'archives';
 	}
 
-	if ($CONF['MemberKey'] == '') {
+	if (!isset($CONF['MemberKey']) || $CONF['MemberKey'] == '') {
 		$CONF['MemberKey'] = 'member';
 	}
 
-	if ($CONF['BlogKey'] == '') {
+	if (!isset($CONF['BlogKey']) || $CONF['BlogKey'] == '') {
 		$CONF['BlogKey'] = 'blog';
 	}
 
-	if ($CONF['CategoryKey'] == '') {
+	if (!isset($CONF['CategoryKey']) || $CONF['CategoryKey'] == '') {
 		$CONF['CategoryKey'] = 'category';
 	}
 
@@ -839,6 +839,8 @@ function selector() {
 
 		if ($b->isValidCategory($catid) ) {
 			$catextra = ' and icat=' . $catid;
+		} else {
+			$catextra = '';
 		}
 
 		// get previous itemid and title
@@ -1201,11 +1203,13 @@ function help($id) {
 }
 
 function helpHtml($id) {
-	return helplink($id) . '<img src="documentation/icon-help.gif" width="15" height="15" alt="' . _HELP_TT . '" /></a>';
+	global $CONF;
+	return helplink($id) . '<img src="' . $CONF['AdminURL'] . 'documentation/icon-help.gif" width="15" height="15" alt="' . _HELP_TT . '" /></a>';
 }
 
 function helplink($id) {
-	return '<a href="documentation/help.html#'. $id . '" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);">';
+	global $CONF;
+	return '<a href="' . $CONF['AdminURL'] . 'documentation/help.html#'. $id . '" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);">';
 }
 
 function getMailFooter() {
@@ -2055,7 +2059,7 @@ function getBookmarklet($blogid) {
 	$document = 'document';
 	$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('";
 	$bookmarkletline .= $CONF['AdminURL'] . "bookmarklet.php?blogid=$blogid";
-	$bookmarkletline .="&logtext='+escape(Q)+'&loglink='+escape(x.location.href)+'&loglinktitle='+escape(x.title),'nucleusbm','scrollbars=yes,width=600,height=550,left=10,top=10,status=yes,resizable=yes');wingm.focus();";
+	$bookmarkletline .="&logtext='+escape(Q)+'&loglink='+escape(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();";
 
 	return $bookmarkletline;
 }