Modify typo.

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

diff --git a/utf8/nucleus/plugins/NP_SkinFiles.php b/utf8/nucleus/plugins/NP_SkinFiles.php
index ae1e017..bdf3ba3 100644 (file)
--- a/utf8/nucleus/plugins/NP_SkinFiles.php
+++ b/utf8/nucleus/plugins/NP_SkinFiles.php
@@ -25,31 +25,31 @@
  * ==========================================================================================
  *
  * Changes:
- * v0.91 ged           - added ICO, PHPx files, fixed/added some icons
+ * v0.91       ged                     - added ICO, PHPx files, fixed/added some icons
  *                                             - changed perms on file or folder creation or upload to 0755 from 0640
  *                                             - changed 'cancel' links for delete actions to $parent dir from http_referer
  *                                             - changed order of links next to files... moved 'del' over a bit.  ;)
- * v0.92 ged           - changed order of links next to dirs
+ * v0.92       ged                     - changed order of links next to dirs
  *                                             - $privateskins = FALSE by default
- * v1.0  ged           - fixed security catch so it actually quits the script
+ * v1.0        ged                     - fixed security catch so it actually quits the script
  *                                             - "columnated" the files & dirs display for easier viewing
  *                                             - Made the edit cancel link more intuitive
- * v1.01 ged           - fixed event_QuickMenu to properly skip for non-admins
+ * v1.01       ged                     - fixed event_QuickMenu to properly skip for non-admins
  *                                             - lined up columns for directories & added <tr> highlights
  * v2.00       rakaz           - Almost complete rewrite
  * v2.01       yama            - modified form button for IE
  * v2.02       kimitake        - multilingual support, modified form button for IE
  * v2.03       yama            - CSS out source. and textarea width bug fix for IE. And some lang add.And add routine empty file delete.
- *             cacher  - replace function 'basename' (PHP BUG)
+ *                     cacher          - replace function 'basename' (PHP BUG)
  *                                             - add help
