From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Sat, 20 Oct 2012 02:19:48 +0000 (+0900)
Subject: CHANGE: NP_AttachをNucleus CMS 4.0でも動作するよう変更
X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-plugins.git;a=commitdiff_plain;h=7af2f9c09cf52bdc2d36873b63f342ee38187fdf

CHANGE: NP_AttachをNucleus CMS 4.0でも動作するよう変更

翻訳ファイルのinclude処理を修正。翻訳ファイル名も変更。
---

diff --git a/NP_Attach/NP_Attach.php b/NP_Attach/NP_Attach.php
index 0cf61b0..87c9a38 100755
--- a/NP_Attach/NP_Attach.php
+++ b/NP_Attach/NP_Attach.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Attach plugin for Nucleus CMS
- * Version 0.9.6 (1.0 RC2) for PHP5
- * Written By Mocchi, Apr. 04, 2011
+ * Version 1.0.0 for PHP5
+ * Written By Mocchi, Oct. 20, 2012
  * Original code was written by NKJG and yamamoto, May 02, 2009
  * This plugin depends on NP_Thumbnail and NP_MediaUtils
  * 
@@ -16,23 +16,25 @@
 // TODO (hard) There are no ways to show the error message even if upload processing is failed.
 // TODO (medium) all of the plugin options are purged when uninstalling plugins.
 
