conflict while merge with master

Elena.Budnik
2 parents e566b28b b6e4778f
Showing 3 changed files with 52 additions and 14 deletions Show diff stats
php/WebServices/WSUserMgr.php
php/WebServices/WebServer.php
php/classes/UserMgr.php
@@ -55,6 +55,7 @@ class WSUserMgr extends UserMgr
 		if ( $setPathOnly )
 			return array('success' => true);
  
+		$this->userGrps = $this->getUserGrps();	
 		$this->makeLocalTree();
 		$this->makeRemoteTree();
  
@@ -38,6 +38,7 @@ class WebServer
  
 		if (isset($vars['userID'])){
 			$this->userID  = $vars['userID'];
+			IHMConfigClass::setUserName($this->userID);
 		}
 		else {
 			$this->userID  = 'impex';
@@ -53,10 +54,10 @@ class WebServer
 		return array('success' => true, 'vars' => $vars);
 	}
  
-	private function initUserMgr($setPatOnly = false) 
+	private function initUserMgr($setPathOnly = false) 
 	{
 		$wsUserMgr = new WSUserMgr();
-		$wsUserMgr->init($this->userID, $this->userPWD, $this->sessionID,  $setPatOnly, $this->isSoap);
+		$wsUserMgr->init($this->userID, $this->userPWD, $this->sessionID,  $setPathOnly, $this->isSoap);
  
 		$this->IPclient = $wsUserMgr->getIPClient();
  
@@ -296,7 +297,34 @@ class WebServer
  
 		return array('success' => true, 'token' => $newToken);
 	}
+	
+	private function excludePrivateNodes($locParamSrc, $locParamDst)
+	{
+		$locParamSrcDom = new DomDocument("1.0");
+		$locParamSrcDom->preserveWhiteSpace = FALSE; /// Important !!! otherwise removeChild() leaves empty text nodes
+		
+		if (!$locParamSrcDom->load($locParamSrc))
+			$this->throwError("getObsDataTree", "Cannot load  Amda Local DataBase Parameters description file".$this->userID);
+ 
+		$xp =  new domxpath($locParamSrcDom);
+		$restricted = $xp->query("//*[@group]");
  
+		foreach ($restricted as $node) {
+				$parentNode = $node->parentNode;
+				$parentNode->removeChild($node);
+				
+				if (!$parentNode->hasChildNodes()) {
+					if ($parentNode->parentNode){
+						$parentParentNode = $parentNode->parentNode;  
+						$parentParentNode->removeChild($parentNode);
+					}
+				}
+			}
+ 
+		if (!$locParamSrcDom->save(WSConfigClass::getWsResultDir().$locParamDst))
+			$this->throwError('workspaceError', 'Cannot save Amda Local DataBase Parameters description file'.$this->userID);   
+	}
+	
 /************************** WEB SERVICES **************************************/	
  
 /*
@@ -308,11 +336,13 @@ class WebServer
 		$this->initUserMgr();
  
 		$locParamSrc = USERWSDIR.'LocalParams.xml'; 
+		
 		$locParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_AmdaLocalDataBaseParameters.xml';
  
-		if (!copy($locParamSrc,WSConfigClass::getWsResultDir().$locParamDst))
-			$this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file');   
+// 		if (!copy($locParamSrc,WSConfigClass::getWsResultDir().$locParamDst))
+// 			$this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file');   
  
+		$this->excludePrivateNodes($locParamSrc,$locParamDst);
 		return  array('success' => true,'WorkSpace' => array("LocalDataBaseParameters" => WSConfigClass::getUrl().$locParamDst));
 	}
  
@@ -332,8 +362,10 @@ class WebServer
 		$locParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_AmdaLocalDataBaseParameters.xml';
 		$wsParamDst = substr(strtolower(__FUNCTION__),3).'_'.$this->userID.'_'.$this->requestTime.'_UserDefinedParameters.xml';
  
-		if (!copy($locParamSrc, WSConfigClass::getWsResultDir().$locParamDst))
-			$this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file for '.$this->userID);
+// 		if (!copy($locParamSrc, WSConfigClass::getWsResultDir().$locParamDst))
+// 			$this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file for '.$this->userID);
+		
+		$this->excludePrivateNodes($locParamSrc,$locParamDst);
  
 		if (!copy($wsParamSrc, WSConfigClass::getWsResultDir().$wsParamDst))
 			return  array('success' => true,'ParameterList' => 
@@ -29,6 +29,7 @@ class UserMgr
 	public $isOldWS = true;
 	public $isNewInfo = false;
 	public $isSpecialInfo = null;
+	public $isGuest = false;
  
 	function __construct($username = NULL, $password = NULL, $sessionID = NULL) 
 	{	 
@@ -51,6 +52,7 @@ class UserMgr
 			// Process Guest Login
 			if (strcasecmp(trim($_POST['username']),"guest") == 0) {
 				$this->processGuestLogin();
+				$this->isGuest = true;
 			}
 			else {
 				$this->user = trim($_POST['username']);
@@ -535,12 +537,17 @@ class UserMgr
 			if (!$this->createDir()) { 
 				die("Login for ".$this->user." failed: Can't create WS dirs");
 			}
-			$this->isFirst = true;   
-			$convert = new UserWsTransfer($this->user); 
-
-			$res = $convert->checkWS();
-			if (!$res['success']) 
+			$this->isFirst = true;
+			
+			if ($this->isGuest) {
 				$this->isOldWS = false;
+			}
+			else {
+				$convert = new UserWsTransfer($this->user); 
+				$res = $convert->checkWS();
+				if (!$res['success']) 
+					$this->isOldWS = false;
+			}
 		}
  
 		if (file_exists($this->userdir.'newLogin')) {
@@ -553,14 +560,12 @@ class UserMgr
 		// if new info exists it will be shown to : 
 		// public => to all
 		// special => to group members
-		if (file_exists($this->userdir.'newInfo')) 
-		{      
+		if (file_exists($this->userdir.'newInfo')) {                
 			$amdaInfo = new AmdaNews($this->user);
 			$info = $this->getUserInfo($this->user);
 			$status = $amdaInfo->makeInfo($info['group']); 
  
 			if ($status) $this->isNewInfo = true; 
-			
 			unlink($this->userdir.'newInfo');
 		}
 		touch($this->userdir.'newLogin');