- *                     Mocchi  - arrange codes for PHP5
+ *                     Mocchi          - arrange codes for PHP5
  */
 
 class NP_SkinFiles extends NucleusPlugin {
        public function getName() { return 'SkinFiles'; }
        public function getAuthor() { return 'Misc authors'; }
        public function getURL() { return 'http://wakka.xiffy.nl/skinfiles'; }
-       public function getVersion() { return '2.031'; }
+       public function getVersion() { return '2.032'; }
        public function getDescription() { return _SKINFILES_01; }
        public function supportsFeature($feature)       { return in_array ($feature, array ('SqlTablePrefix', 'SqlApi', 'HelpPage'));}
        public function hasAdminArea() { return 1; }

diff --git a/utf8/nucleus/plugins/skinfiles/index.php b/utf8/nucleus/plugins/skinfiles/index.php
index e5a1096..98c649c 100644 (file)
--- a/utf8/nucleus/plugins/skinfiles/index.php
+++ b/utf8/nucleus/plugins/skinfiles/index.php
@@ -1,30 +1,30 @@
 <?php\r
 \r
-   /* ==========================================================================================\r
-       * Nucleus SkinFiles Plugin\r
-       *\r
-       * Copyright 2005-2007 by Jeff MacMichael and Niels Leenheer\r
-       *\r
-       * @version $Id$\r
-       * @version $NucleusJP: index.php,v 1.6 2007/03/20 19:32:47 kmorimatsu Exp $\r
-       *\r
-       * ==========================================================================================\r
-       * This program is free software and open source software; you can redistribute\r
-       * it and/or modify it under the terms of the GNU General Public License as\r
-       * published by the Free Software Foundation; either version 2 of the License,\r
-       * or (at your option) any later version.\r
-       *\r
-       * This program is distributed in the hope that it will be useful, but WITHOUT\r
-       * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-       * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-       * more details.\r
-       *\r
-       * You should have received a copy of the GNU General Public License along\r
-       * with this program; if not, write to the Free Software Foundation, Inc.,\r
-       * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  or visit\r
-       * http://www.gnu.org/licenses/gpl.html\r
-       * ==========================================================================================\r
-       */\r
+/* ==========================================================================================\r
+ * Nucleus SkinFiles Plugin\r
+ *\r
+ * Copyright 2005-2007 by Jeff MacMichael and Niels Leenheer\r
+ *\r
+ * @version $Id$\r
+ * @version $NucleusJP: index.php,v 1.6 2007/03/20 19:32:47 kmorimatsu Exp $\r
+ *\r
+ * ==========================================================================================\r
+ * This program is free software and open source software; you can redistribute\r
+ * it and/or modify it under the terms of the GNU General Public License as\r
+ * published by the Free Software Foundation; either version 2 of the License,\r
+ * or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful, but WITHOUT\r
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+ * more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License along\r
+ * with this program; if not, write to the Free Software Foundation, Inc.,\r
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  or visit\r
+ * http://www.gnu.org/licenses/gpl.html\r
+ * ==========================================================================================\r
+ */\r
        $DIR_LIBS = '';\r
        $strRel = '../../../'; \r
        require($strRel . 'config.php');\r
@@ -502,7 +502,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = trim(_skinfikes_basename(requestVar('dir')));\r
+               $file      = trim(_skinfiles_basename(requestVar('dir')));\r
                $directory = trim(dirname(requestVar('dir')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -542,7 +542,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = trim(_skinfikes_basename(requestVar('dir')));\r
+               $file      = trim(_skinfiles_basename(requestVar('dir')));\r
                $directory = trim(dirname(requestVar('dir')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -655,7 +655,7 @@
                }               \r
                else\r
                {\r
-                       echo "<p class='error'>" . _SKINFILES_ERR_COULD_NOT_CREATE_DIR9 . "&laquo;" . htmlspecialchars(_skinfikes_basename($directory)) . "&raquo; " .  _SKINFILES_ERR_COULD_NOT_CREATE_DIR10;\r
+                       echo "<p class='error'>" . _SKINFILES_ERR_COULD_NOT_CREATE_DIR9 . "&laquo;" . htmlspecialchars(_skinfiles_basename($directory)) . "&raquo; " .  _SKINFILES_ERR_COULD_NOT_CREATE_DIR10;\r
                        echo _SKINFILES_ERR_COULD_NOT_CREATE_DIR11 . "</p>";\r
                }\r
        }\r
@@ -669,7 +669,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = trim(_skinfikes_basename(requestVar('dir')));\r
+               $file      = trim(_skinfiles_basename(requestVar('dir')));\r
                $directory = trim(dirname(requestVar('dir')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -709,7 +709,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = trim(_skinfikes_basename(requestVar('dir')));\r
+               $file      = trim(_skinfiles_basename(requestVar('dir')));\r
                $directory = trim(dirname(requestVar('dir')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -762,7 +762,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = trim(_skinfikes_basename(requestVar('dir')));\r
+               $file      = trim(_skinfiles_basename(requestVar('dir')));\r
                $directory = trim(dirname(requestVar('dir')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -832,7 +832,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = trim(_skinfikes_basename(requestVar('dir')));\r
+               $file      = trim(_skinfiles_basename(requestVar('dir')));\r
                $directory = trim(dirname(requestVar('dir')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -881,7 +881,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file = _skinfikes_basename(trim(requestVar('file')));\r
+               $file = _skinfiles_basename(trim(requestVar('file')));\r
 \r
                $directory = dirname(trim(requestVar('file')));\r
                $directory = sfExpandDirectory ($directory);\r
@@ -927,7 +927,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = _skinfikes_basename(trim(requestVar('file')));\r
+               $file      = _skinfiles_basename(trim(requestVar('file')));\r
                $directory = dirname(trim(requestVar('file')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -1067,7 +1067,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = _skinfikes_basename(trim(requestVar('file')));\r
+               $file      = _skinfiles_basename(trim(requestVar('file')));\r
                $directory = dirname(trim(requestVar('file')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -1111,7 +1111,7 @@
        function _skinfiles_editfile_process() {\r
                global $manager;\r
                $skinfiles            = $manager->getPlugin('NP_SkinFiles');\r
-               $file      = _skinfikes_basename(trim(requestVar('file')));\r
+               $file      = _skinfiles_basename(trim(requestVar('file')));\r
                $directory = dirname(trim(requestVar('file')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -1167,7 +1167,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = _skinfikes_basename(trim(requestVar('file')));\r
+               $file      = _skinfiles_basename(trim(requestVar('file')));\r
                $directory = dirname(trim(requestVar('file')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -1207,7 +1207,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = _skinfikes_basename(trim(requestVar('file')));\r
+               $file      = _skinfiles_basename(trim(requestVar('file')));\r
                $directory = dirname(trim(requestVar('file')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -1322,7 +1322,7 @@
                }               \r
                else\r
                {\r
-                       echo "<p class='error'>" . _SKINFILES_ERR_CREATE_FILE11 . "&laquo;" . htmlspecialchars(_skinfikes_basename($directory)) . "&raquo; " . _SKINFILES_ERR_CREATE_FILE12;\r
+                       echo "<p class='error'>" . _SKINFILES_ERR_CREATE_FILE11 . "&laquo;" . htmlspecialchars(_skinfiles_basename($directory)) . "&raquo; " . _SKINFILES_ERR_CREATE_FILE12;\r
                        echo _SKINFILES_ERR_CREATE_FILE13 . "</p>";\r
                }\r
        }\r
@@ -1336,7 +1336,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = _skinfikes_basename(trim(requestVar('file')));\r
+               $file      = _skinfiles_basename(trim(requestVar('file')));\r
                $directory = dirname(trim(requestVar('file')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -1375,7 +1375,7 @@
 \r
                global $pluginUrl, $manager;\r
                \r
-               $file      = _skinfikes_basename(trim(requestVar('file')));\r
+               $file      = _skinfiles_basename(trim(requestVar('file')));\r
                $directory = dirname(trim(requestVar('file')));\r
                $directory = sfExpandDirectory ($directory);\r
                \r
@@ -1474,7 +1474,7 @@
                }\r
                else\r
                {\r
-                       echo "<p class='error'>" . _SKINFILES_ERR_UPLOAD_FILE9 . "&laquo;" . htmlspecialchars(_skinfikes_basename($directory)) . "&raquo; " . _SKINFILES_ERR_UPLOAD_FILE10;\r
+                       echo "<p class='error'>" . _SKINFILES_ERR_UPLOAD_FILE9 . "&laquo;" . htmlspecialchars(_skinfiles_basename($directory)) . "&raquo; " . _SKINFILES_ERR_UPLOAD_FILE10;\r
                        echo _SKINFILES_ERR_UPLOAD_FILE11 . "</p>";\r
                }       \r
        }\r
@@ -1504,11 +1504,16 @@
        }\r
 /* end modification */\r
 \r
-       function _skinfikes_basename($name) {\r
-               if ((strtolower(_CHARSET) != 'utf-8') && function_exists('mb_convert_encoding')) {$name = mb_convert_encoding($name , "UTF-8" , _CHARSET);}\r
+       function _skinfiles_basename($name) {\r
+               if ((strtolower(_CHARSET) != 'utf-8') && function_exists('mb_convert_encoding')) {\r
+                       $name = mb_convert_encoding($name , "UTF-8" , _CHARSET);\r
+               }\r
                $name = str_replace('\\','/',$name); // Avoid using "\" in Windows.\r
+               $name = rtrim($name, '/'); \r
                $name = (function_exists('mb_split')) ? end(mb_split("/",$name)) : end(explode("/",$name));\r
-               if ((strtolower(_CHARSET) != 'utf-8') && function_exists('mb_convert_encoding')) {$name = mb_convert_encoding($name , _CHARSET , "UTF-8");}\r
+               if ((strtolower(_CHARSET) != 'utf-8') && function_exists('mb_convert_encoding')) {\r
+                       $name = mb_convert_encoding($name , _CHARSET , "UTF-8");\r
+               }\r
                return $name;\r
        }\r
 ?>\r