| Revision | b228da6ee1226ff40331d60d90b3e9bdcfe3b43f (tree) |
|---|---|
| Time | 2006-10-13 23:44:42 |
| Author | shizuki <shizuki@1ca2...> |
| Commiter | shizuki |
avtion=plugin の URL に対応
git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/plugin@446 1ca29b6e-896d-4ea0-84a5-967f57386b96
trunk/NP_CustomURL/NP_CustomURL.php (diff)| @@ -45,7 +45,7 @@ class NP_CustomURL extends NucleusPlugin | ||
| 45 | 45 | |
| 46 | 46 | function getVersion() |
| 47 | 47 | { |
| 48 | - return '0.3.0'; | |
| 48 | + return '0.3.01'; | |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | function getDescription() |
| @@ -370,7 +370,8 @@ class NP_CustomURL extends NucleusPlugin | ||
| 370 | 370 | // Admin area check |
| 371 | 371 | $uri = str_replace('/', '\/', sprintf("%s%s%s","http://",serverVar("HTTP_HOST"),serverVar("SCRIPT_NAME"))); |
| 372 | 372 | $plug_url = str_replace('/', '\/', $CONF['PluginURL']); |
| 373 | - if (strpos($uri, $plug_url) === 0) $UsingPlugAdmin = TRUE; | |
| 373 | + $u_plugAction = (getVar('action') == 'plugin' && getVar('name')); | |
| 374 | + if (strpos($uri, $plug_url) === 0 || $u_plugAction) $UsingPlugAdmin = TRUE; | |
| 374 | 375 | |
| 375 | 376 | // redirect to other URL style |
| 376 | 377 | if ($this->getBlogOption(intval($blogid), 'use_customurl') == 'yes' && !$UsingPlugAdmin && !$CONF['UsingAdminArea']) { |
| @@ -399,7 +400,8 @@ class NP_CustomURL extends NucleusPlugin | ||
| 399 | 400 | // redirection nomal URL to FancyURL |
| 400 | 401 | $temp_req = explode('?', serverVar('REQUEST_URI')); |
| 401 | 402 | $request_path = reset($temp_req); |
| 402 | - $feeds = ($request_path == 'xml-rss1.php' || $request_path == 'xml-rss2.php' || $request_path == 'atom.php'); | |
| 403 | + $feeds = ($request_path == '/xml-rss1.php' || $request_path == '/xml-rss2.php' || $request_path == '/atom.php'); | |
| 404 | + if ($feeds) return; | |
| 403 | 405 | if ($this->getBlogOption(intval($blogid), 'redirect_normal') == 'yes' && serverVar('QUERY_STRING') && !$feeds && !$exLink) { |
| 404 | 406 | $temp = explode('&', serverVar('QUERY_STRING')); |
| 405 | 407 | foreach ($temp as $k => $val) { |
Fork