コミット: 6586001ffbd57fa84dbec5c33f5c01b4ec034dc0 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

コミットメタ情報

• リビジョン: 6586001ffbd57fa84dbec5c33f5c01b4ec034dc0 (tree)
• 日時: 2012-07-31 18:15:17
• 作者: HIKAWA Kilica <kilica.hikawa@gmai...>
• コミッター: HIKAWA Kilica

ログメッセージ

#8 AbstractClientObjectHandler fixation is wrong.

変更サマリ

• modified: html/modules/legacy/class/interface/AbstractClientObjectHandler.class.php

差分

--- a/html/modules/legacy/class/interface/AbstractClientObjectHandler.class.php
+++ b/html/modules/legacy/class/interface/AbstractClientObjectHandler.class.php
@@ -1,416 +1,412 @@
-<?php
-/**
- * @file
- * @package legacy
- * @version $Id$
-**/
-
-if(!defined('XOOPS_ROOT_PATH'))
-{
-	exit;
-}
-
-/**
- * Legacy_AbstractClientObjectHandler
-**/
-abstract class Legacy_AbstractClientObjectHandler extends XoopsObjectGenericHandler
-{
-	protected $_mClientField = array('title'=>'title', 'category'=>'category_id', 'posttime'=>'posttime');
-	protected $_mClientConfig = array('tag'=>'tag_dirname', 'image'=>'use_image', 'workflow'=>'use_workflow', 'activity'=>'use_activity', 'map'=>'use_map');
-
-	/**
-	 * _getTagList
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	string[]
-	 */
-	protected function _getTagList(/*** XoopsSimpleObject ***/ $obj)
-	{
-		return $obj->mTag;
-	}
-
-	/**
-	 * insert data to table
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 * @param bool	$force
-	 *
-	 * @return	bool
-	 */
-	public function insert(/*** XoopsSimpleObject ***/ $obj, /*** bool ***/ $force=false)
-	{
-		$ret = parent::insert($obj, $force);
-		if ($ret == true)
-		{
-			$ret = $this->_setClientData($obj);
-		}
-	
-		return $ret;
-	}
-
-	/**
-	 * delete data from table
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 * @param bool	$force
-	 *
-	 * @return	bool
-	 */
-	public function delete(/*** XoopsSimpleObject ***/ $obj, /*** bool ***/ $force=false)
-	{
-		$ret = parent::delete($obj, $force);
-		$this->_deleteClientData($obj);
-	
-		return $ret;
-	}
-
-	/**
-	 * set client data: tag, image, activity, workflow
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	bool
-	 */
-	protected function _setClientData(/*** XoopsSimpleObject ***/ $obj)
-	{
-		$handler = xoops_gethandler('config');
-		$conf = $handler->getConfigsByDirname($obj->getDirname());
-	
-		$ret = true;
-		if($this->_isActivityClient($conf)===true){
-			if($this->_saveActivity($obj)===false){
-				$ret = false;
-			}
-		}
-	
-		if($this->_isTagClient($conf)===true){
-			if($this->_saveTags($obj, $conf[$this->_mClientConfig['tag']])===false){
-				$ret = false;
-			}
-		}
-	
-		if($this->_isWorkflowClient($conf)===true){
-			$this->_saveWorkflow($obj);
-		}
-	
-		if($this->_isImageClient($conf)===true){
-			if($this->_saveImages($obj)===false){
-				$ret = false;
-			}
-		}
-	
-		if($this->_isMapClient($conf)===true){
-			if($this->_saveMap($obj)===false){
-				$ret = false;
-			}
-		}
-	
-		return $ret;
-	}
-
-	/**
-	 * delete client data: tag, activity, workflow, image
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	bool
-	 */
-	protected function _deleteClientData(/*** XoopsSimpleObject ***/ $obj)
-	{
-		$handler = xoops_gethandler('config');
-		$conf = $handler->getConfigsByDirname($obj->getDirname());
-	
-		$ret = true;
-		if($this->_isActivityClient($conf)===true){
-			if($this->_deleteActivity($obj)===false){
-				$ret = false;
-			}
-		}
-	
-		if($this->_isTagClient($conf)===true){
-			if($this->_deleteTags($obj, $tagDirname)===false){
-				$ret = false;
-			}
-		}
-	
-		if($this->_isWorkflowClient($conf)===true){
-			$ret = $this->_deleteWorkflow($obj);
-		}
-	
-		if($this->_isImageClient($conf)===true){
-			if($this->_deleteImages($obj)===false){
-				$ret = false;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * save activity
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	bool
-	 */
-	protected function _saveActivity(/*** XoopsSimpleObject ***/ $obj)
-	{
-		$ret = false;
-		XCube_DelegateUtils::call(
-			'Legacy_Activity.AddActivity', 
-			new XCube_Ref($ret),
-			$obj->get('uid'),
-			$obj->get($this->_mClientField['category']),
-			$obj->getDirname(), 
-			$this->getDataname(), 
-			$obj->get($this->mPrimary),
-			$obj->get($this->_mClientField['posttime'])
-		);
-		return $ret;
-	}
-
-	/**
-	 * save tags
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 * @param string	$tagDirname
-	 *
-	 * @return	bool
-	 */
-	protected function _saveTags(/*** XoopsSimpleObject ***/ $obj, /*** string ***/ $tagDirname)
-	{
-		$ret = false;
-		XCube_DelegateUtils::call('Legacy_Tag.'.$tagDirname.'.SetTags', 
-			new XCube_Ref($ret), 
-			$tagDirname, 
-			$obj->getDirname(),
-			$this->getDataname(),
-			$obj->get($this->mPrimary), 
-			$obj->get($this->_mClientField['posttime']), 
-			$this->_getTagList($obj)
-		);
-		return $ret;
-	}
-
-	/**
-	 * save workflow
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	void
-	 */
-	protected function _saveWorkflow(/*** XoopsSimpleObject ***/ $obj)
-	{
-		XCube_DelegateUtils::call(
-			'Legacy_Workflow.AddItem', 
-			$obj->getShow($this->mPrimary), 
-			$obj->getDirname(), 
-			$this->getDataname(), 
-			$obj->get($obj->getPrimary()), 
-			Legacy_Utils::renderUri($obj->getDirname(), $this->getDataname(), $obj->get($this->mPrimary))
-		);
-	}
-
-	/**
-	 * upload and save images
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	bool
-	 */
-	protected function _saveImages(/*** Legacy_AbstractObject ***/ $obj)
-	{
-		$ret = true;
-		$obj->setupImages();
-		foreach($obj->mImage as $image){
-			$result = false;
-			if($image->isDeleted()===true){	//delete image
-	        	XCube_DelegateUtils::call('Legacy_Image.DeleteImage', new XCube_Ref($result), $image);
-			}
-			else{	//save image
-				XCube_DelegateUtils::call('Legacy_Image.SaveImage', new XCube_Ref($result), $image);
-			}
-			if($result===false){
-				$ret = false;
-			}
-		}
-	
-		return $ret;
-	}
-
-	/**
-	 * save map data
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	bool
-	 */
-    protected function _saveMap($obj)
-    {
-        $result = array();
-        XCube_DelegateUtils::call(
-        	'Legacy_Map.SetPlace', 
-        	new XCube_Ref($result), 
-        	$obj->getDirname(), 
-        	$obj->getDataname(), 
-        	$obj->get($obj->getPrimary()), 
-        	$obj->mLatlng, 
-        	$obj->get($this->_mClientField['posttime'])
-        );
-    
-        return $result;
-    }
-
-	/**
-	 * delete activity
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	bool
-	 */
-	protected function _deleteActivity(/*** XoopsSimpleObject ***/ $obj)
-	{
-		$ret = false;
-		XCube_DelegateUtils::call('Legacy_Activity.DeleteActivity', new XCube_Ref($ret), $obj->getDirname(), $this->getDataname(), $obj->get($this->mPrimary));
-		return $ret;
-	}
-
-	/**
-	 * delete tags
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 * @param string	$tagDirname
-	 *
-	 * @return	bool
-	 */
-	protected function _deleteTags(/*** XoopsSimpleObject ***/ $obj, /*** string ***/ $tagDirname)
-	{
-		$ret = false;
-		XCube_DelegateUtils::call(
-			'Legacy_Tag.'.$tagDirname.'.SetTags',
-			new XCube_Ref($ret),
-			$tagDirname,
-			$obj->getDirname(),
-			$this->getDataname(),
-			$obj->get($this->mPrimary),
-			$obj->get($this->_mClientField['posttime']),
-			array()
-		);
-		return $ret;
-	}
-
-	/**
-	 * delete workflow
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	void
-	 */
-	protected function _deleteWorkflow(/*** XoopsSimpleObject ***/ $obj)
-	{
-		XCube_DelegateUtils::call('Legacy_Workflow.DeleteItem', $obj->getDirname(), $this->getDataname(), $obj->get($this->mPrimary));
-	}
-
-	/**
-	 * delete images
-	 *
-	 * @param XoopsSimpleObject	$obj
-	 *
-	 * @return	bool
-	 */
-	protected function _deleteImages(/*** XoopsSimpleObject ***/ $obj)
-	{
-		$ret = true;
-		$isPost = false;
-		$obj->setupImages($isPost);
-		foreach($obj->mImage as $image){
-			if(!($image instanceof Legacy_AbstractImageObject)){
-				continue;
-			}
-			$result = false;
-			XCube_DelegateUtils::call('Legacy_Image.DeleteImage', new XCube_Ref($result), $image);
-			if($result===false){
-				$ret = false;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * check if use Legacy_Activity
-	 *
-	 * @param mixed[]	$conf
-	 *
-	 * @return	bool
-	 */
-	protected function _isActivityClient(/*** mixed[] ***/ $conf)
-	{
-		return $conf[$this->_mClientConfig['activity']]==1 ? true : false;
-	}
-
-	/**
-	 * check if use Legacy_Tag
-	 *
-	 * @param mixed[]	$conf
-	 *
-	 * @return	bool
-	 */
-	protected function _isTagClient(/*** mixed[] ***/ $conf)
-	{
-		$flag = isset($conf[$this->_mClientConfig['tag']]) ? $conf[$this->_mClientConfig['tag']] : 0 ;
-		return $flag && $flag==1 ? true : false;
-	}
-
-	/**
-	 * check if use Legacy_Workflow
-	 *
-	 * @param mixed[]	$conf
-	 *
-	 * @return	bool
-	 */
-	protected function _isWorkflowClient(/*** mixed[] ***/ $conf)
-	{
-		$flag = isset($conf[$this->_mClientConfig['workflow']]) ? $conf[$this->_mClientConfig['workflow']] : 0 ;
-		return $flag==1 ? true : false;
-	}
-
-	/**
-	 * check if use Legacy_Image
-	 *
-	 * @param mixed[]	$conf
-	 *
-	 * @return	bool
-	 */
-	protected function _isImageClient(/*** mixed[] ***/ $conf)
-	{
-		$flag = isset($conf[$this->_mClientConfig['image']]) ? $conf[$this->_mClientConfig['image']] : 0;
-		return $flag && $flag==1 ? true : false;
-	}
-
-    /**
-     * check if use Legacy_Map
-     *
-     * @param mixed[]   $conf
-     *
-     * @return  bool
-     */
-    protected function _isMapClient(/*** mixed[] ***/ $conf)
-    {
-		$flag = isset($conf[$this->_mClientConfig['map']]) ? $conf[$this->_mClientConfig['map']] : 0;
-		return $flag && $flag==1 ? true : false;
-    }
-
-	/**
-	 * get client field name
-	 *
-	 * @param string	$key
-	 *
-	 * @return	string
-	 */
-	public function getClientField(/*** string ***/ $key)
-	{
-		return $this->_mClientField[$key];
-	}
-}
-
-?>
+<?php
+/**
+ * @file
+ * @package legacy
+ * @version $Id$
+**/
+
+if(!defined('XOOPS_ROOT_PATH'))
+{
+	exit;
+}
+
+/**
+ * Legacy_AbstractClientObjectHandler
+**/
+abstract class Legacy_AbstractClientObjectHandler extends XoopsObjectGenericHandler
+{
+	protected $_mClientField = array('title'=>'title', 'category'=>'category_id', 'posttime'=>'posttime');
+	protected $_mClientConfig = array('tag'=>'tag_dirname', 'image'=>'use_image', 'workflow'=>'use_workflow', 'activity'=>'use_activity', 'map'=>'use_map');
+
+	/**
+	 * _getTagList
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	string[]
+	 */
+	protected function _getTagList(/*** XoopsSimpleObject ***/ $obj)
+	{
+		return $obj->mTag;
+	}
+
+	/**
+	 * insert data to table
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 * @param bool	$force
+	 *
+	 * @return	bool
+	 */
+	public function insert(/*** XoopsSimpleObject ***/ $obj, /*** bool ***/ $force=false)
+	{
+		$ret = parent::insert($obj, $force);
+		if ($ret == true)
+		{
+			$ret = $this->_setClientData($obj);
+		}
+	
+		return $ret;
+	}
+
+	/**
+	 * delete data from table
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 * @param bool	$force
+	 *
+	 * @return	bool
+	 */
+	public function delete(/*** XoopsSimpleObject ***/ $obj, /*** bool ***/ $force=false)
+	{
+		$ret = parent::delete($obj, $force);
+		$this->_deleteClientData($obj);
+	
+		return $ret;
+	}
+
+	/**
+	 * set client data: tag, image, activity, workflow
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	bool
+	 */
+	protected function _setClientData(/*** XoopsSimpleObject ***/ $obj)
+	{
+		$handler = xoops_gethandler('config');
+		$conf = $handler->getConfigsByDirname($obj->getDirname());
+	
+		$ret = true;
+		if($this->_isActivityClient($conf)===true){
+			if($this->_saveActivity($obj)===false){
+				$ret = false;
+			}
+		}
+	
+		if($this->_isTagClient($conf)===true){
+			if($this->_saveTags($obj, $conf[$this->_mClientConfig['tag']])===false){
+				$ret = false;
+			}
+		}
+	
+		if($this->_isWorkflowClient($conf)===true){
+			$this->_saveWorkflow($obj);
+		}
+	
+		if($this->_isImageClient($conf)===true){
+			if($this->_saveImages($obj)===false){
+				$ret = false;
+			}
+		}
+	
+		if($this->_isMapClient($conf)===true){
+			if($this->_saveMap($obj)===false){
+				$ret = false;
+			}
+		}
+	
+		return $ret;
+	}
+
+	/**
+	 * delete client data: tag, activity, workflow, image
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	bool
+	 */
+	protected function _deleteClientData(/*** XoopsSimpleObject ***/ $obj)
+	{
+		$handler = xoops_gethandler('config');
+		$conf = $handler->getConfigsByDirname($obj->getDirname());
+	
+		$ret = true;
+		if($this->_isActivityClient($conf)===true){
+			if($this->_deleteActivity($obj)===false){
+				$ret = false;
+			}
+		}
+	
+		if($this->_isTagClient($conf)===true){
+			if($this->_deleteTags($obj, $tagDirname)===false){
+				$ret = false;
+			}
+		}
+	
+		if($this->_isWorkflowClient($conf)===true){
+			$ret = $this->_deleteWorkflow($obj);
+		}
+	
+		if($this->_isImageClient($conf)===true){
+			if($this->_deleteImages($obj)===false){
+				$ret = false;
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	 * save activity
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	bool
+	 */
+	protected function _saveActivity(/*** XoopsSimpleObject ***/ $obj)
+	{
+		$ret = false;
+		XCube_DelegateUtils::call(
+			'Legacy_Activity.AddActivity', 
+			new XCube_Ref($ret),
+			$obj->get('uid'),
+			$obj->get($this->_mClientField['category']),
+			$obj->getDirname(), 
+			$this->getDataname(), 
+			$obj->get($this->mPrimary),
+			$obj->get($this->_mClientField['posttime'])
+		);
+		return $ret;
+	}
+
+	/**
+	 * save tags
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 * @param string	$tagDirname
+	 *
+	 * @return	bool
+	 */
+	protected function _saveTags(/*** XoopsSimpleObject ***/ $obj, /*** string ***/ $tagDirname)
+	{
+		$ret = false;
+		XCube_DelegateUtils::call('Legacy_Tag.'.$tagDirname.'.SetTags', 
+			new XCube_Ref($ret), 
+			$tagDirname, 
+			$obj->getDirname(),
+			$this->getDataname(),
+			$obj->get($this->mPrimary), 
+			$obj->get($this->_mClientField['posttime']), 
+			$this->_getTagList($obj)
+		);
+		return $ret;
+	}
+
+	/**
+	 * save workflow
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	void
+	 */
+	protected function _saveWorkflow(/*** XoopsSimpleObject ***/ $obj)
+	{
+		XCube_DelegateUtils::call(
+			'Legacy_Workflow.AddItem', 
+			$obj->getShow($this->mPrimary), 
+			$obj->getDirname(), 
+			$this->getDataname(), 
+			$obj->get($obj->getPrimary()), 
+			Legacy_Utils::renderUri($obj->getDirname(), $this->getDataname(), $obj->get($this->mPrimary))
+		);
+	}
+
+	/**
+	 * upload and save images
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	bool
+	 */
+	protected function _saveImages(/*** Legacy_AbstractObject ***/ $obj)
+	{
+		$ret = true;
+		$obj->setupImages();
+		foreach($obj->mImage as $image){
+			$result = false;
+			if($image->isDeleted()===true){	//delete image
+	        	XCube_DelegateUtils::call('Legacy_Image.DeleteImage', new XCube_Ref($result), $image);
+			}
+			else{	//save image
+				XCube_DelegateUtils::call('Legacy_Image.SaveImage', new XCube_Ref($result), $image);
+			}
+			if($result===false){
+				$ret = false;
+			}
+		}
+	
+		return $ret;
+	}
+
+	/**
+	 * save map data
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	bool
+	 */
+    protected function _saveMap($obj)
+    {
+        $result = array();
+        XCube_DelegateUtils::call(
+        	'Legacy_Map.SetPlace', 
+        	new XCube_Ref($result), 
+        	$obj->getDirname(), 
+        	$obj->getDataname(), 
+        	$obj->get($obj->getPrimary()), 
+        	$obj->mLatlng, 
+        	$obj->get($this->_mClientField['posttime'])
+        );
+    
+        return $result;
+    }
+
+	/**
+	 * delete activity
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	bool
+	 */
+	protected function _deleteActivity(/*** XoopsSimpleObject ***/ $obj)
+	{
+		$ret = false;
+		XCube_DelegateUtils::call('Legacy_Activity.DeleteActivity', new XCube_Ref($ret), $obj->getDirname(), $this->getDataname(), $obj->get($this->mPrimary));
+		return $ret;
+	}
+
+	/**
+	 * delete tags
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 * @param string	$tagDirname
+	 *
+	 * @return	bool
+	 */
+	protected function _deleteTags(/*** XoopsSimpleObject ***/ $obj, /*** string ***/ $tagDirname)
+	{
+		$ret = false;
+		XCube_DelegateUtils::call(
+			'Legacy_Tag.'.$tagDirname.'.SetTags',
+			new XCube_Ref($ret),
+			$tagDirname,
+			$obj->getDirname(),
+			$this->getDataname(),
+			$obj->get($this->mPrimary),
+			$obj->get($this->_mClientField['posttime']),
+			array()
+		);
+		return $ret;
+	}
+
+	/**
+	 * delete workflow
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	void
+	 */
+	protected function _deleteWorkflow(/*** XoopsSimpleObject ***/ $obj)
+	{
+		XCube_DelegateUtils::call('Legacy_Workflow.DeleteItem', $obj->getDirname(), $this->getDataname(), $obj->get($this->mPrimary));
+	}
+
+	/**
+	 * delete images
+	 *
+	 * @param XoopsSimpleObject	$obj
+	 *
+	 * @return	bool
+	 */
+	protected function _deleteImages(/*** XoopsSimpleObject ***/ $obj)
+	{
+		$ret = true;
+		$isPost = false;
+		$obj->setupImages($isPost);
+		foreach($obj->mImage as $image){
+			if(!($image instanceof Legacy_AbstractImageObject)){
+				continue;
+			}
+			$result = false;
+			XCube_DelegateUtils::call('Legacy_Image.DeleteImage', new XCube_Ref($result), $image);
+			if($result===false){
+				$ret = false;
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	 * check if use Legacy_Activity
+	 *
+	 * @param mixed[]	$conf
+	 *
+	 * @return	bool
+	 */
+	protected function _isActivityClient(/*** mixed[] ***/ $conf)
+	{
+		return $conf[$this->_mClientConfig['activity']]==1 ? true : false;
+	}
+
+	/**
+	 * check if use Legacy_Tag
+	 *
+	 * @param mixed[]	$conf
+	 *
+	 * @return	bool
+	 */
+	protected function _isTagClient(/*** mixed[] ***/ $conf)
+	{
+		return isset($conf[$this->_mClientConfig['tag']]) ?  true : false;
+	}
+
+	/**
+	 * check if use Legacy_Workflow
+	 *
+	 * @param mixed[]	$conf
+	 *
+	 * @return	bool
+	 */
+	protected function _isWorkflowClient(/*** mixed[] ***/ $conf)
+	{
+		return isset($conf[$this->_mClientConfig['workflow']]) ? true : false;
+	}
+
+	/**
+	 * check if use Legacy_Image
+	 *
+	 * @param mixed[]	$conf
+	 *
+	 * @return	bool
+	 */
+	protected function _isImageClient(/*** mixed[] ***/ $conf)
+	{
+		return isset($conf[$this->_mClientConfig['image']]) ? true : false;
+	}
+
+    /**
+     * check if use Legacy_Map
+     *
+     * @param mixed[]   $conf
+     *
+     * @return  bool
+     */
+    protected function _isMapClient(/*** mixed[] ***/ $conf)
+    {
+		return isset($conf[$this->_mClientConfig['map']]) ? true : false;
+    }
+
+	/**
+	 * get client field name
+	 *
+	 * @param string	$key
+	 *
+	 * @return	string
+	 */
+	public function getClientField(/*** string ***/ $key)
+	{
+		return $this->_mClientField[$key];
+	}
+}
+
+?>