Userlist filtering fix.

Author: CaMer0n

e107_handlers/form_handler.php

@@ -1067,7 +1067,9 @@ function datepicker($name, $datestamp = false, $options = null)
 	 * @param array $options
 	 * @param string $options['group'] if == 'class' then users will be sorted into userclass groups.
 	 * @param string $options['fields']
-	 * @param string $options['classes']
+	 * @param string $options['classes'] - single or comma-separated list of user-classes members to include.
+	 * @param string $options['excludeSelf'] = exlude logged in user from list.
+	 * @param string $options['return'] if == 'array' an array is returned.
 	 * @return string select form element.
 	 */
 	public function userlist($name, $val=null, $options=array())
@@ -1133,9 +1135,16 @@ public function userlist($name, $val=null, $options=array())
 				foreach($users as $u)
 				{
 					$uclass = explode(',',$u['user_class']);
-					if(($classList == e_UC_ADMIN) || ($classList = e_UC_MEMBER) || in_array($cls,$uclass))
+
+					if(($classList == e_UC_ADMIN) || ($classList == e_UC_MEMBER) || in_array($cls,$uclass))
 					{
 						$id = $u['user_id'];
+
+						if(!empty($options['excludeSelf']) && ($id == USERID))
+						{
+							continue;
+						}
+
 						$opt[$cname][$id] = $u['user_name'];
 					}
 				}
@@ -1154,6 +1163,15 @@ public function userlist($name, $val=null, $options=array())
 
 		}
 
+
+		ksort($opt);
+
+
+		if(!empty($options['return']) && $options['return'] == 'array') // can be used by user.php ajax method..
+		{
+			return $opt;
+		}
+
 		return $this->select($name,$opt,$val,$options, varset($options['default'],null));
 
 	}

e107_plugins/pm/pm_shortcodes.php

@@ -176,7 +176,7 @@ public function sc_pm_form_touser()
 			else
 			{
 				$frm = e107::getForm();
-				$ret = $frm->userlist('pm_to',null,array('default'=>'blank', 'classes'=>varset($this->pmPrefs['send_to_class'], e_UC_MEMBER)));
+				$ret = $frm->userlist('pm_to',null,array('excludeSelf'=>true, 'default'=>'blank', 'classes'=>varset($this->pmPrefs['send_to_class'], e_UC_MEMBER)));
 			}