#8 AbstractClientObjectHandler fixation is wrong.

XoopsX · Aug 16, 2012 · 3464426 · 3464426
1 parent 8dc545a
commit 3464426
Showing 1 changed file with 41 additions and 6 deletions.
diff --git a/html/modules/legacy/class/interface/AbstractClientObjectHandler.class.php b/html/modules/legacy/class/interface/AbstractClientObjectHandler.class.php
@@ -345,7 +345,14 @@ protected function _deleteImages(/*** XoopsSimpleObject ***/ $obj)
 	 */
 	protected function _isActivityClient(/*** mixed[] ***/ $conf)
 	{
-		return $conf[$this->_mClientConfig['activity']]==1 ? true : false;
+		$key ='activity';
+		if(! isset($this->_mClientConfig[$key])){
+			return false;
+		}
+		if(! isset($conf[$this->_mClientConfig[$key]])){
+			return false;
+		}
+		return $conf[$this->_mClientConfig[$key]]==1 ? true : false;
 	}
 
 	/**
@@ -357,7 +364,14 @@ protected function _isActivityClient(/*** mixed[] ***/ $conf)
 	 */
 	protected function _isTagClient(/*** mixed[] ***/ $conf)
 	{
-		return isset($conf[$this->_mClientConfig['tag']]) ?  true : false;
+		$key ='tag';
+		if(! isset($this->_mClientConfig[$key])){
+			return false;
+		}
+		if(! isset($conf[$this->_mClientConfig[$key]])){
+			return false;
+		}
+		return $conf[$this->_mClientConfig[$key]] ? true : false;
 	}
 
 	/**
@@ -369,7 +383,14 @@ protected function _isTagClient(/*** mixed[] ***/ $conf)
 	 */
 	protected function _isWorkflowClient(/*** mixed[] ***/ $conf)
 	{
-		return isset($conf[$this->_mClientConfig['workflow']]) ? true : false;
+		$key ='workflow';
+		if(! isset($this->_mClientConfig[$key])){
+			return false;
+		}
+		if(! isset($conf[$this->_mClientConfig[$key]])){
+			return false;
+		}
+		return $conf[$this->_mClientConfig[$key]] ? true : false;
 	}
 
 	/**
@@ -381,7 +402,14 @@ protected function _isWorkflowClient(/*** mixed[] ***/ $conf)
 	 */
 	protected function _isImageClient(/*** mixed[] ***/ $conf)
 	{
-		return isset($conf[$this->_mClientConfig['image']]) ? true : false;
+		$key ='image';
+		if(! isset($this->_mClientConfig[$key])){
+			return false;
+		}
+		if(! isset($conf[$this->_mClientConfig[$key]])){
+			return false;
+		}
+		return $conf[$this->_mClientConfig[$key]] ? true : false;
 	}
 
     /**
@@ -393,8 +421,15 @@ protected function _isImageClient(/*** mixed[] ***/ $conf)
      */
     protected function _isMapClient(/*** mixed[] ***/ $conf)
     {
-		return isset($conf[$this->_mClientConfig['map']]) ? true : false;
-    }
+		$key ='map';
+		if(! isset($this->_mClientConfig[$key])){
+			return false;
+		}
+		if(! isset($conf[$this->_mClientConfig[$key]])){
+			return false;
+		}
+		return $conf[$this->_mClientConfig[$key]]==1 ? true : false;
+	}
 
 	/**
 	 * get client field name