Merged in from DEV trunk...

KTS-3154 "new Tags with spaces are created without spaces" Fixed. The spaces were being removed using a str_replace. Committed by: Megan Watson Reviewed by: Jonathan Byrne KTS-3155 "Error when renaming folders that contain special characters" Fixed. Mysql is case insensitive, added a check in the php before returning true. Committed by: Megan Watson Reviewed by: Conrad Vermeulen KTS-3167 "Issue with viewing resolved permissions for all users" Fixed. Added a check for users in subgroups on the resolved permissions per user page. Committed By: Jonathan Byrne Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8272 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-3154 "new Tags with spaces are created without spaces" Fixed. The spaces were being removed using a str_replace. Committed by: Megan Watson Reviewed by: Jonathan Byrne KTS-3155 "Error when renaming folders that contain special characters" Fixed. Mysql is case insensitive, added a check in the php before returning true. Committed by: Megan Watson Reviewed by: Conrad Vermeulen KTS-3167 "Issue with viewing resolved permissions for all users" Fixed. Added a check for users in subgroups on the resolved permissions per user page. Committed By: Jonathan Byrne Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8272 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 06b6d973
Showing 3 changed files with 54 additions and 7 deletions
lib/foldermanagement/Folder.inc
lib/users/User.inc
plugins/tagcloud/TagCloudTriggers.php
@@ -448,12 +448,20 @@ class Folder extends KTEntity {
 	* @return	true if the folder exists, false otherwise and set $_SESSION["errorMessage"]
 	*/
 	function folderExistsName($sName, $iParentID) {
-        $sQuery = "SELECT id FROM " . KTUtil::getTableName('folders') . " WHERE name = ? AND parent_id = ?";/*ok*/
+        $sQuery = "SELECT id, name FROM " . KTUtil::getTableName('folders') . " WHERE name = ? AND parent_id = ?";/*ok*/
         $aParams = array($sName, $iParentID);
 		$res = DBUtil::getResultArray(array($sQuery, $aParams));
 		//var_dump($res);
 		if (count($res) != 0) {
-			return true;
+
+		    // mysql is case-insensitive - check using php
+		    foreach ($res as $folder){
+    		    $name = isset($folder['name']) ? $folder['name'] : '';
+    		    if($name == $sName){
+    		        return true;
+    		    }
+		    }
+			return false;
 		}
 		return false;
 	}
@@ -504,20 +504,59 @@ class User extends KTEntity {
     		$iUserId = $_SESSION['iUserId'];
     	}
  
-		$pdgTable = KTUtil::getTableName('permission_descriptor_groups');
+    	$pdgTable = KTUtil::getTableName('permission_descriptor_groups');
         global $default;
 		$uglTable = $default->users_groups_table;
-
 		$sQuery = "SELECT COUNT(*) AS num FROM $pdgTable pd
 			INNER JOIN $uglTable ug ON ug.group_id = pd.group_id
 			WHERE pd.descriptor_id = ? AND ug.user_id = ?";
  
 		$aParams = array($oPermissionDescriptor->getID(), $iUserId);
         $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'num');
+        
         if (PEAR::isError($res) || empty($res)) {
-            return false;
+            
+            $aSubGrpOneParams = array($oPermissionDescriptor->getID());
+            
+            //Checking if user is in a subgroup
+            //Query One is the get any groups with permissions
+            $sSubGrpQueryOne = "SELECT group_id FROM $pdgTable pd
+            					WHERE pd.descriptor_id = ?";
+            $aSubRes = DBUtil::getResultArrayKey(array($sSubGrpQueryOne, $aSubGrpOneParams), 'group_id');
+            
+            if(!(PEAR::isError($aSubRes) || empty($aSubRes)))
+            {
+            	$list = implode(',', $aSubRes);
+
+            	$sSubGroupTable = KTUtil::getTableName('groups_groups_link');
+            	$aParams = array($iUserId);
+            	
+            	//Query two is to check if the current user's group is a sub group of the
+            	//group with permissions
+            	$sSubGrpQueryTwo = "SELECT COUNT(member_group_id) count FROM $sSubGroupTable ggl
+            			INNER JOIN users_groups_link ugl ON (ugl.group_id = ggl.member_group_id)
+            			WHERE ugl.user_id = ? AND parent_group_id IN ($list)";
+            	$aSubResTwo = DBUtil::getOneResultKey(array($sSubGrpQueryTwo, $aParams), 'count');
+        	
+            	if(PEAR::isError($aSubResTwo) || empty($aSubResTwo))
+            	{
+            		return false;
+            	}
+            	else
+            	{
+            		return true;
+            	}
+            }
+            else
+            {
+            	return false;
+            }
+            
+        }
+        else
+        {
+        	return true;
         }
-        return true;
 	}
 }
 ?>
 \ No newline at end of file
@@ -87,7 +87,7 @@ class KTAddDocumentTrigger {
 			}
 			if($tagString != ''){
 	        	$words_table = KTUtil::getTableName('tag_words');
-	        	$tagString = str_replace(' ', '', $tagString);
+	        	$tagString = str_replace('  ', ' ', $tagString);
 		    	$tags = explode(',',$tagString);
  
 		    	$aTagIds = array();