Errors when adding or removing a role/badge

user_badges_get_roles has an error setting the default value for returnbadges. It is setting it to a string, and then performing a boolean evaluation on it. This was causing it to unexpectedly return objects instead of badge ids to calling functions, and breaking them. This is the primary issue with this ticket.

There are also flaws in the logic implementing 'type' with badges.

The function user_badges_user_save, while it doesn't appear to be used anywhere in this module (why??), may be called externally (which I was doing writing user_badges support into user_import). It does not save 'type' when it stores a badge. However, when modifying a user and changing their roles, it explicitly only deletes badges of type 'role'. I can't take a user created with user_badges_user_save and modify their badges anymore because of this. I can't set them since it thinks they are already set (checking badges doesn't check the type), and it won't let me unset them because they don't have a type.

Since the user hook is dependent on roles to change badges, it seems appropriate it only affects that type of badge - in which case it seems best to me to modify the user_badges_user_save function to have an additional optional argument on the end to enable setting the type.

Further code errors I've addressed:
Line 262 looks like it was a debugging statement that someone failed to remove, hardcoding a role number.
Line 379 increments a variable that was never set.
Line 560 expects the $user global, which wasn't declared. This could have caused permissions issues.

Hope this patch helps.