-class NP_Attach extends NucleusPlugin {
-	static private  $buffer	= false;
-	static private  $blogid	= 0;
-	static private  $itemid	= 0;
-	static private  $amount	= 0;
-	static private  $data	= array();
+class NP_Attach extends NucleusPlugin
+{
+	static private $buffer = false;
+	static private $blogid = 0;
+	static private $itemid = 0;
+	static private $amount = 0;
+	static private $data = array();
 	
 	public function getName()			{ return 'Attach'; }
 	public function getAuthor()		{ return 'Mocchi, yamamoto, NKJG'; }
 	public function getURL()			{ return 'http://japan.nucleuscms.org/wiki/plugins:attach'; }
-	public function getVersion()		{ return '0.9.6 (1.0 RC2)'; }
+	public function getVersion()		{ return '1.0.0'; }
 	public function getDescription()	{ return _NP_ATTACH_01; }
 	public function getPluginDep()	{ return array('NP_MediaUtils', 'NP_Thumbnail');}
-	public function getMinNucleusVersion()		{return 340;}
-	public function supportsFeature($feature)	{ return in_array ($feature, array ('SqlTablePrefix', 'SqlApi'));}
-	public function getEventList() {
-		return array (
+	public function getMinNucleusVersion()	{return 340;}
+	public function supportsFeature($feature)	{ return in_array($feature, array('SqlTablePrefix', 'SqlApi'));}
+	public function getEventList()
+	{
+		return array(
 			'PrePluginOptionsEdit', 
 			'AdminPrePageHead',
 			'BookmarkletExtraHead',
@@ -46,7 +48,8 @@ class NP_Attach extends NucleusPlugin {
 			'EditItemFormExtras');
 	}
 	
-	public function install () {
+	public function install()
+	{
 		$this->createOption('maxwidth', '_NP_ATTACH_02', 'text', '90',  'datatype=numerical');
 		$this->createOption('maxheight', '_NP_ATTACH_03', 'text', '90',  'datatype=numerical');
 		$this->createOption('admin_popup_template', '_NP_ATTACH_04', 'textarea', '<a href="<%rawpopuplink%>" title="<%popuptext%>" onclick="<%popupcode%>"><img src="<%thumb_url%>" width="<%thumb_width%>" height="<%thumb_height%>" alt="<%popuptext%>" /></a>');
@@ -58,150 +61,189 @@ class NP_Attach extends NucleusPlugin {
 		return;
 	}
 	
-	public function uninstall () {
+	public function uninstall()
+	{
 		return;
 	}
 	
-	public function init() {
-		if(!defined('_NP_ATTACH_01')) {
+	public function init()
+	{
+		$locale = '';
+		
+		/* new API */
+		if ( class_exists('i18n', FALSE) )
+		{
+			$locale = i18n::get_current_locale() . '.' . i18n::get_current_charset() . '.php';
+		}
+		/* old API */
+		else
+		{
 			$language = preg_replace('#[/|\\\\]#', '', getLanguageName());
-			if (file_exists($this->getDirectory() . $language.'.php')) {
-				include($this->getDirectory() . $language.'.php');
-			} else {
-				include($this->getDirectory() . 'english.php');
+			if ( $language == 'japanese-euc' )
+			{
+				$locale = 'ja_Jpan_JP.EUC-JP.php';
+			}
+			else if ( $language = 'japanese-utf8' )
+			{
+				$locale = 'ja_Jpan_JP.UTF-8.php';
 			}
 		}
+		
+		if ( !$locale || !file_exists($this->getDirectory() . $locale) )
+		{
+			include($this->getDirectory() . 'en_Latn_US.ISO-8859-1.php');
+		}
+		else
+		{
+			include($this->getDirectory() . $locale);
+		}
+		
 		return;
 	}
 	
-/*
- * for translation
- */
-	public function event_PrePluginOptionsEdit ($data)
+	/*
+	 * for translation
+	 */
+	public function event_PrePluginOptionsEdit(&$data)
 	{
-		if ($data['context'] != 'global') {
-			foreach($data['options'] as $key => $option) {
-				if ($option['pid'] == $this->getID()) {
-					if (defined($option['description'])) {
-						$data['options'][$key]['description'] = constant($option['description']);
-					}
-					if ($option['type'] == 'select') {
-						foreach (explode('|', $option['typeinfo']) as $option) {
-							if (defined($option)) {
-								$data['options'][$key]['typeinfo'] = str_replace($option, constant($option), $data['options'][$key]['typeinfo']);
+		/* Old version do not support natively */
+		if ( getNucleusVersion() < 400  )
+		{
+			if ( $data['context'] != 'global' )
+			{
+				foreach ( $data['options'] as $key => $option )
+				{
+					if ( $option['pid'] == $this->getID() )
+					{
+						if ( defined($option['description']) )
+						{
+							$data['options'][$key]['description'] = constant($option['description']);
+						}
+						if ( $option['type'] == 'select' )
+						{
+							foreach ( explode('|', $option['typeinfo']) as $option )
+							{
+								if ( defined($option) )
+								{
+									$data['options'][$key]['typeinfo'] = str_replace($option, constant($option), $data['options'][$key]['typeinfo']);
+								}
 							}
 						}
 					}
 				}
 			}
-		} else if ($data['plugid'] == $this->getID()) {
-			foreach($data['options'] as $key => $option){
-				if (defined($option['description'])) {
-					$data['options'][$key]['description'] = constant($option['description']);
-				}
-				if ($option['type'] == 'select') {
-						foreach (explode('|', $option['typeinfo']) as $option) {
-							if (defined($option)) {
-								$data['options'][$key]['typeinfo'] = str_replace($option, constant($option), $data['options'][$key]['typeinfo']);
+			else if ($data['plugid'] == $this->getID() )
+			{
+				foreach ( $data['options'] as $key => $option )
+				{
+					if ( defined($option['description']) )
+					{
+						$data['options'][$key]['description'] = constant($option['description']);
+					}
+					if ( $option['type'] == 'select' )
+					{
+							foreach ( explode('|', $option['typeinfo']) as $option )
+							{
+								if ( defined($option) )
+								{
+									$data['options'][$key]['typeinfo'] = str_replace($option, constant($option), $data['options'][$key]['typeinfo']);
+								}
 							}
-						}
+					}
 				}
 			}
 		}
+		
 		return;
 	}
 	
-/*
- * for translation
- */
-	static private function t ($text,$array=array()){
-		if (is_array($array)) {
-			$search = array();
-			$replace = array();
-			
-			foreach ($array as $key => $value){
-				if (is_array($value)) {
-					continue;
-				}
-				$search[] = '<%'.preg_replace('/[^a-zA-Z0-9_]+/','',$key).'%>';
-				$replace[] = $value;
-			}
-		}
-		return htmlspecialchars (str_replace($search, $replace, $text), ENT_QUOTES, _CHARSET);
-	}
-	
-/*
- * Change enctype attribute of form element as 'multipart/form-data'
- * Insert interface
- */
-	public function event_AdminPrePageHead ($data) {
-		if (!in_array ($data['action'], array ('createitem', 'itemedit'))) {
-		 return;
+	/*
+	 * Change enctype attribute of form element as 'multipart/form-data'
+	 * Insert interface
+	 */
+	public function event_AdminPrePageHead(&$data)
+	{
+		if ( !in_array ($data['action'], array('createitem', 'itemedit')) )
+		{
+			self::prepareEnctype();
 		}
-		
-		self::prepareEnctype ();
 		return;
 	}
 	
-	public function event_BookmarkletExtraHead ($data) {
-		self::prepareEnctype ();
+	public function event_BookmarkletExtraHead(&$data)
+	{
+		self::prepareEnctype();
 		return;
 	}
 	
-	public function event_AddItemFormExtras ($data) {
+	public function event_AddItemFormExtras(&$data)
+	{
 		global $DIR_MEDIA;
 		$blog = $data['blog'];
 		self::$blogid = $blog->blogid;
 		self::$itemid = 0;
-		self::setEnctype ();
+		self::setEnctype();
 		$this->setData($DIR_MEDIA);
-		$this->showInterface ();
+		$this->showInterface();
 		return;
 	}
 	
-	public function event_EditItemFormExtras ($data) {
+	public function event_EditItemFormExtras(&$data)
+	{
 		global $DIR_MEDIA;
 		$blog = $data['blog'];
 		self::$blogid = $blog->blogid;
 		self::$itemid = $data['itemid'];
-		self::setEnctype ();
+		self::setEnctype();
 		$this->setData($DIR_MEDIA);
-		$this->showInterface ();
+		$this->showInterface();
 		return;
 	}
 	
-/*
- * Process upload and update plugin item option
- */
-	public function event_PreAddItem ($data) {
+	/*
+	 * Process upload and update plugin item option
+	 */
+	public function event_PreAddItem(&$data)
+	{
 		self::$blogid = $data['blog']->blogid;
 		return;
 	}
-	public function event_PreUpdateItem ($data) {
+	
+	public function event_PreUpdateItem(&$data)
+	{
 		self::$blogid = $data['blog']->blogid;
 		return;
 	}
-	public function event_PostAddItem ($data) {
+	
+	public function event_PostAddItem(&$data)
+	{
 		self::$itemid = $data['itemid'];
 		return;
 	}
-	public function event_PostUpdateItem ($data) {
+	
+	public function event_PostUpdateItem(&$data)
+	{
 		self::$itemid = $data['itemid'];
 		return;
 	}
-	public function event_PrePluginOptionsUpdate ($data) {
+	
+	public function event_PrePluginOptionsUpdate(&$data)
+	{
 		global $DIR_MEDIA, $member;
 		
-		if ($data['plugid'] != $this->getID () || $data['optionname'] != 'media') {
+		if ( $data['plugid'] != $this->getID() || $data['optionname'] != 'media' )
+		{
 			return;
 		}
 		
 		$this->setData($DIR_MEDIA);
-		self::batchRequest ($DIR_MEDIA, $member->getID());
+		self::batchRequest($DIR_MEDIA, $member->getID());
 		
 		$value = '';
-		foreach (self::$data as $datum) {
-			if (!$datum['path']) {
+		foreach ( self::$data as $datum )
+		{
+			if ( !$datum['path'] )
+			{
 				continue;
 			}
 			$value .= "{$datum['path']}:{$datum['alt']}:{$datum['way']};";
@@ -211,100 +253,144 @@ class NP_Attach extends NucleusPlugin {
 		return;
 	}
 	
-/*
- * Show media in item
- */
-	public function event_PreItem($data) {
+	/*
+	 * Show media in item
+	 */
+	public function event_PreItem(&$data)
+	{
 		global $DIR_MEDIA;
+		
 		self::$blogid =& $data['blog']->blogid;
 		self::$itemid =& $data["item"]->itemid;
 		$this->setData($DIR_MEDIA);
 		
-		$data["item"]->body = preg_replace_callback("#<\%Attach\((.+?)(,.+?)?(,.+?)?\)%\>#", array(&$this, 'getParsedTag'), $data["item"]->body);
-		$data["item"]->more = preg_replace_callback("#<\%Attach\((.+?)(,.+?)?(,.+?)?\)%\>#", array(&$this, 'getParsedTag'), $data["item"]->more);
+		$data["item"]->body = preg_replace_callback("#<\%Attach\((.+?)(,.+?)?(,.+?)?\)%\>#", array($this, 'getParsedTag'), $data["item"]->body);
+		$data["item"]->more = preg_replace_callback("#<\%Attach\((.+?)(,.+?)?(,.+?)?\)%\>#", array($this, 'getParsedTag'), $data["item"]->more);
 		return;
 	}
-	public function doTemplateVar($item, $mediumid) {
+	
+	public function doTemplateVar($item, $mediumid)
+	{
 		global $DIR_MEDIA, $blogid;
 		
-		if (!self::$itemid || !self::$blogid) {
+		if ( !self::$itemid || !self::$blogid )
+		{
 			self::$blogid = $blogid;
 			self::$itemid = $item->itemid;
 			$this->setData($DIR_MEDIA);
 		}
-		$this->getParsedTag(array('item', $mediumid));
+		
+		$params = array('item', $mediumid);
+		$this->getParsedTag($params);
 		return;
 	}
 	
-	private function getParsedTag($match) {
+	private function getParsedTag($match)
+	{
 		global $DIR_MEDIA, $manager;
 		
+		/* receice maximum dimension */
 		$maxwidth = 0;
 		$maxheight = 0;
-		if (array_key_exists(3, $match)) {
+		if ( array_key_exists(3, $match) )
+		{
 			$maxheight = (integer) trim($match[3], ',');
 		}
-		if (array_key_exists(2, $match)) {
+		if ( array_key_exists(2, $match) )
+		{
 			$maxwidth = (integer) trim($match[2], ',');
 		}
 		
-		$data = &self::$data;
+		/* ID in tag starts 1 but ID in program starts 0 */
 		$mediumid = $match[1];
 		$mediumid--;
 		
-		if (!array_key_exists ($mediumid, $data) || !$data[$mediumid]['path']) {
+		/* filled tag or blank if failed */
+		$tag = $this->generateParsedTag($maxwidth, $maxheight);
+		
+		return $tag;
+	}
+	
+	private function generateParsedTag($maxwidth, $maxheight)
+	{
+		global $manager;
+		
+		/* check medium has path */
+		$data = &self::$data;
+		if ( !array_key_exists($mediumid, $data) || !$data[$mediumid]['path'] )
+		{
 			return;
 		}
 		
+		/* receive an instance of NP_Thumbnail class */
 		$NP_Thumbnail =& $manager->getPlugin('NP_Thumbnail');
 		
-		if ($maxwidth==0 && $maxheight==0) {
+		/* confirm to have maximum dimension */
+		if ( $maxwidth == 0 && $maxheight == 0 )
+		{
 			$maxwidth = $NP_Thumbnail->getOption('maxwidth');
 			$maxheight = $NP_Thumbnail->getOption('maxheight');
 		}
 		
-		if (FALSE === ($medium = new MEDIUM($DIR_MEDIA, $data[$mediumid]['path'], MediaUtils::$prefix))) {
+		/* receive an instance of MEDIUM class */
+		if ( FALSE === ($medium = new MEDIUM($DIR_MEDIA, $data[$mediumid]['path'], MediaUtils::$prefix)) )
+		{
 			return;
 		}
 		
-		if (array_key_exists($medium->mime, MediaUtils::$image_mime)
-		 && !$medium->setResampledSize($maxwidth, $maxheight)) {
+		/* take the instance having correct resampled dimension */
+		if ( array_key_exists($medium->mime, MediaUtils::$image_mime)
+		   && !$medium->setResampledSize($maxwidth, $maxheight) )
+		 {
 			return;
 		}
 		
-		if (!array_key_exists($medium->mime, MediaUtils::$image_mime)
-		 || $data[$mediumid]['way'] == 'anchor') {
+		/* receive template */
+		if ( !array_key_exists($medium->mime, MediaUtils::$image_mime)
+		   || $data[$mediumid]['way'] == 'anchor' )
+		 {
 			$template = $this->getBlogOption(self::$blogid, 'blog_media_template');
-		} else if ($data[$mediumid]['way'] == 'original') {
+		}
+		else if ( $data[$mediumid]['way'] == 'original' )
+		{
 			$template = $this->getBlogOption(self::$blogid, 'blog_image_template');
-		} else {
+		}
+		else
+		{
 			$template = $NP_Thumbnail->getBlogOption(self::$blogid, 'thumb_template');
 		}
+		
+		/* return filled template */
 		return $NP_Thumbnail->generateTag($template, $medium, $data[$mediumid]['alt']);
 	}
 	
-	private function showInterface () {
+	private function showInterface()
+	{
 		global $CONF, $DIR_LIBS, $DIR_MEDIA, $manager;
 		
-		if (!class_exists('BODYACTIONS', FALSE)) {
-			include ($DIR_LIBS . 'BODYACTIONS.php');
+		if ( !class_exists('BODYACTIONS', FALSE) )
+		{
+			include($DIR_LIBS . 'BODYACTIONS.php');
 		}
 		$action = new BODYACTIONS;
 		
-		if (!$manager->pluginInstalled('NP_Thumbnail')) {
+		if ( !$manager->pluginInstalled('NP_Thumbnail') )
+		{
 			return;
 		}
 		$NP_Thumbnail = &$manager->getPlugin('NP_Thumbnail');
 		$maxwidth = $NP_Thumbnail->getOption('maxwidth');
 		$maxheight = $NP_Thumbnail->getOption('maxheight');
 			
-		if (!self::$amount) {
+		if ( !self::$amount )
+		{
 			return;
 		}
 		
 		$data = self::$data;
 		
-		if (empty($data)) {
+		if ( empty($data) )
+		{
 			return;
 		}
 		
@@ -318,14 +404,16 @@ class NP_Attach extends NucleusPlugin {
 		echo "</thead>\n";
 		echo "<tbody>\n";
 		
-		for ($count = 0; $count < self::$amount; $count++) {
+		for ( $count = 0; $count < self::$amount; $count++ )
+		{
 			$id = $count + 1;
 			
 			echo "<tr>\n";
 			echo "<td>\n";
 			echo "<label for=\"alt{$count}\"><%Attach({$id})%></label>\n";
 			
-			if ($data[$count]['path']) {
+			if ( $data[$count]['path'] )
+			{
 				echo "<br />\n";
 				echo "<input type=\"checkbox\" id=\"delete{$count}\" name=\"delete[{$count}]\" value=\"1\" />\n";
 				echo "<label for=\"delete{$count}\">" . _NP_ATTACH_13 . "</label>\n";
@@ -334,21 +422,29 @@ class NP_Attach extends NucleusPlugin {
 			echo "</td>\n";
 			echo "<td>\n";
 			
-			if (!$data[$count]['path']) {
+			if ( !$data[$count]['path'] )
+			{
 				echo "<input type=\"file\" id=\"medium{$count}\" name=\"medium[{$count}]\" size=\"1\" /><br />\n";
-			} else {
-				if (FALSE === ($medium = new MEDIUM($DIR_MEDIA, $data[$count]['path'], MediaUtils::$prefix))) {
+			}
+			else
+			{
+				if ( FALSE === ($medium = new MEDIUM($DIR_MEDIA, $data[$count]['path'], MediaUtils::$prefix)) )
+				{
 					return;
 				}
 				
-				if (array_key_exists($medium->mime, MediaUtils::$image_mime)
-				 && !$medium->setResampledSize($maxwidth, $maxheight)) {
+				if ( array_key_exists($medium->mime, MediaUtils::$image_mime)
+				   && !$medium->setResampledSize($maxwidth, $maxheight) )
+				 {
 					return;
 				}
 				
-				if (array_key_exists($medium->mime, MediaUtils::$image_mime)) {
+				if ( array_key_exists($medium->mime, MediaUtils::$image_mime) )
+				{
 					$template = $this->getOption('admin_popup_template');
-				} else {
+				}
+				else
+				{
 					$template = $this->getOption('admin_media_template');
 				}
 				
@@ -359,19 +455,27 @@ class NP_Attach extends NucleusPlugin {
 			echo "</td>\n";
 			echo "<td>\n";
 			
-			if ($data[$count]['path'] && !array_key_exists($data[$count]['mime'], MediaUtils::$image_mime)) {
+			if ( $data[$count]['path'] && !array_key_exists($data[$count]['mime'], MediaUtils::$image_mime) )
+			{
 				echo "<input type=\"hidden\" name=\"way[{$count}]\" value=\"anchor\" />\n";
 				echo _NP_ATTACH_14 . "\n";
-			} else {
+			}
+			else
+			{
 				$thumbnail_checked = "";
 				$original_checked = "";
 				$anchor_checked = "";
 				
-				if ($data[$count]['way'] == 'original') {
+				if ( $data[$count]['way'] == 'original' )
+				{
 					$original_checked = 'checked="checked"';
-				} else if ($data[$count]['way'] == 'anchor') {
+				}
+				else if ($data[$count]['way'] == 'anchor' )
+				{
 					$anchor_checked = 'checked="checked"';
-				} else {
+				}
+				else
+				{
 					$thumbnail_checked = 'checked="checked"';
 				}
 				
@@ -391,31 +495,38 @@ class NP_Attach extends NucleusPlugin {
 		return;
 	}
 	
-	private function setData($root) {
-		if(self::$blogid === 0 || !self::$itemid === 0) {
+	private function setData($root)
+	{
+		if ( self::$blogid === 0 || !self::$itemid === 0 )
+		{
 		 return;
 		}
 		
 		self::$amount = $this->getBlogOption(self::$blogid, 'amount');
-		$media = explode(';', $this->getitemOption (self::$itemid, 'media'));
+		$media = explode(';', $this->getitemOption(self::$itemid, 'media'));
 		$data = array();
 		
-		for ($count = 0; $count < self::$amount; $count++) {
-			if((self::$itemid != 0) && array_key_exists ($count, $media) && !empty ($media[$count])) {
-				$medium = explode (':', $media[$count]);
+		for ( $count = 0; $count < self::$amount; $count++ )
+		{
+			if ( (self::$itemid != 0) && array_key_exists($count, $media) && !empty($media[$count]) )
+			{
+				$medium = explode(':', $media[$count]);
 				$data[$count]['path'] = $medium[0];
 				$data[$count]['alt'] = $medium[1];
 				$data[$count]['way'] = $medium[2];
 				
-				if (FALSE === ($file = new Medium($root, $data[$count]['path'], MediaUtils::$prefix))) {
-					$data[$count] = array ('path' => "", 'alt' => "", 'way' => "");
+				if ( FALSE === ($file = new Medium($root, $data[$count]['path'], MediaUtils::$prefix)) )
+				{
+					$data[$count] = array('path' => "", 'alt' => "", 'way' => "");
 				}
 				
 				$data[$count]['mime'] = $file->mime;
 				$data[$count]['width'] = $file->width;
 				$data[$count]['height'] = $file->height;
-			} else {
-				$data[$count] = array ('path' => "", 'alt' => "", 'way' => "");
+			}
+			else
+			{
+				$data[$count] = array('path' => "", 'alt' => "", 'way' => "");
 			}
 		}
 		
@@ -423,46 +534,55 @@ class NP_Attach extends NucleusPlugin {
 		return;
 	}
 	
-	static private function batchRequest($root, $collection) {
+	static private function batchRequest($root, $collection)
+	{
 		global $CONF, $manager;
-		$media = array ();
-		$paths = array ();
-		$alts = array ();
-		$ways = array ();
-		$deletes = array ();
-		
-		if (array_key_exists ('medium', $_FILES)) {
+		$media = array();
+		$paths = array();
+		$alts = array();
+		$ways = array();
+		$deletes = array();
+		
+		if ( array_key_exists('medium', $_FILES) )
+		{
 			$media = $_FILES['medium'];
 		}
 		
-		if (array_key_exists ('path', $_POST)) {
+		if ( array_key_exists('path', $_POST) )
+		{
 			$paths = $_POST['path'];
 		}
 		
-		if (array_key_exists ('alt', $_POST)) {
+		if ( array_key_exists('alt', $_POST) )
+		{
 			$alts = $_POST['alt'];
 		}
 		
-		if (array_key_exists ('way', $_POST)) {
+		if ( array_key_exists('way', $_POST) )
+		{
 			$ways = $_POST['way'];
 		}
 		
-		if (array_key_exists ('delete', $_POST)) {
+		if ( array_key_exists('delete', $_POST) )
+		{
 			$deletes = $_POST['delete'];
 		}
 		
 		$data = &self::$data;
 		
-		if (!$manager->pluginInstalled('NP_Thumbnail')) {
+		if ( !$manager->pluginInstalled('NP_Thumbnail') )
+		{
 			return;
 		}
-		$NP_Thumbnail = &$manager->getPlugin('NP_Thumbnail');
 		
-		foreach ($data as $key => $value) {
-			if ($media && array_key_exists ($key, $media['name']) && !empty ($media['name'][$key])) {
-				$medium = array ();
-				if (preg_match ("#(\\\\|/|\\n)#", $media['name'][$key])) {
-					$data[$key] = array ('path' => "", 'alt' => "", 'way' => "");
+		foreach ( $data as $key => $value )
+		{
+			if ( $media && array_key_exists($key, $media['name']) && !empty($media['name'][$key]) )
+			{
+				$medium = array();
+				if ( preg_match ("#(\\\\|/|\\n)#", $media['name'][$key]) )
+				{
+					$data[$key] = array('path' => "", 'alt' => "", 'way' => "");
 					continue;
 				}
 				
@@ -471,40 +591,54 @@ class NP_Attach extends NucleusPlugin {
 				$medium['tmp_name'] = $media['tmp_name'][$key];
 				$medium['error'] = $media['error'][$key];
 				
-				$result = MediaUtils::uploadMedium ($root, $collection, $medium, $medium['name'], $manager);
+				$result = MediaUtils::uploadMedium($root, $collection, $medium, '', $manager);
 				
-				if ($result) {
+				if ( $result )
+				{
 					$data[$key]['path'] = "";
-					$data[$key]['alt']  = $result . ' (' . $medium['name'] . ')';
+					$data[$key]['alt']  = "{$result} ({$medium['name']})";
 					$data[$key]['way']  = "";
 					continue;
-				} else {
-					$data[$key]['path'] = $collection . '/' . $medium['name'];
 				}
-			} else if (array_key_exists($key, $paths) && !empty ($paths[$key])) {
-				if (FALSE === ($medium = new MEDIUM($root, $paths[$key], MediaUtils::$prefix))) {
-					$data[$key] = array ('path' => "", 'alt' => "", 'way' => "");
+				else
+				{
+					$data[$key]['path'] = "{$collection}/{$medium['name']}";
+				}
+			}
+			else if ( array_key_exists($key, $paths) && !empty($paths[$key]) )
+			{
+				if ( FALSE === ($medium = new MEDIUM($root, $paths[$key], MediaUtils::$prefix)) )
+				{
+					$data[$key] = array('path' => "", 'alt' => "", 'way' => "");
 					continue;
 				}
-				if ($deletes && array_key_exists ($key, $deletes) && $deletes[$key] == 1) {
-					if (@ unlink ($root . $paths[$key])) {
-						if (array_key_exists($medium->mime, MediaUtils::$image_mime)) {
-							@ unlink ($root . $NP_Thumbnail->getThumbPath($medium));
+				if ( $deletes && array_key_exists($key, $deletes) && $deletes[$key] == 1 )
+				{
+					if ( @unlink($root . $paths[$key]) )
+					{
+						if ( array_key_exists($medium->mime, MediaUtils::$image_mime) )
+						{
+							@ unlink($root . NP_Thumbnail::getThumbPath($medium));
 						}
-						$data[$key] = array ('path' => "", 'alt' => "", 'way' => "");
+						$data[$key] = array('path' => "", 'alt' => "", 'way' => "");
 						continue;
 					}
 				}
 			}
 			
-			if (array_key_exists ($key, $alts) && $alts[$key] != $value['alt']) {
-				$data[$key]['alt'] = htmlspecialchars ($alts[$key], ENT_QUOTES, _CHARSET);
+			if ( array_key_exists($key, $alts) && $alts[$key] != $value['alt'] )
+			{
+				$data[$key]['alt'] = htmlspecialchars($alts[$key], ENT_QUOTES, _CHARSET);
 			}
 			
-			if (array_key_exists ($key, $ways) && $ways[$key] != $value['way']) {
-				if (!in_array ($ways[$key], array ('thumbnail', 'original', 'anchor'))) {
+			if ( array_key_exists($key, $ways) && $ways[$key] != $value['way'] )
+			{
+				if ( !in_array($ways[$key], array('thumbnail', 'original', 'anchor')) )
+				{
 					$data[$key]['way'] = 'thumbnail';
-				} else {
+				}
+				else
+				{
 					$data[$key]['way'] = $ways[$key];
 				}
 			}
@@ -512,18 +646,22 @@ class NP_Attach extends NucleusPlugin {
 		return;
 	}
 	
-	static private function prepareEnctype () {
-		self::$buffer = ob_start ();
+	static private function prepareEnctype()
+	{
+		self::$buffer = ob_start();
 		return;
 	}
 	
-	static private function setEnctype () {
-		if (!self::$buffer) {
+	static private function setEnctype()
+	{
+		if ( !self::$buffer )
+		{
 			return;
 		}
-		$strings = ob_get_contents ();
-		ob_end_clean ();
-		$strings = preg_replace ('#action="(index.php|bookmarklet.php)"#', '$0 enctype="multipart/form-data"', $strings);
+		
+		$strings = ob_get_contents();
+		ob_end_clean();
+		$strings = preg_replace('#action="(index.php|bookmarklet.php)"#', '$0 enctype="multipart/form-data"', $strings);
 		echo $strings;
 		return;
 	}
diff --git a/NP_Attach/attach/english.php b/NP_Attach/attach/en_Latn_US.ISO-8859-1.php
similarity index 93%
rename from NP_Attach/attach/english.php
rename to NP_Attach/attach/en_Latn_US.ISO-8859-1.php
index 202e305..1051a2e 100755
--- a/NP_Attach/attach/english.php
+++ b/NP_Attach/attach/en_Latn_US.ISO-8859-1.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Attach plugin for Nucleus CMS
- * Version 0.9.6 (1.0 RC2) for PHP5
- * Written By Mocchi, Apr. 04, 2011
+ * Version 1.0.0 for PHP5
+ * Written By Mocchi, Oct. 20, 2012
  * Original code was written by NKJG and yamamoto, May 02, 2009
  * This plugin depends on NP_Thumbnail and NP_MediaUtils
  * 
diff --git a/NP_Attach/attach/japanese-utf8.php b/NP_Attach/attach/ja_Jpan_JP.EUC-JP.php
similarity index 94%
rename from NP_Attach/attach/japanese-utf8.php
rename to NP_Attach/attach/ja_Jpan_JP.EUC-JP.php
index 358b326..7422940 100755
--- a/NP_Attach/attach/japanese-utf8.php
+++ b/NP_Attach/attach/ja_Jpan_JP.EUC-JP.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Attach plugin for Nucleus CMS
- * Version 0.9.6 (1.0 RC2) for PHP5
- * Written By Mocchi, Apr. 04, 2011
+ * Version 1.0.0 for PHP5
+ * Written By Mocchi, Oct. 20, 2012
  * Original code was written by NKJG and yamamoto, May 02, 2009
  * This plugin depends on NP_Thumbnail and NP_MediaUtils
  * 
diff --git a/NP_Attach/attach/ja_Jpan_JP.UTF-8.php b/NP_Attach/attach/ja_Jpan_JP.UTF-8.php
new file mode 100755
index 0000000..7422940
--- /dev/null
+++ b/NP_Attach/attach/ja_Jpan_JP.UTF-8.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Attach plugin for Nucleus CMS
+ * Version 1.0.0 for PHP5
+ * Written By Mocchi, Oct. 20, 2012
+ * Original code was written by NKJG and yamamoto, May 02, 2009
+ * This plugin depends on NP_Thumbnail and NP_MediaUtils
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ */
+
+define('_NP_ATTACH_01', 'アイテムに直接、ファイルを添付します。添付したファイルはタグ<%Attach%>でアイテム中に表示できます');
+define('_NP_ATTACH_02', '管理画面に表示するサムネイルの横幅の最大値');
+define('_NP_ATTACH_03', '管理画面に表示するサムネイルの縦幅の最大値');
+define('_NP_ATTACH_04', '管理画面に表示する縮小画像のテンプレート');
+define('_NP_ATTACH_05', '管理画面に表示する画像以外のテンプレート');
+define('_NP_ATTACH_06', 'アイテムに添付できるファイルの数');
+define('_NP_ATTACH_07', 'ウェブログに表示する原寸画像のテンプレート。縮小画像のテンプレートはNP_Thumbnailのテンプレートに準じてます。');
+define('_NP_ATTACH_08', 'ウェブログに表示する画像以外のテンプレート');
+define('_NP_ATTACH_09', 'ファイルの情報');
+define('_NP_ATTACH_10', 'タグ');
+define('_NP_ATTACH_11', 'ファイルと説明文');
+define('_NP_ATTACH_12', '埋め込み方法');
+define('_NP_ATTACH_13', '削除');
+define('_NP_ATTACH_14', 'リンク');
+define('_NP_ATTACH_15', 'リンク');
+define('_NP_ATTACH_16', '縮小');
+define('_NP_ATTACH_17', '実寸');
diff --git a/NP_Attach/attach/japanese-euc.php b/NP_Attach/attach/japanese-euc.php
deleted file mode 100755
index 593d9ee..0000000
--- a/NP_Attach/attach/japanese-euc.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Attach plugin for Nucleus CMS
- * Version 0.9.6 (1.0 RC2) for PHP5
- * Written By Mocchi, Apr. 04, 2011
- * Original code was written by NKJG and yamamoto, May 02, 2009
- * This plugin depends on NP_Thumbnail and NP_MediaUtils
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- */
-
-define('_NP_ATTACH_01', '¥¢¥¤¥Æ¥à¤ËľÀÜ¡¢¥Õ¥¡¥¤¥ë¤òźÉÕ¤·¤Þ¤¹¡£ÅºÉÕ¤·¤¿¥Õ¥¡¥¤¥ë¤Ï¥¿¥°<%Attach%>¤Ç¥¢¥¤¥Æ¥àÃæ¤Ëɽ¼¨¤Ç¤­¤Þ¤¹');
-define('_NP_ATTACH_02', '´ÉÍý²èÌ̤Ëɽ¼¨¤¹¤ë¥µ¥à¥Í¥¤¥ë¤Î²£Éý¤ÎºÇÂçÃÍ');
-define('_NP_ATTACH_03', '´ÉÍý²èÌ̤Ëɽ¼¨¤¹¤ë¥µ¥à¥Í¥¤¥ë¤Î½ÄÉý¤ÎºÇÂçÃÍ');
-define('_NP_ATTACH_04', '´ÉÍý²èÌ̤Ëɽ¼¨¤¹¤ë½Ì¾®²èÁü¤Î¥Æ¥ó¥×¥ì¡¼¥È');
-define('_NP_ATTACH_05', '´ÉÍý²èÌ̤Ëɽ¼¨¤¹¤ë²èÁü°Ê³°¤Î¥Æ¥ó¥×¥ì¡¼¥È');
-define('_NP_ATTACH_06', '¥¢¥¤¥Æ¥à¤ËźÉդǤ­¤ë¥Õ¥¡¥¤¥ë¤Î¿ô');
-define('_NP_ATTACH_07', '¥¦¥§¥Ö¥í¥°¤Ëɽ¼¨¤¹¤ë¸¶À£²èÁü¤Î¥Æ¥ó¥×¥ì¡¼¥È¡£½Ì¾®²èÁü¤Î¥Æ¥ó¥×¥ì¡¼¥È¤ÏNP_Thumbnail¤Î¥Æ¥ó¥×¥ì¡¼¥È¤Ë½à¤¸¤Æ¤Þ¤¹¡£');
-define('_NP_ATTACH_08', '¥¦¥§¥Ö¥í¥°¤Ëɽ¼¨¤¹¤ë²èÁü°Ê³°¤Î¥Æ¥ó¥×¥ì¡¼¥È');
-define('_NP_ATTACH_09', '¥Õ¥¡¥¤¥ë¤Î¾ðÊó');
-define('_NP_ATTACH_10', '¥¿¥°');
-define('_NP_ATTACH_11', '¥Õ¥¡¥¤¥ë¤ÈÀâÌÀʸ');
-define('_NP_ATTACH_12', 'Ëä¤á¹þ¤ßÊýË¡');
-define('_NP_ATTACH_13', 'ºï½ü');
-define('_NP_ATTACH_14', '¥ê¥ó¥¯');
-define('_NP_ATTACH_15', '¥ê¥ó¥¯');
-define('_NP_ATTACH_16', '½Ì¾®');
-define('_NP_ATTACH_17', '¼ÂÀ£');