OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

nucleus-plugins: Commit

Nucleus CMS日本語版用プラグインのうち、日本語版開発者がサポートしているもの


Commit MetaInfo

Revisionc9f7ae9d63147c885aaccc44e8c119ebd319bf86 (tree)
Time2006-10-06 14:15:59
Authorshizuki <shizuki@1ca2...>
Commitershizuki

Log Message

朝の分修正/未テスト

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

Change Summary

Incremental Difference

--- a/trunk/NP_Dtree/NP_Dtree.php
+++ b/trunk/NP_Dtree/NP_Dtree.php
@@ -65,7 +65,7 @@ class NP_Dtree extends NucleusPlugin
6565 if ($skinType == 'template') {
6666 echo '<script type="text/javascript" src="' .
6767 htmlspecialchars($this->getAdminURL()) . 'dtreedata.php?o=' .
68- $randomID.'a&amp;bid=' . $blogid . '&amp;id=' . $itemid . '"></script>';
68+ $randomID . 'a&amp;bid=' . $blogid . '&amp;id=' . $itemid . '"></script>';
6969 echo '<a href="javascript: ' . $randomID . 'a.openAll();">open all</a>' .
7070 ' | <a href="javascript: ' . $randomID . 'a.closeAll();">close all</a>';
7171 return;
--- a/trunk/NP_Dtree/dtree/dtreedata.php
+++ b/trunk/NP_Dtree/dtree/dtreedata.php
@@ -1,25 +1,11 @@
11 <?php
2-// $strRel = '../../../';
3-// include($strRel . 'config.php');
2+global $CONF;
3+ $strRel = '../../../';
4+ include($strRel . 'config.php');
45
56 $usePathInfo = ($CONF['URLMode'] == 'pathinfo');
67
78 if ($usePathInfo) {
8- if (empty($CONF['ItemKey'])) {
9- $CONF['ItemKey'] = 'item';
10- }
11- if (empty($CONF['ArchiveKey'])) {
12- $CONF['ArchiveKey'] = 'archive';
13- }
14- if (empty($CONF['ArchivesKey'])) {
15- $CONF['ArchivesKey'] = 'archives';
16- }
17- if (empty($CONF['MemberKey'])) {
18- $CONF['MemberKey'] = 'member';
19- }
20- if (empty($CONF['BlogKey'])) {
21- $CONF['BlogKey'] = 'blog';
22- }
239 if (empty($CONF['CategoryKey'])) {
2410 $CONF['CategoryKey'] = 'category';
2511 }
@@ -27,20 +13,22 @@
2713
2814 $CategoryKey = ($usePathInfo) ? $CONF['CategoryKey'] : 'catid';
2915
30- $objectId = requestVar('o');
31- $blogid = intval(requestVar('bid'));
16+// $objectId = requestVar('o');
17+ $objectId = 'tree' . intval(substr(requestVar('o'), 4));
18+ $blogid = intRequestVar('bid');
19+ if (empty($blogid)) $blogid = intval($CONF['DefaultBlog']);
3220 $blogname = getBlogNameFromID($blogid);
3321
3422 $b =& $manager->getBlog($blogid);
3523 $blogurl = $b->getURL();
3624 if (!$blogurl) {
3725 if($blog) {
38- $b_tmp =& $manager->getBlog($CONF['DefaultBlog']);
26+ $b_tmp =& $manager->getBlog($blogid);
3927 $blogurl = $b_tmp->getURL();
4028 }
4129 if (!$blogurl) {
4230 $blogurl = $CONF['IndexURL'];
43- if (!$usePathInfo){
31+ if (!$usePathInfo) {
4432 if ($data['type'] == 'pageparser') {
4533 $blogurl .= 'index.php';
4634 } else {
@@ -62,15 +50,16 @@
6250 $CONF['ArchiveListURL'] = $blogurl;
6351 $CONF['SearchURL'] = $blogurl;
6452
65- echo $objectId . " = new dTree('" . htmlspecialchars($objectId) . "');\n";
53+ echo $objectId . "=new dTree('" . htmlspecialchars($objectId) . "');\n";
6654
6755 echo $objectId . ".add(0,-1,'" . htmlspecialchars($blogname) . "');\n";
6856
69- $res = sql_query("SELECT * FROM " . sql_table('category') . " WHERE cblog = " . $blogid);
57+ $resq = 'SELECT * FROM %s WHERE cblog = %d';
58+ $res = sql_query(sprintf($resq, sql_table('category'), $blogid));
7059 $n = 1;
7160 while ($o = mysql_fetch_object($res)) {
7261 $catid = intval($o->catid);
73- $nodeArray[cat][$catid] = $n;
62+ $nodeArray['cat'][$catid] = $n;
7463 // $url = createBlogidLink($blogid, array('catid'=>$catid));
7564 $url = createCategoryLink($catid);
7665 // $url = createBlogidLink($blogid, array("$CategoryKey"=>$catid));
@@ -84,85 +73,92 @@
8473 $mPlugin =& $manager->getPlugin('NP_MultipleCategories');
8574 $subrequest = $mPlugin->getRequestName();
8675 echo 'document.write(' . $objectId . ');';
87- if ($itemid = intval(requestVar('id'))) {
88- $catid = quickQuery('SELECT icat as result FROM ' . sql_table('item') . ' WHERE inumber = ' . $itemid);
89- $nodeId = 's' . $objectId . $nodeArray[cat][$catid];
76+ if ($itemid = intRequestVar('id')) {
77+ $que = 'SELECT icat as result FROM %s WHERE inumber = %d';
78+ $catid = quickQuery(sprintf($que, sql_table('item'), $itemid));
79+ $catid = intval($catid);
80+ $nodeId = 's' . $objectId . $nodeArray['cat'][$catid];
9081 echo "document.getElementById('" . htmlspecialchars($nodeId) . "').className = 'selectedNode';";
9182 }
9283 return;
9384 }
9485
9586 if ($catFilter[1]) {
96- $catFilter = @join(',', $catFilter);
87+ $catFilter = @join(', ', $catFilter);
9788 $catFilter = ' IN (' . $catFilter . ')';
9889 } else {
9990 $catFilter = '=' . $catFilter;
10091 }
10192
102- $query = "SELECT * FROM " . sql_table('plug_multiple_categories_sub') . " WHERE catid" . $catFilter;
103- $res = sql_query($query);
93+ $query = 'SELECT * FROM %s WHERE catid %s';
94+ $res = sql_query(sprintf($query, sql_table('plug_multiple_categories_sub'), $catFilter));
10495 while ($o = mysql_fetch_object($res)) {
10596 $scatid = intval($o->scatid);
106- $nodeArray[subcat][$scatid] = $n;
97+ $nodeArray['subcat'][$scatid] = $n;
10798 $n++;
10899 }
109- $query = "SELECT * FROM " . sql_table('plug_multiple_categories_sub') . " WHERE catid" . $catFilter;
110- $res = sql_query($query);
100+ $query = 'SELECT * FROM %s WHERE catid %s';
101+ $res = sql_query(sprintf($query, sql_table('plug_multiple_categories_sub'), $catFilter));
111102 while ($u = mysql_fetch_object($res)) {
112103 $scatid = intval($u->scatid);
104+ $parent_id = intval($u->parentid);
105+ $cat_id = intval($u->catid);
113106 // $url = createBlogidLink($blogid, array('catid'=>$u->catid, 'subcatid'=>$scatid));
114107 $url = createCategoryLink($u->catid, array($subrequest => $scatid));
115108 // $url = createBlogidLink($blogid, array("$CategoryKey"=>$u->catid, 'subcatid'=>$scatid));
116- $pnode = ($u->parentid) ? $nodeArray[subcat][$u->parentid] : $nodeArray[cat][$u->catid];
117- echo $objectId . ".add(" . $nodeArray[subcat][$u->scatid] . "," . $pnode . ",'" . htmlspecialchars($u->sname) . "','" . $url . "');\n";
109+ $pnode = (!empty($parent_id)) ? $nodeArray['subcat'][$parent_id] : $nodeArray['cat'][$cat_id];
110+ echo $objectId . ".add(" . $nodeArray['subcat'][$scatid] . "," . $pnode . ",'" . htmlspecialchars($u->sname) . "','" . $url . "');\n";
118111 }
119112
120- echo "document.write(".$objectId.");\n";
113+ echo "document.write(" . $objectId . ");\n";
121114
122115
123- if (requestVar('sid')) {
124- $sid = intval(requestVar('sid'));
125- $nodeId = 's' . $objectId . $nodeArray[subcat][$sid];
126- echo "document.getElementById('" . $nodeId . "').className = 'urlselected';\n";
127- echo $objectId . ".openTo(" . $nodeArray[subcat][$sid] . ", true);\n";
128- } elseif(requestVar('cid')) {
129- $cid = intval(requestVar('cid'));
130- $nodeId = 's' . $objectId . $nodeArray[cat][$cid];
131- echo "document.getElementById('" . $nodeId . "').className = 'urlselected';\n";
132- echo $objectId . ".openTo(" . $nodeArray[cat][$cid] . ", true);\n";
116+ if ($sid = intRequestVar('sid')) {
117+// $sid = intRequestVar('sid');
118+ $nodeId = 's' . $objectId . $nodeArray['subcat'][$sid];
119+ echo "document.getElementById('" . $nodeId . "').className='urlselected';\n";
120+ echo $objectId . ".openTo(" . $nodeArray['subcat'][$sid] . ",true);\n";
121+ } elseif ($cid = intRequestVar('cid')) {
122+// $cid = intRequestVar('cid');
123+ $nodeId = 's' . $objectId . $nodeArray['cat'][$cid];
124+ echo "document.getElementById('" . $nodeId . "').className='urlselected';\n";
125+ echo $objectId . ".openTo(" . $nodeArray['cat'][$cid] . ",true);\n";
133126 }
134127
135128
136129
137- if ($itemid = requestVar('id')) {
138- $catid = quickQuery('SELECT icat as result FROM ' . sql_table('item') . ' WHERE inumber = ' . intval($itemid));
139- $nodeId = 's' . $objectId.$nodeArray[cat][$catid];
140- echo "document.getElementById('" . $nodeId . "').className = 'selectedNode';\n";
130+ if ($itemid = intRequestVar('id')) {
131+ $que = 'SELECT icat as result FROM %s WHERE inumber = %d';
132+ $catid = quickQuery($que, sql_table('item'), $itemid);
133+ $catid = intva($catid);
134+// $catid = quickQuery('SELECT icat as result FROM ' . sql_table('item') . ' WHERE inumber = ' . $itemid);
135+ $nodeId = 's' . $objectId.$nodeArray['cat'][$catid];
136+ echo "document.getElementById('" . $nodeId . "').className='selectedNode';\n";
141137
142138 //multi catid
143139 $que = 'SELECT categories as result FROM %s WHERE item_id = %d';
144- $catids = quickQuery(sprintf($que, sql_table('plug_multiple_categories'), intval($itemid)));
140+ $catids = quickQuery(sprintf($que, sql_table('plug_multiple_categories'), $itemid));
145141 if ($catids) {
146142 $catids = explode(',', $catids);
147143 for ($i=0;$i<count($catids);$i++) {
148144 $catidTemp = intval($catids[$i]);
149145 if ($catidTemp != $catid) {
150- $nodeId = 's' . $objectId . $nodeArray[cat][$catidTemp];
151- echo "document.getElementById('" . $nodeId . "').className = 'selectedCatNode';\n";
146+ $nodeId = 's' . $objectId . $nodeArray['cat'][$catidTemp];
147+ echo "document.getElementById('" . $nodeId . "').className='selectedCatNode';\n";
152148 }
153149 }
154150 }
155151
156152 //(multi) subcatid
157153 $que = 'SELECT subcategories as result FROM %s WHERE item_id = %d';
158- $scatids = quickQuery(sprintf($que, sql_table('plug_multiple_categories'), intval($itemid)));
154+ $scatids = quickQuery(sprintf($que, sql_table('plug_multiple_categories'), $itemid));
159155 if ($scatids) {
160156 $scatids = explode(',', $scatids);
161157 for ($i=0;$i<count($scatids);$i++) {
162158 $scatid = intval($scatids[$i]);
163- $nodeId = 's' . $objectId . $nodeArray[subcat][$scatid];
164- echo "document.getElementById('" . $nodeId . "').className = 'selectedScatNode';\n";
165- echo $objectId . ".openTo(" . $nodeArray[subcat][$scatid] . ", true);\n";
159+ $nodeId = 's' . $objectId . $nodeArray['subcat'][$scatid];
160+ echo "document.getElementById('" . $nodeId . "').className='selectedScatNode';\n";
161+ echo $objectId . ".openTo(" . $nodeArray['subcat'][$scatid] . ",true);\n";
166162 }
167163 }
168164 }
Show on old repository browser