manqod-server 1.265.0 → 1.268.0

data/lib/DrbDB/DrbListModel.rb

@@ -82,19 +82,22 @@ class DrbListModel
 		found_iter
 	end
 
-	def set_iter_depth(row,depth_check=nil)
-		depth_check=Array.new if depth_check.nil?
+	def set_iter_depth(row,depth_check=Array.new)
+		begin
 		if @tree_key
 			if piter=data_iter_of_col_num(@column_of_tree_parent,row[@column_of_tree])
 				unless depth_check.include?(piter[@column_of_id])
 					depth_check.push(piter[@column_of_id])
 					set_iter_depth(piter,depth_check)
-#					else
-#					print "circular child=>parent relation: ",depth_check.join("->"),"-/>",piter[@column_of_id],"\n"
+					else
+					edebug("circular child=>parent relation: #{depth_check.join("->")} -/> #{piter[@column_of_id]}")
 				end
 				row[@column_of_iter_depth]=piter[@column_of_iter_depth]+1
 			end
 		end
+		rescue =>err
+			eexception(err)
+		end
 	end
 
 	def child_iter_ids(iter_id)

data/lib/DrbDB/Users.rb

@@ -37,6 +37,14 @@ class Users
 		}
 		found
 	end
+	
+	def mygroups(nick)
+		gr=Hash.new
+		@usergroups.each_value{|ugrp|
+			gr[ugrp["groupid"].to_i]=@groups[ugrp["groupid"].to_i]["name"] if @groups.has_key?(ugrp["groupid"].to_i) && @users.has_key?(ugrp["userid"].to_i) && @users[ugrp["userid"].to_i]['nick'] == nick 
+		}
+		gr
+	end
 
 	def get_user(user_id)
 		@users[user_id]

data/lib/DrbDB.rb

@@ -206,6 +206,9 @@ class DrbDb
 	def user_in_group?(user_id,group_id)
 		@users.user_in_group?(user_id,group_id)
 	end
+	def mygroups(nick)
+		@users.mygroups(nick)
+	end
 	
 	def moditems_with_base(base)
 		@moditems.each_value{|drblist|

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 265
+  - 268
   - 0
-  version: 1.265.0
+  version: 1.268.0
 platform: ruby
 authors: 
 - Dobai-Pataky Balint
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 +02:00
+date: 2011-04-27 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency